Changeset 50853 in vbox for trunk/src/VBox/Runtime

Timestamp:

Mar 24, 2014 11:44:34 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

92939

Message:

Runtime/r3/win/RTSystemQueryDmiString: don't fail if the COM lib was already initialized

File:

• trunk/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp

@@ -166 +166 @@
      * Before we do anything with COM, we have to initialize it.
      */
+    bool fUninit = true;
     HRESULT hrc = rtSystemDmiWinInitialize();
-    if (FAILED(hrc))
+    if (hrc == RPC_E_CHANGED_MODE)
+        fUninit = false;  /* don't fail if already initialized */
+    else if (FAILED(hrc))
         return VERR_NOT_SUPPORTED;
 
@@ -247 +250 @@
     else
         hrc = E_OUTOFMEMORY;
-    rtSystemDmiWinTerminate();
+    if (fUninit)
+        rtSystemDmiWinTerminate();
     if (FAILED(hrc) && rc == VERR_NOT_SUPPORTED)
         rc = VERR_NOT_SUPPORTED;