ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Make the ExitProcess test work on x86_64.

This commit is contained in:
Dmitry Timoshkov 2013-04-15 18:10:00 +09:00 committed by Alexandre Julliard
parent 0d50e86f6a
commit c5fbb4a780
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/kernel32/tests/loader.c
View File

@ -408,7 +408,6 @@ static void test_Loader(void)
if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize)
{ {
const char *start; const char *start;
int size;
start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders; start = (const char *)hlib + nt_header.OptionalHeader.SizeOfHeaders;
size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; 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) if (nt_header.OptionalHeader.SectionAlignment >= si.dwPageSize)
{ {
const char *start; const char *start;
int size;
start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData; start = (const char *)hlib + section.VirtualAddress + section.PointerToRawData + section.SizeOfRawData;
size = ALIGN_SIZE((ULONG_PTR)start, si.dwPageSize) - (ULONG_PTR)start; 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) static void test_ExitProcess(void)
{ {
#include "pshpack1.h" #include "pshpack1.h"
#ifdef JMP_EAX #ifdef __x86_64__
static struct section_data
{
BYTE mov_rax[2];
void *target;
BYTE jmp_rax[2];
} section_data = { { 0x48,0xb8 }, dll_entry_point, { 0xff,0xe0 } };
#else
static struct section_data static struct section_data
{ {
BYTE mov_eax; BYTE mov_eax;
void *target; void *target;
BYTE jmp_eax[2]; BYTE jmp_eax[2];
} section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } };
#else
static struct section_data
{
BYTE push;
void *target;
BYTE ret;
} section_data = { 0x68, dll_entry_point, 0xc3 };
#endif #endif
#include "poppack.h" #include "poppack.h"
static const char filler[0x1000]; static const char filler[0x1000];
@ -1327,7 +1325,7 @@ static void test_ExitProcess(void)
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
STARTUPINFO si = { sizeof(si) }; STARTUPINFO si = { sizeof(si) };
#ifndef __i386__ #if !defined(__i386__) && !defined(__x86_64__)
skip("x86 specific ExitProcess test\n"); skip("x86 specific ExitProcess test\n");
return; return;
#endif #endif