Patch is looking fine to me. Please apply. Thanks, Kai
2016-03-31 18:07 GMT+02:00 Hugo Beauzée-Luyssen <h...@beauzee.fr>: > --- > mingw-w64-headers/include/combaseapi.h | 2 ++ > mingw-w64-headers/include/errhandlingapi.h | 15 ++++++++------- > mingw-w64-headers/include/fileapi.h | 15 ++++++++------- > mingw-w64-headers/include/libloaderapi.h | 4 ++++ > mingw-w64-headers/include/memoryapi.h | 4 +++- > mingw-w64-headers/include/processthreadsapi.h | 4 +++- > mingw-w64-headers/include/sysinfoapi.h | 2 ++ > mingw-w64-headers/include/winbase.h | 7 +++++-- > mingw-w64-headers/include/winnls.h | 2 +- > 9 files changed, 36 insertions(+), 19 deletions(-) > > diff --git a/mingw-w64-headers/include/combaseapi.h > b/mingw-w64-headers/include/combaseapi.h > index 3536e25..9c32965 100644 > --- a/mingw-w64-headers/include/combaseapi.h > +++ b/mingw-w64-headers/include/combaseapi.h > @@ -255,6 +255,8 @@ WINOLEAPI CoRevertToSelf (void); > WINOLEAPI CoQueryAuthenticationServices (DWORD *pcAuthSvc, > SOLE_AUTHENTICATION_SERVICE **asAuthSvc); > WINOLEAPI CoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD > dwClsContext, REFIID riid, LPVOID *ppv); > WINOLEAPI CoCreateInstanceEx (REFCLSID Clsid, IUnknown *punkOuter, DWORD > dwClsCtx, COSERVERINFO *pServerInfo, DWORD dwCount, MULTI_QI *pResults); > +#elif defined(WINSTORECOMPAT) > +WINOLEAPI CoCreateInstance (REFCLSID rclsid, LPUNKNOWN pUnkOuter, DWORD > dwClsContext, REFIID riid, LPVOID *ppv); > #endif > > #if WINAPI_FAMILY == WINAPI_FAMILY_APP > diff --git a/mingw-w64-headers/include/errhandlingapi.h > b/mingw-w64-headers/include/errhandlingapi.h > index c1c616a..379fddf 100755 > --- a/mingw-w64-headers/include/errhandlingapi.h > +++ b/mingw-w64-headers/include/errhandlingapi.h > @@ -13,14 +13,15 @@ > extern "C" { > #endif > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || > defined(WINSTORECOMPAT) > +typedef LONG (WINAPI *PTOP_LEVEL_EXCEPTION_FILTER) (struct > _EXCEPTION_POINTERS *ExceptionInfo); > +typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; > + WINBASEAPI UINT WINAPI SetErrorMode (UINT uMode); > + WINBASEAPI LPTOP_LEVEL_EXCEPTION_FILTER WINAPI > SetUnhandledExceptionFilter (LPTOP_LEVEL_EXCEPTION_FILTER > lpTopLevelExceptionFilter); > + WINBASEAPI LONG WINAPI UnhandledExceptionFilter (struct > _EXCEPTION_POINTERS *ExceptionInfo); > +#endif > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > - typedef LONG (WINAPI *PTOP_LEVEL_EXCEPTION_FILTER) (struct > _EXCEPTION_POINTERS *ExceptionInfo); > - typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER; > - > - WINBASEAPI LONG WINAPI UnhandledExceptionFilter (struct > _EXCEPTION_POINTERS *ExceptionInfo); > - WINBASEAPI LPTOP_LEVEL_EXCEPTION_FILTER WINAPI SetUnhandledExceptionFilter > (LPTOP_LEVEL_EXCEPTION_FILTER lpTopLevelExceptionFilter); > - WINBASEAPI UINT WINAPI SetErrorMode (UINT uMode); > - WINBASEAPI PVOID WINAPI AddVectoredExceptionHandler (ULONG First, > PVECTORED_EXCEPTION_HANDLER Handler); > + WINBASEAPI PVOID WINAPI AddVectoredExceptionHandler (ULONG First, > PVECTORED_EXCEPTION_HANDLER Handler); > WINBASEAPI ULONG WINAPI RemoveVectoredExceptionHandler (PVOID Handle); > WINBASEAPI PVOID WINAPI AddVectoredContinueHandler (ULONG First, > PVECTORED_EXCEPTION_HANDLER Handler); > WINBASEAPI ULONG WINAPI RemoveVectoredContinueHandler (PVOID Handle); > diff --git a/mingw-w64-headers/include/fileapi.h > b/mingw-w64-headers/include/fileapi.h > index 7bd9cee..eecd801 100755 > --- a/mingw-w64-headers/include/fileapi.h > +++ b/mingw-w64-headers/include/fileapi.h > @@ -26,6 +26,14 @@ extern "C" { > #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) > #endif > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || > defined(WINSTORECOMPAT) > +WINBASEAPI HANDLE WINAPI CreateFileW (LPCWSTR lpFileName, DWORD > dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES > lpSecurityAttributes, DWORD dwCreationDisposition, DWORD > dwFlagsAndAttributes, HANDLE hTemplateFile); > +#define CreateFile __MINGW_NAME_AW(CreateFile) > +WINBASEAPI DWORD WINAPI GetFileAttributesW (LPCWSTR lpFileName); > +#define GetFileAttributes __MINGW_NAME_AW(GetFileAttributes) > +WINBASEAPI DWORD WINAPI GetFileSize (HANDLE hFile, LPDWORD lpFileSizeHigh); > +WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG lDistanceToMove, > PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); > +#endif > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > typedef struct _BY_HANDLE_FILE_INFORMATION { > DWORD dwFileAttributes; > @@ -43,7 +51,6 @@ extern "C" { > > WINBASEAPI LONG WINAPI CompareFileTime (CONST FILETIME *lpFileTime1, CONST > FILETIME *lpFileTime2); > WINBASEAPI HANDLE WINAPI CreateFileA (LPCSTR lpFileName, DWORD > dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES > lpSecurityAttributes, DWORD dwCreationDisposition, DWORD > dwFlagsAndAttributes, HANDLE hTemplateFile); > - WINBASEAPI HANDLE WINAPI CreateFileW (LPCWSTR lpFileName, DWORD > dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES > lpSecurityAttributes, DWORD dwCreationDisposition, DWORD > dwFlagsAndAttributes, HANDLE hTemplateFile); > WINBASEAPI WINBOOL WINAPI DefineDosDeviceW (DWORD dwFlags, LPCWSTR > lpDeviceName, LPCWSTR lpTargetPath); > WINBASEAPI WINBOOL WINAPI DeleteVolumeMountPointW (LPCWSTR > lpszVolumeMountPoint); > WINBASEAPI WINBOOL WINAPI FileTimeToLocalFileTime (CONST FILETIME > *lpFileTime, LPFILETIME lpLocalFileTime); > @@ -61,9 +68,7 @@ extern "C" { > WINBASEAPI UINT WINAPI GetDriveTypeA (LPCSTR lpRootPathName); > WINBASEAPI UINT WINAPI GetDriveTypeW (LPCWSTR lpRootPathName); > WINBASEAPI DWORD WINAPI GetFileAttributesA (LPCSTR lpFileName); > - WINBASEAPI DWORD WINAPI GetFileAttributesW (LPCWSTR lpFileName); > WINBASEAPI WINBOOL WINAPI GetFileInformationByHandle (HANDLE hFile, > LPBY_HANDLE_FILE_INFORMATION lpFileInformation); > - WINBASEAPI DWORD WINAPI GetFileSize (HANDLE hFile, LPDWORD lpFileSizeHigh); > WINBASEAPI WINBOOL WINAPI GetFileSizeEx (HANDLE hFile, PLARGE_INTEGER > lpFileSize); > WINBASEAPI WINBOOL WINAPI GetFileTime (HANDLE hFile, LPFILETIME > lpCreationTime, LPFILETIME lpLastAccessTime, LPFILETIME lpLastWriteTime); > WINBASEAPI DWORD WINAPI GetFileType (HANDLE hFile); > @@ -82,7 +87,6 @@ extern "C" { > WINBASEAPI DWORD WINAPI QueryDosDeviceW (LPCWSTR lpDeviceName, LPWSTR > lpTargetPath, DWORD ucchMax); > WINBASEAPI WINBOOL WINAPI ReadFileEx (HANDLE hFile, LPVOID lpBuffer, DWORD > nNumberOfBytesToRead, LPOVERLAPPED lpOverlapped, > LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine); > WINBASEAPI WINBOOL WINAPI ReadFileScatter (HANDLE hFile, > FILE_SEGMENT_ELEMENT aSegmentArray[], DWORD nNumberOfBytesToRead, LPDWORD > lpReserved, LPOVERLAPPED lpOverlapped); > - WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG > lDistanceToMove, PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod); > WINBASEAPI WINBOOL WINAPI SetFileTime (HANDLE hFile, CONST FILETIME > *lpCreationTime, CONST FILETIME *lpLastAccessTime, CONST FILETIME > *lpLastWriteTime); > WINBASEAPI WINBOOL WINAPI SetFileValidData (HANDLE hFile, LONGLONG > ValidDataLength); > WINBASEAPI WINBOOL WINAPI UnlockFile (HANDLE hFile, DWORD dwFileOffsetLow, > DWORD dwFileOffsetHigh, DWORD nNumberOfBytesToUnlockLow, DWORD > nNumberOfBytesToUnlockHigh); > @@ -92,7 +96,6 @@ extern "C" { > WINBASEAPI WINBOOL WINAPI GetVolumeNameForVolumeMountPointW (LPCWSTR > lpszVolumeMountPoint, LPWSTR lpszVolumeName, DWORD cchBufferLength); > WINBASEAPI WINBOOL WINAPI GetVolumePathNamesForVolumeNameW (LPCWSTR > lpszVolumeName, LPWCH lpszVolumePathNames, DWORD cchBufferLength, PDWORD > lpcchReturnLength); > > -#define CreateFile __MINGW_NAME_AW(CreateFile) > #ifdef UNICODE > #define DefineDosDevice DefineDosDeviceW > #define DeleteVolumeMountPoint DeleteVolumeMountPointW > @@ -112,7 +115,6 @@ extern "C" { > #define FindFirstFile __MINGW_NAME_AW(FindFirstFile) > #define GetDiskFreeSpace __MINGW_NAME_AW(GetDiskFreeSpace) > #define GetDriveType __MINGW_NAME_AW(GetDriveType) > -#define GetFileAttributes __MINGW_NAME_AW(GetFileAttributes) > #define GetFullPathName __MINGW_NAME_AW(GetFullPathName) > #define GetLongPathName __MINGW_NAME_AW(GetLongPathName) > > @@ -123,7 +125,6 @@ extern "C" { > > #define GetFinalPathNameByHandle __MINGW_NAME_AW(GetFinalPathNameByHandle) > #endif > - > #endif > > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) > diff --git a/mingw-w64-headers/include/libloaderapi.h > b/mingw-w64-headers/include/libloaderapi.h > index 8744f68..765a63f 100755 > --- a/mingw-w64-headers/include/libloaderapi.h > +++ b/mingw-w64-headers/include/libloaderapi.h > @@ -127,6 +127,10 @@ extern "C" { > #define EnumResourceNamesEx __MINGW_NAME_AW(EnumResourceNamesEx) > #define EnumResourceTypesEx __MINGW_NAME_AW(EnumResourceTypesEx) > #endif > +#elif defined(WINSTORECOMPAT) > +WINBASEAPI HMODULE WINAPI GetModuleHandleA (LPCSTR lpModuleName); > +WINBASEAPI HMODULE WINAPI GetModuleHandleW (LPCWSTR lpModuleName); > +#define GetModuleHandle __MINGW_NAME_AW(GetModuleHandle) > #endif > > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_APP) > diff --git a/mingw-w64-headers/include/memoryapi.h > b/mingw-w64-headers/include/memoryapi.h > index 11f1591..01969f7 100755 > --- a/mingw-w64-headers/include/memoryapi.h > +++ b/mingw-w64-headers/include/memoryapi.h > @@ -51,6 +51,9 @@ extern "C" { > WINBASEAPI PVOID WINAPI MapViewOfFileFromApp (HANDLE hFileMappingObject, > ULONG DesiredAccess, ULONG64 FileOffset, SIZE_T NumberOfBytesToMap); > #endif > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || > defined(WINSTORECOMPAT) > + WINBASEAPI WINBOOL WINAPI VirtualProtect (LPVOID lpAddress, SIZE_T dwSize, > DWORD flNewProtect, PDWORD lpflOldProtect); > +#endif > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > #define FILE_MAP_EXECUTE SECTION_MAP_EXECUTE_EXPLICIT > > @@ -62,7 +65,6 @@ extern "C" { > > WINBASEAPI LPVOID WINAPI VirtualAlloc (LPVOID lpAddress, SIZE_T dwSize, > DWORD flAllocationType, DWORD flProtect); > WINBASEAPI WINBOOL WINAPI VirtualFree (LPVOID lpAddress, SIZE_T dwSize, > DWORD dwFreeType); > - WINBASEAPI WINBOOL WINAPI VirtualProtect (LPVOID lpAddress, SIZE_T dwSize, > DWORD flNewProtect, PDWORD lpflOldProtect); > WINBASEAPI LPVOID WINAPI VirtualAllocEx (HANDLE hProcess, LPVOID > lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect); > WINBASEAPI WINBOOL WINAPI VirtualFreeEx (HANDLE hProcess, LPVOID > lpAddress, SIZE_T dwSize, DWORD dwFreeType); > WINBASEAPI WINBOOL WINAPI VirtualProtectEx (HANDLE hProcess, LPVOID > lpAddress, SIZE_T dwSize, DWORD flNewProtect, PDWORD lpflOldProtect); > diff --git a/mingw-w64-headers/include/processthreadsapi.h > b/mingw-w64-headers/include/processthreadsapi.h > index daef829..c04e79c 100755 > --- a/mingw-w64-headers/include/processthreadsapi.h > +++ b/mingw-w64-headers/include/processthreadsapi.h > @@ -14,6 +14,9 @@ > extern "C" { > #endif > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || > defined(WINSTORECOMPAT) > +WINBASEAPI WINBOOL WINAPI TerminateProcess (HANDLE hProcess, UINT uExitCode); > +#endif > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > #ifndef FLS_OUT_OF_INDEXES > #define FLS_OUT_OF_INDEXES ((DWORD)0xffffffff) > @@ -78,7 +81,6 @@ extern "C" { > WINBASEAPI DWORD WINAPI QueueUserAPC (PAPCFUNC pfnAPC, HANDLE hThread, > ULONG_PTR dwData); > WINBASEAPI WINBOOL WINAPI GetProcessTimes (HANDLE hProcess, LPFILETIME > lpCreationTime, LPFILETIME lpExitTime, LPFILETIME lpKernelTime, LPFILETIME > lpUserTime); > WINBASEAPI DECLSPEC_NORETURN VOID WINAPI ExitProcess (UINT uExitCode); > - WINBASEAPI WINBOOL WINAPI TerminateProcess (HANDLE hProcess, UINT > uExitCode); > WINBASEAPI WINBOOL WINAPI GetExitCodeProcess (HANDLE hProcess, LPDWORD > lpExitCode); > WINBASEAPI WINBOOL WINAPI SwitchToThread (VOID); > WINBASEAPI HANDLE WINAPI CreateRemoteThread (HANDLE hProcess, > LPSECURITY_ATTRIBUTES lpThreadAttributes, SIZE_T dwStackSize, > LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter, DWORD > dwCreationFlags, LPDWORD lpThreadId); > diff --git a/mingw-w64-headers/include/sysinfoapi.h > b/mingw-w64-headers/include/sysinfoapi.h > index 2f8cc99..7d43ff5 100755 > --- a/mingw-w64-headers/include/sysinfoapi.h > +++ b/mingw-w64-headers/include/sysinfoapi.h > @@ -109,6 +109,8 @@ extern "C" { > #ifdef UNICODE > #define SetComputerNameEx SetComputerNameExW > #endif > +#elif defined(WINSTORECOMPAT) > + WINBASEAPI DWORD WINAPI GetTickCount (VOID); > #endif > > #ifdef __cplusplus > diff --git a/mingw-w64-headers/include/winbase.h > b/mingw-w64-headers/include/winbase.h > index a9a6809..7e12bcb 100644 > --- a/mingw-w64-headers/include/winbase.h > +++ b/mingw-w64-headers/include/winbase.h > @@ -1065,6 +1065,10 @@ extern "C" { > #define INVALID_ATOM ((ATOM)0) > #endif > > +#if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || > defined(WINSTORECOMPAT) > + WINBASEAPI HLOCAL WINAPI LocalAlloc (UINT uFlags, SIZE_T uBytes); > + WINBASEAPI HLOCAL WINAPI LocalFree (HLOCAL hMem); > +#endif > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR > lpCmdLine, int nShowCmd); > int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR > lpCmdLine, int nShowCmd); > @@ -1082,14 +1086,12 @@ extern "C" { > WINBASEAPI LPVOID WINAPI GlobalWire (HGLOBAL hMem); > WINBASEAPI WINBOOL WINAPI GlobalUnWire (HGLOBAL hMem); > WINBASEAPI VOID WINAPI GlobalMemoryStatus (LPMEMORYSTATUS lpBuffer); > - WINBASEAPI HLOCAL WINAPI LocalAlloc (UINT uFlags, SIZE_T uBytes); > WINBASEAPI HLOCAL WINAPI LocalReAlloc (HLOCAL hMem, SIZE_T uBytes, UINT > uFlags); > WINBASEAPI LPVOID WINAPI LocalLock (HLOCAL hMem); > WINBASEAPI HLOCAL WINAPI LocalHandle (LPCVOID pMem); > WINBASEAPI WINBOOL WINAPI LocalUnlock (HLOCAL hMem); > WINBASEAPI SIZE_T WINAPI LocalSize (HLOCAL hMem); > WINBASEAPI UINT WINAPI LocalFlags (HLOCAL hMem); > - WINBASEAPI HLOCAL WINAPI LocalFree (HLOCAL hMem); > WINBASEAPI SIZE_T WINAPI LocalShrink (HLOCAL hMem, UINT cbNewSize); > WINBASEAPI SIZE_T WINAPI LocalCompact (UINT uMinFree); > #if _WIN32_WINNT >= 0x0600 > @@ -1494,6 +1496,7 @@ extern "C" { > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || > defined(WINSTORECOMPAT) > #define CreateSemaphore __MINGW_NAME_AW(CreateSemaphore) > WINBASEAPI HANDLE WINAPI CreateSemaphoreW (LPSECURITY_ATTRIBUTES > lpSemaphoreAttributes, LONG lInitialCount, LONG lMaximumCount, LPCWSTR > lpName); > +#define LoadLibrary __MINGW_NAME_AW(LoadLibrary) > WINBASEAPI HMODULE WINAPI LoadLibraryW (LPCWSTR lpLibFileName); > #endif > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > diff --git a/mingw-w64-headers/include/winnls.h > b/mingw-w64-headers/include/winnls.h > index b0814b1..ebae7a5 100644 > --- a/mingw-w64-headers/include/winnls.h > +++ b/mingw-w64-headers/include/winnls.h > @@ -903,6 +903,7 @@ extern "C" { > > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) || > defined(WINSTORECOMPAT) > WINBASEAPI UINT WINAPI GetACP (void); > + WINBASEAPI WINBOOL WINAPI IsDBCSLeadByteEx (UINT CodePage, BYTE TestChar); > #endif > > #if WINAPI_FAMILY_PARTITION (WINAPI_PARTITION_DESKTOP) > @@ -913,7 +914,6 @@ extern "C" { > WINBASEAPI int WINAPI GetLocaleInfoW (LCID Locale, LCTYPE LCType, LPWSTR > lpLCData, int cchData); > WINBASEAPI int WINAPI GetLocaleInfoA (LCID Locale, LCTYPE LCType, LPSTR > lpLCData, int cchData); > WINBASEAPI WINBOOL WINAPI IsDBCSLeadByte (BYTE TestChar); > - WINBASEAPI WINBOOL WINAPI IsDBCSLeadByteEx (UINT CodePage, BYTE TestChar); > WINBASEAPI int WINAPI GetNumberFormatA (LCID Locale, DWORD dwFlags, LPCSTR > lpValue, CONST NUMBERFMTA *lpFormat, LPSTR lpNumberStr, int cchNumber); > WINBASEAPI int WINAPI GetNumberFormatW (LCID Locale, DWORD dwFlags, > LPCWSTR lpValue, CONST NUMBERFMTW *lpFormat, LPWSTR lpNumberStr, int > cchNumber); > WINBASEAPI int WINAPI GetCurrencyFormatA (LCID Locale, DWORD dwFlags, > LPCSTR lpValue, CONST CURRENCYFMTA *lpFormat, LPSTR lpCurrencyStr, int > cchCurrency); > -- > 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