reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-10 14:23:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: Remove child folders first in the RemoveFolders action.

Browse Source
This commit is contained in:
Hans Leidekker 2012-04-23 15:46:50 +02:00 committed by Alexandre Julliard
parent 2e5bf9ca06
commit 52f3d5bead
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/msi/action.c
View File

@ -884,6 +884,20 @@ static UINT ACTION_CreateFolders(MSIPACKAGE *package)
return rc;
}
static void remove_persistent_folder( MSIFOLDER *folder )
{
FolderList *fl;
LIST_FOR_EACH_ENTRY( fl, &folder->children, FolderList, entry )
{
remove_persistent_folder( fl->folder );
}
if (folder->persistent && folder->State != FOLDER_STATE_REMOVED)
{
if (RemoveDirectoryW( folder->ResolvedTarget )) folder->State = FOLDER_STATE_REMOVED;
}
}
static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param )
{
MSIPACKAGE *package = param;
@ -927,9 +941,8 @@ static UINT ITERATE_RemoveFolders( MSIRECORD *row, LPVOID param )
msi_ui_actiondata( package, szRemoveFolders, uirow );
msiobj_release( &uirow->hdr );
RemoveDirectoryW( full_path );
folder = msi_get_loaded_folder( package, dir );
folder->State = FOLDER_STATE_REMOVED;
remove_persistent_folder( folder );
return ERROR_SUCCESS;
}