Changeset 18806 in vbox for trunk/src/VBox

Timestamp:

Apr 7, 2009 11:41:25 AM (16 years ago)

Author:

vboxsync

Message:

tstXPCOMCCall.c: adjustments.

File:

• trunk/src/VBox/Main/cbinding/tstXPCOMCCall.c (modified) (18 diffs)

trunk/src/VBox/Main/cbinding/tstXPCOMCCall.c

@@ -35 +35 @@
 static void startVM(IVirtualBox *virtualBox, ISession *session, nsID *id);
 
-int refcount = 0;
+int volatile g_refcount = 0;
 
 /**
@@ -81 +81 @@
 }
 
-nsresult OnMousePointerShapeChange(
+static nsresult OnMousePointerShapeChange(
     IConsoleCallback *this_,
     PRBool visible,
@@ -95 +95 @@
 }
 
-nsresult OnMouseCapabilityChange(
+static nsresult OnMouseCapabilityChange(
     IConsoleCallback *this_,
     PRBool supportsAbsolute,
@@ -104 +104 @@
 }
 
-nsresult OnKeyboardLedsChange(
+static nsresult OnKeyboardLedsChange(
     IConsoleCallback *this_,
     PRBool numLock,
@@ -114 +114 @@
 }
 
-nsresult OnStateChange(
+static nsresult OnStateChange(
     IConsoleCallback *this_,
     PRUint32 state
@@ -124 +124 @@
 }
 
-nsresult OnAdditionsStateChange(IConsoleCallback *this_ )
-{
-    printf("%d here\n",__LINE__);
-    return 0;
-}
-
-nsresult OnDVDDriveChange(IConsoleCallback *this_ )
-{
-    printf("%d here\n",__LINE__);
-    return 0;
-}
-
-nsresult OnFloppyDriveChange(IConsoleCallback *this_ )
-{
-    printf("%d here\n",__LINE__);
-    return 0;
-}
-
-nsresult OnNetworkAdapterChange(
+static nsresult OnAdditionsStateChange(IConsoleCallback *this_ )
+{
+    printf("%d here\n",__LINE__);
+    return 0;
+}
+
+static nsresult OnDVDDriveChange(IConsoleCallback *this_ )
+{
+    printf("%d here\n",__LINE__);
+    return 0;
+}
+
+static nsresult OnFloppyDriveChange(IConsoleCallback *this_ )
+{
+    printf("%d here\n",__LINE__);
+    return 0;
+}
+
+static nsresult OnNetworkAdapterChange(
     IConsoleCallback *this_,
     INetworkAdapter * networkAdapter
@@ -150 +150 @@
 }
 
-nsresult OnSerialPortChange(
+static nsresult OnSerialPortChange(
     IConsoleCallback *this_,
     ISerialPort * serialPort
@@ -158 +158 @@
 }
 
-nsresult OnParallelPortChange(
+static nsresult OnParallelPortChange(
     IConsoleCallback *this_,
     IParallelPort * parallelPort
@@ -166 +166 @@
 }
 
-nsresult OnStorageControllerChange(IConsoleCallback *this_ )
-{
-    printf("%d here\n",__LINE__);
-    return 0;
-}
-
-nsresult OnVRDPServerChange(IConsoleCallback *this_ )
-{
-    printf("%d here\n",__LINE__);
-    return 0;
-}
-
-nsresult OnUSBControllerChange(IConsoleCallback *this_ )
-{
-    printf("%d here\n",__LINE__);
-    return 0;
-}
-
-nsresult OnUSBDeviceStateChange(
+static nsresult OnStorageControllerChange(IConsoleCallback *this_ )
+{
+    printf("%d here\n",__LINE__);
+    return 0;
+}
+
+static nsresult OnVRDPServerChange(IConsoleCallback *this_ )
+{
+    printf("%d here\n",__LINE__);
+    return 0;
+}
+
+static nsresult OnUSBControllerChange(IConsoleCallback *this_ )
+{
+    printf("%d here\n",__LINE__);
+    return 0;
+}
+
+static nsresult OnUSBDeviceStateChange(
     IConsoleCallback *this_,
     IUSBDevice * device,
@@ -194 +194 @@
 }
 
-nsresult OnSharedFolderChange(
+static nsresult OnSharedFolderChange(
     IConsoleCallback *this_,
     PRUint32 scope
@@ -202 +202 @@
 }
 
-nsresult OnRuntimeError(
+static nsresult OnRuntimeError(
     IConsoleCallback *this_,
     PRBool fatal,
@@ -212 +212 @@
 }
 
-nsresult OnCanShowWindow(
+static nsresult OnCanShowWindow(
     IConsoleCallback *this_,
     PRBool * canShow
@@ -220 +220 @@
 }
 
-nsresult OnShowWindow(
+static nsresult OnShowWindow(
     IConsoleCallback *this_,
     PRUint64 * winId
@@ -229 +229 @@
 
 
-nsresult AddRef(IConsoleCallback *this_)
-{
+static nsresult AddRef(nsISupports *this_)
+{
+    nsresult c;
+
     printf("AddRef\n");
-    refcount++;
-    return refcount;
-}
-
-nsresult Release(IConsoleCallback *this_)
-{
+    c = g_refcount++;
+    return c;
+}
+
+static nsresult Release(nsISupports *this_)
+{
+    nsresult c;
     printf("Release\n");
-    refcount--;
-    return refcount;
-}
-
-nsresult QueryInterface(IConsoleCallback *this_, const nsID *iid, void **resultp)
-{
+
+    c = g_refcount--;
+    if (c == 0)
+    {
+        /* delete object */
+#if 0 /* test */
+        free(this_->vtbl);
+        free(this_);
+#endif
+    }
+    return c;
+}
+
+static nsresult QueryInterface(nsISupports *this_, const nsID *iid, void **resultp)
+{
+    IConsoleCallback *that = (IConsoleCallback *)this_;
+
     printf("QueryInterface\n");
-    refcount++;
-    *resultp = this_;
+    /* match iid */
+    g_refcount++;
+    *resultp = that;
     return 0;
 }
@@ -287 +302 @@
             consoleCallback->vtbl->OnCanShowWindow = &OnCanShowWindow;
             consoleCallback->vtbl->OnShowWindow = &OnShowWindow;
+            g_refcount = 1;
 
             printf("%d here\n",__LINE__);
@@ -292 +308 @@
             printf("%d here\n",__LINE__);
 
-            int run = 10;
-            while (run-- > 0) {
-                sleep(1);
-                printf("waiting here:%d\n",run);
-                fflush(stdout);
+            {
+                int run = 10;
+                while (run-- > 0) {
+                    sleep(1);
+                    printf("waiting here:%d\n",run);
+                    fflush(stdout);
+                }
             }
             console->vtbl->UnregisterCallback(console, consoleCallback);
         }
-        //free(consoleCallback->vtbl);
-        //free(consoleCallback);
+        /*consoleCallback->vtbl->Release(consoleCallback);*/
     }
     session->vtbl->Close((void *)session);
@@ -447 +464 @@
 
             machine->vtbl->GetId(machine, &iid);
-            //startVM(virtualBox, session, iid);
+            /*startVM(virtualBox, session, iid);*/
             registerCallBack(virtualBox, session, iid);
 
@@ -464 +481 @@
         if (machine)
         {
-            machine->vtbl->nsisupports.Release((void *)machine);
+            machine->vtbl->nsisupports.Release((nsISupports *)machine);
         }
     }