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

Make sure we only CoUninitialize after successfully initializing. 

Fix the address of the returned IShellLinkDataList interface.
This commit is contained in:
Mike McCormack 2005-11-09 10:58:24 +00:00 committed by Alexandre Julliard
parent bf5155b606
commit 454fa4bea0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/msi/msi.c
View File

@ -1818,14 +1818,12 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget,
IShellLinkDataList *dl = NULL; IShellLinkDataList *dl = NULL;
IPersistFile *pf = NULL; IPersistFile *pf = NULL;
LPEXP_DARWIN_LINK darwin = NULL; LPEXP_DARWIN_LINK darwin = NULL;
HRESULT r; HRESULT r, init;
TRACE("%s %p %p %p\n", debugstr_w(szShortcutTarget), TRACE("%s %p %p %p\n", debugstr_w(szShortcutTarget),
szProductCode, szFeatureId, szComponentCode ); szProductCode, szFeatureId, szComponentCode );
r = CoInitialize(NULL); init = CoInitialize(NULL);
if( FAILED( r ) )
return ERROR_FUNCTION_FAILED;
r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
&IID_IPersistFile, (LPVOID*) &pf ); &IID_IPersistFile, (LPVOID*) &pf );
@ -1836,7 +1834,7 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget,
if( SUCCEEDED( r ) ) if( SUCCEEDED( r ) )
{ {
r = IPersistFile_QueryInterface( pf, &IID_IShellLinkDataList, r = IPersistFile_QueryInterface( pf, &IID_IShellLinkDataList,
(LPVOID*) dl ); (LPVOID*) &dl );
if( SUCCEEDED( r ) ) if( SUCCEEDED( r ) )
{ {
IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG, IShellLinkDataList_CopyDataBlock( dl, EXP_DARWIN_ID_SIG,
@ -1847,7 +1845,8 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget,
IPersistFile_Release( pf ); IPersistFile_Release( pf );
} }
CoUninitialize(); if (SUCCEEDED(init))
CoUninitialize();
TRACE("darwin = %p\n", darwin); TRACE("darwin = %p\n", darwin);