Hans Leidekker : msi: Update the UI in the RegisterUser action.
Alexandre Julliard
julliard at winehq.org
Fri Mar 5 09:42:57 CST 2010
Module: wine
Branch: master
Commit: ab9a1813264f342f9488d0bb3ffc9148603d4ba5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9a1813264f342f9488d0bb3ffc9148603d4ba5
Author: Hans Leidekker <hans at codeweavers.com>
Date: Fri Mar 5 12:28:34 2010 +0100
msi: Update the UI in the RegisterUser action.
---
dlls/msi/action.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 46e28d9..15730f0 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -4782,10 +4782,10 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package)
static UINT ACTION_RegisterUser(MSIPACKAGE *package)
{
- HKEY hkey=0;
- LPWSTR buffer;
- LPWSTR productid;
- UINT rc,i;
+ HKEY hkey = 0;
+ LPWSTR buffer, productid = NULL;
+ UINT i, rc = ERROR_SUCCESS;
+ MSIRECORD *uirow;
static const WCHAR szPropKeys[][80] =
{
@@ -4806,12 +4806,12 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package)
if (msi_check_unpublish(package))
{
MSIREG_DeleteUserDataProductKey(package->ProductCode);
- return ERROR_SUCCESS;
+ goto end;
}
productid = msi_dup_property( package, INSTALLPROPERTY_PRODUCTIDW );
if (!productid)
- return ERROR_SUCCESS;
+ goto end;
rc = MSIREG_OpenInstallProps(package->ProductCode, package->Context,
NULL, &hkey, TRUE);
@@ -4826,11 +4826,13 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package)
}
end:
+ uirow = MSI_CreateRecord( 1 );
+ MSI_RecordSetStringW( uirow, 1, productid );
+ ui_actiondata( package, szRegisterUser, uirow );
+ msiobj_release( &uirow->hdr );
+
msi_free(productid);
RegCloseKey(hkey);
-
- /* FIXME: call ui_actiondata */
-
return rc;
}
More information about the wine-cvs
mailing list