Hello.
Changelog:
Dmitry Timoshkov <dmitry@codeweavers.com>
Replace static initializers with a proper #define in .h files.
--
Dmitry.
diff -u cvs/hq/wine/include/commctrl.h wine/include/commctrl.h
--- cvs/hq/wine/include/commctrl.h Thu Sep 12 11:10:59 2002
+++ wine/include/commctrl.h Sat Sep 14 22:49:55 2002
@@ -265,8 +265,8 @@
#define STATUSCLASSNAME16 "msctls_statusbar"
#define STATUSCLASSNAMEA "msctls_statusbar32"
-static const WCHAR STATUSCLASSNAMEW[] = { 'm','s','c','t','l','s','_',
- 's','t','a','t','u','s','b','a','r','3','2',0 };
+#define STATUSCLASSNAMEW (const WCHAR []){ 'm','s','c','t','l','s','_', \
+ 's','t','a','t','u','s','b','a','r','3','2',0 }
#define STATUSCLASSNAME WINELIB_NAME_AW(STATUSCLASSNAME)
#define SBT_NOBORDERS 0x0100
@@ -358,8 +358,8 @@
#define UPDOWN_CLASS16 "msctls_updown"
#define UPDOWN_CLASSA "msctls_updown32"
-static const WCHAR UPDOWN_CLASSW[] = { 'm','s','c','t','l','s','_',
- 'u','p','d','o','w','n','3','2',0 };
+#define UPDOWN_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \
+ 'u','p','d','o','w','n','3','2',0 }
#define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS)
typedef struct tagUDACCEL
@@ -421,8 +421,8 @@
#define PROGRESS_CLASS16 "msctls_progress"
#define PROGRESS_CLASSA "msctls_progress32"
-static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_',
- 'p','r','o','g','r','e','s','s','3','2',0 };
+#define PROGRESS_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \
+ 'p','r','o','g','r','e','s','s','3','2',0 }
#define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS)
#define PBM_SETRANGE (WM_USER+1)
@@ -613,8 +613,8 @@
#define FLATSB_CLASS16 "flatsb_class"
#define FLATSB_CLASSA "flatsb_class32"
-static const WCHAR FLATSB_CLASSW[] = { 'f','l','a','t','s','b','_',
- 'c','l','a','s','s','3','2',0 };
+#define FLATSB_CLASSW (const WCHAR []){ 'f','l','a','t','s','b','_', \
+ 'c','l','a','s','s','3','2',0 }
#define FLATSB_CLASS WINELIB_NAME_AW(FLATSB_CLASS)
#define WSB_PROP_CYVSCROLL 0x00000001L
@@ -654,7 +654,7 @@
#define WC_HEADER16 "SysHeader"
#define WC_HEADERA "SysHeader32"
-static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 };
+#define WC_HEADERW (const WCHAR []){ 'S','y','s','H','e','a','d','e','r','3','2',0 }
#define WC_HEADER WINELIB_NAME_AW(WC_HEADER)
#define HDS_HORZ 0x0000
@@ -900,8 +900,8 @@
#define TOOLBARCLASSNAME16 "ToolbarWindow"
#define TOOLBARCLASSNAMEA "ToolbarWindow32"
-static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r',
- 'W','i','n','d','o','w','3','2',0 };
+#define TOOLBARCLASSNAMEW (const WCHAR []){ 'T','o','o','l','b','a','r', \
+ 'W','i','n','d','o','w','3','2',0 }
#define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME)
#define CMB_MASKED 0x02
@@ -1388,8 +1388,8 @@
#define TOOLTIPS_CLASS16 "tooltips_class"
#define TOOLTIPS_CLASSA "tooltips_class32"
-static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_',
- 'c','l','a','s','s','3','2',0 };
+#define TOOLTIPS_CLASSW (const WCHAR []){ 't','o','o','l','t','i','p','s','_', \
+ 'c','l','a','s','s','3','2',0 }
#define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS)
#define INFOTIPSIZE 1024
@@ -1567,8 +1567,8 @@
#define REBARCLASSNAME16 "ReBarWindow"
#define REBARCLASSNAMEA "ReBarWindow32"
-static const WCHAR REBARCLASSNAMEW[] = { 'R','e','B','a','r',
- 'W','i','n','d','o','w','3','2',0 };
+#define REBARCLASSNAMEW (const WCHAR []){ 'R','e','B','a','r', \
+ 'W','i','n','d','o','w','3','2',0 }
#define REBARCLASSNAME WINELIB_NAME_AW(REBARCLASSNAME)
#define RBS_TOOLTIPS 0x0100
@@ -1776,8 +1776,8 @@
#define TRACKBAR_CLASS16 "msctls_trackbar"
#define TRACKBAR_CLASSA "msctls_trackbar32"
-static const WCHAR TRACKBAR_CLASSW[] = { 'm','s','c','t','l','s','_',
- 't','r','a','c','k','b','a','r','3','2',0 };
+#define TRACKBAR_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \
+ 't','r','a','c','k','b','a','r','3','2',0 }
#define TRACKBAR_CLASS WINELIB_NAME_AW(TRACKBAR_CLASS)
#define TBS_AUTOTICKS 0x0001
@@ -1855,7 +1855,7 @@
/* Pager control */
#define WC_PAGESCROLLERA "SysPager"
-static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 };
+#define WC_PAGESCROLLERW (const WCHAR []){ 'S','y','s','P','a','g','e','r',0 }
#define WC_PAGESCROLLER WINELIB_NAME_AW(WC_PAGESCROLLER)
#define PGS_VERT 0x00000000
@@ -1933,8 +1933,8 @@
/* Treeview control */
#define WC_TREEVIEWA "SysTreeView32"
-static const WCHAR WC_TREEVIEWW[] = { 'S','y','s',
- 'T','r','e','e','V','i','e','w','3','2',0 };
+#define WC_TREEVIEWW (const WCHAR []){ 'S','y','s', \
+ 'T','r','e','e','V','i','e','w','3','2',0 }
#define WC_TREEVIEW WINELIB_NAME_AW(WC_TREEVIEW)
#define TVSIL_NORMAL 0
@@ -2537,8 +2537,8 @@
/* Listview control */
#define WC_LISTVIEWA "SysListView32"
-static const WCHAR WC_LISTVIEWW[] = { 'S','y','s',
- 'L','i','s','t','V','i','e','w','3','2',0 };
+#define WC_LISTVIEWW (const WCHAR []){ 'S','y','s', \
+ 'L','i','s','t','V','i','e','w','3','2',0 }
#define WC_LISTVIEW WINELIB_NAME_AW(WC_LISTVIEW)
#define LVSCW_AUTOSIZE -1
@@ -3245,8 +3245,8 @@
#define WC_TABCONTROL16 "SysTabControl"
#define WC_TABCONTROLA "SysTabControl32"
-static const WCHAR WC_TABCONTROLW[] = { 'S','y','s',
- 'T','a','b','C','o','n','t','r','o','l','3','2',0 };
+#define WC_TABCONTROLW (const WCHAR []){ 'S','y','s', \
+ 'T','a','b','C','o','n','t','r','o','l','3','2',0 }
#define WC_TABCONTROL WINELIB_NAME_AW(WC_TABCONTROL)
@@ -3437,8 +3437,8 @@
/* ComboBoxEx control */
#define WC_COMBOBOXEXA "ComboBoxEx32"
-static const WCHAR WC_COMBOBOXEXW[] = { 'C','o','m','b','o',
- 'B','o','x','E','x','3','2',0 };
+#define WC_COMBOBOXEXW (const WCHAR []){ 'C','o','m','b','o', \
+ 'B','o','x','E','x','3','2',0 }
#define WC_COMBOBOXEX WINELIB_NAME_AW(WC_COMBOBOXEX)
#define CBEIF_TEXT 0x00000001
@@ -3601,8 +3601,8 @@
#define HOTKEY_CLASS16 "msctls_hotkey"
#define HOTKEY_CLASSA "msctls_hotkey32"
-static const WCHAR HOTKEY_CLASSW[] = { 'm','s','c','t','l','s','_',
- 'h','o','t','k','e','y','3','2',0 };
+#define HOTKEY_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \
+ 'h','o','t','k','e','y','3','2',0 }
#define HOTKEY_CLASS WINELIB_NAME_AW(HOTKEY_CLASS)
#define HOTKEYF_SHIFT 0x01
@@ -3627,8 +3627,8 @@
/* animate control */
#define ANIMATE_CLASSA "SysAnimate32"
-static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s',
- 'A','n','i','m','a','t','e','3','2',0 };
+#define ANIMATE_CLASSW (const WCHAR []){ 'S','y','s', \
+ 'A','n','i','m','a','t','e','3','2',0 }
#define ANIMATE_CLASS WINELIB_NAME_AW(ANIMATE_CLASS)
#define ACS_CENTER 0x0001
@@ -3675,8 +3675,8 @@
*/
#define WC_IPADDRESSA "SysIPAddress32"
-static const WCHAR WC_IPADDRESSW[] = { 'S','y','s',
- 'I','P','A','d','d','r','e','s','s','3','2',0 };
+#define WC_IPADDRESSW (const WCHAR []){ 'S','y','s', \
+ 'I','P','A','d','d','r','e','s','s','3','2',0 }
#define WC_IPADDRESS WINELIB_NAME_AW(WC_IPADDRESS)
#define IPM_CLEARADDRESS (WM_USER+100)
@@ -3713,8 +3713,8 @@
*/
#define WC_NATIVEFONTCTLA "NativeFontCtl"
-static const WCHAR WC_NATIVEFONTCTLW[] = { 'N','a','t','i','v','e',
- 'F','o','n','t','C','t','l',0 };
+#define WC_NATIVEFONTCTLW (const WCHAR []){ 'N','a','t','i','v','e', \
+ 'F','o','n','t','C','t','l',0 }
#define WC_NATIVEFONTCTL WINELIB_NAME_AW(WC_NATIVEFONTCTL)
#define NFS_EDIT 0x0001
@@ -3730,8 +3730,8 @@
*/
#define MONTHCAL_CLASSA "SysMonthCal32"
-static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s',
- 'M','o','n','t','h','C','a','l','3','2',0 };
+#define MONTHCAL_CLASSW (const WCHAR []){ 'S','y','s', \
+ 'M','o','n','t','h','C','a','l','3','2',0 }
#define MONTHCAL_CLASS WINELIB_NAME_AW(MONTHCAL_CLASS)
#define MCM_FIRST 0x1000
@@ -3893,8 +3893,8 @@
*/
#define DATETIMEPICK_CLASSA "SysDateTimePick32"
-static const WCHAR DATETIMEPICK_CLASSW[] = { 'S','y','s',
- 'D','a','t','e','T','i','m','e','P','i','c','k','3','2',0 };
+#define DATETIMEPICK_CLASSW (const WCHAR []){ 'S','y','s', \
+ 'D','a','t','e','T','i','m','e','P','i','c','k','3','2',0 }
#define DATETIMEPICK_CLASS WINELIB_NAME_AW(DATETIMEPICK_CLASS)
#define DTM_FIRST 0x1000
diff -u cvs/hq/wine/include/commdlg.h wine/include/commdlg.h
--- cvs/hq/wine/include/commdlg.h Sun Aug 18 21:20:52 2002
+++ wine/include/commdlg.h Sat Sep 14 22:04:09 2002
@@ -309,38 +309,38 @@
#define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102)
#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 LBSELCHSTRINGW (const WCHAR []){ '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 SHAREVISTRINGW (const WCHAR []){ '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 FILEOKSTRINGW (const WCHAR []){ '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 COLOROKSTRINGW (const WCHAR []){ '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 SETRGBSTRINGW (const WCHAR []){ '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 FINDMSGSTRINGW (const WCHAR []){ '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 HELPMSGSTRINGW (const WCHAR []){ 'c','o','m','m','d','l','g','_', \
+ 'H','e','l','p',0 }
#define HELPMSGSTRING WINELIB_NAME_AW(HELPMSGSTRING)
diff -u cvs/hq/wine/include/msacm.h wine/include/msacm.h
--- cvs/hq/wine/include/msacm.h Mon Jun 3 13:01:30 2002
+++ wine/include/msacm.h Sat Sep 14 22:05:38 2002
@@ -107,18 +107,18 @@
#define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L
#define ACMHELPMSGSTRINGA "acmchoose_help"
-static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m',
- 'c','h','o','o','s','e','_','h','e','l','p',0 };
+#define ACMHELPMSGSTRINGW (const WCHAR []){ 'a','c','m', \
+ 'c','h','o','o','s','e','_','h','e','l','p',0 }
#define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING)
#define ACMHELPMSGCONTEXTMENUA "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 ACMHELPMSGCONTEXTMENUW (const WCHAR []){ '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"
-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 ACMHELPMSGCONTEXTHELPW (const WCHAR []){ '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
diff -u cvs/hq/wine/include/prsht.h wine/include/prsht.h
--- cvs/hq/wine/include/prsht.h Mon Jun 3 13:01:31 2002
+++ wine/include/prsht.h Sat Sep 14 22:08:09 2002
@@ -34,8 +34,8 @@
#define WC_PROPSHEETA "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_PROPSHEETW (const WCHAR []){ '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 **/
diff -u cvs/hq/wine/include/richedit.h wine/include/richedit.h
--- cvs/hq/wine/include/richedit.h Sat Aug 10 18:03:34 2002
+++ wine/include/richedit.h Sat Sep 14 22:09:02 2002
@@ -33,7 +33,7 @@
#define cchTextLimitDefault 0x7fff
#define RICHEDIT_CLASS20A "RichEdit20A"
-static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W', '\0' };
+#define RICHEDIT_CLASS20W (const WCHAR []){ 'R','i','c','h','E','d','i','t','2','0','W',0 }
#define RICHEDIT_CLASS10A "RICHEDIT"
#if (_RICHEDIT_VER >= 0x0200 )
diff -u cvs/hq/wine/include/wincrypt.h wine/include/wincrypt.h
--- cvs/hq/wine/include/wincrypt.h Tue Sep 10 18:03:46 2002
+++ wine/include/wincrypt.h Sat Sep 14 22:17:55 2002
@@ -134,65 +134,65 @@
/* Provider names */
#define MS_DEF_PROV_A "Microsoft Base Cryptographic Provider v1.0"
-static const WCHAR MS_DEF_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'B','a','s','e',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ',
- 'P','r','o','v','i','d','e','r',' ','v','1','.','0',0 };
+#define MS_DEF_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'B','a','s','e',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ', \
+ 'P','r','o','v','i','d','e','r',' ','v','1','.','0',0 }
#define MS_DEF_PROV WINELIB_NAME_AW(MS_DEF_PROV_)
#define MS_ENHANCED_PROV_A "Microsoft Enhanced Cryptographic Provider "
-static const WCHAR MS_ENHANCED_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'E','n','h','a','n','c','e','d',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ',
- 'P','r','o','v','i','d','e','r',' ', 0 };
+#define MS_ENHANCED_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'E','n','h','a','n','c','e','d',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ', \
+ 'P','r','o','v','i','d','e','r',' ', 0 }
#define MS_ENHANCED_PROV WINELIB_NAME_AW(MS_ENHANCED_PROV_)
#define MS_STRONG_PROV_A "Microsoft Strong Cryptographic Provider"
-static const WCHAR MS_STRONG_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'S','t','r','o','n','g',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ',
- 'P','r','o','v','i','d','e','r',0 };
+#define MS_STRONG_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'S','t','r','o','n','g',' ','C','r','y','p','t','o','g','r','a','p','h','i','c',' ', \
+ 'P','r','o','v','i','d','e','r',0 }
#define MS_STRONG_PROV WINELIB_NAME_AW(MS_STRONG_PROV_)
#define MS_DEF_RSA_SIG_PROV_A "Microsoft RSA Signature Cryptographic Provider"
-static const WCHAR MS_DEF_RSA_SIG_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'R','S','A',' ','S','i','g','n','a','t','u','r','e',' ',
- 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 };
+#define MS_DEF_RSA_SIG_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'R','S','A',' ','S','i','g','n','a','t','u','r','e',' ', \
+ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }
#define MS_DEF_RSA_SIG_PROV WINELIB_NAME_AW(MS_DEF_RSA_SIG_PROV_)
#define MS_DEF_RSA_SCHANNEL_PROV_A "Microsoft RSA SChannel Cryptographic Provider"
-static const WCHAR MS_DEF_RSA_SCHANNEL_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'R','S','A',' ','S','C','h','a','n','n','e','l',' ',
- 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 };
+#define MS_DEF_RSA_SCHANNEL_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'R','S','A',' ','S','C','h','a','n','n','e','l',' ', \
+ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }
#define MS_DEF_RSA_SCHANNEL_PROV WINELIB_NAME_AW(MS_DEF_RSA_SCHANNEL_PROV_)
#define MS_DEF_DSS_PROV_A "Microsoft Base DSS Cryptographic Provider"
-static const WCHAR MS_DEF_DSS_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'B','a','s','e',' ','D','S','S',' ',
- 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 };
+#define MS_DEF_DSS_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'B','a','s','e',' ','D','S','S',' ', \
+ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }
#define MS_DEF_DSS_PROV WINELIB_NAME_AW(MS_DEF_DSS_PROV_)
#define MS_DEF_DSS_DH_PROV_A "Microsoft Base DSS and Diffie-Hellman Cryptographic Provider"
-static const WCHAR MS_DEF_DSS_DH_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'B','a','s','e',' ','D','S','S',' ','a','n','d',' ',
- 'D','i','f','f','i','e','-','H','e','l','l','m','a','n',' ',
- 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 };
+#define MS_DEF_DSS_DH_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'B','a','s','e',' ','D','S','S',' ','a','n','d',' ', \
+ 'D','i','f','f','i','e','-','H','e','l','l','m','a','n',' ', \
+ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }
#define MS_DEF_DSS_DH_PROV WINELIB_NAME_AW(MS_DEF_DSS_DH_PROV_)
#define MS_ENH_DSS_DH_PROV_A "Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider"
-static const WCHAR MS_ENH_DSS_DH_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'E','n','h','a','n','c','e','d',' ','D','S','S',' ','a','n','d',' ',
- 'D','i','f','f','i','e','-','H','e','l','l','m','a','n',' ',
- 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 };
+#define MS_ENH_DSS_DH_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'E','n','h','a','n','c','e','d',' ','D','S','S',' ','a','n','d',' ', \
+ 'D','i','f','f','i','e','-','H','e','l','l','m','a','n',' ', \
+ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }
#define MS_ENH_DSS_DH_PROV WINELIB_NAME_AW(MS_ENH_DSS_DH_PROV_)
#define MS_DEF_DH_SCHANNEL_PROV_A "Microsoft DH SChannel Cryptographic Provider"
-static const WCHAR MS_DEF_DH_SCHANNEL_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'D','H',' ','S','C','h','a','n','n','e','l',' ',
- 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 };
+#define MS_DEF_DH_SCHANNEL_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'D','H',' ','S','C','h','a','n','n','e','l',' ', \
+ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }
#define MS_DEF_DH_SCHANNEL_PROV WINELIB_NAME_AW(MS_DEF_DH_SCHANNEL_PROV_)
#define MS_SCARD_PROV_A "Microsoft Base Smart Card Cryptographic Provider"
-static const WCHAR MS_SCARD_PROV_W[] = { 'M','i','c','r','o','s','o','f','t',' ',
- 'B','a','s','e',' ','S','m','a','r','t',' ','C','a','r','d',' ',
- 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 };
+#define MS_SCARD_PROV_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \
+ 'B','a','s','e',' ','S','m','a','r','t',' ','C','a','r','d',' ', \
+ 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',0 }
#define MS_SCARD_PROV WINELIB_NAME_AW(MS_SCARD_PROV_)
/* Key Specs*/
diff -u cvs/hq/wine/include/wine/obj_contextmenu.h wine/include/wine/obj_contextmenu.h
--- cvs/hq/wine/include/wine/obj_contextmenu.h Mon Jun 3 13:01:34 2002
+++ wine/include/wine/obj_contextmenu.h Sat Sep 14 22:07:18 2002
@@ -58,9 +58,9 @@
#define CMDSTR_NEWFOLDERA "NewFolder"
#define CMDSTR_VIEWLISTA "ViewList"
#define CMDSTR_VIEWDETAILSA "ViewDetails"
-static const WCHAR CMDSTR_NEWFOLDERW[] = {'N','e','w','F','o','l','d','e','r',0};
-static const WCHAR CMDSTR_VIEWLISTW [] = {'V','i','e','w','L','i','s','t',0};
-static const WCHAR CMDSTR_VIEWDETAILSW[] = {'V','i','e','w','D','e','t','a','i','l','s',0};
+#define CMDSTR_NEWFOLDERW (const WCHAR []){ 'N','e','w','F','o','l','d','e','r',0 }
+#define CMDSTR_VIEWLISTW (const WCHAR []){ 'V','i','e','w','L','i','s','t',0 }
+#define CMDSTR_VIEWDETAILSW (const WCHAR []){ 'V','i','e','w','D','e','t','a','i','l','s',0 }
#define CMDSTR_NEWFOLDER CMDSTR_NEWFOLDERA
#define CMDSTR_VIEWLIST CMDSTR_VIEWLISTA
