Changeset 6974 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

Feb 15, 2008 5:30:32 PM (17 years ago)

Author:

vboxsync

Message:

XPCOM/IPC/DConnect: Serialize/deserialize exceptions in case of warning result codes too.

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (5 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -2467 +2467 @@
 
   rv = completion.GetResult();
-  if (NS_FAILED(rv))
+  if (rv != NS_OK)
   {
     NS_ASSERTION(completion.ParamsLen() == 0 ||
@@ -2582 +2582 @@
     LOG(("got SETUP_REPLY: status=%x instance=%p\n", reply->status, reply->instance));
 
-    if (NS_FAILED(reply->status))
+    if (reply->status != NS_OK)
     {
       mStatus = reply->status;
@@ -2589 +2589 @@
       const PRUint32 paramsLen = opLen - sizeof (DConnectSetupReply);
 
-      NS_ASSERTION(paramsLen >= sizeof(void*),
+      NS_ASSERTION(paramsLen == 0 || paramsLen >= sizeof(void*),
                    "invalid nsIException serialization length");
       if (paramsLen >= sizeof(void*))
@@ -3532 +3532 @@
   writer.PutBytes(&msg, sizeof(msg));
 
-  if (NS_FAILED(rv))
+  if (rv != NS_OK)
   {
     // try to fetch an nsIException possibly set by one of the setup methods
@@ -3728 +3728 @@
                           params);
 
-  if (NS_FAILED(rv))
+  if (rv != NS_OK)
   {
     // try to fetch an nsIException possibly set by the method