Constify strings to conform C++ standard.

6 files changed, 17 insertions, 17 deletions

diff --git a/src/thirdparty/BaseClasses/amvideo.cpp b/src/thirdparty/BaseClasses/amvideo.cpp
index f8e36c005..6af1a3fdd 100644
--- a/src/thirdparty/BaseClasses/amvideo.cpp
+++ b/src/thirdparty/BaseClasses/amvideo.cpp
@@ -23,8 +23,8 @@ const DWORD bits888[] = {0xFF0000,0x00FF00,0x0000FF};
 const struct {

     const GUID *pSubtype;

     WORD BitCount;

-    CHAR *pName;

-    WCHAR *wszName;

+    LPCSTR pName;

+    LPCWSTR wszName;

 } BitCountMap[] =  { &MEDIASUBTYPE_RGB1,        1,   "RGB Monochrome",     L"RGB Monochrome",   

                      &MEDIASUBTYPE_RGB4,        4,   "RGB VGA",            L"RGB VGA",          

                      &MEDIASUBTYPE_RGB8,        8,   "RGB 8",              L"RGB 8",            

@@ -173,12 +173,12 @@ int LocateSubtype(const GUID *pSubtype)
 

 

 

-STDAPI_(WCHAR *) GetSubtypeNameW(const GUID *pSubtype)

+STDAPI_(LPCWSTR) GetSubtypeNameW(const GUID *pSubtype)

 {

     return BitCountMap[LocateSubtype(pSubtype)].wszName;

 }

 

-STDAPI_(CHAR *) GetSubtypeNameA(const GUID *pSubtype)

+STDAPI_(LPCSTR) GetSubtypeNameA(const GUID *pSubtype)

 {

     return BitCountMap[LocateSubtype(pSubtype)].pName;

 }

@@ -190,7 +190,7 @@ STDAPI_(CHAR *) GetSubtypeNameA(const GUID *pSubtype)
 

 // this is here for people that linked to it directly; most people

 // would use the header file that picks the A or W version.

-STDAPI_(CHAR *) GetSubtypeName(const GUID *pSubtype)

+STDAPI_(LPCSTR) GetSubtypeName(const GUID *pSubtype)

 {

     return GetSubtypeNameA(pSubtype);

 }

diff --git a/src/thirdparty/BaseClasses/videoctl.cpp b/src/thirdparty/BaseClasses/videoctl.cpp
index 85119d485..d8e293d32 100644
--- a/src/thirdparty/BaseClasses/videoctl.cpp
+++ b/src/thirdparty/BaseClasses/videoctl.cpp
@@ -15,7 +15,7 @@
 // buffer in the property page class and use it for all string loading. It

 // cannot be static as multiple property pages may be active simultaneously

 

-LPTSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPTSTR pBuffer, int iResourceID)

+LPCTSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPTSTR pBuffer, int iResourceID)

 {

     if (LoadString(g_hInst,iResourceID,pBuffer,STR_MAX_LENGTH) == 0) {

         return TEXT("");

@@ -24,7 +24,7 @@ LPTSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPTSTR pBuffer, in
 }

 

 #ifdef UNICODE

-LPSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPSTR pBuffer, int iResourceID)

+LPCSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPSTR pBuffer, int iResourceID)

 {

     if (LoadStringA(g_hInst,iResourceID,pBuffer,STR_MAX_LENGTH) == 0) {

         return "";

@@ -44,7 +44,7 @@ LPSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPSTR pBuffer, int
 

 #ifndef UNICODE

 

-LPWSTR WINAPI WideStringFromResource(__out_ecount(STR_MAX_LENGTH) LPWSTR pBuffer, int iResourceID)

+LPCWSTR WINAPI WideStringFromResource(__out_ecount(STR_MAX_LENGTH) LPWSTR pBuffer, int iResourceID)

 {

     *pBuffer = 0;

 

diff --git a/src/thirdparty/BaseClasses/videoctl.h b/src/thirdparty/BaseClasses/videoctl.h
index 62770bd2d..aa74d79e8 100644
--- a/src/thirdparty/BaseClasses/videoctl.h
+++ b/src/thirdparty/BaseClasses/videoctl.h
@@ -17,13 +17,13 @@
 // resource ID of a dialog box and returns the size of it in screen pixels

 

 #define STR_MAX_LENGTH 256

-LPTSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPTSTR pBuffer, int iResourceID);

+LPCTSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPTSTR pBuffer, int iResourceID);

 

 #ifdef UNICODE

 #define WideStringFromResource StringFromResource

-LPSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPSTR pBuffer, int iResourceID);

+LPCSTR WINAPI StringFromResource(__out_ecount(STR_MAX_LENGTH) LPSTR pBuffer, int iResourceID);

 #else

-LPWSTR WINAPI WideStringFromResource(__out_ecount(STR_MAX_LENGTH) LPWSTR pBuffer, int iResourceID);

+LPCWSTR WINAPI WideStringFromResource(__out_ecount(STR_MAX_LENGTH) LPWSTR pBuffer, int iResourceID);

 #endif

 

 

diff --git a/src/thirdparty/BaseClasses/wxdebug.cpp b/src/thirdparty/BaseClasses/wxdebug.cpp
index 8c9971a2a..410900484 100644
--- a/src/thirdparty/BaseClasses/wxdebug.cpp
+++ b/src/thirdparty/BaseClasses/wxdebug.cpp
@@ -76,7 +76,7 @@ bool g_fAutoRefreshLevels = false;
 

 LPCTSTR pBaseKey = TEXT("SOFTWARE\\Microsoft\\DirectShow\\Debug");

 LPCTSTR pGlobalKey = TEXT("GLOBAL");

-static CHAR *pUnknownName = "UNKNOWN";

+static LPCSTR pUnknownName = "UNKNOWN";

 

 LPCTSTR TimeoutName = TEXT("TIMEOUT");

 

@@ -1077,7 +1077,7 @@ void WINAPI DbgSetWaitTimeout(DWORD dwTimeout)
     CGuidNameList GuidNames;

     int g_cGuidNames = sizeof(g_GuidNames) / sizeof(g_GuidNames[0]);

 

-    char *CGuidNameList::operator [] (const GUID &guid)

+    LPCSTR CGuidNameList::operator [] (const GUID &guid)

     {

         for (int i = 0; i < g_cGuidNames; i++) {

             if (g_GuidNames[i].guid == guid) {

diff --git a/src/thirdparty/BaseClasses/wxdebug.h b/src/thirdparty/BaseClasses/wxdebug.h
index 34ceefeec..be80d128d 100644
--- a/src/thirdparty/BaseClasses/wxdebug.h
+++ b/src/thirdparty/BaseClasses/wxdebug.h
@@ -254,13 +254,13 @@ typedef struct tag_ObjectDesc {
     //  Returns the name defined in uuids.h as a string

 

     typedef struct {

-        CHAR   *szName;

+        LPCSTR  szName;

         GUID    guid;

     } GUID_STRING_ENTRY;

 

     class CGuidNameList {

     public:

-        CHAR *operator [] (const GUID& guid);

+        LPCSTR operator [] (const GUID& guid);

     };

 

     extern CGuidNameList GuidNames;

diff --git a/src/thirdparty/BaseClasses/wxutil.h b/src/thirdparty/BaseClasses/wxutil.h
index 1a44c255e..a1c1704bf 100644
--- a/src/thirdparty/BaseClasses/wxutil.h
+++ b/src/thirdparty/BaseClasses/wxutil.h
@@ -414,8 +414,8 @@ STDAPI_(WORD) GetBitCount(const GUID *pSubtype);
 //

 // STDAPI_(/* T */ CHAR *) GetSubtypeName(const GUID *pSubtype);

 

-STDAPI_(CHAR *) GetSubtypeNameA(const GUID *pSubtype);

-STDAPI_(WCHAR *) GetSubtypeNameW(const GUID *pSubtype);

+STDAPI_(LPCSTR) GetSubtypeNameA(const GUID *pSubtype);

+STDAPI_(LPCWSTR) GetSubtypeNameW(const GUID *pSubtype);

 

 #ifdef UNICODE

 #define GetSubtypeName GetSubtypeNameW