Rebase against a5031391f40c6196b9baccbf69f5ccbe3b59e17c.

patches/msvcr120-_SetWinRTOutOfMemoryExceptionCallback/0001-msvcr120-Add-stub-for-_SetWinRTOutOfMemoryExceptionC.patch

@@ -1,4 +1,4 @@
-From 76d016aa66e8b00405a10fad09b49613578d1a2a Mon Sep 17 00:00:00 2001
+From 0d26f0fea6b78f147597477a4a8a90ac82a1f4a0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 15 Jan 2016 12:58:17 +0100
 Subject: msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.
@@ -10,7 +10,7 @@ Subject: msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.
  3 files changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
-index fa8f3adf06..893d167ec2 100644
+index 84edf51369..139acab465 100644
 --- a/dlls/msvcr120/msvcr120.spec
 +++ b/dlls/msvcr120/msvcr120.spec
 @@ -844,7 +844,7 @@
@@ -23,7 +23,7 @@ index fa8f3adf06..893d167ec2 100644
  @ stub -arch=win64 _SetThrowImageBase
  @ cdecl _Strftime(ptr long str ptr ptr)
 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
-index bcbc8bf894..5e3b42e141 100644
+index 46a76da1c8..d9a1e46359 100644
 --- a/dlls/msvcr120_app/msvcr120_app.spec
 +++ b/dlls/msvcr120_app/msvcr120_app.spec
 @@ -838,7 +838,7 @@
@@ -36,12 +36,12 @@ index bcbc8bf894..5e3b42e141 100644
  @ stub -arch=win64 _SetThrowImageBase
  @ cdecl _Strftime(ptr long str ptr ptr) msvcr120._Strftime
 diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c
-index 23a089ab3b..754362aeff 100644
+index 767972f893..fbbdfcf148 100644
 --- a/dlls/msvcrt/misc.c
 +++ b/dlls/msvcrt/misc.c
-@@ -532,3 +532,11 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved)
- {
-     WARN("(%x)\n", reserved);
+@@ -542,3 +542,11 @@ LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep)
+     SetUnhandledExceptionFilter(NULL);
+     return UnhandledExceptionFilter(ep);
  }
 +
 +/*********************************************************************

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "c3b108e54b99eff3942c44eef5aa89c1dbcebd91"
+	echo "a5031391f40c6196b9baccbf69f5ccbe3b59e17c"
 }
 
 # Show version information