[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 69af09daa25bcc922282784c77315bdac2ad6dd8
Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Apr 2 12:45:43 2012 +0200

    ntdll: Move the _chkstk implementation to signal_i386.c.
    (cherry picked from commit aa55603b731fee304ce949cdcaa6572907c99604)

diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 1970251..34869e7 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -405,37 +405,6 @@ RtlDeleteSecurityObject( PSECURITY_DESCRIPTOR *ObjectDescriptor )
     return STATUS_NOT_IMPLEMENTED;
 }
 
-/**************************************************************************
- *                 _chkstk				[NTDLL.@]
- *
- * Glorified "enter xxxx".
- */
-#ifdef __i386__
-__ASM_STDCALL_FUNC( _chkstk, 0,
-                   "negl %eax\n\t"
-                   "addl %esp,%eax\n\t"
-                   "xchgl %esp,%eax\n\t"
-                   "movl 0(%eax),%eax\n\t"  /* copy return address from old location */
-                   "movl %eax,0(%esp)\n\t"
-                   "ret" )
-#endif
-
-/**************************************************************************
- *                 _alloca_probe		        [NTDLL.@]
- *
- * Glorified "enter xxxx".
- */
-#ifdef __i386__
-__ASM_STDCALL_FUNC( _alloca_probe, 0,
-                   "negl %eax\n\t"
-                   "addl %esp,%eax\n\t"
-                   "xchgl %esp,%eax\n\t"
-                   "movl 0(%eax),%eax\n\t"  /* copy return address from old location */
-                   "movl %eax,0(%esp)\n\t"
-                   "ret" )
-#endif
-
-
 /******************************************************************************
  *  RtlInitializeGenericTable           [NTDLL.@]
  */
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index e839994..6763344 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -2573,6 +2573,29 @@ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret")
 __ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" )
 
 
+/**************************************************************************
+ *           _chkstk   (NTDLL.@)
+ */
+__ASM_STDCALL_FUNC( _chkstk, 0,
+                   "negl %eax\n\t"
+                   "addl %esp,%eax\n\t"
+                   "xchgl %esp,%eax\n\t"
+                   "movl 0(%eax),%eax\n\t"  /* copy return address from old location */
+                   "movl %eax,0(%esp)\n\t"
+                   "ret" )
+
+/**************************************************************************
+ *           _alloca_probe   (NTDLL.@)
+ */
+__ASM_STDCALL_FUNC( _alloca_probe, 0,
+                   "negl %eax\n\t"
+                   "addl %esp,%eax\n\t"
+                   "xchgl %esp,%eax\n\t"
+                   "movl 0(%eax),%eax\n\t"  /* copy return address from old location */
+                   "movl %eax,0(%esp)\n\t"
+                   "ret" )
+
+
 /**********************************************************************
  *		EXC_CallHandler   (internal)
  *

-- 
Debian Wine packaging