[janitor] dlls/commdlg -Wwrite-strings cleanup
Daniel Marmier
d.marmier at bluewin.ch
Sun Oct 12 05:59:22 CDT 2003
Fixed warnings with gcc option "-Wwrite-strings".
-------------- next part --------------
Index: dlls/commdlg/cdlg32.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/cdlg32.c,v
retrieving revision 1.28
diff -u -r1.28 cdlg32.c
--- dlls/commdlg/cdlg32.c 5 Sep 2003 23:08:42 -0000 1.28
+++ dlls/commdlg/cdlg32.c 12 Oct 2003 10:46:48 -0000
@@ -63,7 +63,7 @@
* FALSE if sibling could not be loaded or instantiated twice, TRUE
* otherwise.
*/
-static char * GPA_string = "Failed to get entry point %s for hinst = 0x%08x\n";
+static const char * GPA_string = "Failed to get entry point %s for hinst = 0x%08x\n";
#define GPA(dest, hinst, name) \
if(!(dest = (void*)GetProcAddress(hinst,name)))\
{ \
Index: dlls/commdlg/fontdlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/fontdlg.c,v
retrieving revision 1.54
diff -u -r1.54 fontdlg.c
--- dlls/commdlg/fontdlg.c 10 Sep 2003 03:56:48 -0000 1.54
+++ dlls/commdlg/fontdlg.c 12 Oct 2003 10:46:53 -0000
@@ -109,7 +109,7 @@
struct {
int mask;
- char *name;
+ const char *name;
} cfflags[] = {
#define XX(x) { x, #x },
XX(CF_SCREENFONTS)
Index: dlls/commdlg/printdlg.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v
retrieving revision 1.71
diff -u -r1.71 printdlg.c
--- dlls/commdlg/printdlg.c 7 Oct 2003 22:51:09 -0000 1.71
+++ dlls/commdlg/printdlg.c 12 Oct 2003 10:47:08 -0000
@@ -363,8 +363,9 @@
lppd->Flags &= ~PD_PAGENUMS;
if (IsDlgButtonChecked(hDlg, chx1) == BST_CHECKED) {/* Print to file */
+ static char file[] = "FILE:";
lppd->Flags |= PD_PRINTTOFILE;
- pi->pPortName = "FILE:";
+ pi->pPortName = file;
}
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) { /* Collate */
More information about the wine-patches
mailing list