[PATCH 2/5] setupapi: Initialize COM if necessary when registering DLLs.

[Zebediah Figura]

From: Zebediah Figura

Signed-off-by: Zebediah Figura 
---
 dlls/setupapi/install.c       | 14 ++++++++++++++
 dlls/setupapi/tests/install.c |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c
index e1667541680..86390b5a41c 100644
--- a/dlls/setupapi/install.c
+++ b/dlls/setupapi/install.c
@@ -1125,6 +1125,7 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
     if (flags & SPINST_REGSVR)
     {
         struct register_dll_info info;
+        HRESULT hr;

info.unregister    = FALSE;
         info.modules_size  = 0;
@@ -1142,14 +1143,21 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
         else
             return FALSE;

+        hr = CoInitialize(NULL);
+
         ret = iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info );
         for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] );
+
+        if (SUCCEEDED(hr))
+            CoUninitialize();
+
         HeapFree( GetProcessHeap(), 0, info.modules );
         if (!ret) return FALSE;
     }
     if (flags & SPINST_UNREGSVR)
     {
         struct register_dll_info info;
+        HRESULT hr;

info.unregister    = TRUE;
         info.modules_size  = 0;
@@ -1162,8 +1170,14 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section,
         }
         else info.callback = NULL;

+        hr = CoInitialize(NULL);
+
         ret = iterate_section_fields( hinf, section, UnregisterDlls, register_dlls_callback, &info );
         for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] );
+
+        if (SUCCEEDED(hr))
+            CoUninitialize();
+
         HeapFree( GetProcessHeap(), 0, info.modules );
         if (!ret) return FALSE;
     }
diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c
index b918bb21f60..8a2f9eec351 100644
--- a/dlls/setupapi/tests/install.c
+++ b/dlls/setupapi/tests/install.c
@@ -2092,7 +2092,7 @@ static void test_register_dlls(void)
     ok(ret, "Failed to install, error %#x.\n", GetLastError());

l = RegOpenKeyA(HKEY_CURRENT_USER, "winetest_setupapi_selfreg", &key);
-    todo_wine ok(!l, "Got error %u.\n", l);
+    ok(!l, "Got error %u.\n", l);
     RegCloseKey(key);

ret = SetupInstallFromInfSectionA(NULL, hinf, "DefaultInstall", SPINST_UNREGSVR,