Make sure we only CoUninitialize after successfully initializing.

Fix the address of the returned IShellLinkDataList interface.

Make sure we only CoUninitialize after successfully initializing.
454fa4be · Mike McCormack · Alexandre Julliard · bf5155b6 · 454fa4be
Commit 454fa4be authored Nov 09, 2005 by Mike McCormack Committed by Alexandre Julliard Nov 09, 2005
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

msi.c dlls/msi/msi.c +4 -5

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