marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Fix the libdl refcount when loading the same builtin twice.

oldstable
Alexandre Julliard 2006-12-20 15:54:27 +01:00
parent 1d6db94ee2
commit 2a1dc15790
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/kernel32/tests/module.c
View File

@ -179,7 +179,7 @@ static void testNestedLoadLibraryA(void)
/* Try to load the dll again, if refcounting is ok, this should work */
hModule1 = LoadLibraryA(path1);
todo_wine ok(hModule1 != NULL, "LoadLibrary(%s) failed\n", path1);
ok(hModule1 != NULL, "LoadLibrary(%s) failed\n", path1);
if (hModule1 != NULL)
ok(FreeLibrary(hModule1), "FreeLibrary() failed\n");
}

7
dlls/ntdll/loader.c
View File

@ -1553,7 +1553,11 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
}
}
if (info.status != STATUS_SUCCESS) return info.status;
if (info.status != STATUS_SUCCESS)
{
wine_dll_unload( handle );
return info.status;
}
if (!info.wm)
{
@ -1574,6 +1578,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, LPCWSTR path, HANDLE file,
break;
}
}
wine_dll_unload( handle ); /* release the libdl refcount */
if (!info.wm) return STATUS_INVALID_IMAGE_FORMAT;
if (info.wm->ldr.LoadCount != -1) info.wm->ldr.LoadCount++;
}