Akihiro Sagawa : psapi/tests: Add more EnumProcessModules tests.

Alexandre Julliard julliard at winehq.org
Thu Jan 11 15:44:31 CST 2018


Module: wine
Branch: master
Commit: 97ad2b8b39c1640f0878a86ca9b12891c083da31
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=97ad2b8b39c1640f0878a86ca9b12891c083da31

Author: Akihiro Sagawa <sagawa.aki at gmail.com>
Date:   Fri Jan 12 00:27:45 2018 +0900

psapi/tests: Add more EnumProcessModules tests.

Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 cd07ce7..30059c5 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);




More information about the wine-cvs mailing list