Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/virtual.c | 74 ++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index ed15c51339f3..b0aa94a6496e 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = ntdll.dll IMPORTS = user32 advapi32 +EXTRADLLFLAGS = -Xlinker --stack=0x300000,0x3000
C_SRCS = \ atom.c \ diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 195a54704fb4..841ecca42125 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -26,6 +26,10 @@ #include "winternl.h" #include "wine/test.h"
+static unsigned int page_size; + +static NTSTATUS (WINAPI *pRtlCreateUserStack)(SIZE_T, SIZE_T, ULONG, SIZE_T, SIZE_T, INITIAL_TEB *); +static NTSTATUS (WINAPI *pRtlFreeUserStack)(void *); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
static void test_AllocateVirtualMemory(void) @@ -169,16 +173,80 @@ static void test_AllocateVirtualMemory(void) ok(status == STATUS_SUCCESS, "NtFreeVirtualMemory failed\n"); }
+static void test_RtlCreateUserStack(void) +{ + INITIAL_TEB stack = {0}; + unsigned int i; + NTSTATUS ret; + + static const struct + { + SIZE_T commit, reserve, commit_align, reserve_align, expect_commit, expect_reserve; + } + tests[] = + { + { 0, 0, 1, 1, 0x3000, 0x300000}, + { 0x2000, 0, 1, 1, 0x2000, 0x300000}, + { 0x4000, 0, 1, 1, 0x4000, 0x300000}, + { 0, 0x200000, 1, 1, 0x3000, 0x200000}, + { 0x4000, 0x200000, 1, 1, 0x4000, 0x200000}, + {0x100000, 0x100000, 1, 1, 0x100000, 0x100000}, + { 0x20000, 0x20000, 1, 1, 0x20000, 0x100000}, + + { 0, 0x110000, 1, 1, 0x3000, 0x110000}, + { 0, 0x110000, 1, 0x40000, 0x3000, 0x140000}, + { 0, 0x140000, 1, 0x40000, 0x3000, 0x140000}, + { 0x11000, 0x140000, 1, 0x40000, 0x11000, 0x140000}, + { 0x11000, 0x140000, 0x4000, 0x40000, 0x14000, 0x140000}, + { 0, 0, 0x2000, 0x200000, 0x4000, 0x400000}, + }; + + if (!pRtlCreateUserStack) + { + win_skip("RtlCreateUserStack() is missing\n"); + return; + } + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + memset(&stack, 0xcc, sizeof(stack)); + ret = pRtlCreateUserStack(tests[i].commit, tests[i].reserve, 0, + tests[i].commit_align, tests[i].reserve_align, &stack); + ok(!ret, "%u: got status %#x\n", i, ret); + ok(!stack.OldStackBase, "%u: got OldStackBase %p\n", i, stack.OldStackBase); + ok(!stack.OldStackLimit, "%u: got OldStackLimit %p\n", i, stack.OldStackLimit); + ok(!((ULONG_PTR)stack.DeallocationStack & (page_size - 1)), + "%u: got unaligned memory %p\n", i, stack.DeallocationStack); + ok((ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.DeallocationStack == tests[i].expect_reserve, + "%u: got reserve %#lx\n", i, (ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.DeallocationStack); + todo_wine ok((ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.StackLimit == tests[i].expect_commit, + "%u: got commit %#lx\n", i, (ULONG_PTR)stack.StackBase - (ULONG_PTR)stack.StackLimit); + pRtlFreeUserStack(stack.DeallocationStack); + } + + ret = pRtlCreateUserStack(0x11000, 0x110000, 0, 1, 0, &stack); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + ret = pRtlCreateUserStack(0x11000, 0x110000, 0, 0, 1, &stack); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); +} + START_TEST(virtual) { SYSTEM_BASIC_INFORMATION sbi; - HMODULE hkernel32; + HMODULE mod;
- hkernel32 = GetModuleHandleA("kernel32.dll"); - pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); + mod = GetModuleHandleA("kernel32.dll"); + pIsWow64Process = (void *)GetProcAddress(mod, "IsWow64Process"); + + mod = GetModuleHandleA("ntdll.dll"); + pRtlCreateUserStack = (void *)GetProcAddress(mod, "RtlCreateUserStack"); + pRtlFreeUserStack = (void *)GetProcAddress(mod, "RtlFreeUserStack");
NtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); trace("system page size %#x\n", sbi.PageSize); + page_size = sbi.PageSize;
test_AllocateVirtualMemory(); + test_RtlCreateUserStack(); }