Rebase against 754c68182623657b4862d7700afbf781b4555c77.

[ucrtbase-Functions]
Removed patch to forward _{calloc,malloc,free}_base to {calloc,malloc,free}.

patches/d3dx9_33-Share_Source/0001-d3dx9_33-Share-the-source-with-d3dx9_36.patch

@@ -1,4 +1,4 @@
-From 1b67c1863bd891d9949d0e391306135519e722b5 Mon Sep 17 00:00:00 2001
+From 420ca2da1e8b4d43cb84e2a725842c0637612edf Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 13 Jul 2015 20:38:04 +1000
 Subject: d3dx9_33: Share the source with d3dx9_36
@@ -6,9 +6,9 @@ Subject: d3dx9_33: Share the source with d3dx9_36
 ---
  dlls/d3dx9_33/Makefile.in     |  22 +-
  dlls/d3dx9_33/d3dx9_33.spec   | 667 +++++++++++++++++++++---------------------
- dlls/d3dx9_33/d3dx9_33_main.c |  19 ++
+ dlls/d3dx9_33/d3dx9_33_main.c |   1 +
  tools/make_specfiles          |   1 -
- 4 files changed, 373 insertions(+), 336 deletions(-)
+ 4 files changed, 355 insertions(+), 336 deletions(-)
 
 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in
 index 0934eab..1106d11 100644
@@ -716,7 +716,7 @@ index 35cb0b6..2790d1a 100644
 +@ stdcall D3DXVec4TransformArray(ptr long ptr long ptr long)
 +@ stdcall D3DXWeldVertices(ptr long ptr ptr ptr ptr ptr)
 diff --git a/dlls/d3dx9_33/d3dx9_33_main.c b/dlls/d3dx9_33/d3dx9_33_main.c
-index 1b65a84..92f1772 100644
+index 1b65a84..3e409e3 100644
 --- a/dlls/d3dx9_33/d3dx9_33_main.c
 +++ b/dlls/d3dx9_33/d3dx9_33_main.c
 @@ -21,6 +21,7 @@
@@ -727,30 +727,8 @@ index 1b65a84..92f1772 100644
  
  #include <stdarg.h>
  
-@@ -59,3 +60,21 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers)
-     else
-         return FALSE;
- }
-+
-+/***********************************************************************
-+ * D3DXDebugMute
-+ * Returns always FALSE for us.
-+ */
-+BOOL WINAPI D3DXDebugMute(BOOL mute)
-+{
-+    return FALSE;
-+}
-+
-+/***********************************************************************
-+ * D3DXGetDriverLevel.
-+ * Returns always 900 (DX 9) for us
-+ */
-+UINT WINAPI D3DXGetDriverLevel(struct IDirect3DDevice9 *device)
-+{
-+    return 900;
-+}
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index b0a7b0a..75be4b3 100755
+index f55a42f..5f00f28 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
 @@ -83,7 +83,6 @@ my @dll_groups =
@@ -762,5 +740,5 @@ index b0a7b0a..75be4b3 100755
    "d3dx9_31",
    "d3dx9_30",
 -- 
-2.7.1
+2.8.0
 

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "41d01871fef296dc717cf2c4f0bdbb07f5266acd"
+	echo "754c68182623657b4862d7700afbf781b4555c77"
 }
 
 # Show version information
@@ -323,7 +323,6 @@ patch_enable_all ()
 	enable_stdole32_idl_Typelib="$1"
 	enable_stdole32_tlb_SLTG_Typelib="$1"
 	enable_taskmgr_Memory_Usage="$1"
-	enable_ucrtbase_Functions="$1"
 	enable_user_exe16_CONTAINING_RECORD="$1"
 	enable_user_exe16_DlgDirList="$1"
 	enable_user32_CharToOem="$1"
@@ -1152,9 +1151,6 @@ patch_enable ()
 		taskmgr-Memory_Usage)
 			enable_taskmgr_Memory_Usage="$2"
 			;;
-		ucrtbase-Functions)
-			enable_ucrtbase_Functions="$2"
-			;;
 		user.exe16-CONTAINING_RECORD)
 			enable_user_exe16_CONTAINING_RECORD="$2"
 			;;
@@ -6702,18 +6698,6 @@ if test "$enable_taskmgr_Memory_Usage" -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 user.exe16-CONTAINING_RECORD
 # |
 # | Modified files:

patches/ucrtbase-Functions/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch

@@ -1,69 +0,0 @@
-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
- implementations
-
-These are some functions that on a first glance seem to have a
-matching signature even though the name has changed.
----
- 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 3478342..53ca8fb 100644
---- a/dlls/ucrtbase/ucrtbase.spec
-+++ b/dlls/ucrtbase/ucrtbase.spec
-@@ -211,7 +211,7 @@
- @ cdecl _c_exit() MSVCRT__c_exit
- @ cdecl _cabs(long) MSVCRT__cabs
- @ cdecl _callnewh(long)
--@ stub _calloc_base
-+@ cdecl _calloc_base(long long) MSVCRT_calloc
- @ cdecl _cexit() MSVCRT__cexit
- @ cdecl _cgets(ptr)
- @ stub _cgets_s
-@@ -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
--@ stub _free_base
-+@ cdecl _free_base(ptr) MSVCRT_free
- @ cdecl _free_locale(ptr) MSVCRT__free_locale
- @ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
- @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@@ -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
--@ stub _malloc_base
-+@ cdecl _malloc_base(long) MSVCRT_malloc
- @ cdecl _mbbtombc(long)
- @ stub _mbbtombc_l
- @ cdecl _mbbtype(long long)
--- 
-2.6.4
-

patches/ucrtbase-Functions/definition

@@ -1 +0,0 @@
-Fixes: Forward _{calloc,malloc,free}_base to {calloc,malloc,free}