[janitor] dlls/dinput -Wwrite-strings cleanup

Daniel Marmier d.marmier at bluewin.ch
Mon Oct 6 16:24:32 CDT 2003


Fixed warnings with gcc option "-Wwrite-strings".

-------------- next part --------------
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.45
diff -u -r1.45 dplay.c
--- dlls/dplayx/dplay.c	27 Sep 2003 02:23:44 -0000	1.45
+++ dlls/dplayx/dplay.c	6 Oct 2003 20:55:44 -0000
@@ -3660,7 +3660,7 @@
   {
     HKEY hkResult;
     LPCSTR searchSubKey    = "SOFTWARE\\Microsoft\\DirectPlay\\Service Providers";
-    LPSTR guidDataSubKey   = "Guid";
+    LPCSTR guidDataSubKey  = "Guid";
     char subKeyName[51];
     DWORD dwIndex, sizeOfSubKeyName=50;
     FILETIME filetime;
@@ -3754,7 +3754,7 @@
   {
     HKEY hkResult;
     LPCSTR searchSubKey    = "SOFTWARE\\Microsoft\\DirectPlay\\Lobby Providers";
-    LPSTR guidDataSubKey   = "Guid";
+    LPCSTR guidDataSubKey  = "Guid";
     char subKeyName[51];
     DWORD dwIndex, sizeOfSubKeyName=50;
     FILETIME filetime;
@@ -5218,9 +5218,9 @@
                       NULL, NULL, NULL, &filetime ) != ERROR_NO_MORE_ITEMS;
        ++dwIndex, sizeOfSubKeyName=50 )
   {
-    LPSTR    majVerDataSubKey = "dwReserved1";
-    LPSTR    minVerDataSubKey = "dwReserved2";
-    LPSTR    guidDataSubKey   = "Guid";
+    LPCSTR   majVerDataSubKey = "dwReserved1";
+    LPCSTR   minVerDataSubKey = "dwReserved2";
+    LPCSTR   guidDataSubKey   = "Guid";
     HKEY     hkServiceProvider;
     GUID     serviceProviderGUID;
     DWORD    returnTypeGUID, returnTypeReserved, sizeOfReturnBuffer = 50;
Index: dlls/dplayx/dplobby.c
===================================================================
RCS file: /home/wine/wine/dlls/dplayx/dplobby.c,v
retrieving revision 1.30
diff -u -r1.30 dplobby.c
--- dlls/dplayx/dplobby.c	29 Sep 2003 20:12:05 -0000	1.30
+++ dlls/dplayx/dplobby.c	6 Oct 2003 20:56:06 -0000
@@ -775,8 +775,8 @@
       char     returnBuffer[51];
       WCHAR    buff[51];
       DWORD    dwAtIndex;
-      LPSTR    atKey = "Address Types";
-      LPSTR    guidDataSubKey   = "Guid";
+      LPCSTR   atKey = "Address Types";
+      LPCSTR   guidDataSubKey   = "Guid";
       FILETIME filetime;
 
 
@@ -886,7 +886,7 @@
 
   HKEY hkResult;
   LPCSTR searchSubKey    = "SOFTWARE\\Microsoft\\DirectPlay\\Applications";
-  LPSTR guidDataSubKey   = "Guid";
+  LPCSTR guidDataSubKey  = "Guid";
   DWORD dwIndex, sizeOfSubKeyName=50;
   char subKeyName[51];
   FILETIME filetime;
@@ -1081,10 +1081,10 @@
   {
     char  returnBuffer[200];
     DWORD returnType, sizeOfReturnBuffer;
-    LPSTR clSubKey   = "CommandLine";
-    LPSTR cdSubKey   = "CurrentDirectory";
-    LPSTR fileSubKey = "File";
-    LPSTR pathSubKey = "Path";
+    LPCSTR clSubKey   = "CommandLine";
+    LPCSTR cdSubKey   = "CurrentDirectory";
+    LPCSTR fileSubKey = "File";
+    LPCSTR pathSubKey = "Path";
 
     /* FIXME: Lazy man hack - dplay struct has the present reg key saved */
 


More information about the wine-patches mailing list