mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch with stub for _SetWinRTOutOfMemoryExceptionCallback.
This commit is contained in:
parent
551b7c746a
commit
bbbe91723c
@ -0,0 +1,56 @@
|
||||
From 9bbb0f1cc3c59fad8fce55cf004583cc8a86a825 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.
|
||||
|
||||
---
|
||||
dlls/msvcr120/msvcr120.spec | 2 +-
|
||||
dlls/msvcr120_app/msvcr120_app.spec | 2 +-
|
||||
dlls/msvcrt/misc.c | 8 ++++++++
|
||||
3 files changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
|
||||
index b738155..a46e1ac 100644
|
||||
--- a/dlls/msvcr120/msvcr120.spec
|
||||
+++ b/dlls/msvcr120/msvcr120.spec
|
||||
@@ -844,7 +844,7 @@
|
||||
@ stub -arch=i386 _NLG_Return
|
||||
@ stub -arch=i386 _NLG_Return2
|
||||
@ stub -arch=arm,win64 __NLG_Return2
|
||||
-@ stub _SetWinRTOutOfMemoryExceptionCallback
|
||||
+@ cdecl -arch=i386,x86_64,arm _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback
|
||||
@ stub -arch=win64 _SetImageBase
|
||||
@ stub -arch=win64 _SetThrowImageBase
|
||||
@ cdecl _Strftime(str long str ptr ptr)
|
||||
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
|
||||
index ec18f21..b7424a0 100644
|
||||
--- a/dlls/msvcr120_app/msvcr120_app.spec
|
||||
+++ b/dlls/msvcr120_app/msvcr120_app.spec
|
||||
@@ -838,7 +838,7 @@
|
||||
@ stub -arch=i386 _NLG_Return
|
||||
@ stub -arch=i386 _NLG_Return2
|
||||
@ stub -arch=arm,win64 __NLG_Return2
|
||||
-@ stub _SetWinRTOutOfMemoryExceptionCallback
|
||||
+@ cdecl -arch=i386,x86_64,arm _SetWinRTOutOfMemoryExceptionCallback(ptr) msvcr120._SetWinRTOutOfMemoryExceptionCallback
|
||||
@ stub -arch=win64 _SetImageBase
|
||||
@ stub -arch=win64 _SetThrowImageBase
|
||||
@ cdecl _Strftime(str long str ptr ptr) msvcr120._Strftime
|
||||
diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c
|
||||
index 4e9f288..cc6891b 100644
|
||||
--- a/dlls/msvcrt/misc.c
|
||||
+++ b/dlls/msvcrt/misc.c
|
||||
@@ -498,3 +498,11 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src)
|
||||
{
|
||||
__ms_va_copy(*dest, src);
|
||||
}
|
||||
+
|
||||
+/*********************************************************************
|
||||
+ * _SetWinRTOutOfMemoryExceptionCallback (MSVCR120.@)
|
||||
+ */
|
||||
+void CDECL MSVCR120__SetWinRTOutOfMemoryExceptionCallback(void *callback)
|
||||
+{
|
||||
+ FIXME("(%p): stub\n", callback);
|
||||
+}
|
||||
--
|
||||
2.6.4
|
||||
|
@ -0,0 +1 @@
|
||||
Fixes: Add stub for _SetWinRTOutOfMemoryExceptionCallback
|
@ -177,6 +177,7 @@ patch_enable_all ()
|
||||
enable_mshtml_HTMLLocation_put_hash="$1"
|
||||
enable_mshtml_Wine_Gecko_2_44="$1"
|
||||
enable_msidb_Implementation="$1"
|
||||
enable_msvcr120__SetWinRTOutOfMemoryExceptionCallback="$1"
|
||||
enable_msvcrt_Math_Precision="$1"
|
||||
enable_msvcrt_StdHandle_RefCount="$1"
|
||||
enable_ntdll_APC_Performance="$1"
|
||||
@ -657,6 +658,9 @@ patch_enable ()
|
||||
msidb-Implementation)
|
||||
enable_msidb_Implementation="$2"
|
||||
;;
|
||||
msvcr120-_SetWinRTOutOfMemoryExceptionCallback)
|
||||
enable_msvcr120__SetWinRTOutOfMemoryExceptionCallback="$2"
|
||||
;;
|
||||
msvcrt-Math_Precision)
|
||||
enable_msvcrt_Math_Precision="$2"
|
||||
;;
|
||||
@ -3987,6 +3991,18 @@ if test "$enable_msidb_Implementation" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msvcr120-_SetWinRTOutOfMemoryExceptionCallback
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/msvcr120/msvcr120.spec, dlls/msvcr120_app/msvcr120_app.spec, dlls/msvcrt/misc.c
|
||||
# |
|
||||
if test "$enable_msvcr120__SetWinRTOutOfMemoryExceptionCallback" -eq 1; then
|
||||
patch_apply msvcr120-_SetWinRTOutOfMemoryExceptionCallback/0001-msvcr120-Add-stub-for-_SetWinRTOutOfMemoryExceptionC.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset msvcrt-Math_Precision
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
x
Reference in New Issue
Block a user