Google Git
Sign in
mingw/mingw-w64/101e6770354ff8bae1e4ea19363a3eb7057ad0dd^!/.
commit
101e6770354ff8bae1e4ea19363a3eb7057ad0dd
[log]
author
Jean-Baptiste Kempf <jb@videolan.org>
Tue May 14 16:43:26 2013 +0000
committer
Jean-Baptiste Kempf <jb@videolan.org>
Tue May 14 16:43:26 2013 +0000
tree
0a09e3e8dd77613822ba979e6a39de7709795395
parent
6d3a386cbf400f7fca4386cc6a85f74359711347 [diff]
WinStoreCompat: put WINAPI inside the ( for better compatibility

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5859 4407c894-4637-0410-b4f5-ada5f102cad1

diff --git a/mingw-w64-libraries/winstorecompat/src/CreateEventW.c b/mingw-w64-libraries/winstorecompat/src/CreateEventW.c
index d9f0259..ba933d9 100644
--- a/mingw-w64-libraries/winstorecompat/src/CreateEventW.c
+++ b/mingw-w64-libraries/winstorecompat/src/CreateEventW.c

@@ -39,4 +39,4 @@
     return CreateEventExW(lpEventAttributes, lpName, flags, EVENT_ALL_ACCESS);
 }
 
-HANDLE WINAPI (*_imp__CreateEventW)(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName) asm("__imp__CreateEventW@16") = CreateEventW;
+HANDLE (WINAPI *_imp__CreateEventW)(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName) asm("__imp__CreateEventW@16") = CreateEventW;

diff --git a/mingw-w64-libraries/winstorecompat/src/CreateFileW.c b/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
index 2af1995..f92cb8d 100644
--- a/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
+++ b/mingw-w64-libraries/winstorecompat/src/CreateFileW.c

@@ -47,4 +47,4 @@
     return CreateFile2(lpFileName, dwDesiredAccess, dwShareMode, dwCreationDisposition, &createExParams);
 }
 
-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;
+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;

diff --git a/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c b/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c
index a20b7ad..5e4a59e 100644
--- a/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c
+++ b/mingw-w64-libraries/winstorecompat/src/CreateMutexW.c

@@ -37,4 +37,4 @@
     return CreateMutexExW(lpMutexAttributes, lpName, flags, EVENT_ALL_ACCESS);
 }
 
-HANDLE WINAPI (*__MINGW_IMP_SYMBOL(CreateMutexW))(LPSECURITY_ATTRIBUTES lpMutexAttributes, BOOL bInitialOwner, LPCWSTR lpName) asm("__imp__CreateMutexW@12") = CreateMutexW;
+HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateMutexW))(LPSECURITY_ATTRIBUTES lpMutexAttributes, BOOL bInitialOwner, LPCWSTR lpName) asm("__imp__CreateMutexW@12") = CreateMutexW;

diff --git a/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c b/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c
index ab9dc36..943953e 100644
--- a/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c
+++ b/mingw-w64-libraries/winstorecompat/src/CreateSemaphoreW.c

@@ -39,7 +39,7 @@
     return CreateSemaphoreExW(lpSemaphoreAttributes, lInitialCount, lMaximumCount, lpName, 0, EVENT_ALL_ACCESS);
 }
 
-HANDLE WINAPI (*__MINGW_IMP_SYMBOL(CreateSemaphoreW))(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCWSTR lpName) asm("__imp__CreateSemaphoreW@16") = CreateSemaphoreW;
+HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateSemaphoreW))(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCWSTR lpName) asm("__imp__CreateSemaphoreW@16") = CreateSemaphoreW;
 
 /*
  This is not really a proper implementation, but it is needed by gcc/libstdc++
@@ -60,4 +60,4 @@
     return CreateSemaphoreW(lpSemaphoreAttributes, lInitialCount, lMaximumCount, lpwName );
 }
 
-HANDLE WINAPI (*__MINGW_IMP_SYMBOL(CreateSemaphoreA))(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCSTR lpName) asm("__imp__CreateSemaphoreA@16") = CreateSemaphoreA;
+HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateSemaphoreA))(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCSTR lpName) asm("__imp__CreateSemaphoreA@16") = CreateSemaphoreA;

diff --git a/mingw-w64-libraries/winstorecompat/src/GetACP.c b/mingw-w64-libraries/winstorecompat/src/GetACP.c
index da09fe9..a799709 100644
--- a/mingw-w64-libraries/winstorecompat/src/GetACP.c
+++ b/mingw-w64-libraries/winstorecompat/src/GetACP.c

@@ -34,4 +34,4 @@
     return CP_UTF8; /* utf-8 */
 }
 
-UINT WINAPI (*__MINGW_IMP_SYMBOL(GetACP))(void) asm("__imp__GetACP@0") = GetACP;
+UINT (WINAPI *__MINGW_IMP_SYMBOL(GetACP))(void) asm("__imp__GetACP@0") = GetACP;

diff --git a/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c b/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c
index 8112b00..b85875d 100644
--- a/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c
+++ b/mingw-w64-libraries/winstorecompat/src/GetFileAttributes.c

@@ -41,4 +41,4 @@
         return INVALID_FILE_ATTRIBUTES;
 }
 
-DWORD WINAPI (*__MINGW_IMP_SYMBOL(GetFileAttributesW))(LPCWSTR lpFileName) asm("__imp__GetFileAttributesW@4") = GetFileAttributesW;
+DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetFileAttributesW))(LPCWSTR lpFileName) asm("__imp__GetFileAttributesW@4") = GetFileAttributesW;

diff --git a/mingw-w64-libraries/winstorecompat/src/GetFileSize.c b/mingw-w64-libraries/winstorecompat/src/GetFileSize.c
index d90cea9..e92eb1a 100644
--- a/mingw-w64-libraries/winstorecompat/src/GetFileSize.c
+++ b/mingw-w64-libraries/winstorecompat/src/GetFileSize.c

@@ -48,4 +48,4 @@
     return dwRet;
 }
 
-DWORD WINAPI (*__MINGW_IMP_SYMBOL(GetFileSize))(HANDLE hFile, LPDWORD lpFileSizeHigh) asm("__imp__GetFileSize@8") = GetFileSize;
+DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetFileSize))(HANDLE hFile, LPDWORD lpFileSizeHigh) asm("__imp__GetFileSize@8") = GetFileSize;

diff --git a/mingw-w64-libraries/winstorecompat/src/GetTickCount.c b/mingw-w64-libraries/winstorecompat/src/GetTickCount.c
index 5e02f3a..7b6c049 100644
--- a/mingw-w64-libraries/winstorecompat/src/GetTickCount.c
+++ b/mingw-w64-libraries/winstorecompat/src/GetTickCount.c

@@ -34,4 +34,4 @@
     return (DWORD)GetTickCount64();
 }
 
-DWORD WINAPI (*__MINGW_IMP_SYMBOL(GetTickCount))(void) asm("__imp__GetTickCount@0") = GetTickCount;
+DWORD (WINAPI *__MINGW_IMP_SYMBOL(GetTickCount))(void) asm("__imp__GetTickCount@0") = GetTickCount;

diff --git a/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c b/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c
index c54a001..6438bee 100644
--- a/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c
+++ b/mingw-w64-libraries/winstorecompat/src/InitializeCriticalSection.c

@@ -36,4 +36,4 @@
     InitializeCriticalSectionEx(lpCriticalSection, 0, flags);
 }
 
-void WINAPI (*__MINGW_IMP_SYMBOL(InitializeCriticalSection))(LPCRITICAL_SECTION lpCriticalSection) asm("__imp__InitializeCriticalSection@4") = InitializeCriticalSection;
+void (WINAPI *__MINGW_IMP_SYMBOL(InitializeCriticalSection))(LPCRITICAL_SECTION lpCriticalSection) asm("__imp__InitializeCriticalSection@4") = InitializeCriticalSection;

diff --git a/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c b/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c
index 7446e92..93c527e 100644
--- a/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c
+++ b/mingw-w64-libraries/winstorecompat/src/IsDBCSLeadByteEx.c

@@ -46,4 +46,4 @@
     return FALSE;
 }
 
-BOOL WINAPI (*__MINGW_IMP_SYMBOL(IsDBCSLeadByteEx))(UINT CodePage, BYTE TestChar) asm("__imp__IsDBCSLeadByteEx@8") = IsDBCSLeadByteEx;
+BOOL (WINAPI *__MINGW_IMP_SYMBOL(IsDBCSLeadByteEx))(UINT CodePage, BYTE TestChar) asm("__imp__IsDBCSLeadByteEx@8") = IsDBCSLeadByteEx;

diff --git a/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c b/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c
index 55c1418..f87984e 100644
--- a/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c
+++ b/mingw-w64-libraries/winstorecompat/src/LoadLibraryW.c

@@ -34,4 +34,4 @@
     return LoadPackagedLibrary(lpFileName, 0);
 }
 
-HMODULE WINAPI (*__MINGW_IMP_SYMBOL(LoadLibraryW))(LPCWSTR lpFileName) asm("__imp__LoadLibraryW@4") = LoadLibraryW;
+HMODULE (WINAPI *__MINGW_IMP_SYMBOL(LoadLibraryW))(LPCWSTR lpFileName) asm("__imp__LoadLibraryW@4") = LoadLibraryW;

diff --git a/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c b/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c
index 6182447..a2a0992 100644
--- a/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c
+++ b/mingw-w64-libraries/winstorecompat/src/LocalAlloc.c

@@ -38,4 +38,4 @@
     return HeapAlloc(GetProcessHeap(), (uFlags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0, uBytes);
 }
 
-HLOCAL WINAPI (*__MINGW_IMP_SYMBOL(LocalAlloc))(UINT uFlags, SIZE_T uByte) asm("__imp__LocalAlloc@8") = LocalAlloc;
+HLOCAL (WINAPI *__MINGW_IMP_SYMBOL(LocalAlloc))(UINT uFlags, SIZE_T uByte) asm("__imp__LocalAlloc@8") = LocalAlloc;

diff --git a/mingw-w64-libraries/winstorecompat/src/LocalFree.c b/mingw-w64-libraries/winstorecompat/src/LocalFree.c
index c703831..f41f43e 100644
--- a/mingw-w64-libraries/winstorecompat/src/LocalFree.c
+++ b/mingw-w64-libraries/winstorecompat/src/LocalFree.c

@@ -37,4 +37,4 @@
         return hMem;
 }
 
-HLOCAL WINAPI (*__MINGW_IMP_SYMBOL(LocalFree))(HLOCAL hMem) asm("__imp__LocalFree@4") = LocalFree;
+HLOCAL (WINAPI *__MINGW_IMP_SYMBOL(LocalFree))(HLOCAL hMem) asm("__imp__LocalFree@4") = LocalFree;

diff --git a/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c b/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c
index aa6c301..18d82c6 100644
--- a/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c
+++ b/mingw-w64-libraries/winstorecompat/src/SetErrorMode.c

@@ -35,4 +35,4 @@
     return InterlockedExchange(&oldMode, (LONG)uMode);
 }
 
-UINT WINAPI (*__MINGW_IMP_SYMBOL(SetErrorMode))(UINT uMode) asm("__imp__SetErrorMode@4") = SetErrorMode;
+UINT (WINAPI *__MINGW_IMP_SYMBOL(SetErrorMode))(UINT uMode) asm("__imp__SetErrorMode@4") = SetErrorMode;

diff --git a/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c b/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c
index 87c77ce..8962841 100644
--- a/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c
+++ b/mingw-w64-libraries/winstorecompat/src/SetFilePointer.c

@@ -56,4 +56,4 @@
     return newpos.u.LowPart;
 }
 
-DWORD WINAPI (*__MINGW_IMP_SYMBOL(SetFilePointer))(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod) asm("__imp__SetFilePointer@16") = SetFilePointer;
+DWORD (WINAPI *__MINGW_IMP_SYMBOL(SetFilePointer))(HANDLE hFile, LONG lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod) asm("__imp__SetFilePointer@16") = SetFilePointer;

diff --git a/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c b/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c
index 4e54eec..79913e8 100644
--- a/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c
+++ b/mingw-w64-libraries/winstorecompat/src/SetUnhandledExceptionFilter.c

@@ -39,4 +39,4 @@
     return (LPTOP_LEVEL_EXCEPTION_FILTER)(INT_PTR)InterlockedExchangePointer(target, lpTopLevelExceptionFilter);
 }
 
-LPTOP_LEVEL_EXCEPTION_FILTER WINAPI (*__MINGW_IMP_SYMBOL(SetUnhandledExceptionFilter))(LPTOP_LEVEL_EXCEPTION_FILTER) asm("__imp__SetUnhandledExceptionFilter@4") = SetUnhandledExceptionFilter;
+LPTOP_LEVEL_EXCEPTION_FILTER (WINAPI *__MINGW_IMP_SYMBOL(SetUnhandledExceptionFilter))(LPTOP_LEVEL_EXCEPTION_FILTER) asm("__imp__SetUnhandledExceptionFilter@4") = SetUnhandledExceptionFilter;

diff --git a/mingw-w64-libraries/winstorecompat/src/Sleep.c b/mingw-w64-libraries/winstorecompat/src/Sleep.c
index 560d4ef..0f00410 100644
--- a/mingw-w64-libraries/winstorecompat/src/Sleep.c
+++ b/mingw-w64-libraries/winstorecompat/src/Sleep.c

@@ -34,4 +34,4 @@
     WaitForSingleObjectEx(GetCurrentThread(), dwMilliseconds, FALSE);
 }
 
-VOID WINAPI (*__MINGW_IMP_SYMBOL(Sleep))(DWORD dwMilliseconds) asm("__imp__Sleep@4") = Sleep;
+VOID (WINAPI *__MINGW_IMP_SYMBOL(Sleep))(DWORD dwMilliseconds) asm("__imp__Sleep@4") = Sleep;

diff --git a/mingw-w64-libraries/winstorecompat/src/SleepEx.c b/mingw-w64-libraries/winstorecompat/src/SleepEx.c
index 8e34774..be77d30 100644
--- a/mingw-w64-libraries/winstorecompat/src/SleepEx.c
+++ b/mingw-w64-libraries/winstorecompat/src/SleepEx.c

@@ -38,4 +38,4 @@
         return ret;
 }
 
-DWORD WINAPI (*__MINGW_IMP_SYMBOL(SleepEx))(DWORD dwMilliseconds, BOOL bAlertable) asm("__imp__SleepEx@8") = SleepEx;
+DWORD (WINAPI *__MINGW_IMP_SYMBOL(SleepEx))(DWORD dwMilliseconds, BOOL bAlertable) asm("__imp__SleepEx@8") = SleepEx;

diff --git a/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c b/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c
index 2279187..8892df8 100644
--- a/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c
+++ b/mingw-w64-libraries/winstorecompat/src/TerminateProcess.c

@@ -41,4 +41,4 @@
     }
 }
 
-BOOL WINAPI (*__MINGW_IMP_SYMBOL(TerminateProcess))(HANDLE, UINT) asm("__imp__TerminateProcess@8") = TerminateProcess;
+BOOL (WINAPI *__MINGW_IMP_SYMBOL(TerminateProcess))(HANDLE, UINT) asm("__imp__TerminateProcess@8") = TerminateProcess;

diff --git a/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c b/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c
index 7103038..a1492ee 100644
--- a/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c
+++ b/mingw-w64-libraries/winstorecompat/src/UnhandledExceptionFilter.c

@@ -34,4 +34,4 @@
     return EXCEPTION_CONTINUE_SEARCH;
 }
 
-LONG WINAPI (*__MINGW_IMP_SYMBOL(UnhandledExceptionFilter))(struct _EXCEPTION_POINTERS *) asm("__imp__UnhandledExceptionFilter@4") = UnhandledExceptionFilter;
+LONG (WINAPI *__MINGW_IMP_SYMBOL(UnhandledExceptionFilter))(struct _EXCEPTION_POINTERS *) asm("__imp__UnhandledExceptionFilter@4") = UnhandledExceptionFilter;

diff --git a/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c b/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c
index f29c80d..05d8e68 100644
--- a/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c
+++ b/mingw-w64-libraries/winstorecompat/src/VirtualProtect.c

@@ -34,4 +34,4 @@
     return FALSE;
 }
 
-BOOL WINAPI (*__MINGW_IMP_SYMBOL(VirtualProtect))(LPVOID lpAddress, SIZE_T dwSize, DWORD flNewProtect, PDWORD lpflOldProtect) asm("__imp__VirtualProtect@16") = VirtualProtect;
+BOOL (WINAPI *__MINGW_IMP_SYMBOL(VirtualProtect))(LPVOID lpAddress, SIZE_T dwSize, DWORD flNewProtect, PDWORD lpflOldProtect) asm("__imp__VirtualProtect@16") = VirtualProtect;

diff --git a/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c b/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c
index 3a26358..6979db7 100644
--- a/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c
+++ b/mingw-w64-libraries/winstorecompat/src/WaitForSingleObject.c

@@ -34,4 +34,4 @@
     return WaitForSingleObjectEx(hHandle, dwMilliseconds, FALSE);
 }
 
-DWORD WINAPI (*__MINGW_IMP_SYMBOL(WaitForSingleObject))(HANDLE hHandle, DWORD dwMilliseconds) asm("__imp__WaitForSingleObject@8") = WaitForSingleObject;
+DWORD (WINAPI *__MINGW_IMP_SYMBOL(WaitForSingleObject))(HANDLE hHandle, DWORD dwMilliseconds) asm("__imp__WaitForSingleObject@8") = WaitForSingleObject;