Changeset 16835 in vbox

Timestamp:

Feb 17, 2009 12:49:35 PM (16 years ago)

Author:

vboxsync

Message:

tstXPCOMCGlue.c: transformed tstLinux.c to use the glue code.

Location:

trunk/src/VBox/Main/cbinding

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxXPCOMCGlue.c (modified) (3 diffs)
• VBoxXPCOMCGlue.h (modified) (1 diff)
• tstXPCOMCGlue.c (copied) (copied from trunk/src/VBox/Main/cbinding/tstLinuxC.c ) (15 diffs)

trunk/src/VBox/Main/cbinding/Makefile.kmk

@@ -88 +88 @@
 
   #
+  # C testcase using the dynamic glue.
+  #
+  PROGRAMS.linux += tstXPCOMCGlue
+  tstXPCOMCGlue_TEMPLATE = VBOXR3
+  tstXPCOMCGlue_INCS = \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub
+  tstXPCOMCGlue_INTERMEDIATES = \
+        $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_CXPCOM.h
+  tstXPCOMCGlue_SOURCES = \
+        tstXPCOMCGlue.c
+  tstXPCOMCGlue_LIBS = \
+        $(VBoxXPCOMCGlue_1_TARGET)
+
+  #
   # The testcase (also in samples).
   #

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

@@ -50 +50 @@
 void *g_hVBoxXPCOMC = NULL;
 /** The last load error. */
-char g_szVBoxXPCOMErrMsg[256];
+char g_szVBoxErrMsg[256];
 /** Pointer to the VBoxXPCOMC function table.  */
 PCVBOXXPCOM g_pVBoxFuncs = NULL;
@@ -77 +77 @@
     if (!pszBuf)
     {
-        sprintf(g_szVBoxXPCOMErrMsg, "malloc(%u) failed", (unsigned)cbBuf);
+        sprintf(g_szVBoxErrMsg, "malloc(%u) failed", (unsigned)cbBuf);
         if (pszMsgPrefix)
-            fprintf(stderr, "%s%s\n", pszMsgPrefix, g_szVBoxXPCOMErrMsg);
+            fprintf(stderr, "%s%s\n", pszMsgPrefix, g_szVBoxErrMsg);
         return -1;
     }
@@ -107 +107 @@
                 rc = 0;
             else
-                sprintf(g_szVBoxXPCOMErrMsg, "%.80s: pfnGetFunctions(%#x) failed",
+                sprintf(g_szVBoxErrMsg, "%.80s: pfnGetFunctions(%#x) failed",
                         pszBuf, VBOX_XPCOMC_VERSION);
         }
         else
-            sprintf(g_szVBoxXPCOMErrMsg, "dlsym(%.80s/%.32s): %128s",
+            sprintf(g_szVBoxErrMsg, "dlsym(%.80s/%.32s): %128s",
                     pszBuf, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror());
     }
     else
-        sprintf(g_szVBoxXPCOMErrMsg, "dlopen(%.80s): %128s", pszBuf, dlerror());
+        sprintf(g_szVBoxErrMsg, "dlopen(%.80s): %128s", pszBuf, dlerror());
     free(pszBuf);
     return rc;

trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.h

@@ -32 +32 @@
 extern void *g_hVBoxXPCOMC;
 /** The last load error. */
-extern char g_szVBoxXPCOMErrMsg[256];
+extern char g_szVBoxErrMsg[256];
 /** Pointer to the VBoxXPCOMC function table.  */
 extern PCVBOXXPCOM g_pVBoxFuncs;

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

@@ -1 +1 @@
 /* $Revsion: $ */
-/** @file tstLinuxC.c
+/** @file tstXPCOMCGlue.c
  * Demonstrator program to illustrate use of C bindings of Main API.
  *
@@ -22 +22 @@
  */
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
+#include "VBoxXPCOMCGlue.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-#include "cbinding.h"
 
 static char *nsIDToString(nsID *guid);
@@ -114 +117 @@
 
             machine->vtbl->GetName(machine, &machineNameUtf16);
-            VBoxUtf16ToUtf8(machineNameUtf16,&machineName);
+            g_pVBoxFuncs->pfnUtf16ToUtf8(machineNameUtf16,&machineName);
             printf("\tName:        %s\n", machineName);
 
-            VBoxUtf8Free(machineName);
-            VBoxComUnallocMem(machineNameUtf16);
+            g_pVBoxFuncs->pfnUtf8Free(machineName);
+            g_pVBoxFuncs->pfnComUnallocMem(machineNameUtf16);
         }
         else
@@ -135 +138 @@
 
             free(uuidString);
-            VBoxComUnallocMem(iid);
+            g_pVBoxFuncs->pfnComUnallocMem(iid);
         }
 
@@ -145 +148 @@
 
                 machine->vtbl->GetSettingsFilePath(machine, &configFile);
-                VBoxUtf16ToUtf8(configFile, &configFile1);
+                g_pVBoxFuncs->pfnUtf16ToUtf8(configFile, &configFile1);
                 printf("\tConfig file: %s\n", configFile1);
 
                 free(configFile1);
-                VBoxComUnallocMem(configFile);
+                g_pVBoxFuncs->pfnComUnallocMem(configFile);
             }
 
@@ -168 +171 @@
                 virtualBox->vtbl->GetGuestOSType(virtualBox, typeId, &osType);
                 osType->vtbl->GetDescription(osType, &osNameUtf16);
-                VBoxUtf16ToUtf8(osNameUtf16,&osName);
+                g_pVBoxFuncs->pfnUtf16ToUtf8(osNameUtf16,&osName);
                 printf("\tGuest OS:    %s\n\n", osName);
 
                 osType->vtbl->nsisupports.Release((void *)osType);
-                VBoxUtf8Free(osName);
-                VBoxComUnallocMem(osNameUtf16);
-                VBoxComUnallocMem(typeId);
+                g_pVBoxFuncs->pfnUtf8Free(osName);
+                g_pVBoxFuncs->pfnComUnallocMem(osNameUtf16);
+                g_pVBoxFuncs->pfnComUnallocMem(typeId);
             }
         }
@@ -198 +201 @@
             startVM(virtualBox, session, iid);
 
-            VBoxComUnallocMem(iid);
+            g_pVBoxFuncs->pfnComUnallocMem(iid);
         }
     }
@@ -240 +243 @@
     }
 
-    VBoxUtf8ToUtf16("gui", &sessionType);
+    g_pVBoxFuncs->pfnUtf8ToUtf16("gui", &sessionType);
 
     rc = virtualBox->vtbl->OpenRemoteSession(
@@ -251 +254 @@
     );
 
-    VBoxUtf16Free(sessionType);
+    g_pVBoxFuncs->pfnUtf16Free(sessionType);
 
     if (NS_FAILED(rc))
@@ -280 +283 @@
             progress->vtbl->GetErrorInfo(progress, &errorInfo);
             errorInfo->vtbl->GetText(errorInfo, &textUtf16);
-            VBoxUtf16ToUtf8(textUtf16, &text);
+            g_pVBoxFuncs->pfnUtf16ToUtf8(textUtf16, &text);
             printf("Error: %s\n", text);
 
-            VBoxComUnallocMem(textUtf16);
-            VBoxUtf8Free(text);
+            g_pVBoxFuncs->pfnComUnallocMem(textUtf16);
+            g_pVBoxFuncs->pfnUtf8Free(text);
         }
         else
@@ -309 +312 @@
     nsresult    rc;     /* Result code of various function (method) calls. */
 
-    /*
-     * Guess where VirtualBox is installed not mentioned in the environment.
-     * (This will be moved to VBoxComInitialize later.)
-     */
-
-    if (!VBoxGetEnv("VBOX_APP_HOME"))
-    {
-        if (stat("/opt/VirtualBox/VBoxXPCOMC.so", &stIgnored) == 0)
-        {
-            VBoxSetEnv("VBOX_APP_HOME","/opt/VirtualBox/");
-        }
-        if (stat("/usr/lib/virtualbox/VBoxXPCOMC.so", &stIgnored) == 0)
-        {
-            VBoxSetEnv("VBOX_APP_HOME","/usr/lib/virtualbox/");
-        }
-    }
-
     printf("Starting Main\n");
 
@@ -335 +321 @@
      */
 
-    VBoxComInitialize(&vbox, &session);
-
+    if (VBoxCGlueInit(NULL) != 0)
+    {
+        fprintf(stderr, "%s: FATAL: VBoxCGlueInit failed: %s\n",
+                argv[0], g_szVBoxErrMsg);
+        return EXIT_FAILURE;
+    }
+
+    g_pVBoxFuncs->pfnComInitialize(&vbox, &session);
     if (vbox == NULL)
     {
@@ -375 +367 @@
     {
         char *version = NULL;
-        VBoxUtf16ToUtf8(versionUtf16, &version);
+        g_pVBoxFuncs->pfnUtf16ToUtf8(versionUtf16, &version);
         printf("\tVersion: %s\n", version);
-        VBoxUtf8Free(version);
-        VBoxComUnallocMem(versionUtf16);
+        g_pVBoxFuncs->pfnUtf8Free(version);
+        g_pVBoxFuncs->pfnComUnallocMem(versionUtf16);
     }
     else
@@ -392 +384 @@
     {
         char *homefolder = NULL;
-        VBoxUtf16ToUtf8(homefolderUtf16, &homefolder);
+        g_pVBoxFuncs->pfnUtf16ToUtf8(homefolderUtf16, &homefolder);
         printf("\tHomeFolder: %s\n", homefolder);
-        VBoxUtf8Free(homefolder);
-        VBoxComUnallocMem(homefolderUtf16);
+        g_pVBoxFuncs->pfnUtf8Free(homefolder);
+        g_pVBoxFuncs->pfnComUnallocMem(homefolderUtf16);
     }
     else
@@ -412 +404 @@
      */
 
-    VBoxComUninitialize();
+    g_pVBoxFuncs->pfnComUninitialize();
+    VBoxCGlueTerm();
     printf("Finished Main\n");