From 5aa6e7afe42ac5a5aa4aaf1e937cfb9cbf41cd39 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 25 Aug 2015 22:44:50 +0200 Subject: [PATCH] Rebase against bdaa571c5d7dd59dd28fd1f25cdad5761bfaf4dd. --- README.md | 4 +- debian/changelog | 6 + ...rtbase-Add-the-new-universal-CRT-DLL.patch | 2624 ----------------- ...some-functions-with-new-names-to-ex.patch} | 23 +- ...the-new-MSVC-2015-compiler-specific.patch} | 6 +- ...-up-a-function-with-a-new-name-to-t.patch} | 2 +- ...ub-functions-for-narrow-environment.patch} | 10 +- ...0-Add-stubs-for-telemetry-functions.patch} | 2 +- ...e-cdecl-for-stub-redirects-to-ucrtb.patch} | 2 +- ...s-win-crt-conio-l1-1-0-Add-stub-dll.patch} | 4 +- ...win-crt-convert-l1-1-0-Add-stub-dll.patch} | 4 +- ...crt-environment-l1-1-0-Add-stub-dll.patch} | 4 +- ...-crt-filesystem-l1-1-0-Add-stub-dll.patch} | 4 +- ...ms-win-crt-heap-l1-1-0-Add-stub-dll.patch} | 4 +- ...-win-crt-locale-l1-1-0-Add-stub-dll.patch} | 4 +- ...ms-win-crt-math-l1-1-0-Add-stub-dll.patch} | 4 +- ...n-crt-multibyte-l1-1-0-Add-stub-dll.patch} | 4 +- ...win-crt-private-l1-1-0-Add-stub-dll.patch} | 4 +- ...win-crt-process-l1-1-0-Add-stub-dll.patch} | 4 +- ...win-crt-runtime-l1-1-0-Add-stub-dll.patch} | 4 +- ...s-win-crt-stdio-l1-1-0-Add-stub-dll.patch} | 4 +- ...-win-crt-string-l1-1-0-Add-stub-dll.patch} | 4 +- ...ms-win-crt-time-l1-1-0-Add-stub-dll.patch} | 4 +- ...win-crt-utility-l1-1-0-Add-stub-dll.patch} | 4 +- ...eral-issues-in-save_dds_surface_to_m.patch | 19 +- ...re-new-files-are-created-immediately.patch | 35 - patches/notepad-New_File/definition | 1 - patches/patchinstall.sh | 82 +- .../wined3d-CSMT_Main/9999-IfDefined.patch | 162 +- ...-specify-multisampling-AA-quality-le.patch | 27 +- ...t-Delay-setting-the-http-host-header.patch | 138 - ...ilename-if-no-path-is-set-in-cookie.patch} | 0 ...-header-fields-should-fail-if-they-.patch} | 0 ...est-server-canon_host_port-in-authen.patch | 49 - ...est-server-canon_host_port-when-quer.patch | 54 - patches/wininet-Cleanup/definition | 2 +- 36 files changed, 184 insertions(+), 3124 deletions(-) delete mode 100644 patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Add-the-new-universal-CRT-DLL.patch rename patches/api-ms-win-crt-Stub_DLLs/{0002-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch => 0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch} (77%) rename patches/api-ms-win-crt-Stub_DLLs/{0003-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch => 0002-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch} (97%) rename patches/api-ms-win-crt-Stub_DLLs/{0004-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch => 0003-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch} (93%) rename patches/api-ms-win-crt-Stub_DLLs/{0005-ucrtbase-Add-stub-functions-for-narrow-environment.patch => 0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch} (94%) rename patches/api-ms-win-crt-Stub_DLLs/{0006-vcruntime140-Add-stubs-for-telemetry-functions.patch => 0005-vcruntime140-Add-stubs-for-telemetry-functions.patch} (96%) rename patches/api-ms-win-crt-Stub_DLLs/{0007-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch => 0006-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch} (93%) rename patches/api-ms-win-crt-Stub_DLLs/{0008-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch => 0007-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch} (97%) rename patches/api-ms-win-crt-Stub_DLLs/{0009-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch => 0008-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch} (98%) rename patches/api-ms-win-crt-Stub_DLLs/{0010-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch => 0009-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch} (96%) rename patches/api-ms-win-crt-Stub_DLLs/{0011-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch => 0010-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch} (98%) rename patches/api-ms-win-crt-Stub_DLLs/{0012-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch => 0011-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch} (97%) rename patches/api-ms-win-crt-Stub_DLLs/{0013-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch => 0012-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch} (96%) rename patches/api-ms-win-crt-Stub_DLLs/{0014-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch => 0013-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch} (99%) rename patches/api-ms-win-crt-Stub_DLLs/{0015-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch => 0014-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch} (98%) rename patches/api-ms-win-crt-Stub_DLLs/{0016-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch => 0015-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch} (99%) rename patches/api-ms-win-crt-Stub_DLLs/{0017-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch => 0016-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch} (97%) rename patches/api-ms-win-crt-Stub_DLLs/{0018-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch => 0017-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch} (98%) rename patches/api-ms-win-crt-Stub_DLLs/{0019-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch => 0018-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch} (98%) rename patches/api-ms-win-crt-Stub_DLLs/{0020-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch => 0019-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch} (99%) rename patches/api-ms-win-crt-Stub_DLLs/{0021-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch => 0020-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch} (98%) rename patches/api-ms-win-crt-Stub_DLLs/{0022-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch => 0021-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch} (97%) delete mode 100644 patches/notepad-New_File/0001-notepad-Make-sure-new-files-are-created-immediately.patch delete mode 100644 patches/notepad-New_File/definition delete mode 100644 patches/wininet-Cleanup/0004-wininet-Delay-setting-the-http-host-header.patch rename patches/wininet-Cleanup/{0007-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch => 0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch} (100%) rename patches/wininet-Cleanup/{0008-wininet-Replacing-header-fields-should-fail-if-they-.patch => 0005-wininet-Replacing-header-fields-should-fail-if-they-.patch} (100%) delete mode 100644 patches/wininet-Cleanup/0005-wininet-Use-request-server-canon_host_port-in-authen.patch delete mode 100644 patches/wininet-Cleanup/0006-wininet-Use-request-server-canon_host_port-when-quer.patch diff --git a/README.md b/README.md index 8c4a9266..6cb96940 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ releases, take a look at the [changelog](https://github.com/wine-compholio/wine-staging/blob/master/debian/changelog) for more details.* -* Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest ([Wine Bug #28911](https://bugs.winehq.org/show_bug.cgi?id=28911)) +* ~~Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest~~ ([Wine Bug #28911](https://bugs.winehq.org/show_bug.cgi?id=28911)) * Add IDragSourceHelper stub interface ([Wine Bug #24699](https://bugs.winehq.org/show_bug.cgi?id=24699)) * Add a ProfileList\ registry subkey ([Wine Bug #15670](https://bugs.winehq.org/show_bug.cgi?id=15670)) * Add implementation for mfplat.MFTRegister ([Wine Bug #37811](https://bugs.winehq.org/show_bug.cgi?id=37811)) @@ -213,7 +213,7 @@ for more details.* * MediaCoder needs CUDA for video encoding ([Wine Bug #37664](https://bugs.winehq.org/show_bug.cgi?id=37664)) * Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978)) * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115)) -* Notepad should create new files immediately ([Wine Bug #19425](https://bugs.winehq.org/show_bug.cgi?id=19425)) +* ~~Notepad should create new files immediately~~ ([Wine Bug #19425](https://bugs.winehq.org/show_bug.cgi?id=19425)) * Only set SFGAO_HASSUBFOLDER when there are really subfolders ([Wine Bug #24851](https://bugs.winehq.org/show_bug.cgi?id=24851)) * Other Pipelight-specific enhancements * Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913)) diff --git a/debian/changelog b/debian/changelog index d9d6f0a3..b4da5349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,12 @@ wine-staging (1.7.51) UNRELEASED; urgency=low * Removed patch to fix test failure in kernel32/thread tests (fixed upstream). * Removed patch to use request->server->name when processing cookies (identical patch accepted upstream). + * Removed patch to set Host header in HttpSendRequest instead of + HttpOpenRequest (accepted upstream). + * Removed patch to make sure Notepad creates new files immediately (accepted + upstream). + * Partially removed patches for stub dlls required by the MSVC 2015 runtime + library (accepted upstream). -- Sebastian Lackner Mon, 24 Aug 2015 07:55:18 +0200 wine-staging (1.7.50) unstable; urgency=low diff --git a/patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Add-the-new-universal-CRT-DLL.patch b/patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Add-the-new-universal-CRT-DLL.patch deleted file mode 100644 index c5c4b65c..00000000 --- a/patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Add-the-new-universal-CRT-DLL.patch +++ /dev/null @@ -1,2624 +0,0 @@ -From cee6d1991d4b43b26fd672bf7561b4cdddbd041f Mon Sep 17 00:00:00 2001 -From: Martin Storsjo -Date: Mon, 3 Aug 2015 22:26:00 +0300 -Subject: ucrtbase: Add the new universal CRT DLL. - -Since MSVC 2015/Windows 10, the C runtime has now been split into two -parts, ucrtbase, which is the generic C runtime which is now considered -a system component (in Windows 10, and as an extra installed runtime -component for older Windows version), and vcruntimeX which is specific -to the compiler version. - -This uses the msvcrt implementation, just like the earlier msvcr* DLLs. - -Functions with names that existed in msvcr120 are hooked up so far. ---- - configure.ac | 1 + - dlls/ucrtbase/Makefile.in | 33 + - dlls/ucrtbase/ucrtbase.spec | 2542 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 2576 insertions(+) - create mode 100644 dlls/ucrtbase/Makefile.in - create mode 100644 dlls/ucrtbase/ucrtbase.spec - -diff --git a/configure.ac b/configure.ac -index 1329786..0a93a00 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3303,6 +3303,7 @@ WINE_CONFIG_DLL(twain.dll16,enable_win16) - WINE_CONFIG_DLL(twain_32) - WINE_CONFIG_TEST(dlls/twain_32/tests) - WINE_CONFIG_DLL(typelib.dll16,enable_win16) -+WINE_CONFIG_DLL(ucrtbase,,[implib]) - WINE_CONFIG_DLL(unicows,,[implib]) - WINE_CONFIG_DLL(updspapi) - WINE_CONFIG_DLL(url,,[implib]) -diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in -new file mode 100644 -index 0000000..cbb18c6 ---- /dev/null -+++ b/dlls/ucrtbase/Makefile.in -@@ -0,0 +1,33 @@ -+EXTRADEFS = -D_MT -D_MSVCR_VER=140 -+MODULE = ucrtbase.dll -+IMPORTLIB = ucrtbase -+DELAYIMPORTS = advapi32 user32 -+PARENTSRC = ../msvcrt -+ -+C_SRCS = \ -+ console.c \ -+ cpp.c \ -+ ctype.c \ -+ data.c \ -+ dir.c \ -+ environ.c \ -+ errno.c \ -+ except.c \ -+ except_arm.c \ -+ except_i386.c \ -+ except_x86_64.c \ -+ exit.c \ -+ file.c \ -+ heap.c \ -+ locale.c \ -+ lock.c \ -+ main.c \ -+ math.c \ -+ mbcs.c \ -+ misc.c \ -+ process.c \ -+ string.c \ -+ thread.c \ -+ time.c \ -+ undname.c \ -+ wcs.c -diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec -new file mode 100644 -index 0000000..a1be10d ---- /dev/null -+++ b/dlls/ucrtbase/ucrtbase.spec -@@ -0,0 +1,2542 @@ -+@ cdecl -arch=i386 _CIacos() -+@ cdecl -arch=i386 _CIasin() -+@ cdecl -arch=i386 _CIatan() -+@ cdecl -arch=i386 _CIatan2() -+@ cdecl -arch=i386 _CIcos() -+@ cdecl -arch=i386 _CIcosh() -+@ cdecl -arch=i386 _CIexp() -+@ cdecl -arch=i386 _CIfmod() -+@ cdecl -arch=i386 _CIlog() -+@ cdecl -arch=i386 _CIlog10() -+@ cdecl -arch=i386 _CIpow() -+@ cdecl -arch=i386 _CIsin() -+@ cdecl -arch=i386 _CIsinh() -+@ cdecl -arch=i386 _CIsqrt() -+@ cdecl -arch=i386 _CItan() -+@ cdecl -arch=i386 _CItanh() -+@ stub _Cbuild -+@ stub _Cmulcc -+@ stub _Cmulcr -+@ stub _CreateFrameInfo -+@ stdcall _CxxThrowException(long long) -+@ cdecl -arch=i386 -norelay _EH_prolog() -+@ stub _Exit -+@ stub _FCbuild -+@ stub _FCmulcc -+@ stub _FCmulcr -+@ stub _FindAndUnlinkFrame -+@ cdecl _Getdays() -+@ cdecl _Getmonths() -+@ cdecl _Gettnames() -+@ stub _IsExceptionObjectToBeDestroyed -+@ stub _LCbuild -+@ stub _LCmulcc -+@ stub _LCmulcr -+@ stub _NLG_Dispatch2 -+@ stub _NLG_Return -+@ stub _NLG_Return2 -+@ stub _SetWinRTOutOfMemoryExceptionCallback -+@ cdecl _Strftime(str long str ptr ptr) -+@ cdecl _W_Getdays() -+@ cdecl _W_Getmonths() -+@ stub _W_Gettnames -+@ stub _Wcsftime -+@ cdecl __AdjustPointer(ptr ptr) -+@ stub __BuildCatchObject -+@ stub __BuildCatchObjectHelper -+@ cdecl -arch=i386,x86_64,arm __CxxDetectRethrow(ptr) -+@ stub __CxxExceptionFilter -+@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) -+@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler -+@ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -+@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) -+@ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() -+@ stub __CxxRegisterExceptionObject -+@ stub __CxxUnregisterExceptionObject -+@ stub __DestructExceptionObject -+@ stub __FrameUnwindFilter -+@ stub __GetPlatformExceptionInfo -+@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid -+@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast -+@ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid -+@ stub __TypeMatch -+@ cdecl ___lc_codepage_func() -+@ cdecl ___lc_collate_cp_func() -+@ cdecl ___lc_locale_name_func() -+@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func -+@ cdecl ___mb_cur_max_l_func(ptr) -+@ stub __acrt_iob_func -+@ stub __conio_common_vcprintf -+@ stub __conio_common_vcprintf_p -+@ stub __conio_common_vcprintf_s -+@ stub __conio_common_vcscanf -+@ stub __conio_common_vcwprintf -+@ stub __conio_common_vcwprintf_p -+@ stub __conio_common_vcwprintf_s -+@ stub __conio_common_vcwscanf -+@ cdecl -arch=i386 __control87_2(long long ptr ptr) -+@ stub __current_exception -+@ stub __current_exception_context -+@ cdecl __daylight() MSVCRT___p__daylight -+@ stub __dcrt_get_wide_environment_from_os -+@ stub __dcrt_initial_narrow_environment -+@ cdecl __doserrno() MSVCRT___doserrno -+@ cdecl __dstbias() MSVCRT___p__dstbias -+@ stub __fpe_flt_rounds -+@ cdecl __fpecode() -+@ stub __initialize_lconv_for_unsigned_char -+@ stub __intrinsic_abnormal_termination -+@ stub __intrinsic_setjmp -+@ cdecl __isascii(long) MSVCRT___isascii -+@ cdecl __iscsym(long) MSVCRT___iscsym -+@ cdecl __iscsymf(long) MSVCRT___iscsymf -+@ stub __iswcsym -+@ stub __iswcsymf -+@ cdecl -arch=i386 __libm_sse2_acos() -+@ cdecl -arch=i386 __libm_sse2_acosf() -+@ cdecl -arch=i386 __libm_sse2_asin() -+@ cdecl -arch=i386 __libm_sse2_asinf() -+@ cdecl -arch=i386 __libm_sse2_atan() -+@ cdecl -arch=i386 __libm_sse2_atan2() -+@ cdecl -arch=i386 __libm_sse2_atanf() -+@ cdecl -arch=i386 __libm_sse2_cos() -+@ cdecl -arch=i386 __libm_sse2_cosf() -+@ cdecl -arch=i386 __libm_sse2_exp() -+@ cdecl -arch=i386 __libm_sse2_expf() -+@ cdecl -arch=i386 __libm_sse2_log() -+@ cdecl -arch=i386 __libm_sse2_log10() -+@ cdecl -arch=i386 __libm_sse2_log10f() -+@ cdecl -arch=i386 __libm_sse2_logf() -+@ cdecl -arch=i386 __libm_sse2_pow() -+@ cdecl -arch=i386 __libm_sse2_powf() -+@ cdecl -arch=i386 __libm_sse2_sin() -+@ cdecl -arch=i386 __libm_sse2_sinf() -+@ cdecl -arch=i386 __libm_sse2_tan() -+@ cdecl -arch=i386 __libm_sse2_tanf() -+@ cdecl __p___argc() MSVCRT___p___argc -+@ cdecl __p___argv() MSVCRT___p___argv -+@ cdecl __p___wargv() MSVCRT___p___wargv -+@ cdecl __p__acmdln() -+@ cdecl __p__commode() -+@ cdecl __p__environ() MSVCRT___p__environ -+@ cdecl __p__fmode() -+@ stub __p__mbcasemap() -+@ cdecl __p__mbctype() -+@ cdecl __p__pgmptr() MSVCRT___p__pgmptr -+@ cdecl __p__wcmdln() -+@ cdecl __p__wenviron() MSVCRT___p__wenviron -+@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr -+@ cdecl __pctype_func() MSVCRT___pctype_func -+@ stub __processing_throw -+@ stub __pwctype_func -+@ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs -+@ stub __report_gsfailure -+@ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -+@ stub __std_exception_copy -+@ stub __std_exception_destroy -+@ stub __std_type_info_compare -+@ stub __std_type_info_destroy_list -+@ stub __std_type_info_hash -+@ stub __std_type_info_name -+@ stub __stdio_common_vfprintf -+@ stub __stdio_common_vfprintf_p -+@ stub __stdio_common_vfprintf_s -+@ stub __stdio_common_vfscanf -+@ stub __stdio_common_vfwprintf -+@ stub __stdio_common_vfwprintf_p -+@ stub __stdio_common_vfwprintf_s -+@ stub __stdio_common_vfwscanf -+@ stub __stdio_common_vsnprintf_s -+@ stub __stdio_common_vsnwprintf_s -+@ stub __stdio_common_vsprintf -+@ stub __stdio_common_vsprintf_p -+@ stub __stdio_common_vsprintf_s -+@ stub __stdio_common_vsscanf -+@ stub __stdio_common_vswprintf -+@ stub __stdio_common_vswprintf_p -+@ stub __stdio_common_vswprintf_s -+@ stub __stdio_common_vswscanf -+@ stub __strncnt -+@ cdecl __sys_errlist() -+@ cdecl __sys_nerr() -+@ cdecl __threadhandle() kernel32.GetCurrentThread -+@ cdecl __threadid() kernel32.GetCurrentThreadId -+@ cdecl __timezone() MSVCRT___p__timezone -+@ cdecl __toascii(long) MSVCRT___toascii -+@ cdecl __tzname() __p__tzname -+@ cdecl __unDName(ptr str long ptr ptr long) -+@ cdecl __unDNameEx(ptr str long ptr ptr ptr long) -+@ cdecl __uncaught_exception() MSVCRT___uncaught_exception -+@ cdecl __wcserror(wstr) MSVCRT___wcserror -+@ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s -+@ stub __wcsncnt -+@ cdecl -ret64 _abs64(int64) -+@ cdecl _access(str long) MSVCRT__access -+@ cdecl _access_s(str long) MSVCRT__access_s -+@ cdecl _aligned_free(ptr) -+@ cdecl _aligned_malloc(long long) -+@ cdecl _aligned_msize(ptr long long) -+@ cdecl _aligned_offset_malloc(long long long) -+@ cdecl _aligned_offset_realloc(ptr long long long) -+@ stub _aligned_offset_recalloc -+@ cdecl _aligned_realloc(ptr long long) -+@ stub _aligned_recalloc -+@ cdecl _assert(str str long) MSVCRT__assert -+@ cdecl _atodbl(ptr str) MSVCRT__atodbl -+@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -+@ cdecl _atof_l(str ptr) MSVCRT__atof_l -+@ cdecl _atoflt(ptr str) MSVCRT__atoflt -+@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -+@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -+@ stub _atoi64_l -+@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -+@ stub _atol_l -+@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl -+@ stub _atoldbl_l -+@ stub _atoll_l -+@ cdecl _beep(long long) MSVCRT__beep -+@ cdecl _beginthread(ptr long ptr) -+@ cdecl _beginthreadex(ptr long ptr ptr long ptr) -+@ cdecl _byteswap_uint64(int64) -+@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong -+@ cdecl _byteswap_ushort(long) -+@ cdecl _c_exit() MSVCRT__c_exit -+@ cdecl _cabs(long) MSVCRT__cabs -+@ cdecl _callnewh(long) -+@ stub _calloc_base -+@ cdecl _cexit() MSVCRT__cexit -+@ cdecl _cgets(ptr) -+@ stub _cgets_s -+@ stub _cgetws -+@ stub _cgetws_s -+@ cdecl _chdir(str) MSVCRT__chdir -+@ cdecl _chdrive(long) MSVCRT__chdrive -+@ cdecl _chgsign(double) MSVCRT__chgsign -+@ cdecl _chgsignf(float) MSVCRT__chgsignf -+@ cdecl -arch=i386 -norelay _chkesp() -+@ cdecl _chmod(str long) MSVCRT__chmod -+@ cdecl _chsize(long long) MSVCRT__chsize -+@ cdecl _chsize_s(long int64) MSVCRT__chsize_s -+@ cdecl _clearfp() -+@ cdecl _close(long) MSVCRT__close -+@ cdecl _commit(long) MSVCRT__commit -+@ cdecl _configthreadlocale(long) -+@ stub _configure_narrow_argv -+@ stub _configure_wide_argv -+@ cdecl _control87(long long) -+@ cdecl _controlfp(long long) -+@ cdecl _controlfp_s(ptr long long) -+@ cdecl _copysign(double double) MSVCRT__copysign -+@ cdecl _copysignf(float float) MSVCRT__copysignf -+@ cdecl _cputs(str) -+@ cdecl _cputws(wstr) -+@ cdecl _creat(str long) MSVCRT__creat -+@ cdecl _create_locale(long str) MSVCRT__create_locale -+@ stub _crt_at_quick_exit -+@ stub _crt_atexit -+@ stub _crt_debugger_hook -+@ cdecl _ctime32(ptr) MSVCRT__ctime32 -+@ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s -+@ cdecl _ctime64(ptr) MSVCRT__ctime64 -+@ cdecl _ctime64_s(str long ptr) MSVCRT__ctime64_s -+@ cdecl _cwait(ptr long long) -+@ stub _d_int -+@ cdecl _dclass(double) MSVCR120__dclass -+@ stub _dexp -+@ cdecl _difftime32(long long) MSVCRT__difftime32 -+@ cdecl _difftime64(long long) MSVCRT__difftime64 -+@ stub _dlog -+@ stub _dnorm -+@ stub _dpcomp -+@ stub _dpoly -+@ stub _dscale -+@ cdecl _dsign(double) MSVCR120__dsign -+@ stub _dsin -+@ cdecl _dtest(ptr) MSVCR120__dtest -+@ stub _dunscale -+@ cdecl _dup(long) MSVCRT__dup -+@ cdecl _dup2(long long) MSVCRT__dup2 -+@ cdecl _dupenv_s(ptr ptr str) -+@ cdecl _ecvt(double long ptr ptr) MSVCRT__ecvt -+@ cdecl _ecvt_s(str long double long ptr ptr) MSVCRT__ecvt_s -+@ cdecl _endthread() -+@ cdecl _endthreadex(long) -+@ cdecl _eof(long) MSVCRT__eof -+@ cdecl _errno() MSVCRT__errno -+@ stub _except1 -+@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) -+@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) -+@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) -+@ varargs _execl(str str) -+@ varargs _execle(str str) -+@ varargs _execlp(str str) -+@ varargs _execlpe(str str) -+@ stub _execute_onexit_table -+@ cdecl _execv(str ptr) -+@ cdecl _execve(str ptr ptr) MSVCRT__execve -+@ cdecl _execvp(str ptr) -+@ cdecl _execvpe(str ptr ptr) -+@ cdecl _exit(long) MSVCRT__exit -+@ cdecl _expand(ptr long) -+@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock -+@ cdecl _fcloseall() MSVCRT__fcloseall -+@ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt -+@ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s -+@ stub _fd_int -+@ cdecl _fdclass(float) MSVCR120__fdclass -+@ stub _fdexp -+@ stub _fdlog -+@ stub _fdnorm -+@ cdecl _fdopen(long str) MSVCRT__fdopen -+@ stub _fdpcomp -+@ stub _fdpoly -+@ stub _fdscale -+@ cdecl _fdsign(float) MSVCR120__fdsign -+@ stub _fdsin -+@ cdecl _fdtest(ptr) MSVCR120__fdtest -+@ stub _fdunscale -+@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock -+@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock -+@ cdecl _fgetchar() MSVCRT__fgetchar -+@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock -+@ cdecl _fgetwchar() MSVCRT__fgetwchar -+@ cdecl _filelength(long) MSVCRT__filelength -+@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64 -+@ cdecl _fileno(ptr) MSVCRT__fileno -+@ cdecl _findclose(long) MSVCRT__findclose -+@ cdecl _findfirst32(str ptr) MSVCRT__findfirst32 -+@ stub _findfirst32i64 -+@ cdecl _findfirst64(str ptr) MSVCRT__findfirst64 -+@ cdecl _findfirst64i32(str ptr) MSVCRT__findfirst64i32 -+@ cdecl _findnext32(long ptr) MSVCRT__findnext32 -+@ stub _findnext32i64 -+@ cdecl _findnext64(long ptr) MSVCRT__findnext64 -+@ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 -+@ cdecl _finite(double) MSVCRT__finite -+@ cdecl _flushall() MSVCRT__flushall -+@ cdecl _fpclass(double) MSVCRT__fpclass -+@ stub _fpieee_flt(long ptr ptr) -+@ cdecl _fpreset() -+@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock -+@ cdecl _fputchar(long) MSVCRT__fputchar -+@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock -+@ cdecl _fputwchar(long) MSVCRT__fputwchar -+@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock -+@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s -+@ stub _free_base -+@ cdecl _free_locale(ptr) MSVCRT__free_locale -+@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock -+@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 -+@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock -+@ cdecl _fsopen(str str long) MSVCRT__fsopen -+@ cdecl _fstat32(long ptr) MSVCRT__fstat32 -+@ stub _fstat32i64 -+@ cdecl _fstat64(long ptr) MSVCRT__fstat64 -+@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32 -+@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock -+@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 -+@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock -+@ cdecl _ftime32(ptr) MSVCRT__ftime32 -+@ cdecl _ftime32_s(ptr) MSVCRT__ftime32_s -+@ cdecl _ftime64(ptr) MSVCRT__ftime64 -+@ cdecl _ftime64_s(ptr) MSVCRT__ftime64_s -+@ cdecl -arch=i386 -ret64 _ftol() MSVCRT__ftol -+@ cdecl _fullpath(ptr str long) MSVCRT__fullpath -+@ cdecl _futime32(long ptr) -+@ cdecl _futime64(long ptr) -+@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock -+@ cdecl _gcvt(double long str) MSVCRT__gcvt -+@ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s -+@ cdecl _get_current_locale() MSVCRT__get_current_locale -+@ cdecl _get_daylight(ptr) -+@ cdecl _get_doserrno(ptr) -+@ stub _get_dstbias -+@ cdecl _get_errno(ptr) -+@ cdecl _get_fmode(ptr) MSVCRT__get_fmode -+@ cdecl _get_heap_handle() -+@ stub _get_initial_narrow_environment -+@ stub _get_initial_wide_environment -+@ cdecl _get_invalid_parameter_handler() -+@ stub _get_narrow_winmain_command_line -+@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle -+@ cdecl _get_pgmptr(ptr) -+@ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -+@ stub _get_purecall_handler -+@ stub _get_stream_buffer_pointers -+@ cdecl _get_terminate() MSVCRT__get_terminate -+@ stub _get_thread_local_invalid_parameter_handler -+@ cdecl _get_timezone(ptr) -+@ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname -+@ cdecl _get_unexpected() MSVCRT__get_unexpected -+@ stub _get_wide_winmain_command_line -+@ cdecl _get_wpgmptr(ptr) -+@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock -+@ cdecl _getch() -+@ cdecl _getch_nolock() -+@ cdecl _getche() -+@ cdecl _getche_nolock() -+@ cdecl _getcwd(str long) MSVCRT__getcwd -+@ cdecl _getdcwd(long str long) MSVCRT__getdcwd -+@ cdecl _getdiskfree(long ptr) MSVCRT__getdiskfree -+@ cdecl _getdllprocaddr(long str long) -+@ cdecl _getdrive() MSVCRT__getdrive -+@ cdecl _getdrives() kernel32.GetLogicalDrives -+@ cdecl _getmaxstdio() MSVCRT__getmaxstdio -+@ cdecl _getmbcp() -+@ cdecl _getpid() _getpid -+@ stub _getsystime(ptr) -+@ cdecl _getw(ptr) MSVCRT__getw -+@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock -+@ cdecl _getwch() -+@ cdecl _getwch_nolock() -+@ cdecl _getwche() -+@ cdecl _getwche_nolock() -+@ cdecl _getws(ptr) MSVCRT__getws -+@ stub _getws_s -+@ cdecl -arch=i386 _global_unwind2(ptr) -+@ cdecl _gmtime32(ptr) MSVCRT__gmtime32 -+@ cdecl _gmtime32_s(ptr ptr) MSVCRT__gmtime32_s -+@ cdecl _gmtime64(ptr) MSVCRT__gmtime64 -+@ cdecl _gmtime64_s(ptr ptr) MSVCRT__gmtime64_s -+@ cdecl _heapchk() -+@ cdecl _heapmin() -+@ cdecl _heapwalk(ptr) -+@ cdecl _hypot(double double) -+@ cdecl _hypotf(float float) MSVCRT__hypotf -+@ cdecl _i64toa(int64 ptr long) ntdll._i64toa -+@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s -+@ cdecl _i64tow(int64 ptr long) ntdll._i64tow -+@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s -+@ stub _initialize_narrow_environment -+@ stub _initialize_onexit_table -+@ stub _initialize_wide_environment -+@ cdecl _initterm(ptr ptr) -+@ cdecl _initterm_e(ptr ptr) -+@ cdecl _invalid_parameter_noinfo() -+@ stub _invalid_parameter_noinfo_noreturn -+@ stub _invoke_watson -+@ stub _is_exception_typeof -+@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l -+@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l -+@ cdecl _isatty(long) MSVCRT__isatty -+@ stub _isblank_l -+@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l -+@ cdecl _isctype(long long) MSVCRT__isctype -+@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l -+@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l -+@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l -+@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l -+@ cdecl _islower_l(long ptr) MSVCRT__islower_l -+@ stub _ismbbalnum(long) -+@ stub _ismbbalnum_l -+@ stub _ismbbalpha(long) -+@ stub _ismbbalpha_l -+@ stub _ismbbblank -+@ stub _ismbbblank_l -+@ stub _ismbbgraph(long) -+@ stub _ismbbgraph_l -+@ stub _ismbbkalnum(long) -+@ stub _ismbbkalnum_l -+@ cdecl _ismbbkana(long) -+@ stub _ismbbkana_l -+@ stub _ismbbkprint(long) -+@ stub _ismbbkprint_l -+@ stub _ismbbkpunct(long) -+@ stub _ismbbkpunct_l -+@ cdecl _ismbblead(long) -+@ cdecl _ismbblead_l(long ptr) -+@ stub _ismbbprint(long) -+@ stub _ismbbprint_l -+@ stub _ismbbpunct(long) -+@ stub _ismbbpunct_l -+@ cdecl _ismbbtrail(long) -+@ stub _ismbbtrail_l -+@ cdecl _ismbcalnum(long) -+@ stub _ismbcalnum_l -+@ cdecl _ismbcalpha(long) -+@ stub _ismbcalpha_l -+@ stub _ismbcblank -+@ stub _ismbcblank_l -+@ cdecl _ismbcdigit(long) -+@ stub _ismbcdigit_l -+@ cdecl _ismbcgraph(long) -+@ stub _ismbcgraph_l -+@ cdecl _ismbchira(long) -+@ stub _ismbchira_l -+@ cdecl _ismbckata(long) -+@ stub _ismbckata_l -+@ stub _ismbcl0(long) -+@ stub _ismbcl0_l -+@ stub _ismbcl1(long) -+@ stub _ismbcl1_l -+@ stub _ismbcl2(long) -+@ stub _ismbcl2_l -+@ cdecl _ismbclegal(long) -+@ stub _ismbclegal_l -+@ stub _ismbclower(long) -+@ stub _ismbclower_l -+@ cdecl _ismbcprint(long) -+@ stub _ismbcprint_l -+@ cdecl _ismbcpunct(long) -+@ stub _ismbcpunct_l -+@ cdecl _ismbcspace(long) -+@ stub _ismbcspace_l -+@ cdecl _ismbcsymbol(long) -+@ stub _ismbcsymbol_l -+@ cdecl _ismbcupper(long) -+@ stub _ismbcupper_l -+@ cdecl _ismbslead(ptr ptr) -+@ stub _ismbslead_l -+@ cdecl _ismbstrail(ptr ptr) -+@ stub _ismbstrail_l -+@ cdecl _isnan(double) MSVCRT__isnan -+@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l -+@ stub _ispunct_l -+@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l -+@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l -+@ stub _iswalnum_l -+@ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -+@ stub _iswblank_l -+@ stub _iswcntrl_l -+@ stub _iswcsym_l -+@ stub _iswcsymf_l -+@ stub _iswctype_l -+@ cdecl _iswdigit_l(long ptr) MSVCRT__iswdigit_l -+@ stub _iswgraph_l -+@ stub _iswlower_l -+@ stub _iswprint_l -+@ cdecl _iswpunct_l(long ptr) MSVCRT__iswpunct_l -+@ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l -+@ stub _iswupper_l -+@ stub _iswxdigit_l -+@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l -+@ cdecl _itoa(long ptr long) MSVCRT__itoa -+@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s -+@ cdecl _itow(long ptr long) ntdll._itow -+@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s -+@ cdecl _j0(double) MSVCRT__j0 -+@ cdecl _j1(double) MSVCRT__j1 -+@ cdecl _jn(long double) MSVCRT__jn -+@ cdecl _kbhit() -+@ stub _ld_int -+@ cdecl _ldclass(double) MSVCR120__ldclass -+@ stub _ldexp -+@ stub _ldlog -+@ stub _ldpcomp -+@ stub _ldpoly -+@ stub _ldscale -+@ cdecl _ldsign(double) MSVCR120__dsign -+@ stub _ldsin -+@ cdecl _ldtest(ptr) MSVCR120__ldtest -+@ stub _ldunscale -+@ cdecl _lfind(ptr ptr ptr long ptr) -+@ stub _lfind_s -+@ cdecl -arch=i386 _libm_sse2_acos_precise() __libm_sse2_acos -+@ cdecl -arch=i386 _libm_sse2_asin_precise() __libm_sse2_asin -+@ cdecl -arch=i386 _libm_sse2_atan_precise() __libm_sse2_atan -+@ cdecl -arch=i386 _libm_sse2_cos_precise() __libm_sse2_cos -+@ cdecl -arch=i386 _libm_sse2_exp_precise() __libm_sse2_exp -+@ cdecl -arch=i386 _libm_sse2_log10_precise() __libm_sse2_log10 -+@ cdecl -arch=i386 _libm_sse2_log_precise() __libm_sse2_log -+@ cdecl -arch=i386 _libm_sse2_pow_precise() __libm_sse2_pow -+@ cdecl -arch=i386 _libm_sse2_sin_precise() __libm_sse2_sin -+@ cdecl -arch=i386 _libm_sse2_sqrt_precise() __libm_sse2_sqrt_precise -+@ cdecl -arch=i386 _libm_sse2_tan_precise() __libm_sse2_tan -+@ cdecl _loaddll(str) -+@ cdecl -arch=i386 _local_unwind2(ptr long) -+@ cdecl -arch=i386 _local_unwind4(ptr ptr long) -+@ cdecl _localtime32(ptr) MSVCRT__localtime32 -+@ cdecl _localtime32_s(ptr ptr) -+@ cdecl _localtime64(ptr) MSVCRT__localtime64 -+@ cdecl _localtime64_s(ptr ptr) -+@ cdecl _lock_file(ptr) MSVCRT__lock_file -+@ stub _lock_locales -+@ cdecl _locking(long long long) MSVCRT__locking -+@ cdecl _logb(double) MSVCRT__logb -+@ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp -+@ cdecl _lrotl(long long) MSVCRT__lrotl -+@ cdecl _lrotr(long long) MSVCRT__lrotr -+@ cdecl _lsearch(ptr ptr ptr long ptr) -+@ stub _lsearch_s -+@ cdecl _lseek(long long long) MSVCRT__lseek -+@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 -+@ cdecl _ltoa(long ptr long) ntdll._ltoa -+@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s -+@ cdecl _ltow(long ptr long) ntdll._ltow -+@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s -+@ cdecl _makepath(ptr str str str str) MSVCRT__makepath -+@ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s -+@ stub _malloc_base -+@ cdecl _mbbtombc(long) -+@ stub _mbbtombc_l -+@ cdecl _mbbtype(long long) -+@ stub _mbbtype_l -+@ stub _mbcasemap -+@ cdecl _mbccpy(ptr str) -+@ stub _mbccpy_l -+@ stub _mbccpy_s -+@ stub _mbccpy_s_l -+@ cdecl _mbcjistojms(long) -+@ stub _mbcjistojms_l -+@ cdecl _mbcjmstojis(long) -+@ stub _mbcjmstojis_l -+@ cdecl _mbclen(ptr) -+@ stub _mbclen_l -+@ cdecl _mbctohira(long) -+@ stub _mbctohira_l -+@ cdecl _mbctokata(long) -+@ stub _mbctokata_l -+@ cdecl _mbctolower(long) -+@ stub _mbctolower_l -+@ cdecl _mbctombb(long) -+@ stub _mbctombb_l -+@ cdecl _mbctoupper(long) -+@ stub _mbctoupper_l -+@ stub _mblen_l -+@ cdecl _mbsbtype(str long) -+@ stub _mbsbtype_l -+@ cdecl _mbscat_s(ptr long str) -+@ cdecl _mbscat_s_l(ptr long str ptr) -+@ cdecl _mbschr(str long) -+@ stub _mbschr_l -+@ cdecl _mbscmp(str str) -+@ stub _mbscmp_l -+@ cdecl _mbscoll(str str) -+@ cdecl _mbscoll_l(str str ptr) -+@ cdecl _mbscpy_s(ptr long str) -+@ cdecl _mbscpy_s_l(ptr long str ptr) -+@ cdecl _mbscspn(str str) -+@ stub _mbscspn_l -+@ cdecl _mbsdec(ptr ptr) -+@ stub _mbsdec_l -+@ stub _mbsdup -+@ cdecl _mbsicmp(str str) -+@ stub _mbsicmp_l -+@ cdecl _mbsicoll(str str) -+@ cdecl _mbsicoll_l(str str ptr) -+@ cdecl _mbsinc(str) -+@ stub _mbsinc_l -+@ cdecl _mbslen(str) -+@ stub _mbslen_l -+@ cdecl _mbslwr(str) -+@ stub _mbslwr_l -+@ cdecl _mbslwr_s(str long) -+@ stub _mbslwr_s_l -+@ cdecl _mbsnbcat(str str long) -+@ stub _mbsnbcat_l -+@ cdecl _mbsnbcat_s(str long ptr long) -+@ stub _mbsnbcat_s_l -+@ cdecl _mbsnbcmp(str str long) -+@ stub _mbsnbcmp_l -+@ cdecl _mbsnbcnt(ptr long) -+@ stub _mbsnbcnt_l -+@ cdecl _mbsnbcoll(str str long) -+@ cdecl _mbsnbcoll_l(str str long ptr) -+@ cdecl _mbsnbcpy(ptr str long) -+@ stub _mbsnbcpy_l -+@ cdecl _mbsnbcpy_s(ptr long str long) -+@ cdecl _mbsnbcpy_s_l(ptr long str long ptr) -+@ cdecl _mbsnbicmp(str str long) -+@ stub _mbsnbicmp_l -+@ cdecl _mbsnbicoll(str str long) -+@ cdecl _mbsnbicoll_l(str str long ptr) -+@ cdecl _mbsnbset(ptr long long) -+@ stub _mbsnbset_l -+@ stub _mbsnbset_s -+@ stub _mbsnbset_s_l -+@ cdecl _mbsncat(str str long) -+@ stub _mbsncat_l -+@ stub _mbsncat_s -+@ stub _mbsncat_s_l -+@ cdecl _mbsnccnt(str long) -+@ stub _mbsnccnt_l -+@ cdecl _mbsncmp(str str long) -+@ stub _mbsncmp_l -+@ stub _mbsncoll(str str long) -+@ stub _mbsncoll_l -+@ cdecl _mbsncpy(ptr str long) -+@ stub _mbsncpy_l -+@ stub _mbsncpy_s -+@ stub _mbsncpy_s_l -+@ cdecl _mbsnextc(str) -+@ stub _mbsnextc_l -+@ cdecl _mbsnicmp(str str long) -+@ stub _mbsnicmp_l -+@ stub _mbsnicoll(str str long) -+@ stub _mbsnicoll_l -+@ cdecl _mbsninc(str long) -+@ stub _mbsninc_l -+@ stub _mbsnlen -+@ stub _mbsnlen_l -+@ cdecl _mbsnset(ptr long long) -+@ stub _mbsnset_l -+@ stub _mbsnset_s -+@ stub _mbsnset_s_l -+@ cdecl _mbspbrk(str str) -+@ stub _mbspbrk_l -+@ cdecl _mbsrchr(str long) -+@ stub _mbsrchr_l -+@ cdecl _mbsrev(str) -+@ stub _mbsrev_l -+@ cdecl _mbsset(ptr long) -+@ stub _mbsset_l -+@ stub _mbsset_s -+@ stub _mbsset_s_l -+@ cdecl _mbsspn(str str) -+@ stub _mbsspn_l -+@ cdecl _mbsspnp(str str) -+@ stub _mbsspnp_l -+@ cdecl _mbsstr(str str) -+@ stub _mbsstr_l -+@ cdecl _mbstok(str str) -+@ cdecl _mbstok_l(str str ptr) -+@ cdecl _mbstok_s(str str ptr) -+@ cdecl _mbstok_s_l(str str ptr ptr) -+@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -+@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l -+@ cdecl _mbstrlen(str) -+@ cdecl _mbstrlen_l(str ptr) -+@ stub _mbstrnlen -+@ stub _mbstrnlen_l -+@ cdecl _mbsupr(str) -+@ stub _mbsupr_l -+@ cdecl _mbsupr_s(str long) -+@ stub _mbsupr_s_l -+@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l -+@ cdecl _memccpy(ptr ptr long long) ntdll._memccpy -+@ cdecl _memicmp(str str long) ntdll._memicmp -+@ stub _memicmp_l -+@ cdecl _mkdir(str) MSVCRT__mkdir -+@ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 -+@ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 -+@ cdecl _mktemp(str) MSVCRT__mktemp -+@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s -+@ cdecl _mktime32(ptr) MSVCRT__mktime32 -+@ cdecl _mktime64(ptr) MSVCRT__mktime64 -+@ cdecl _msize(ptr) -+@ cdecl _nextafter(double double) MSVCRT__nextafter -+@ stub _o__CIacos -+@ stub _o__CIasin -+@ stub _o__CIatan -+@ stub _o__CIatan2 -+@ stub _o__CIcos -+@ stub _o__CIcosh -+@ stub _o__CIexp -+@ stub _o__CIfmod -+@ stub _o__CIlog -+@ stub _o__CIlog10 -+@ stub _o__CIpow -+@ stub _o__CIsin -+@ stub _o__CIsinh -+@ stub _o__CIsqrt -+@ stub _o__CItan -+@ stub _o__CItanh -+@ stub _o__Getdays -+@ stub _o__Getmonths -+@ stub _o__Gettnames -+@ stub _o__Strftime -+@ stub _o__W_Getdays -+@ stub _o__W_Getmonths -+@ stub _o__W_Gettnames -+@ stub _o__Wcsftime -+@ stub _o____lc_codepage_func -+@ stub _o____lc_collate_cp_func -+@ stub _o____lc_locale_name_func -+@ stub _o____mb_cur_max_func -+@ stub _o___acrt_iob_func -+@ stub _o___conio_common_vcprintf -+@ stub _o___conio_common_vcprintf_p -+@ stub _o___conio_common_vcprintf_s -+@ stub _o___conio_common_vcscanf -+@ stub _o___conio_common_vcwprintf -+@ stub _o___conio_common_vcwprintf_p -+@ stub _o___conio_common_vcwprintf_s -+@ stub _o___conio_common_vcwscanf -+@ stub _o___daylight -+@ stub _o___dstbias -+@ stub _o___fpe_flt_rounds -+@ stub _o___libm_sse2_acos -+@ stub _o___libm_sse2_acosf -+@ stub _o___libm_sse2_asin -+@ stub _o___libm_sse2_asinf -+@ stub _o___libm_sse2_atan -+@ stub _o___libm_sse2_atan2 -+@ stub _o___libm_sse2_atanf -+@ stub _o___libm_sse2_cos -+@ stub _o___libm_sse2_cosf -+@ stub _o___libm_sse2_exp -+@ stub _o___libm_sse2_expf -+@ stub _o___libm_sse2_log -+@ stub _o___libm_sse2_log10 -+@ stub _o___libm_sse2_log10f -+@ stub _o___libm_sse2_logf -+@ stub _o___libm_sse2_pow -+@ stub _o___libm_sse2_powf -+@ stub _o___libm_sse2_sin -+@ stub _o___libm_sse2_sinf -+@ stub _o___libm_sse2_tan -+@ stub _o___libm_sse2_tanf -+@ stub _o___p___argc -+@ stub _o___p___argv -+@ stub _o___p___wargv -+@ stub _o___p__acmdln -+@ stub _o___p__commode -+@ stub _o___p__environ -+@ stub _o___p__fmode -+@ stub _o___p__mbcasemap -+@ stub _o___p__mbctype -+@ stub _o___p__pgmptr -+@ stub _o___p__wcmdln -+@ stub _o___p__wenviron -+@ stub _o___p__wpgmptr -+@ stub _o___pctype_func -+@ stub _o___pwctype_func -+@ stub _o___std_exception_copy -+@ stub _o___std_exception_destroy -+@ stub _o___std_type_info_destroy_list -+@ stub _o___std_type_info_name -+@ stub _o___stdio_common_vfprintf -+@ stub _o___stdio_common_vfprintf_p -+@ stub _o___stdio_common_vfprintf_s -+@ stub _o___stdio_common_vfscanf -+@ stub _o___stdio_common_vfwprintf -+@ stub _o___stdio_common_vfwprintf_p -+@ stub _o___stdio_common_vfwprintf_s -+@ stub _o___stdio_common_vfwscanf -+@ stub _o___stdio_common_vsnprintf_s -+@ stub _o___stdio_common_vsnwprintf_s -+@ stub _o___stdio_common_vsprintf -+@ stub _o___stdio_common_vsprintf_p -+@ stub _o___stdio_common_vsprintf_s -+@ stub _o___stdio_common_vsscanf -+@ stub _o___stdio_common_vswprintf -+@ stub _o___stdio_common_vswprintf_p -+@ stub _o___stdio_common_vswprintf_s -+@ stub _o___stdio_common_vswscanf -+@ stub _o___timezone -+@ stub _o___tzname -+@ stub _o___wcserror -+@ stub _o__access -+@ stub _o__access_s -+@ stub _o__aligned_free -+@ stub _o__aligned_malloc -+@ stub _o__aligned_msize -+@ stub _o__aligned_offset_malloc -+@ stub _o__aligned_offset_realloc -+@ stub _o__aligned_offset_recalloc -+@ stub _o__aligned_realloc -+@ stub _o__aligned_recalloc -+@ stub _o__atodbl -+@ stub _o__atodbl_l -+@ stub _o__atof_l -+@ stub _o__atoflt -+@ stub _o__atoflt_l -+@ stub _o__atoi64 -+@ stub _o__atoi64_l -+@ stub _o__atoi_l -+@ stub _o__atol_l -+@ stub _o__atoldbl -+@ stub _o__atoldbl_l -+@ stub _o__atoll_l -+@ stub _o__beep -+@ stub _o__beginthread -+@ stub _o__beginthreadex -+@ stub _o__cabs -+@ stub _o__callnewh -+@ stub _o__calloc_base -+@ stub _o__cexit -+@ stub _o__cgets -+@ stub _o__cgets_s -+@ stub _o__cgetws -+@ stub _o__cgetws_s -+@ stub _o__chdir -+@ stub _o__chdrive -+@ stub _o__chmod -+@ stub _o__chsize -+@ stub _o__chsize_s -+@ stub _o__close -+@ stub _o__commit -+@ stub _o__configthreadlocale -+@ stub _o__configure_narrow_argv -+@ stub _o__configure_wide_argv -+@ stub _o__controlfp_s -+@ stub _o__cputs -+@ stub _o__cputws -+@ stub _o__creat -+@ stub _o__create_locale -+@ stub _o__crt_atexit -+@ stub _o__ctime32_s -+@ stub _o__ctime64_s -+@ stub _o__cwait -+@ stub _o__d_int -+@ stub _o__dclass -+@ stub _o__difftime32 -+@ stub _o__difftime64 -+@ stub _o__dlog -+@ stub _o__dnorm -+@ stub _o__dpcomp -+@ stub _o__dpoly -+@ stub _o__dscale -+@ stub _o__dsign -+@ stub _o__dsin -+@ stub _o__dtest -+@ stub _o__dunscale -+@ stub _o__dup -+@ stub _o__dup2 -+@ stub _o__dupenv_s -+@ stub _o__ecvt -+@ stub _o__ecvt_s -+@ stub _o__endthread -+@ stub _o__endthreadex -+@ stub _o__eof -+@ stub _o__errno -+@ stub _o__except1 -+@ stub _o__execute_onexit_table -+@ stub _o__execv -+@ stub _o__execve -+@ stub _o__execvp -+@ stub _o__execvpe -+@ stub _o__exit -+@ stub _o__expand -+@ stub _o__fclose_nolock -+@ stub _o__fcloseall -+@ stub _o__fcvt -+@ stub _o__fcvt_s -+@ stub _o__fd_int -+@ stub _o__fdclass -+@ stub _o__fdexp -+@ stub _o__fdlog -+@ stub _o__fdopen -+@ stub _o__fdpcomp -+@ stub _o__fdpoly -+@ stub _o__fdscale -+@ stub _o__fdsign -+@ stub _o__fdsin -+@ stub _o__fflush_nolock -+@ stub _o__fgetc_nolock -+@ stub _o__fgetchar -+@ stub _o__fgetwc_nolock -+@ stub _o__fgetwchar -+@ stub _o__filelength -+@ stub _o__filelengthi64 -+@ stub _o__fileno -+@ stub _o__findclose -+@ stub _o__findfirst32 -+@ stub _o__findfirst32i64 -+@ stub _o__findfirst64 -+@ stub _o__findfirst64i32 -+@ stub _o__findnext32 -+@ stub _o__findnext32i64 -+@ stub _o__findnext64 -+@ stub _o__findnext64i32 -+@ stub _o__flushall -+@ stub _o__fpclass -+@ stub _o__fputc_nolock -+@ stub _o__fputchar -+@ stub _o__fputwc_nolock -+@ stub _o__fputwchar -+@ stub _o__fread_nolock -+@ stub _o__fread_nolock_s -+@ stub _o__free_base -+@ stub _o__free_locale -+@ stub _o__fseek_nolock -+@ stub _o__fseeki64 -+@ stub _o__fseeki64_nolock -+@ stub _o__fsopen -+@ stub _o__fstat32 -+@ stub _o__fstat32i64 -+@ stub _o__fstat64 -+@ stub _o__fstat64i32 -+@ stub _o__ftell_nolock -+@ stub _o__ftelli64 -+@ stub _o__ftelli64_nolock -+@ stub _o__ftime32 -+@ stub _o__ftime32_s -+@ stub _o__ftime64 -+@ stub _o__ftime64_s -+@ stub _o__fullpath -+@ stub _o__futime32 -+@ stub _o__futime64 -+@ stub _o__fwrite_nolock -+@ stub _o__gcvt -+@ stub _o__gcvt_s -+@ stub _o__get_daylight -+@ stub _o__get_doserrno -+@ stub _o__get_dstbias -+@ stub _o__get_errno -+@ stub _o__get_fmode -+@ stub _o__get_heap_handle -+@ stub _o__get_initial_narrow_environment -+@ stub _o__get_initial_wide_environment -+@ stub _o__get_invalid_parameter_handler -+@ stub _o__get_narrow_winmain_command_line -+@ stub _o__get_osfhandle -+@ stub _o__get_pgmptr -+@ stub _o__get_stream_buffer_pointers -+@ stub _o__get_terminate -+@ stub _o__get_thread_local_invalid_parameter_handler -+@ stub _o__get_timezone -+@ stub _o__get_tzname -+@ stub _o__get_wide_winmain_command_line -+@ stub _o__get_wpgmptr -+@ stub _o__getc_nolock -+@ stub _o__getch -+@ stub _o__getch_nolock -+@ stub _o__getche -+@ stub _o__getche_nolock -+@ stub _o__getcwd -+@ stub _o__getdcwd -+@ stub _o__getdiskfree -+@ stub _o__getdllprocaddr -+@ stub _o__getdrive -+@ stub _o__getdrives -+@ stub _o__getmbcp -+@ stub _o__getsystime -+@ stub _o__getw -+@ stub _o__getwc_nolock -+@ stub _o__getwch -+@ stub _o__getwch_nolock -+@ stub _o__getwche -+@ stub _o__getwche_nolock -+@ stub _o__getws -+@ stub _o__getws_s -+@ stub _o__gmtime32 -+@ stub _o__gmtime32_s -+@ stub _o__gmtime64 -+@ stub _o__gmtime64_s -+@ stub _o__heapchk -+@ stub _o__heapmin -+@ stub _o__hypot -+@ stub _o__hypotf -+@ stub _o__i64toa -+@ stub _o__i64toa_s -+@ stub _o__i64tow -+@ stub _o__i64tow_s -+@ stub _o__initialize_narrow_environment -+@ stub _o__initialize_onexit_table -+@ stub _o__initialize_wide_environment -+@ stub _o__invalid_parameter_noinfo -+@ stub _o__invalid_parameter_noinfo_noreturn -+@ stub _o__isatty -+@ stub _o__isctype -+@ stub _o__isctype_l -+@ stub _o__isleadbyte_l -+@ stub _o__ismbbalnum -+@ stub _o__ismbbalnum_l -+@ stub _o__ismbbalpha -+@ stub _o__ismbbalpha_l -+@ stub _o__ismbbblank -+@ stub _o__ismbbblank_l -+@ stub _o__ismbbgraph -+@ stub _o__ismbbgraph_l -+@ stub _o__ismbbkalnum -+@ stub _o__ismbbkalnum_l -+@ stub _o__ismbbkana -+@ stub _o__ismbbkana_l -+@ stub _o__ismbbkprint -+@ stub _o__ismbbkprint_l -+@ stub _o__ismbbkpunct -+@ stub _o__ismbbkpunct_l -+@ stub _o__ismbblead -+@ stub _o__ismbblead_l -+@ stub _o__ismbbprint -+@ stub _o__ismbbprint_l -+@ stub _o__ismbbpunct -+@ stub _o__ismbbpunct_l -+@ stub _o__ismbbtrail -+@ stub _o__ismbbtrail_l -+@ stub _o__ismbcalnum -+@ stub _o__ismbcalnum_l -+@ stub _o__ismbcalpha -+@ stub _o__ismbcalpha_l -+@ stub _o__ismbcblank -+@ stub _o__ismbcblank_l -+@ stub _o__ismbcdigit -+@ stub _o__ismbcdigit_l -+@ stub _o__ismbcgraph -+@ stub _o__ismbcgraph_l -+@ stub _o__ismbchira -+@ stub _o__ismbchira_l -+@ stub _o__ismbckata -+@ stub _o__ismbckata_l -+@ stub _o__ismbcl0 -+@ stub _o__ismbcl0_l -+@ stub _o__ismbcl1 -+@ stub _o__ismbcl1_l -+@ stub _o__ismbcl2 -+@ stub _o__ismbcl2_l -+@ stub _o__ismbclegal -+@ stub _o__ismbclegal_l -+@ stub _o__ismbclower -+@ stub _o__ismbclower_l -+@ stub _o__ismbcprint -+@ stub _o__ismbcprint_l -+@ stub _o__ismbcpunct -+@ stub _o__ismbcpunct_l -+@ stub _o__ismbcspace -+@ stub _o__ismbcspace_l -+@ stub _o__ismbcsymbol -+@ stub _o__ismbcsymbol_l -+@ stub _o__ismbcupper -+@ stub _o__ismbcupper_l -+@ stub _o__ismbslead -+@ stub _o__ismbslead_l -+@ stub _o__ismbstrail -+@ stub _o__ismbstrail_l -+@ stub _o__iswctype_l -+@ stub _o__itoa -+@ stub _o__itoa_s -+@ stub _o__itow -+@ stub _o__itow_s -+@ stub _o__j0 -+@ stub _o__j1 -+@ stub _o__jn -+@ stub _o__kbhit -+@ stub _o__ld_int -+@ stub _o__ldclass -+@ stub _o__ldexp -+@ stub _o__ldlog -+@ stub _o__ldpcomp -+@ stub _o__ldpoly -+@ stub _o__ldscale -+@ stub _o__ldsign -+@ stub _o__ldsin -+@ stub _o__ldtest -+@ stub _o__ldunscale -+@ stub _o__lfind -+@ stub _o__lfind_s -+@ stub _o__libm_sse2_acos_precise -+@ stub _o__libm_sse2_asin_precise -+@ stub _o__libm_sse2_atan_precise -+@ stub _o__libm_sse2_cos_precise -+@ stub _o__libm_sse2_exp_precise -+@ stub _o__libm_sse2_log10_precise -+@ stub _o__libm_sse2_log_precise -+@ stub _o__libm_sse2_pow_precise -+@ stub _o__libm_sse2_sin_precise -+@ stub _o__libm_sse2_sqrt_precise -+@ stub _o__libm_sse2_tan_precise -+@ stub _o__loaddll -+@ stub _o__localtime32 -+@ stub _o__localtime32_s -+@ stub _o__localtime64 -+@ stub _o__localtime64_s -+@ stub _o__lock_file -+@ stub _o__locking -+@ stub _o__logb -+@ stub _o__lsearch -+@ stub _o__lsearch_s -+@ stub _o__lseek -+@ stub _o__lseeki64 -+@ stub _o__ltoa -+@ stub _o__ltoa_s -+@ stub _o__ltow -+@ stub _o__ltow_s -+@ stub _o__makepath -+@ stub _o__makepath_s -+@ stub _o__malloc_base -+@ stub _o__mbbtombc -+@ stub _o__mbbtombc_l -+@ stub _o__mbbtype -+@ stub _o__mbbtype_l -+@ stub _o__mbccpy -+@ stub _o__mbccpy_l -+@ stub _o__mbccpy_s -+@ stub _o__mbccpy_s_l -+@ stub _o__mbcjistojms -+@ stub _o__mbcjistojms_l -+@ stub _o__mbcjmstojis -+@ stub _o__mbcjmstojis_l -+@ stub _o__mbclen -+@ stub _o__mbclen_l -+@ stub _o__mbctohira -+@ stub _o__mbctohira_l -+@ stub _o__mbctokata -+@ stub _o__mbctokata_l -+@ stub _o__mbctolower -+@ stub _o__mbctolower_l -+@ stub _o__mbctombb -+@ stub _o__mbctombb_l -+@ stub _o__mbctoupper -+@ stub _o__mbctoupper_l -+@ stub _o__mblen_l -+@ stub _o__mbsbtype -+@ stub _o__mbsbtype_l -+@ stub _o__mbscat_s -+@ stub _o__mbscat_s_l -+@ stub _o__mbschr -+@ stub _o__mbschr_l -+@ stub _o__mbscmp -+@ stub _o__mbscmp_l -+@ stub _o__mbscoll -+@ stub _o__mbscoll_l -+@ stub _o__mbscpy_s -+@ stub _o__mbscpy_s_l -+@ stub _o__mbscspn -+@ stub _o__mbscspn_l -+@ stub _o__mbsdec -+@ stub _o__mbsdec_l -+@ stub _o__mbsicmp -+@ stub _o__mbsicmp_l -+@ stub _o__mbsicoll -+@ stub _o__mbsicoll_l -+@ stub _o__mbsinc -+@ stub _o__mbsinc_l -+@ stub _o__mbslen -+@ stub _o__mbslen_l -+@ stub _o__mbslwr -+@ stub _o__mbslwr_l -+@ stub _o__mbslwr_s -+@ stub _o__mbslwr_s_l -+@ stub _o__mbsnbcat -+@ stub _o__mbsnbcat_l -+@ stub _o__mbsnbcat_s -+@ stub _o__mbsnbcat_s_l -+@ stub _o__mbsnbcmp -+@ stub _o__mbsnbcmp_l -+@ stub _o__mbsnbcnt -+@ stub _o__mbsnbcnt_l -+@ stub _o__mbsnbcoll -+@ stub _o__mbsnbcoll_l -+@ stub _o__mbsnbcpy -+@ stub _o__mbsnbcpy_l -+@ stub _o__mbsnbcpy_s -+@ stub _o__mbsnbcpy_s_l -+@ stub _o__mbsnbicmp -+@ stub _o__mbsnbicmp_l -+@ stub _o__mbsnbicoll -+@ stub _o__mbsnbicoll_l -+@ stub _o__mbsnbset -+@ stub _o__mbsnbset_l -+@ stub _o__mbsnbset_s -+@ stub _o__mbsnbset_s_l -+@ stub _o__mbsncat -+@ stub _o__mbsncat_l -+@ stub _o__mbsncat_s -+@ stub _o__mbsncat_s_l -+@ stub _o__mbsnccnt -+@ stub _o__mbsnccnt_l -+@ stub _o__mbsncmp -+@ stub _o__mbsncmp_l -+@ stub _o__mbsncoll -+@ stub _o__mbsncoll_l -+@ stub _o__mbsncpy -+@ stub _o__mbsncpy_l -+@ stub _o__mbsncpy_s -+@ stub _o__mbsncpy_s_l -+@ stub _o__mbsnextc -+@ stub _o__mbsnextc_l -+@ stub _o__mbsnicmp -+@ stub _o__mbsnicmp_l -+@ stub _o__mbsnicoll -+@ stub _o__mbsnicoll_l -+@ stub _o__mbsninc -+@ stub _o__mbsninc_l -+@ stub _o__mbsnlen -+@ stub _o__mbsnlen_l -+@ stub _o__mbsnset -+@ stub _o__mbsnset_l -+@ stub _o__mbsnset_s -+@ stub _o__mbsnset_s_l -+@ stub _o__mbspbrk -+@ stub _o__mbspbrk_l -+@ stub _o__mbsrchr -+@ stub _o__mbsrchr_l -+@ stub _o__mbsrev -+@ stub _o__mbsrev_l -+@ stub _o__mbsset -+@ stub _o__mbsset_l -+@ stub _o__mbsset_s -+@ stub _o__mbsset_s_l -+@ stub _o__mbsspn -+@ stub _o__mbsspn_l -+@ stub _o__mbsspnp -+@ stub _o__mbsspnp_l -+@ stub _o__mbsstr -+@ stub _o__mbsstr_l -+@ stub _o__mbstok -+@ stub _o__mbstok_l -+@ stub _o__mbstok_s -+@ stub _o__mbstok_s_l -+@ stub _o__mbstowcs_l -+@ stub _o__mbstowcs_s_l -+@ stub _o__mbstrlen -+@ stub _o__mbstrlen_l -+@ stub _o__mbstrnlen -+@ stub _o__mbstrnlen_l -+@ stub _o__mbsupr -+@ stub _o__mbsupr_l -+@ stub _o__mbsupr_s -+@ stub _o__mbsupr_s_l -+@ stub _o__mbtowc_l -+@ stub _o__memicmp -+@ stub _o__memicmp_l -+@ stub _o__mkdir -+@ stub _o__mkgmtime32 -+@ stub _o__mkgmtime64 -+@ stub _o__mktemp -+@ stub _o__mktemp_s -+@ stub _o__mktime32 -+@ stub _o__mktime64 -+@ stub _o__msize -+@ stub _o__nextafter -+@ stub _o__open_osfhandle -+@ stub _o__pclose -+@ stub _o__pipe -+@ stub _o__popen -+@ stub _o__purecall -+@ stub _o__putc_nolock -+@ stub _o__putch -+@ stub _o__putch_nolock -+@ stub _o__putenv -+@ stub _o__putenv_s -+@ stub _o__putw -+@ stub _o__putwc_nolock -+@ stub _o__putwch -+@ stub _o__putwch_nolock -+@ stub _o__putws -+@ stub _o__read -+@ stub _o__realloc_base -+@ stub _o__recalloc -+@ stub _o__register_onexit_function -+@ stub _o__resetstkoflw -+@ stub _o__rmdir -+@ stub _o__rmtmp -+@ stub _o__scalb -+@ stub _o__searchenv -+@ stub _o__searchenv_s -+@ stub _o__seh_filter_dll -+@ stub _o__seh_filter_exe -+@ stub _o__set_abort_behavior -+@ stub _o__set_app_type -+@ stub _o__set_doserrno -+@ stub _o__set_errno -+@ stub _o__set_fmode -+@ stub _o__set_invalid_parameter_handler -+@ stub _o__set_new_handler -+@ stub _o__set_new_mode -+@ stub _o__set_thread_local_invalid_parameter_handler -+@ stub _o__seterrormode -+@ stub _o__setmbcp -+@ stub _o__setmode -+@ stub _o__setsystime -+@ stub _o__sleep -+@ stub _o__sopen -+@ stub _o__sopen_dispatch -+@ stub _o__sopen_s -+@ stub _o__spawnv -+@ stub _o__spawnve -+@ stub _o__spawnvp -+@ stub _o__spawnvpe -+@ stub _o__splitpath -+@ stub _o__splitpath_s -+@ stub _o__stat32 -+@ stub _o__stat32i64 -+@ stub _o__stat64 -+@ stub _o__stat64i32 -+@ stub _o__strcoll_l -+@ stub _o__strdate -+@ stub _o__strdate_s -+@ stub _o__strdup -+@ stub _o__strerror -+@ stub _o__strerror_s -+@ stub _o__strftime_l -+@ stub _o__stricmp -+@ stub _o__stricmp_l -+@ stub _o__stricoll -+@ stub _o__stricoll_l -+@ stub _o__strlwr -+@ stub _o__strlwr_l -+@ stub _o__strlwr_s -+@ stub _o__strlwr_s_l -+@ stub _o__strncoll -+@ stub _o__strncoll_l -+@ stub _o__strnicmp -+@ stub _o__strnicmp_l -+@ stub _o__strnicoll -+@ stub _o__strnicoll_l -+@ stub _o__strnset_s -+@ stub _o__strset_s -+@ stub _o__strtime -+@ stub _o__strtime_s -+@ stub _o__strtod_l -+@ stub _o__strtof_l -+@ stub _o__strtoi64 -+@ stub _o__strtoi64_l -+@ stub _o__strtol_l -+@ stub _o__strtold_l -+@ stub _o__strtoll_l -+@ stub _o__strtoui64 -+@ stub _o__strtoui64_l -+@ stub _o__strtoul_l -+@ stub _o__strtoull_l -+@ stub _o__strupr -+@ stub _o__strupr_l -+@ stub _o__strupr_s -+@ stub _o__strupr_s_l -+@ stub _o__strxfrm_l -+@ stub _o__swab -+@ stub _o__tell -+@ stub _o__telli64 -+@ stub _o__timespec32_get -+@ stub _o__timespec64_get -+@ stub _o__tolower -+@ stub _o__tolower_l -+@ stub _o__toupper -+@ stub _o__toupper_l -+@ stub _o__towlower_l -+@ stub _o__towupper_l -+@ stub _o__tzset -+@ stub _o__ui64toa -+@ stub _o__ui64toa_s -+@ stub _o__ui64tow -+@ stub _o__ui64tow_s -+@ stub _o__ultoa -+@ stub _o__ultoa_s -+@ stub _o__ultow -+@ stub _o__ultow_s -+@ stub _o__umask -+@ stub _o__umask_s -+@ stub _o__ungetc_nolock -+@ stub _o__ungetch -+@ stub _o__ungetch_nolock -+@ stub _o__ungetwc_nolock -+@ stub _o__ungetwch -+@ stub _o__ungetwch_nolock -+@ stub _o__unlink -+@ stub _o__unloaddll -+@ stub _o__unlock_file -+@ stub _o__utime32 -+@ stub _o__utime64 -+@ stub _o__waccess -+@ stub _o__waccess_s -+@ stub _o__wasctime -+@ stub _o__wasctime_s -+@ stub _o__wchdir -+@ stub _o__wchmod -+@ stub _o__wcreat -+@ stub _o__wcreate_locale -+@ stub _o__wcscoll_l -+@ stub _o__wcsdup -+@ stub _o__wcserror -+@ stub _o__wcserror_s -+@ stub _o__wcsftime_l -+@ stub _o__wcsicmp -+@ stub _o__wcsicmp_l -+@ stub _o__wcsicoll -+@ stub _o__wcsicoll_l -+@ stub _o__wcslwr -+@ stub _o__wcslwr_l -+@ stub _o__wcslwr_s -+@ stub _o__wcslwr_s_l -+@ stub _o__wcsncoll -+@ stub _o__wcsncoll_l -+@ stub _o__wcsnicmp -+@ stub _o__wcsnicmp_l -+@ stub _o__wcsnicoll -+@ stub _o__wcsnicoll_l -+@ stub _o__wcsnset -+@ stub _o__wcsnset_s -+@ stub _o__wcsset -+@ stub _o__wcsset_s -+@ stub _o__wcstod_l -+@ stub _o__wcstof_l -+@ stub _o__wcstoi64 -+@ stub _o__wcstoi64_l -+@ stub _o__wcstol_l -+@ stub _o__wcstold_l -+@ stub _o__wcstoll_l -+@ stub _o__wcstombs_l -+@ stub _o__wcstombs_s_l -+@ stub _o__wcstoui64 -+@ stub _o__wcstoui64_l -+@ stub _o__wcstoul_l -+@ stub _o__wcstoull_l -+@ stub _o__wcsupr -+@ stub _o__wcsupr_l -+@ stub _o__wcsupr_s -+@ stub _o__wcsupr_s_l -+@ stub _o__wcsxfrm_l -+@ stub _o__wctime32 -+@ stub _o__wctime32_s -+@ stub _o__wctime64 -+@ stub _o__wctime64_s -+@ stub _o__wctomb_l -+@ stub _o__wctomb_s_l -+@ stub _o__wdupenv_s -+@ stub _o__wexecv -+@ stub _o__wexecve -+@ stub _o__wexecvp -+@ stub _o__wexecvpe -+@ stub _o__wfdopen -+@ stub _o__wfindfirst32 -+@ stub _o__wfindfirst32i64 -+@ stub _o__wfindfirst64 -+@ stub _o__wfindfirst64i32 -+@ stub _o__wfindnext32 -+@ stub _o__wfindnext32i64 -+@ stub _o__wfindnext64 -+@ stub _o__wfindnext64i32 -+@ stub _o__wfopen -+@ stub _o__wfopen_s -+@ stub _o__wfreopen -+@ stub _o__wfreopen_s -+@ stub _o__wfsopen -+@ stub _o__wfullpath -+@ stub _o__wgetcwd -+@ stub _o__wgetdcwd -+@ stub _o__wgetenv -+@ stub _o__wgetenv_s -+@ stub _o__wmakepath -+@ stub _o__wmakepath_s -+@ stub _o__wmkdir -+@ stub _o__wmktemp -+@ stub _o__wmktemp_s -+@ stub _o__wperror -+@ stub _o__wpopen -+@ stub _o__wputenv -+@ stub _o__wputenv_s -+@ stub _o__wremove -+@ stub _o__wrename -+@ stub _o__write -+@ stub _o__wrmdir -+@ stub _o__wsearchenv -+@ stub _o__wsearchenv_s -+@ stub _o__wsetlocale -+@ stub _o__wsopen_dispatch -+@ stub _o__wsopen_s -+@ stub _o__wspawnv -+@ stub _o__wspawnve -+@ stub _o__wspawnvp -+@ stub _o__wspawnvpe -+@ stub _o__wsplitpath -+@ stub _o__wsplitpath_s -+@ stub _o__wstat32 -+@ stub _o__wstat32i64 -+@ stub _o__wstat64 -+@ stub _o__wstat64i32 -+@ stub _o__wstrdate -+@ stub _o__wstrdate_s -+@ stub _o__wstrtime -+@ stub _o__wstrtime_s -+@ stub _o__wsystem -+@ stub _o__wtmpnam_s -+@ stub _o__wtof -+@ stub _o__wtof_l -+@ stub _o__wtoi -+@ stub _o__wtoi64 -+@ stub _o__wtoi64_l -+@ stub _o__wtoi_l -+@ stub _o__wtol -+@ stub _o__wtol_l -+@ stub _o__wtoll -+@ stub _o__wtoll_l -+@ stub _o__wunlink -+@ stub _o__wutime32 -+@ stub _o__wutime64 -+@ stub _o__y0 -+@ stub _o__y1 -+@ stub _o__yn -+@ stub _o_abort -+@ stub _o_acos -+@ stub _o_acosh -+@ stub _o_acoshf -+@ stub _o_acoshl -+@ stub _o_asctime -+@ stub _o_asctime_s -+@ stub _o_asin -+@ stub _o_asinh -+@ stub _o_asinhf -+@ stub _o_asinhl -+@ stub _o_atan -+@ stub _o_atan2 -+@ stub _o_atanh -+@ stub _o_atanhf -+@ stub _o_atanhl -+@ stub _o_atof -+@ stub _o_atoi -+@ stub _o_atol -+@ stub _o_atoll -+@ stub _o_bsearch -+@ stub _o_bsearch_s -+@ stub _o_btowc -+@ stub _o_calloc -+@ stub _o_cbrt -+@ stub _o_cbrtf -+@ stub _o_ceil -+@ stub _o_clearerr -+@ stub _o_clearerr_s -+@ stub _o_cos -+@ stub _o_cosh -+@ stub _o_erf -+@ stub _o_erfc -+@ stub _o_erfcf -+@ stub _o_erfcl -+@ stub _o_erff -+@ stub _o_erfl -+@ stub _o_exit -+@ stub _o_exp -+@ stub _o_exp2 -+@ stub _o_exp2f -+@ stub _o_exp2l -+@ stub _o_fabs -+@ stub _o_fclose -+@ stub _o_feof -+@ stub _o_ferror -+@ stub _o_fflush -+@ stub _o_fgetc -+@ stub _o_fgetpos -+@ stub _o_fgets -+@ stub _o_fgetwc -+@ stub _o_fgetws -+@ stub _o_floor -+@ stub _o_fma -+@ stub _o_fmaf -+@ stub _o_fmal -+@ stub _o_fmod -+@ stub _o_fopen -+@ stub _o_fopen_s -+@ stub _o_fputc -+@ stub _o_fputs -+@ stub _o_fputwc -+@ stub _o_fputws -+@ stub _o_fread -+@ stub _o_fread_s -+@ stub _o_free -+@ stub _o_freopen -+@ stub _o_freopen_s -+@ stub _o_frexp -+@ stub _o_fseek -+@ stub _o_fsetpos -+@ stub _o_ftell -+@ stub _o_fwrite -+@ stub _o_getc -+@ stub _o_getchar -+@ stub _o_getenv -+@ stub _o_getenv_s -+@ stub _o_gets -+@ stub _o_gets_s -+@ stub _o_getwc -+@ stub _o_getwchar -+@ stub _o_hypot -+@ stub _o_is_wctype -+@ stub _o_isalnum -+@ stub _o_isalpha -+@ stub _o_isblank -+@ stub _o_iscntrl -+@ stub _o_isdigit -+@ stub _o_isgraph -+@ stub _o_isleadbyte -+@ stub _o_islower -+@ stub _o_isprint -+@ stub _o_ispunct -+@ stub _o_isspace -+@ stub _o_isupper -+@ stub _o_iswalnum -+@ stub _o_iswalpha -+@ stub _o_iswascii -+@ stub _o_iswblank -+@ stub _o_iswcntrl -+@ stub _o_iswctype -+@ stub _o_iswdigit -+@ stub _o_iswgraph -+@ stub _o_iswlower -+@ stub _o_iswprint -+@ stub _o_iswpunct -+@ stub _o_iswspace -+@ stub _o_iswupper -+@ stub _o_iswxdigit -+@ stub _o_isxdigit -+@ stub _o_ldexp -+@ stub _o_lgamma -+@ stub _o_lgammaf -+@ stub _o_lgammal -+@ stub _o_llrint -+@ stub _o_llrintf -+@ stub _o_llrintl -+@ stub _o_llround -+@ stub _o_llroundf -+@ stub _o_llroundl -+@ stub _o_localeconv -+@ stub _o_log -+@ stub _o_log10 -+@ stub _o_log1p -+@ stub _o_log1pf -+@ stub _o_log1pl -+@ stub _o_log2 -+@ stub _o_log2f -+@ stub _o_log2l -+@ stub _o_logb -+@ stub _o_logbf -+@ stub _o_logbl -+@ stub _o_lrint -+@ stub _o_lrintf -+@ stub _o_lrintl -+@ stub _o_lround -+@ stub _o_lroundf -+@ stub _o_lroundl -+@ stub _o_malloc -+@ stub _o_mblen -+@ stub _o_mbrlen -+@ stub _o_mbrtoc16 -+@ stub _o_mbrtoc32 -+@ stub _o_mbrtowc -+@ stub _o_mbsrtowcs -+@ stub _o_mbsrtowcs_s -+@ stub _o_mbstowcs -+@ stub _o_mbstowcs_s -+@ stub _o_mbtowc -+@ stub _o_memcpy_s -+@ stub _o_memset -+@ stub _o_modf -+@ stub _o_nan -+@ stub _o_nanf -+@ stub _o_nanl -+@ stub _o_nearbyint -+@ stub _o_nearbyintf -+@ stub _o_nearbyintl -+@ stub _o_nextafter -+@ stub _o_nextafterf -+@ stub _o_nextafterl -+@ stub _o_nexttoward -+@ stub _o_nexttowardf -+@ stub _o_nexttowardl -+@ stub _o_pow -+@ stub _o_powf -+@ stub _o_putc -+@ stub _o_putchar -+@ stub _o_puts -+@ stub _o_putwc -+@ stub _o_putwchar -+@ stub _o_qsort -+@ stub _o_qsort_s -+@ stub _o_raise -+@ stub _o_rand -+@ stub _o_rand_s -+@ stub _o_realloc -+@ stub _o_remainder -+@ stub _o_remainderf -+@ stub _o_remainderl -+@ stub _o_remove -+@ stub _o_remquo -+@ stub _o_remquof -+@ stub _o_remquol -+@ stub _o_rename -+@ stub _o_rewind -+@ stub _o_rint -+@ stub _o_rintf -+@ stub _o_rintl -+@ stub _o_round -+@ stub _o_roundf -+@ stub _o_roundl -+@ stub _o_scalbln -+@ stub _o_scalblnf -+@ stub _o_scalblnl -+@ stub _o_scalbn -+@ stub _o_scalbnf -+@ stub _o_scalbnl -+@ stub _o_set_terminate -+@ stub _o_setbuf -+@ stub _o_setlocale -+@ stub _o_setvbuf -+@ stub _o_sin -+@ stub _o_sinh -+@ stub _o_sqrt -+@ stub _o_srand -+@ stub _o_strcat_s -+@ stub _o_strcoll -+@ stub _o_strcpy_s -+@ stub _o_strerror -+@ stub _o_strerror_s -+@ stub _o_strftime -+@ stub _o_strncat_s -+@ stub _o_strncpy_s -+@ stub _o_strtod -+@ stub _o_strtof -+@ stub _o_strtok -+@ stub _o_strtok_s -+@ stub _o_strtol -+@ stub _o_strtold -+@ stub _o_strtoll -+@ stub _o_strtoul -+@ stub _o_strtoull -+@ stub _o_system -+@ stub _o_tan -+@ stub _o_tanh -+@ stub _o_terminate -+@ stub _o_tgamma -+@ stub _o_tgammaf -+@ stub _o_tgammal -+@ stub _o_tmpfile_s -+@ stub _o_tmpnam_s -+@ stub _o_tolower -+@ stub _o_toupper -+@ stub _o_towlower -+@ stub _o_towupper -+@ stub _o_ungetc -+@ stub _o_ungetwc -+@ stub _o_wcrtomb -+@ stub _o_wcrtomb_s -+@ stub _o_wcscat_s -+@ stub _o_wcscoll -+@ stub _o_wcscpy -+@ stub _o_wcscpy_s -+@ stub _o_wcsftime -+@ stub _o_wcsncat_s -+@ stub _o_wcsncpy_s -+@ stub _o_wcsrtombs -+@ stub _o_wcsrtombs_s -+@ stub _o_wcstod -+@ stub _o_wcstof -+@ stub _o_wcstok -+@ stub _o_wcstok_s -+@ stub _o_wcstol -+@ stub _o_wcstold -+@ stub _o_wcstoll -+@ stub _o_wcstombs -+@ stub _o_wcstombs_s -+@ stub _o_wcstoul -+@ stub _o_wcstoull -+@ stub _o_wctob -+@ stub _o_wctomb -+@ stub _o_wctomb_s -+@ stub _o_wmemcpy_s -+@ stub _o_wmemmove_s -+@ varargs _open(str long) MSVCRT__open -+@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle -+@ cdecl _pclose(ptr) MSVCRT__pclose -+@ cdecl _pipe(ptr long long) MSVCRT__pipe -+@ cdecl _popen(str str) MSVCRT__popen -+@ cdecl _purecall() -+@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock -+@ cdecl _putch(long) -+@ cdecl _putch_nolock(long) -+@ cdecl _putenv(str) -+@ cdecl _putenv_s(str str) -+@ cdecl _putw(long ptr) MSVCRT__putw -+@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock -+@ cdecl _putwch(long) -+@ cdecl _putwch_nolock(long) -+@ cdecl _putws(wstr) MSVCRT__putws -+@ stub _query_app_type -+@ stub _query_new_handler -+@ stub _query_new_mode -+@ cdecl _read(long ptr long) MSVCRT__read -+@ stub _realloc_base -+@ cdecl _recalloc(ptr long long) -+@ stub _register_onexit_function -+@ stub _register_thread_local_exe_atexit_callback -+@ cdecl _resetstkoflw() MSVCRT__resetstkoflw -+@ cdecl _rmdir(str) MSVCRT__rmdir -+@ cdecl _rmtmp() MSVCRT__rmtmp -+@ cdecl _rotl(long long) -+@ cdecl -ret64 _rotl64(int64 long) -+@ cdecl _rotr(long long) -+@ cdecl -ret64 _rotr64(int64 long) -+@ cdecl _scalb(double long) MSVCRT__scalb -+@ cdecl _searchenv(str str ptr) MSVCRT__searchenv -+@ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s -+@ stub _seh_filter_dll -+@ stub _seh_filter_exe -+@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) -+@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) -+@ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable -+@ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior -+@ stub _set_app_type -+@ cdecl _set_controlfp(long long) -+@ cdecl _set_doserrno(long) -+@ cdecl _set_errno(long) -+@ cdecl _set_error_mode(long) -+@ cdecl _set_fmode(long) MSVCRT__set_fmode -+@ cdecl _set_invalid_parameter_handler(ptr) -+@ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned int) -+@ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned __int64) -+@ stub _set_new_mode -+@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output -+@ cdecl _set_purecall_handler(ptr) -+@ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z # void(__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *) -+@ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z # void(__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64) -+@ stub _set_thread_local_invalid_parameter_handler -+@ cdecl _seterrormode(long) -+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3 -+@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio -+@ cdecl _setmbcp(long) -+@ cdecl _setmode(long long) MSVCRT__setmode -+@ stub _setsystime(ptr long) -+@ cdecl _sleep(long) MSVCRT__sleep -+@ varargs _sopen(str long long) MSVCRT__sopen -+@ stub _sopen_dispatch -+@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s -+@ varargs _spawnl(long str str) -+@ varargs _spawnle(long str str) -+@ varargs _spawnlp(long str str) -+@ varargs _spawnlpe(long str str) -+@ cdecl _spawnv(long str ptr) -+@ cdecl _spawnve(long str ptr ptr) MSVCRT__spawnve -+@ cdecl _spawnvp(long str ptr) -+@ cdecl _spawnvpe(long str ptr ptr) MSVCRT__spawnvpe -+@ cdecl _splitpath(str ptr ptr ptr ptr) MSVCRT__splitpath -+@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) MSVCRT__splitpath_s -+@ cdecl _stat32(str ptr) MSVCRT__stat32 -+@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64 -+@ cdecl _stat64(str ptr) MSVCRT_stat64 -+@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 -+@ cdecl _statusfp() -+@ cdecl -arch=i386 _statusfp2(ptr ptr) -+@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l -+@ cdecl _strdate(ptr) MSVCRT__strdate -+@ cdecl _strdate_s(ptr long) -+@ cdecl _strdup(str) MSVCRT__strdup -+@ cdecl _strerror(long) MSVCRT__strerror -+@ stub _strerror_s -+@ stub _strftime_l -+@ cdecl _stricmp(str str) MSVCRT__stricmp -+@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -+@ cdecl _stricoll(str str) MSVCRT__stricoll -+@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -+@ cdecl _strlwr(str) MSVCRT__strlwr -+@ cdecl _strlwr_l(str ptr) -+@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -+@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -+@ cdecl _strncoll(str str long) MSVCRT__strncoll -+@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -+@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -+@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -+@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -+@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -+@ cdecl _strnset(str long long) MSVCRT__strnset -+@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -+@ cdecl _strrev(str) MSVCRT__strrev -+@ cdecl _strset(str long) -+@ stub _strset_s -+@ cdecl _strtime(ptr) MSVCRT__strtime -+@ cdecl _strtime_s(ptr long) -+@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -+@ stub _strtof_l -+@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -+@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -+@ stub _strtoimax_l -+@ stub _strtol_l -+@ stub _strtold_l -+@ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l -+@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -+@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -+@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -+@ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -+@ stub _strtoumax_l -+@ cdecl _strupr(str) MSVCRT__strupr -+@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -+@ cdecl _strupr_s(str long) MSVCRT__strupr_s -+@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -+@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -+@ cdecl _swab(str str long) MSVCRT__swab -+@ cdecl _tell(long) MSVCRT__tell -+@ cdecl -ret64 _telli64(long) -+@ cdecl _tempnam(str str) MSVCRT__tempnam -+@ cdecl _time32(ptr) MSVCRT__time32 -+@ cdecl _time64(ptr) MSVCRT__time64 -+@ stub _timespec32_get -+@ stub _timespec64_get -+@ cdecl _tolower(long) MSVCRT__tolower -+@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l -+@ cdecl _toupper(long) MSVCRT__toupper -+@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l -+@ cdecl _towlower_l(long ptr) MSVCRT__towlower_l -+@ cdecl _towupper_l(long ptr) MSVCRT__towupper_l -+@ cdecl _tzset() MSVCRT__tzset -+@ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -+@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s -+@ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -+@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s -+@ cdecl _ultoa(long ptr long) ntdll._ultoa -+@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s -+@ cdecl _ultow(long ptr long) ntdll._ultow -+@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s -+@ cdecl _umask(long) MSVCRT__umask -+@ stub _umask_s -+@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock -+@ cdecl _ungetch(long) -+@ cdecl _ungetch_nolock(long) -+@ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock -+@ cdecl _ungetwch(long) -+@ cdecl _ungetwch_nolock(long) -+@ cdecl _unlink(str) MSVCRT__unlink -+@ cdecl _unloaddll(long) -+@ cdecl _unlock_file(ptr) MSVCRT__unlock_file -+@ stub _unlock_locales -+@ cdecl _utime32(str ptr) -+@ cdecl _utime64(str ptr) -+@ cdecl _waccess(wstr long) MSVCRT__waccess -+@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s -+@ cdecl _wasctime(ptr) MSVCRT__wasctime -+@ cdecl _wasctime_s(ptr long ptr) MSVCRT__wasctime_s -+@ cdecl _wassert(wstr wstr long) MSVCRT__wassert -+@ cdecl _wchdir(wstr) MSVCRT__wchdir -+@ cdecl _wchmod(wstr long) MSVCRT__wchmod -+@ cdecl _wcreat(wstr long) MSVCRT__wcreat -+@ stub _wcreate_locale -+@ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l -+@ cdecl _wcsdup(wstr) MSVCRT__wcsdup -+@ cdecl _wcserror(long) MSVCRT__wcserror -+@ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s -+@ stub _wcsftime_l -+@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp -+@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l -+@ cdecl _wcsicoll(wstr wstr) MSVCRT__wcsicoll -+@ cdecl _wcsicoll_l(wstr wstr ptr) MSVCRT__wcsicoll_l -+@ cdecl _wcslwr(wstr) MSVCRT__wcslwr -+@ cdecl _wcslwr_l(wstr ptr) MSVCRT__wcslwr_l -+@ cdecl _wcslwr_s(wstr long) MSVCRT__wcslwr_s -+@ cdecl _wcslwr_s_l(wstr long ptr) MSVCRT__wcslwr_s_l -+@ cdecl _wcsncoll(wstr wstr long) MSVCRT__wcsncoll -+@ cdecl _wcsncoll_l(wstr wstr long ptr) MSVCRT__wcsncoll_l -+@ cdecl _wcsnicmp(wstr wstr long) MSVCRT__wcsnicmp -+@ cdecl _wcsnicmp_l(wstr wstr long ptr) MSVCRT__wcsnicmp_l -+@ cdecl _wcsnicoll(wstr wstr long) MSVCRT__wcsnicoll -+@ cdecl _wcsnicoll_l(wstr wstr long ptr) MSVCRT__wcsnicoll_l -+@ cdecl _wcsnset(wstr long long) MSVCRT__wcsnset -+@ stub _wcsnset_s -+@ cdecl _wcsrev(wstr) MSVCRT__wcsrev -+@ cdecl _wcsset(wstr long) MSVCRT__wcsset -+@ cdecl _wcsset_s(wstr long long) MSVCRT__wcsset_s -+@ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l -+@ stub _wcstof_l -+@ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 -+@ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l -+@ stub _wcstoimax_l -+@ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l -+@ stub _wcstold_l -+@ stub _wcstoll_l -+@ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l -+@ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l -+@ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 -+@ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l -+@ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -+@ stub _wcstoull_l -+@ stub _wcstoumax_l -+@ cdecl _wcsupr(wstr) ntdll._wcsupr -+@ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l -+@ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s -+@ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l -+@ cdecl _wcsxfrm_l(ptr wstr long ptr) MSVCRT__wcsxfrm_l -+@ cdecl _wctime32(ptr) MSVCRT__wctime32 -+@ stub _wctime32_s -+@ cdecl _wctime64(ptr) MSVCRT__wctime64 -+@ stub _wctime64_s -+@ cdecl _wctomb_l(ptr long ptr) MSVCRT__wctomb_l -+@ cdecl _wctomb_s_l(ptr ptr long long ptr) MSVCRT__wctomb_s_l -+@ stub _wctype -+@ cdecl _wdupenv_s(ptr ptr wstr) -+@ varargs _wexecl(wstr wstr) -+@ varargs _wexecle(wstr wstr) -+@ varargs _wexeclp(wstr wstr) -+@ varargs _wexeclpe(wstr wstr) -+@ cdecl _wexecv(wstr ptr) -+@ cdecl _wexecve(wstr ptr ptr) -+@ cdecl _wexecvp(wstr ptr) -+@ cdecl _wexecvpe(wstr ptr ptr) -+@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen -+@ cdecl _wfindfirst32(wstr ptr) MSVCRT__wfindfirst32 -+@ stub _wfindfirst32i64 -+@ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 -+@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 -+@ stub _wfindnext32 -+@ stub _wfindnext32i64 -+@ cdecl _wfindnext64(long ptr) MSVCRT__wfindnext64 -+@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 -+@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen -+@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s -+@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen -+@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s -+@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen -+@ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath -+@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd -+@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd -+@ cdecl _wgetenv(wstr) MSVCRT__wgetenv -+@ cdecl _wgetenv_s(ptr ptr long wstr) -+@ cdecl _wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath -+@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s -+@ cdecl _wmkdir(wstr) MSVCRT__wmkdir -+@ cdecl _wmktemp(wstr) MSVCRT__wmktemp -+@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s -+@ varargs _wopen(wstr long) MSVCRT__wopen -+@ stub _wperror(wstr) -+@ cdecl _wpopen(wstr wstr) MSVCRT__wpopen -+@ cdecl _wputenv(wstr) -+@ cdecl _wputenv_s(wstr wstr) -+@ cdecl _wremove(wstr) MSVCRT__wremove -+@ cdecl _wrename(wstr wstr) MSVCRT__wrename -+@ cdecl _write(long ptr long) MSVCRT__write -+@ cdecl _wrmdir(wstr) MSVCRT__wrmdir -+@ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv -+@ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s -+@ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale -+@ varargs _wsopen(wstr long long) MSVCRT__wsopen -+@ stub _wsopen_dispatch -+@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s -+@ varargs _wspawnl(long wstr wstr) -+@ varargs _wspawnle(long wstr wstr) -+@ varargs _wspawnlp(long wstr wstr) -+@ varargs _wspawnlpe(long wstr wstr) -+@ cdecl _wspawnv(long wstr ptr) -+@ cdecl _wspawnve(long wstr ptr ptr) MSVCRT__wspawnve -+@ cdecl _wspawnvp(long wstr ptr) -+@ cdecl _wspawnvpe(long wstr ptr ptr) MSVCRT__wspawnvpe -+@ cdecl _wsplitpath(wstr ptr ptr ptr ptr) MSVCRT__wsplitpath -+@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) MSVCRT__wsplitpath_s -+@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32 -+@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64 -+@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64 -+@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32 -+@ cdecl _wstrdate(ptr) MSVCRT__wstrdate -+@ cdecl _wstrdate_s(ptr long) -+@ cdecl _wstrtime(ptr) MSVCRT__wstrtime -+@ cdecl _wstrtime_s(ptr long) -+@ cdecl _wsystem(wstr) -+@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam -+@ cdecl _wtmpnam(ptr) MSVCRT_wtmpnam -+@ stub _wtmpnam_s -+@ cdecl _wtof(wstr) MSVCRT__wtof -+@ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l -+@ cdecl _wtoi(wstr) MSVCRT__wtoi -+@ cdecl -ret64 _wtoi64(wstr) MSVCRT__wtoi64 -+@ cdecl -ret64 _wtoi64_l(wstr ptr) MSVCRT__wtoi64_l -+@ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l -+@ cdecl _wtol(wstr) MSVCRT__wtol -+@ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l -+@ stub _wtoll -+@ stub _wtoll_l -+@ cdecl _wunlink(wstr) MSVCRT__wunlink -+@ cdecl _wutime32(wstr ptr) -+@ cdecl _wutime64(wstr ptr) -+@ cdecl _y0(double) MSVCRT__y0 -+@ cdecl _y1(double) MSVCRT__y1 -+@ cdecl _yn(long double) MSVCRT__yn -+@ cdecl abort() MSVCRT_abort -+@ cdecl abs(long) MSVCRT_abs -+@ cdecl acos(double) MSVCRT_acos -+@ stub acosh -+@ stub acoshf -+@ stub acoshl -+@ cdecl asctime(ptr) MSVCRT_asctime -+@ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s -+@ cdecl asin(double) MSVCRT_asin -+@ stub asinh -+@ stub asinhf -+@ stub asinhl -+@ cdecl atan(double) MSVCRT_atan -+@ cdecl atan2(double double) MSVCRT_atan2 -+@ stub atanh -+@ stub atanhf -+@ stub atanhl -+@ cdecl atof(str) MSVCRT_atof -+@ cdecl atoi(str) MSVCRT_atoi -+@ cdecl atol(str) ntdll.atol -+@ stub atoll -+@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch -+@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s -+@ cdecl btowc(long) MSVCRT_btowc -+@ stub c16rtomb -+@ stub c32rtomb -+@ stub cabs -+@ stub cabsf -+@ stub cabsl -+@ stub cacos -+@ stub cacosf -+@ stub cacosh -+@ stub cacoshf -+@ stub cacoshl -+@ stub cacosl -+@ cdecl calloc(long long) MSVCRT_calloc -+@ stub carg -+@ stub cargf -+@ stub cargl -+@ stub casin -+@ stub casinf -+@ stub casinh -+@ stub casinhf -+@ stub casinhl -+@ stub casinl -+@ stub catan -+@ stub catanf -+@ stub catanh -+@ stub catanhf -+@ stub catanhl -+@ stub catanl -+@ cdecl cbrt(double) MSVCR120_cbrt -+@ cdecl cbrtf(float) MSVCR120_cbrtf -+@ cdecl cbrtl(double) MSVCR120_cbrtl -+@ stub ccos -+@ stub ccosf -+@ stub ccosh -+@ stub ccoshf -+@ stub ccoshl -+@ stub ccosl -+@ cdecl ceil(double) MSVCRT_ceil -+@ stub cexp -+@ stub cexpf -+@ stub cexpl -+@ stub cimag -+@ stub cimagf -+@ stub cimagl -+@ cdecl clearerr(ptr) MSVCRT_clearerr -+@ stub clearerr_s -+@ cdecl clock() MSVCRT_clock -+@ stub clog -+@ stub clog10 -+@ stub clog10f -+@ stub clog10l -+@ stub clogf -+@ stub clogl -+@ stub conj -+@ stub conjf -+@ stub conjl -+@ cdecl copysign(double double) MSVCRT__copysign -+@ cdecl copysignf(float float) MSVCRT__copysignf -+@ cdecl copysignl(double double) MSVCRT__copysign -+@ cdecl cos(double) MSVCRT_cos -+@ cdecl cosh(double) MSVCRT_cosh -+@ stub cpow -+@ stub cpowf -+@ stub cpowl -+@ stub cproj -+@ stub cprojf -+@ stub cprojl -+@ stub creal -+@ stub crealf -+@ stub creall -+@ stub csin -+@ stub csinf -+@ stub csinh -+@ stub csinhf -+@ stub csinhl -+@ stub csinl -+@ stub csqrt -+@ stub csqrtf -+@ stub csqrtl -+@ stub ctan -+@ stub ctanf -+@ stub ctanh -+@ stub ctanhf -+@ stub ctanhl -+@ stub ctanl -+@ cdecl -ret64 div(long long) MSVCRT_div -+@ cdecl erf(double) MSVCR120_erf -+@ stub erfc -+@ stub erfcf -+@ stub erfcl -+@ cdecl erff(double) MSVCR120_erff -+@ cdecl erfl(double) MSVCR120_erfl -+@ cdecl exit(long) MSVCRT_exit -+@ cdecl exp(double) MSVCRT_exp -+@ cdecl exp2(double) MSVCR120_exp2 -+@ cdecl exp2f(float) MSVCR120_exp2f -+@ cdecl exp2l(double) MSVCR120_exp2l -+@ stub expm1 -+@ stub expm1f -+@ stub expm1l -+@ cdecl fabs(double) MSVCRT_fabs -+@ cdecl fclose(ptr) MSVCRT_fclose -+@ stub fdim -+@ stub fdimf -+@ stub fdiml -+@ stub feclearexcept -+@ stub fegetenv -+@ stub fegetexceptflag -+@ stub fegetround -+@ stub feholdexcept -+@ cdecl feof(ptr) MSVCRT_feof -+@ cdecl ferror(ptr) MSVCRT_ferror -+@ stub fesetenv -+@ stub fesetexceptflag -+@ stub fesetround -+@ stub fetestexcept -+@ cdecl fflush(ptr) MSVCRT_fflush -+@ cdecl fgetc(ptr) MSVCRT_fgetc -+@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos -+@ cdecl fgets(ptr long ptr) MSVCRT_fgets -+@ cdecl fgetwc(ptr) MSVCRT_fgetwc -+@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws -+@ cdecl floor(double) MSVCRT_floor -+@ stub fma -+@ stub fmaf -+@ stub fmal -+@ cdecl fmax(double double) MSVCR120_fmax -+@ cdecl fmaxf(float float) MSVCR120_fmaxf -+@ cdecl fmaxl(double double) MSVCR120_fmax -+@ stub fmin -+@ stub fminf -+@ stub fminl -+@ cdecl fmod(double double) MSVCRT_fmod -+@ cdecl fopen(str str) MSVCRT_fopen -+@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s -+@ cdecl fputc(long ptr) MSVCRT_fputc -+@ cdecl fputs(str ptr) MSVCRT_fputs -+@ cdecl fputwc(long ptr) MSVCRT_fputwc -+@ cdecl fputws(wstr ptr) MSVCRT_fputws -+@ cdecl fread(ptr long long ptr) MSVCRT_fread -+@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s -+@ cdecl free(ptr) MSVCRT_free -+@ cdecl freopen(str str ptr) MSVCRT_freopen -+@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s -+@ cdecl frexp(double ptr) MSVCRT_frexp -+@ cdecl fseek(ptr long long) MSVCRT_fseek -+@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos -+@ cdecl ftell(ptr) MSVCRT_ftell -+@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite -+@ cdecl getc(ptr) MSVCRT_getc -+@ cdecl getchar() MSVCRT_getchar -+@ cdecl getenv(str) MSVCRT_getenv -+@ cdecl getenv_s(ptr ptr long str) -+@ cdecl gets(str) MSVCRT_gets -+@ stub gets_s -+@ cdecl getwc(ptr) MSVCRT_getwc -+@ cdecl getwchar() MSVCRT_getwchar -+@ stub hypot -+@ stub ilogb -+@ stub ilogbf -+@ stub ilogbl -+@ stub imaxabs -+@ stub imaxdiv -+@ cdecl is_wctype(long long) ntdll.iswctype -+@ cdecl isalnum(long) MSVCRT_isalnum -+@ cdecl isalpha(long) MSVCRT_isalpha -+@ stub isblank -+@ cdecl iscntrl(long) MSVCRT_iscntrl -+@ cdecl isdigit(long) MSVCRT_isdigit -+@ cdecl isgraph(long) MSVCRT_isgraph -+@ cdecl isleadbyte(long) MSVCRT_isleadbyte -+@ cdecl islower(long) MSVCRT_islower -+@ cdecl isprint(long) MSVCRT_isprint -+@ cdecl ispunct(long) MSVCRT_ispunct -+@ cdecl isspace(long) MSVCRT_isspace -+@ cdecl isupper(long) MSVCRT_isupper -+@ cdecl iswalnum(long) MSVCRT_iswalnum -+@ cdecl iswalpha(long) ntdll.iswalpha -+@ cdecl iswascii(long) MSVCRT_iswascii -+@ stub iswblank -+@ cdecl iswcntrl(long) MSVCRT_iswcntrl -+@ cdecl iswctype(long long) ntdll.iswctype -+@ cdecl iswdigit(long) MSVCRT_iswdigit -+@ cdecl iswgraph(long) MSVCRT_iswgraph -+@ cdecl iswlower(long) MSVCRT_iswlower -+@ cdecl iswprint(long) MSVCRT_iswprint -+@ cdecl iswpunct(long) MSVCRT_iswpunct -+@ cdecl iswspace(long) MSVCRT_iswspace -+@ cdecl iswupper(long) MSVCRT_iswupper -+@ cdecl iswxdigit(long) MSVCRT_iswxdigit -+@ cdecl isxdigit(long) MSVCRT_isxdigit -+@ cdecl labs(long) MSVCRT_labs -+@ cdecl ldexp(double long) MSVCRT_ldexp -+@ cdecl ldiv(long long) MSVCRT_ldiv -+@ stub lgamma -+@ stub lgammaf -+@ stub lgammal -+@ cdecl -ret64 llabs(int64) MSVCRT_llabs -+@ stub lldiv -+@ cdecl -ret64 llrint(double) MSVCR120_llrint -+@ cdecl -ret64 llrintf(float) MSVCR120_llrintf -+@ cdecl -ret64 llrintl(double) MSVCR120_llrintl -+@ cdecl -ret64 llround(double) MSVCR120_llround -+@ cdecl -ret64 llroundf(float) MSVCR120_llroundf -+@ cdecl -ret64 llroundl(double) MSVCR120_llroundl -+@ cdecl localeconv() MSVCRT_localeconv -+@ cdecl log(double) MSVCRT_log -+@ cdecl log10(double) MSVCRT_log10 -+@ stub log1p -+@ stub log1pf -+@ stub log1pl -+@ cdecl log2(double) MSVCR120_log2 -+@ cdecl log2f(float) MSVCR120_log2f -+@ cdecl log2l(double) MSVCR120_log2l -+@ stub logb -+@ stub logbf -+@ stub logbl -+@ cdecl -arch=i386,x86_64,arm longjmp(ptr long) MSVCRT_longjmp -+@ cdecl lrint(double) MSVCR120_lrint -+@ cdecl lrintf(float) MSVCR120_lrintf -+@ cdecl lrintl(double) MSVCR120_lrintl -+@ cdecl lround(double) MSVCR120_lround -+@ cdecl lroundf(float) MSVCR120_lroundf -+@ cdecl lroundl(double) MSVCR120_lroundl -+@ cdecl malloc(long) MSVCRT_malloc -+@ cdecl mblen(ptr long) MSVCRT_mblen -+@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -+@ stub mbrtoc16 -+@ stub mbrtoc32 -+@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -+@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -+@ stub mbsrtowcs_s -+@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -+@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -+@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc -+@ cdecl memchr(ptr long long) MSVCRT_memchr -+@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp -+@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy -+@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s -+@ cdecl memmove(ptr ptr long) MSVCRT_memmove -+@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s -+@ cdecl memset(ptr long long) MSVCRT_memset -+@ cdecl modf(double ptr) MSVCRT_modf -+@ stub nan -+@ stub nanf -+@ stub nanl -+@ stub nearbyint -+@ stub nearbyintf -+@ stub nearbyintl -+@ stub nextafter -+@ stub nextafterf -+@ stub nextafterl -+@ stub nexttoward -+@ stub nexttowardf -+@ stub nexttowardl -+@ stub norm -+@ stub normf -+@ stub norml -+@ cdecl perror(str) MSVCRT_perror -+@ cdecl pow(double double) MSVCRT_pow -+@ cdecl -arch=arm,x86_64 powf(float float) MSVCRT_powf -+@ cdecl putc(long ptr) MSVCRT_putc -+@ cdecl putchar(long) MSVCRT_putchar -+@ cdecl puts(str) MSVCRT_puts -+@ cdecl putwc(long ptr) MSVCRT_fputwc -+@ cdecl putwchar(long) MSVCRT__fputwchar -+@ cdecl qsort(ptr long long ptr) MSVCRT_qsort -+@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s -+@ stub quick_exit -+@ cdecl raise(long) MSVCRT_raise -+@ cdecl rand() MSVCRT_rand -+@ cdecl rand_s(ptr) MSVCRT_rand_s -+@ cdecl realloc(ptr long) MSVCRT_realloc -+@ stub remainder -+@ stub remainderf -+@ stub remainderl -+@ cdecl remove(str) MSVCRT_remove -+@ stub remquo -+@ stub remquof -+@ stub remquol -+@ cdecl rename(str str) MSVCRT_rename -+@ cdecl rewind(ptr) MSVCRT_rewind -+@ cdecl rint(double) MSVCR120_rint -+@ cdecl rintf(float) MSVCR120_rintf -+@ cdecl rintl(double) MSVCR120_rintl -+@ cdecl round(double) MSVCR120_round -+@ cdecl roundf(float) MSVCR120_roundf -+@ cdecl roundl(double) MSVCR120_roundl -+@ stub scalbln -+@ stub scalblnf -+@ stub scalblnl -+@ stub scalbn -+@ stub scalbnf -+@ stub scalbnl -+@ stub set_terminate -+@ stub set_unexpected -+@ cdecl setbuf(ptr ptr) MSVCRT_setbuf -+@ cdecl setlocale(long str) MSVCRT_setlocale -+@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf -+@ cdecl signal(long long) MSVCRT_signal -+@ cdecl sin(double) MSVCRT_sin -+@ cdecl sinh(double) MSVCRT_sinh -+@ cdecl sqrt(double) MSVCRT_sqrt -+@ cdecl srand(long) MSVCRT_srand -+@ cdecl strcat(str str) ntdll.strcat -+@ cdecl strcat_s(str long str) MSVCRT_strcat_s -+@ cdecl strchr(str long) MSVCRT_strchr -+@ cdecl strcmp(str str) MSVCRT_strcmp -+@ cdecl strcoll(str str) MSVCRT_strcoll -+@ cdecl strcpy(ptr str) ntdll.strcpy -+@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -+@ cdecl strcspn(str str) ntdll.strcspn -+@ cdecl strerror(long) MSVCRT_strerror -+@ cdecl strerror_s(ptr long long) MSVCRT_strerror_s -+@ cdecl strftime(str long str ptr) MSVCRT_strftime -+@ cdecl strlen(str) MSVCRT_strlen -+@ cdecl strncat(str str long) MSVCRT_strncat -+@ cdecl strncat_s(str long str long) MSVCRT_strncat_s -+@ cdecl strncmp(str str long) MSVCRT_strncmp -+@ cdecl strncpy(ptr str long) MSVCRT_strncpy -+@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s -+@ cdecl strnlen(str long) MSVCRT_strnlen -+@ cdecl strpbrk(str str) ntdll.strpbrk -+@ cdecl strrchr(str long) MSVCRT_strrchr -+@ cdecl strspn(str str) ntdll.strspn -+@ cdecl strstr(str str) MSVCRT_strstr -+@ cdecl strtod(str ptr) MSVCRT_strtod -+@ stub strtof -+@ stub strtoimax -+@ cdecl strtok(str str) MSVCRT_strtok -+@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -+@ cdecl strtol(str ptr long) MSVCRT_strtol -+@ stub strtold -+@ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 -+@ cdecl strtoul(str ptr long) MSVCRT_strtoul -+@ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -+@ stub strtoumax -+@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm -+@ cdecl system(str) MSVCRT_system -+@ cdecl tan(double) MSVCRT_tan -+@ cdecl tanh(double) MSVCRT_tanh -+@ stub terminate -+@ stub tgamma -+@ stub tgammaf -+@ stub tgammal -+@ cdecl tmpfile() MSVCRT_tmpfile -+@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s -+@ cdecl tmpnam(ptr) MSVCRT_tmpnam -+@ stub tmpnam_s -+@ cdecl tolower(long) MSVCRT_tolower -+@ cdecl toupper(long) MSVCRT_toupper -+@ stub towctrans -+@ cdecl towlower(long) MSVCRT_towlower -+@ cdecl towupper(long) MSVCRT_towupper -+@ cdecl trunc(double) MSVCR120_trunc -+@ cdecl truncf(float) MSVCR120_truncf -+@ cdecl truncl(double) MSVCR120_truncl -+@ stub unexpected -+@ cdecl ungetc(long ptr) MSVCRT_ungetc -+@ cdecl ungetwc(long ptr) MSVCRT_ungetwc -+@ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb -+@ stub wcrtomb_s -+@ cdecl wcscat(wstr wstr) ntdll.wcscat -+@ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s -+@ cdecl wcschr(wstr long) MSVCRT_wcschr -+@ cdecl wcscmp(wstr wstr) ntdll.wcscmp -+@ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll -+@ cdecl wcscpy(ptr wstr) ntdll.wcscpy -+@ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s -+@ cdecl wcscspn(wstr wstr) ntdll.wcscspn -+@ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime -+@ cdecl wcslen(wstr) MSVCRT_wcslen -+@ cdecl wcsncat(wstr wstr long) ntdll.wcsncat -+@ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s -+@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp -+@ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy -+@ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s -+@ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen -+@ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -+@ cdecl wcsrchr(wstr long) ntdll.wcsrchr -+@ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs -+@ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s -+@ cdecl wcsspn(wstr wstr) ntdll.wcsspn -+@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr -+@ cdecl wcstod(wstr ptr) MSVCRT_wcstod -+@ stub wcstof -+@ stub wcstoimax -+@ cdecl wcstok(wstr wstr) MSVCRT_wcstok -+@ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -+@ cdecl wcstol(wstr ptr long) ntdll.wcstol -+@ stub wcstold -+@ stub wcstoll -+@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs -+@ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s -+@ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul -+@ stub wcstoull -+@ stub wcstoumax -+@ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm -+@ cdecl wctob(long) MSVCRT_wctob -+@ cdecl wctomb(ptr long) MSVCRT_wctomb -+@ cdecl wctomb_s(ptr ptr long long) MSVCRT_wctomb_s -+@ stub wctrans -+@ stub wctype -+@ cdecl wmemcpy_s(ptr long ptr long) -+@ cdecl wmemmove_s(ptr long ptr long) --- -2.5.0 - diff --git a/patches/api-ms-win-crt-Stub_DLLs/0002-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch b/patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch similarity index 77% rename from patches/api-ms-win-crt-Stub_DLLs/0002-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch rename to patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch index e45dc4cc..ca87fa94 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0002-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch @@ -1,4 +1,4 @@ -From a8d6331370eb45eef60eb3348e342288344fa622 Mon Sep 17 00:00:00 2001 +From 15ae58e5e7a33fa53a1dcb66e916d747db8a09d2 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:01 +0300 Subject: ucrtbase: Hook up some functions with new names to existing @@ -7,14 +7,14 @@ Subject: ucrtbase: Hook up some functions with new names to existing These are some functions that on a first glance seem to have a matching signature even though the name has changed. --- - dlls/ucrtbase/ucrtbase.spec | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) + dlls/ucrtbase/ucrtbase.spec | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec -index a1be10d..bcbfeaa 100644 +index d6516d7..a7a7718 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec -@@ -203,7 +203,7 @@ +@@ -211,7 +211,7 @@ @ cdecl _c_exit() MSVCRT__c_exit @ cdecl _cabs(long) MSVCRT__cabs @ cdecl _callnewh(long) @@ -23,7 +23,7 @@ index a1be10d..bcbfeaa 100644 @ cdecl _cexit() MSVCRT__cexit @ cdecl _cgets(ptr) @ stub _cgets_s -@@ -233,7 +233,7 @@ +@@ -241,7 +241,7 @@ @ cdecl _creat(str long) MSVCRT__creat @ cdecl _create_locale(long str) MSVCRT__create_locale @ stub _crt_at_quick_exit @@ -32,7 +32,7 @@ index a1be10d..bcbfeaa 100644 @ stub _crt_debugger_hook @ cdecl _ctime32(ptr) MSVCRT__ctime32 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s -@@ -323,7 +323,7 @@ +@@ -333,7 +333,7 @@ @ cdecl _fputwchar(long) MSVCRT__fputwchar @ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s @@ -41,7 +41,7 @@ index a1be10d..bcbfeaa 100644 @ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 -@@ -566,7 +566,7 @@ +@@ -580,7 +580,7 @@ @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s @@ -50,7 +50,7 @@ index a1be10d..bcbfeaa 100644 @ cdecl _mbbtombc(long) @ stub _mbbtombc_l @ cdecl _mbbtype(long long) -@@ -1842,16 +1842,15 @@ +@@ -1881,15 +1881,15 @@ @ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl -arch=i386 _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_abort_behavior(long long) MSVCRT__set_abort_behavior @@ -62,14 +62,13 @@ index a1be10d..bcbfeaa 100644 @ cdecl _set_error_mode(long) @ cdecl _set_fmode(long) MSVCRT__set_fmode @ cdecl _set_invalid_parameter_handler(ptr) --@ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned int) --@ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z # int(__cdecl*__cdecl _set_new_handler(int))(unsigned __int64) +-@ stub _set_new_handler -@ stub _set_new_mode +@ cdecl _set_new_handler(ptr) MSVCRT_set_new_handler +@ cdecl _set_new_mode(long) MSVCRT__set_new_mode @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_purecall_handler(ptr) - @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z # void(__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *) + @ stub _set_se_translator -- 2.5.0 diff --git a/patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch b/patches/api-ms-win-crt-Stub_DLLs/0002-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch similarity index 97% rename from patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch rename to patches/api-ms-win-crt-Stub_DLLs/0002-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch index e501de78..e68407aa 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0002-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch @@ -1,4 +1,4 @@ -From 4c5f9bb07041f41bae05c4e6487f0ba6a5456099 Mon Sep 17 00:00:00 2001 +From 5bf6e56850354195aec9ec1146e3f82a0b2bcfdb Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:02 +0300 Subject: vcruntime140: Add the new MSVC 2015 compiler specific DLL. @@ -20,10 +20,10 @@ msvcrt. create mode 100644 dlls/vcruntime140/vcruntime140.spec diff --git a/configure.ac b/configure.ac -index 0a93a00..e6817bb 100644 +index ed1052c..16d87ac 100644 --- a/configure.ac +++ b/configure.ac -@@ -3327,6 +3327,7 @@ WINE_CONFIG_TEST(dlls/vcomp/tests) +@@ -3328,6 +3328,7 @@ WINE_CONFIG_TEST(dlls/vcomp/tests) WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vcomp110) WINE_CONFIG_DLL(vcomp90) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0004-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch b/patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch similarity index 93% rename from patches/api-ms-win-crt-Stub_DLLs/0004-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch rename to patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch index 07452d01..29aff82c 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0004-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch @@ -1,4 +1,4 @@ -From af073a4d16fe89994017690db5a719940e66534b Mon Sep 17 00:00:00 2001 +From 3d3dd8491369119ee0dea8ec571b917f8613910a Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:03 +0300 Subject: vcruntime140: Hook up a function with a new name to the existing diff --git a/patches/api-ms-win-crt-Stub_DLLs/0005-ucrtbase-Add-stub-functions-for-narrow-environment.patch b/patches/api-ms-win-crt-Stub_DLLs/0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch similarity index 94% rename from patches/api-ms-win-crt-Stub_DLLs/0005-ucrtbase-Add-stub-functions-for-narrow-environment.patch rename to patches/api-ms-win-crt-Stub_DLLs/0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch index adbb7931..f7daa14b 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0005-ucrtbase-Add-stub-functions-for-narrow-environment.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch @@ -1,4 +1,4 @@ -From dd7c7b7b6225700204da16f150524c2fbe4f1536 Mon Sep 17 00:00:00 2001 +From f06ecd78dedb3c2beaa5f36a812ee78afa04ec74 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:04 +0300 Subject: ucrtbase: Add stub functions for narrow environment @@ -47,10 +47,10 @@ index e6989f1..7b6216d 100644 + return 0; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec -index bcbfeaa..1ab1d7b 100644 +index a7a7718..0f2a082 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec -@@ -221,7 +221,7 @@ +@@ -229,7 +229,7 @@ @ cdecl _close(long) MSVCRT__close @ cdecl _commit(long) MSVCRT__commit @ cdecl _configthreadlocale(long) @@ -59,7 +59,7 @@ index bcbfeaa..1ab1d7b 100644 @ stub _configure_wide_argv @ cdecl _control87(long long) @ cdecl _controlfp(long long) -@@ -354,7 +354,7 @@ +@@ -365,7 +365,7 @@ @ cdecl _get_errno(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @ cdecl _get_heap_handle() @@ -68,7 +68,7 @@ index bcbfeaa..1ab1d7b 100644 @ stub _get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() @ stub _get_narrow_winmain_command_line -@@ -407,7 +407,7 @@ +@@ -418,7 +418,7 @@ @ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s diff --git a/patches/api-ms-win-crt-Stub_DLLs/0006-vcruntime140-Add-stubs-for-telemetry-functions.patch b/patches/api-ms-win-crt-Stub_DLLs/0005-vcruntime140-Add-stubs-for-telemetry-functions.patch similarity index 96% rename from patches/api-ms-win-crt-Stub_DLLs/0006-vcruntime140-Add-stubs-for-telemetry-functions.patch rename to patches/api-ms-win-crt-Stub_DLLs/0005-vcruntime140-Add-stubs-for-telemetry-functions.patch index 584eb1c7..ec925cb5 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0006-vcruntime140-Add-stubs-for-telemetry-functions.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0005-vcruntime140-Add-stubs-for-telemetry-functions.patch @@ -1,4 +1,4 @@ -From 8addd3884ce995b5d993a701ca5e1384fc234531 Mon Sep 17 00:00:00 2001 +From 00e2e0a38d5ef81502d35a5aa3f62cb4ed834488 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:05 +0300 Subject: vcruntime140: Add stubs for telemetry functions diff --git a/patches/api-ms-win-crt-Stub_DLLs/0007-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch b/patches/api-ms-win-crt-Stub_DLLs/0006-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch similarity index 93% rename from patches/api-ms-win-crt-Stub_DLLs/0007-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch rename to patches/api-ms-win-crt-Stub_DLLs/0006-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch index 66e32b3b..cd08e85b 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0007-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0006-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch @@ -1,4 +1,4 @@ -From 5041ce059770502a5d39223adaf2413475f201ec Mon Sep 17 00:00:00 2001 +From b47092c85b03f1cbea95408f7472587c0ad93253 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:06 +0300 Subject: make_specfiles: Use cdecl for stub redirects to ucrtbase, just like diff --git a/patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0007-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch similarity index 97% rename from patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0007-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch index 1de3ccac..385fd86c 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0007-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 242996c2824aca4beea47e9f7c2fb698a0fc5386 Mon Sep 17 00:00:00 2001 +From d62f0baa87e0b93524f0b74dadbd050210b17a42 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:07 +0300 Subject: api-ms-win-crt-conio-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-conio-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-conio-l1-1-0/api-ms-win-crt-conio-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index e6817bb..a1f38d6 100644 +index 16d87ac..f414a6d 100644 --- a/configure.ac +++ b/configure.ac @@ -2755,6 +2755,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch similarity index 98% rename from patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch index 89daba2a..71bb69fc 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From c47fba8bb1e415834128dc16d812b222eacc087b Mon Sep 17 00:00:00 2001 +From d6d651c0b25aab5d5a0dbb712e94868fbae067ae Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:08 +0300 Subject: api-ms-win-crt-convert-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-convert-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index a1f38d6..6cf2939 100644 +index f414a6d..2b1e683 100644 --- a/configure.ac +++ b/configure.ac @@ -2756,6 +2756,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch similarity index 96% rename from patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch index 5cc493de..2c3b6fa9 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 590d6ec37998f47cf3db2dc1c946d79942a81eb7 Mon Sep 17 00:00:00 2001 +From 43151558574497be780735559f3c5117f8eef890 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:09 +0300 Subject: api-ms-win-crt-environment-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-environment-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-environment-l1-1-0/api-ms-win-crt-environment-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 6cf2939..73188cf 100644 +index 2b1e683..126bc4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2757,6 +2757,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch similarity index 98% rename from patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch index 98bcab84..92543e78 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From fa2b9196dae1cfe2ab52803bdc1704c504a4e2dc Mon Sep 17 00:00:00 2001 +From 9d5d1c6825e39a3f06b71a4aa4fd2c908526d255 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:10 +0300 Subject: api-ms-win-crt-filesystem-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-filesystem-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-filesystem-l1-1-0/api-ms-win-crt-filesystem-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 73188cf..47abb05 100644 +index 126bc4e..f6fc051 100644 --- a/configure.ac +++ b/configure.ac @@ -2758,6 +2758,7 @@ WINE_CONFIG_DLL(api-ms-win-core-xstate-l2-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch similarity index 97% rename from patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch index 13539e9f..4cdb6afc 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 3c9db1f1b8250c38cd78d6eee4167effb93fe9b3 Mon Sep 17 00:00:00 2001 +From 50f23a4a1e8385d13628dc40b4f59bd6c3a92800 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:11 +0300 Subject: api-ms-win-crt-heap-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-heap-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 47abb05..f439add 100644 +index f6fc051..625547e 100644 --- a/configure.ac +++ b/configure.ac @@ -2759,6 +2759,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-conio-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch similarity index 96% rename from patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch index dff2139d..f753b495 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From e9a3823a4db6c5eae002c677558e78c5f7005496 Mon Sep 17 00:00:00 2001 +From c5b365b792e1bec24faefd423436862a6867483a Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:12 +0300 Subject: api-ms-win-crt-locale-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-locale-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index f439add..93e34b8 100644 +index 625547e..458a7e4 100644 --- a/configure.ac +++ b/configure.ac @@ -2760,6 +2760,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-convert-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch similarity index 99% rename from patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch index 9acfcafd..56be44a1 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 92e21c2e69ec3cfc88c1dfe1d92dcbfd5b901f71 Mon Sep 17 00:00:00 2001 +From d9f8a6f3b575b2b3ac3a35f6a4d978b7dd7a5730 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:13 +0300 Subject: api-ms-win-crt-math-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-math-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 93e34b8..c06487e 100644 +index 458a7e4..1ee611f 100644 --- a/configure.ac +++ b/configure.ac @@ -2761,6 +2761,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-environment-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch similarity index 98% rename from patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch index 5674e736..5848c98c 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 6793be9a3e812303ef1cd40d7236894fa08a6f66 Mon Sep 17 00:00:00 2001 +From dee2c12b995d7cdf2d0779711c163641b447a049 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:14 +0300 Subject: api-ms-win-crt-multibyte-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-multibyte-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index c06487e..3484091 100644 +index 1ee611f..b9855ed 100644 --- a/configure.ac +++ b/configure.ac @@ -2762,6 +2762,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-filesystem-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch similarity index 99% rename from patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch index 7077b149..6353889f 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 665dd4d94ddfcd0459994baf2945303725294989 Mon Sep 17 00:00:00 2001 +From 746c7b93c8618fcbb3d085ff34bc527f20741fb2 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:15 +0300 Subject: api-ms-win-crt-private-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-private-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 3484091..9cf2158 100644 +index b9855ed..2853538 100644 --- a/configure.ac +++ b/configure.ac @@ -2763,6 +2763,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-heap-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch similarity index 97% rename from patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch index 12ceeca3..b97de430 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From f2f8aed4e38d19d33a63ce843b452fb88471a889 Mon Sep 17 00:00:00 2001 +From 8e63ecbc4889eaa894e550bbb1e2ac804269de67 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:16 +0300 Subject: api-ms-win-crt-process-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-process-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-process-l1-1-0/api-ms-win-crt-process-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 9cf2158..f35ab71 100644 +index 2853538..2560994 100644 --- a/configure.ac +++ b/configure.ac @@ -2764,6 +2764,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-locale-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch similarity index 98% rename from patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch index 4f955592..d8df4179 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 20be096fcfa0ffaba988ab4eb6fad318c4a0f046 Mon Sep 17 00:00:00 2001 +From cc7ad5c0a1b87dae7fbb3e73c2c1605d68970d8d Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:17 +0300 Subject: api-ms-win-crt-runtime-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-runtime-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index f35ab71..0b2be08 100644 +index 2560994..6f36334 100644 --- a/configure.ac +++ b/configure.ac @@ -2765,6 +2765,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-math-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch similarity index 98% rename from patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch index 29284aee..b5097e39 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 9c9b81b04f69cb93f948ba6d7e6ad8dc85bc0604 Mon Sep 17 00:00:00 2001 +From 7ef77c382d1ac0a07b8c8ce575d01d43cec4975b Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:18 +0300 Subject: api-ms-win-crt-stdio-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-stdio-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 0b2be08..f39153e 100644 +index 6f36334..4aeed6c 100644 --- a/configure.ac +++ b/configure.ac @@ -2766,6 +2766,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-multibyte-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch similarity index 99% rename from patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch index 398ce277..7daad87d 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From fedde420b260fdbc99453d09474ce61db3be2acb Mon Sep 17 00:00:00 2001 +From 416258ddf02da79531a2f55683bcc988072cfdb5 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:19 +0300 Subject: api-ms-win-crt-string-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-string-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index f39153e..5d52949 100644 +index 4aeed6c..1ed138f 100644 --- a/configure.ac +++ b/configure.ac @@ -2767,6 +2767,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-private-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch similarity index 98% rename from patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch index 1ea094b2..9473c5e3 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From 140404f0112b83949a5665e989388cd2403f558c Mon Sep 17 00:00:00 2001 +From 1498586964a9b0652620a4d37f6cb80fd15e63eb Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:20 +0300 Subject: api-ms-win-crt-time-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-time-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 5d52949..b826d63 100644 +index 1ed138f..d31086b 100644 --- a/configure.ac +++ b/configure.ac @@ -2768,6 +2768,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-process-l1-1-0) diff --git a/patches/api-ms-win-crt-Stub_DLLs/0022-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch b/patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch similarity index 97% rename from patches/api-ms-win-crt-Stub_DLLs/0022-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch rename to patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch index 3a4e5a9c..b48e5e7a 100644 --- a/patches/api-ms-win-crt-Stub_DLLs/0022-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch +++ b/patches/api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From aa62f276c14b80649d60d9c25f84d1a242758f4a Mon Sep 17 00:00:00 2001 +From 2f7c095d927cb3d84ad47fdd74e5c0f7c9579d4d Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 3 Aug 2015 22:26:21 +0300 Subject: api-ms-win-crt-utility-l1-1-0: Add stub dll. @@ -13,7 +13,7 @@ Subject: api-ms-win-crt-utility-l1-1-0: Add stub dll. create mode 100644 dlls/api-ms-win-crt-utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index b826d63..9bb0a22 100644 +index d31086b..2a1dcd2 100644 --- a/configure.ac +++ b/configure.ac @@ -2769,6 +2769,7 @@ WINE_CONFIG_DLL(api-ms-win-crt-runtime-l1-1-0) diff --git a/patches/d3dx9_36-DDS/0001-d3dx9_36-Fix-several-issues-in-save_dds_surface_to_m.patch b/patches/d3dx9_36-DDS/0001-d3dx9_36-Fix-several-issues-in-save_dds_surface_to_m.patch index 2985a514..e2b2c40d 100644 --- a/patches/d3dx9_36-DDS/0001-d3dx9_36-Fix-several-issues-in-save_dds_surface_to_m.patch +++ b/patches/d3dx9_36-DDS/0001-d3dx9_36-Fix-several-issues-in-save_dds_surface_to_m.patch @@ -1,4 +1,4 @@ -From 85bb1e11795df868ab19f6b40b07036f2922eba4 Mon Sep 17 00:00:00 2001 +From 226f9f6bd5622c18ec4ab78f3b71ef205a550d16 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sun, 11 Jan 2015 16:09:43 +0100 Subject: d3dx9_36: Fix several issues in save_dds_surface_to_memory. @@ -9,22 +9,13 @@ The different fixes are: - Fix DDS_WIDTH define to correct value 4 - Do not set depth and miplevels fields as their flags are not set (to match native) --- - dlls/d3dx9_36/surface.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) + dlls/d3dx9_36/surface.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c -index f187031..ae10adc 100644 +index b8bb710..6f6132c 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c -@@ -77,7 +77,7 @@ static const GUID *d3dformat_to_wic_guid(D3DFORMAT format) - /* dds_header.flags */ - #define DDS_CAPS 0x1 - #define DDS_HEIGHT 0x2 --#define DDS_WIDTH 0x2 -+#define DDS_WIDTH 0x4 - #define DDS_PITCH 0x8 - #define DDS_PIXELFORMAT 0x1000 - #define DDS_MIPMAPCOUNT 0x20000 @@ -487,13 +487,12 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur memset(header, 0, sizeof(*header)); @@ -43,5 +34,5 @@ index f187031..ae10adc 100644 hr = d3dformat_to_dds_pixel_format(&header->pixel_format, src_desc.Format); if (FAILED(hr)) -- -2.2.1 +2.5.0 diff --git a/patches/notepad-New_File/0001-notepad-Make-sure-new-files-are-created-immediately.patch b/patches/notepad-New_File/0001-notepad-Make-sure-new-files-are-created-immediately.patch deleted file mode 100644 index daeb04a8..00000000 --- a/patches/notepad-New_File/0001-notepad-Make-sure-new-files-are-created-immediately.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 391fff4e34db1ea266bf5abcfffb81f0ce127eb7 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 22 Aug 2015 21:59:22 +0200 -Subject: notepad: Make sure new files are created immediately. - ---- - programs/notepad/main.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/programs/notepad/main.c b/programs/notepad/main.c -index 480f866..20e887b 100644 ---- a/programs/notepad/main.c -+++ b/programs/notepad/main.c -@@ -702,9 +702,18 @@ static void HandleCommandLine(LPWSTR cmdline) - { - switch (AlertFileDoesNotExist(file_name)) { - case IDYES: -+ { -+ -+ HANDLE file; - SetFileNameAndEncoding(file_name, ENCODING_ANSI); -+ -+ file = CreateFileW(file_name, GENERIC_WRITE, FILE_SHARE_WRITE, -+ NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); -+ if (file != INVALID_HANDLE_VALUE) CloseHandle(file); -+ - UpdateWindowCaption(); - break; -+ } - - case IDNO: - break; --- -2.5.0 - diff --git a/patches/notepad-New_File/definition b/patches/notepad-New_File/definition deleted file mode 100644 index 530d2592..00000000 --- a/patches/notepad-New_File/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [19425] Notepad should create new files immediately diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 2489f5cb..6a01a009 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -55,7 +55,7 @@ version() echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" - echo " commit 6038e2ab7957b65dd2e13ddd414c206718fb14b7" + echo " commit bdaa571c5d7dd59dd28fd1f25cdad5761bfaf4dd" echo "" } @@ -159,7 +159,6 @@ patch_enable_all () enable_msvcrt_Math_Precision="$1" enable_msvcrt_StdHandle_RefCount="$1" enable_msvfw32_Image_Size="$1" - enable_notepad_New_File="$1" enable_ntdll_APC_Performance="$1" enable_ntdll_APC_Start_Process="$1" enable_ntdll_Activation_Context="$1" @@ -568,9 +567,6 @@ patch_enable () msvfw32-Image_Size) enable_msvfw32_Image_Size="$2" ;; - notepad-New_File) - enable_notepad_New_File="$2" - ;; ntdll-APC_Performance) enable_ntdll_APC_Performance="$2" ;; @@ -2153,34 +2149,32 @@ fi # | crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec, dlls/api-ms-win-crt-string-l1-1-0/Makefile.in, dlls/api-ms-win-crt- # | string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec, dlls/api-ms-win-crt-time-l1-1-0/Makefile.in, dlls/api-ms-win-crt- # | time-l1-1-0/api-ms-win-crt-time-l1-1-0.spec, dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in, dlls/api-ms-win-crt- -# | utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec, dlls/msvcrt/data.c, dlls/msvcrt/misc.c, dlls/ucrtbase/Makefile.in, -# | dlls/ucrtbase/ucrtbase.spec, dlls/vcruntime140/Makefile.in, dlls/vcruntime140/vcruntime140.spec, tools/make_specfiles +# | utility-l1-1-0/api-ms-win-crt-utility-l1-1-0.spec, dlls/msvcrt/data.c, dlls/msvcrt/misc.c, dlls/ucrtbase/ucrtbase.spec, +# | dlls/vcruntime140/Makefile.in, dlls/vcruntime140/vcruntime140.spec, tools/make_specfiles # | if test "$enable_api_ms_win_crt_Stub_DLLs" -eq 1; then - patch_apply api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Add-the-new-universal-CRT-DLL.patch - patch_apply api-ms-win-crt-Stub_DLLs/0002-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch - patch_apply api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch - patch_apply api-ms-win-crt-Stub_DLLs/0004-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch - patch_apply api-ms-win-crt-Stub_DLLs/0005-ucrtbase-Add-stub-functions-for-narrow-environment.patch - patch_apply api-ms-win-crt-Stub_DLLs/0006-vcruntime140-Add-stubs-for-telemetry-functions.patch - patch_apply api-ms-win-crt-Stub_DLLs/0007-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch - patch_apply api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch - patch_apply api-ms-win-crt-Stub_DLLs/0022-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch + patch_apply api-ms-win-crt-Stub_DLLs/0002-vcruntime140-Add-the-new-MSVC-2015-compiler-specific.patch + patch_apply api-ms-win-crt-Stub_DLLs/0003-vcruntime140-Hook-up-a-function-with-a-new-name-to-t.patch + patch_apply api-ms-win-crt-Stub_DLLs/0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch + patch_apply api-ms-win-crt-Stub_DLLs/0005-vcruntime140-Add-stubs-for-telemetry-functions.patch + patch_apply api-ms-win-crt-Stub_DLLs/0006-make_specfiles-Use-cdecl-for-stub-redirects-to-ucrtb.patch + patch_apply api-ms-win-crt-Stub_DLLs/0007-api-ms-win-crt-conio-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0008-api-ms-win-crt-convert-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0009-api-ms-win-crt-environment-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0010-api-ms-win-crt-filesystem-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0011-api-ms-win-crt-heap-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0012-api-ms-win-crt-locale-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0013-api-ms-win-crt-math-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0014-api-ms-win-crt-multibyte-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0015-api-ms-win-crt-private-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0016-api-ms-win-crt-process-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0017-api-ms-win-crt-runtime-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0018-api-ms-win-crt-stdio-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0019-api-ms-win-crt-string-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0020-api-ms-win-crt-time-l1-1-0-Add-stub-dll.patch + patch_apply api-ms-win-crt-Stub_DLLs/0021-api-ms-win-crt-utility-l1-1-0-Add-stub-dll.patch ( - echo '+ { "Martin Storsjo", "ucrtbase: Add the new universal CRT DLL.", 1 },'; echo '+ { "Martin Storsjo", "ucrtbase: Hook up some functions with new names to existing implementations.", 1 },'; echo '+ { "Martin Storsjo", "vcruntime140: Add the new MSVC 2015 compiler specific DLL.", 1 },'; echo '+ { "Martin Storsjo", "vcruntime140: Hook up a function with a new name to the existing implementation.", 1 },'; @@ -3589,21 +3583,6 @@ if test "$enable_msvfw32_Image_Size" -eq 1; then ) >> "$patchlist" fi -# Patchset notepad-New_File -# | -# | This patchset fixes the following Wine bugs: -# | * [#19425] Notepad should create new files immediately -# | -# | Modified files: -# | * programs/notepad/main.c -# | -if test "$enable_notepad_New_File" -eq 1; then - patch_apply notepad-New_File/0001-notepad-Make-sure-new-files-are-created-immediately.patch - ( - echo '+ { "Sebastian Lackner", "notepad: Make sure new files are created immediately.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-APC_Performance # | # | Modified files: @@ -5989,9 +5968,6 @@ fi # Patchset wininet-Cleanup # | -# | This patchset fixes the following Wine bugs: -# | * [#28911] Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest -# | # | Modified files: # | * dlls/wininet/http.c, dlls/wininet/tests/http.c # | @@ -5999,18 +5975,12 @@ if test "$enable_wininet_Cleanup" -eq 1; then patch_apply wininet-Cleanup/0001-wininet-tests-Add-more-tests-for-cookies.patch patch_apply wininet-Cleanup/0002-wininet-tests-Test-auth-credential-reusage-with-host.patch patch_apply wininet-Cleanup/0003-wininet-tests-Check-cookie-behaviour-when-overriding.patch - patch_apply wininet-Cleanup/0004-wininet-Delay-setting-the-http-host-header.patch - patch_apply wininet-Cleanup/0005-wininet-Use-request-server-canon_host_port-in-authen.patch - patch_apply wininet-Cleanup/0006-wininet-Use-request-server-canon_host_port-when-quer.patch - patch_apply wininet-Cleanup/0007-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch - patch_apply wininet-Cleanup/0008-wininet-Replacing-header-fields-should-fail-if-they-.patch + patch_apply wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch + patch_apply wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch ( echo '+ { "Michael Müller", "wininet/tests: Add more tests for cookies.", 1 },'; echo '+ { "Michael Müller", "wininet/tests: Test auth credential reusage with host override.", 1 },'; echo '+ { "Michael Müller", "wininet/tests: Check cookie behaviour when overriding host.", 1 },'; - echo '+ { "Michael Müller", "wininet: Delay setting the http host header.", 1 },'; - echo '+ { "Michael Müller", "wininet: Use request->server->canon_host_port in authentication process.", 1 },'; - echo '+ { "Michael Müller", "wininet: Use request->server->canon_host_port when querying for INTERNET_OPTION_URL.", 1 },'; echo '+ { "Michael Müller", "wininet: Strip filename if no path is set in cookie.", 1 },'; echo '+ { "Michael Müller", "wininet: Replacing header fields should fail if they do not exist yet.", 1 },'; ) >> "$patchlist" diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index a5173793..898d61ae 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -7760,7 +7760,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } /* Read the framebuffer contents into a texture. Note that this function -@@ -2845,6 +3615,85 @@ +@@ -2858,6 +3628,85 @@ } } @@ -7846,7 +7846,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c /* Does a direct frame buffer -> texture copy. Stretching is done with single * pixel copy calls. */ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, -@@ -2951,8 +3800,13 @@ +@@ -2964,8 +3813,13 @@ /* The texture is now most up to date - If the surface is a render target * and has a drawable, this path is never entered. */ @@ -7860,7 +7860,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } /* Uses the hardware to stretch and flip the image */ -@@ -3020,7 +3874,11 @@ +@@ -3033,7 +3887,11 @@ checkGLcall("glEnable(texture_target)"); /* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */ @@ -7872,7 +7872,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag -@@ -3217,6 +4075,7 @@ +@@ -3230,6 +4088,7 @@ checkGLcall("glDeleteTextures(1, &backup)"); } @@ -7880,7 +7880,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (wined3d_settings.cs_multithreaded) gl_info->gl_ops.gl.p_glFinish(); else if (wined3d_settings.strict_draw_ordering) -@@ -3228,6 +4087,17 @@ +@@ -3241,6 +4100,17 @@ * and has a drawable, this path is never entered. */ wined3d_resource_validate_location(&dst_surface->resource, WINED3D_LOCATION_TEXTURE_RGB); wined3d_resource_invalidate_location(&dst_surface->resource, ~WINED3D_LOCATION_TEXTURE_RGB); @@ -7898,7 +7898,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } /* Front buffer coordinates are always full screen coordinates, but our GL -@@ -3258,6 +4128,7 @@ +@@ -3271,6 +4141,7 @@ rect->bottom = drawable_height - rect->bottom; } @@ -7906,7 +7906,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c /* Context activation is done by the caller. */ static void surface_blt_to_drawable(const struct wined3d_device *device, struct wined3d_context *old_ctx, -@@ -3292,6 +4163,26 @@ +@@ -3305,6 +4176,26 @@ /* Make sure the surface is up-to-date. This should probably use * wined3d_resource_load_location() and worry about the destination * surface too, unless we're overwriting it completely. */ @@ -7933,7 +7933,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c wined3d_texture_load(src_surface->container, context, FALSE); /* Activate the destination context, set it up for blitting */ -@@ -3334,6 +4225,7 @@ +@@ -3347,6 +4238,7 @@ /* Leave the opengl state valid for blitting */ device->blitter->unset_shader(context->gl_info); @@ -7941,7 +7941,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (wined3d_settings.cs_multithreaded) gl_info->gl_ops.gl.p_glFinish(); else if (wined3d_settings.strict_draw_ordering -@@ -3347,6 +4239,14 @@ +@@ -3360,6 +4252,14 @@ context = context_acquire(device, restore_rt); context_release(context); } @@ -7956,7 +7956,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) -@@ -3370,8 +4270,13 @@ +@@ -3383,8 +4283,13 @@ enum wined3d_texture_filter_type filter) { struct wined3d_device *device = dst_surface->resource.device; @@ -7970,7 +7970,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, blt_fx %p, filter %s.\n", dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), -@@ -3562,6 +4467,7 @@ +@@ -3575,6 +4480,7 @@ { TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h); @@ -7978,7 +7978,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (((surface->resource.locations & WINED3D_LOCATION_TEXTURE_RGB) && !(location & WINED3D_LOCATION_TEXTURE_RGB)) || (!(surface->resource.locations & WINED3D_LOCATION_TEXTURE_RGB) && (location & WINED3D_LOCATION_TEXTURE_RGB))) -@@ -3570,6 +4476,15 @@ +@@ -3583,6 +4489,15 @@ surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; surface->resource.locations = location; @@ -7994,7 +7994,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } /* Context activation is done by the caller. */ -@@ -3584,7 +4499,11 @@ +@@ -3597,7 +4512,11 @@ /* TODO: Make this work for modes other than FBO */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) return; @@ -8006,7 +8006,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c { w = surface->ds_current_size.cx; h = surface->ds_current_size.cy; -@@ -3610,7 +4529,11 @@ +@@ -3623,7 +4542,11 @@ return; } @@ -8018,7 +8018,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c { TRACE("Surface was discarded, no need copy data.\n"); switch (location) -@@ -3630,6 +4553,7 @@ +@@ -3643,6 +4566,7 @@ default: FIXME("Unhandled location %#x\n", location); } @@ -8026,7 +8026,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c surface->resource.locations &= ~WINED3D_LOCATION_DISCARDED; surface->resource.locations |= location; surface->ds_current_size.cx = surface->resource.width; -@@ -3641,6 +4565,19 @@ +@@ -3654,6 +4578,19 @@ { FIXME("No up to date depth stencil location.\n"); surface->resource.locations |= location; @@ -8046,7 +8046,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c surface->ds_current_size.cx = surface->resource.width; surface->ds_current_size.cy = surface->resource.height; return; -@@ -3705,9 +4642,13 @@ +@@ -3718,9 +4655,13 @@ context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -8060,7 +8060,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ } else if (location == WINED3D_LOCATION_DRAWABLE) -@@ -3723,9 +4664,13 @@ +@@ -3736,9 +4677,13 @@ context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -8074,7 +8074,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ } else -@@ -3733,6 +4678,7 @@ +@@ -3746,6 +4691,7 @@ ERR("Invalid location (%#x) specified.\n", location); } @@ -8082,7 +8082,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c surface->resource.locations |= location; surface->ds_current_size.cx = surface->resource.width; surface->ds_current_size.cy = surface->resource.height; -@@ -3778,6 +4724,135 @@ +@@ -3791,6 +4737,135 @@ TRACE("Surface was discarded, nothing to do.\n"); return WINED3D_OK; } @@ -8218,7 +8218,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && wined3d_resource_is_offscreen(&surface->container->resource)) -@@ -3787,6 +4862,7 @@ +@@ -3800,6 +4875,7 @@ } surface_get_rect(surface, NULL, &r); @@ -8226,7 +8226,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c wined3d_resource_load_location(&surface->resource, context, WINED3D_LOCATION_TEXTURE_RGB); surface_blt_to_drawable(surface->resource.device, context, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); -@@ -3855,6 +4931,66 @@ +@@ -3868,6 +4944,66 @@ RECT rect = {0, 0, surface->resource.width, surface->resource.height}; surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, @@ -8293,7 +8293,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c &rect, surface, dst_location, &rect); return WINED3D_OK; -@@ -3864,6 +5000,7 @@ +@@ -3877,6 +5013,7 @@ if (srgb) { @@ -8301,7 +8301,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if ((surface->resource.locations & (WINED3D_LOCATION_TEXTURE_RGB | surface->resource.map_binding)) == WINED3D_LOCATION_TEXTURE_RGB) { -@@ -3898,6 +5035,45 @@ +@@ -3911,6 +5048,45 @@ width = surface->resource.width; wined3d_resource_get_pitch(&surface->resource, &src_row_pitch, &src_slice_pitch); @@ -8347,7 +8347,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) -@@ -3906,7 +5082,11 @@ +@@ -3919,7 +5095,11 @@ /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ @@ -8359,7 +8359,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c { TRACE("Removing the pbo attached to surface %p.\n", surface); -@@ -3915,6 +5095,7 @@ +@@ -3928,6 +5108,7 @@ else surface->resource.map_binding = WINED3D_LOCATION_SYSMEM; @@ -8367,7 +8367,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c wined3d_resource_prepare_map_memory(&surface->resource, context); wined3d_resource_load_location(&surface->resource, context, surface->resource.map_binding); wined3d_resource_free_bo(&surface->resource); -@@ -3922,6 +5103,14 @@ +@@ -3935,6 +5116,14 @@ } wined3d_resource_get_memory(&surface->resource, surface->resource.locations, &data); @@ -8382,7 +8382,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (format.convert) { /* This code is entered for texture formats which need a fixup. */ -@@ -3936,9 +5125,15 @@ +@@ -3949,9 +5138,15 @@ context_release(context); return E_OUTOFMEMORY; } @@ -8398,7 +8398,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c data.addr = mem; } else if (conversion) -@@ -3958,6 +5153,7 @@ +@@ -3971,6 +5166,7 @@ } if (texture->swapchain && texture->swapchain->palette) palette = texture->swapchain->palette; @@ -8406,7 +8406,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c conversion->convert(data.addr, src_row_pitch, mem, dst_pitch, width, height, palette, &texture->async.gl_color_key); src_row_pitch = dst_pitch; -@@ -3990,6 +5186,40 @@ +@@ -4003,6 +5199,40 @@ struct wined3d_context *context, DWORD location) { struct wined3d_surface *surface = surface_from_resource(resource); @@ -8447,7 +8447,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c HRESULT hr; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); -@@ -3997,6 +5227,7 @@ +@@ -4010,6 +5240,7 @@ if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { if (location == WINED3D_LOCATION_TEXTURE_RGB @@ -8455,7 +8455,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c && surface->resource.locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) { surface_load_ds_location(surface, context, location); -@@ -4006,21 +5237,63 @@ +@@ -4019,21 +5250,63 @@ && surface->container->resource.draw_binding != WINED3D_LOCATION_DRAWABLE) { /* Already up to date, nothing to do. */ @@ -8524,7 +8524,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } switch (location) -@@ -4029,6 +5302,7 @@ +@@ -4042,6 +5315,7 @@ case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: @@ -8532,7 +8532,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c surface_load_sysmem(surface, context, location); break; -@@ -4046,6 +5320,24 @@ +@@ -4059,6 +5333,24 @@ if (FAILED(hr = surface_load_texture(surface, context, location == WINED3D_LOCATION_TEXTURE_SRGB))) return; @@ -8557,7 +8557,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c break; default: -@@ -4053,12 +5345,21 @@ +@@ -4066,12 +5358,21 @@ break; } @@ -8579,7 +8579,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } static HRESULT ffp_blit_alloc(struct wined3d_device *device) { return WINED3D_OK; } -@@ -4166,6 +5467,7 @@ +@@ -4179,6 +5480,7 @@ const RECT *dst_rect, const struct wined3d_color *color) { const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height}; @@ -8587,7 +8587,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c struct wined3d_rendertarget_view view, *view_ptr = &view; struct wined3d_fb_state fb = {&view_ptr, NULL, 1}; struct wined3d_texture *texture = dst_surface->container; -@@ -4186,6 +5488,21 @@ +@@ -4199,6 +5501,21 @@ view.sub_resource_idx = dst_surface->texture_layer * texture->level_count + dst_surface->texture_level; device_clear_render_targets(device, 1, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_TARGET, color, 0.0f, 0); @@ -8609,7 +8609,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c return WINED3D_OK; } -@@ -4194,6 +5511,7 @@ +@@ -4207,6 +5524,7 @@ const RECT *dst_rect, float depth) { const RECT draw_rect = {0, 0, dst_surface->resource.width, dst_surface->resource.height}; @@ -8617,7 +8617,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c struct wined3d_rendertarget_view view; struct wined3d_fb_state fb = {NULL, &view}; struct wined3d_texture *texture = dst_surface->container; -@@ -4209,6 +5527,20 @@ +@@ -4222,6 +5540,20 @@ view.sub_resource_idx = dst_surface->texture_layer * texture->level_count + dst_surface->texture_level; device_clear_render_targets(device, 0, &fb, 1, dst_rect, &draw_rect, WINED3DCLEAR_ZBUFFER, 0, depth, 0); @@ -8638,7 +8638,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c return WINED3D_OK; } -@@ -4221,6 +5553,7 @@ +@@ -4234,6 +5566,7 @@ /* Blit from offscreen surface to render target */ struct wined3d_color_key old_blt_key = src_surface->container->async.src_blt_color_key; DWORD old_color_key_flags = src_surface->container->async.color_key_flags; @@ -8646,7 +8646,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c struct wined3d_context *context; TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); -@@ -4238,6 +5571,22 @@ +@@ -4251,6 +5584,22 @@ wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding); wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->container->resource.draw_binding); @@ -8669,7 +8669,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } const struct blit_shader ffp_blit = { -@@ -4397,6 +5746,7 @@ +@@ -4410,6 +5759,7 @@ const struct wined3d_format *src_format, *dst_format; unsigned int src_fmt_flags, dst_fmt_flags; struct wined3d_texture *src_texture = NULL; @@ -8677,7 +8677,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c void *src_data = NULL, *dst_data = NULL; UINT src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; const BYTE *sbase = NULL; -@@ -4427,6 +5777,23 @@ +@@ -4440,6 +5790,23 @@ wined3d_resource_get_pitch(&dst_surface->resource, &dst_row_pitch, &dst_slice_pitch); src_data = dst_data; src_row_pitch = dst_row_pitch; @@ -8701,7 +8701,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c src_format = dst_surface->resource.format; dst_format = src_format; dst_fmt_flags = dst_surface->container->resource.format_flags; -@@ -4438,12 +5805,14 @@ +@@ -4451,12 +5818,14 @@ dst_fmt_flags = dst_surface->container->resource.format_flags; if (src_surface) { @@ -8716,7 +8716,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (dst_surface->resource.format->id != src_surface->resource.format->id) { if (!(src_texture = surface_convert_format(src_surface, dst_format->id))) -@@ -4454,9 +5823,13 @@ +@@ -4467,9 +5836,13 @@ } src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, 0)); } @@ -8730,7 +8730,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c src_format = src_surface->resource.format; src_fmt_flags = src_surface->container->resource.format_flags; } -@@ -4466,8 +5839,12 @@ +@@ -4479,8 +5852,12 @@ src_fmt_flags = dst_fmt_flags; } @@ -8743,7 +8743,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } bpp = dst_surface->resource.format->byte_count; -@@ -4478,12 +5855,24 @@ +@@ -4491,12 +5868,24 @@ width = (dst_rect->right - dst_rect->left) * bpp; if (src_surface) @@ -8768,7 +8768,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (src_fmt_flags & dst_fmt_flags & WINED3DFMT_FLAG_BLOCKS) { -@@ -4518,7 +5907,11 @@ +@@ -4531,7 +5920,11 @@ } hr = surface_cpu_blt_compressed(sbase, dbuf, @@ -8780,7 +8780,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c src_format, flags, fx); goto release; } -@@ -4526,7 +5919,11 @@ +@@ -4539,7 +5932,11 @@ /* First, all the 'source-less' blits */ if (flags & WINEDDBLT_COLORFILL) { @@ -8792,7 +8792,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c flags &= ~WINEDDBLT_COLORFILL; } -@@ -4575,6 +5972,7 @@ +@@ -4588,6 +5985,7 @@ for (y = 0; y < dstheight; ++y) { memcpy(dbuf, sbuf, width); @@ -8800,7 +8800,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c sbuf += src_row_pitch; dbuf += dst_row_pitch; } -@@ -4588,6 +5986,21 @@ +@@ -4601,6 +5999,21 @@ { sbuf -= src_row_pitch; dbuf -= dst_row_pitch; @@ -8822,7 +8822,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c memcpy(dbuf, sbuf, width); } } -@@ -4597,8 +6010,13 @@ +@@ -4610,8 +6023,13 @@ for (y = 0; y < dstheight; ++y) { memmove(dbuf, sbuf, width); @@ -8836,7 +8836,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } } } -@@ -4607,9 +6025,15 @@ +@@ -4620,9 +6038,15 @@ /* Stretching in y direction only. */ for (y = sy = 0; y < dstheight; ++y, sy += yinc) { @@ -8852,7 +8852,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } } } -@@ -4619,6 +6043,7 @@ +@@ -4632,6 +6056,7 @@ int last_sy = -1; for (y = sy = 0; y < dstheight; ++y, sy += yinc) { @@ -8860,7 +8860,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c sbuf = sbase + (sy >> 16) * src_row_pitch; if ((sy >> 16) == (last_sy >> 16)) -@@ -4626,6 +6051,15 @@ +@@ -4639,6 +6064,15 @@ /* This source row is the same as last source row - * Copy the already stretched row. */ memcpy(dbuf, dbuf - dst_row_pitch, width); @@ -8876,7 +8876,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } else { -@@ -4672,6 +6106,7 @@ +@@ -4685,6 +6119,7 @@ } #undef STRETCH_ROW } @@ -8884,7 +8884,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c dbuf += dst_row_pitch; last_sy = sy; } -@@ -4680,6 +6115,16 @@ +@@ -4693,6 +6128,16 @@ else { LONG dstyinc = dst_row_pitch, dstxinc = bpp; @@ -8901,7 +8901,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c DWORD keylow = 0xffffffff, keyhigh = 0, keymask = 0xffffffff; DWORD destkeylow = 0x0, destkeyhigh = 0xffffffff, destkeymask = 0xffffffff; if (flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYDEST | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_KEYDESTOVERRIDE)) -@@ -4729,7 +6174,11 @@ +@@ -4742,7 +6187,11 @@ LONG tmpxy; dTopLeft = dbuf; dTopRight = dbuf + ((dstwidth - 1) * bpp); @@ -8913,7 +8913,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c dBottomRight = dBottomLeft + ((dstwidth - 1) * bpp); if (fx->dwDDFX & WINEDDBLTFX_ARITHSTRETCHY) -@@ -4806,6 +6255,7 @@ +@@ -4819,6 +6268,7 @@ flags &= ~(WINEDDBLT_DDFX); } @@ -8921,7 +8921,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c #define COPY_COLORKEY_FX(type) \ do { \ const type *s; \ -@@ -4827,6 +6277,29 @@ +@@ -4840,6 +6290,29 @@ d = (type *)(((BYTE *)d) + dstyinc); \ } \ } while(0) @@ -8951,7 +8951,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c switch (bpp) { -@@ -4845,7 +6318,11 @@ +@@ -4858,7 +6331,11 @@ BYTE *d = dbuf, *dx; for (y = sy = 0; y < dstheight; ++y, sy += yinc) { @@ -8963,7 +8963,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c dx = d; for (x = sx = 0; x < dstwidth; ++x, sx+= xinc) { -@@ -4876,10 +6353,12 @@ +@@ -4889,10 +6366,12 @@ } } @@ -8976,7 +8976,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c error: if (flags && FIXME_ON(d3d_surface)) { -@@ -4887,6 +6366,7 @@ +@@ -4900,6 +6379,7 @@ } release: @@ -8984,7 +8984,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (dst_data) { wined3d_resource_release_map_ptr(&dst_surface->resource, context); -@@ -4905,6 +6385,14 @@ +@@ -4918,6 +6398,14 @@ wined3d_texture_decref(src_texture); if (context) context_release(context); @@ -8999,7 +8999,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c return hr; } -@@ -4949,6 +6437,7 @@ +@@ -4962,6 +6450,7 @@ cpu_blit_blit_surface, }; @@ -9007,7 +9007,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c void surface_blt_ugly(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) -@@ -4956,6 +6445,16 @@ +@@ -4969,6 +6458,16 @@ struct wined3d_swapchain *src_swapchain, *dst_swapchain; struct wined3d_device *device = dst_surface->resource.device; DWORD src_ds_flags, dst_ds_flags; @@ -9024,7 +9024,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c BOOL scale, convert; static const DWORD simple_blit = WINEDDBLT_ASYNC -@@ -4966,6 +6465,106 @@ +@@ -4979,6 +6478,106 @@ | WINEDDBLT_DEPTHFILL | WINEDDBLT_DONOTWAIT; @@ -9131,7 +9131,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c if (!device->d3d_initialized) { WARN("D3D not initialized, using fallback.\n"); -@@ -5008,8 +6607,13 @@ +@@ -5021,8 +6620,13 @@ } scale = src_surface @@ -9145,7 +9145,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c convert = src_surface && src_surface->resource.format->id != dst_surface->resource.format->id; dst_ds_flags = dst_surface->container->resource.format_flags -@@ -5029,6 +6633,7 @@ +@@ -5042,6 +6646,7 @@ TRACE("Depth fill.\n"); if (!surface_convert_depth_to_float(dst_surface, fx->u5.dwFillDepth, &depth)) @@ -9153,7 +9153,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c return; if (SUCCEEDED(wined3d_surface_depth_fill(dst_surface, dst_rect, depth))) -@@ -5039,6 +6644,24 @@ +@@ -5052,6 +6657,24 @@ if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->container->resource.draw_binding, src_rect, dst_surface, dst_surface->container->resource.draw_binding, dst_rect))) return; @@ -9178,7 +9178,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } } else -@@ -5047,8 +6670,13 @@ +@@ -5060,8 +6683,13 @@ /* In principle this would apply to depth blits as well, but we don't * implement those in the CPU blitter at the moment. */ @@ -9192,7 +9192,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c { if (scale) TRACE("Not doing sysmem blit because of scaling.\n"); -@@ -5069,8 +6697,13 @@ +@@ -5082,8 +6710,13 @@ palette, fx->u5.dwFillColor, &color)) goto fallback; @@ -9206,7 +9206,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } else { -@@ -5088,8 +6721,13 @@ +@@ -5101,8 +6734,13 @@ color_key = &src_surface->container->async.src_blt_color_key; blit_op = WINED3D_BLIT_OP_COLOR_BLIT_CKEY; } @@ -9220,7 +9220,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c { /* Upload */ if (scale) -@@ -5098,6 +6736,7 @@ +@@ -5111,6 +6749,7 @@ TRACE("Not doing upload because of format conversion.\n"); else { @@ -9228,7 +9228,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c POINT dst_point = {dst_rect->left, dst_rect->top}; if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, src_rect))) -@@ -5110,6 +6749,15 @@ +@@ -5123,6 +6762,15 @@ context_release(context); } return; @@ -9244,7 +9244,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } } } -@@ -5133,6 +6781,7 @@ +@@ -5146,6 +6794,7 @@ wined3d_swapchain_present(dst_swapchain, NULL, NULL, dst_swapchain->win_handle, NULL, 0); dst_swapchain->desc.swap_effect = swap_effect; @@ -9252,7 +9252,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c return; } -@@ -5328,6 +6977,49 @@ +@@ -5341,6 +6990,49 @@ wined3d_surface_location_invalidated, wined3d_surface_load_location, }; @@ -9302,7 +9302,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags) -@@ -5395,9 +7087,13 @@ +@@ -5402,9 +7094,13 @@ } surface->container = container; @@ -9316,7 +9316,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c list_init(&surface->renderbuffers); list_init(&surface->overlays); -@@ -5429,9 +7125,14 @@ +@@ -5436,9 +7132,14 @@ if (surface->resource.map_binding == WINED3D_LOCATION_DIB) { wined3d_resource_free_sysmem(&surface->resource); @@ -9331,7 +9331,7 @@ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c } return hr; -@@ -5458,7 +7159,11 @@ +@@ -5465,7 +7166,11 @@ if (FAILED(hr = surface_init(object, container, desc, target, level, layer, flags))) { WARN("Failed to initialize surface, returning %#x.\n", hr); @@ -9879,7 +9879,7 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -5493,9 +5493,15 @@ +@@ -5492,9 +5492,15 @@ DebugBreak(); } diff --git a/patches/wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch b/patches/wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch index 8893ca99..2eeab563 100644 --- a/patches/wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch +++ b/patches/wined3d-Multisampling/0001-wined3d-Allow-to-specify-multisampling-AA-quality-le.patch @@ -1,43 +1,38 @@ -From 6e90ea5d3a677b1f073effab2eef34edc328075b Mon Sep 17 00:00:00 2001 +From 20c5727bab6314d9d788f5b782cf8f5d1b6fc281 Mon Sep 17 00:00:00 2001 From: Austin English Date: Sat, 28 Feb 2015 00:34:07 +0100 Subject: wined3d: Allow to specify multisampling AA quality levels via registry. --- - dlls/wined3d/directx.c | 11 +++++++++-- + dlls/wined3d/directx.c | 7 ++++++- dlls/wined3d/wined3d_main.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 1 + - 3 files changed, 22 insertions(+), 2 deletions(-) + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c -index 4ca13f4..94a2f7b 100644 +index 019b415..b9eb03c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c -@@ -4231,9 +4231,16 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 +@@ -4404,7 +4404,12 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if (quality_levels) { - if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) -- /* FIXME: This is probably wrong. */ + if (wined3d_settings.msaa_quality_levels) + { + *quality_levels = wined3d_settings.msaa_quality_levels; + TRACE("Overriding MSAA quality levels to %i\n", *quality_levels); + } + else if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) -+ { *quality_levels = gl_info->limits.samples; -+ WARN("probably wrong, setting quality_levels to %d\n", *quality_levels); -+ } else *quality_levels = 1; - } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c -index 758ba43..0bf6c9f 100644 +index 0543d97..c985c2d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c -@@ -76,6 +76,7 @@ struct wined3d_settings wined3d_settings = +@@ -77,6 +77,7 @@ struct wined3d_settings wined3d_settings = ORM_FBO, /* Use FBOs to do offscreen rendering */ PCI_VENDOR_NONE,/* PCI Vendor ID */ PCI_DEVICE_NONE,/* PCI Device ID */ @@ -45,7 +40,7 @@ index 758ba43..0bf6c9f 100644 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ TRUE, /* Multisampling enabled by default. */ -@@ -251,6 +252,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) +@@ -261,6 +262,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.pci_vendor_id = pci_vendor_id; } } @@ -64,10 +59,10 @@ index 758ba43..0bf6c9f 100644 { int TmpVideoMemorySize = atoi(buffer); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index b0c7a53..2f2511e 100644 +index 7847557..9e39dd7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -269,6 +269,7 @@ struct wined3d_settings +@@ -268,6 +268,7 @@ struct wined3d_settings unsigned short pci_vendor_id; unsigned short pci_device_id; /* Memory tracking and object counting. */ @@ -76,5 +71,5 @@ index b0c7a53..2f2511e 100644 char *logo; int allow_multisampling; -- -2.3.0 +2.5.0 diff --git a/patches/wininet-Cleanup/0004-wininet-Delay-setting-the-http-host-header.patch b/patches/wininet-Cleanup/0004-wininet-Delay-setting-the-http-host-header.patch deleted file mode 100644 index 127a0e27..00000000 --- a/patches/wininet-Cleanup/0004-wininet-Delay-setting-the-http-host-header.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 72a8f7896554e752e1c924b71709e8cb0e48a51c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 16 May 2015 01:39:33 +0200 -Subject: wininet: Delay setting the http host header. - -This change temporarly breaks two other tests which were only -working by pure accident before. ---- - dlls/wininet/http.c | 28 ++++++++++++++++++---------- - dlls/wininet/tests/http.c | 10 +++++----- - 2 files changed, 23 insertions(+), 15 deletions(-) - -diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c -index 5dd1b3b..e24a337 100644 ---- a/dlls/wininet/http.c -+++ b/dlls/wininet/http.c -@@ -376,6 +376,7 @@ static WCHAR *get_host_header( http_request_t *req ) - - EnterCriticalSection( &req->headers_section ); - if ((header = HTTP_GetHeader( req, hostW ))) ret = heap_strdupW( header->lpszValue ); -+ else ret = heap_strdupW( req->server->canon_host_port ); - LeaveCriticalSection( &req->headers_section ); - return ret; - } -@@ -1886,20 +1887,21 @@ static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) - static const WCHAR https[] = { 'h','t','t','p','s',':','/','/',0 }; - static const WCHAR slash[] = { '/',0 }; - LPHTTPHEADERW host_header; -+ const WCHAR *host; - LPCWSTR scheme; - -- host_header = HTTP_GetHeader(req, hostW); -- if(!host_header) -- return FALSE; -- - EnterCriticalSection( &req->headers_section ); - -+ host_header = HTTP_GetHeader(req, hostW); -+ if (host_header) host = host_header->lpszValue; -+ else host = req->server->canon_host_port; -+ - if (req->hdr.dwFlags & INTERNET_FLAG_SECURE) - scheme = https; - else - scheme = http; - strcpyW(buf, scheme); -- strcatW(buf, host_header->lpszValue); -+ strcatW(buf, host); - if (req->path[0] != '/') - strcatW(buf, slash); - strcatW(buf, req->path); -@@ -2140,14 +2142,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe - case INTERNET_OPTION_URL: { - static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; - WCHAR url[INTERNET_MAX_URL_LENGTH]; -- HTTPHEADERW *host; -+ HTTPHEADERW *host_header; -+ const WCHAR *host; - - TRACE("INTERNET_OPTION_URL\n"); - - EnterCriticalSection( &req->headers_section ); -- host = HTTP_GetHeader(req, hostW); -+ -+ host_header = HTTP_GetHeader(req, hostW); -+ if (host_header) host = host_header->lpszValue; -+ else host = req->server->canon_host_port; -+ - strcpyW(url, httpW); -- strcatW(url, host->lpszValue); -+ strcatW(url, host); - strcatW(url, req->path); - LeaveCriticalSection( &req->headers_section ); - -@@ -3417,8 +3424,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, - request->verb = heap_strdupW(lpszVerb && *lpszVerb ? lpszVerb : szGET); - request->version = heap_strdupW(lpszVersion && *lpszVersion ? lpszVersion : g_szHttp1_1); - -- HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); -- - if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) - HTTP_DealWithProxy( hIC, session, request ); - -@@ -4911,6 +4916,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, - if (!request->verb) - request->verb = heap_strdupW(szGET); - -+ HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, -+ HTTP_ADDREQ_FLAG_ADD_IF_NEW | HTTP_ADDHDR_FLAG_REQ); -+ - if (dwContentLength || strcmpW(request->verb, szGET)) - { - sprintfW(contentLengthStr, szContentLength, dwContentLength); -diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c -index 46a2258..5725b30 100644 ---- a/dlls/wininet/tests/http.c -+++ b/dlls/wininet/tests/http.c -@@ -3054,8 +3054,8 @@ static void test_header_override(int port) - memset(buffer, 0, sizeof(buffer)); - ret = HttpQueryInfoA(req, HTTP_QUERY_HOST | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, &count); - err = GetLastError(); -- todo_wine ok(!ret, "HttpQueryInfo succeeded\n"); -- todo_wine ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); -+ ok(!ret, "HttpQueryInfo succeeded\n"); -+ ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "Expected error ERROR_HTTP_HEADER_NOT_FOUND, got %d\n", err); - - size = sizeof(buffer) - 1; - memset(buffer, 0, sizeof(buffer)); -@@ -3081,7 +3081,7 @@ static void test_header_override(int port) - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); - -- test_status_code_todo(req, 200); -+ test_status_code(req, 200); - - InternetCloseHandle(req); - req = HttpOpenRequestA(con, NULL, "/test_host_override", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); -@@ -3229,7 +3229,7 @@ static void test_header_override(int port) - ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); - ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); - -- test_status_code(req, 200); -+ test_status_code_todo(req, 200); - - InternetCloseHandle(req); - InternetCloseHandle(con); -@@ -3268,7 +3268,7 @@ static void test_header_override(int port) - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); - -- test_status_code(req, 200); -+ test_status_code_todo(req, 200); - - InternetCloseHandle(req); - InternetCloseHandle(con); --- -2.4.3 - diff --git a/patches/wininet-Cleanup/0007-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch b/patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch similarity index 100% rename from patches/wininet-Cleanup/0007-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch rename to patches/wininet-Cleanup/0004-wininet-Strip-filename-if-no-path-is-set-in-cookie.patch diff --git a/patches/wininet-Cleanup/0008-wininet-Replacing-header-fields-should-fail-if-they-.patch b/patches/wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch similarity index 100% rename from patches/wininet-Cleanup/0008-wininet-Replacing-header-fields-should-fail-if-they-.patch rename to patches/wininet-Cleanup/0005-wininet-Replacing-header-fields-should-fail-if-they-.patch diff --git a/patches/wininet-Cleanup/0005-wininet-Use-request-server-canon_host_port-in-authen.patch b/patches/wininet-Cleanup/0005-wininet-Use-request-server-canon_host_port-in-authen.patch deleted file mode 100644 index 80b6a850..00000000 --- a/patches/wininet-Cleanup/0005-wininet-Use-request-server-canon_host_port-in-authen.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f0e05bd23a5a4377462586a0f8bd9c54117dcbb8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 16 May 2015 01:57:17 +0200 -Subject: wininet: Use request->server->canon_host_port in authentication - process. - ---- - dlls/wininet/http.c | 2 +- - dlls/wininet/tests/http.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c -index 356ebb6..3232fad 100644 ---- a/dlls/wininet/http.c -+++ b/dlls/wininet/http.c -@@ -5116,7 +5116,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, - dwBufferSize=2048; - if (request->status_code == HTTP_STATUS_DENIED) - { -- WCHAR *host = get_host_header( request ); -+ WCHAR *host = heap_strdupW( request->server->canon_host_port ); - DWORD dwIndex = 0; - while (HTTP_HttpQueryInfoW(request,HTTP_QUERY_WWW_AUTHENTICATE,szAuthValue,&dwBufferSize,&dwIndex) == ERROR_SUCCESS) - { -diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c -index 2ac075f..9e207b9 100644 ---- a/dlls/wininet/tests/http.c -+++ b/dlls/wininet/tests/http.c -@@ -3215,7 +3215,7 @@ static void test_header_override(int port) - ret = HttpSendRequestA( req, NULL, 0, NULL, 0 ); - ok( ret, "HttpSendRequestA failed %u\n", GetLastError() ); - -- test_status_code_todo(req, 200); -+ test_status_code(req, 200); - - InternetCloseHandle(req); - InternetCloseHandle(con); -@@ -3254,7 +3254,7 @@ static void test_header_override(int port) - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequestA failed %u\n", GetLastError()); - -- test_status_code_todo(req, 200); -+ test_status_code(req, 200); - - InternetCloseHandle(req); - InternetCloseHandle(con); --- -2.4.0 - diff --git a/patches/wininet-Cleanup/0006-wininet-Use-request-server-canon_host_port-when-quer.patch b/patches/wininet-Cleanup/0006-wininet-Use-request-server-canon_host_port-when-quer.patch deleted file mode 100644 index bb09c197..00000000 --- a/patches/wininet-Cleanup/0006-wininet-Use-request-server-canon_host_port-when-quer.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 53df41c8abfc5bafd1ba214d58a3edda1099024b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 16 May 2015 02:00:57 +0200 -Subject: wininet: Use request->server->canon_host_port when querying for - INTERNET_OPTION_URL. - ---- - dlls/wininet/http.c | 11 +---------- - dlls/wininet/tests/http.c | 2 +- - 2 files changed, 2 insertions(+), 11 deletions(-) - -diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c -index b61a96a..edea9f8 100644 ---- a/dlls/wininet/http.c -+++ b/dlls/wininet/http.c -@@ -2142,21 +2142,12 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe - case INTERNET_OPTION_URL: { - static const WCHAR httpW[] = {'h','t','t','p',':','/','/',0}; - WCHAR url[INTERNET_MAX_URL_LENGTH]; -- HTTPHEADERW *host_header; -- const WCHAR *host; - - TRACE("INTERNET_OPTION_URL\n"); - -- EnterCriticalSection( &req->headers_section ); -- -- host_header = HTTP_GetHeader(req, hostW); -- if (host_header) host = host_header->lpszValue; -- else host = req->server->canon_host_port; -- - strcpyW(url, httpW); -- strcatW(url, host); -+ strcatW(url, req->server->canon_host_port); - strcatW(url, req->path); -- LeaveCriticalSection( &req->headers_section ); - - TRACE("INTERNET_OPTION_URL: %s\n",debugstr_w(url)); - return str_to_buffer(url, buffer, size, unicode); -diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c -index fd235b1..1a82aba 100644 ---- a/dlls/wininet/tests/http.c -+++ b/dlls/wininet/tests/http.c -@@ -3076,7 +3076,7 @@ static void test_header_override(int port) - memset(buffer, 0, sizeof(buffer)); - ret = InternetQueryOptionA(req, INTERNET_OPTION_URL, buffer, &size); - ok(ret, "InternetQueryOption failed\n"); -- todo_wine ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); -+ ok(!strcmp(full_url, buffer), "Expected %s, got %s\n", full_url, buffer); - - ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed\n"); --- -2.4.3 - diff --git a/patches/wininet-Cleanup/definition b/patches/wininet-Cleanup/definition index cb495458..52d34a96 100644 --- a/patches/wininet-Cleanup/definition +++ b/patches/wininet-Cleanup/definition @@ -1 +1 @@ -Fixes: [28911] Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest +# Fixes: [28911] Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest