儲存庫 vbox 的更動 4737

時間撮記:

2007-9-12 下午03:44:32 (17 年 以前)

作者:

vboxsync

訊息:

Main: Fixed logging.

檔案:

• trunk/src/VBox/Main/glue/initterm.cpp (修改) (1 筆差異)

trunk/src/VBox/Main/glue/initterm.cpp

@@ -184 +184 @@
      * brute force method: */
 
-    enum { MaxTries = 10000 };
-    int tries = MaxTries;
-    while (rc == RPC_E_CHANGED_MODE && tries --)
+    if (rc == RPC_E_CHANGED_MODE)
     {
         LogFlowFunc (("COM already initialized in wrong apartment mode, "
                       "will reinitialize.\n"));
 
-        CoUninitialize();
-        rc = CoInitializeEx (NULL, flags);
-        if (rc == S_OK)
-        {
-            /* We've successfully reinitialized COM; restore the
-             * initialization reference counter */
-
-            LogFlowFunc (("Will call CoInitializeEx() %d times.\n",
-                          MaxTries - tries));
-
-            while (tries ++ < MaxTries)
-            {
-                rc = CoInitializeEx (NULL, flags);
-                Assert (rc == S_FALSE);
-            }
-        }
-    }
-
-    /* the overall result must be either S_OK or S_FALSE */
+        enum { MaxTries = 10000 };
+        int tries = MaxTries;
+        while (rc == RPC_E_CHANGED_MODE && tries --)
+        {
+            CoUninitialize();
+            rc = CoInitializeEx (NULL, flags);
+            if (rc == S_OK)
+            {
+                /* We've successfully reinitialized COM; restore the
+                 * initialization reference counter */
+
+                LogFlowFunc (("Will call CoInitializeEx() %d times.\n",
+                              MaxTries - tries));
+
+                while (tries ++ < MaxTries)
+                {
+                    rc = CoInitializeEx (NULL, flags);
+                    Assert (rc == S_FALSE);
+                }
+            }
+        }
+    }
+
+    /* the overall result must be either S_OK or S_FALSE (S_FALSE means
+     * "already initialized using the same apartment model") */
     AssertMsg (rc == S_OK || rc == S_FALSE, ("rc=%08X\n", rc));