From a9c057f73bd8d234b6bddea67afd99ca3dd18647 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Mon, 16 Sep 2002 19:29:36 +0000 Subject: [PATCH] Replace static initializers with a proper #define in .h files. --- include/commctrl.h | 139 ++++++++++++++++++++++++++++++++- include/commdlg.h | 49 ++++++++++++ include/msacm.h | 23 +++++- include/prsht.h | 7 ++ include/richedit.h | 8 +- include/wincrypt.h | 86 +++++++++++++++++++- include/wine/obj_contextmenu.h | 10 +++ 7 files changed, 316 insertions(+), 6 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index e25b98d139d..84fe4211dea 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -265,8 +265,15 @@ typedef struct tagNMTTCUSTOMDRAW #define STATUSCLASSNAME16 "msctls_statusbar" #define STATUSCLASSNAMEA "msctls_statusbar32" +#if defined(__GNUC__) +# define STATUSCLASSNAMEW (const WCHAR []){ 'm','s','c','t','l','s','_', \ + 's','t','a','t','u','s','b','a','r','3','2',0 } +#elif defined(_MSC_VER) +# define STATUSCLASSNAMEW L"msctls_statusbar32" +#else static const WCHAR STATUSCLASSNAMEW[] = { 'm','s','c','t','l','s','_', 's','t','a','t','u','s','b','a','r','3','2',0 }; +#endif #define STATUSCLASSNAME WINELIB_NAME_AW(STATUSCLASSNAME) #define SBT_NOBORDERS 0x0100 @@ -358,8 +365,15 @@ INT WINAPI LBItemFromPt (HWND, POINT, BOOL); #define UPDOWN_CLASS16 "msctls_updown" #define UPDOWN_CLASSA "msctls_updown32" +#if defined(__GNUC__) +# define UPDOWN_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ + 'u','p','d','o','w','n','3','2',0 } +#elif defined(_MSC_VER) +# define UPDOWN_CLASSW L"msctls_updown32" +#else static const WCHAR UPDOWN_CLASSW[] = { 'm','s','c','t','l','s','_', 'u','p','d','o','w','n','3','2',0 }; +#endif #define UPDOWN_CLASS WINELIB_NAME_AW(UPDOWN_CLASS) typedef struct tagUDACCEL @@ -421,8 +435,15 @@ HWND WINAPI CreateUpDownControl (DWORD, INT, INT, INT, INT, #define PROGRESS_CLASS16 "msctls_progress" #define PROGRESS_CLASSA "msctls_progress32" +#if defined(__GNUC__) +# define PROGRESS_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ + 'p','r','o','g','r','e','s','s','3','2',0 } +#elif defined(_MSC_VER) +# define PROGRESS_CLASSW L"msctls_progress32" +#else static const WCHAR PROGRESS_CLASSW[] = { 'm','s','c','t','l','s','_', 'p','r','o','g','r','e','s','s','3','2',0 }; +#endif #define PROGRESS_CLASS WINELIB_NAME_AW(PROGRESS_CLASS) #define PBM_SETRANGE (WM_USER+1) @@ -613,8 +634,15 @@ _TrackMouseEvent( #define FLATSB_CLASS16 "flatsb_class" #define FLATSB_CLASSA "flatsb_class32" +#if defined(__GNUC__) +# define FLATSB_CLASSW (const WCHAR []){ 'f','l','a','t','s','b','_', \ + 'c','l','a','s','s','3','2',0 } +#elif defined(_MSC_VER) +# define FLATSB_CLASSW L"flatsb_class32" +#else static const WCHAR FLATSB_CLASSW[] = { 'f','l','a','t','s','b','_', 'c','l','a','s','s','3','2',0 }; +#endif #define FLATSB_CLASS WINELIB_NAME_AW(FLATSB_CLASS) #define WSB_PROP_CYVSCROLL 0x00000001L @@ -654,7 +682,13 @@ HRESULT WINAPI UninitializeFlatSB(HWND); #define WC_HEADER16 "SysHeader" #define WC_HEADERA "SysHeader32" +#if defined(__GNUC__) +# define WC_HEADERW (const WCHAR []){ 'S','y','s','H','e','a','d','e','r','3','2',0 } +#elif defined(_MSC_VER) +# define WC_HEADERW L"SysHeader32" +#else static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2',0 }; +#endif #define WC_HEADER WINELIB_NAME_AW(WC_HEADER) #define HDS_HORZ 0x0000 @@ -900,8 +934,15 @@ typedef struct tagNMHDDISPINFOW #define TOOLBARCLASSNAME16 "ToolbarWindow" #define TOOLBARCLASSNAMEA "ToolbarWindow32" +#if defined(__GNUC__) +# define TOOLBARCLASSNAMEW (const WCHAR []){ 'T','o','o','l','b','a','r', \ + 'W','i','n','d','o','w','3','2',0 } +#elif defined(_MSC_VER) +# define TOOLBARCLASSNAMEW L"ToolbarWindow32" +#else static const WCHAR TOOLBARCLASSNAMEW[] = { 'T','o','o','l','b','a','r', 'W','i','n','d','o','w','3','2',0 }; +#endif #define TOOLBARCLASSNAME WINELIB_NAME_AW(TOOLBARCLASSNAME) #define CMB_MASKED 0x02 @@ -1388,8 +1429,15 @@ CreateMappedBitmap (HINSTANCE, INT, UINT, LPCOLORMAP, INT); #define TOOLTIPS_CLASS16 "tooltips_class" #define TOOLTIPS_CLASSA "tooltips_class32" +#if defined(__GNUC__) +# define TOOLTIPS_CLASSW (const WCHAR []){ 't','o','o','l','t','i','p','s','_', \ + 'c','l','a','s','s','3','2',0 } +#elif defined(_MSC_VER) +# define TOOLTIPS_CLASSW L"tooltips_class32" +#else static const WCHAR TOOLTIPS_CLASSW[] = { 't','o','o','l','t','i','p','s','_', 'c','l','a','s','s','3','2',0 }; +#endif #define TOOLTIPS_CLASS WINELIB_NAME_AW(TOOLTIPS_CLASS) #define INFOTIPSIZE 1024 @@ -1567,8 +1615,15 @@ typedef struct tagNMTTDISPINFOW #define REBARCLASSNAME16 "ReBarWindow" #define REBARCLASSNAMEA "ReBarWindow32" +#if defined(__GNUC__) +# define REBARCLASSNAMEW (const WCHAR []){ 'R','e','B','a','r', \ + 'W','i','n','d','o','w','3','2',0 } +#elif defined(_MSC_VER) +# define REBARCLASSNAMEW L"ReBarWindow32" +#else static const WCHAR REBARCLASSNAMEW[] = { 'R','e','B','a','r', 'W','i','n','d','o','w','3','2',0 }; +#endif #define REBARCLASSNAME WINELIB_NAME_AW(REBARCLASSNAME) #define RBS_TOOLTIPS 0x0100 @@ -1776,8 +1831,15 @@ typedef struct _RB_HITTESTINFO #define TRACKBAR_CLASS16 "msctls_trackbar" #define TRACKBAR_CLASSA "msctls_trackbar32" +#if defined(__GNUC__) +# define TRACKBAR_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ + 't','r','a','c','k','b','a','r','3','2',0 } +#elif defined(_MSC_VER) +# define TRACKBAR_CLASSW L"msctls_trackbar32" +#else static const WCHAR TRACKBAR_CLASSW[] = { 'm','s','c','t','l','s','_', 't','r','a','c','k','b','a','r','3','2',0 }; +#endif #define TRACKBAR_CLASS WINELIB_NAME_AW(TRACKBAR_CLASS) #define TBS_AUTOTICKS 0x0001 @@ -1855,7 +1917,13 @@ static const WCHAR TRACKBAR_CLASSW[] = { 'm','s','c','t','l','s','_', /* Pager control */ #define WC_PAGESCROLLERA "SysPager" +#if defined(__GNUC__) +# define WC_PAGESCROLLERW (const WCHAR []){ 'S','y','s','P','a','g','e','r',0 } +#elif defined(_MSC_VER) +# define WC_PAGESCROLLERW L"SysPager" +#else static const WCHAR WC_PAGESCROLLERW[] = { 'S','y','s','P','a','g','e','r',0 }; +#endif #define WC_PAGESCROLLER WINELIB_NAME_AW(WC_PAGESCROLLER) #define PGS_VERT 0x00000000 @@ -1933,8 +2001,15 @@ typedef struct /* Treeview control */ #define WC_TREEVIEWA "SysTreeView32" +#if defined(__GNUC__) +# define WC_TREEVIEWW (const WCHAR []){ 'S','y','s', \ + 'T','r','e','e','V','i','e','w','3','2',0 } +#elif defined(_MSC_VER) +# define WC_TREEVIEWW L"SysTreeView32" +#else static const WCHAR WC_TREEVIEWW[] = { 'S','y','s', 'T','r','e','e','V','i','e','w','3','2',0 }; +#endif #define WC_TREEVIEW WINELIB_NAME_AW(WC_TREEVIEW) #define TVSIL_NORMAL 0 @@ -2537,8 +2612,15 @@ typedef struct tagTVKEYDOWN /* Listview control */ #define WC_LISTVIEWA "SysListView32" +#if defined(__GNUC__) +# define WC_LISTVIEWW (const WCHAR []){ 'S','y','s', \ + 'L','i','s','t','V','i','e','w','3','2',0 } +#elif defined(_MSC_VER) +# define WC_LISTVIEWW L"SysListView32" +#else static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', 'L','i','s','t','V','i','e','w','3','2',0 }; +#endif #define WC_LISTVIEW WINELIB_NAME_AW(WC_LISTVIEW) #define LVSCW_AUTOSIZE -1 @@ -3245,9 +3327,15 @@ typedef struct tagNMLVODSTATECHANGE #define WC_TABCONTROL16 "SysTabControl" #define WC_TABCONTROLA "SysTabControl32" +#if defined(__GNUC__) +# define WC_TABCONTROLW (const WCHAR []){ 'S','y','s', \ + 'T','a','b','C','o','n','t','r','o','l','3','2',0 } +#elif defined(_MSC_VER) +# define WC_TABCONTROLW L"SysTabControl32" +#else static const WCHAR WC_TABCONTROLW[] = { 'S','y','s', 'T','a','b','C','o','n','t','r','o','l','3','2',0 }; - +#endif #define WC_TABCONTROL WINELIB_NAME_AW(WC_TABCONTROL) /* tab control styles */ @@ -3437,8 +3525,15 @@ typedef struct tagTCKEYDOWN /* ComboBoxEx control */ #define WC_COMBOBOXEXA "ComboBoxEx32" +#if defined(__GNUC__) +# define WC_COMBOBOXEXW (const WCHAR []){ 'C','o','m','b','o', \ + 'B','o','x','E','x','3','2',0 } +#elif defined(_MSC_VER) +# define WC_COMBOBOXEXW L"ComboBoxEx32" +#else static const WCHAR WC_COMBOBOXEXW[] = { 'C','o','m','b','o', 'B','o','x','E','x','3','2',0 }; +#endif #define WC_COMBOBOXEX WINELIB_NAME_AW(WC_COMBOBOXEX) #define CBEIF_TEXT 0x00000001 @@ -3601,8 +3696,15 @@ typedef struct #define HOTKEY_CLASS16 "msctls_hotkey" #define HOTKEY_CLASSA "msctls_hotkey32" +#if defined(__GNUC__) +# define HOTKEY_CLASSW (const WCHAR []){ 'm','s','c','t','l','s','_', \ + 'h','o','t','k','e','y','3','2',0 } +#elif defined(_MSC_VER) +# define HOTKEY_CLASSW L"msctls_hotkey32" +#else static const WCHAR HOTKEY_CLASSW[] = { 'm','s','c','t','l','s','_', 'h','o','t','k','e','y','3','2',0 }; +#endif #define HOTKEY_CLASS WINELIB_NAME_AW(HOTKEY_CLASS) #define HOTKEYF_SHIFT 0x01 @@ -3627,8 +3729,15 @@ static const WCHAR HOTKEY_CLASSW[] = { 'm','s','c','t','l','s','_', /* animate control */ #define ANIMATE_CLASSA "SysAnimate32" +#if defined(__GNUC__) +# define ANIMATE_CLASSW (const WCHAR []){ 'S','y','s', \ + 'A','n','i','m','a','t','e','3','2',0 } +#elif defined(_MSC_VER) +# define ANIMATE_CLASSW L"SysAnimate32" +#else static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s', 'A','n','i','m','a','t','e','3','2',0 }; +#endif #define ANIMATE_CLASS WINELIB_NAME_AW(ANIMATE_CLASS) #define ACS_CENTER 0x0001 @@ -3675,8 +3784,15 @@ static const WCHAR ANIMATE_CLASSW[] = { 'S','y','s', */ #define WC_IPADDRESSA "SysIPAddress32" +#if defined(__GNUC__) +# define WC_IPADDRESSW (const WCHAR []){ 'S','y','s', \ + 'I','P','A','d','d','r','e','s','s','3','2',0 } +#elif defined(_MSC_VER) +# define WC_IPADDRESSW L"SysIPAddress32" +#else static const WCHAR WC_IPADDRESSW[] = { 'S','y','s', 'I','P','A','d','d','r','e','s','s','3','2',0 }; +#endif #define WC_IPADDRESS WINELIB_NAME_AW(WC_IPADDRESS) #define IPM_CLEARADDRESS (WM_USER+100) @@ -3713,8 +3829,15 @@ typedef struct tagNMIPADDRESS */ #define WC_NATIVEFONTCTLA "NativeFontCtl" +#if defined(__GNUC__) +# define WC_NATIVEFONTCTLW (const WCHAR []){ 'N','a','t','i','v','e', \ + 'F','o','n','t','C','t','l',0 } +#elif defined(_MSC_VER) +# define WC_NATIVEFONTCTLW L"NativeFontCtl" +#else static const WCHAR WC_NATIVEFONTCTLW[] = { 'N','a','t','i','v','e', 'F','o','n','t','C','t','l',0 }; +#endif #define WC_NATIVEFONTCTL WINELIB_NAME_AW(WC_NATIVEFONTCTL) #define NFS_EDIT 0x0001 @@ -3730,8 +3853,15 @@ static const WCHAR WC_NATIVEFONTCTLW[] = { 'N','a','t','i','v','e', */ #define MONTHCAL_CLASSA "SysMonthCal32" +#if defined(__GNUC__) +# define MONTHCAL_CLASSW (const WCHAR []){ 'S','y','s', \ + 'M','o','n','t','h','C','a','l','3','2',0 } +#elif defined(_MSC_VER) +# define MONTHCAL_CLASSW L"SysMonthCal32" +#else static const WCHAR MONTHCAL_CLASSW[] = { 'S','y','s', 'M','o','n','t','h','C','a','l','3','2',0 }; +#endif #define MONTHCAL_CLASS WINELIB_NAME_AW(MONTHCAL_CLASS) #define MCM_FIRST 0x1000 @@ -3893,8 +4023,15 @@ typedef struct tagNMDAYSTATE */ #define DATETIMEPICK_CLASSA "SysDateTimePick32" +#if defined(__GNUC__) +# define DATETIMEPICK_CLASSW (const WCHAR []){ 'S','y','s', \ + 'D','a','t','e','T','i','m','e','P','i','c','k','3','2',0 } +#elif defined(_MSC_VER) +# define DATETIMEPICK_CLASSW L"SysDateTimePick32" +#else static const WCHAR DATETIMEPICK_CLASSW[] = { 'S','y','s', 'D','a','t','e','T','i','m','e','P','i','c','k','3','2',0 }; +#endif #define DATETIMEPICK_CLASS WINELIB_NAME_AW(DATETIMEPICK_CLASS) #define DTM_FIRST 0x1000 diff --git a/include/commdlg.h b/include/commdlg.h index c70cd2185d0..cb19da016af 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -309,38 +309,87 @@ DECL_WINELIB_TYPE_AW(LPCHOOSEFONT) #define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102) #define LBSELCHSTRINGA "commdlg_LBSelChangedNotify" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define LBSELCHSTRINGW L"commdlg_LBSelChangedNotify" +#else 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 }; +#endif #define LBSELCHSTRING WINELIB_NAME_AW(LBSELCHSTRING) #define SHAREVISTRINGA "commdlg_ShareViolation" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define SHAREVISTRINGW L"commdlg_ShareViolation" +#else 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 }; +#endif #define SHAREVISTRING WINELIB_NAME_AW(SHAREVISTRING) #define FILEOKSTRINGA "commdlg_FileNameOK" +#if defined(__GNUC__) +# define FILEOKSTRINGW (const WCHAR []){ 'c','o','m','m','d','l','g','_', \ + 'F','i','l','e','N','a','m','e','O','K',0 } +#elif defined(_MSC_VER) +# define FILEOKSTRINGW L"commdlg_FileNameOK" +#else static const WCHAR FILEOKSTRINGW[] = { 'c','o','m','m','d','l','g','_', 'F','i','l','e','N','a','m','e','O','K',0 }; +#endif #define FILEOKSTRING WINELIB_NAME_AW(FILEOKSTRING) #define COLOROKSTRINGA "commdlg_ColorOK" +#if defined(__GNUC__) +# define COLOROKSTRINGW (const WCHAR []){ 'c','o','m','m','d','l','g','_', \ + 'C','o','l','o','r','O','K',0 } +#elif defined(_MSC_VER) +# define COLOROKSTRINGW L"commdlg_ColorOK" +#else static const WCHAR COLOROKSTRINGW[] = { 'c','o','m','m','d','l','g','_', 'C','o','l','o','r','O','K',0 }; +#endif #define COLOROKSTRING WINELIB_NAME_AW(COLOROKSTRING) #define SETRGBSTRINGA "commdlg_SetRGBColor" +#if defined(__GNUC__) +# define SETRGBSTRINGW (const WCHAR []){ 'c','o','m','m','d','l','g','_', \ + 'S','e','t','R','G','B','C','o','l','o','r',0 } +#elif defined(_MSC_VER) +# define SETRGBSTRINGW L"commdlg_SetRGBColor" +#else static const WCHAR SETRGBSTRINGW[] = { 'c','o','m','m','d','l','g','_', 'S','e','t','R','G','B','C','o','l','o','r',0 }; +#endif #define SETRGBSTRING WINELIB_NAME_AW(SETRGBSTRING) #define FINDMSGSTRINGA "commdlg_FindReplace" +#if defined(__GNUC__) +# define FINDMSGSTRINGW (const WCHAR []){ 'c','o','m','m','d','l','g','_', \ + 'F','i','n','d','R','e','p','l','a','c','e',0 } +#elif defined(_MSC_VER) +# define FINDMSGSTRINGW L"commdlg_FindReplace" +#else static const WCHAR FINDMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', 'F','i','n','d','R','e','p','l','a','c','e',0 }; +#endif #define FINDMSGSTRING WINELIB_NAME_AW(FINDMSGSTRING) #define HELPMSGSTRINGA "commdlg_help" +#if defined(__GNUC__) +# define HELPMSGSTRINGW (const WCHAR []){ 'c','o','m','m','d','l','g','_', \ + 'H','e','l','p',0 } +#elif defined(_MSC_VER) +# define HELPMSGSTRINGW L"commdlg_help" +#else static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', 'H','e','l','p',0 }; +#endif #define HELPMSGSTRING WINELIB_NAME_AW(HELPMSGSTRING) diff --git a/include/msacm.h b/include/msacm.h index 2eeeec819c6..1fb7a05eabe 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -107,18 +107,39 @@ extern "C" { #define ACM_FILTERENUMF_DWFILTERTAG 0x00010000L #define ACMHELPMSGSTRINGA "acmchoose_help" +#if defined(__GNUC__) +# define ACMHELPMSGSTRINGW (const WCHAR []){ 'a','c','m', \ + 'c','h','o','o','s','e','_','h','e','l','p',0 } +#elif defined(_MSC_VER) +# define ACMHELPMSGSTRINGW L"acmchoose_help" +#else static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m', 'c','h','o','o','s','e','_','h','e','l','p',0 }; +#endif #define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING) #define ACMHELPMSGCONTEXTMENUA "acmchoose_contextmenu" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define ACMHELPMSGCONTEXTMENUW L"acmchoose_contextmenu" +#else 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 }; +#endif #define ACMHELPMSGCONTEXTMENU WINELIB_NAME_AW(ACMHELPMSGCONTEXTMENU) #define ACMHELPMSGCONTEXTHELPA "acmchoose_contexthelp" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define ACMHELPMSGCONTEXTHELPW L"acmchoose_contexthelp" +#else 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 }; +#endif #define ACMHELPMSGCONTEXTHELP WINELIB_NAME_AW(ACMHELPMSGCONTEXTHELP) #define MM_ACM_FORMATCHOOSE 0x8000 @@ -756,5 +777,3 @@ MMRESULT WINAPI acmStreamUnprepareHeader( #endif /* defined(__cplusplus) */ #endif /* __WINE_MSACM_H */ - - diff --git a/include/prsht.h b/include/prsht.h index 0e3f9a008fc..790c113c043 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -34,8 +34,15 @@ extern "C" { #define WC_PROPSHEETA "SysPropertySheet" +#if defined(__GNUC__) +# define WC_PROPSHEETW (const WCHAR []){ 'S','y','s', \ + 'P','r','o','p','e','r','t','y','S','h','e','e','t',0 } +#elif defined(_MSC_VER) +# define WC_PROPSHEETW L"SysPropertySheet" +#else static const WCHAR WC_PROPSHEETW[] = { 'S','y','s', 'P','r','o','p','e','r','t','y','S','h','e','e','t',0 }; +#endif #define WC_PROPSHEET WINELIB_NAME_AW(WC_PROPSHEET) struct _PROPSHEETPAGEA; /** need to forward declare those structs **/ diff --git a/include/richedit.h b/include/richedit.h index c1de5d8bab6..eb11349a5ef 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -33,7 +33,13 @@ extern "C" { #define cchTextLimitDefault 0x7fff #define RICHEDIT_CLASS20A "RichEdit20A" -static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W', '\0' }; +#if defined(__GNUC__) +# define RICHEDIT_CLASS20W (const WCHAR []){ 'R','i','c','h','E','d','i','t','2','0','W',0 } +#elif defined(_MSC_VER) +# define RICHEDIT_CLASS20W L"RichEdit20W" +#else +static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 }; +#endif #define RICHEDIT_CLASS10A "RICHEDIT" #if (_RICHEDIT_VER >= 0x0200 ) diff --git a/include/wincrypt.h b/include/wincrypt.h index cf87d26b38b..f3d94718c9b 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -134,65 +134,147 @@ typedef struct _PUBLICKEYSTRUC { /* Provider names */ #define MS_DEF_PROV_A "Microsoft Base Cryptographic Provider v1.0" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_DEF_PROV_W L"Microsoft Base Cryptographic Provider v1.0" +#else 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 }; +#endif #define MS_DEF_PROV WINELIB_NAME_AW(MS_DEF_PROV_) -#define MS_ENHANCED_PROV_A "Microsoft Enhanced Cryptographic Provider " +#define MS_ENHANCED_PROV_A "Microsoft Enhanced Cryptographic Provider v1.0" +#if defined(__GNUC__) +# 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',' ','v','1','.','0',0 } +#elif defined(_MSC_VER) +# define MS_ENHANCED_PROV_W L"Microsoft Enhanced Cryptographic Provider v1.0" +#else 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 }; + 'P','r','o','v','i','d','e','r',' ','v','1','.','0',0 }; +#endif #define MS_ENHANCED_PROV WINELIB_NAME_AW(MS_ENHANCED_PROV_) #define MS_STRONG_PROV_A "Microsoft Strong Cryptographic Provider" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_STRONG_PROV_W L"Microsoft Strong Cryptographic Provider" +#else 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 }; +#endif #define MS_STRONG_PROV WINELIB_NAME_AW(MS_STRONG_PROV_) #define MS_DEF_RSA_SIG_PROV_A "Microsoft RSA Signature Cryptographic Provider" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_DEF_RSA_SIG_PROV_W L"Microsoft RSA Signature Cryptographic Provider" +#else 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 }; +#endif #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" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_DEF_RSA_SCHANNEL_PROV_W L"Microsoft RSA SChannel Cryptographic Provider" +#else 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 }; +#endif #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" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_DEF_DSS_PROV_W L"Microsoft Base DSS Cryptographic Provider" +#else 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 }; +#endif #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" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_DEF_DSS_DH_PROV_W L"Microsoft Base DSS and Diffie-Hellman Cryptographic Provider" +#else 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 }; +#endif #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" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_ENH_DSS_DH_PROV_W L"Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider" +#else 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 }; +#endif #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" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_DEF_DH_SCHANNEL_PROV_W L"Microsoft DH SChannel Cryptographic Provider" +#else 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 }; +#endif #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" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define MS_SCARD_PROV_W L"Microsoft Base Smart Card Cryptographic Provider" +#else 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 }; +#endif #define MS_SCARD_PROV WINELIB_NAME_AW(MS_SCARD_PROV_) /* Key Specs*/ diff --git a/include/wine/obj_contextmenu.h b/include/wine/obj_contextmenu.h index 2ccedaa2046..b687589a242 100644 --- a/include/wine/obj_contextmenu.h +++ b/include/wine/obj_contextmenu.h @@ -58,9 +58,19 @@ typedef struct IContextMenu IContextMenu, *LPCONTEXTMENU; #define CMDSTR_NEWFOLDERA "NewFolder" #define CMDSTR_VIEWLISTA "ViewList" #define CMDSTR_VIEWDETAILSA "ViewDetails" +#if defined(__GNUC__) +# 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 } +#elif defined(_MSC_VER) +# define CMDSTR_NEWFOLDERW L"NewFolder" +# define CMDSTR_VIEWLISTW L"ViewList" +# define CMDSTR_VIEWDETAILSW L"ViewDetails" +#else 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}; +#endif #define CMDSTR_NEWFOLDER CMDSTR_NEWFOLDERA #define CMDSTR_VIEWLIST CMDSTR_VIEWLISTA