Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] setupapi: Delay freeing registered dlls until they have all been processed.

Browse source 
wine commit id a192b707f2d102374771ed90e6c94ea40e79a08a by Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
winesync 2024-01-04 21:16:19 +01:00 committed by Hermès Bélusca-Maïto
parent 3a286fb14f
commit 1f8cfa86dc
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
dll/win32/setupapi/install.c
View file

@ -79,6 +79,9 @@ struct register_dll_info
PSP_FILE_CALLBACK_W callback;
PVOID callback_context;
BOOL unregister;
int modules_size;
int modules_count;
HMODULE *modules;
};
/* info passed to callback functions dealing with Needs directives */
@ -566,7 +569,7 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg )
*
* Register or unregister a dll.
*/
static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *path,
static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path,
INT flags, INT timeout, const WCHAR *args )
{
HMODULE module;
@ -694,7 +697,23 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *
}
done:
if (module) FreeLibrary( module );
if (module)
{
if (info->modules_count >= info->modules_size)
{
int new_size = max( 32, info->modules_size * 2 );
HMODULE *new = info->modules ?
HeapReAlloc( GetProcessHeap(), 0, info->modules, new_size * sizeof(*new) ) :
HeapAlloc( GetProcessHeap(), 0, new_size * sizeof(*new) );
if (new)
{
info->modules_size = new_size;
info->modules = new;
}
}
if (info->modules_count < info->modules_size) info->modules[info->modules_count++] = module;
else FreeLibrary( module );
}
if (info->callback) info->callback( info->callback_context, SPFILENOTIFY_ENDREGISTRATION,
(UINT_PTR)&status, !info->unregister );
return TRUE;
@ -1368,6 +1387,8 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
PSP_FILE_CALLBACK_W callback, PVOID context,
HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data )
{
BOOL ret;
int i;
struct needs_callback_info needs_info;
/* Parse 'Include' and 'Needs' directives */
@ -1390,7 +1411,6 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
struct files_callback_info info;
HSPFILEQ queue = NULL;
BOOL use_custom_queue;
BOOL ret;
install_params.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
use_custom_queue = SetupDiGetDeviceInstallParamsW(devinfo, devinfo_data, &install_params) && (install_params.Flags & DI_NOVCP);
@ -1432,7 +1452,10 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
{
struct register_dll_info info;
info.unregister = FALSE;
info.unregister = FALSE;
info.modules_size = 0;
info.modules_count = 0;
info.modules = NULL;
if (flags & SPINST_REGISTERCALLBACKAWARE)
{
info.callback = callback;
@ -1447,14 +1470,19 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
return FALSE;
#endif
if (!iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info ))
return FALSE;
ret = iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info );
for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] );
HeapFree( GetProcessHeap(), 0, info.modules );
if (!ret) return FALSE;
}
if (flags & SPINST_UNREGSVR)
{
struct register_dll_info info;
info.unregister = TRUE;
info.unregister = TRUE;
info.modules_size = 0;
info.modules_count = 0;
info.modules = NULL;
if (flags & SPINST_REGISTERCALLBACKAWARE)
{
info.callback = callback;
@ -1462,8 +1490,10 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
}
else info.callback = NULL;
if (!iterate_section_fields( hinf, section, UnregisterDlls, register_dlls_callback, &info ))
return FALSE;
ret = iterate_section_fields( hinf, section, UnregisterDlls, register_dlls_callback, &info );
for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] );
HeapFree( GetProcessHeap(), 0, info.modules );
if (!ret) return FALSE;
}
if (flags & SPINST_REGISTRY)
{

2
sdk/tools/winesync/setupapi.cfg
View file

@ -5,4 +5,4 @@ files:
dlls/setupapi/misc.c: dll/win32/setupapi/misc.c
dlls/setupapi/stubs.c: dll/win32/setupapi/stubs.c
tags:
wine: 7e309601f3cb55deadaab9bd444757483a0fb065
wine: a192b707f2d102374771ed90e6c94ea40e79a08a