vbox的更動 69117 路徑 trunk/src/VBox

時間撮記:

2017-10-17 下午05:29:34 (7 年 以前)

作者:

vboxsync

訊息:

vboxapi.py: Check for RPC_E_TOO_LATE instead of blindly claiming this is the case. Documented the next step wrt to calling thread ID + handle.

檔案:

• trunk/src/VBox/Main/glue/vboxapi.py (修改) (4 筆差異)

trunk/src/VBox/Main/glue/vboxapi.py

@@ -440 +440 @@
         # Setup client impersonation in COM calls.
         try:
-            pythoncom.CoInitializeSecurity(None, 
+            pythoncom.CoInitializeSecurity(None,
                                            None,
                                            None,
@@ -449 +449 @@
                                            None)
         except:
-            # handle RPC_E_TOO_LATE (repeat call of CoInitializeSecurity)
-            print("Warning: CoInitializeSecurity was already called")
-
+            _, oXcpt, _ = sys.exc_info();
+            if isinstance(oXcpt, pythoncom.com_error) and self.xcptGetStatus(oXcpt) == -2147417831: # RPC_E_TOO_LATE
+                print("Warning: CoInitializeSecurity was already called");
+            else:
+                print("Warning: CoInitializeSecurity failed: ", oXctp);
+
+        # Remember this thread ID and get its handle so we can wait on it in waitForEvents().
+        self.tid = GetCurrentThreadId()
         pid = GetCurrentProcess()
-        self.tid = GetCurrentThreadId()
-        handle = DuplicateHandle(pid, GetCurrentThread(), pid, 0, 0, DUPLICATE_SAME_ACCESS)
-        self.handles = []
-        self.handles.append(handle)
+        self.handles = [DuplicateHandle(pid, GetCurrentThread(), pid, 0, 0, DUPLICATE_SAME_ACCESS),];
 
         # Hack the COM dispatcher base class so we can modify method and
@@ -603 +605 @@
         from win32api import GetCurrentThreadId
         from win32event import INFINITE
-        from win32event import MsgWaitForMultipleObjects, \
-            QS_ALLINPUT, WAIT_TIMEOUT, WAIT_OBJECT_0
+        from win32event import MsgWaitForMultipleObjects, QS_ALLINPUT, WAIT_TIMEOUT, WAIT_OBJECT_0
         from pythoncom import PumpWaitingMessages
         import types
@@ -671 +672 @@
         oClient = None
         pythoncom.CoUninitialize()
-        pass
 
     def queryInterface(self, oIUnknown, sClassName):