Skip to content

W
wine-cw
Commit fefad8fc authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard
Browse files
Options

Fix a leaking handle.

Make MsiCollectUserInfo more internally consistent. Thanks to Mike McCormack.
parent a7275c85
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 2 deletions
dlls/msi/msi.c
View file @ fefad8fc
...@@ -36,6 +36,7 @@ ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment