Hello,
patch is fine, if previous patches getting reviewed ok, too.
Thanks,
Kai
2016-03-31 18:07 GMT+02:00 Hugo Beauzée-Luyssen <h...@beauzee.fr>:
> which simply suppresses the call.
> ---
> mingw-w64-headers/include/fileapi.h | 2 +-
> .../winstorecompat/src/CreateFileW.c | 22
> ++++++++++++++++++++++
> 2 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/mingw-w64-headers/include/fileapi.h
> b/mingw-w64-headers/include/fileapi.h
> index eecd801..53abd81 100755
> --- a/mingw-w64-headers/include/fileapi.h
> +++ b/mingw-w64-headers/include/fileapi.h
> @@ -28,6 +28,7 @@ extern "C" {
>
> #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);
> +WINBASEAPI HANDLE WINAPI CreateFileA (LPCSTR 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)
> @@ -50,7 +51,6 @@ WINBASEAPI DWORD WINAPI SetFilePointer (HANDLE hFile, LONG
> lDistanceToMove, PLON
> *LPBY_HANDLE_FILE_INFORMATION;
>
> 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 WINBOOL WINAPI DefineDosDeviceW (DWORD dwFlags, LPCWSTR
> lpDeviceName, LPCWSTR lpTargetPath);
> WINBASEAPI WINBOOL WINAPI DeleteVolumeMountPointW (LPCWSTR
> lpszVolumeMountPoint);
> WINBASEAPI WINBOOL WINAPI FileTimeToLocalFileTime (CONST FILETIME
> *lpFileTime, LPFILETIME lpLocalFileTime);
> diff --git a/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> b/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> index b251d8b..4af6abb 100644
> --- a/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> +++ b/mingw-w64-libraries/winstorecompat/src/CreateFileW.c
> @@ -25,8 +25,10 @@
> #define _WIN32_WINNT 0x602 /* CreateFile2 is Win8 APP Family */
>
> #define CreateFileW __CreateFileW
> +#define CreateFileA __CreateFileA
> #include <windef.h>
> #include <winbase.h>
> +#undef CreateFileA
> #undef CreateFileW
>
> HANDLE WINAPI CreateFileW(LPCWSTR lpFileName,
> @@ -47,8 +49,28 @@ HANDLE WINAPI CreateFileW(LPCWSTR lpFileName,
> return CreateFile2(lpFileName, dwDesiredAccess, dwShareMode,
> dwCreationDisposition, &createExParams);
> }
>
> +WINBASEAPI HANDLE WINAPI CreateFileA(LPCSTR lpFileName,
> + DWORD dwDesiredAccess,
> + DWORD dwShareMode,
> + LPSECURITY_ATTRIBUTES
> lpSecurityAttributes,
> + DWORD dwCreationDisposition,
> + DWORD dwFlagsAndAttributes,
> + HANDLE hTemplateFile)
> +{
> + (void)lpFileName;
> + (void)dwDesiredAccess;
> + (void)dwShareMode;
> + (void)lpSecurityAttributes;
> + (void)dwCreationDisposition;
> + (void)dwFlagsAndAttributes;
> + (void)hTemplateFile;
> + return INVALID_HANDLE_VALUE;
> +}
> +
> #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;
> +HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateFileA))(LPCWSTR lpFileName, DWORD
> dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES
> lpSecurityAttributes, DWORD dwCreationDisposition, DWORD
> dwFlagsAndAttributes, HANDLE hTemplateFile) asm("__imp__CreateFileA@28") =
> CreateFileA;
> #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;
> +HANDLE (WINAPI *__MINGW_IMP_SYMBOL(CreateFileA))(LPCWSTR lpFileName, DWORD
> dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES
> lpSecurityAttributes, DWORD dwCreationDisposition, DWORD
> dwFlagsAndAttributes, HANDLE hTemplateFile) asm("__imp_CreateFileA") =
> CreateFileA;
> #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
