Hello,
Patch looks fine. Please go ahead and apply.
Thanks,
Kai
2016-03-31 18:07 GMT+02:00 Hugo Beauzée-Luyssen <h...@beauzee.fr>:
> ---
> mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/CreateEventW.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/CreateFileW.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/CreateMutexW.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c | 8
> ++++++++
> mingw-w64-libraries/winstorecompat/src/GetACP.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/GetFileSize.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/GetModuleHandle.c | 5 +++++
> mingw-w64-libraries/winstorecompat/src/GetTickCount.c | 4 ++++
> .../winstorecompat/src/InitializeCriticalSection.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/LocalAlloc.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/LocalFree.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/QueueTimer.c | 5 +++++
> mingw-w64-libraries/winstorecompat/src/SHGetFolderPathW.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/SetErrorMode.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/SetFilePointer.c | 4 ++++
> .../winstorecompat/src/SetUnhandledExceptionFilter.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/Sleep.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/SleepEx.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/TerminateProcess.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/Tls.c | 7 +++++++
> mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/VirtualProtect.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/getenv.c | 4 ++++
> mingw-w64-libraries/winstorecompat/src/getpid.c | 4 ++++
> 29 files changed, 125 insertions(+)
>
> diff --git a/mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
> b/mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
> index 6f98693..acb065f 100644
> --- a/mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
> +++ b/mingw-w64-libraries/winstorecompat/src/CoCreateInstance.c
> @@ -59,5 +59,9 @@ HRESULT WINAPI CoCreateInstance(REFCLSID rclsid,
> }
> }
>
> +#ifndef _WIN64
> HRESULT (WINAPI *__MINGW_IMP_SYMBOL(CoCreateInstance))(REFCLSID rclsid,
> LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID *ppv)
> asm("__imp__CoCreateInstance@20") = CoCreateInstance;
> +#else
> +HRESULT (WINAPI *__MINGW_IMP_SYMBOL(CoCreateInstance))(REFCLSID rclsid,
> LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFIID riid, LPVOID *ppv)
> asm("__imp_CoCreateInstance") = CoCreateInstance;
> +#endif
>
> diff --git a/mingw-w64-libraries/winstorecompat/src/CreateEventW.c
> b/mingw-w64-libraries/winstorecompat/src/CreateEventW.c
> index 1daf9e8..a9c3451 100644
> --- a/mingw-w64-libraries/winstorecompat/src/CreateEventW.c
> +++ b/mingw-w64-libraries/winstorecompat/src/CreateEventW.c
> @@ -39,4 +39,8 @@ HANDLE WINAPI CreateEventW(LPSECURITY_ATTRIBUTES
> lpEventAttributes, BOOL bManual
> return CreateEventExW(lpEventAttributes, lpName, flags,
> EVENT_ALL_ACCESS);
> }
>
> +#ifndef _WIN64
> HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateEventW))(LPSECURITY_ATTRIBUTES
> lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName)
> asm("__imp__CreateEventW@16") = CreateEventW;
> +#else
> +HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateEventW))(LPSECURITY_ATTRIBUTES
> lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName)
> asm("__imp_CreateEventW") = CreateEventW;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> b/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> index f92cb8d..b251d8b 100644
> --- a/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> +++ b/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> @@ -47,4 +47,8 @@ HANDLE WINAPI CreateFileW(LPCWSTR lpFileName,
> return CreateFile2(lpFileName, dwDesiredAccess, dwShareMode,
> dwCreationDisposition, &createExParams);
> }
>
> +#ifndef _WIN64
> HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateFileW))(LPCWSTR lpFileName, DWORD
> dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES
> lpSecurityAttributes, DWORD dwCreationDisposition, DWORD
> dwFlagsAndAttributes, HANDLE hTemplateFile) asm("__imp__CreateFileW@28") =
> CreateFileW;
> +#else
> +HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateFileW))(LPCWSTR lpFileName, DWORD
> dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES
> lpSecurityAttributes, DWORD dwCreationDisposition, DWORD
> dwFlagsAndAttributes, HANDLE hTemplateFile) asm("__imp_CreateFileW") =
> CreateFileW;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c
> b/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c
> index 5e4a59e..101248e 100644
> --- a/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c
> +++ b/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c
> @@ -37,4 +37,8 @@ HANDLE WINAPI CreateMutexW(LPSECURITY_ATTRIBUTES
> lpMutexAttributes, BOOL bInitia
> return CreateMutexExW(lpMutexAttributes, lpName, flags,
> EVENT_ALL_ACCESS);
> }
>
> +#ifndef _WIN64
> HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateMutexW))(LPSECURITY_ATTRIBUTES
> lpMutexAttributes, BOOL bInitialOwner, LPCWSTR lpName)
> asm("__imp__CreateMutexW@12") = CreateMutexW;
> +#else
> +HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateMutexW))(LPSECURITY_ATTRIBUTES
> lpMutexAttributes, BOOL bInitialOwner, LPCWSTR lpName)
> asm("__imp_CreateMutexW") = CreateMutexW;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c
> b/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c
> index 943953e..7ae34eb 100644
> --- a/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c
> +++ b/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c
> @@ -39,7 +39,11 @@ HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes,
> return CreateSemaphoreExW(lpSemaphoreAttributes, lInitialCount,
> lMaximumCount, lpName, 0, EVENT_ALL_ACCESS);
> }
>
> +#ifndef _WIN64
> HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateSemaphoreW))(LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCWSTR
> lpName) asm("__imp__CreateSemaphoreW@16") = CreateSemaphoreW;
> +#else
> +HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateSemaphoreW))(LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCWSTR
> lpName) asm("__imp_CreateSemaphoreW") = CreateSemaphoreW;
> +#endif
>
> /*
> This is not really a proper implementation, but it is needed by
> gcc/libstdc++
> @@ -60,4 +64,8 @@ HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes,
> return CreateSemaphoreW(lpSemaphoreAttributes, lInitialCount,
> lMaximumCount, lpwName );
> }
>
> +#ifndef _WIN64
> HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateSemaphoreA))(LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCSTR lpName)
> asm("__imp__CreateSemaphoreA@16") = CreateSemaphoreA;
> +#else
> +HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateSemaphoreA))(LPSECURITY_ATTRIBUTES
> lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCSTR lpName)
> asm("__imp_CreateSemaphoreA") = CreateSemaphoreA;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/GetACP.c
> b/mingw-w64-libraries/winstorecompat/src/GetACP.c
> index a799709..b9fb1a9 100644
> --- a/mingw-w64-libraries/winstorecompat/src/GetACP.c
> +++ b/mingw-w64-libraries/winstorecompat/src/GetACP.c
> @@ -34,4 +34,8 @@ UINT WINAPI GetACP(void)
> return CP_UTF8; /* utf-8 */
> }
>
> +#ifndef _WIN64
> UINT (WINAPI *__MINGW_IMP_SYMBOL(GetACP))(void) asm("__imp__GetACP@0") =
> GetACP;
> +#else
> +UINT (WINAPI *__MINGW_IMP_SYMBOL(GetACP))(void) asm("__imp_GetACP") = GetACP;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c
> b/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c
> index b85875d..66b2937 100644
> --- a/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c
> +++ b/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c
> @@ -41,4 +41,8 @@ DWORD WINAPI GetFileAttributesW(LPCWSTR lpFileName)
> return INVALID_FILE_ATTRIBUTES;
> }
>
> +#ifndef _WIN64
> DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetFileAttributesW))(LPCWSTR lpFileName)
> asm("__imp__GetFileAttributesW@4") = GetFileAttributesW;
> +#else
> +DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetFileAttributesW))(LPCWSTR lpFileName)
> asm("__imp_GetFileAttributesW") = GetFileAttributesW;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/GetFileSize.c
> b/mingw-w64-libraries/winstorecompat/src/GetFileSize.c
> index e92eb1a..960d22f 100644
> --- a/mingw-w64-libraries/winstorecompat/src/GetFileSize.c
> +++ b/mingw-w64-libraries/winstorecompat/src/GetFileSize.c
> @@ -48,4 +48,8 @@ DWORD WINAPI GetFileSize(HANDLE hFile, LPDWORD
> lpFileSizeHigh)
> return dwRet;
> }
>
> +#ifndef _WIN64
> DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetFileSize))(HANDLE hFile, LPDWORD
> lpFileSizeHigh) asm("__imp__GetFileSize@8") = GetFileSize;
> +#else
> +DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetFileSize))(HANDLE hFile, LPDWORD
> lpFileSizeHigh) asm("__imp_GetFileSize") = GetFileSize;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/GetModuleHandle.c
> b/mingw-w64-libraries/winstorecompat/src/GetModuleHandle.c
> index 68435f4..fc04194 100644
> --- a/mingw-w64-libraries/winstorecompat/src/GetModuleHandle.c
> +++ b/mingw-w64-libraries/winstorecompat/src/GetModuleHandle.c
> @@ -56,5 +56,10 @@ HMODULE WINAPI GetModuleHandleW(LPCWSTR lpModuleName)
> return NULL;
> }
>
> +#ifndef _WIN64
> HMODULE (WINAPI *__MINGW_IMP_SYMBOL(GetModuleHandleA))(LPCSTR)
> asm("__imp__GetModuleHandleA@4") = GetModuleHandleA;
> HMODULE (WINAPI *__MINGW_IMP_SYMBOL(GetModuleHandleW))(LPCWSTR)
> asm("__imp__GetModuleHandleW@4") = GetModuleHandleW;
> +#else
> +HMODULE (WINAPI *__MINGW_IMP_SYMBOL(GetModuleHandleA))(LPCSTR)
> asm("__imp_GetModuleHandleA") = GetModuleHandleA;
> +HMODULE (WINAPI *__MINGW_IMP_SYMBOL(GetModuleHandleW))(LPCWSTR)
> asm("__imp_GetModuleHandleW") = GetModuleHandleW;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/GetTickCount.c
> b/mingw-w64-libraries/winstorecompat/src/GetTickCount.c
> index 7b6c049..8dcd692 100644
> --- a/mingw-w64-libraries/winstorecompat/src/GetTickCount.c
> +++ b/mingw-w64-libraries/winstorecompat/src/GetTickCount.c
> @@ -34,4 +34,8 @@ DWORD WINAPI GetTickCount(void)
> return (DWORD)GetTickCount64();
> }
>
> +#ifndef _WIN64
> DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetTickCount))(void)
> asm("__imp__GetTickCount@0") = GetTickCount;
> +#else
> +DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetTickCount))(void)
> asm("__imp_GetTickCount") = GetTickCount;
> +#endif
> diff --git
> a/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c
> b/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c
> index 6438bee..232f0a1 100644
> --- a/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c
> +++ b/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c
> @@ -36,4 +36,8 @@ void WINAPI InitializeCriticalSection(LPCRITICAL_SECTION
> lpCriticalSection)
> InitializeCriticalSectionEx(lpCriticalSection, 0, flags);
> }
>
> +#ifndef _WIN64
> void (WINAPI
> *__MINGW_IMP_SYMBOL(InitializeCriticalSection))(LPCRITICAL_SECTION
> lpCriticalSection) asm("__imp__InitializeCriticalSection@4") =
> InitializeCriticalSection;
> +#else
> +void (WINAPI
> *__MINGW_IMP_SYMBOL(InitializeCriticalSection))(LPCRITICAL_SECTION
> lpCriticalSection) asm("__imp_InitializeCriticalSection") =
> InitializeCriticalSection;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c
> b/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c
> index 93c527e..4eec35c 100644
> --- a/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c
> +++ b/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c
> @@ -46,4 +46,8 @@ BOOL WINAPI IsDBCSLeadByteEx( UINT CodePage, BYTE TestChar )
> return FALSE;
> }
>
> +#ifndef _WIN64
> BOOL (WINAPI *__MINGW_IMP_SYMBOL(IsDBCSLeadByteEx))(UINT CodePage, BYTE
> TestChar) asm("__imp__IsDBCSLeadByteEx@8") = IsDBCSLeadByteEx;
> +#else
> +BOOL (WINAPI *__MINGW_IMP_SYMBOL(IsDBCSLeadByteEx))(UINT CodePage, BYTE
> TestChar) asm("__imp_IsDBCSLeadByteEx") = IsDBCSLeadByteEx;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c
> b/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c
> index f87984e..d76973f 100644
> --- a/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c
> +++ b/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c
> @@ -34,4 +34,8 @@ HMODULE WINAPI LoadLibraryW(LPCWSTR lpFileName)
> return LoadPackagedLibrary(lpFileName, 0);
> }
>
> +#ifndef _WIN64
> HMODULE (WINAPI *__MINGW_IMP_SYMBOL(LoadLibraryW))(LPCWSTR lpFileName)
> asm("__imp__LoadLibraryW@4") = LoadLibraryW;
> +#else
> +HMODULE (WINAPI *__MINGW_IMP_SYMBOL(LoadLibraryW))(LPCWSTR lpFileName)
> asm("__imp_LoadLibraryW") = LoadLibraryW;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c
> b/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c
> index a2a0992..393cc9f 100644
> --- a/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c
> +++ b/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c
> @@ -38,4 +38,8 @@ HLOCAL WINAPI LocalAlloc(UINT uFlags, SIZE_T uBytes)
> return HeapAlloc(GetProcessHeap(), (uFlags & LMEM_ZEROINIT) ?
> HEAP_ZERO_MEMORY : 0, uBytes);
> }
>
> +#ifndef _WIN64
> HLOCAL (WINAPI *__MINGW_IMP_SYMBOL(LocalAlloc))(UINT uFlags, SIZE_T uByte)
> asm("__imp__LocalAlloc@8") = LocalAlloc;
> +#else
> +HLOCAL (WINAPI *__MINGW_IMP_SYMBOL(LocalAlloc))(UINT uFlags, SIZE_T uByte)
> asm("__imp_LocalAlloc") = LocalAlloc;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/LocalFree.c
> b/mingw-w64-libraries/winstorecompat/src/LocalFree.c
> index f41f43e..6c86412 100644
> --- a/mingw-w64-libraries/winstorecompat/src/LocalFree.c
> +++ b/mingw-w64-libraries/winstorecompat/src/LocalFree.c
> @@ -37,4 +37,8 @@ HLOCAL WINAPI LocalFree(HLOCAL hMem)
> return hMem;
> }
>
> +#ifndef _WIN64
> HLOCAL (WINAPI *__MINGW_IMP_SYMBOL(LocalFree))(HLOCAL hMem)
> asm("__imp__LocalFree@4") = LocalFree;
> +#else
> +HLOCAL (WINAPI *__MINGW_IMP_SYMBOL(LocalFree))(HLOCAL hMem)
> asm("__imp_LocalFree") = LocalFree;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/QueueTimer.c
> b/mingw-w64-libraries/winstorecompat/src/QueueTimer.c
> index 48d8e7f..40b6862 100644
> --- a/mingw-w64-libraries/winstorecompat/src/QueueTimer.c
> +++ b/mingw-w64-libraries/winstorecompat/src/QueueTimer.c
> @@ -45,5 +45,10 @@ WINBOOL WINAPI DeleteTimerQueueTimer (HANDLE TimerQueue,
> HANDLE Timer, HANDLE Co
> return 0;
> }
>
> +#ifndef _WIN64
> WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(CreateTimerQueueTimer)) (PHANDLE
> phNewTimer, HANDLE TimerQueue, WAITORTIMERCALLBACK Callback, PVOID Parameter,
> DWORD DueTime, DWORD Period, ULONG Flags)
> asm("__imp__CreateTimerQueueTimer@28") = CreateTimerQueueTimer;
> WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(DeleteTimerQueueTimer)) (HANDLE
> TimerQueue, HANDLE Timer, HANDLE CompletionEvent)
> asm("__imp__DeleteTimerQueueTimer@12") = DeleteTimerQueueTimer;
> +#else
> +WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(CreateTimerQueueTimer)) (PHANDLE
> phNewTimer, HANDLE TimerQueue, WAITORTIMERCALLBACK Callback, PVOID Parameter,
> DWORD DueTime, DWORD Period, ULONG Flags) asm("__imp_CreateTimerQueueTimer")
> = CreateTimerQueueTimer;
> +WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(DeleteTimerQueueTimer)) (HANDLE
> TimerQueue, HANDLE Timer, HANDLE CompletionEvent)
> asm("__imp_DeleteTimerQueueTimer") = DeleteTimerQueueTimer;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/SHGetFolderPathW.c
> b/mingw-w64-libraries/winstorecompat/src/SHGetFolderPathW.c
> index 9ae7d3c..0f15075 100644
> --- a/mingw-w64-libraries/winstorecompat/src/SHGetFolderPathW.c
> +++ b/mingw-w64-libraries/winstorecompat/src/SHGetFolderPathW.c
> @@ -34,4 +34,8 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd,int csidl,HANDLE
> hToken,DWORD dwFlags,
> return S_FALSE;
> }
>
> +#ifndef _WIN64
> HRESULT (WINAPI *__MINGW_IMP_SYMBOL(SHGetFolderPathW))(HWND hwnd,int
> csidl,HANDLE hToken,DWORD dwFlags,LPWSTR pszPath)
> asm("__imp__SHGetFolderPathW@20") = SHGetFolderPathW;
> +#else
> +HRESULT (WINAPI *__MINGW_IMP_SYMBOL(SHGetFolderPathW))(HWND hwnd,int
> csidl,HANDLE hToken,DWORD dwFlags,LPWSTR pszPath)
> asm("__imp_SHGetFolderPathW") = SHGetFolderPathW;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c
> b/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c
> index 18d82c6..a8e5b16 100644
> --- a/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c
> +++ b/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c
> @@ -35,4 +35,8 @@ UINT WINAPI SetErrorMode(UINT uMode)
> return InterlockedExchange(&oldMode, (LONG)uMode);
> }
>
> +#ifndef _WIN64
> UINT (WINAPI *__MINGW_IMP_SYMBOL(SetErrorMode))(UINT uMode)
> asm("__imp__SetErrorMode@4") = SetErrorMode;
> +#else
> +UINT (WINAPI *__MINGW_IMP_SYMBOL(SetErrorMode))(UINT uMode)
> asm("__imp_SetErrorMode") = SetErrorMode;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c
> b/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c
> index 8962841..b180d57 100644
> --- a/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c
> +++ b/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c
> @@ -56,4 +56,8 @@ DWORD WINAPI SetFilePointer(HANDLE hFile, LONG
> lDistanceToMove, PLONG lpDistance
> return newpos.u.LowPart;
> }
>
> +#ifndef _WIN64
> DWORD (WINAPI *__MINGW_IMP_SYMBOL(SetFilePointer))(HANDLE hFile, LONG
> lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod)
> asm("__imp__SetFilePointer@16") = SetFilePointer;
> +#else
> +DWORD (WINAPI *__MINGW_IMP_SYMBOL(SetFilePointer))(HANDLE hFile, LONG
> lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod)
> asm("__imp_SetFilePointer") = SetFilePointer;
> +#endif
> diff --git
> a/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c
> b/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c
> index 79913e8..1b23e01 100644
> --- a/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c
> +++ b/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c
> @@ -39,4 +39,8 @@ LPTOP_LEVEL_EXCEPTION_FILTER WINAPI
> SetUnhandledExceptionFilter(LPTOP_LEVEL_EXCE
> return
> (LPTOP_LEVEL_EXCEPTION_FILTER)(INT_PTR)InterlockedExchangePointer(target,
> lpTopLevelExceptionFilter);
> }
>
> +#ifndef _WIN64
> LPTOP_LEVEL_EXCEPTION_FILTER (WINAPI
> *__MINGW_IMP_SYMBOL(SetUnhandledExceptionFilter))(LPTOP_LEVEL_EXCEPTION_FILTER)
> asm("__imp__SetUnhandledExceptionFilter@4") = SetUnhandledExceptionFilter;
> +#else
> +LPTOP_LEVEL_EXCEPTION_FILTER (WINAPI
> *__MINGW_IMP_SYMBOL(SetUnhandledExceptionFilter))(LPTOP_LEVEL_EXCEPTION_FILTER)
> asm("__imp_SetUnhandledExceptionFilter") = SetUnhandledExceptionFilter;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/Sleep.c
> b/mingw-w64-libraries/winstorecompat/src/Sleep.c
> index 0f00410..1afadef 100644
> --- a/mingw-w64-libraries/winstorecompat/src/Sleep.c
> +++ b/mingw-w64-libraries/winstorecompat/src/Sleep.c
> @@ -34,4 +34,8 @@ VOID WINAPI Sleep(DWORD dwMilliseconds)
> WaitForSingleObjectEx(GetCurrentThread(), dwMilliseconds, FALSE);
> }
>
> +#ifndef _WIN64
> VOID (WINAPI *__MINGW_IMP_SYMBOL(Sleep))(DWORD dwMilliseconds)
> asm("__imp__Sleep@4") = Sleep;
> +#else
> +VOID (WINAPI *__MINGW_IMP_SYMBOL(Sleep))(DWORD dwMilliseconds)
> asm("__imp_Sleep") = Sleep;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/SleepEx.c
> b/mingw-w64-libraries/winstorecompat/src/SleepEx.c
> index be77d30..4b87b76 100644
> --- a/mingw-w64-libraries/winstorecompat/src/SleepEx.c
> +++ b/mingw-w64-libraries/winstorecompat/src/SleepEx.c
> @@ -38,4 +38,8 @@ DWORD WINAPI SleepEx(DWORD dwMilliseconds, BOOL bAlertable)
> return ret;
> }
>
> +#ifndef _WIN64
> DWORD (WINAPI *__MINGW_IMP_SYMBOL(SleepEx))(DWORD dwMilliseconds, BOOL
> bAlertable) asm("__imp__SleepEx@8") = SleepEx;
> +#else
> +DWORD (WINAPI *__MINGW_IMP_SYMBOL(SleepEx))(DWORD dwMilliseconds, BOOL
> bAlertable) asm("__imp_SleepEx") = SleepEx;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c
> b/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c
> index 8892df8..fae4a4d 100644
> --- a/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c
> +++ b/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c
> @@ -41,4 +41,8 @@ BOOL WINAPI TerminateProcess(HANDLE hProcess, UINT
> uExitCode)
> }
> }
>
> +#ifndef _WIN64
> BOOL (WINAPI *__MINGW_IMP_SYMBOL(TerminateProcess))(HANDLE, UINT)
> asm("__imp__TerminateProcess@8") = TerminateProcess;
> +#else
> +BOOL (WINAPI *__MINGW_IMP_SYMBOL(TerminateProcess))(HANDLE, UINT)
> asm("__imp_TerminateProcess") = TerminateProcess;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/Tls.c
> b/mingw-w64-libraries/winstorecompat/src/Tls.c
> index 957fa46..7b1bad0 100644
> --- a/mingw-w64-libraries/winstorecompat/src/Tls.c
> +++ b/mingw-w64-libraries/winstorecompat/src/Tls.c
> @@ -65,7 +65,14 @@ DWORD WINAPI TlsAlloc (void)
> return FlsAlloc (__ic_fls_free);
> }
>
> +#ifndef _WIN64
> DWORD (WINAPI *__MINGW_IMP_SYMBOL(TlsAlloc))(void) asm("__imp__TlsAlloc@0")
> = TlsAlloc;
> WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(TlsFree))(DWORD) asm("__imp__TlsFree@4")
> = TlsFree;
> WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(TlsSetValue))(DWORD, LPVOID)
> asm("__imp__TlsSetValue@8") = TlsSetValue;
> LPVOID (WINAPI *__MINGW_IMP_SYMBOL(TlsGetValue))(DWORD)
> asm("__imp__TlsGetValue@4") = TlsGetValue;
> +#else
> +DWORD (WINAPI *__MINGW_IMP_SYMBOL(TlsAlloc))(void) asm("__imp_TlsAlloc") =
> TlsAlloc;
> +WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(TlsFree))(DWORD) asm("__imp_TlsFree") =
> TlsFree;
> +WINBOOL (WINAPI *__MINGW_IMP_SYMBOL(TlsSetValue))(DWORD, LPVOID)
> asm("__imp_TlsSetValue") = TlsSetValue;
> +LPVOID (WINAPI *__MINGW_IMP_SYMBOL(TlsGetValue))(DWORD)
> asm("__imp_TlsGetValue") = TlsGetValue;
> +#endif
> diff --git
> a/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c
> b/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c
> index a1492ee..23a1df8 100644
> --- a/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c
> +++ b/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c
> @@ -34,4 +34,8 @@ LONG WINAPI UnhandledExceptionFilter(struct
> _EXCEPTION_POINTERS *ExceptionInfo)
> return EXCEPTION_CONTINUE_SEARCH;
> }
>
> +#ifndef _WIN64
> LONG (WINAPI *__MINGW_IMP_SYMBOL(UnhandledExceptionFilter))(struct
> _EXCEPTION_POINTERS *) asm("__imp__UnhandledExceptionFilter@4") =
> UnhandledExceptionFilter;
> +#else
> +LONG (WINAPI *__MINGW_IMP_SYMBOL(UnhandledExceptionFilter))(struct
> _EXCEPTION_POINTERS *) asm("__imp_UnhandledExceptionFilter") =
> UnhandledExceptionFilter;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c
> b/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c
> index 05d8e68..cce2eb4 100644
> --- a/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c
> +++ b/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c
> @@ -34,4 +34,8 @@ BOOL WINAPI VirtualProtect(LPVOID lpAddress, SIZE_T dwSize,
> DWORD flNewProtect,
> return FALSE;
> }
>
> +#ifndef _WIN64
> BOOL (WINAPI *__MINGW_IMP_SYMBOL(VirtualProtect))(LPVOID lpAddress, SIZE_T
> dwSize, DWORD flNewProtect, PDWORD lpflOldProtect)
> asm("__imp__VirtualProtect@16") = VirtualProtect;
> +#else
> +BOOL (WINAPI *__MINGW_IMP_SYMBOL(VirtualProtect))(LPVOID lpAddress, SIZE_T
> dwSize, DWORD flNewProtect, PDWORD lpflOldProtect)
> asm("__imp_VirtualProtect") = VirtualProtect;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c
> b/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c
> index 6979db7..a70b46a 100644
> --- a/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c
> +++ b/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c
> @@ -34,4 +34,8 @@ DWORD WINAPI WaitForSingleObject(HANDLE hHandle, DWORD
> dwMilliseconds)
> return WaitForSingleObjectEx(hHandle, dwMilliseconds, FALSE);
> }
>
> +#ifndef _WIN64
> DWORD (WINAPI *__MINGW_IMP_SYMBOL(WaitForSingleObject))(HANDLE hHandle,
> DWORD dwMilliseconds) asm("__imp__WaitForSingleObject@8") =
> WaitForSingleObject;
> +#else
> +DWORD (WINAPI *__MINGW_IMP_SYMBOL(WaitForSingleObject))(HANDLE hHandle,
> DWORD dwMilliseconds) asm("__imp_WaitForSingleObject") = WaitForSingleObject;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/getenv.c
> b/mingw-w64-libraries/winstorecompat/src/getenv.c
> index db9cdb3..a55f539 100644
> --- a/mingw-w64-libraries/winstorecompat/src/getenv.c
> +++ b/mingw-w64-libraries/winstorecompat/src/getenv.c
> @@ -32,4 +32,8 @@ char *getenv(const char *name)
> return NULL;
> }
>
> +#ifndef _WIN64
> char *(*__MINGW_IMP_SYMBOL(getenv))(const char *) asm("__imp__getenv") =
> getenv;
> +#else
> +char *(*__MINGW_IMP_SYMBOL(getenv))(const char *) asm("__imp_getenv") =
> getenv;
> +#endif
> diff --git a/mingw-w64-libraries/winstorecompat/src/getpid.c
> b/mingw-w64-libraries/winstorecompat/src/getpid.c
> index f6a24a4..fab1c91 100644
> --- a/mingw-w64-libraries/winstorecompat/src/getpid.c
> +++ b/mingw-w64-libraries/winstorecompat/src/getpid.c
> @@ -33,4 +33,8 @@ int getpid(void)
> return GetCurrentProcessId();
> }
>
> +#ifndef _WIN64
> int (*__MINGW_IMP_SYMBOL(getpid))(void) asm("__imp__getpid") = getpid;
> +#else
> +int (*__MINGW_IMP_SYMBOL(getpid))(void) asm("__imp_getpid") = getpid;
> +#endif
> --
> 2.8.0.rc3
>
>
> ------------------------------------------------------------------------------
> Transform Data into Opportunity.
> Accelerate data analysis in your applications with
> Intel Data Analytics Acceleration Library.
> Click to learn more.
> http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
> _______________________________________________
> Mingw-w64-public mailing list
> Mingw-w64-public@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
