Hans Leidekker : msi: Display directory identifier instead of the full path in the CreateFolders action .
Alexandre Julliard
julliard at winehq.org
Fri Mar 5 09:42:56 CST 2010
Module: wine
Branch: master
Commit: a70d86d3c9079a6fd93b66e0f3c54eb2ff2d68b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a70d86d3c9079a6fd93b66e0f3c54eb2ff2d68b3
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Mar 5 12:24:18 2010 +0100
msi: Display directory identifier instead of the full path in the CreateFolders action.
---
dlls/msi/action.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index a39ddad..e321099 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -92,8 +92,6 @@ static const WCHAR szForceReboot[] =
{'F','o','r','c','e','R','e','b','o','o','t',0};
static const WCHAR szResolveSource[] =
{'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[] =
{'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[] =
@@ -910,6 +908,11 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param)
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);
if (!full_path)
{
@@ -919,12 +922,6 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param)
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)
create_full_pathW(full_path);
More information about the wine-cvs
mailing list