From 97ad2b8b39c1640f0878a86ca9b12891c083da31 Mon Sep 17 00:00:00 2001 From: Akihiro Sagawa Date: Fri, 12 Jan 2018 00:27:45 +0900 Subject: [PATCH] psapi/tests: Add more EnumProcessModules tests. Signed-off-by: Akihiro Sagawa Signed-off-by: Alexandre Julliard --- dlls/psapi/tests/psapi_main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index cd07ce727a1..30059c5af70 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -110,7 +110,7 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { - HMODULE hMod = GetModuleHandleA(NULL); + HMODULE hMod; DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -122,14 +122,18 @@ static void test_EnumProcessModules(void) ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + hMod = (void *)0xdeadbeef; ret = pEnumProcessModules(hpQI, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + hMod = (void *)0xdeadbeef; ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), NULL); ok(!ret, "succeeded\n"); ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); + todo_wine ok(hMod == GetModuleHandleA(NULL), + "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); SetLastError(0xdeadbeef); ret = pEnumProcessModules(hpQV, NULL, 0, &cbNeeded); @@ -141,9 +145,9 @@ static void test_EnumProcessModules(void) ok(GetLastError() == ERROR_NOACCESS, "expected error=ERROR_NOACCESS but got %d\n", GetLastError()); SetLastError(0xdeadbeef); + hMod = (void *)0xdeadbeef; ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); - if(ret != 1) - return; + ok(ret == 1, "got %d, failed with %d\n", ret, GetLastError()); ok(hMod == GetModuleHandleA(NULL), "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded);