[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
Alexandre Julliard
julliard at winehq.org
Sun Jun 17 20:04:12 UTC 2012
The following commit has been merged in the wheezy branch:
commit f83016a27b308813b4d8a24d498b063893908136
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Apr 2 12:42:52 2012 +0200
ntdll: Add a __chkstk entry point for x86_64.
(cherry picked from commit 3d4a73e6015a9d3f0d79810985700b2a45cd6439)
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index d64c5f3..b100103 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -1275,6 +1275,8 @@
@ stdcall WriteProfileStringW(wstr wstr wstr)
@ stdcall WriteTapemark(ptr long long long)
@ stdcall ZombifyActCtx(ptr)
+@ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler
+@ stdcall -arch=x86_64 -private -norelay __chkstk() ntdll.__chkstk
@ stub _DebugOut
@ stub _DebugPrintf
@ stdcall _hread(long ptr long)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index cd666bc..7523e63 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1244,6 +1244,7 @@
# @ stub _CIsin
# @ stub _CIsqrt
@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr)
+@ stdcall -private -arch=x86_64 -norelay __chkstk()
# @ stub __isascii
# @ stub __iscsym
# @ stub __iscsymf
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 6196358..7d2b8d5 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -1483,6 +1483,14 @@ static void restore_context( const CONTEXT *context, ucontext_t *sigcontext )
}
+/**************************************************************************
+ * __chkstk (NTDLL.@)
+ *
+ * Supposed to touch all the stack pages, but we shouldn't need that.
+ */
+__ASM_GLOBAL_FUNC( __chkstk, "ret" );
+
+
/***********************************************************************
* RtlCaptureContext (NTDLL.@)
*/
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list