msi: Ignore CoInitialize failure in ACTION_CreateShortcuts.
This commit is contained in:
parent
bf1b965e96
commit
dd1ca6ca5e
|
@ -3387,15 +3387,11 @@ 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);
|
||||||
|
|
||||||
|
if (SUCCEEDED(res))
|
||||||
CoUninitialize();
|
CoUninitialize();
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
|
|
|
@ -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();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue