Changeset 3387 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 3, 2007 11:36:37 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22585

Message:

Main: com::GetVBoxUserHomeDirectory() now takes char * instead of Utf8Str because on XPCOM platforms, this function may be called before XPCOM has been initialized, when Utf8Str functionality is not yet available (because it uses XPCOM memory management).

Location:

trunk/src/VBox/Main

Files:

• VirtualBoxImpl.cpp (modified) (1 diff)
• glue/com.cpp (modified) (3 diffs)
• glue/initterm.cpp (modified) (2 diffs)
• testcase/tstAPI.cpp (modified) (3 diffs)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -139 +139 @@
 
     /* Get the VirtualBox home directory. */
-    int vrc = com::GetVBoxUserHomeDirectory (unconst (mData.mHomeDir));
-    if (VBOX_FAILURE (vrc))
-        return setError (E_FAIL,
-            tr ("Could not create the VirtualBox home directory '%s'"
-                "(%Vrc)"),
-            mData.mHomeDir.raw(), vrc);
+    {
+        char homeDir [RTPATH_MAX];
+        int vrc = com::GetVBoxUserHomeDirectory (homeDir, sizeof (homeDir));
+        if (VBOX_FAILURE (vrc))
+            return setError (E_FAIL,
+                tr ("Could not create the VirtualBox home directory '%s'"
+                    "(%Vrc)"),
+                homeDir, vrc);
+
+        unconst (mData.mHomeDir) = homeDir;
+    }
 
     /* compose the global config file name (always full path) */

trunk/src/VBox/Main/glue/com.cpp

@@ -133 +133 @@
 }
 
-int GetVBoxUserHomeDirectory (Utf8Str &aDir)
+int GetVBoxUserHomeDirectory (char *aDir, size_t aDirLen)
 {
+    AssertReturn (aDir, VERR_INVALID_POINTER);
+    AssertReturn (aDirLen > 0, VERR_BUFFER_OVERFLOW);
+
     /* start with null */
-    aDir.setNull();
+    *aDir = 0;
 
     const char *VBoxUserHome = RTEnvGet ("VBOX_USER_HOME");
@@ -152 +155 @@
             vrc = RTPathAbs (VBoxUserHomeUtf8, path, sizeof (path));
             if (RT_SUCCESS (vrc))
-                aDir = path;
+            {
+                if (aDirLen < strlen (path) + 1)
+                    vrc = VERR_BUFFER_OVERFLOW;
+                else
+                    strcpy (aDir, path);
+            }
             RTStrFree (VBoxUserHomeUtf8);
         }
@@ -161 +169 @@
         vrc = RTPathUserHome (path, sizeof (path));
         if (RT_SUCCESS (vrc))
-            aDir = Utf8StrFmt ("%s%c%s", path, RTPATH_DELIMITER,
-                               VBOX_USER_HOME_SUFFIX);
+        {
+            size_t len = 
+                RTStrPrintf (aDir, aDirLen, "%s%c%s",
+                             path, RTPATH_DELIMITER, VBOX_USER_HOME_SUFFIX);
+            if (len != strlen (path) + 1 + strlen (VBOX_USER_HOME_SUFFIX))
+                vrc = VERR_BUFFER_OVERFLOW;
+        }
     }
 

trunk/src/VBox/Main/glue/initterm.cpp

@@ -184 +184 @@
 
         /* prepare paths for registry files */
-        Utf8Str homeDir;
-        int vrc = GetVBoxUserHomeDirectory (homeDir);
+        char homeDir [RTPATH_MAX];
+        int vrc = GetVBoxUserHomeDirectory (homeDir, sizeof (homeDir));
         if (RT_SUCCESS (vrc))
         {
-            Utf8Str compReg = Utf8StrFmt ("%s%c%s", homeDir.raw(),
-                                          RTPATH_DELIMITER, "compreg.dat");
-            Utf8Str xptiDat = Utf8StrFmt ("%s%c%s", homeDir.raw(),
-                                          RTPATH_DELIMITER, "xpti.dat");
+            char compReg [RTPATH_MAX];
+            char xptiDat [RTPATH_MAX];
+
+            RTStrPrintf (compReg, sizeof (compReg), "%s%c%s",
+                         homeDir, RTPATH_DELIMITER, "compreg.dat");
+            RTStrPrintf (xptiDat, sizeof (xptiDat), "%s%c%s",
+                         homeDir, RTPATH_DELIMITER, "xpti.dat");
+
             dsProv = new DirectoryServiceProvider();
             if (dsProv)
@@ -230 +234 @@
             if (RT_SUCCESS (vrc))
             {
-                nsCOMPtr<nsILocalFile> file;
+                nsCOMPtr <nsILocalFile> file;
                 rc = NS_NewNativeLocalFile (nsEmbedCString (appDirCP),
                                             PR_FALSE, getter_AddRefs (file));

trunk/src/VBox/Main/testcase/tstAPI.cpp

@@ -202 +202 @@
     HRESULT rc;
 
+    {
+        char homeDir [RTPATH_MAX];
+        GetVBoxUserHomeDirectory (homeDir, sizeof (homeDir));
+        printf ("VirtualBox Home Directory = '%s'\n", homeDir);
+    }
+
     printf ("Initializing COM...\n");
 
@@ -213 +219 @@
     ComPtr <IVirtualBox> virtualBox;
     ComPtr <ISession> session;
+
+#if 0
+    // Utf8Str test
+    ////////////////////////////////////////////////////////////////////////////
+
+    Utf8Str nullUtf8Str;
+    printf ("nullUtf8Str='%s'\n", nullUtf8Str.raw());
+    
+    Utf8Str simpleUtf8Str = "simpleUtf8Str";
+    printf ("simpleUtf8Str='%s'\n", simpleUtf8Str.raw());
+
+    Utf8Str utf8StrFmt = Utf8StrFmt ("[0=%d]%s[1=%d]",
+                                     0, "utf8StrFmt", 1);
+    printf ("utf8StrFmt='%s'\n", utf8StrFmt.raw());
+
+#endif
 
     printf ("Creating VirtualBox object...\n");
@@ -454 +476 @@
 #endif
 
-#if 1
+#if 0
     // find a registered hard disk by location
     ///////////////////////////////////////////////////////////////////////////