2013/11/16 Rafaël Carré <fun...@videolan.org>:
> ---
> mingw-w64-headers/include/combaseapi.h | 2 +-
> mingw-w64-headers/include/shobjidl.h | 3 ++-
> mingw-w64-headers/include/winbase.h | 2 +-
> mingw-w64-headers/include/winnls.h | 6 +++---
> mingw-w64-headers/include/ws2tcpip.h | 2 +-
> 5 files changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/mingw-w64-headers/include/combaseapi.h
> b/mingw-w64-headers/include/combaseapi.h
> index b79c4db..09b5ce9 100644
> --- a/mingw-w64-headers/include/combaseapi.h
> +++ b/mingw-w64-headers/include/combaseapi.h
> @@ -257,7 +257,7 @@ WINOLEAPI CoCreateInstance (REFCLSID rclsid, LPUNKNOWN
> pUnkOuter, DWORD dwClsCon
> WINOLEAPI CoCreateInstanceEx (REFCLSID Clsid, IUnknown *punkOuter, DWORD
> dwClsCtx, COSERVERINFO *pServerInfo, DWORD dwCount, MULTI_QI *pResults);
> #endif
>
> -#if WINAPI_FAMILY == WINAPI_FAMILY_APP
> +#if 0 //WINAPI_FAMILY == WINAPI_FAMILY_APP
> __inline HRESULT CoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter,
> DWORD dwClsContext, REFIID riid, LPVOID *ppv) {
> MULTI_QI OneQI;
> HRESULT hr;
> diff --git a/mingw-w64-headers/include/shobjidl.h
> b/mingw-w64-headers/include/shobjidl.h
> index fde591d..8f245c7 100644
> --- a/mingw-w64-headers/include/shobjidl.h
> +++ b/mingw-w64-headers/include/shobjidl.h
> @@ -29949,7 +29949,7 @@ HRESULT __RPC_STUB IKnownFolderManager_Redirect_Stub(
>
> #endif /* __IKnownFolderManager_INTERFACE_DEFINED__ */
>
> -
> +#if 0
> __inline void FreeKnownFolderDefinitionFields(KNOWNFOLDER_DEFINITION
> *pKFD) {
> CoTaskMemFree(pKFD->pszName);
> CoTaskMemFree(pKFD->pszDescription);
> @@ -29960,6 +29960,7 @@ HRESULT __RPC_STUB IKnownFolderManager_Redirect_Stub(
> CoTaskMemFree(pKFD->pszIcon);
> CoTaskMemFree(pKFD->pszSecurity);
> }
> +#endif
>
> typedef enum SHARE_ROLE {
> SHARE_ROLE_INVALID = -1,
> diff --git a/mingw-w64-headers/include/winbase.h
> b/mingw-w64-headers/include/winbase.h
> index 93a0eb6..3b614d2 100644
> --- a/mingw-w64-headers/include/winbase.h
> +++ b/mingw-w64-headers/include/winbase.h
> @@ -1487,7 +1487,7 @@ extern "C" {
> #define SHUTDOWN_NORETRY 0x1
> #endif
>
> -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
> +#if 1 //WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP)
> WINBASEAPI HANDLE WINAPI OpenMutexA (DWORD dwDesiredAccess, WINBOOL
> bInheritHandle, LPCSTR lpName);
> WINBASEAPI HANDLE WINAPI CreateSemaphoreA (LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCSTR lpName);
> WINBASEAPI HANDLE WINAPI CreateSemaphoreW (LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCWSTR
> lpName);
> diff --git a/mingw-w64-headers/include/winnls.h
> b/mingw-w64-headers/include/winnls.h
> index d59c363..6c6edbd 100644
> --- a/mingw-w64-headers/include/winnls.h
> +++ b/mingw-w64-headers/include/winnls.h
> @@ -19,7 +19,7 @@ extern "C" {
>
> #ifndef NONLS
>
> -#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
> +#if 1 //WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP)
>
> #ifndef _NORMALIZE_
> #define WINNORMALIZEAPI DECLSPEC_IMPORT
> @@ -775,7 +775,7 @@ extern "C" {
> GEOCLASS_ALL = 0
> };
>
> -#if WINVER >= 0x0600
> +#if WINVER >= 0x0600 || _WIN32_WINNT >= 0x600
> typedef enum _NORM_FORM {
> NormalizationOther = 0,
> NormalizationC = 0x1,
> @@ -1048,7 +1048,7 @@ extern "C" {
>
> #define EnumSystemCodePages __MINGW_NAME_AW(EnumSystemCodePages)
>
> -#if WINVER >= 0x0600
> +#if WINVER >= 0x0600 || _WIN32_WINNT >= 0x0600
>
> #define LOCALE_NAME_USER_DEFAULT NULL
> #define LOCALE_NAME_INVARIANT L""
> diff --git a/mingw-w64-headers/include/ws2tcpip.h
> b/mingw-w64-headers/include/ws2tcpip.h
> index 0f05e76..2b038ce 100644
> --- a/mingw-w64-headers/include/ws2tcpip.h
> +++ b/mingw-w64-headers/include/ws2tcpip.h
> @@ -274,7 +274,7 @@ extern "C" {
>
> #define GAI_STRERROR_BUFFER_SIZE 1024
>
> -char *gai_strerrorA (int);
> +WINAPI char *gai_strerrorA (int);
> WCHAR *gai_strerrorW(int);
>
> #define NI_MAXHOST 1025
> --
> 1.8.3.2
Patch is not ok. As discussed already on IRC, please add here instead
additional guards for WINSTORECOMPAT define.
Kai
------------------------------------------------------------------------------
DreamFactory - Open Source REST & JSON Services for HTML5 & Native Apps
OAuth, Users, Roles, SQL, NoSQL, BLOB Storage and External API Access
Free app hosting. Or install the open source package on any LAMP server.
Sign up and see examples for AngularJS, jQuery, Sencha Touch and Native!
http://pubads.g.doubleclick.net/gampad/clk?id=63469471&iu=/4140/ostg.clktrk
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
