Changeset 21113 in vbox

Timestamp:

Jul 1, 2009 11:48:47 AM (16 years ago)

Author:

vboxsync

Message:

xpcom: first go at making xpcom bitness-safe

Location:

trunk/src/libs/xpcom18a4

Files:

• ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (7 diffs)
• ipc/ipcd/extensions/dconnect/src/ipcDConnectService.h (modified) (1 diff)
• xpcom/base/nscore.h (modified) (2 diffs)
• xpcom/ds/nsCheapSets.h (modified) (2 diffs)
• xpcom/ds/nsVoidArray.h (modified) (1 diff)
• xpcom/io/nsFastLoadService.cpp (modified) (2 diffs)

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

@@ -1533 +1533 @@
     if (NS_SUCCEEDED(rv) && (stub->PeerID() == peer))
     {
-      void *p = stub->Instance();
+      DConAddr p = stub->Instance();
       writer.PutBytes(&p, sizeof(p));
     }
@@ -1850 +1850 @@
       {
         // send the wrapper instance back to the peer
-        void *p = stub->Stub()->Instance();
+        DConAddr p = stub->Stub()->Instance();
         writer.PutBytes(&p, sizeof(p));
       }
@@ -3473 +3473 @@
     {
       const DConnectSetupQueryInterface *setupQI = (const DConnectSetupQueryInterface *) setup;
+      DConnectInstance *instance = (DConnectInstance *)setupQI->instance;
 
       // make sure we've been sent a valid wrapper
-      if (!CheckInstanceAndAddRef(setupQI->instance, peer))
+      if (!CheckInstanceAndAddRef(instance, peer))
       {
         NS_NOTREACHED("instance wrapper not found");
@@ -3482 +3483 @@
       else
       {
-        rv = setupQI->instance->RealInstance()->QueryInterface(setupQI->iid, (void **) &instance);
-        setupQI->instance->Release();
+        rv = instance->RealInstance()->QueryInterface(setupQI->iid, (void **) &instance);
+        instance->Release();
       }
       break;
@@ -3588 +3589 @@
   msg.flags = 0;
   msg.request_index = setup->request_index;
-  msg.instance = wrapper;
+  msg.instance = (DConAddr)wrapper;
   msg.status = rv;
 
@@ -3623 +3624 @@
        peer, release->instance));
 
-  DConnectInstance *wrapper = release->instance;
+  DConnectInstance *wrapper = (DConnectInstance *)release->instance;
 
   nsAutoLock lock (mLock);
@@ -3658 +3659 @@
       peer, invoke->instance, invoke->method_index));
 
-  DConnectInstance *wrapper = invoke->instance;
+  DConnectInstance *wrapper = (DConnectInstance *)invoke->instance;
 
   ipcMessageReader reader((const PRUint8 *) (invoke + 1), opLen - sizeof(*invoke));

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

@@ -144 +144 @@
 };
 
-typedef class DConnectInstance* DConAddr;
+typedef PRUint64 DConAddr;
 
 // a key class used to identify DConnectStub objects stored in a hash table

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

@@ -431 +431 @@
 #endif
  
+#ifndef VBOX
 /* 
  * Use these macros to do 64bit safe pointer conversions.
@@ -437 +438 @@
 #define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
 #define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
+#else /* VBOX */
+// This stuff is (contrary to the comment) totally 64bit unsafe, so strip
+// it down to only do one direction, which is used by the hashing code.
+#define NS_PTR_TO_INT32(x) ((PRInt32)((char *)(x) - (char *)0))
+#endif /* VBOX */
 
 /*

trunk/src/libs/xpcom18a4/xpcom/ds/nsCheapSets.h

@@ -83 +83 @@
 
 private:
-  typedef unsigned long PtrBits;
+  typedef PRUint64 PtrBits;
 
   /** Get the hash pointer (or null if we're not a hash) */
@@ -156 +156 @@
 
 private:
-  typedef unsigned long PtrBits;
+  typedef PRUint64 PtrBits;
 
   /** Get the hash pointer (or null if we're not a hash) */

trunk/src/libs/xpcom18a4/xpcom/ds/nsVoidArray.h

@@ -376 +376 @@
 
 private:
-  typedef unsigned long PtrBits;
+  typedef PRUint64 PtrBits;
 
   PRBool HasSingleChild() const

trunk/src/libs/xpcom18a4/xpcom/io/nsFastLoadService.cpp

@@ -395 +395 @@
         return rv;
 
+#ifndef VBOX
     mChecksumTable.Put(&key, NS_INT32_TO_PTR(checksum));
+#else /* VBOX */
+    mChecksumTable.Put(&key, (void *)checksum);
+#endif /* VBOX */
     *aChecksum = checksum;
     return NS_OK;
@@ -418 +422 @@
 
     nsCStringKey key(path);
+#ifndef VBOX
     mChecksumTable.Put(&key, NS_INT32_TO_PTR(checksum));
+#else /* VBOX */
+    mChecksumTable.Put(&key, (void *)checksum);
+#endif /* VBOX */
     return NS_OK;
 }