Dmitry Timoshkov : comdlg32: Make some data const.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d0db296db0bd0b4911783e425dbfabb422cb9822
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d0db296db0bd0b4911783e425dbfabb422cb9822

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed Nov 29 18:04:52 2006 +0800

comdlg32: Make some data const.

---

 dlls/comdlg32/cdlg32.c     |    2 +-
 dlls/comdlg32/filedlg.c    |    4 ++--
 dlls/comdlg32/fontdlg.c    |    2 +-
 dlls/comdlg32/printdlg.c   |   10 +++++-----
 dlls/comdlg32/printdlg.h   |    2 +-
 dlls/comdlg32/printdlg16.c |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c
index c8a7e76..91144a8 100644
--- a/dlls/comdlg32/cdlg32.c
+++ b/dlls/comdlg32/cdlg32.c
@@ -63,7 +63,7 @@ BOOL (WINAPI *COMDLG32_SHGetFolderPathW)
  *	FALSE if sibling could not be loaded or instantiated twice, TRUE
  *	otherwise.
  */
-static const 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 = %p\n";
 #define GPA(dest, hinst, name) \
 	if(!(dest = (void*)GetProcAddress(hinst,name)))\
 	{ \
diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index 5410bf9..68887d2 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -175,8 +175,8 @@ typedef struct tagFD32_PRIVATE
 #define CBSetExtendedUI(hwnd,flag) \
   SendMessageA(hwnd,CB_SETEXTENDEDUI,(WPARAM)(flag),0)
 
-const char *FileOpenDlgInfosStr = "FileOpenDlgInfos"; /* windows property description string */
-const char *LookInInfosStr = "LookInInfos"; /* LOOKIN combo box property */
+const char FileOpenDlgInfosStr[] = "FileOpenDlgInfos"; /* windows property description string */
+static const char LookInInfosStr[] = "LookInInfos"; /* LOOKIN combo box property */
 
 /***********************************************************************
  * Prototypes
diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
index 9bfbfa2..510d4de 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -88,7 +88,7 @@ static const WCHAR stIso88594[]={'A','a'
 static const WCHAR stIso885910[]={'A','a','B','b',0}; /* ISO-8859-10 */
 static const WCHAR stCeltic[]={'A','a','B','b',0};/* Celtic */
 
-static const WCHAR *sample_lang_text[]={
+static const WCHAR * const sample_lang_text[]={
     stWestern,stSymbol,stShiftJis,stHangul,stGB2312,
     stBIG5,stGreek,stTurkish,stHebrew,stArabic,
     stBaltic,stVietname,stCyrillic,stEastEur,stThai,
diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 3977b5f..6b6a725 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -51,7 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 #define MAX_COPIES 9999
 
 /* Debugging info */
-static struct pd_flags psd_flags[] = {
+static const struct pd_flags psd_flags[] = {
   {PSD_MINMARGINS,"PSD_MINMARGINS"},
   {PSD_MARGINS,"PSD_MARGINS"},
   {PSD_INTHOUSANDTHSOFINCHES,"PSD_INTHOUSANDTHSOFINCHES"},
@@ -1999,7 +1999,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
 
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = pd_flags;
+	const struct pd_flags *pflag = pd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(lppd->Flags & pflag->flag)
 	        strcat(flagstr, pflag->name);
@@ -2141,7 +2141,7 @@ BOOL WINAPI PrintDlgW(
 
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = pd_flags;
+	const struct pd_flags *pflag = pd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(lppd->Flags & pflag->flag)
 	        strcat(flagstr, pflag->name);
@@ -3335,7 +3335,7 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLG
     /* TRACE */
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = psd_flags;
+	const struct pd_flags *pflag = psd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(setupdlg->Flags & pflag->flag) {
 	        strcat(flagstr, pflag->name);
@@ -3437,7 +3437,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLG
     FIXME("Unicode implementation is not done yet\n");
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = psd_flags;
+	const struct pd_flags *pflag = psd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(setupdlg->Flags & pflag->flag) {
 	        strcat(flagstr, pflag->name);
diff --git a/dlls/comdlg32/printdlg.h b/dlls/comdlg32/printdlg.h
index 4977297..77a39f9 100644
--- a/dlls/comdlg32/printdlg.h
+++ b/dlls/comdlg32/printdlg.h
@@ -59,7 +59,7 @@ typedef struct
 } PRINT_PTRW;
 
 /* Debugging info */
-static struct pd_flags {
+static const struct pd_flags {
   DWORD  flag;
   LPCSTR name;
 } pd_flags[] = {
diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c
index 86b16cf..a84ee6a 100644
--- a/dlls/comdlg32/printdlg16.c
+++ b/dlls/comdlg32/printdlg16.c
@@ -349,7 +349,7 @@ BOOL16 WINAPI PrintDlg16(
 
     if(TRACE_ON(commdlg)) {
         char flagstr[1000] = "";
-	struct pd_flags *pflag = pd_flags;
+	const struct pd_flags *pflag = pd_flags;
 	for( ; pflag->name; pflag++) {
 	    if(lppd->Flags & pflag->flag)
 	        strcat(flagstr, pflag->name);