vbox的更動 64428 路徑 trunk/src/libs

時間撮記:

2016-10-26 下午12:35:20 (8 年 以前)

作者:

vboxsync

訊息:

xpcom/Runtime: introduced NS_ERROR_SOCKET_FAIL which is used for XPCOM socket errors at /tmp/.vbox-*-ipc/ipcd

位置:

trunk/src/libs/xpcom18a4

檔案:

• ipc/ipcd/client/src/ipcConnectionUnix.cpp (修改) (2 筆差異)
• xpcom/base/nsError.h (修改) (1 筆差異)
• xpcom/components/nsComponentManager.cpp (修改) (1 筆差異)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcConnectionUnix.cpp

@@ -420 +420 @@
   PRNetAddr addr;
   PRSocketOptionData opt;
-  nsresult rv = NS_ERROR_FAILURE;
+  // don't use NS_ERROR_FAILURE as we want to detect these kind of errors
+  // in the frontend
+  nsresult rv = NS_ERROR_SOCKET_FAIL;
 
   fd = PR_OpenTCPSocket(PR_AF_LOCAL);
@@ -480 +482 @@
   if (NS_FAILED(rv))
   {
-    rv = IPC_SpawnDaemon(daemonPath);
+    nsresult rv1 = IPC_SpawnDaemon(daemonPath);
+    if (NS_SUCCEEDED(rv1) || rv != NS_ERROR_SOCKET_FAIL)
+      rv = rv1; 
     if (NS_SUCCEEDED(rv))
       rv = TryConnect(&fd);

trunk/src/libs/xpcom18a4/xpcom/base/nsError.h

@@ -215 +215 @@
 #define NS_ERROR_FACTORY_EXISTS            (NS_ERROR_BASE + 0x100)
 
+/* Socket failures */
+#define NS_ERROR_SOCKET_FAIL               (NS_ERROR_BASE + 0x200)
+
 
 /* For COM compatibility reasons, we want to use exact error code numbers

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -1962 +1962 @@
     {
         // Translate error values
-        rv = NS_ERROR_FACTORY_NOT_REGISTERED;
+        if (rv != NS_ERROR_SOCKET_FAIL)
+            rv = NS_ERROR_FACTORY_NOT_REGISTERED;
     }