From: Rémi Bernon rbernon@codeweavers.com
Using comctl32 will load the user driver and create a desktop, which we don't need, and it will cause spurious failures in next tests as the rawinput thread startup may briefly take the loader lock. --- dlls/ntdll/tests/rtl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 76cecebae34..b4ec7f5018b 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2220,32 +2220,32 @@ static void test_LdrAddRefDll(void) NTSTATUS status; BOOL ret;
- mod = LoadLibraryA("comctl32.dll"); + mod = LoadLibraryA("combase.dll"); ok(mod != NULL, "got %p\n", mod); ret = FreeLibrary(mod); ok(ret, "got %d\n", ret);
- mod2 = GetModuleHandleA("comctl32.dll"); + mod2 = GetModuleHandleA("combase.dll"); ok(mod2 == NULL, "got %p\n", mod2);
/* load, addref and release 2 times */ - mod = LoadLibraryA("comctl32.dll"); + mod = LoadLibraryA("combase.dll"); ok(mod != NULL, "got %p\n", mod); status = LdrAddRefDll(0, mod); ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); ret = FreeLibrary(mod); ok(ret, "got %d\n", ret);
- mod2 = GetModuleHandleA("comctl32.dll"); + mod2 = GetModuleHandleA("combase.dll"); ok(mod2 != NULL, "got %p\n", mod2); ret = FreeLibrary(mod); ok(ret, "got %d\n", ret);
- mod2 = GetModuleHandleA("comctl32.dll"); + mod2 = GetModuleHandleA("combase.dll"); ok(mod2 == NULL, "got %p\n", mod2);
/* pin refcount */ - mod = LoadLibraryA("comctl32.dll"); + mod = LoadLibraryA("combase.dll"); ok(mod != NULL, "got %p\n", mod); status = LdrAddRefDll(LDR_ADDREF_DLL_PIN, mod); ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status); @@ -2259,7 +2259,7 @@ static void test_LdrAddRefDll(void) ret = FreeLibrary(mod); ok(ret, "got %d\n", ret);
- mod2 = GetModuleHandleA("comctl32.dll"); + mod2 = GetModuleHandleA("combase.dll"); ok(mod2 != NULL, "got %p\n", mod2); }