ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a leaking handle. 

Make MsiCollectUserInfo more internally consistent.
Thanks to Mike McCormack.
This commit is contained in:
Aric Stewart 2005-05-23 16:23:54 +00:00 committed by Alexandre Julliard
parent a7275c85c4
commit fefad8fcf2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msi/msi.c
View File

@ -36,6 +36,7 @@
#include "winver.h" #include "winver.h"
#include "winuser.h" #include "winuser.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "action.h"
WINE_DEFAULT_DEBUG_CHANNEL(msi); WINE_DEFAULT_DEBUG_CHANNEL(msi);
@ -1604,6 +1605,7 @@ USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR szProduct, LPWSTR lpUserNameBuf,
if (pcchSerialBuf) if (pcchSerialBuf)
*pcchSerialBuf = sz / sizeof(WCHAR); *pcchSerialBuf = sz / sizeof(WCHAR);
RegCloseKey(hkey);
return USERINFOSTATE_PRESENT; return USERINFOSTATE_PRESENT;
} }
@ -1622,6 +1624,7 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct)
{ {
MSIHANDLE handle; MSIHANDLE handle;
UINT rc; UINT rc;
MSIPACKAGE *package;
static const WCHAR szFirstRun[] = {'F','i','r','s','t','R','u','n',0}; static const WCHAR szFirstRun[] = {'F','i','r','s','t','R','u','n',0};
TRACE("(%s)\n",debugstr_w(szProduct)); TRACE("(%s)\n",debugstr_w(szProduct));
@ -1630,7 +1633,10 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct)
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
rc = MsiDoActionW(handle, szFirstRun); package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE);
rc = ACTION_PerformUIAction(package, szFirstRun);
msiobj_release( &package->hdr );
MsiCloseHandle(handle); MsiCloseHandle(handle);
return rc; return rc;
@ -1640,6 +1646,7 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct)
{ {
MSIHANDLE handle; MSIHANDLE handle;
UINT rc; UINT rc;
MSIPACKAGE *package;
static const WCHAR szFirstRun[] = {'F','i','r','s','t','R','u','n',0}; static const WCHAR szFirstRun[] = {'F','i','r','s','t','R','u','n',0};
TRACE("(%s)\n",debugstr_a(szProduct)); TRACE("(%s)\n",debugstr_a(szProduct));
@ -1648,7 +1655,10 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct)
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
return ERROR_INVALID_PARAMETER; return ERROR_INVALID_PARAMETER;
rc = MsiDoActionW(handle, szFirstRun); package = msihandle2msiinfo(handle, MSIHANDLETYPE_PACKAGE);
rc = ACTION_PerformUIAction(package, szFirstRun);
msiobj_release( &package->hdr );
MsiCloseHandle(handle); MsiCloseHandle(handle);
return rc; return rc;