reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-29 22:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

msi: Display directory identifier instead of the full path in the CreateFolders action.

Browse Source
This commit is contained in:
Hans Leidekker 2010-03-05 12:24:18 +01:00 committed by Alexandre Julliard
parent 868e6f2bc8
commit a70d86d3c9
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/msi/action.c
View File

@ -92,8 +92,6 @@ static const WCHAR szForceReboot[] =
{'F','o','r','c','e','R','e','b','o','o','t',0}; {'F','o','r','c','e','R','e','b','o','o','t',0};
static const WCHAR szResolveSource[] = static const WCHAR szResolveSource[] =
{'R','e','s','o','l','v','e','S','o','u','r','c','e',0}; {'R','e','s','o','l','v','e','S','o','u','r','c','e',0};
static const WCHAR szAppSearch[] =
{'A','p','p','S','e','a','r','c','h',0};
static const WCHAR szAllocateRegistrySpace[] = static const WCHAR szAllocateRegistrySpace[] =
{'A','l','l','o','c','a','t','e','R','e','g','i','s','t','r','y','S','p','a','c','e',0}; {'A','l','l','o','c','a','t','e','R','e','g','i','s','t','r','y','S','p','a','c','e',0};
static const WCHAR szBindImage[] = static const WCHAR szBindImage[] =
@ -910,6 +908,11 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param)
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
uirow = MSI_CreateRecord(1);
MSI_RecordSetStringW(uirow, 1, dir);
ui_actiondata(package, szCreateFolders, uirow);
msiobj_release(&uirow->hdr);
full_path = resolve_folder(package,dir,FALSE,FALSE,TRUE,&folder); full_path = resolve_folder(package,dir,FALSE,FALSE,TRUE,&folder);
if (!full_path) if (!full_path)
{ {
@ -919,12 +922,6 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param)
TRACE("Folder is %s\n",debugstr_w(full_path)); TRACE("Folder is %s\n",debugstr_w(full_path));
/* UI stuff */
uirow = MSI_CreateRecord(1);
MSI_RecordSetStringW(uirow,1,full_path);
ui_actiondata(package,szCreateFolders,uirow);
msiobj_release( &uirow->hdr );
if (folder->State == 0) if (folder->State == 0)
create_full_pathW(full_path); create_full_pathW(full_path);