Dmitry Timoshkov : kernel32: Make the ExitProcess test work on x86_64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c5fbb4a780b856ab7281d675d3ccd141287ceb6b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c5fbb4a780b856ab7281d675d3...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Mon Apr 15 18:10:00 2013 +0900

kernel32: Make the ExitProcess test work on x86_64.

---

 dlls/kernel32/tests/loader.c |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index 61ec904..c88a995 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -408,7 +408,6 @@ static void test_Loader(void)
             if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize)
             {
                 const char *start;
-                int size;
 
                 start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders;
                 size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start;
@@ -449,7 +448,6 @@ static void test_Loader(void)
                 if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize)
                 {
                     const char *start;
-                    int size;
 
                     start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData;
                     size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start;
@@ -1302,20 +1300,20 @@ static void child_process(const char *dll_name, DWORD target_offset)
 static void test_ExitProcess(void)
 {
 #include "pshpack1.h"
-#ifdef JMP_EAX
+#ifdef __x86_64__
     static struct section_data
     {
-        BYTE mov_eax;
+        BYTE mov_rax[2];
         void *target;
-        BYTE jmp_eax[2];
-    } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } };
+        BYTE jmp_rax[2];
+    } section_data = { { 0x48,0xb8 }, dll_entry_point, { 0xff,0xe0 } };
 #else
     static struct section_data
     {
-        BYTE push;
+        BYTE mov_eax;
         void *target;
-        BYTE ret;
-    } section_data = { 0x68, dll_entry_point, 0xc3 };
+        BYTE jmp_eax[2];
+    } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } };
 #endif
 #include "poppack.h"
     static const char filler[0x1000];
@@ -1327,7 +1325,7 @@ static void test_ExitProcess(void)
     PROCESS_INFORMATION pi;
     STARTUPINFO si = { sizeof(si) };
 
-#ifndef __i386__
+#if !defined(__i386__) && !defined(__x86_64__)
     skip("x86 specific ExitProcess test\n");
     return;
 #endif