From: Earnie Boyd Date: Wed, 12 Sep 2012 18:10:31 +0000 (-0400) Subject: Redo the filters based on assumptions discussed in mingw-dvlpr list. X-Git-Tag: 4.0-rc1~43 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9313d16b81162e4d6f58aa5b4a08d16dbcbccdb6;p=mingw%2Fmingw-org-wsl.git Redo the filters based on assumptions discussed in mingw-dvlpr list. * include/mshtml.h (_mingw.h): Include. * include/mswsock.h: Ditto. * include/mb30.h: Ditto. * include/ntdef.h: Ditto. * include/ntdll.h: Ditto. * include/ntldap.h: Ditto. * include/ntsecapi.h: Ditto. * include/ntsecpkg.h: Ditto. * include/oaidl.h: Ditto. * include/objbase.h: Ditto. * include/objfwd.h: Ditto. * include/objidl.h: Ditto. * include/objsafe.h: Ditto. * include/ocidlh.: Ditto. * include/odbcinst.h: Ditto. * include/ole.h: Ditto. * include/ole2.h: Ditto. * include/ole2ver.h: Ditto. * include/oleauto.h: Ditto. * include/olectl.h: Ditto. * include/olectlid.h: Ditto. * include/oleidl.h: Ditto. * include/pbt.h: Ditto. * include/powrprof.h: Ditto. * include/qedit.h: Ditto. * include/process.h (_mingw.h): Remove comment and move to top of file. * include/mq.h (_mingw.h): Include. (_WIN32_WINNT): Use MACRO constant for comparison instead of integer and move filters to the end of the file. * include/ntdsapi.h: Ditto. * include/ntdsbcli.h: Ditto. * include/objsel.h: Ditto. * include/msacm.h (_mingw.h): Include. (UNICODE): Use __AW() macro for mapping non-specific symbols. * include/nddeapi.h: Ditto. * include/nspapi.h: Ditto. * include/oleacc.h: Ditto. * include/oledlg.h: Ditto. * include/prsht.h: Ditto. * include/_mingw.h (__AW): Add filters for SQL_NOUNICODEMAP. * TODO: Add items to the list as needed. --- diff --git a/ChangeLog b/ChangeLog index cc25bca..7bda1ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,54 @@ +2012-09-12 Earnie Boyd + + Redo the filters based on assumptions discussed in mingw-dvlpr list. + + * include/mshtml.h (_mingw.h): Include. + * include/mswsock.h: Ditto. + * include/mb30.h: Ditto. + * include/ntdef.h: Ditto. + * include/ntdll.h: Ditto. + * include/ntldap.h: Ditto. + * include/ntsecapi.h: Ditto. + * include/ntsecpkg.h: Ditto. + * include/oaidl.h: Ditto. + * include/objbase.h: Ditto. + * include/objfwd.h: Ditto. + * include/objidl.h: Ditto. + * include/objsafe.h: Ditto. + * include/ocidlh.: Ditto. + * include/odbcinst.h: Ditto. + * include/ole.h: Ditto. + * include/ole2.h: Ditto. + * include/ole2ver.h: Ditto. + * include/oleauto.h: Ditto. + * include/olectl.h: Ditto. + * include/olectlid.h: Ditto. + * include/oleidl.h: Ditto. + * include/pbt.h: Ditto. + * include/powrprof.h: Ditto. + * include/qedit.h: Ditto. + + * include/process.h (_mingw.h): Remove comment and move to top of file. + + * include/mq.h (_mingw.h): Include. + (_WIN32_WINNT): Use MACRO constant for comparison instead of integer + and move filters to the end of the file. + * include/ntdsapi.h: Ditto. + * include/ntdsbcli.h: Ditto. + * include/objsel.h: Ditto. + + * include/msacm.h (_mingw.h): Include. + (UNICODE): Use __AW() macro for mapping non-specific symbols. + * include/nddeapi.h: Ditto. + * include/nspapi.h: Ditto. + * include/oleacc.h: Ditto. + * include/oledlg.h: Ditto. + * include/prsht.h: Ditto. + + * include/_mingw.h (__AW): Add filters for SQL_NOUNICODEMAP. + + * TODO: Add items to the list as needed. + 2012-09-11 Earnie Boyd Redo the filters based on assumptions discussed in mingw-dvlpr list. diff --git a/TODO b/TODO index 91ff4c0..d32d0e6 100644 --- a/TODO +++ b/TODO @@ -6,3 +6,6 @@ ** lmstats.h - What is LM20_WORKSTATION_STATISTICS? ** malloc.h - What about calloc, free, malloc, realloc and _recalloc? ** math.h - Commented out code. +** objbase.h - DBG, how does MS set this macro? +** objidl.h - Commented out code in PROVARIANT struct. +** odbcinst.h - UNICODE?? diff --git a/include/_mingw.h b/include/_mingw.h index 0e66e9d..eda88bb 100644 --- a/include/_mingw.h +++ b/include/_mingw.h @@ -199,7 +199,12 @@ typedef struct localeinfo_struct { * the symbol passed and concantenating either A or W to the symbol. */ #define __AW__(AW, AW_) AW ## AW_ -#if (defined(UNICODE) || defined(_UNICODE) || defined(FORCE_UNICODE)) +#if ( \ + (!defined(_ODBCINST_H) && defined(UNICODE)) || \ + (!defined(_ODBCINST_H) && defined(_UNICODE)) || \ + defined(FORCE_UNICODE) \ + (defined _ODBCINST_H && !defined(SQL_NOUNICODEMAP) && defined(UNICODE)) \ +) #define __AW(AW) __AW__(AW, W) #define __STR(AW) __AW__(L, AW) #else diff --git a/include/mq.h b/include/mq.h index 345aef4..b6296a6 100644 --- a/include/mq.h +++ b/include/mq.h @@ -24,6 +24,7 @@ #ifndef _MQ_H #define _MQ_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -106,19 +107,6 @@ extern "C" { #define PROPID_M_LAST_IN_XACT 51 #define PROPID_M_XACTID 52 #define PROPID_M_AUTHENTICATED_EX 53 -#if (_WIN32_WINNT >= 0x0501) -#define PROPID_M_RESP_FORMAT_NAME 54 -#define PROPID_M_RESP_FORMAT_NAME_LEN 55 -#define PROPID_M_DEST_FORMAT_NAME 58 -#define PROPID_M_DEST_FORMAT_NAME_LEN 59 -#define PROPID_M_LOOKUPID 60 -#define PROPID_M_SOAP_ENVELOPE 61 -#define PROPID_M_SOAP_ENVELOPE_LEN 62 -#define PROPID_M_COMPOUND_MESSAGE 63 -#define PROPID_M_COMPOUND_MESSAGE_SIZE 64 -#define PROPID_M_SOAP_HEADER 65 -#define PROPID_M_SOAP_BODY 66 -#endif /*#define PROPID_M_TOTAL_ABORT_COUNT*/ #define PROPID_M_CORRELATIONID_SIZE 20 #define PROPID_M_MSGID_SIZE 20 @@ -367,22 +355,6 @@ extern "C" { /*#define MQ_MTS_TRANSACTION*/ /*#define MQ_SINGLE_MESSAGE*/ /*#define MQ_XA_TRANSACTION*/ -#if (_WIN32_WINNT >= 0x0501) -#define MQ_LOOKUP_PEEK_CURRENT 0x40000010 -#define MQ_LOOKUP_PEEK_NEXT 0x40000011 -#define MQ_LOOKUP_PEEK_PREV 0x40000012 -#define MQ_LOOKUP_PEEK_FIRST 0x40000014 -#define MQ_LOOKUP_PEEK_LAST 0x40000018 -#define MQ_LOOKUP_RECEIVE_CURRENT 0x40000020 -#define MQ_LOOKUP_RECEIVE_NEXT 0x40000021 -#define MQ_LOOKUP_RECEIVE_PREV 0x40000022 -#define MQ_LOOKUP_RECEIVE_FIRST 0x40000024 -#define MQ_LOOKUP_RECEIVE_LAST 0x40000028 -#endif -#if (_WIN32_WINNT >= 0x0500) -#define MQCERT_REGISTER_ALWAYS 0x00000001 -#define MQCERT_REGISTER_IF_NOT_EXIST 0x00000002 -#endif #define PRLT 0 #define PRLE 1 #define PRGT 2 @@ -490,9 +462,6 @@ typedef struct tagSEQUENCE_INFO { typedef HANDLE QUEUEHANDLE; typedef VOID (*PMQRECEIVECALLBACK)(VOID); -#if (_WIN32_WINNT >= 0x0501) -HRESULT WINAPI MQADsPathToFormatName(LPCWSTR,LPWSTR,LPDWORD); -#endif HRESULT WINAPI MQBeginTransaction(ITransaction **); HRESULT WINAPI MQCloseCursor(HANDLE); HRESULT WINAPI MQCloseQueue(QUEUEHANDLE); @@ -502,10 +471,6 @@ HRESULT WINAPI MQDeleteQueue(LPCWSTR); VOID WINAPI MQFreeMemory(PVOID); VOID WINAPI MQFreeSecurityContext(HANDLE); HRESULT WINAPI MQGetMachineProperties(LPCWSTR,const GUID *,MQQMPROPS *); -#if (_WIN32_WINNT >= 0x0500) -HRESULT WINAPI MQGetOverlappedResult(LPOVERLAPPED); -HRESULT WINAPI MQGetPrivateComputerInformation(LPCWSTR,MQPRIVATEPROPS *); -#endif HRESULT WINAPI MQGetQueueProperties(LPCWSTR,MQQUEUEPROPS *); HRESULT WINAPI MQGetQueueSecurity(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); HRESULT WINAPI MQGetSecurityContext(LPVOID,DWORD,HANDLE *); @@ -515,41 +480,63 @@ HRESULT WINAPI MQGetPrivateComputerInformation(LPCWSTR,MQPRIVATEPROPS *); HRESULT WINAPI MQGetQueueProperties(LPCWSTR,MQQUEUEPROPS *); HRESULT WINAPI MQGetQueueSecurity(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD,LPDWORD); HRESULT WINAPI MQGetSecurityContext(LPVOID,DWORD,HANDLE *); -#if (_WIN32_WINNT >= 0x0500) -HRESULT WINAPI MQGetSecurityContextEx(LPVOID,DWORD,HANDLE *); -#endif HRESULT WINAPI MQHandleToFormatName(QUEUEHANDLE,LPWSTR,LPDWORD); HRESULT WINAPI MQInstanceToFormatName(GUID *,LPWSTR,LPDWORD); HRESULT WINAPI MQLocateBegin(LPCWSTR,MQRESTRICTION *,MQCOLUMNSET *,MQSORTSET *,PHANDLE); HRESULT WINAPI MQLocateEnd(HANDLE); HRESULT WINAPI MQLocateNext(HANDLE,DWORD *,MQPROPVARIANT[]); -#if (_WIN32_WINNT >= 0x0600) -HRESULT WINAPI MQMarkMessageRejected(QUEUEHANDLE,ULONGLONG); -#endif -#if (_WIN32_WINNT >= 0x0501) -HRESULT WINAPI MQMgmtAction(LPCWSTR,LPCWSTR,LPCWSTR); -HRESULT WINAPI MQMgmtGetInfo(LPCWSTR,LPCWSTR,MQMGMTPROPS *); -#endif -#if (_WIN32_WINNT >= 0x0600) -HRESULT WINAPI MQMoveMessage(QUEUEHANDLE,QUEUEHANDLE,ULONGLONG,ITransaction *); -#endif HRESULT WINAPI MQOpenQueue(LPCWSTR,DWORD,DWORD,QUEUEHANDLE *); HRESULT WINAPI MQPathNameToFormatName(LPCWSTR,LPWSTR,LPDWORD); -#if (_WIN32_WINNT >= 0x0501) -HRESULT WINAPI MQPurgeQueue(QUEUEHANDLE); -#endif HRESULT WINAPI MQReceiveMessage(QUEUEHANDLE,DWORD,DWORD,MQMSGPROPS *,LPOVERLAPPED,PMQRECEIVECALLBACK,HANDLE,ITransaction *); -#if (_WIN32_WINNT >= 0x0501) -HRESULT WINAPI MQReceiveMessageByLookupId(QUEUEHANDLE,ULONGLONG,DWORD,MQMSGPROPS *,LPOVERLAPPED,PMQRECEIVECALLBACK,ITransaction *); -#endif -#if (_WIN32_WINNT >= 0x0500) -HRESULT WINAPI MQRegisterCertificate(DWORD,PVOID,DWORD); -#endif HRESULT WINAPI MQSendMessage(QUEUEHANDLE,MQMSGPROPS *,ITransaction *); HRESULT WINAPI MQSetQueueProperties(LPCWSTR,MQQUEUEPROPS *); HRESULT WINAPI MQSetQueueSecurity(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) +#define MQCERT_REGISTER_ALWAYS 0x00000001 +#define MQCERT_REGISTER_IF_NOT_EXIST 0x00000002 +HRESULT WINAPI MQGetOverlappedResult(LPOVERLAPPED); +HRESULT WINAPI MQGetPrivateComputerInformation(LPCWSTR,MQPRIVATEPROPS *); +HRESULT WINAPI MQGetSecurityContextEx(LPVOID,DWORD,HANDLE *); +HRESULT WINAPI MQRegisterCertificate(DWORD,PVOID,DWORD); +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ + +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) +#define PROPID_M_RESP_FORMAT_NAME 54 +#define PROPID_M_RESP_FORMAT_NAME_LEN 55 +#define PROPID_M_DEST_FORMAT_NAME 58 +#define PROPID_M_DEST_FORMAT_NAME_LEN 59 +#define PROPID_M_LOOKUPID 60 +#define PROPID_M_SOAP_ENVELOPE 61 +#define PROPID_M_SOAP_ENVELOPE_LEN 62 +#define PROPID_M_COMPOUND_MESSAGE 63 +#define PROPID_M_COMPOUND_MESSAGE_SIZE 64 +#define PROPID_M_SOAP_HEADER 65 +#define PROPID_M_SOAP_BODY 66 +#define MQ_LOOKUP_PEEK_CURRENT 0x40000010 +#define MQ_LOOKUP_PEEK_NEXT 0x40000011 +#define MQ_LOOKUP_PEEK_PREV 0x40000012 +#define MQ_LOOKUP_PEEK_FIRST 0x40000014 +#define MQ_LOOKUP_PEEK_LAST 0x40000018 +#define MQ_LOOKUP_RECEIVE_CURRENT 0x40000020 +#define MQ_LOOKUP_RECEIVE_NEXT 0x40000021 +#define MQ_LOOKUP_RECEIVE_PREV 0x40000022 +#define MQ_LOOKUP_RECEIVE_FIRST 0x40000024 +#define MQ_LOOKUP_RECEIVE_LAST 0x40000028 +HRESULT WINAPI MQADsPathToFormatName(LPCWSTR,LPWSTR,LPDWORD); +HRESULT WINAPI MQMgmtAction(LPCWSTR,LPCWSTR,LPCWSTR); +HRESULT WINAPI MQMgmtGetInfo(LPCWSTR,LPCWSTR,MQMGMTPROPS *); +HRESULT WINAPI MQPurgeQueue(QUEUEHANDLE); +HRESULT WINAPI MQReceiveMessageByLookupId(QUEUEHANDLE,ULONGLONG,DWORD,MQMSGPROPS *,LPOVERLAPPED,PMQRECEIVECALLBACK,ITransaction *); +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WINXP */ + +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) +HRESULT WINAPI MQMarkMessageRejected(QUEUEHANDLE,ULONGLONG); +HRESULT WINAPI MQMoveMessage(QUEUEHANDLE,QUEUEHANDLE,ULONGLONG,ITransaction *); +#endif /* _WIN32_WINNT >= _WIN32_WINNT_VISTA */ + #ifdef __cplusplus } #endif + #endif diff --git a/include/msacm.h b/include/msacm.h index 4833772..ed7605c 100644 --- a/include/msacm.h +++ b/include/msacm.h @@ -24,6 +24,7 @@ #ifndef _MSACM_H #define _MSACM_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -240,31 +241,15 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose); /*msdn.microsoft.com/en-us/library/dd742924%28VS.85%29.aspx*/ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, LPACMSTREAMHEADER pash, DWORD fdwConvert); -#ifdef UNICODE - -typedef ACMFORMATDETAILSW ACMFORMATDETAILS, *LPACMFORMATDETAILS; -typedef ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS, *LPACMFORMATTAGDETAILS; -typedef ACMDRIVERDETAILSW ACMDRIVERDETAILS, *LPACMDRIVERDETAILS; -typedef ACMFORMATENUMCBW ACMFORMATENUMCB; -typedef ACMFORMATTAGENUMCBW ACMFORMATTAGENUMCB; -#define acmFormatEnum acmFormatEnumW -#define acmDriverDetails acmDriverDetailsW -#define acmFormatTagEnum acmFormatTagEnumW -#define acmDriverAdd acmDriverAddW - -#else /*ifdef UNICODE*/ - -typedef ACMFORMATDETAILSA ACMFORMATDETAILS, *LPACMFORMATDETAILS; -typedef ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS, *LPACMFORMATTAGDETAILS; -typedef ACMDRIVERDETAILSA ACMDRIVERDETAILS, *LPACMDRIVERDETAILS; -typedef ACMFORMATENUMCBA ACMFORMATENUMCB; -typedef ACMFORMATTAGENUMCBA ACMFORMATTAGENUMCB; -#define acmFormatEnum acmFormatEnumA -#define acmDriverDetails acmDriverDetailsA -#define acmFormatTagEnum acmFormatTagEnumA -#define acmDriverAdd acmDriverAddA - -#endif /*ifdef UNICODE*/ +typedef __AW(ACMFORMATDETAILS) ACMFORMATDETAILS, *LPACMFORMATDETAILS; +typedef __AW(ACMFORMATTAGDETAILS) ACMFORMATTAGDETAILS, *LPACMFORMATTAGDETAILS; +typedef __AW(ACMDRIVERDETAILS) ACMDRIVERDETAILS, *LPACMDRIVERDETAILS; +typedef __AW(ACMFORMATENUMCB) ACMFORMATENUMCB; +typedef __AW(ACMFORMATTAGENUMCB) ACMFORMATTAGENUMCB; +#define acmFormatEnum __AW(acmFormatEnum) +#define acmDriverDetails __AW(acmDriverDetails) +#define acmFormatTagEnum __AW(acmFormatTagEnum) +#define acmDriverAdd __AW(acmDriverAdd) #ifdef __cplusplus } diff --git a/include/mshtml.h b/include/mshtml.h index 2d8453a..8c32871 100644 --- a/include/mshtml.h +++ b/include/mshtml.h @@ -24,6 +24,7 @@ #ifndef _MSHTML_H #define _MSHTML_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { diff --git a/include/mswsock.h b/include/mswsock.h index afe3975..a5c6454 100644 --- a/include/mswsock.h +++ b/include/mswsock.h @@ -24,6 +24,7 @@ #ifndef _MSWSOCK_H #define _MSWSOCK_H #pragma GCC system_header +#include <_mingw.h> /* * MS-specific extensions to Windows Sockets, exported from mswsock.dll. diff --git a/include/nb30.h b/include/nb30.h index c02d938..f56c0d6 100644 --- a/include/nb30.h +++ b/include/nb30.h @@ -24,10 +24,12 @@ #ifndef _NB30_H #define _NB30_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define NCBNAMSZ 16 #define MAX_LANA 254 #define NAME_FLAGS_MASK 0x87 @@ -201,7 +203,9 @@ typedef struct _SESSION_HEADER { UCHAR rcv_any_outstanding; } SESSION_HEADER,*PSESSION_HEADER; UCHAR WINAPI Netbios(PNCB); + #ifdef __cplusplus } #endif + #endif diff --git a/include/nddeapi.h b/include/nddeapi.h index ad2fc91..dcd1711 100644 --- a/include/nddeapi.h +++ b/include/nddeapi.h @@ -24,10 +24,12 @@ #ifndef _NDDEAPI_H #define _NDDEAPI_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #ifndef CNLEN /* also in lmcons.h */ #define CNLEN 15 #define UNCLEN (CNLEN + 2) @@ -121,34 +123,20 @@ UINT WINAPI NDdeShareSetInfoA(LPSTR,LPSTR,UINT,PBYTE,DWORD,WORD); UINT WINAPI NDdeShareSetInfoW(LPWSTR,LPWSTR,UINT,PBYTE,DWORD,WORD); UINT WINAPI NDdeTrustedShareEnumA(LPSTR,UINT,PBYTE,DWORD,PDWORD,PDWORD); UINT WINAPI NDdeTrustedShareEnumW(LPWSTR,UINT,PBYTE,DWORD,PDWORD,PDWORD); -#ifdef UNICODE -#define NDdeShareAdd NDdeShareAddW -#define NDdeShareDel NDdeShareDelW -#define NDdeSetShareSecurity NDdeSetShareSecurityW -#define NDdeGetShareSecurity NDdeGetShareSecurityW -#define NDdeShareEnum NDdeShareEnumW -#define NDdeShareGetInfo NDdeShareGetInfoW -#define NDdeShareSetInfo NDdeShareSetInfoW -#define NDdeGetErrorString NDdeGetErrorStringW -#define NDdeSetTrustedShare NDdeSetTrustedShareW -#define NDdeGetTrustedShare NDdeGetTrustedShareW -#define NDdeTrustedShareEnum NDdeTrustedShareEnumW -#else -#define NDdeShareAdd NDdeShareAddA -#define NDdeShareDel NDdeShareDelA -#define NDdeSetShareSecurity NDdeSetShareSecurityA -#define NDdeGetShareSecurity NDdeGetShareSecurityA -#define NDdeShareEnum NDdeShareEnumA -#define NDdeShareGetInfo NDdeShareGetInfoA -#define NDdeShareSetInfo NDdeShareSetInfoA -#define NDdeGetErrorString NDdeGetErrorStringA -#define NDdeIsValidShareName NDdeIsValidShareNameA -#define NDdeIsValidAppTopicList NDdeIsValidAppTopicListA -#define NDdeSetTrustedShare NDdeSetTrustedShareA -#define NDdeGetTrustedShare NDdeGetTrustedShareA -#define NDdeTrustedShareEnum NDdeTrustedShareEnumA -#endif +#define NDdeShareAdd __AW(NDdeShareAdd) +#define NDdeShareDel __AW(NDdeShareDel) +#define NDdeSetShareSecurity __AW(NDdeSetShareSecurity) +#define NDdeGetShareSecurity __AW(NDdeGetShareSecurity) +#define NDdeShareEnum __AW(NDdeShareEnum) +#define NDdeShareGetInfo __AW(NDdeShareGetInfo) +#define NDdeShareSetInfo __AW(NDdeShareSetInfo) +#define NDdeGetErrorString __AW(NDdeGetErrorString) +#define NDdeSetTrustedShare __AW(NDdeSetTrustedShare) +#define NDdeGetTrustedShare __AW(NDdeGetTrustedShare) +#define NDdeTrustedShareEnum __AW(NDdeTrustedShareEnum) + #ifdef __cplusplus } #endif + #endif diff --git a/include/nspapi.h b/include/nspapi.h index 9f19893..96a8b8e 100644 --- a/include/nspapi.h +++ b/include/nspapi.h @@ -24,6 +24,7 @@ #ifndef _NSPAPI_H #define _NSPAPI_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -127,21 +128,15 @@ INT WINAPI SetServiceW(DWORD,DWORD,DWORD,LPSERVICE_INFOW,LPSERVICE_ASYNC_INFO,LP INT WINAPI GetAddressByNameA(DWORD,LPGUID,LPSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPSTR,LPDWORD); INT WINAPI GetAddressByNameW(DWORD,LPGUID,LPWSTR,LPINT,DWORD,LPSERVICE_ASYNC_INFO,LPVOID,LPDWORD,LPWSTR,LPDWORD); -#ifdef UNICODE -typedef SERVICE_INFOW SERVICE_INFO, *LPSERVICE_INFO; -#define _SERVICE_INFO SERVICE_INFOW -#define SetService SetServiceW -#define GetAddressByName GetAddressByNameW -#else -typedef SERVICE_INFOA SERVICE_INFO, *LPSERVICE_INFO; -#define _SERVICE_INFO SERVICE_INFOA -#define SetService SetServiceA -#define GetAddressByName GetAddressByNameA -#endif +typedef __AW(SERVICE_INFO) SERVICE_INFO, *LPSERVICE_INFO; +#define _SERVICE_INFO __AW(SERVICE_INFO) +#define SetService __AW(SetService) +#define GetAddressByName __AW(GetAddressByName) #endif /* RC_INVOKED */ #ifdef __cplusplus } #endif + #endif /* _NSPAPI_H */ diff --git a/include/ntdef.h b/include/ntdef.h index 652624c..17310dd 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -24,6 +24,7 @@ #ifndef _NTDEF_H #define _NTDEF_H #pragma GCC system_header +#include <_mingw.h> #define NTAPI __stdcall #define OBJ_INHERIT 2L @@ -41,10 +42,12 @@ (p)->SecurityDescriptor = (s); \ (p)->SecurityQualityOfService = NULL; \ } + #ifndef NT_SUCCESS #define NT_SUCCESS(x) ((x)>=0) #define STATUS_SUCCESS ((NTSTATUS)0) #endif + #if !defined(_NTSECAPI_H) && !defined(_SUBAUTH_H) typedef LONG NTSTATUS, *PNTSTATUS; typedef struct _UNICODE_STRING { @@ -59,6 +62,7 @@ typedef struct _STRING { PCHAR Buffer; } STRING, *PSTRING; #endif + typedef STRING ANSI_STRING; typedef PSTRING PANSI_STRING; typedef STRING OEM_STRING; @@ -68,6 +72,7 @@ typedef enum _SECTION_INHERIT { ViewShare = 1, ViewUnmap = 2 } SECTION_INHERIT; + #if !defined(_NTSECAPI_H) typedef struct _OBJECT_ATTRIBUTES { ULONG Length; @@ -78,4 +83,5 @@ typedef struct _OBJECT_ATTRIBUTES { PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif + #endif /* _NTDEF_H */ diff --git a/include/ntdll.h b/include/ntdll.h index 057c3b7..e347101 100644 --- a/include/ntdll.h +++ b/include/ntdll.h @@ -24,6 +24,7 @@ #ifndef _NTDLL_H #define _NTDLL_H #pragma GCC system_header +#include <_mingw.h> typedef enum _SHUTDOWN_ACTION { ShutdownNoReboot, diff --git a/include/ntdsapi.h b/include/ntdsapi.h index 1534cbe..7435ae4 100644 --- a/include/ntdsapi.h +++ b/include/ntdsapi.h @@ -24,20 +24,14 @@ #ifndef _NTDSAPI_H #define _NTDSAPI_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif /*--- Active Directory Reference - Active Directory Enumerations */ -#if (_WIN32_WINNT >= 0x0501) -typedef enum _DS_MANGLE_FOR { - DS_MANGLE_UNKNOWN = 0, - DS_MANGLE_OBJECT_RDN_FOR_DELETION = 1, - DS_MANGLE_OBJECT_RDN_FOR_NAME_CONFLICT = 2 -} DS_MANGLE_FOR; -#endif /* (_WIN32_WINNT >= 0x0501) */ -#if (_WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) typedef enum { DS_NAME_NO_ERROR = 0, DS_NAME_ERROR_RESOLVING = 1, @@ -112,9 +106,15 @@ typedef enum { DS_SPN_REPLACE_SPN_OP = 1, DS_SPN_DELETE_SPN_OP = 2 } DS_SPN_WRITE_OP; +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) */ - -#endif /* (_WIN32_WINNT >= 0x0500) */ +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) +typedef enum _DS_MANGLE_FOR { + DS_MANGLE_UNKNOWN = 0, + DS_MANGLE_OBJECT_RDN_FOR_DELETION = 1, + DS_MANGLE_OBJECT_RDN_FOR_NAME_CONFLICT = 2 +} DS_MANGLE_FOR; +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WINXP) */ #ifdef __cplusplus } diff --git a/include/ntdsbcli.h b/include/ntdsbcli.h index 35acef0..c38c681 100644 --- a/include/ntdsbcli.h +++ b/include/ntdsbcli.h @@ -24,13 +24,14 @@ #ifndef _NTDSBCLI_H #define _NTDSBCLI_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif /*--- Active Directory Reference - Active Directory Structures - Directory Backup Structures */ -#if (_WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) typedef struct { LPSTR szDatabaseName; LPSTR szNewDatabaseName; @@ -39,12 +40,8 @@ typedef struct { LPWSTR szDatabaseName; LPWSTR szNewDatabaseName; } EDB_RSTMAPW,*PEDB_RSTMAPW; -#ifdef UNICODE -typedef EDB_RSTMAPW EDB_RSTMAP,*PEDB_RSTMAP; -#else -typedef EDB_RSTMAPA EDB_RSTMAP,*PEDB_RSTMAP; -#endif -#endif /* (_WIN32_WINNT >= 0x0500) */ +typedef __AW(EDB_RSTMAP) EDB_RSTMAP,*PEDB_RSTMAP; +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) */ #ifdef __cplusplus } diff --git a/include/ntldap.h b/include/ntldap.h index 7ce8318..2f81db1 100644 --- a/include/ntldap.h +++ b/include/ntldap.h @@ -24,6 +24,7 @@ #ifndef _NTLDAP_H #define _NTLDAP_H #pragma GCC system_header +#include <_mingw.h> /* * LDAP API Extensions diff --git a/include/ntsecapi.h b/include/ntsecapi.h index fdc23b0..eb799b4 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -24,10 +24,12 @@ #ifndef _NTSECAPI_H #define _NTSECAPI_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #define KERB_WRAP_NO_ENCRYPT 0x80000001 #define LOGON_GUEST 1 #define LOGON_NOENCRYPTION 2 @@ -143,6 +145,7 @@ extern "C" { #define TRUST_TYPE_UPLEVEL 2 #define TRUST_TYPE_MIT 3 #define TRUST_TYPE_DCE 4 + #if !defined(_NTDEF_H) && !defined(_SUBAUTH_H) typedef LONG NTSTATUS, *PNTSTATUS; typedef struct _UNICODE_STRING { @@ -157,6 +160,7 @@ typedef struct _STRING { PCHAR Buffer; } STRING, *PSTRING; #endif + typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef enum _MSV1_0_LOGON_SUBMIT_TYPE { @@ -280,6 +284,7 @@ typedef struct _LSA_ENUMERATION_INFORMATION { PSID Sid; } LSA_ENUMERATION_INFORMATION, *PLSA_ENUMERATION_INFORMATION; typedef ULONG LSA_OPERATIONAL_MODE, *PLSA_OPERATIONAL_MODE; + #if !defined(_NTDEF_H) typedef struct _LSA_OBJECT_ATTRIBUTES { ULONG Length; @@ -290,6 +295,7 @@ typedef struct _LSA_OBJECT_ATTRIBUTES { PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif + typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; typedef struct _LSA_TRUST_INFORMATION { LSA_UNICODE_STRING Name; @@ -630,4 +636,5 @@ typedef BOOLEAN (*PSAM_PASSWORD_FILTER_ROUTINE)(PUNICODE_STRING,PUNICODE_STRING, #ifdef __cplusplus } #endif + #endif /* _NTSECAPI_H */ diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index de90edc..c2d9a3b 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -24,6 +24,7 @@ #ifndef _NTSECPKG_H #define _NTSECPKG_H #pragma GCC system_header +#include <_mingw.h> #include "windef.h" #include "ntsecapi.h" @@ -449,4 +450,5 @@ typedef NTSTATUS (WINAPI *SpUserModeInitializeFn)(ULONG, PULONG, #ifdef __cplusplus } #endif + #endif /* _NTSECPKG_H */ diff --git a/include/oaidl.h b/include/oaidl.h index 4279013..5bdff8e 100644 --- a/include/oaidl.h +++ b/include/oaidl.h @@ -24,6 +24,7 @@ #ifndef _OAIDL_H #define _OAIDL_H #pragma GCC system_header +#include <_mingw.h> #ifndef COM_NO_WINDOWS_H #include @@ -33,6 +34,7 @@ #ifdef __cplusplus extern "C" { #endif + #ifdef NONAMELESSUNION #define __VARIANT_NAME_1 n1 #define __VARIANT_NAME_2 n2 @@ -45,6 +47,7 @@ extern "C" { #define __VARIANT_NAME_3 #define __VARIANT_NAME_4 #endif + #define DISPID_UNKNOWN (-1) #define DISPID_VALUE (0) #define DISPID_PROPERTYPUT (-3) @@ -211,9 +214,11 @@ typedef struct tagSAFEARRAY { PVOID pvData; SAFEARRAYBOUND rgsabound[1]; }SAFEARRAY,*LPSAFEARRAY; + #if !defined (NONAMELESSUNION) __extension__ /* no named members */ #endif + typedef struct tagVARIANT { _ANONYMOUS_UNION union { struct __tagVARIANT { @@ -796,4 +801,5 @@ DECLARE_INTERFACE_(ITypeMarshal, IUnknown) #ifdef __cplusplus } #endif + #endif diff --git a/include/objbase.h b/include/objbase.h index 797a40d..3ba0f83 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -24,6 +24,7 @@ #ifndef _OBJBASE_H #define _OBJBASE_H #pragma GCC system_header +#include <_mingw.h> /* Include here to prevent circular dependencies if windows.h not already included */ @@ -103,6 +104,7 @@ inline BOOL operator!=(const GUID& g1, const GUID& g2) #else #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #endif + #define IsEqualIID(id1,id2) IsEqualGUID(id1,id2) #define IsEqualCLSID(id1,id2) IsEqualGUID(id1,id2) #include @@ -127,10 +129,12 @@ WINOLEAPI_(DWORD) CoGetCurrentProcess(void); WINOLEAPI CoRegisterMallocSpy(LPMALLOCSPY); WINOLEAPI CoRevokeMallocSpy(void); WINOLEAPI CoCreateStandardMalloc(DWORD,IMalloc**); + #ifdef DBG WINOLEAPI_(ULONG) DebugCoGetRpcFault(void); WINOLEAPI_(void) DebugCoSetRpcFault(ULONG); #endif + WINOLEAPI CoGetClassObject(REFCLSID,DWORD,COSERVERINFO*,REFIID,PVOID*); WINOLEAPI CoRegisterClassObject(REFCLSID,LPUNKNOWN,DWORD,DWORD,PDWORD); WINOLEAPI CoRevokeClassObject(DWORD); @@ -221,4 +225,5 @@ WINOLEAPI CoGetPSClsid(REFIID,CLSID*); WINOLEAPI CoRegisterPSClsid(REFIID,REFCLSID); #pragma pack(pop) + #endif diff --git a/include/objfwd.h b/include/objfwd.h index 111e2cb..b1f5d07 100644 --- a/include/objfwd.h +++ b/include/objfwd.h @@ -24,12 +24,14 @@ #ifndef _OBJFWD_H #define _OBJFWD_H #pragma GCC system_header +#include <_mingw.h> #include #ifdef __cplusplus extern "C" { #endif + typedef _COM_interface IMoniker *LPMONIKER; typedef _COM_interface IStream *LPSTREAM; typedef _COM_interface IMarshal *LPMARSHAL; @@ -72,7 +74,9 @@ typedef _COM_interface IClassActivator *LPCLASSACTIVATOR; typedef _COM_interface IFillLockBytes *LPFILLLOCKBYTES; typedef _COM_interface IProgressNotify *LPPROGRESSNOTIFY; typedef _COM_interface ILayoutStorage *LPLAYOUTSTORAGE; + #ifdef __cplusplus } #endif + #endif diff --git a/include/objidl.h b/include/objidl.h index 1481457..0db88ef 100644 --- a/include/objidl.h +++ b/include/objidl.h @@ -24,6 +24,7 @@ #ifndef _OBJIDL_H #define _OBJIDL_H #pragma GCC system_header +#include <_mingw.h> #include diff --git a/include/objsafe.h b/include/objsafe.h index c3eacc0..7c22452 100644 --- a/include/objsafe.h +++ b/include/objsafe.h @@ -24,6 +24,7 @@ #ifndef _OBJSAFE_H #define _OBJSAFE_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -44,4 +45,5 @@ DECLARE_INTERFACE_(IObjectSafety,IUnknown) #ifdef __cplusplus } #endif + #endif diff --git a/include/objsel.h b/include/objsel.h index 6f0f63b..3d8f68c 100644 --- a/include/objsel.h +++ b/include/objsel.h @@ -24,13 +24,14 @@ #ifndef _OBJSEL_H #define _OBJSEL_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif /*--- Active Directory Reference - Active Directory Structures - Object Picker Dialog Box Structures */ -#if (_WIN32_WINNT >= 0x0500) +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) typedef struct _DS_SELECTION { PWSTR pwzName; PWSTR pwzADsPath; @@ -117,9 +118,10 @@ typedef struct _DSOP_INIT_INFO { } DSOP_INIT_INFO,*PDSOP_INIT_INFO; #define DSOP_FLAG_MULTISELECT 0x00000001 #define DSOP_FLAG_SKIP_TARGET_COMPUTER_DC_CHECK 0x00000002 -#endif /* (_WIN32_WINNT >= 0x0500) */ +#endif /* (_WIN32_WINNT >= _WIN32_WINNT_WIN2K) */ #ifdef __cplusplus } #endif + #endif diff --git a/include/ocidl.h b/include/ocidl.h index c808141..6f057d7 100644 --- a/include/ocidl.h +++ b/include/ocidl.h @@ -24,6 +24,7 @@ #ifndef _OCIDL_H #define _OCIDL_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -874,4 +875,5 @@ DECLARE_INTERFACE_(IQuickActivate,IUnknown) #ifdef __cplusplus } #endif + #endif diff --git a/include/odbcinst.h b/include/odbcinst.h index fdf4585..d684051 100644 --- a/include/odbcinst.h +++ b/include/odbcinst.h @@ -24,17 +24,23 @@ #ifndef _ODBCINST_H #define _ODBCINST_H #pragma GCC system_header +#include <_mingw.h> + #include + #ifdef __cplusplus extern "C" { #endif + #ifndef ODBCVER #define ODBCVER 0x0351 #endif + #define INSTAPI __stdcall #define ODBC_ADD_DSN 1 #define ODBC_CONFIG_DSN 2 #define ODBC_REMOVE_DSN 3 + #if (ODBCVER >= 0x0250) #define ODBC_ADD_SYS_DSN 4 #define ODBC_CONFIG_SYS_DSN 5 @@ -46,6 +52,7 @@ extern "C" { #define ODBC_CONFIG_DRIVER 3 #define ODBC_CONFIG_DRIVER_MAX 100 #endif /* (ODBCVER >= 0x0250) */ + #if (ODBCVER >= 0x0300) #define ODBC_REMOVE_DEFAULT_DSN 7 #define ODBC_BOTH_DSN 0 @@ -107,6 +114,7 @@ BOOL INSTAPI SQLWriteDSNToIni(LPCSTR,LPCSTR); BOOL INSTAPI SQLWriteDSNToIniW(LPCWSTR,LPCWSTR); BOOL INSTAPI SQLWritePrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR); BOOL INSTAPI SQLWritePrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); + #if(ODBCVER >= 0x0250) BOOL INSTAPI ConfigDriver(HWND,WORD,LPCSTR,LPCSTR,LPSTR,WORD,WORD*); BOOL INSTAPI ConfigDriverW(HWND,WORD,LPCWSTR,LPCWSTR,LPWSTR,WORD,WORD*); @@ -120,6 +128,7 @@ BOOL INSTAPI SQLRemoveDriverW(LPCWSTR,BOOL,LPDWORD); BOOL INSTAPI SQLRemoveTranslator(LPCSTR,LPDWORD); BOOL INSTAPI SQLRemoveTranslatorW(LPCWSTR,LPDWORD); #endif /* ODBCVER >= 0x0250 */ + #if (ODBCVER >= 0x0300) BOOL INSTAPI SQLGetConfigMode(UWORD*); BOOL INSTAPI SQLInstallDriverEx(LPCSTR,LPCSTR,LPSTR,WORD,WORD*,WORD,LPDWORD); @@ -137,6 +146,7 @@ BOOL INSTAPI SQLWriteFileDSN(LPCSTR,LPCSTR,LPCSTR,LPCSTR); BOOL INSTAPI SQLWriteFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); #endif /* ODBCVER >= 0x0300 */ +/* Cannot use __AW() since the A version does not exist. */ #if defined (UNICODE) && !defined (SQL_NOUNICODEMAP) #define SQLConfigDataSource SQLConfigDataSourceW #define SQLConfigDriver SQLConfigDriverW @@ -162,8 +172,11 @@ BOOL INSTAPI SQLWriteFileDSNW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); #define SQLWriteFileDSN SQLWriteFileDSNW #define SQLWritePrivateProfileString SQLWritePrivateProfileStringW #endif /* UNICODE && !SQL_NOUNICODEMAP */ + #endif /* RC_INVOKED */ + #ifdef __cplusplus } #endif + #endif /* _ODBCINST_H */ diff --git a/include/ole.h b/include/ole.h index 7d6910d..d50ef5c 100644 --- a/include/ole.h +++ b/include/ole.h @@ -24,10 +24,12 @@ #ifndef _OLE_H #define _OLE_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #ifdef STRICT #define OLE_LPCSTR LPCSTR #define OLE_CONST const @@ -35,6 +37,7 @@ extern "C" { #define OLE_LPCSTR LPSTR #define OLE_CONST #endif + #define LRESULT LONG #define HGLOBAL HANDLE #define OT_LINK 1L @@ -216,9 +219,11 @@ typedef struct _OLEOBJECTVTBL { #endif } OLEOBJECTVTBL; typedef OLEOBJECTVTBL*LPOLEOBJECTVTBL; + #ifndef OLE_INTERNAL typedef struct _OLEOBJECT { LPOLEOBJECTVTBL lpvtbl; } OLEOBJECT; #endif + typedef struct _OLECLIENTVTBL { int (CALLBACK* CallBack)(LPOLECLIENT,OLE_NOTIFICATION,LPOLEOBJECT); } OLECLIENTVTBL; typedef OLECLIENTVTBL *LPOLECLIENTVTBL; typedef struct _OLECLIENT { LPOLECLIENTVTBL lpvtbl; } OLECLIENT; @@ -323,7 +328,9 @@ OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC); OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC,LPCSTR); OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC); OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC); + #ifdef __cplusplus } #endif + #endif diff --git a/include/ole2.h b/include/ole2.h index 1e36788..671db70 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -24,6 +24,7 @@ #ifndef _OLE2_H #define _OLE2_H #pragma GCC system_header +#include <_mingw.h> #pragma pack(push,8) #include @@ -34,6 +35,7 @@ #ifdef __cplusplus extern "C" { #endif + #define E_DRAW VIEW_E_DRAW #define DATA_E_FORMATETC DV_E_FORMATETC #define OLEIVERB_PRIMARY (0L) @@ -124,8 +126,11 @@ WINOLEAPI GetConvertStg(LPSTORAGE); WINOLEAPI SetConvertStg(LPSTORAGE,BOOL); WINOLEAPI OleConvertIStorageToOLESTREAMEx(LPSTORAGE,CLIPFORMAT,LONG,LONG,DWORD,LPSTGMEDIUM,LPOLESTREAM); WINOLEAPI OleConvertOLESTREAMToIStorageEx(LPOLESTREAM,LPSTORAGE,CLIPFORMAT*,LONG*,LONG*,DWORD*,LPSTGMEDIUM); + #ifdef __cplusplus } #endif + #pragma pack(pop) + #endif diff --git a/include/ole2ver.h b/include/ole2ver.h index c1fb024..d015374 100644 --- a/include/ole2ver.h +++ b/include/ole2ver.h @@ -24,6 +24,9 @@ #ifndef _OLE2VER_H #define _OLE2VER_H #pragma GCC system_header +#include <_mingw.h> + #define rmm 23 #define rup 639 + #endif diff --git a/include/oleacc.h b/include/oleacc.h index abfdce4..4f754c5 100644 --- a/include/oleacc.h +++ b/include/oleacc.h @@ -24,6 +24,7 @@ #ifndef _OLEACC_H #define _OLEACC_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -228,17 +229,12 @@ LRESULT WINAPI LresultFromObject(REFIID,WPARAM,LPUNKNOWN); STDAPI ObjectFromLresult(LRESULT,REFIID,WPARAM,void**); STDAPI WindowFromAccessibleObject(IAccessible*,HWND*); -#ifdef UNICODE -#define CreateStdAccessibleProxy CreateStdAccessibleProxyW -#define GetRoleText GetRoleTextW -#define GetStateText GetStateTextW -#else -#define CreateStdAccessibleProxy CreateStdAccessibleProxyA -#define GetRoleText GetRoleTextA -#define GetStateText GetStateTextA -#endif +#define CreateStdAccessibleProxy __AW(CreateStdAccessibleProxy) +#define GetRoleText __AW(GetRoleText) +#define GetStateText __AW(GetStateText) #ifdef __cplusplus } #endif + #endif /* _OLEACC_H */ diff --git a/include/oleauto.h b/include/oleauto.h index 7032874..192d0d0 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -24,6 +24,7 @@ #ifndef _OLEAUTO_H #define _OLEAUTO_H #pragma GCC system_header +#include <_mingw.h> #pragma pack(push,8) #define WINOLEAUTAPI STDAPI @@ -58,6 +59,7 @@ #define IsHashValCompatible(h1,h2) ((BOOL)((0x00ff0000&(h1))==(0x00ff0000&(h2)))) #define ACTIVEOBJECT_STRONG 0 #define ACTIVEOBJECT_WEAK 1 + #ifdef NONAMELESSUNION #define V_UNION(X,Y) ((X)->__VARIANT_NAME_1.__VARIANT_NAME_2.__VARIANT_NAME_3.Y) #define V_VT(X) ((X)->__VARIANT_NAME_1.__VARIANT_NAME_2.vt) @@ -65,6 +67,7 @@ #define V_UNION(X,Y) ((X)->Y) #define V_VT(X) ((X)->vt) #endif + #define V_BOOL(X) V_UNION(X,boolVal) #define V_ISBYREF(X) (V_VT(X)&VT_BYREF) #define V_ISARRAY(X) (V_VT(X)&VT_ARRAY) @@ -113,11 +116,13 @@ #define V_ARRAY(X) V_UNION(X,parray) #define V_ARRAYREF(X) V_UNION(X,pparray) #define V_BYREF(X) V_UNION(X,byref) + #if defined(NONAMELESSUNION) #define V_DECIMAL(X) ((X)->__VARIANT_NAME_1.decVal) #else #define V_DECIMAL(X) ((X)->decVal) #endif + #define V_DECIMALREF(X) V_UNION(X,pdecVal) #define V_I1(X) V_UNION(X,cVal) diff --git a/include/olectl.h b/include/olectl.h index 278af43..73db972 100644 --- a/include/olectl.h +++ b/include/olectl.h @@ -24,6 +24,7 @@ #ifndef _OLECTL_H #define _OLECTL_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -338,7 +339,9 @@ STDAPI OleLoadPictureFile(VARIANT,LPDISPATCH*); STDAPI OleLoadPictureFileEx(VARIANT,DWORD,DWORD,DWORD,LPDISPATCH*); STDAPI OleSavePictureFile(LPDISPATCH,BSTR); STDAPI OleTranslateColor(OLE_COLOR,HPALETTE,COLORREF*); + #ifdef __cplusplus } #endif + #endif diff --git a/include/olectlid.h b/include/olectlid.h index 577e13a..d13fed7 100644 --- a/include/olectlid.h +++ b/include/olectlid.h @@ -24,6 +24,7 @@ #ifndef _OLECTLID_H #define _OLECTLID_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -132,4 +133,5 @@ extern const GUID CLSID_Picture_Dib; #ifdef __cplusplus } #endif + #endif diff --git a/include/oledlg.h b/include/oledlg.h index 4caf034..e9a4362 100644 --- a/include/oledlg.h +++ b/include/oledlg.h @@ -24,10 +24,12 @@ #ifndef _OLEDLG_H #define _OLEDLG_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { #endif + #include #include #include @@ -809,148 +811,80 @@ int OleUIPromptUserA(int,HWND,...); STDAPI_(BOOL) OleUIUpdateLinksW(LPOLEUILINKCONTAINERW,HWND,LPWSTR,int); STDAPI_(BOOL) OleUIUpdateLinksA(LPOLEUILINKCONTAINERA,HWND,LPSTR,int); -#ifdef UNICODE -#define IDD_SERVERNOTREG IDD_SERVERNOTREGW -#define IDD_LINKTYPECHANGED IDD_LINKTYPECHANGEDW -#define OleUIUpdateLinks OleUIUpdateLinksW -#define OleUIAddVerbMenu OleUIAddVerbMenuW -#define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSW -#define OLEUIOBJECTPROPS OLEUIOBJECTPROPSW -#define POLEUIOBJECTPROPS POLEUIOBJECTPROPSW -#define LPOLEUIOBJECTPROPS LPOLEUIOBJECTPROPSW -#define OleUIObjectProperties OleUIObjectPropertiesW -#define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTW -#define OLEUIINSERTOBJECT OLEUIINSERTOBJECTW -#define POLEUIINSERTOBJECT POLEUIINSERTOBJECTW -#define LPOLEUIINSERTOBJECT LPOLEUIINSERTOBJECTW -#define OleUIInsertObject OleUIInsertObjectW -#define OleUIPromptUser OleUIPromptUserW -#define tagOLEUIPASTEENTRY tagOLEUIPASTEENTRYW -#define OLEUIPASTEENTRY OLEUIPASTEENTRYW -#define POLEUIPASTEENTRY POLEUIPASTEENTRYW -#define LPOLEUIPASTEENTRY LPOLEUIPASTEENTRYW -#define tagOLEUIPASTESPECIAL tagOLEUIPASTESPECIALW -#define OLEUIPASTESPECIAL OLEUIPASTESPECIALW -#define POLEUIPASTESPECIAL POLEUIPASTESPECIALW -#define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALW -#define OleUIPasteSpecial OleUIPasteSpecialW -#define IOleUILinkContainer IOleUILinkContainerW -#define LPOLEUILINKCONTAINER LPOLEUILINKCONTAINERW -#define tagOLEUIEDITLINKS tagOLEUIEDITLINKSW -#define OLEUIEDITLINKS OLEUIEDITLINKSW -#define POLEUIEDITLINKS POLEUIEDITLINKSW -#define LPOLEUIEDITLINKS LPOLEUIEDITLINKSW -#define OleUIEditLinks OleUIEditLinksW -#define tagOLEUICHANGEICON tagOLEUICHANGEICONW -#define OLEUICHANGEICON OLEUICHANGEICONW -#define POLEUICHANGEICON POLEUICHANGEICONW -#define LPOLEUICHANGEICON LPOLEUICHANGEICONW -#define OleUIChangeIcon OleUIChangeIconW -#define tagOLEUICONVERT tagOLEUICONVERTW -#define OLEUICONVERT OLEUICONVERTW -#define POLEUICONVERT POLEUICONVERTW -#define LPOLEUICONVERT LPOLEUICONVERTW -#define OleUIConvert OleUIConvertW -#define tagOLEUIBUSY tagOLEUIBUSYW -#define OLEUIBUSY OLEUIBUSYW -#define POLEUIBUSY POLEUIBUSYW -#define LPOLEUIBUSY LPOLEUIBUSYW -#define OleUIBusy OleUIBusyW -#define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEW -#define OLEUICHANGESOURCE OLEUICHANGESOURCEW -#define POLEUICHANGESOURCE POLEUICHANGESOURCEW -#define LPOLEUICHANGESOURCE LPOLEUICHANGESOURCEW -#define OleUIChangeSource OleUIChangeSourceW -#define IOleUIObjInfo IOleUIObjInfoW -#define LPOLEUIOBJINFO LPOLEUIOBJINFOW -#define IOleUILinkInfo IOleUILinkInfoW -#define IOleUILinkInfoVtbl IOleUILinkInfoWVtbl -#define LPOLEUILINKINFO LPOLEUILINKINFOW -#define tagOLEUIGNRLPROPS tagOLEUIGNRLPROPSW -#define OLEUIGNRLPROPS OLEUIGNRLPROPSW -#define POLEUIGNRLPROPS POLEUIGNRLPROPSW -#define LPOLEUIGNRLPROPS LPOLEUIGNRLPROPSW -#define tagOLEUIVIEWPROPS tagOLEUIVIEWPROPSW -#define OLEUIVIEWPROPS OLEUIVIEWPROPSW -#define POLEUIVIEWPROPS POLEUIVIEWPROPSW -#define LPOLEUIVIEWPROPS LPOLEUIVIEWPROPSW -#define tagOLEUILINKPROPS tagOLEUILINKPROPSW -#define OLEUILINKPROPS OLEUILINKPROPSW -#define POLEUILINKPROPS POLEUILINKPROPSW -#define LPOLEUILINKPROPS LPOLEUILINKPROPSW -#else -#define IDD_SERVERNOTREG IDD_SERVERNOTREGA -#define IDD_LINKTYPECHANGED IDD_LINKTYPECHANGEDA -#define OleUIUpdateLinks OleUIUpdateLinksA -#define OleUIAddVerbMenu OleUIAddVerbMenuA -#define tagOLEUIOBJECTPROPS tagOLEUIOBJECTPROPSA -#define OLEUIOBJECTPROPS OLEUIOBJECTPROPSA -#define POLEUIOBJECTPROPS POLEUIOBJECTPROPSA -#define LPOLEUIOBJECTPROPS LPOLEUIOBJECTPROPSA -#define OleUIObjectProperties OleUIObjectPropertiesA -#define tagOLEUIINSERTOBJECT tagOLEUIINSERTOBJECTA -#define OLEUIINSERTOBJECT OLEUIINSERTOBJECTA -#define POLEUIINSERTOBJECT POLEUIINSERTOBJECTA -#define LPOLEUIINSERTOBJECT LPOLEUIINSERTOBJECTA -#define OleUIInsertObject OleUIInsertObjectA -#define OleUIPromptUser OleUIPromptUserA -#define tagOLEUIPASTEENTRY tagOLEUIPASTEENTRYA -#define OLEUIPASTEENTRY OLEUIPASTEENTRYA -#define POLEUIPASTEENTRY POLEUIPASTEENTRYA -#define LPOLEUIPASTEENTRY LPOLEUIPASTEENTRYA -#define tagOLEUIPASTESPECIAL tagOLEUIPASTESPECIALA -#define OLEUIPASTESPECIAL OLEUIPASTESPECIALA -#define POLEUIPASTESPECIAL POLEUIPASTESPECIALA -#define LPOLEUIPASTESPECIAL LPOLEUIPASTESPECIALA -#define OleUIPasteSpecial OleUIPasteSpecialA -#define IOleUILinkContainer IOleUILinkContainerA -#define LPOLEUILINKCONTAINER LPOLEUILINKCONTAINERA -#define tagOLEUIEDITLINKS tagOLEUIEDITLINKSA -#define OLEUIEDITLINKS OLEUIEDITLINKSA -#define POLEUIEDITLINKS POLEUIEDITLINKSA -#define LPOLEUIEDITLINKS LPOLEUIEDITLINKSA -#define OleUIEditLinks OleUIEditLinksA -#define tagOLEUICHANGEICON tagOLEUICHANGEICONA -#define OLEUICHANGEICON OLEUICHANGEICONA -#define POLEUICHANGEICON POLEUICHANGEICONA -#define LPOLEUICHANGEICON LPOLEUICHANGEICONA -#define OleUIChangeIcon OleUIChangeIconA -#define tagOLEUICONVERT tagOLEUICONVERTA -#define OLEUICONVERT OLEUICONVERTA -#define POLEUICONVERT POLEUICONVERTA -#define LPOLEUICONVERT LPOLEUICONVERTA -#define OleUIConvert OleUIConvertA -#define tagOLEUIBUSY tagOLEUIBUSYA -#define OLEUIBUSY OLEUIBUSYA -#define POLEUIBUSY POLEUIBUSYA -#define LPOLEUIBUSY LPOLEUIBUSYA -#define OleUIBusy OleUIBusyA -#define tagOLEUICHANGESOURCE tagOLEUICHANGESOURCEA -#define OLEUICHANGESOURCE OLEUICHANGESOURCEA -#define POLEUICHANGESOURCE POLEUICHANGESOURCEA -#define LPOLEUICHANGESOURCE LPOLEUICHANGESOURCEA -#define OleUIChangeSource OleUIChangeSourceA -#define IOleUIObjInfo IOleUIObjInfoA -#define LPOLEUIOBJINFO LPOLEUIOBJINFOA -#define IOleUILinkInfo IOleUILinkInfoA -#define IOleUILinkInfoVtbl IOleUILinkInfoAVtbl -#define LPOLEUILINKINFO LPOLEUILINKINFOA -#define tagOLEUIGNRLPROPS tagOLEUIGNRLPROPSA -#define OLEUIGNRLPROPS OLEUIGNRLPROPSA -#define POLEUIGNRLPROPS POLEUIGNRLPROPSA -#define LPOLEUIGNRLPROPS LPOLEUIGNRLPROPSA -#define tagOLEUIVIEWPROPS tagOLEUIVIEWPROPSA -#define OLEUIVIEWPROPS OLEUIVIEWPROPSA -#define POLEUIVIEWPROPS POLEUIVIEWPROPSA -#define LPOLEUIVIEWPROPS LPOLEUIVIEWPROPSA -#define tagOLEUILINKPROPS tagOLEUILINKPROPSA -#define OLEUILINKPROPS OLEUILINKPROPSA -#define POLEUILINKPROPS POLEUILINKPROPSA -#define LPOLEUILINKPROPS LPOLEUILINKPROPSA -#endif +#define IDD_SERVERNOTREG __AW(IDD_SERVERNOTREG) +#define IDD_LINKTYPECHANGED __AW(IDD_LINKTYPECHANGED) +#define OleUIUpdateLinks __AW(OleUIUpdateLinks) +#define OleUIAddVerbMenu __AW(OleUIAddVerbMenu) +#define tagOLEUIOBJECTPROPS __AW(tagOLEUIOBJECTPROPS) +#define OLEUIOBJECTPROPS __AW(OLEUIOBJECTPROPS) +#define POLEUIOBJECTPROPS __AW(POLEUIOBJECTPROPS) +#define LPOLEUIOBJECTPROPS __AW(LPOLEUIOBJECTPROPS) +#define OleUIObjectProperties __AW(OleUIObjectProperties) +#define tagOLEUIINSERTOBJECT __AW(tagOLEUIINSERTOBJECT) +#define OLEUIINSERTOBJECT __AW(OLEUIINSERTOBJECT) +#define POLEUIINSERTOBJECT __AW(POLEUIINSERTOBJECT) +#define LPOLEUIINSERTOBJECT __AW(LPOLEUIINSERTOBJECT) +#define OleUIInsertObject __AW(OleUIInsertObject) +#define OleUIPromptUser __AW(OleUIPromptUser) +#define tagOLEUIPASTEENTRY __AW(tagOLEUIPASTEENTRY) +#define OLEUIPASTEENTRY __AW(OLEUIPASTEENTRY) +#define POLEUIPASTEENTRY __AW(POLEUIPASTEENTRY) +#define LPOLEUIPASTEENTRY __AW(LPOLEUIPASTEENTRY) +#define tagOLEUIPASTESPECIAL __AW(tagOLEUIPASTESPECIAL) +#define OLEUIPASTESPECIAL __AW(OLEUIPASTESPECIAL) +#define POLEUIPASTESPECIAL __AW(POLEUIPASTESPECIAL) +#define LPOLEUIPASTESPECIAL __AW(LPOLEUIPASTESPECIAL) +#define OleUIPasteSpecial __AW(OleUIPasteSpecial) +#define IOleUILinkContainer __AW(IOleUILinkContainer) +#define LPOLEUILINKCONTAINER __AW(LPOLEUILINKCONTAINER) +#define tagOLEUIEDITLINKS __AW(tagOLEUIEDITLINKS) +#define OLEUIEDITLINKS __AW(OLEUIEDITLINKS) +#define POLEUIEDITLINKS __AW(POLEUIEDITLINKS) +#define LPOLEUIEDITLINKS __AW(LPOLEUIEDITLINKS) +#define OleUIEditLinks __AW(OleUIEditLinks) +#define tagOLEUICHANGEICON __AW(tagOLEUICHANGEICON) +#define OLEUICHANGEICON __AW(OLEUICHANGEICON) +#define POLEUICHANGEICON __AW(POLEUICHANGEICON) +#define LPOLEUICHANGEICON __AW(LPOLEUICHANGEICON) +#define OleUIChangeIcon __AW(OleUIChangeIcon) +#define tagOLEUICONVERT __AW(tagOLEUICONVERT) +#define OLEUICONVERT __AW(OLEUICONVERT) +#define POLEUICONVERT __AW(POLEUICONVERT) +#define LPOLEUICONVERT __AW(LPOLEUICONVERT) +#define OleUIConvert __AW(OleUIConvert) +#define tagOLEUIBUSY __AW(tagOLEUIBUSY) +#define OLEUIBUSY __AW(OLEUIBUSY) +#define POLEUIBUSY __AW(POLEUIBUSY) +#define LPOLEUIBUSY __AW(LPOLEUIBUSY) +#define OleUIBusy __AW(OleUIBusy) +#define tagOLEUICHANGESOURCE __AW(tagOLEUICHANGESOURCE) +#define OLEUICHANGESOURCE __AW(OLEUICHANGESOURCE) +#define POLEUICHANGESOURCE __AW(POLEUICHANGESOURCE) +#define LPOLEUICHANGESOURCE __AW(LPOLEUICHANGESOURCE) +#define OleUIChangeSource __AW(OleUIChangeSource) +#define IOleUIObjInfo __AW(IOleUIObjInfo) +#define LPOLEUIOBJINFO __AW(LPOLEUIOBJINFO) +#define IOleUILinkInfo __AW(IOleUILinkInfo) +#define IOleUILinkInfoVtbl __AW(IOleUILinkInfoWVtb) +#define LPOLEUILINKINFO __AW(LPOLEUILINKINFO) +#define tagOLEUIGNRLPROPS __AW(tagOLEUIGNRLPROPS) +#define OLEUIGNRLPROPS __AW(OLEUIGNRLPROPS) +#define POLEUIGNRLPROPS __AW(POLEUIGNRLPROPS) +#define LPOLEUIGNRLPROPS __AW(LPOLEUIGNRLPROPS) +#define tagOLEUIVIEWPROPS __AW(tagOLEUIVIEWPROPS) +#define OLEUIVIEWPROPS __AW(OLEUIVIEWPROPS) +#define POLEUIVIEWPROPS __AW(POLEUIVIEWPROPS) +#define LPOLEUIVIEWPROPS __AW(LPOLEUIVIEWPROPS) +#define tagOLEUILINKPROPS __AW(tagOLEUILINKPROPS) +#define OLEUILINKPROPS __AW(OLEUILINKPROPS) +#define POLEUILINKPROPS __AW(POLEUILINKPROPS) +#define LPOLEUILINKPROPS __AW(LPOLEUILINKPROPS) + #pragma pack(pop) #endif + #ifdef __cplusplus } #endif + #endif diff --git a/include/oleidl.h b/include/oleidl.h index a67c601..e061d4b 100644 --- a/include/oleidl.h +++ b/include/oleidl.h @@ -24,6 +24,7 @@ #ifndef _OLEIDL_H #define _OLEIDL_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -590,5 +591,6 @@ DECLARE_INTERFACE_(IOleCacheControl,IUnknown) #ifdef __cplusplus } #endif + #endif diff --git a/include/pbt.h b/include/pbt.h index bf78408..ee3c983 100644 --- a/include/pbt.h +++ b/include/pbt.h @@ -24,6 +24,7 @@ #ifndef _PBT_H #define _PBT_H #pragma GCC system_header +#include <_mingw.h> /* Also in winuser.h */ #define PBT_APMQUERYSUSPEND 0 diff --git a/include/powrprof.h b/include/powrprof.h index b54788a..8672a84 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -24,6 +24,7 @@ #ifndef _POWRPROF_H #define _POWRPROF_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { diff --git a/include/process.h b/include/process.h index 094e644..08a6d7b 100644 --- a/include/process.h +++ b/include/process.h @@ -24,14 +24,12 @@ #ifndef _PROCESS_H_ #define _PROCESS_H_ #pragma GCC system_header +#include <_mingw.h> /* * Function calls for spawning child processes. */ -/* All the headers include this file. */ -#include <_mingw.h> - #include /* For _pid_t and pid_t. */ #include /* For intptr_t. */ /* diff --git a/include/prsht.h b/include/prsht.h index 153f1a7..46e10d5 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -24,6 +24,7 @@ #ifndef _PRSHT_H #define _PRSHT_H #pragma GCC system_header +#include <_mingw.h> #ifndef SNDMSG #ifdef __cplusplus @@ -56,11 +57,13 @@ extern "C" { #define PSP_USEREFPARENT 64 #define PSP_USECALLBACK 128 #define PSP_PREMATURE 1024 + #if (_WIN32_IE >= 0x0400) #define PSP_HIDEHEADER 2048 #define PSP_USEHEADERTITLE 4096 #define PSP_USEHEADERSUBTITLE 8192 #endif + #define PSPCB_RELEASE 1 #define PSPCB_CREATE 2 #define PSH_DEFAULT 0 @@ -77,6 +80,7 @@ extern "C" { #define PSH_MODELESS 1024 #define PSH_RTLREADING 2048 #define PSH_WIZARDCONTEXTHELP 4096 + #if (_WIN32_IE >= 0x0400) #define PSH_WATERMARK 32768 #define PSH_USEHBMWATERMARK 65536 @@ -85,16 +89,20 @@ extern "C" { #define PSH_HEADER 524288 #define PSH_USEHBMHEADER 1048576 #define PSH_USEPAGELANG 2097152 -#if (_WIN32_IE < 0x0500) -#define PSH_WIZARD97 0x00002000 -#else + +#if (_WIN32_IE >= 0x0500) #define PSH_WIZARD97 0x01000000 +#else +#define PSH_WIZARD97 0x00002000 #endif + #endif /* _WIN32_IE >= 0x0400 */ + #if (_WIN32_IE >= 0x0500) #define PSH_WIZARD_LITE 0x400000 #define PSH_NOCONTEXTHELP 0x2000000 #endif + #define PSCB_INITIALIZED 1 #define PSCB_PRECREATE 2 #define PSM_GETTABCONTROL 1140 @@ -310,32 +318,20 @@ int WINAPI PropertySheetW(LPCPROPSHEETHEADERW); #define PropSheet_UnChanged(d,w) SNDMSG(d,PSM_UNCHANGED,(WPARAM)w,0) #endif -#ifdef UNICODE -#define LPFNPSPCALLBACK LPFNPSPCALLBACKW -#define PROPSHEETPAGE PROPSHEETPAGEW -#define LPPROPSHEETPAGE LPPROPSHEETPAGEW -#define LPCPROPSHEETPAGE LPCPROPSHEETPAGEW -#define PROPSHEETHEADER PROPSHEETHEADERW -#define LPPROPSHEETHEADER LPPROPSHEETHEADERW -#define LPCPROPSHEETHEADER LPCPROPSHEETHEADERW -#define PSM_SETTITLE PSM_SETTITLEW -#define PSM_SETFINISHTEXT PSM_SETFINISHTEXTW -#define CreatePropertySheetPage CreatePropertySheetPageW -#define PropertySheet PropertySheetW -#else -#define LPFNPSPCALLBACK LPFNPSPCALLBACKA -#define PROPSHEETPAGE PROPSHEETPAGEA -#define LPPROPSHEETPAGE LPPROPSHEETPAGEA -#define LPCPROPSHEETPAGE LPCPROPSHEETPAGEA -#define PROPSHEETHEADER PROPSHEETHEADERA -#define LPPROPSHEETHEADER LPPROPSHEETHEADERA -#define LPCPROPSHEETHEADER LPCPROPSHEETHEADERA -#define PSM_SETTITLE PSM_SETTITLEA -#define PSM_SETFINISHTEXT PSM_SETFINISHTEXTA -#define CreatePropertySheetPage CreatePropertySheetPageA -#define PropertySheet PropertySheetA -#endif +#define LPFNPSPCALLBACK __AW(LPFNPSPCALLBACK) +#define PROPSHEETPAGE __AW(PROPSHEETPAGE) +#define LPPROPSHEETPAGE __AW(LPPROPSHEETPAGE) +#define LPCPROPSHEETPAGE __AW(LPCPROPSHEETPAGE) +#define PROPSHEETHEADER __AW(PROPSHEETHEADER) +#define LPPROPSHEETHEADER __AW(LPPROPSHEETHEADER) +#define LPCPROPSHEETHEADER __AW(LPCPROPSHEETHEADER) +#define PSM_SETTITLE __AW(PSM_SETTITLE) +#define PSM_SETFINISHTEXT __AW(PSM_SETFINISHTEXT) +#define CreatePropertySheetPage __AW(CreatePropertySheetPage) +#define PropertySheet __AW(PropertySheet) + #ifdef __cplusplus } #endif + #endif diff --git a/include/psapi.h b/include/psapi.h index 2a162cf..ee4f9b2 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -24,6 +24,7 @@ #ifndef _PSAPI_H #define _PSAPI_H #pragma GCC system_header +#include <_mingw.h> #ifdef __cplusplus extern "C" { @@ -123,33 +124,21 @@ DWORD WINAPI GetDeviceDriverFileNameA(LPVOID,LPSTR,DWORD); DWORD WINAPI GetDeviceDriverFileNameW(LPVOID,LPWSTR,DWORD); BOOL WINAPI GetProcessMemoryInfo(HANDLE,PPROCESS_MEMORY_COUNTERS,DWORD); BOOL WINAPI GetPerformanceInfo(PPERFORMANCE_INFORMATION,DWORD); -#if (_WIN32_WINNT >= 0x0501) + +#define GetModuleBaseName __AW(GetModuleBaseName) +#define GetModuleFileNameEx __AW(GetModuleFileNameEx) +#define GetMappedFileName __AW(GetMappedFileName) +#define GetDeviceDriverBaseName __AW(GetDeviceDriverBaseName) +#define GetDeviceDriverFileName __AW(GetDeviceDriverFileName) + +#if (_WIN32_WINNT >= _WIN32_WINNT_WINXP) DWORD WINAPI GetProcessImageFileNameA(HANDLE,LPSTR,DWORD); DWORD WINAPI GetProcessImageFileNameW(HANDLE,LPWSTR,DWORD); -#endif +#define GetProcessImageFileName __AW(GetProcessImageFileName) +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WINXP */ #endif /* not RC_INVOKED */ -#ifdef UNICODE -#define GetModuleBaseName GetModuleBaseNameW -#define GetModuleFileNameEx GetModuleFileNameExW -#define GetMappedFileName GetMappedFileNameW -#define GetDeviceDriverBaseName GetDeviceDriverBaseNameW -#define GetDeviceDriverFileName GetDeviceDriverFileNameW -#if (_WIN32_WINNT >= 0x0501) -#define GetProcessImageFileName GetProcessImageFileNameW -#endif -#else -#define GetModuleBaseName GetModuleBaseNameA -#define GetModuleFileNameEx GetModuleFileNameExA -#define GetMappedFileName GetMappedFileNameA -#define GetDeviceDriverBaseName GetDeviceDriverBaseNameA -#define GetDeviceDriverFileName GetDeviceDriverFileNameA -#if (_WIN32_WINNT >= 0x0501) -#define GetProcessImageFileName GetProcessImageFileNameA -#endif -#endif - #ifdef __cplusplus } #endif diff --git a/include/qedit.h b/include/qedit.h index 834cddd..2eac788 100644 --- a/include/qedit.h +++ b/include/qedit.h @@ -24,10 +24,9 @@ #ifndef _QEDIT_H #define _QEDIT_H #pragma GCC system_header +#include <_mingw.h> -#ifndef _STRMIF_H #include -#endif #ifdef __cplusplus extern "C" { @@ -88,4 +87,5 @@ typedef enum { #ifdef __cplusplus } #endif + #endif