From 4afc805422f7cb1214bfe19e9bf74e50e83a476a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 15 Jan 2016 14:42:21 +0100
Subject: [PATCH] api-ms-win-crt-Stub_DLLs: Update exports in
 api-ms-win-crt-heap-l1-1-0.

---
 ...-some-functions-with-new-names-to-ex.patch | 33 ++++++++++++++++---
 patches/patchinstall.sh                       |  3 +-
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/patches/api-ms-win-crt-Stub_DLLs/0001-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
index 31bd121f..0bf1f476 100644
--- a/patches/api-ms-win-crt-Stub_DLLs/0001-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 fe4c1e1f10f8edc76c5dad994ed2e5202f9c2821 Mon Sep 17 00:00:00 2001
+From 97853bae25a321b30e2ee38044c85af75fb61174 Mon Sep 17 00:00:00 2001
 From: Martin Storsjo <martin@martin.st>
 Date: Mon, 3 Aug 2015 22:26:01 +0300
 Subject: ucrtbase: Hook up some functions with new names to existing
@@ -7,11 +7,34 @@ 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 | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec | 6 +++---
+ dlls/ucrtbase/ucrtbase.spec                                     | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
+diff --git a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
+index 18ca9d4..418926e 100644
+--- a/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
++++ b/dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec
+@@ -7,14 +7,14 @@
+ @ cdecl _aligned_realloc(ptr long long) ucrtbase._aligned_realloc
+ @ stub _aligned_recalloc
+ @ cdecl _callnewh(long) ucrtbase._callnewh
+-@ stub _calloc_base
++@ cdecl _calloc_base(long long) ucrtbase._calloc_base
+ @ cdecl _expand(ptr long) ucrtbase._expand
+-@ stub _free_base
++@ cdecl _free_base(ptr) ucrtbase._free_base
+ @ cdecl _get_heap_handle() ucrtbase._get_heap_handle
+ @ cdecl _heapchk() ucrtbase._heapchk
+ @ cdecl _heapmin() ucrtbase._heapmin
+ @ cdecl _heapwalk(ptr) ucrtbase._heapwalk
+-@ stub _malloc_base
++@ cdecl _malloc_base(long) ucrtbase._malloc_base
+ @ cdecl _msize(ptr) ucrtbase._msize
+ @ stub _query_new_handler
+ @ stub _query_new_mode
 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
-index bb56408..cee094d 100644
+index 3478342..53ca8fb 100644
 --- a/dlls/ucrtbase/ucrtbase.spec
 +++ b/dlls/ucrtbase/ucrtbase.spec
 @@ -211,7 +211,7 @@
@@ -42,5 +65,5 @@ index bb56408..cee094d 100644
  @ stub _mbbtombc_l
  @ cdecl _mbbtype(long long)
 -- 
-2.5.0
+2.6.4
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index d0c9c5f7..2506c68b 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -2408,7 +2408,8 @@ fi
 # |
 # | Modified files:
 # |   *	configure.ac, dlls/api-ms-win-core-com-l1-1-1/Makefile.in, dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-
-# | 	com-l1-1-1.spec, dlls/ucrtbase/ucrtbase.spec, tools/make_specfiles
+# | 	com-l1-1-1.spec, dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec, dlls/ucrtbase/ucrtbase.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-Hook-up-some-functions-with-new-names-to-ex.patch