Changeset 21169 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/extensions

Timestamp:

Jul 2, 2009 2:34:49 PM (16 years ago)

Author:

vboxsync

Message:

xpcom: fix hopefully all remaining bitness issues

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src

Files:

• ipcDConnectService.cpp (modified) (15 diffs)
• ipcDConnectService.h (modified) (1 diff)

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

@@ -196 +196 @@
 //-----------------------------------------------------------------------------
 
+struct DConAddrPlusPtr
+{
+  DConAddr addr;
+  void *p;
+};
+
+//-----------------------------------------------------------------------------
+
 ipcDConnectService *ipcDConnectService::mInstance = nsnull;
 
@@ -533 +541 @@
     case nsXPTType::T_INTERFACE_IS:
       {
-        reader.GetBytes(&v.val.p, sizeof(void *));
+        reader.GetBytes(&v.val.u64, sizeof(DConAddr));
         // stub creation will be handled outside this routine.  we only
-        // deserialize the DConAddr into v.val.p temporarily.
+        // deserialize the DConAddr into v.val.u64 temporarily.
       }
       break;
@@ -768 +776 @@
       {
         // stub creation will be handled outside this routine.  we only
-        // deserialize the DConAddr into v.val.p temporarily.
-        void *ptr;
-        reader.GetBytes(&ptr, sizeof(void *));
-        *((void **) v.val.p) = ptr;
+        // deserialize the DConAddr and the original value of v.val.p
+        // into v.val.p temporarily.  needs temporary memory alloc.
+        DConAddrPlusPtr *buf = (DConAddrPlusPtr *) nsMemory::Alloc(sizeof(DConAddrPlusPtr));
+        reader.GetBytes(&buf->addr, sizeof(DConAddr));
+        buf->p = v.val.p;
+        v.val.p = buf;
       }
       break;
@@ -939 +949 @@
     case nsXPTType::T_CHAR_STR:       /* fall through */
     case nsXPTType::T_WCHAR_STR:      /* fall through */
-    case nsXPTType::T_INTERFACE:      /* fall through */
-    case nsXPTType::T_INTERFACE_IS:   /* fall through */
     case nsXPTType::T_ASTRING:        /* fall through */
     case nsXPTType::T_DOMSTRING:      /* fall through */
@@ -946 +954 @@
     case nsXPTType::T_CSTRING:        /* fall through */
       size = sizeof(void *);
+      isSimple = PR_FALSE;
+      break;
+    case nsXPTType::T_INTERFACE:      /* fall through */
+    case nsXPTType::T_INTERFACE_IS:   /* fall through */
+      size = sizeof(DConAddr);
       isSimple = PR_FALSE;
       break;
@@ -1097 +1110 @@
     {
       // grab the DConAddr value temporarily stored in the param
-      PtrBits bits = (PtrBits) v.val.p;
+      PtrBits bits = v.val.u64;
 
       // DeserializeInterfaceParamBits needs IID only if it's a remote object
@@ -1525 +1538 @@
   {
     // write null address
-    writer.PutBytes(&obj, sizeof(obj));
+    DConAddr nullobj = 0;
+    writer.PutBytes(&nullobj, sizeof(nullobj));
   }
   else
@@ -1582 +1596 @@
       // send address of the instance wrapper, and set the low bit to indicate
       // to the remote party that this is a remote instance wrapper.
-      PtrBits bits = ((PtrBits) wrapper) | PTRBITS_REMOTE_BIT;
+      PtrBits bits = ((PtrBits)(uintptr_t) wrapper) | PTRBITS_REMOTE_BIT;
       writer.PutBytes(&bits, sizeof(bits));
     }
@@ -1900 +1914 @@
         // send address of the instance wrapper, and set the low bit to indicate
         // to the remote party that this is a remote instance wrapper.
-        PtrBits bits = ((PtrBits) wrapper) | PTRBITS_REMOTE_BIT;
+        PtrBits bits = ((PtrBits)(uintptr_t) wrapper) | PTRBITS_REMOTE_BIT;
         writer.PutBytes(&bits, sizeof(bits));
 
@@ -1987 +2001 @@
   PRUint32 len;
 
-  void *instance = 0;
-  reader.GetBytes(&instance, sizeof(void *));
+  PtrBits bits = 0;
+  reader.GetBytes(&bits, sizeof(DConAddr));
   if (reader.HasError())
     return NS_ERROR_INVALID_ARG;
-
-  PtrBits bits = (PtrBits) (instance);
 
   if (bits & PTRBITS_REMOTE_BIT)
@@ -2514 +2526 @@
       if (aParams[i].val.p && (paramInfo.IsOut() || paramInfo.IsRetval()))
       {
-        void **pptr = (void **) aParams[i].val.p;
         const nsXPTType &type = paramInfo.GetType();
         if (type.IsInterfacePointer())
         {
-          // grab the DConAddr value temporarily stored in the param
-          PtrBits bits = (PtrBits) *pptr;
-          *pptr = nsnull;
+          // grab the DConAddr value temporarily stored in the param, restore
+          // the pointer and free the temporarily allocated memory.
+          DConAddrPlusPtr *dptr = (DConAddrPlusPtr *)aParams[i].val.p;
+          PtrBits bits = dptr->addr;
+          aParams[i].val.p = dptr->p;
+          nsMemory::Free((void *)dptr);
 
           // DeserializeInterfaceParamBits needs IID only if it's a remote object
@@ -2533 +2547 @@
             rv = dConnect->DeserializeInterfaceParamBits(bits, mPeerID, iid, obj);
             if (NS_SUCCEEDED(rv))
-              *pptr = obj;
+              *(void **)aParams[i].val.p = obj;
           }
         }
@@ -2543 +2557 @@
                                      paramInfo, PR_TRUE, array);
           if (NS_SUCCEEDED(rv))
-            *pptr = array;
+            *(void **)aParams[i].val.p = array;
         }
       }
@@ -3589 +3603 @@
   msg.flags = 0;
   msg.request_index = setup->request_index;
-  msg.instance = (DConAddr)wrapper;
+  msg.instance = (DConAddr)(uintptr_t)wrapper;
   msg.status = rv;
 
@@ -3732 +3746 @@
       {
         // grab the DConAddr value temporarily stored in the param
-        PtrBits bits = (PtrBits) params[i].val.p;
+        PtrBits bits = (PtrBits)(uintptr_t) params[i].val.p;
 
         // DeserializeInterfaceParamBits needs IID only if it's a remote object

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

@@ -188 +188 @@
 // used elsewhere like nsAtomTable to safely represent the integral value
 // of an address.
-typedef unsigned long PtrBits;
+typedef PRUint64 PtrBits;
 
 // bit flag that defines if a PtrBits value represents a remote object