system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-01 01:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbghelp: Unload overlapping modules in SymLoadModule*().

Browse source 
Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
This commit is contained in:
Eric Pouech 2023-02-16 10:49:01 +01:00 committed by Alexandre Julliard
parent 5654af818a
commit 32bc569520
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/dbghelp/module.c
View file

@ -992,17 +992,10 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
}
if (altmodule)
{
/* we have a conflict as the new module cannot be found by its base address
* we need to get rid of one on the two modules
/* We have a conflict as the new module cannot be found by its base address
* (it's hidden by altmodule).
* We need to decide which one the two modules we need to get rid of.
*/
if (lstrcmpW(module->modulename, altmodule->modulename) != 0)
{
/* module overlaps an existing but different module... unload new module and return error */
WARN("%ls overlaps %ls\n", module->modulename, altmodule->modulename);
module_remove(pcs, module);
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
/* loading same module at same address... don't change anything */
if (module->module.BaseOfImage == altmodule->module.BaseOfImage)
{
@ -1010,9 +1003,10 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam
SetLastError(ERROR_SUCCESS);
return 0;
}
/* replace old module with new one, which will look like a shift of base address */
WARN("Shift module %ls from %I64x to %I64x\n",
module->modulename, altmodule->module.BaseOfImage, module->module.BaseOfImage);
/* replace old module with new one */
WARN("Replace module %ls at %I64x by module %ls at %I64x\n",
altmodule->module.ImageName, altmodule->module.BaseOfImage,
module->module.ImageName, module->module.BaseOfImage);
module_remove(pcs, altmodule);
}

4
dlls/dbghelp/tests/dbghelp.c
View file

@ -456,7 +456,6 @@ static void test_modules_overlap(void)
}
else
{
todo_wine_if(i == 6 || i == 7)
ok(base == tests[i].input.base, "SymLoadModuleEx failed: %lu\n", GetLastError());
}
for (j = 0; j < ARRAY_SIZE(tests[i].outputs); j++)
@ -471,13 +470,10 @@ static void test_modules_overlap(void)
break;
}
ok(nth.index == -1, "Expecting more modules\n");
todo_wine_if(i == 6 || i == 7)
ok(nth.module.BaseOfImage == tests[i].outputs[j].base, "Wrong base\n");
if (!nth.will_fail)
{
todo_wine_if(i == 7)
ok(nth.module.ImageSize == tests[i].outputs[j].size, "Wrong size\n");
todo_wine_if(i == 6 || i == 7)
ok(!strcasecmp(nth.module.ModuleName, tests[i].outputs[j].name), "Wrong name\n");
}
}