Rebase against 6056a3f1634a72e181fb3a03ca625aaa7720523e.

patches/api-ms-win-crt-Stub_DLLs/0004-ucrtbase-Add-stub-functions-for-narrow-environment.patch

@@ -1,82 +0,0 @@
-From f06ecd78dedb3c2beaa5f36a812ee78afa04ec74 Mon Sep 17 00:00:00 2001
-From: Martin Storsjo <martin@martin.st>
-Date: Mon, 3 Aug 2015 22:26:04 +0300
-Subject: ucrtbase: Add stub functions for narrow environment
-
-The interface is taken from ucrt public headers.
-
-These are required for a plain empty exe that is built with dynamic
-C runtime with MSVC 2015 to start up.
----
- dlls/msvcrt/data.c          | 26 ++++++++++++++++++++++++++
- dlls/ucrtbase/ucrtbase.spec |  6 +++---
- 2 files changed, 29 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c
-index e6989f1..7b6216d 100644
---- a/dlls/msvcrt/data.c
-+++ b/dlls/msvcrt/data.c
-@@ -640,3 +640,29 @@ void CDECL MSVCRT___set_app_type(int app_type)
-   TRACE("(%d) %s application\n", app_type, app_type == 2 ? "Gui" : "Console");
-   MSVCRT_app_type = app_type;
- }
-+
-+/*********************************************************************
-+ *		_get_initial_narrow_environment (MSVCRT.@)
-+ */
-+char** CDECL _get_initial_narrow_environment(void)
-+{
-+  return MSVCRT___argv;
-+}
-+
-+/*********************************************************************
-+ *		_configure_narrow_argv (MSVCRT.@)
-+ */
-+int CDECL _configure_narrow_argv(int mode)
-+{
-+  TRACE("(%d)\n", mode);
-+  return 0;
-+}
-+
-+/*********************************************************************
-+ *		_initialize_narrow_environment (MSVCRT.@)
-+ */
-+int CDECL _initialize_narrow_environment(void)
-+{
-+  TRACE("\n");
-+  return 0;
-+}
-diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
-index a7a7718..0f2a082 100644
---- a/dlls/ucrtbase/ucrtbase.spec
-+++ b/dlls/ucrtbase/ucrtbase.spec
-@@ -229,7 +229,7 @@
- @ cdecl _close(long) MSVCRT__close
- @ cdecl _commit(long) MSVCRT__commit
- @ cdecl _configthreadlocale(long)
--@ stub _configure_narrow_argv
-+@ cdecl _configure_narrow_argv(long)
- @ stub _configure_wide_argv
- @ cdecl _control87(long long)
- @ cdecl _controlfp(long long)
-@@ -365,7 +365,7 @@
- @ cdecl _get_errno(ptr)
- @ cdecl _get_fmode(ptr) MSVCRT__get_fmode
- @ cdecl _get_heap_handle()
--@ stub _get_initial_narrow_environment
-+@ cdecl _get_initial_narrow_environment()
- @ stub _get_initial_wide_environment
- @ cdecl _get_invalid_parameter_handler()
- @ stub _get_narrow_winmain_command_line
-@@ -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
--@ stub _initialize_narrow_environment
-+@ cdecl _initialize_narrow_environment()
- @ stub _initialize_onexit_table
- @ stub _initialize_wide_environment
- @ cdecl _initterm(ptr ptr)
--- 
-2.5.0
-

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e5ce90ed1b88bba8389aabfcb9ad0b6f837f6a14"
+	echo "6056a3f1634a72e181fb3a03ca625aaa7720523e"
 }
 
 # Show version information
@@ -2150,20 +2150,18 @@ fi
 # Patchset api-ms-win-crt-Stub_DLLs
 # |
 # | Modified files:
-# |   *	configure.ac, dlls/msvcrt/data.c, dlls/msvcrt/misc.c, dlls/ucrtbase/ucrtbase.spec, dlls/vcruntime140/Makefile.in,
+# |   *	configure.ac, dlls/msvcrt/misc.c, dlls/ucrtbase/ucrtbase.spec, dlls/vcruntime140/Makefile.in,
 # | 	dlls/vcruntime140/vcruntime140.spec
 # |
 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
 	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/0004-vcruntime140-Add-stubs-for-telemetry-functions.patch
 	(
 		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 },';
-		echo '+    { "Martin Storsjo", "ucrtbase: Add stub functions for narrow environment.", 1 },';
 		echo '+    { "Martin Storsjo", "vcruntime140: Add stubs for telemetry functions.", 1 },';
 	) >> "$patchlist"
 fi