From 031b029c8d18e997853a0a86035b00f9a1050cdd Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 19 Jan 2016 17:11:54 +0100 Subject: [PATCH] Move patch to forward _{calloc,malloc,free}_base to {calloc,malloc,free} into separate directory. --- ...-api-ms-win-core-com-l1-1-1-Add-dll.patch} | 0 ...dll-and-add-stub-for-QuirkIsEnabled.patch} | 0 ...i-ms-win-core-quirks-l1-1-0-Add-dll.patch} | 0 ...s-win-core-delayload-l1-1-1-Add-dll.patch} | 0 ...appmodel-runtime-l1-1-1-Add-new-dll.patch} | 0 ...ms-win-core-apiquery-l1-1-0-Add-dll.patch} | 0 ...n-core-libraryloader-l1-2-0-Add-dll.patch} | 0 ...core-kernel32-legacy-l1-1-1-Add-dll.patch} | 0 ...api-ms-win-core-heap-l2-1-0-Add-dll.patch} | 0 ...ting-classicprovider-l1-1-0-Add-dll.patch} | 0 ...dd-dll-and-add-stub-for-ordinal-811.patch} | 0 ...e-winrt-registration-l1-1-0-Add-dll.patch} | 0 ...dd-dll.patch => 0013-shcore-Add-dll.patch} | 0 ...-win-shcore-obsolete-l1-1-0-Add-dll.patch} | 0 ...al-l1-1-0-Add-dll-and-add-stub-for-.patch} | 0 ...el-usercontext-l1-1-0-Add-dll-and-a.patch} | 0 patches/api-ms-win-Stub_DLLs/definition | 1 - patches/patchinstall.sh | 68 +++++++++++-------- ...-some-functions-with-new-names-to-ex.patch | 0 patches/ucrtbase-Functions/definition | 1 + 20 files changed, 42 insertions(+), 28 deletions(-) rename patches/api-ms-win-Stub_DLLs/{0002-api-ms-win-core-com-l1-1-1-Add-dll.patch => 0001-api-ms-win-core-com-l1-1-1-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0003-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch => 0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0004-api-ms-win-core-quirks-l1-1-0-Add-dll.patch => 0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0005-api-ms-win-core-delayload-l1-1-1-Add-dll.patch => 0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0006-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch => 0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0007-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch => 0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0008-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch => 0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0009-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch => 0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0010-api-ms-win-core-heap-l2-1-0-Add-dll.patch => 0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0011-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch => 0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0012-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch => 0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0013-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch => 0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0014-shcore-Add-dll.patch => 0013-shcore-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0015-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch => 0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0016-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch => 0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch} (100%) rename patches/api-ms-win-Stub_DLLs/{0017-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch => 0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch} (100%) rename patches/{api-ms-win-Stub_DLLs => ucrtbase-Functions}/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch (100%) create mode 100644 patches/ucrtbase-Functions/definition diff --git a/patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-com-l1-1-1-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-com-l1-1-1-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0003-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch b/patches/api-ms-win-Stub_DLLs/0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0003-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch rename to patches/api-ms-win-Stub_DLLs/0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch diff --git a/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-quirks-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-quirks-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-delayload-l1-1-1-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0005-api-ms-win-core-delayload-l1-1-1-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0006-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch b/patches/api-ms-win-Stub_DLLs/0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0006-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch rename to patches/api-ms-win-Stub_DLLs/0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0009-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0009-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0010-api-ms-win-core-heap-l2-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0010-api-ms-win-core-heap-l2-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0011-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0012-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch b/patches/api-ms-win-Stub_DLLs/0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0012-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch rename to patches/api-ms-win-Stub_DLLs/0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch diff --git a/patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0014-shcore-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0013-shcore-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0014-shcore-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0013-shcore-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0015-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0015-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch rename to patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch diff --git a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch b/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch rename to patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch diff --git a/patches/api-ms-win-Stub_DLLs/0017-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch b/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0017-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch rename to patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch diff --git a/patches/api-ms-win-Stub_DLLs/definition b/patches/api-ms-win-Stub_DLLs/definition index 9c1c7499..10ce12af 100644 --- a/patches/api-ms-win-Stub_DLLs/definition +++ b/patches/api-ms-win-Stub_DLLs/definition @@ -1,4 +1,3 @@ -Fixes: Add stub dlls required for MSVC 2015 runtime library (Windows 10) Fixes: Add api-ms-win-core-com-l1-1-1 dll Fixes: Add api-ms-win-core-quirks-l1-1-0 dll Fixes: Add api-ms-win-core-delayload-l1-1-1 dll diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index fd8e2340..4440f6c6 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -291,6 +291,7 @@ patch_enable_all () enable_shlwapi_AssocGetPerceivedType="$1" enable_shlwapi_SHMapHandle="$1" enable_shlwapi_UrlCombine="$1" + enable_ucrtbase_Functions="$1" enable_user32_DeferWindowPos="$1" enable_user32_Dialog_Paint_Event="$1" enable_user32_DrawTextExW="$1" @@ -1006,6 +1007,9 @@ patch_enable () shlwapi-UrlCombine) enable_shlwapi_UrlCombine="$2" ;; + ucrtbase-Functions) + enable_ucrtbase_Functions="$2" + ;; user32-DeferWindowPos) enable_user32_DeferWindowPos="$2" ;; @@ -2559,36 +2563,34 @@ fi # | libraryloader-l1-2-0/Makefile.in, dlls/api-ms-win-core-libraryloader-l1-2-0/api-ms-win-core-libraryloader-l1-2-0.spec, # | dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec, # | dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in, dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win- -# | core-winrt-registration-l1-1-0.spec, dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec, dlls/api-ms-win- -# | eventing-classicprovider-l1-1-0/Makefile.in, dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing- -# | classicprovider-l1-1-0.spec, dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-obsolete-l1-1-0 -# | /api-ms-win-shcore-obsolete-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win- -# | appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel- -# | usercontext-l1-1-0/main.c, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml- -# | pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, -# | dlls/iertutil/main.c, dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, -# | dlls/shcore/Makefile.in, dlls/shcore/shcore.spec, dlls/ucrtbase/ucrtbase.spec, tools/make_specfiles +# | core-winrt-registration-l1-1-0.spec, dlls/api-ms-win-eventing-classicprovider-l1-1-0/Makefile.in, dlls/api-ms-win- +# | eventing-classicprovider-l1-1-0/api-ms-win-eventing-classicprovider-l1-1-0.spec, dlls/api-ms-win-shcore- +# | obsolete-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec, dlls/ext-ms- +# | win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel- +# | usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls/ext-ms-win-xaml- +# | pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml- +# | pal-l1-1-0/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, +# | dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/shcore/Makefile.in, +# | dlls/shcore/shcore.spec, tools/make_specfiles # | if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then - patch_apply api-ms-win-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch - patch_apply api-ms-win-Stub_DLLs/0002-api-ms-win-core-com-l1-1-1-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0003-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch - patch_apply api-ms-win-Stub_DLLs/0004-api-ms-win-core-quirks-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0005-api-ms-win-core-delayload-l1-1-1-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0006-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch - patch_apply api-ms-win-Stub_DLLs/0007-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0008-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0009-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0010-api-ms-win-core-heap-l2-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0011-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0012-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch - patch_apply api-ms-win-Stub_DLLs/0013-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0014-shcore-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0015-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch - patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch - patch_apply api-ms-win-Stub_DLLs/0017-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch + patch_apply api-ms-win-Stub_DLLs/0001-api-ms-win-core-com-l1-1-1-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0002-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch + patch_apply api-ms-win-Stub_DLLs/0003-api-ms-win-core-quirks-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0004-api-ms-win-core-delayload-l1-1-1-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0005-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch + patch_apply api-ms-win-Stub_DLLs/0006-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0007-api-ms-win-core-libraryloader-l1-2-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0008-api-ms-win-core-kernel32-legacy-l1-1-1-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0009-api-ms-win-core-heap-l2-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0010-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0011-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch + patch_apply api-ms-win-Stub_DLLs/0012-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0013-shcore-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch + patch_apply api-ms-win-Stub_DLLs/0015-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch + patch_apply api-ms-win-Stub_DLLs/0016-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch ( - echo '+ { "Martin Storsjo", "ucrtbase: Hook up some functions with new names to existing implementations.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-core-com-l1-1-1: Add dll.", 1 },'; echo '+ { "Michael Müller", "kernelbase: Add dll and add stub for QuirkIsEnabled.", 1 },'; echo '+ { "Michael Müller", "api-ms-win-core-quirks-l1-1-0: Add dll.", 1 },'; @@ -5860,6 +5862,18 @@ if test "$enable_shlwapi_UrlCombine" -eq 1; then ) >> "$patchlist" fi +# Patchset ucrtbase-Functions +# | +# | Modified files: +# | * dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec, dlls/ucrtbase/ucrtbase.spec +# | +if test "$enable_ucrtbase_Functions" -eq 1; then + patch_apply ucrtbase-Functions/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch + ( + echo '+ { "Martin Storsjo", "ucrtbase: Hook up some functions with new names to existing implementations.", 1 },'; + ) >> "$patchlist" +fi + # Patchset user32-DeferWindowPos # | # | This patchset fixes the following Wine bugs: diff --git a/patches/api-ms-win-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch b/patches/ucrtbase-Functions/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch similarity index 100% rename from patches/api-ms-win-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch rename to patches/ucrtbase-Functions/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch diff --git a/patches/ucrtbase-Functions/definition b/patches/ucrtbase-Functions/definition new file mode 100644 index 00000000..4839b99c --- /dev/null +++ b/patches/ucrtbase-Functions/definition @@ -0,0 +1 @@ +Fixes: Forward _{calloc,malloc,free}_base to {calloc,malloc,free}