- Fix a typo in TBSAVEPARAMS A/W declaration.

dlls/commdlg/colordlg.c

@@ -850,7 +850,7 @@ static LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 )
 
    if (!(lpp->lpcc->Flags & CC_SHOWHELP))
       ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE);
-   lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRING);
+   lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRINGA);
 
 #if 0
    cpos = MAKELONG(5,7); /* init */
@@ -1035,7 +1035,7 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif
 	       break;
 
 	  case 0x40e:           /* Help! */ /* The Beatles, 1965  ;-) */
-	       i = RegisterWindowMessageA(HELPMSGSTRING);
+	       i = RegisterWindowMessageA(HELPMSGSTRINGA);
                if (lpp->lpcc16)
                {
                    if (lpp->lpcc->hwndOwner)
@@ -1055,7 +1055,7 @@ static LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notif
 	       break;
 
           case IDOK :
-		cokmsg = RegisterWindowMessageA(COLOROKSTRING);
+		cokmsg = RegisterWindowMessageA(COLOROKSTRINGA);
                 if (lpp->lpcc16)
                 {
 		    if (lpp->lpcc->hwndOwner)

dlls/commdlg/filedlg.c

@@ -1212,8 +1212,8 @@ LFSPRIVATE FILEDLG_AllocPrivate(LPARAM lParam, int type, UINT dlgType)
         lfs->open = TRUE;
     else
         lfs->open = FALSE;
-    lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRING);
-    lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRING);
+    lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA);
+    lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRINGA);
     switch(type)
     {
         case LFS16:

dlls/commdlg/filedlg95.c

@@ -240,10 +240,10 @@ BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
     /* old style hook messages */
     if (IsHooked(fodInfos))
     {
-      fodInfos->HookMsg.fileokstring = RegisterWindowMessageA(FILEOKSTRING);
-      fodInfos->HookMsg.lbselchstring = RegisterWindowMessageA(LBSELCHSTRING);
-      fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageA(HELPMSGSTRING);
-      fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRING);
+      fodInfos->HookMsg.fileokstring = RegisterWindowMessageA(FILEOKSTRINGA);
+      fodInfos->HookMsg.lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA);
+      fodInfos->HookMsg.helpmsgstring = RegisterWindowMessageA(HELPMSGSTRINGA);
+      fodInfos->HookMsg.sharevistring = RegisterWindowMessageA(SHAREVISTRINGA);
     }
     
     lRes = DialogBoxIndirectParamA(COMMDLG_hInstance32,

dlls/commdlg/finddlg.c

@@ -256,8 +256,8 @@ static LRESULT FINDDLG_WMCommand(HWND hWnd, WPARAM wParam,
 			LPSTR lpstrFindWhat, WORD wFindWhatLen, 
 			BOOL fUnicode)
 {
-    int uFindReplaceMessage = RegisterWindowMessageA( FINDMSGSTRING );
-    int uHelpMessage = RegisterWindowMessageA( HELPMSGSTRING );
+    int uFindReplaceMessage = RegisterWindowMessageA( FINDMSGSTRINGA );
+    int uHelpMessage = RegisterWindowMessageA( HELPMSGSTRINGA );
 
     switch (wParam) {
 	case IDOK:
@@ -367,8 +367,8 @@ static LRESULT REPLACEDLG_WMCommand(HWND hWnd, WPARAM16 wParam,
 		    LPSTR lpstrReplaceWith, WORD wReplaceWithLen,
 		    BOOL fUnicode)
 {
-    int uFindReplaceMessage = RegisterWindowMessageA( FINDMSGSTRING );
-    int uHelpMessage = RegisterWindowMessageA( HELPMSGSTRING );
+    int uFindReplaceMessage = RegisterWindowMessageA( FINDMSGSTRINGA );
+    int uHelpMessage = RegisterWindowMessageA( HELPMSGSTRINGA );
 
     switch (wParam) {
 	case IDOK:

dlls/commdlg/finddlg32.c

@@ -311,12 +311,12 @@ static BOOL COMDLG32_FR_CheckPartial(
                 return FALSE;
         }
 
-	if((FindReplaceMessage = RegisterWindowMessageA(FINDMSGSTRING)) == 0)
+	if((FindReplaceMessage = RegisterWindowMessageA(FINDMSGSTRINGA)) == 0)
         {
         	COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
                 return FALSE;
         }
-	if((HelpMessage = RegisterWindowMessageA(HELPMSGSTRING)) == 0)
+	if((HelpMessage = RegisterWindowMessageA(HELPMSGSTRINGA)) == 0)
         {
         	COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
                 return FALSE;

dlls/commdlg/fontdlg.c

@@ -879,7 +879,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
 		  }
 		  break;
 	
-	case psh15:i=RegisterWindowMessageA( HELPMSGSTRING );
+	case psh15:i=RegisterWindowMessageA( HELPMSGSTRINGA );
 		  if (lpcf->hwndOwner)
 		    SendMessageA(lpcf->hwndOwner, i, 0, (LPARAM)GetWindowLongA(hDlg, DWL_USER));
 /*		  if (CFn_HookCallChk(lpcf))

dlls/commdlg/printdlg.c

@@ -659,7 +659,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam,
      */
     if (lppd->Flags & PD_SHOWHELP) {
         if((PrintStructures->HelpMessageID = 
-	    RegisterWindowMessageA(HELPMSGSTRING)) == 0) {
+	    RegisterWindowMessageA(HELPMSGSTRINGA)) == 0) {
 	    COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
 	    return FALSE;
 	}
@@ -748,7 +748,7 @@ static LRESULT PRINTDLG_WMInitDialog16(HWND hDlg, WPARAM wParam,
      */
     if (lppd->Flags & PD_SHOWHELP) {
         if((PrintStructures->HelpMessageID = 
-	    RegisterWindowMessageA(HELPMSGSTRING)) == 0) {
+	    RegisterWindowMessageA(HELPMSGSTRINGA)) == 0) {
 	    COMDLG32_SetCommDlgExtendedError(CDERR_REGISTERMSGFAIL);
 	    return FALSE;
 	}

include/commdlg.h

-/* 
+/*
  * COMMDLG - Common Wine Dialog ... :-)
  */
 
@@ -296,13 +296,41 @@ DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
 #define WM_CHOOSEFONT_SETLOGFONT	(WM_USER + 101)
 #define WM_CHOOSEFONT_SETFLAGS		(WM_USER + 102)
 
-#define LBSELCHSTRING  "commdlg_LBSelChangedNotify"
-#define SHAREVISTRING  "commdlg_ShareViolation"
-#define FILEOKSTRING   "commdlg_FileNameOK"
-#define COLOROKSTRING  "commdlg_ColorOK"
-#define SETRGBSTRING   "commdlg_SetRGBColor"
-#define FINDMSGSTRING  "commdlg_FindReplace"
-#define HELPMSGSTRING  "commdlg_help"
+#define LBSELCHSTRINGA  "commdlg_LBSelChangedNotify"
+static const WCHAR LBSELCHSTRINGW[] = { 'c','o','m','m','d','l','g','_',
+  'L','B','S','e','l','C','h','a','n','g','e','d','N','o','t','i','f','y',0 };
+#define LBSELCHSTRING   WINELIB_NAME_AW(LBSELCHSTRING)
+
+#define SHAREVISTRINGA  "commdlg_ShareViolation"
+static const WCHAR SHAREVISTRINGW[] = { 'c','o','m','m','d','l','g','_',
+  'S','h','a','r','e','V','i','o','l','a','t','i','o','n',0 };
+#define SHAREVISTRING   WINELIB_NAME_AW(SHAREVISTRING)
+
+#define FILEOKSTRINGA   "commdlg_FileNameOK"
+static const WCHAR FILEOKSTRINGW[] = { 'c','o','m','m','d','l','g','_',
+  'F','i','l','e','N','a','m','e','O','K',0 };
+#define FILEOKSTRING    WINELIB_NAME_AW(FILEOKSTRING)
+
+#define COLOROKSTRINGA  "commdlg_ColorOK"
+static const WCHAR COLOROKSTRINGW[] = { 'c','o','m','m','d','l','g','_',
+  'C','o','l','o','r','O','K',0 };
+#define COLOROKSTRING   WINELIB_NAME_AW(COLOROKSTRING)
+
+#define SETRGBSTRINGA   "commdlg_SetRGBColor"
+static const WCHAR SETRGBSTRINGW[] = { 'c','o','m','m','d','l','g','_',
+  'S','e','t','R','G','B','C','o','l','o','r',0 };
+#define SETRGBSTRING    WINELIB_NAME_AW(SETRGBSTRING)
+
+#define FINDMSGSTRINGA  "commdlg_FindReplace"
+static const WCHAR FINDMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_',
+  'F','i','n','d','R','e','p','l','a','c','e',0 };
+#define FINDMSGSTRING   WINELIB_NAME_AW(FINDMSGSTRING)
+
+#define HELPMSGSTRINGA  "commdlg_help"
+static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_',
+  'H','e','l','p',0 };
+#define HELPMSGSTRING   WINELIB_NAME_AW(HELPMSGSTRING)
+
 
 #define CD_LBSELNOITEMS -1
 #define CD_LBSELCHANGE   0

include/msacm.h

@@ -91,15 +91,18 @@ extern "C" {
 #define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L
 
 #define ACMHELPMSGSTRINGA       "acmchoose_help"
-#define ACMHELPMSGSTRINGW       L"acmchoose_help"
+static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m',
+  'c','h','o','o','s','e','_','h','e','l','p',0 };
 #define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING)
 
 #define ACMHELPMSGCONTEXTMENUA  "acmchoose_contextmenu"
-#define ACMHELPMSGCONTEXTMENUW  L"acmchoose_contextmenu"
+static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m',
+  'c','h','o','o','s','e','_','c','o','n','t','e','x','t','m','e','n','u',0 };
 #define ACMHELPMSGCONTEXTMENU WINELIB_NAME_AW(ACMHELPMSGCONTEXTMENU)
 
 #define ACMHELPMSGCONTEXTHELPA  "acmchoose_contexthelp"
-#define ACMHELPMSGCONTEXTHELPW  L"acmchoose_contexthelp"
+static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m',
+  'c','h','o','o','s','e','_','c','o','n','t','e','x','t','h','e','l','p',0 };
 #define ACMHELPMSGCONTEXTHELP WINELIB_NAME_AW(ACMHELPMSGCONTEXTHELP)
 
 #define MM_ACM_FORMATCHOOSE 0x8000

include/prsht.h

@@ -16,7 +16,8 @@ extern "C" {
 
 
 #define WC_PROPSHEETA      "SysPropertySheet"
-#define WC_PROPSHEETW      L"SysPropertySheet"
+static const WCHAR WC_PROPSHEETW[] = { 'S','y','s',
+  'P','r','o','p','e','r','t','y','S','h','e','e','t',0 };
 #define WC_PROPSHEET         WINELIB_NAME_AW(WC_PROPSHEET)
 
 struct _PROPSHEETPAGEA;  /** need to forward declare those structs **/