Commit 9afc341c authored by Martin Liska's avatar Martin Liska Committed by Alexandre Julliard

include: Avoid compound literals for WCHAR strings.

Starting from GCC 9, compound liferal's scope has changed: https://www.gnu.org/software/gcc/gcc-9/porting_to.html#complitSigned-off-by: 's avatarMartin Liska <mliska@suse.cz> Signed-off-by: 's avatarMarcus Meissner <meissner@suse.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 8ffd8916
...@@ -189,16 +189,18 @@ typedef struct WLDAP32_berval ...@@ -189,16 +189,18 @@ typedef struct WLDAP32_berval
} LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL, WLDAP32_BerValue; } LDAP_BERVAL, *PLDAP_BERVAL, BERVAL, *PBERVAL, WLDAP32_BerValue;
#define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319" #define LDAP_PAGED_RESULT_OID_STRING "1.2.840.113556.1.4.319"
#define LDAP_PAGED_RESULT_OID_STRING_W (const WCHAR []){'1','.','2','.', \
'8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0}
#define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474" #define LDAP_SERVER_RESP_SORT_OID "1.2.840.113556.1.4.474"
#define LDAP_SERVER_RESP_SORT_OID_W (const WCHAR []){'1','.','2','.', \
'8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0}
#define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10" #define LDAP_CONTROL_VLVRESPONSE "2.16.840.1.113730.3.4.10"
#define LDAP_CONTROL_VLVRESPONSE_W (const WCHAR []){'2','.','1','6','.', \
'8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0} #if defined(_MSC_VER) || defined(__MINGW32__)
#define LDAP_PAGED_RESULT_OID_STRING_W L"1.2.840.113556.1.4.319"
#define LDAP_SERVER_RESP_SORT_OID_W L"1.2.840.113556.1.4.474"
#define LDAP_CONTROL_VLVRESPONSE_W L"2.16.840.1.113730.3.4.10"
#else
static const WCHAR LDAP_PAGED_RESULT_OID_STRING_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','3','1','9',0};
static const WCHAR LDAP_SERVER_RESP_SORT_OID_W[] = {'1','.','2','.','8','4','0','.','1','1','3','5','5','6','.','1','.','4','.','4','7','4',0};
static const WCHAR LDAP_CONTROL_VLVRESPONSE_W[] = {'2','.','1','6','.','8','4','0','.','1','.','1','1','3','7','3','0','.','3','.','4','.','1','0',0};
#endif
typedef struct ldapcontrolA typedef struct ldapcontrolA
{ {
......
...@@ -358,10 +358,7 @@ DECL_WINELIB_TYPE_AW(LPCHOOSEFONT) ...@@ -358,10 +358,7 @@ DECL_WINELIB_TYPE_AW(LPCHOOSEFONT)
#define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102) #define WM_CHOOSEFONT_SETFLAGS (WM_USER + 102)
#define LBSELCHSTRINGA "commdlg_LBSelChangedNotify" #define LBSELCHSTRINGA "commdlg_LBSelChangedNotify"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define LBSELCHSTRINGW L"commdlg_LBSelChangedNotify"
#else #else
static const WCHAR LBSELCHSTRINGW[] = { 'c','o','m','m','d','l','g','_', static const WCHAR LBSELCHSTRINGW[] = { 'c','o','m','m','d','l','g','_',
...@@ -370,10 +367,7 @@ static const WCHAR LBSELCHSTRINGW[] = { 'c','o','m','m','d','l','g','_', ...@@ -370,10 +367,7 @@ static const WCHAR LBSELCHSTRINGW[] = { 'c','o','m','m','d','l','g','_',
#define LBSELCHSTRING WINELIB_NAME_AW(LBSELCHSTRING) #define LBSELCHSTRING WINELIB_NAME_AW(LBSELCHSTRING)
#define SHAREVISTRINGA "commdlg_ShareViolation" #define SHAREVISTRINGA "commdlg_ShareViolation"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define SHAREVISTRINGW L"commdlg_ShareViolation"
#else #else
static const WCHAR SHAREVISTRINGW[] = { 'c','o','m','m','d','l','g','_', static const WCHAR SHAREVISTRINGW[] = { 'c','o','m','m','d','l','g','_',
...@@ -382,10 +376,7 @@ static const WCHAR SHAREVISTRINGW[] = { 'c','o','m','m','d','l','g','_', ...@@ -382,10 +376,7 @@ static const WCHAR SHAREVISTRINGW[] = { 'c','o','m','m','d','l','g','_',
#define SHAREVISTRING WINELIB_NAME_AW(SHAREVISTRING) #define SHAREVISTRING WINELIB_NAME_AW(SHAREVISTRING)
#define FILEOKSTRINGA "commdlg_FileNameOK" #define FILEOKSTRINGA "commdlg_FileNameOK"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define FILEOKSTRINGW L"commdlg_FileNameOK"
#else #else
static const WCHAR FILEOKSTRINGW[] = { 'c','o','m','m','d','l','g','_', static const WCHAR FILEOKSTRINGW[] = { 'c','o','m','m','d','l','g','_',
...@@ -394,10 +385,7 @@ static const WCHAR FILEOKSTRINGW[] = { 'c','o','m','m','d','l','g','_', ...@@ -394,10 +385,7 @@ static const WCHAR FILEOKSTRINGW[] = { 'c','o','m','m','d','l','g','_',
#define FILEOKSTRING WINELIB_NAME_AW(FILEOKSTRING) #define FILEOKSTRING WINELIB_NAME_AW(FILEOKSTRING)
#define COLOROKSTRINGA "commdlg_ColorOK" #define COLOROKSTRINGA "commdlg_ColorOK"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define COLOROKSTRINGW L"commdlg_ColorOK"
#else #else
static const WCHAR COLOROKSTRINGW[] = { 'c','o','m','m','d','l','g','_', static const WCHAR COLOROKSTRINGW[] = { 'c','o','m','m','d','l','g','_',
...@@ -406,10 +394,7 @@ static const WCHAR COLOROKSTRINGW[] = { 'c','o','m','m','d','l','g','_', ...@@ -406,10 +394,7 @@ static const WCHAR COLOROKSTRINGW[] = { 'c','o','m','m','d','l','g','_',
#define COLOROKSTRING WINELIB_NAME_AW(COLOROKSTRING) #define COLOROKSTRING WINELIB_NAME_AW(COLOROKSTRING)
#define SETRGBSTRINGA "commdlg_SetRGBColor" #define SETRGBSTRINGA "commdlg_SetRGBColor"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define SETRGBSTRINGW L"commdlg_SetRGBColor"
#else #else
static const WCHAR SETRGBSTRINGW[] = { 'c','o','m','m','d','l','g','_', static const WCHAR SETRGBSTRINGW[] = { 'c','o','m','m','d','l','g','_',
...@@ -418,10 +403,7 @@ static const WCHAR SETRGBSTRINGW[] = { 'c','o','m','m','d','l','g','_', ...@@ -418,10 +403,7 @@ static const WCHAR SETRGBSTRINGW[] = { 'c','o','m','m','d','l','g','_',
#define SETRGBSTRING WINELIB_NAME_AW(SETRGBSTRING) #define SETRGBSTRING WINELIB_NAME_AW(SETRGBSTRING)
#define FINDMSGSTRINGA "commdlg_FindReplace" #define FINDMSGSTRINGA "commdlg_FindReplace"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define FINDMSGSTRINGW L"commdlg_FindReplace"
#else #else
static const WCHAR FINDMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', static const WCHAR FINDMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_',
...@@ -430,10 +412,7 @@ static const WCHAR FINDMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', ...@@ -430,10 +412,7 @@ static const WCHAR FINDMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_',
#define FINDMSGSTRING WINELIB_NAME_AW(FINDMSGSTRING) #define FINDMSGSTRING WINELIB_NAME_AW(FINDMSGSTRING)
#define HELPMSGSTRINGA "commdlg_help" #define HELPMSGSTRINGA "commdlg_help"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define HELPMSGSTRINGW L"commdlg_help"
#else #else
static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_', static const WCHAR HELPMSGSTRINGW[] = { 'c','o','m','m','d','l','g','_',
......
...@@ -25,9 +25,7 @@ ...@@ -25,9 +25,7 @@
extern "C" { extern "C" {
#endif #endif
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define D3DCOMPILER_DLL_W (const WCHAR[]){'d','3','d','c','o','m','p','i','l','e','r','_','4','7','.','d','l','l',0}
#elif defined(_MSC_VER)
#define D3DCOMPILER_DLL_W L"d3dcompiler_47.dll" #define D3DCOMPILER_DLL_W L"d3dcompiler_47.dll"
#else #else
static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','7','.','d','l','l',0}; static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e','r','_','4','7','.','d','l','l',0};
......
...@@ -51,7 +51,7 @@ extern "C" { ...@@ -51,7 +51,7 @@ extern "C" {
#define EXPENTRY CALLBACK #define EXPENTRY CALLBACK
#ifdef UNICODE #ifdef UNICODE
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SZDDESYS_TOPIC L"System" #define SZDDESYS_TOPIC L"System"
#define SZDDESYS_ITEM_TOPICS L"Topics" #define SZDDESYS_ITEM_TOPICS L"Topics"
#define SZDDESYS_ITEM_SYSITEMS L"SysItems" #define SZDDESYS_ITEM_SYSITEMS L"SysItems"
...@@ -60,16 +60,7 @@ extern "C" { ...@@ -60,16 +60,7 @@ extern "C" {
#define SZDDESYS_ITEM_FORMATS L"Formats" #define SZDDESYS_ITEM_FORMATS L"Formats"
#define SZDDESYS_ITEM_HELP L"Help" #define SZDDESYS_ITEM_HELP L"Help"
#define SZDDE_ITEM_ITEMLIST L"TopicItemList" #define SZDDE_ITEM_ITEMLIST L"TopicItemList"
#elif defined(__GNUC__) #else /* _MSC_VER/__MINGW32__ */
#define SZDDESYS_TOPIC (const WCHAR []){'S','y','s','t','e','m',0}
#define SZDDESYS_ITEM_TOPICS (const WCHAR []){'T','o','p','i','c','s',0}
#define SZDDESYS_ITEM_SYSITEMS (const WCHAR []){'S','y','s','I','t','e','m','s',0}
#define SZDDESYS_ITEM_RTNMSG (const WCHAR []){'R','e','t','u','r','n','M','e','s','s','a','g','e',0}
#define SZDDESYS_ITEM_STATUS (const WCHAR []){'S','t','a','t','u','s',0}
#define SZDDESYS_ITEM_FORMATS (const WCHAR []){'F','o','r','m','a','t','s',0}
#define SZDDESYS_ITEM_HELP (const WCHAR []){'H','e','l','p',0}
#define SZDDE_ITEM_ITEMLIST (const WCHAR []){'T','o','p','i','c','I','t','e','m','L','i','s','t',0}
#else /* _MSC_VER/__GNUC__ */
static const WCHAR SZDDESYS_TOPIC[] = {'S','y','s','t','e','m',0}; static const WCHAR SZDDESYS_TOPIC[] = {'S','y','s','t','e','m',0};
static const WCHAR SZDDESYS_ITEM_TOPICS[] = {'T','o','p','i','c','s',0}; static const WCHAR SZDDESYS_ITEM_TOPICS[] = {'T','o','p','i','c','s',0};
static const WCHAR SZDDESYS_ITEM_SYSITEMS[] = {'S','y','s','I','t','e','m','s',0}; static const WCHAR SZDDESYS_ITEM_SYSITEMS[] = {'S','y','s','I','t','e','m','s',0};
......
...@@ -24,10 +24,7 @@ ...@@ -24,10 +24,7 @@
#define MOUNTMGRCONTROLTYPE ((ULONG)'m') #define MOUNTMGRCONTROLTYPE ((ULONG)'m')
#define MOUNTDEVCONTROLTYPE ((ULONG)'M') #define MOUNTDEVCONTROLTYPE ((ULONG)'M')
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define MOUNTMGR_DEVICE_NAME (const WCHAR []){'\\','D','e','v','i','c','e','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}
#define MOUNTMGR_DOS_DEVICE_NAME (const WCHAR []){'\\','\\','.','\\','M','o','u','n','t','P','o','i','n','t','M','a','n','a','g','e','r',0}
#elif defined(_MSC_VER)
#define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager" #define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager"
#define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager" #define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager"
#else #else
......
...@@ -87,43 +87,7 @@ typedef struct sockaddr SOCKADDR; ...@@ -87,43 +87,7 @@ typedef struct sockaddr SOCKADDR;
#define DPNA_VALUE_SERIALPROVIDER_A "SERIAL" #define DPNA_VALUE_SERIALPROVIDER_A "SERIAL"
/* And now the same thing but as Unicode strings */ /* And now the same thing but as Unicode strings */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define DPNA_HEADER (const WCHAR []){ 'x','-','d','i','r','e','c','t','p','l','a','y',':','/',0 }
# define DPNA_KEY_APPLICATION_INSTANCE (const WCHAR []){ 'a','p','p','l','i','c','a','t','i','o','n','i','n','s','t','a','n','c','e',0 }
# define DPNA_KEY_BAUD (const WCHAR []){ 'b','a','u','d',0 }
# define DPNA_KEY_DEVICE (const WCHAR []){ 'd','e','v','i','c','e',0 }
# define DPNA_KEY_FLOWCONTROL (const WCHAR []){ 'f','l','o','w','c','o','n','t','r','o','l',0 }
# define DPNA_KEY_HOSTNAME (const WCHAR []){ 'h','o','s','t','n','a','m','e',0 }
# define DPNA_KEY_NAMEINFO (const WCHAR []){ 'n','a','m','e','i','n','f','o',0 }
# define DPNA_KEY_PARITY (const WCHAR []){ 'p','a','r','i','t','y',0 }
# define DPNA_KEY_PHONENUMBER (const WCHAR []){ 'p','h','o','n','e','n','u','m','b','e','r',0 }
# define DPNA_KEY_PORT (const WCHAR []){ 'p','o','r','t',0 }
# define DPNA_KEY_PROCESSOR (const WCHAR []){ 'p','r','o','c','e','s','s','o','r',0 }
# define DPNA_KEY_PROGRAM (const WCHAR []){ 'p','r','o','g','r','a','m',0 }
# define DPNA_KEY_PROVIDER (const WCHAR []){ 'p','r','o','v','i','d','e','r',0 }
# define DPNA_KEY_SCOPE (const WCHAR []){ 's','c','o','p','e',0 }
# define DPNA_KEY_STOPBITS (const WCHAR []){ 's','t','o','p','b','i','t','s',0 }
# define DPNA_KEY_TRAVERSALMODE (const WCHAR []){ 't','r','a','v','e','r','s','a','l','m','o','d','e',0 }
# define DPNA_STOP_BITS_ONE (const WCHAR []){ '1',0 }
# define DPNA_STOP_BITS_ONE_FIVE (const WCHAR []){ '1','.','5',0 }
# define DPNA_STOP_BITS_TWO (const WCHAR []){ '2',0 }
# define DPNA_PARITY_NONE (const WCHAR []){ 'N','O','N','E',0 }
# define DPNA_PARITY_EVEN (const WCHAR []){ 'E','V','E','N',0 }
# define DPNA_PARITY_ODD (const WCHAR []){ 'O','D','D',0 }
# define DPNA_PARITY_MARK (const WCHAR []){ 'M','A','R','K',0 }
# define DPNA_PARITY_SPACE (const WCHAR []){ 'S','P','A','C','E',0 }
# define DPNA_FLOW_CONTROL_NONE (const WCHAR []){ 'N','O','N','E',0 }
# define DPNA_FLOW_CONTROL_XONXOFF (const WCHAR []){ 'X','O','N','X','O','F','F',0 }
# define DPNA_FLOW_CONTROL_RTS (const WCHAR []){ 'R','T','S',0 }
# define DPNA_FLOW_CONTROL_DTR (const WCHAR []){ 'D','T','R',0 }
# define DPNA_FLOW_CONTROL_RTSDTR (const WCHAR []){ 'R','T','S','D','T','R',0 }
# define DPNA_VALUE_TCPIPPROVIDER (const WCHAR []){ 'I','P',0 }
# define DPNA_VALUE_IPXPROVIDER (const WCHAR []){ 'I','P','X',0 }
# define DPNA_VALUE_MODEMPROVIDER (const WCHAR []){ 'M','O','D','E','M',0 }
# define DPNA_VALUE_SERIALPROVIDER (const WCHAR []){ 'S','E','R','I','A','L',0 }
#elif defined(_MSC_VER)
# define DPNA_HEADER L"x-directplay:/" # define DPNA_HEADER L"x-directplay:/"
# define DPNA_KEY_APPLICATION_INSTANCE L"applicationinstance" # define DPNA_KEY_APPLICATION_INSTANCE L"applicationinstance"
......
...@@ -90,33 +90,25 @@ extern "C" { ...@@ -90,33 +90,25 @@ extern "C" {
UF_DONT_REQUIRE_PREAUTH |\ UF_DONT_REQUIRE_PREAUTH |\
UF_PASSWORD_EXPIRED) UF_PASSWORD_EXPIRED)
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define GROUP_SPECIALGRP_USERS (const WCHAR []){ 'U','S','E','R','S',0 }
#elif defined(_MSC_VER)
# define GROUP_SPECIALGRP_USERS L"USERS" # define GROUP_SPECIALGRP_USERS L"USERS"
#else #else
static const WCHAR GROUP_SPECIALGRP_USERS[] = { 'U','S','E','R','S',0 }; static const WCHAR GROUP_SPECIALGRP_USERS[] = { 'U','S','E','R','S',0 };
#endif #endif
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define GROUP_SPECIALGRP_ADMINS (const WCHAR []){ 'A','D','M','I','N','S',0 }
#elif defined(_MSC_VER)
# define GROUP_SPECIALGRP_ADMINS L"ADMINS" # define GROUP_SPECIALGRP_ADMINS L"ADMINS"
#else #else
static const WCHAR GROUP_SPECIALGRP_ADMINS[] = { 'A','D','M','I','N','S',0 }; static const WCHAR GROUP_SPECIALGRP_ADMINS[] = { 'A','D','M','I','N','S',0 };
#endif #endif
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define GROUP_SPECIALGRP_GUESTS (const WCHAR []){ 'G','U','E','S','T','S',0 }
#elif defined(_MSC_VER)
# define GROUP_SPECIALGRP_GUESTS L"GUESTS" # define GROUP_SPECIALGRP_GUESTS L"GUESTS"
#else #else
static const WCHAR GROUP_SPECIALGRP_GUESTS[] = { 'G','U','E','S','T','S',0 }; static const WCHAR GROUP_SPECIALGRP_GUESTS[] = { 'G','U','E','S','T','S',0 };
#endif #endif
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define GROUP_SPECIALGRP_LOCAL (const WCHAR []){ 'L','O','C','A','L',0 }
#elif defined(_MSC_VER)
# define GROUP_SPECIALGRP_LOCAL L"LOCAL" # define GROUP_SPECIALGRP_LOCAL L"LOCAL"
#else #else
static const WCHAR GROUP_SPECIALGRP_LOCAL[] = { 'L','O','C','A','L',0 }; static const WCHAR GROUP_SPECIALGRP_LOCAL[] = { 'L','O','C','A','L',0 };
......
...@@ -106,10 +106,7 @@ extern "C" { ...@@ -106,10 +106,7 @@ extern "C" {
#define ACM_FILTERENUMF_DWFILTERTAG __MSABI_LONG(0x00010000) #define ACM_FILTERENUMF_DWFILTERTAG __MSABI_LONG(0x00010000)
#define ACMHELPMSGSTRINGA "acmchoose_help" #define ACMHELPMSGSTRINGA "acmchoose_help"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define ACMHELPMSGSTRINGW L"acmchoose_help"
#else #else
static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m', static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m',
...@@ -118,10 +115,7 @@ static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m', ...@@ -118,10 +115,7 @@ static const WCHAR ACMHELPMSGSTRINGW[] = { 'a','c','m',
#define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING) #define ACMHELPMSGSTRING WINELIB_NAME_AW(ACMHELPMSGSTRING)
#define ACMHELPMSGCONTEXTMENUA "acmchoose_contextmenu" #define ACMHELPMSGCONTEXTMENUA "acmchoose_contextmenu"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define ACMHELPMSGCONTEXTMENUW L"acmchoose_contextmenu"
#else #else
static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m', static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m',
...@@ -130,10 +124,7 @@ static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m', ...@@ -130,10 +124,7 @@ static const WCHAR ACMHELPMSGCONTEXTMENUW[] = { 'a','c','m',
#define ACMHELPMSGCONTEXTMENU WINELIB_NAME_AW(ACMHELPMSGCONTEXTMENU) #define ACMHELPMSGCONTEXTMENU WINELIB_NAME_AW(ACMHELPMSGCONTEXTMENU)
#define ACMHELPMSGCONTEXTHELPA "acmchoose_contexthelp" #define ACMHELPMSGCONTEXTHELPA "acmchoose_contexthelp"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define ACMHELPMSGCONTEXTHELPW L"acmchoose_contexthelp"
#else #else
static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m', static const WCHAR ACMHELPMSGCONTEXTHELPW[] = { 'a','c','m',
......
...@@ -357,11 +357,9 @@ typedef struct _AUDIT_POLICY_INFORMATION ...@@ -357,11 +357,9 @@ typedef struct _AUDIT_POLICY_INFORMATION
} AUDIT_POLICY_INFORMATION, *PAUDIT_POLICY_INFORMATION; } AUDIT_POLICY_INFORMATION, *PAUDIT_POLICY_INFORMATION;
#define MICROSOFT_KERBEROS_NAME_A "Kerberos" #define MICROSOFT_KERBEROS_NAME_A "Kerberos"
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__MINGW32__)
#define MICROSOFT_KERBEROS_NAME_W L"Kerberos" #define MICROSOFT_KERBEROS_NAME_W L"Kerberos"
#elif defined(__GNUC__) #else /* _MSC_VER/__MINGW32__ */
#define MICROSOFT_KERBEROS_NAME_W (const WCHAR []){ 'K','e','r','b','e','r','o','s',0 }
#else /* _MSC_VER/__GNUC__ */
static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 }; static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 };
#endif #endif
......
...@@ -94,17 +94,7 @@ typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM); ...@@ -94,17 +94,7 @@ typedef UINT (CALLBACK *LPFNOLEUIHOOK)(HWND, UINT, WPARAM, LPARAM);
#define SZOLEUI_MSG_CHANGESOURCEA "OLEUI_MSG_CHANGESOURCE" #define SZOLEUI_MSG_CHANGESOURCEA "OLEUI_MSG_CHANGESOURCE"
#define SZOLEUI_MSG_ADDCONTROLA "OLEUI_MSG_ADDCONTROL" #define SZOLEUI_MSG_ADDCONTROLA "OLEUI_MSG_ADDCONTROL"
#define SZOLEUI_MSG_BROWSE_OFNA "OLEUI_MSG_BROWSE_OFN" #define SZOLEUI_MSG_BROWSE_OFNA "OLEUI_MSG_BROWSE_OFN"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define SZOLEUI_MSG_HELPW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','H','E','L','P',0 }
# define SZOLEUI_MSG_ENDDIALOGW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','E','N','D','D','I','A','L','O','G',0 }
# define SZOLEUI_MSG_BROWSEW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','B','R','O','W','S','E',0 }
# define SZOLEUI_MSG_CHANGEICONW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','H','A','N','G','E','I','C','O','N',0 }
# define SZOLEUI_MSG_CLOSEBUSYDIALOGW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','L','O','S','E','B','U','S','Y','D','I','A','L','O','G',0 }
# define SZOLEUI_MSG_CONVERTW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','O','N','V','E','R','T',0 }
# define SZOLEUI_MSG_CHANGESOURCEW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','C','H','A','N','G','E','S','O','U','R','C','E',0 }
# define SZOLEUI_MSG_ADDCONTROLW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','A','D','D','C','O','N','T','R','O','L',0 }
# define SZOLEUI_MSG_BROWSE_OFNW (const WCHAR []){ 'O','L','E','U','I','_','M','S','G','_','B','R','O','W','S','E','_','O','F','N',0 }
#elif defined(_MSC_VER)
# define SZOLEUI_MSG_HELPW L"OLEUI_MSG_HELP" # define SZOLEUI_MSG_HELPW L"OLEUI_MSG_HELP"
# define SZOLEUI_MSG_ENDDIALOGW L"OLEUI_MSG_ENDDIALOG" # define SZOLEUI_MSG_ENDDIALOGW L"OLEUI_MSG_ENDDIALOG"
# define SZOLEUI_MSG_BROWSEW L"OLEUI_MSG_BROWSE" # define SZOLEUI_MSG_BROWSEW L"OLEUI_MSG_BROWSE"
......
...@@ -30,10 +30,7 @@ extern "C" { ...@@ -30,10 +30,7 @@ extern "C" {
#define WC_PROPSHEETA "SysPropertySheet" #define WC_PROPSHEETA "SysPropertySheet"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define WC_PROPSHEETW L"SysPropertySheet"
#else #else
static const WCHAR WC_PROPSHEETW[] = { 'S','y','s', static const WCHAR WC_PROPSHEETW[] = { 'S','y','s',
......
...@@ -32,18 +32,14 @@ extern "C" { ...@@ -32,18 +32,14 @@ extern "C" {
#define cchTextLimitDefault 0x7fff #define cchTextLimitDefault 0x7fff
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define MSFTEDIT_CLASS (const WCHAR []){ 'R','i','c','h','E','d','i','t','5','0','W',0 }
#elif defined(_MSC_VER)
# define MSFTEDIT_CLASS L"RichEdit50W" # define MSFTEDIT_CLASS L"RichEdit50W"
#else #else
static const WCHAR MSFTEDIT_CLASS[] = { 'R','i','c','h','E','d','i','t','5','0','W',0 }; static const WCHAR MSFTEDIT_CLASS[] = { 'R','i','c','h','E','d','i','t','5','0','W',0 };
#endif #endif
#define RICHEDIT_CLASS20A "RichEdit20A" #define RICHEDIT_CLASS20A "RichEdit20A"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# 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" # define RICHEDIT_CLASS20W L"RichEdit20W"
#else #else
static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 }; static const WCHAR RICHEDIT_CLASS20W[] = { 'R','i','c','h','E','d','i','t','2','0','W',0 };
......
...@@ -22,11 +22,7 @@ ...@@ -22,11 +22,7 @@
/* Package names */ /* Package names */
#define UNISP_NAME_A "Microsoft Unified Security Protocol Provider" #define UNISP_NAME_A "Microsoft Unified Security Protocol Provider"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define UNISP_NAME_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',\
' ','U','n','i','f','i','e','d',' ','S','e','c','u','r','i','t','y',' ',\
'P','r','o','t','o','c','o','l',' ','P','r','o','v','i','d','e','r',0 }
#elif defined(_MSC_VER)
#define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider" #define UNISP_NAME_W L"Microsoft Unified Security Protocol Provider"
#else #else
static const WCHAR UNISP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', static const WCHAR UNISP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
...@@ -36,10 +32,7 @@ static const WCHAR UNISP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', ...@@ -36,10 +32,7 @@ static const WCHAR UNISP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
#define UNISP_NAME WINELIB_NAME_AW(UNISP_NAME_) #define UNISP_NAME WINELIB_NAME_AW(UNISP_NAME_)
#define SSL2SP_NAME_A "Microsoft SSL 2.0" #define SSL2SP_NAME_A "Microsoft SSL 2.0"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SSL2SP_NAME_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',\
' ','S','S','L',' ','2','.','0',0 }
#elif defined(_MSC_VER)
#define SSL2SP_NAME_W L"Microsoft SSL 2.0" #define SSL2SP_NAME_W L"Microsoft SSL 2.0"
#else #else
static const WCHAR SSL2SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', static const WCHAR SSL2SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
...@@ -48,10 +41,7 @@ static const WCHAR SSL2SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', ...@@ -48,10 +41,7 @@ static const WCHAR SSL2SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
#define SSL2SP_NAME WINELIB_NAME_AW(SSL2SP_NAME_) #define SSL2SP_NAME WINELIB_NAME_AW(SSL2SP_NAME_)
#define SSL3SP_NAME_A "Microsoft SSL 3.0" #define SSL3SP_NAME_A "Microsoft SSL 3.0"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SSL3SP_NAME_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',\
' ','S','S','L',' ','3','.','0',0 }
#elif defined(_MSC_VER)
#define SSL3SP_NAME_W L"Microsoft SSL 3.0" #define SSL3SP_NAME_W L"Microsoft SSL 3.0"
#else #else
static const WCHAR SSL3SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', static const WCHAR SSL3SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
...@@ -60,10 +50,7 @@ static const WCHAR SSL3SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', ...@@ -60,10 +50,7 @@ static const WCHAR SSL3SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
#define SSL3SP_NAME WINELIB_NAME_AW(SSL3SP_NAME_) #define SSL3SP_NAME WINELIB_NAME_AW(SSL3SP_NAME_)
#define TLS1SP_NAME_A "Microsoft TLS 1.0" #define TLS1SP_NAME_A "Microsoft TLS 1.0"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define TLS1SP_NAME_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',\
' ','T','L','S',' ','1','.','0',0 }
#elif defined(_MSC_VER)
#define TLS1SP_NAME_W L"Microsoft TLS 1.0" #define TLS1SP_NAME_W L"Microsoft TLS 1.0"
#else #else
static const WCHAR TLS1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', static const WCHAR TLS1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
...@@ -72,10 +59,7 @@ static const WCHAR TLS1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', ...@@ -72,10 +59,7 @@ static const WCHAR TLS1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
#define TLS1SP_NAME WINELIB_NAME_AW(TLS1SP_NAME_) #define TLS1SP_NAME WINELIB_NAME_AW(TLS1SP_NAME_)
#define PCT1SP_NAME_A "Microsoft PCT 1.0" #define PCT1SP_NAME_A "Microsoft PCT 1.0"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define PCT1SP_NAME_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',\
' ','P','C','T',' ','1','.','0',0 }
#elif defined(_MSC_VER)
#define PCT1SP_NAME_W L"Microsoft PCT 1.0" #define PCT1SP_NAME_W L"Microsoft PCT 1.0"
#else #else
static const WCHAR PCT1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', static const WCHAR PCT1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
...@@ -84,9 +68,7 @@ static const WCHAR PCT1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t', ...@@ -84,9 +68,7 @@ static const WCHAR PCT1SP_NAME_W[] = { 'M','i','c','r','o','s','o','f','t',
#define PCT1SP_NAME WINELIB_NAME_AW(PCT1SP_NAME_) #define PCT1SP_NAME WINELIB_NAME_AW(PCT1SP_NAME_)
#define SCHANNEL_NAME_A "Schannel" #define SCHANNEL_NAME_A "Schannel"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SCHANNEL_NAME_W (const WCHAR []){ 'S','c','h','a','n','n','e','l',0 }
#elif defined(_MSC_VER)
#define SCHANNEL_NAME_W L"Schannel" #define SCHANNEL_NAME_W L"Schannel"
#else #else
static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 }; static const WCHAR SCHANNEL_NAME_W[] = { 'S','c','h','a','n','n','e','l',0 };
......
...@@ -34,12 +34,7 @@ extern "C" { ...@@ -34,12 +34,7 @@ extern "C" {
# define SDDL_DACL "D" # define SDDL_DACL "D"
# define SDDL_SACL "S" # define SDDL_SACL "S"
#else #else
# if defined(__GNUC__) # if defined(_MSC_VER) || defined(__MINGW32__)
# define SDDL_OWNER (const WCHAR[]){ 'O',0 }
# define SDDL_GROUP (const WCHAR[]){ 'G',0 }
# define SDDL_DACL (const WCHAR[]){ 'D',0 }
# define SDDL_SACL (const WCHAR[]){ 'S',0 }
# elif defined(_MSC_VER)
# define SDDL_OWNER L"O" # define SDDL_OWNER L"O"
# define SDDL_GROUP L"G" # define SDDL_GROUP L"G"
# define SDDL_DACL L"D" # define SDDL_DACL L"D"
...@@ -74,12 +69,7 @@ extern "C" { ...@@ -74,12 +69,7 @@ extern "C" {
# define SDDL_ACE_BEGIN "(" # define SDDL_ACE_BEGIN "("
# define SDDL_ACE_END ")" # define SDDL_ACE_END ")"
#else #else
# if defined(__GNUC__) # if defined(_MSC_VER) || defined(__MINGW32__)
# define SDDL_SEPERATOR (const WCHAR[]){ ';',0 }
# define SDDL_DELIMINATOR (const WCHAR[]){ ':',0 }
# define SDDL_ACE_BEGIN (const WCHAR[]){ '(',0 }
# define SDDL_ACE_END (const WCHAR[]){ ')',0 }
# elif defined(_MSC_VER)
# define SDDL_SEPERATOR L";" # define SDDL_SEPERATOR L";"
# define SDDL_DELIMINATOR L":" # define SDDL_DELIMINATOR L":"
# define SDDL_ACE_BEGIN L"(" # define SDDL_ACE_BEGIN L"("
......
...@@ -24,10 +24,7 @@ ...@@ -24,10 +24,7 @@
#define WINTRUST_ACTION_GENERIC_CERT_VERIFY \ #define WINTRUST_ACTION_GENERIC_CERT_VERIFY \
{ 0x189a3842, 0x3041, 0x11d1, { 0x85,0xe1,0x00,0xc0,0x4f,0xc2,0x95,0xee }} { 0x189a3842, 0x3041, 0x11d1, { 0x85,0xe1,0x00,0xc0,0x4f,0xc2,0x95,0xee }}
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SP_GENERIC_CERT_INIT_FUNCTION (const WCHAR []) \
{'S','o','f','t','p','u','b','D','e','f','C','e','r','t','I','n','i','t', 0}
#elif defined(_MSC_VER)
#define SP_GENERIC_CERT_INIT_FUNCTION L"SoftpubDefCertInit" #define SP_GENERIC_CERT_INIT_FUNCTION L"SoftpubDefCertInit"
#else #else
static const WCHAR SP_GENERIC_CERT_INIT_FUNCTION[] = static const WCHAR SP_GENERIC_CERT_INIT_FUNCTION[] =
...@@ -37,12 +34,7 @@ static const WCHAR SP_GENERIC_CERT_INIT_FUNCTION[] = ...@@ -37,12 +34,7 @@ static const WCHAR SP_GENERIC_CERT_INIT_FUNCTION[] =
#define WINTRUST_ACTION_GENERIC_CHAIN_VERIFY \ #define WINTRUST_ACTION_GENERIC_CHAIN_VERIFY \
{ 0xfc451c16, 0xac75, 0x11d1, { 0xb4,0xb8,0x00,0xc0,0x4f,0xb6,0x6e,0xa0 }} { 0xfc451c16, 0xac75, 0x11d1, { 0xb4,0xb8,0x00,0xc0,0x4f,0xb6,0x6e,0xa0 }}
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define GENERIC_CHAIN_FINALPOLICY_FUNCTION (const WCHAR []) \
{'G','e','n','e','r','i','c','C','h','a','i','n','F','i','n','a','l','P','r','o','v', 0}
#define GENERIC_CHAIN_CERTTRUST_FUNCTION (const WCHAR []) \
{'G','e','n','e','r','i','c','C','h','a','i','n','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}
#elif defined(_MSC_VER)
#define GENERIC_CHAIN_FINALPOLICY_FUNCTION L"GenericChainFinalProv" #define GENERIC_CHAIN_FINALPOLICY_FUNCTION L"GenericChainFinalProv"
#define GENERIC_CHAIN_CERTTRUST_FUNCTION L"GenericChainCertificateTrust" #define GENERIC_CHAIN_CERTTRUST_FUNCTION L"GenericChainCertificateTrust"
#else #else
...@@ -95,10 +87,7 @@ typedef struct _WTD_GENERIC_CHAIN_POLICY_DATA ...@@ -95,10 +87,7 @@ typedef struct _WTD_GENERIC_CHAIN_POLICY_DATA
void *pvPolicyArg; void *pvPolicyArg;
} WTD_GENERIC_CHAIN_POLICY_DATA, *PWTD_GENERIC_CHAIN_POLICY_DATA; } WTD_GENERIC_CHAIN_POLICY_DATA, *PWTD_GENERIC_CHAIN_POLICY_DATA;
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SP_POLICY_PROVIDER_DLL_NAME (const WCHAR []) \
{'W','I','N','T','R','U','S','T','.','D','L','L' ,0}
#elif defined(_MSC_VER)
#define SP_POLICY_PROVIDER_DLL_NAME L"WINTRUST.DLL" #define SP_POLICY_PROVIDER_DLL_NAME L"WINTRUST.DLL"
#else #else
static const WCHAR SP_POLICY_PROVIDER_DLL_NAME[] = static const WCHAR SP_POLICY_PROVIDER_DLL_NAME[] =
...@@ -108,20 +97,7 @@ static const WCHAR SP_POLICY_PROVIDER_DLL_NAME[] = ...@@ -108,20 +97,7 @@ static const WCHAR SP_POLICY_PROVIDER_DLL_NAME[] =
#define WINTRUST_ACTION_GENERIC_VERIFY_V2 \ #define WINTRUST_ACTION_GENERIC_VERIFY_V2 \
{ 0xaac56b, 0xcd44, 0x11d0, { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }} { 0xaac56b, 0xcd44, 0x11d0, { 0x8c,0xc2,0x00,0xc0,0x4f,0xc2,0x95,0xee }}
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SP_INIT_FUNCTION (const WCHAR []) \
{'S','o','f','t','p','u','b','I','n','i','t','i','a','l','i','z','e', 0}
#define SP_OBJTRUST_FUNCTION (const WCHAR []) \
{'S','o','f','t','p','u','b','L','o','a','d','M','e','s','s','a','g','e', 0}
#define SP_SIGTRUST_FUNCTION (const WCHAR []) \
{'S','o','f','t','p','u','b','L','o','a','d','S','i','g','n','a','t','u','r','e', 0}
#define SP_CHKCERT_FUNCTION (const WCHAR []) \
{'S','o','f','t','p','u','b','C','h','e','c','k','C','e','r','t', 0}
#define SP_FINALPOLICY_FUNCTION (const WCHAR []) \
{'S','o','f','t','p','u','b','A','u','t','h','e','n','t','i','c','o','d','e', 0}
#define SP_CLEANUPPOLICY_FUNCTION (const WCHAR []) \
{'S','o','f','t','p','u','b','C','l','e','a','n','u','p', 0}
#elif defined(_MSC_VER)
#define SP_INIT_FUNCTION L"SoftpubInitialize" #define SP_INIT_FUNCTION L"SoftpubInitialize"
#define SP_OBJTRUST_FUNCTION L"SoftpubLoadMessage" #define SP_OBJTRUST_FUNCTION L"SoftpubLoadMessage"
#define SP_SIGTRUST_FUNCTION L"SoftpubLoadSignature" #define SP_SIGTRUST_FUNCTION L"SoftpubLoadSignature"
...@@ -146,10 +122,7 @@ static const WCHAR SP_CLEANUPPOLICY_FUNCTION[] = ...@@ -146,10 +122,7 @@ static const WCHAR SP_CLEANUPPOLICY_FUNCTION[] =
#define WINTRUST_ACTION_TRUSTPROVIDER_TEST \ #define WINTRUST_ACTION_TRUSTPROVIDER_TEST \
{ 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} { 0x573e31f8, 0xddba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }}
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SP_TESTDUMPPOLICY_FUNCTION_TEST (const WCHAR []) \
{'S','o','f','t','p','u','b','D','u','m','p','S','t','r','u','c','t','u','r','e', 0}
#elif defined(_MSC_VER)
#define SP_TESTDUMPPOLICY_FUNCTION_TEST L"SoftpubDumpStructure" #define SP_TESTDUMPPOLICY_FUNCTION_TEST L"SoftpubDumpStructure"
#else #else
static const WCHAR SP_TESTDUMPPOLICY_FUNCTION_TEST[] = static const WCHAR SP_TESTDUMPPOLICY_FUNCTION_TEST[] =
...@@ -159,12 +132,7 @@ static const WCHAR SP_TESTDUMPPOLICY_FUNCTION_TEST[] = ...@@ -159,12 +132,7 @@ static const WCHAR SP_TESTDUMPPOLICY_FUNCTION_TEST[] =
#define HTTPSPROV_ACTION \ #define HTTPSPROV_ACTION \
{ 0x573e31f8, 0xaaba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }} { 0x573e31f8, 0xaaba, 0x11d0, { 0x8c,0xcb,0x00,0xc0,0x4f,0xc2,0x95,0xee }}
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define HTTPS_CERTTRUST_FUNCTION (const WCHAR []) \
{'H','T','T','P','S','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}
#define HTTPS_FINALPOLICY_FUNCTION (const WCHAR []) \
{'H','T','T','P','S','F','i','n','a','l','P','r','o','v', 0}
#elif defined(_MSC_VER)
#define HTTPS_FINALPOLICY_FUNCTION L"HTTPSFinalProv" #define HTTPS_FINALPOLICY_FUNCTION L"HTTPSFinalProv"
#define HTTPS_CERTTRUST_FUNCTION L"HTTPSCertificateTrust" #define HTTPS_CERTTRUST_FUNCTION L"HTTPSCertificateTrust"
#else #else
...@@ -177,14 +145,7 @@ static const WCHAR HTTPS_FINALPOLICY_FUNCTION[] = ...@@ -177,14 +145,7 @@ static const WCHAR HTTPS_FINALPOLICY_FUNCTION[] =
#define OFFICESIGN_ACTION_VERIFY \ #define OFFICESIGN_ACTION_VERIFY \
{ 0x5555c2cd, 0x17fb, 0x11d1, { 0x85,0xc4,0x00,0xc0,0x4f,0xc2,0x95,0xee }} { 0x5555c2cd, 0x17fb, 0x11d1, { 0x85,0xc4,0x00,0xc0,0x4f,0xc2,0x95,0xee }}
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define OFFICE_POLICY_PROVIDER_DLL_NAME (const WCHAR []) \
{'W','I','N','T','R','U','S','T','.','D','L','L' ,0}
#define OFFICE_INITPROV_FUNCTION (const WCHAR []) \
{'O','f','f','i','c','e','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0}
#define OFFICE_CLEANUPPOLICY_FUNCTION (const WCHAR []) \
{'O','f','f','i','c','e','C','l','e','a','n','u','p','P','o','l','i','c','y', 0}
#elif defined(_MSC_VER)
#define OFFICE_POLICY_PROVIDER_DLL_NAME SP_POLICY_PROVIDER_DLL_NAME #define OFFICE_POLICY_PROVIDER_DLL_NAME SP_POLICY_PROVIDER_DLL_NAME
#define OFFICE_INITPROV_FUNCTION L"OfficeInitializePolicy" #define OFFICE_INITPROV_FUNCTION L"OfficeInitializePolicy"
#define OFFICE_CLEANUPPOLICY_FUNCTION L"OfficeCleanupPolicy" #define OFFICE_CLEANUPPOLICY_FUNCTION L"OfficeCleanupPolicy"
...@@ -200,14 +161,7 @@ static const WCHAR OFFICE_CLEANUPPOLICY_FUNCTION[] = ...@@ -200,14 +161,7 @@ static const WCHAR OFFICE_CLEANUPPOLICY_FUNCTION[] =
#define DRIVER_ACTION_VERIFY \ #define DRIVER_ACTION_VERIFY \
{ 0xf750e6c3, 0x38ee, 0x11d1, { 0x85,0xe5,0x00,0xc0,0x4f,0xc2,0x95,0xee }} { 0xf750e6c3, 0x38ee, 0x11d1, { 0x85,0xe5,0x00,0xc0,0x4f,0xc2,0x95,0xee }}
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define DRIVER_INITPROV_FUNCTION (const WCHAR []) \
{'D','r','i','v','e','r','I','n','i','t','i','a','l','i','z','e','P','o','l','i','c','y', 0}
#define DRIVER_FINALPOLPROV_FUNCTION (const WCHAR []) \
{'D','r','i','v','e','r','F','i','n','a','l','P','o','l','i','c','y', 0}
#define DRIVER_CLEANUPPOLICY_FUNCTION (const WCHAR []) \
{'D','r','i','v','e','r','C','l','e','a','n','u','p','P','o','l','i','c','y', 0}
#elif defined(_MSC_VER)
#define DRIVER_INITPROV_FUNCTION L"DriverInitializePolicy" #define DRIVER_INITPROV_FUNCTION L"DriverInitializePolicy"
#define DRIVER_FINALPOLPROV_FUNCTION L"DriverFinalPolicy" #define DRIVER_FINALPOLPROV_FUNCTION L"DriverFinalPolicy"
#define DRIVER_CLEANUPPOLICY_FUNCTION L"DriverCleanupPolicy" #define DRIVER_CLEANUPPOLICY_FUNCTION L"DriverCleanupPolicy"
......
...@@ -114,12 +114,7 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*); ...@@ -114,12 +114,7 @@ HRESULT WINAPI GetThemeBackgroundRegion(HTHEME,HDC,int,int,const RECT*,HRGN*);
HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*); HRESULT WINAPI GetThemeBool(HTHEME,int,int,int,BOOL*);
HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*); HRESULT WINAPI GetThemeColor(HTHEME,int,int,int,COLORREF*);
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define SZ_THDOCPROP_DISPLAYNAME (const WCHAR []){ 'D','i','s','p','l','a','y','N','a','m','e',0 }
# define SZ_THDOCPROP_CANONICALNAME (const WCHAR []){ 'T','h','e','m','e','N','a','m','e',0 }
# define SZ_THDOCPROP_TOOLTIP (const WCHAR []){ 'T','o','o','l','T','i','p',0 }
# define SZ_THDOCPROP_AUTHOR (const WCHAR []){ 'a','u','t','h','o','r',0 }
#elif defined(_MSC_VER)
# define SZ_THDOCPROP_DISPLAYNAME L"DisplayName" # define SZ_THDOCPROP_DISPLAYNAME L"DisplayName"
# define SZ_THDOCPROP_CANONICALNAME L"ThemeName" # define SZ_THDOCPROP_CANONICALNAME L"ThemeName"
# define SZ_THDOCPROP_TOOLTIP L"ToolTip" # define SZ_THDOCPROP_TOOLTIP L"ToolTip"
......
...@@ -378,9 +378,7 @@ enum GLYPHFONTSIZINGTYPE { ...@@ -378,9 +378,7 @@ enum GLYPHFONTSIZINGTYPE {
#define TMT_ATLASRECT 8002 #define TMT_ATLASRECT 8002
/* LINK class */ /* LINK class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_LINK (const WCHAR []){'L','I','N','K',0}
#elif defined(_MSC_VER)
#define VSCLASS_LINK L"LINK" #define VSCLASS_LINK L"LINK"
#else #else
static const WCHAR VSCLASS_LINK[] = {'L','I','N','K',0}; static const WCHAR VSCLASS_LINK[] = {'L','I','N','K',0};
...@@ -396,9 +394,7 @@ enum HYPERLINKSTATES { ...@@ -396,9 +394,7 @@ enum HYPERLINKSTATES {
}; };
/* EMPTYMARKUP class */ /* EMPTYMARKUP class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_EMPTYMARKUP (const WCHAR []){'E','M','P','T','Y','M','A','R','K','U','P',0}
#elif defined(_MSC_VER)
#define VSCLASS_EMPTYMARKUP L"EMPTYMARKUP" #define VSCLASS_EMPTYMARKUP L"EMPTYMARKUP"
#else #else
static const WCHAR VSCLASS_EMPTYMARKUP[] = {'E','M','P','T','Y','M','A','R','K','U','P',0}; static const WCHAR VSCLASS_EMPTYMARKUP[] = {'E','M','P','T','Y','M','A','R','K','U','P',0};
...@@ -414,9 +410,7 @@ enum MARKUPTEXTSTATES { ...@@ -414,9 +410,7 @@ enum MARKUPTEXTSTATES {
}; };
/* STATIC class */ /* STATIC class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_STATIC (const WCHAR []){'S','T','A','T','I','C',0}
#elif defined(_MSC_VER)
#define VSCLASS_STATIC L"STATIC" #define VSCLASS_STATIC L"STATIC"
#else #else
static const WCHAR VSCLASS_STATIC[] = {'S','T','A','T','I','C',0}; static const WCHAR VSCLASS_STATIC[] = {'S','T','A','T','I','C',0};
...@@ -427,9 +421,7 @@ enum STATICPARTS { ...@@ -427,9 +421,7 @@ enum STATICPARTS {
}; };
/* PAGE class */ /* PAGE class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_PAGE (const WCHAR []){'P','A','G','E',0}
#elif defined(_MSC_VER)
#define VSCLASS_PAGE L"PAGE" #define VSCLASS_PAGE L"PAGE"
#else #else
static const WCHAR VSCLASS_PAGE[] = {'P','A','G','E',0}; static const WCHAR VSCLASS_PAGE[] = {'P','A','G','E',0};
...@@ -443,9 +435,7 @@ enum PAGEPARTS { ...@@ -443,9 +435,7 @@ enum PAGEPARTS {
}; };
/* MONTHCAL class */ /* MONTHCAL class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_MONTHCAL (const WCHAR []){'M','O','N','T','H','C','A','L',0}
#elif defined(_MSC_VER)
#define VSCLASS_MONTHCAL L"MONTHCAL" #define VSCLASS_MONTHCAL L"MONTHCAL"
#else #else
static const WCHAR VSCLASS_MONTHCAL[] = {'M','O','N','T','H','C','A','L',0}; static const WCHAR VSCLASS_MONTHCAL[] = {'M','O','N','T','H','C','A','L',0};
...@@ -514,9 +504,7 @@ enum NAVPREVSTATES { ...@@ -514,9 +504,7 @@ enum NAVPREVSTATES {
}; };
/* CLOCK class */ /* CLOCK class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_CLOCK (const WCHAR []){'C','L','O','C','K',0}
#elif defined(_MSC_VER)
#define VSCLASS_CLOCK L"CLOCK" #define VSCLASS_CLOCK L"CLOCK"
#else #else
static const WCHAR VSCLASS_CLOCK[] = {'C','L','O','C','K',0}; static const WCHAR VSCLASS_CLOCK[] = {'C','L','O','C','K',0};
...@@ -531,9 +519,7 @@ enum CLOCKSTATES { ...@@ -531,9 +519,7 @@ enum CLOCKSTATES {
}; };
/* TRAYNOTIFY class */ /* TRAYNOTIFY class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_TRAYNOTIFY (const WCHAR []){'T','R','A','Y','N','O','T','I','F','Y',0}
#elif defined(_MSC_VER)
#define VSCLASS_TRAYNOTIFY L"TRAYNOTIFY" #define VSCLASS_TRAYNOTIFY L"TRAYNOTIFY"
#else #else
static const WCHAR VSCLASS_TRAYNOTIFY[] = {'T','R','A','Y','N','O','T','I','F','Y',0}; static const WCHAR VSCLASS_TRAYNOTIFY[] = {'T','R','A','Y','N','O','T','I','F','Y',0};
...@@ -545,9 +531,7 @@ enum TRAYNOTIFYPARTS { ...@@ -545,9 +531,7 @@ enum TRAYNOTIFYPARTS {
}; };
/* TASKBAR class */ /* TASKBAR class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_TASKBAR (const WCHAR []){'T','A','S','K','B','A','R',0}
#elif defined(_MSC_VER)
#define VSCLASS_TASKBAR L"TASKBAR" #define VSCLASS_TASKBAR L"TASKBAR"
#else #else
static const WCHAR VSCLASS_TASKBAR[] = {'T','A','S','K','B','A','R',0}; static const WCHAR VSCLASS_TASKBAR[] = {'T','A','S','K','B','A','R',0};
...@@ -565,9 +549,7 @@ enum TASKBARPARTS { ...@@ -565,9 +549,7 @@ enum TASKBARPARTS {
}; };
/* TASKBAND class */ /* TASKBAND class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_TASKBAND (const WCHAR []){'T','A','S','K','B','A','N','D',0}
#elif defined(_MSC_VER)
#define VSCLASS_TASKBAND L"TASKBAND" #define VSCLASS_TASKBAND L"TASKBAND"
#else #else
static const WCHAR VSCLASS_TASKBAND[] = {'T','A','S','K','B','A','N','D',0}; static const WCHAR VSCLASS_TASKBAND[] = {'T','A','S','K','B','A','N','D',0};
...@@ -580,9 +562,7 @@ enum TASKBANDPARTS { ...@@ -580,9 +562,7 @@ enum TASKBANDPARTS {
}; };
/* STARTPANEL class */ /* STARTPANEL class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_STARTPANEL (const WCHAR []){'S','T','A','R','T','P','A','N','E','L',0}
#elif defined(_MSC_VER)
#define VSCLASS_STARTPANEL L"STARTPANEL" #define VSCLASS_STARTPANEL L"STARTPANEL"
#else #else
static const WCHAR VSCLASS_STARTPANEL[] = {'S','T','A','R','T','P','A','N','E','L',0}; static const WCHAR VSCLASS_STARTPANEL[] = {'S','T','A','R','T','P','A','N','E','L',0};
...@@ -653,9 +633,7 @@ enum LOGOFFBUTTONSSTATES { ...@@ -653,9 +633,7 @@ enum LOGOFFBUTTONSSTATES {
}; };
/* MENUBAND class */ /* MENUBAND class */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define VSCLASS_MENUBAND (const WCHAR []){'M','E','N','U','B','A','N','D',0}
#elif defined(_MSC_VER)
#define VSCLASS_MENUBAND L"MENUBAND" #define VSCLASS_MENUBAND L"MENUBAND"
#else #else
static const WCHAR VSCLASS_MENUBAND[] = {'M','E','N','U','B','A','N','D',0}; static const WCHAR VSCLASS_MENUBAND[] = {'M','E','N','U','B','A','N','D',0};
......
...@@ -324,17 +324,13 @@ extern "C" { ...@@ -324,17 +324,13 @@ extern "C" {
#define LOCALE_IDIGITSUBSTITUTION 0x1014 #define LOCALE_IDIGITSUBSTITUTION 0x1014
/* Locale name special values */ /* Locale name special values */
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define LOCALE_NAME_INVARIANT (const WCHAR []){ 0 }
#elif defined(_MSC_VER)
# define LOCALE_NAME_INVARIANT L"" # define LOCALE_NAME_INVARIANT L""
#else #else
static const WCHAR LOCALE_NAME_INVARIANT[] = { 0 }; static const WCHAR LOCALE_NAME_INVARIANT[] = { 0 };
#endif #endif
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define LOCALE_NAME_SYSTEM_DEFAULT (const WCHAR []){'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}
#elif defined(_MSC_VER)
# define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale" # define LOCALE_NAME_SYSTEM_DEFAULT L"!sys-default-locale"
#else #else
static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0}; static const WCHAR LOCALE_NAME_SYSTEM_DEFAULT[] = {'!','s','y','s','-','d','e','f','a','u','l','t','-','l','o','c','a','l','e',0};
......
...@@ -4158,7 +4158,7 @@ typedef struct _ACL_SIZE_INFORMATION ...@@ -4158,7 +4158,7 @@ typedef struct _ACL_SIZE_INFORMATION
* Privilege Names * Privilege Names
*/ */
#ifdef UNICODE #ifdef UNICODE
#if defined(_MSC_VER) #if defined(_MSC_VER) || defined(__MINGW32__)
#define SE_CREATE_TOKEN_NAME L"SeCreateTokenPrivilege" #define SE_CREATE_TOKEN_NAME L"SeCreateTokenPrivilege"
#define SE_ASSIGNPRIMARYTOKEN_NAME L"SeAssignPrimaryTokenPrivilege" #define SE_ASSIGNPRIMARYTOKEN_NAME L"SeAssignPrimaryTokenPrivilege"
#define SE_LOCK_MEMORY_NAME L"SeLockMemoryPrivilege" #define SE_LOCK_MEMORY_NAME L"SeLockMemoryPrivilege"
...@@ -4188,37 +4188,7 @@ typedef struct _ACL_SIZE_INFORMATION ...@@ -4188,37 +4188,7 @@ typedef struct _ACL_SIZE_INFORMATION
#define SE_MANAGE_VOLUME_NAME L"SeManageVolumePrivilege" #define SE_MANAGE_VOLUME_NAME L"SeManageVolumePrivilege"
#define SE_IMPERSONATE_NAME L"SeImpersonatePrivilege" #define SE_IMPERSONATE_NAME L"SeImpersonatePrivilege"
#define SE_CREATE_GLOBAL_NAME L"SeCreateGlobalPrivilege" #define SE_CREATE_GLOBAL_NAME L"SeCreateGlobalPrivilege"
#elif defined(__GNUC__) #else /* _MSC_VER/__MINGW32__ */
#define SE_CREATE_TOKEN_NAME (const WCHAR []){ 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }
#define SE_ASSIGNPRIMARYTOKEN_NAME (const WCHAR []){ 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }
#define SE_LOCK_MEMORY_NAME (const WCHAR []){ 'S','e','L','o','c','k','M','e','m','o','r','y','P','r','i','v','i','l','e','g','e',0 }
#define SE_INCREASE_QUOTA_NAME (const WCHAR []){ 'S','e','I','n','c','r','e','a','s','e','Q','u','o','t','a','P','r','i','v','i','l','e','g','e',0 }
#define SE_UNSOLICITED_INPUT_NAME (const WCHAR []){ 'S','e','U','n','s','o','l','i','c','i','t','e','d','I','n','p','u','t','P','r','i','v','i','l','e','g','e',0 }
#define SE_MACHINE_ACCOUNT_NAME (const WCHAR []){ 'S','e','M','a','c','h','i','n','e','A','c','c','o','u','n','t','P','r','i','v','i','l','e','g','e',0 }
#define SE_TCB_NAME (const WCHAR []){ 'S','e','T','c','b','P','r','i','v','i','l','e','g','e',0 }
#define SE_SECURITY_NAME (const WCHAR []){ 'S','e','S','e','c','u','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }
#define SE_TAKE_OWNERSHIP_NAME (const WCHAR []){ 'S','e','T','a','k','e','O','w','n','e','r','s','h','i','p','P','r','i','v','i','l','e','g','e',0 }
#define SE_LOAD_DRIVER_NAME (const WCHAR []){ 'S','e','L','o','a','d','D','r','i','v','e','r','P','r','i','v','i','l','e','g','e',0 }
#define SE_SYSTEM_PROFILE_NAME (const WCHAR []){ 'S','e','S','y','s','t','e','m','P','r','o','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }
#define SE_SYSTEMTIME_NAME (const WCHAR []){ 'S','e','S','y','s','t','e','m','t','i','m','e','P','r','i','v','i','l','e','g','e',0 }
#define SE_PROF_SINGLE_PROCESS_NAME (const WCHAR []){ 'S','e','P','r','o','f','i','l','e','S','i','n','g','l','e','P','r','o','c','e','s','s','P','r','i','v','i','l','e','g','e',0 }
#define SE_INC_BASE_PRIORITY_NAME (const WCHAR []){ 'S','e','I','n','c','r','e','a','s','e','B','a','s','e','P','r','i','o','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }
#define SE_CREATE_PAGEFILE_NAME (const WCHAR []){ 'S','e','C','r','e','a','t','e','P','a','g','e','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }
#define SE_CREATE_PERMANENT_NAME (const WCHAR []){ 'S','e','C','r','e','a','t','e','P','e','r','m','a','n','e','n','t','P','r','i','v','i','l','e','g','e',0 }
#define SE_BACKUP_NAME (const WCHAR []){ 'S','e','B','a','c','k','u','p','P','r','i','v','i','l','e','g','e',0 }
#define SE_RESTORE_NAME (const WCHAR []){ 'S','e','R','e','s','t','o','r','e','P','r','i','v','i','l','e','g','e',0 }
#define SE_SHUTDOWN_NAME (const WCHAR []){ 'S','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }
#define SE_DEBUG_NAME (const WCHAR []){ 'S','e','D','e','b','u','g','P','r','i','v','i','l','e','g','e',0 }
#define SE_AUDIT_NAME (const WCHAR []){ 'S','e','A','u','d','i','t','P','r','i','v','i','l','e','g','e',0 }
#define SE_SYSTEM_ENVIRONMENT_NAME (const WCHAR []){ 'S','e','S','y','s','t','e','m','E','n','v','i','r','o','n','m','e','n','t','P','r','i','v','i','l','e','g','e',0 }
#define SE_CHANGE_NOTIFY_NAME (const WCHAR []){ 'S','e','C','h','a','n','g','e','N','o','t','i','f','y','P','r','i','v','i','l','e','g','e',0 }
#define SE_REMOTE_SHUTDOWN_NAME (const WCHAR []){ 'S','e','R','e','m','o','t','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }
#define SE_UNDOCK_NAME (const WCHAR []){ 'S','e','U','n','d','o','c','k','P','r','i','v','i','l','e','g','e',0 }
#define SE_ENABLE_DELEGATION_NAME (const WCHAR []){ 'S','e','E','n','a','b','l','e','D','e','l','e','g','a','t','i','o','n','P','r','i','v','i','l','e','g','e',0 }
#define SE_MANAGE_VOLUME_NAME (const WCHAR []){ 'S','e','M','a','n','a','g','e','V','o','l','u','m','e','P','r','i','v','i','l','e','g','e',0 }
#define SE_IMPERSONATE_NAME (const WCHAR []){ 'S','e','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }
#define SE_CREATE_GLOBAL_NAME (const WCHAR []){ 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 }
#else /* _MSC_VER/__GNUC__ */
static const WCHAR SE_CREATE_TOKEN_NAME[] = { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_CREATE_TOKEN_NAME[] = { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 };
static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME[] = { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME[] = { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 };
static const WCHAR SE_LOCK_MEMORY_NAME[] = { 'S','e','L','o','c','k','M','e','m','o','r','y','P','r','i','v','i','l','e','g','e',0 }; static const WCHAR SE_LOCK_MEMORY_NAME[] = { 'S','e','L','o','c','k','M','e','m','o','r','y','P','r','i','v','i','l','e','g','e',0 };
......
...@@ -33,10 +33,7 @@ extern "C" { ...@@ -33,10 +33,7 @@ extern "C" {
#define SERVICES_ACTIVE_DATABASEA "ServicesActive" #define SERVICES_ACTIVE_DATABASEA "ServicesActive"
#define SERVICES_FAILED_DATABASEA "ServicesFailed" #define SERVICES_FAILED_DATABASEA "ServicesFailed"
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
# define SERVICES_ACTIVE_DATABASEW (const WCHAR []){ 'S','e','r','v','i','c','e','s','A','c','t','i','v','e',0 }
# define SERVICES_FAILED_DATABASEW (const WCHAR []){ 'S','e','r','v','i','c','e','s','F','a','i','l','e','d',0 }
#elif defined(_MSC_VER)
# define SERVICES_ACTIVE_DATABASEW L"ServicesActive" # define SERVICES_ACTIVE_DATABASEW L"ServicesActive"
# define SERVICES_FAILED_DATABASEW L"ServicesFailed" # define SERVICES_FAILED_DATABASEW L"ServicesFailed"
#else #else
......
...@@ -451,10 +451,7 @@ typedef struct _CRYPT_PROVUI_FUNCS { ...@@ -451,10 +451,7 @@ typedef struct _CRYPT_PROVUI_FUNCS {
extern "C" { extern "C" {
#endif #endif
#if defined(__GNUC__) #if defined(_MSC_VER) || defined(__MINGW32__)
#define WT_PROVIDER_CERTTRUST_FUNCTION (const WCHAR []) \
{'W','i','n','t','r','u','s','t','C','e','r','t','i','f','i','c','a','t','e','T','r','u','s','t', 0}
#elif defined(_MSC_VER)
#define WT_PROVIDER_CERTTRUST_FUNCTION L"WintrustCertificateTrust" #define WT_PROVIDER_CERTTRUST_FUNCTION L"WintrustCertificateTrust"
#else #else
static const WCHAR WT_PROVIDER_CERTTRUST_FUNCTION[] = static const WCHAR WT_PROVIDER_CERTTRUST_FUNCTION[] =
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment