Skip to content

W
wine-winehq
Commit b7f06acc authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

msi: Don't refcount the msi_custom_action_info struct.

This is unnecessary, and may have always been so. The struct will either be freed after it completes synchronously, or after it has completed asynchronously in ACTION_FinishCustomActions(). Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarHans Leidekker <hans@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 583edf7f
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 24 deletions
dlls/msi/custom.c
View file @ b7f06acc
......@@ -380,7 +380,6 @@ static UINT wait_process_handle(MSIPACKAGE* package, UINT type,
typedef struct _msi_custom_action_info {
struct list entry;
LONG refs;
MSIPACKAGE *package;
LPWSTR source;
LPWSTR target;
......@@ -391,12 +390,10 @@ typedef struct _msi_custom_action_info {
DWORD arch;
} msi_custom_action_info;
static void release_custom_action_data( msi_custom_action_info *info )
static void free_custom_action_data( msi_custom_action_info *info )
{
EnterCriticalSection( &msi_custom_action_cs );
if (!--info->refs)
{
list_remove( &info->entry );
if (info->handle)
CloseHandle( info->handle );
......@@ -405,17 +402,10 @@ static void release_custom_action_data( msi_custom_action_info *info )
msi_free( info->target );
msiobj_release( &info->package->hdr );
msi_free( info );
}
LeaveCriticalSection( &msi_custom_action_cs );
}
/* must be called inside msi_custom_action_cs if info is in the pending custom actions list */
static void addref_custom_action_data( msi_custom_action_info *info )
{
info->refs++;
}
static UINT wait_thread_handle( msi_custom_action_info *info )
{
UINT rc = ERROR_SUCCESS;
......@@ -429,7 +419,7 @@ static UINT wait_thread_handle( msi_custom_action_info *info )
if (!(info->type & msidbCustomActionTypeContinue))
rc = custom_get_thread_return( info->package, info->handle );
release_custom_action_data( info );
free_custom_action_data( info );
}
else
{
......@@ -450,7 +440,6 @@ static msi_custom_action_info *find_action_by_guid( const GUID *guid )
{
if (IsEqualGUID( &info->guid, guid ))
{
addref_custom_action_data( info );
found = TRUE;
break;
}
......@@ -725,7 +714,6 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
return NULL;
msiobj_addref( &package->hdr );
info->refs = 2; /* 1 for our caller and 1 for thread we created */
info->package = package;
info->type = type;
info->target = strdupW( target );
......@@ -767,9 +755,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll(
info->handle = CreateThread(NULL, 0, custom_client_thread, info, 0, NULL);
if (!info->handle)
{
/* release both references */
release_custom_action_data( info );
release_custom_action_data( info );
free_custom_action_data( info );
return NULL;
}
......@@ -1056,7 +1042,6 @@ static DWORD ACTION_CallScript( const GUID *guid )
else
ERR("failed to create handle for %p\n", info->package );
release_custom_action_data( info );
return r;
}
......@@ -1085,7 +1070,6 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript(
return NULL;
msiobj_addref( &package->hdr );
info->refs = 2; /* 1 for our caller and 1 for thread we created */
info->package = package;
info->type = type;
info->target = strdupW( function );
......@@ -1100,9 +1084,7 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript(
info->handle = CreateThread( NULL, 0, ScriptThread, &info->guid, 0, NULL );
if (!info->handle)
{
/* release both references */
release_custom_action_data( info );
release_custom_action_data( info );
free_custom_action_data( info );
return NULL;
}
......@@ -1496,7 +1478,8 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package)
EnterCriticalSection( &msi_custom_action_cs );
LIST_FOR_EACH_ENTRY_SAFE( info, cursor, &msi_pending_custom_actions, msi_custom_action_info, entry )
{
if (info->package == package) release_custom_action_data( info );
if (info->package == package)
free_custom_action_data( info );
}
LeaveCriticalSection( &msi_custom_action_cs );
}
......@@ -1514,6 +1497,5 @@ UINT __cdecl s_remote_GetActionInfo(const GUID *guid, int *type, LPWSTR *dll, LP
*dll = strdupW(info->source);
*func = strdupWtoA(info->target);
release_custom_action_data(info);
return ERROR_SUCCESS;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment