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

msi: Ignore CoInitialize failure in ACTION_CreateShortcuts.

This commit is contained in:
Hans Leidekker 2009-09-10 10:10:33 +02:00 committed by Alexandre Julliard
parent bf1b965e96
commit dd1ca6ca5e
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msi/action.c
View File

@ -3387,16 +3387,12 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package)
return ERROR_SUCCESS; return ERROR_SUCCESS;
res = CoInitialize( NULL ); res = CoInitialize( NULL );
if (FAILED (res))
{
ERR("CoInitialize failed\n");
return ERROR_FUNCTION_FAILED;
}
rc = MSI_IterateRecords(view, NULL, ITERATE_CreateShortcuts, package); rc = MSI_IterateRecords(view, NULL, ITERATE_CreateShortcuts, package);
msiobj_release(&view->hdr); msiobj_release(&view->hdr);
CoUninitialize(); if (SUCCEEDED(res))
CoUninitialize();
return rc; return rc;
} }

2
dlls/msi/tests/install.c
View File

@ -6212,7 +6212,7 @@ static void test_shortcut(void)
ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr); ok(SUCCEEDED(hr), "CoInitialize failed 0x%08x\n", hr);
r = MsiInstallProductA(msifile, NULL); r = MsiInstallProductA(msifile, NULL);
todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);
CoUninitialize(); CoUninitialize();