wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

ntdll-NtQuerySection: Fix warnings in tests on x86_64 (try 2).

Browse Source
This commit is contained in:
Sebastian Lackner 2015-01-24 13:04:39 +01:00
parent 71658e9cd3
commit c2f1a759c3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/ntdll-NtQuerySection/0003-kernel32-tests-Add-tests-for-NtQuerySection.patch
View File

@ -1,4 +1,4 @@
From 68cf47046f987e210c07132a7f92a275c4054f06 Mon Sep 17 00:00:00 2001
From e82054fc037cd8817bccb0864685e02d92bff3f3 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Thu, 16 Oct 2014 23:26:35 +0200
Subject: kernel32/tests: Add tests for NtQuerySection. (try 2)
@ -8,7 +8,7 @@ Subject: kernel32/tests: Add tests for NtQuerySection. (try 2)
1 file changed, 258 insertions(+)
diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index 3520546..71cdbdf 100644
index 75e91d5..2607fdc 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -47,9 +47,27 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void);
@ -39,7 +39,7 @@ index 3520546..71cdbdf 100644
static HANDLE create_target_process(const char *arg)
{
char **argv;
@@ -3417,6 +3435,244 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access)
@@ -3425,6 +3443,244 @@ static void test_shared_memory_ro(BOOL is_child, DWORD child_access)
CloseHandle(mapping);
}
@ -173,12 +173,12 @@ index 3520546..71cdbdf 100644
+ ok(status == STATUS_SUCCESS, "NtQuerySection error %#x\n", status);
+ ok(ret == sizeof(info.image), "wrong returned size %u\n", ret);
+ ok((ULONG_PTR)info.image.EntryPoint == nt->OptionalHeader.ImageBase + nt->OptionalHeader.AddressOfEntryPoint,
+ "expected %#llx, got %p\n", (ULONGLONG)(nt->OptionalHeader.ImageBase + nt->OptionalHeader.AddressOfEntryPoint), info.image.EntryPoint);
+ "expected %#lx, got %p\n", (SIZE_T)(nt->OptionalHeader.ImageBase + nt->OptionalHeader.AddressOfEntryPoint), info.image.EntryPoint);
+ ok(info.image.StackZeroBits == 0, "expected 0, got %#x\n", info.image.StackZeroBits);
+todo_wine
+ ok(info.image.StackReserved == nt->OptionalHeader.SizeOfStackReserve, "expected %#llx, got %#lx\n", (ULONGLONG)nt->OptionalHeader.SizeOfStackReserve, info.image.StackReserved);
+ ok(info.image.StackReserved == nt->OptionalHeader.SizeOfStackReserve, "expected %#lx, got %#lx\n", (SIZE_T)nt->OptionalHeader.SizeOfStackReserve, info.image.StackReserved);
+todo_wine
+ ok(info.image.StackCommit == nt->OptionalHeader.SizeOfStackCommit, "expected %#llx, got %#lx\n", (ULONGLONG)nt->OptionalHeader.SizeOfStackCommit, info.image.StackCommit);
+ ok(info.image.StackCommit == nt->OptionalHeader.SizeOfStackCommit, "expected %#lx, got %#lx\n", (SIZE_T)nt->OptionalHeader.SizeOfStackCommit, info.image.StackCommit);
+ ok(info.image.ImageSubsystem == nt->OptionalHeader.Subsystem, "expected %#x, got %#x\n", nt->OptionalHeader.Subsystem, info.image.ImageSubsystem);
+ ok(info.image.SubsystemVersionLow == nt->OptionalHeader.MinorSubsystemVersion, "expected %#x, got %#x\n", nt->OptionalHeader.MinorSubsystemVersion, info.image.SubsystemVersionLow);
+ ok(info.image.SubsystemVersionHigh == nt->OptionalHeader.MajorSubsystemVersion, "expected %#x, got %#x\n", nt->OptionalHeader.MajorSubsystemVersion, info.image.SubsystemVersionHigh);
@ -284,7 +284,7 @@ index 3520546..71cdbdf 100644
START_TEST(virtual)
{
int argc;
@@ -3469,12 +3725,14 @@ START_TEST(virtual)
@@ -3477,12 +3733,14 @@ START_TEST(virtual)
pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" );
pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" );
pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" );