system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

psapi/tests: Fix the EnumProcessModules() test and provide more diagnostic information if it fails.

Browse source 
On some Windows systems aclayers.dll gets injected into the process and brings in a lot of extra dlls.
This commit is contained in:
Francois Gouget 2011-08-26 16:09:03 +02:00 committed by Alexandre Julliard
parent d82c70e511
commit 187de1794e
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/psapi/tests/psapi_main.c
View file

@ -107,10 +107,26 @@ static void test_EnumProcessModules(void)
ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded);
if(ret != 1) if(ret != 1)
return; return;
ok(cbNeeded / sizeof(HMODULE) >= 3 && cbNeeded / sizeof(HMODULE) <= 5 * sizeof(HMODULE),
"cbNeeded=%d\n", cbNeeded);
ok(hMod == GetModuleHandle(NULL), ok(hMod == GetModuleHandle(NULL),
"hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL));
ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded);
/* Windows sometimes has a bunch of extra dlls, presumably brought in by
* aclayers.dll.
*/
if (cbNeeded < 4 * sizeof(HMODULE) || cbNeeded > 30 * sizeof(HMODULE))
{
HMODULE hmods[100];
int i;
ok(0, "cbNeeded=%d\n", cbNeeded);
pEnumProcessModules(hpQV, hmods, sizeof(hmods), &cbNeeded);
for (i = 0 ; i < cbNeeded/sizeof(*hmods); i++)
{
char path[1024];
GetModuleFileNameA(hmods[i], path, sizeof(path));
trace("i=%d hmod=%p path=[%s]\n", i, hmods[i], path);
}
}
} }
static void test_GetModuleInformation(void) static void test_GetModuleInformation(void)