[janitor] windows -Wwrite-strings cleanup

Daniel Marmier d.marmier at bluewin.ch
Sun Oct 5 05:44:16 CDT 2003


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

-------------- next part --------------
Index: windows/dialog.c
===================================================================
RCS file: /home/wine/wine/windows/dialog.c,v
retrieving revision 1.121
diff -u -r1.121 dialog.c
--- windows/dialog.c	12 Sep 2003 00:23:30 -0000	1.121
+++ windows/dialog.c	5 Oct 2003 10:27:42 -0000
@@ -155,7 +155,7 @@
 BOOL DIALOG_GetCharSize( HDC hDC, HFONT hFont, SIZE * pSize )
 {
     HFONT hFontPrev = 0;
-    char *alphabet = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    const char *alphabet = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
     SIZE sz;
     TEXTMETRICA tm;
 
@@ -1553,6 +1553,7 @@
 {
     HWND hwnd;
     LPSTR orig_spec = spec;
+    char any[] = "*.*";
 
 #define SENDMSG(msg,wparam,lparam) \
     ((attrib & DDL_POSTMSGS) ? PostMessageA( hwnd, msg, wparam, lparam ) \
@@ -1562,7 +1563,7 @@
           hDlg, spec ? spec : "NULL", idLBox, idStatic, attrib );
 
     /* If the path exists and is a directory, chdir to it */
-    if (!spec || !spec[0] || SetCurrentDirectoryA( spec )) spec = "*.*";
+    if (!spec || !spec[0] || SetCurrentDirectoryA( spec )) spec = any;
     else
     {
         char *p, *p2;
Index: windows/spy.c
===================================================================
RCS file: /home/wine/wine/windows/spy.c,v
retrieving revision 1.53
diff -u -r1.53 spy.c
--- windows/spy.c	5 Sep 2003 23:15:40 -0000	1.53
+++ windows/spy.c	5 Oct 2003 10:27:54 -0000
@@ -2045,7 +2045,7 @@
 /***********************************************************************
  *           SPY_DumpMem
  */
-void SPY_DumpMem (LPSTR header, UINT *q, INT len)
+void SPY_DumpMem (LPCSTR header, UINT *q, INT len)
 {
     int i;
 
Index: windows/sysparams.c
===================================================================
RCS file: /home/wine/wine/windows/sysparams.c,v
retrieving revision 1.54
diff -u -r1.54 sysparams.c
--- windows/sysparams.c	5 Sep 2003 23:15:39 -0000	1.54
+++ windows/sysparams.c	5 Oct 2003 10:28:05 -0000
@@ -373,7 +373,7 @@
 /***********************************************************************
  * Loads system parameter from user profile.
  */
-BOOL SYSPARAMS_Load( LPSTR lpRegKey, LPSTR lpValName, LPSTR lpBuf, DWORD count )
+BOOL SYSPARAMS_Load( LPCSTR lpRegKey, LPCSTR lpValName, LPSTR lpBuf, DWORD count )
 {
     BOOL ret = FALSE;
     DWORD type;
@@ -391,7 +391,7 @@
 /***********************************************************************
  * Saves system parameter to user profile.
  */
-BOOL SYSPARAMS_Save( LPSTR lpRegKey, LPSTR lpValName, LPSTR lpValue,
+BOOL SYSPARAMS_Save( LPCSTR lpRegKey, LPCSTR lpValName, LPCSTR lpValue,
                      UINT fWinIni )
 {
     HKEY hKey;
Index: windows/winpos.c
===================================================================
RCS file: /home/wine/wine/windows/winpos.c,v
retrieving revision 1.146
diff -u -r1.146 winpos.c
--- windows/winpos.c	5 Sep 2003 23:15:39 -0000	1.146
+++ windows/winpos.c	5 Oct 2003 10:28:11 -0000
@@ -79,7 +79,7 @@
  */
 BOOL WINPOS_CreateInternalPosAtom()
 {
-    LPSTR str = "SysIP";
+    LPCSTR str = "SysIP";
     atomInternalPos = (LPCSTR)(DWORD)GlobalAddAtomA(str);
     return (atomInternalPos) ? TRUE : FALSE;
 }


More information about the wine-patches mailing list