Changeset 25944 in vbox for trunk/src

Timestamp:

Jan 20, 2010 5:42:26 PM (15 years ago)

Author:

vboxsync

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

56786

Message:

*: RTEnv usage cleanup - avoid RTEnvGet() as it doesn't necessarily return UTF-8 encoded strings.

File:

• trunk/src/VBox/Main/glue/com.cpp (modified) (8 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
-
 /** @file
  * MS COM / XPCOM Abstraction Layer
@@ -23 +22 @@
 #if !defined (VBOX_WITH_XPCOM)
 
-#include <objbase.h>
+# include <objbase.h>
 
 #else /* !defined (VBOX_WITH_XPCOM) */
 
-#include <stdlib.h>
+# include <stdlib.h>
 
-#include <nsCOMPtr.h>
-#include <nsIServiceManagerUtils.h>
+# include <nsCOMPtr.h>
+# include <nsIServiceManagerUtils.h>
 
-#include <nsIInterfaceInfo.h>
-#include <nsIInterfaceInfoManager.h>
+# include <nsIInterfaceInfo.h>
+# include <nsIInterfaceInfoManager.h>
 
 #endif /* !defined (VBOX_WITH_XPCOM) */
@@ -52 +51 @@
 
 #ifdef RT_OS_DARWIN
-#define VBOX_USER_HOME_SUFFIX   "Library/VirtualBox"
+# define VBOX_USER_HOME_SUFFIX   "Library/VirtualBox"
 #else
-#define VBOX_USER_HOME_SUFFIX   ".VirtualBox"
+# define VBOX_USER_HOME_SUFFIX   ".VirtualBox"
 #endif
 
@@ -62 +61 @@
 {
 
-void GetInterfaceNameByIID (const GUID &aIID, BSTR *aName)
+void GetInterfaceNameByIID(const GUID &aIID, BSTR *aName)
 {
-    Assert (aName);
+    Assert(aName);
     if (!aName)
         return;
@@ -70 +69 @@
     *aName = NULL;
 
-#if !defined (VBOX_WITH_XPCOM)
+#if !defined(VBOX_WITH_XPCOM)
 
     LONG rc;
     LPOLESTR iidStr = NULL;
-    if (StringFromIID (aIID, &iidStr) == S_OK)
+    if (StringFromIID(aIID, &iidStr) == S_OK)
     {
         HKEY ifaceKey;
-        rc = RegOpenKeyExW (HKEY_CLASSES_ROOT, L"Interface",
-                            0, KEY_QUERY_VALUE, &ifaceKey);
+        rc = RegOpenKeyExW(HKEY_CLASSES_ROOT, L"Interface",
+                           0, KEY_QUERY_VALUE, &ifaceKey);
         if (rc == ERROR_SUCCESS)
         {
             HKEY iidKey;
-            rc = RegOpenKeyExW (ifaceKey, iidStr, 0, KEY_QUERY_VALUE, &iidKey);
+            rc = RegOpenKeyExW(ifaceKey, iidStr, 0, KEY_QUERY_VALUE, &iidKey);
             if (rc == ERROR_SUCCESS)
             {
                 /* determine the size and type */
                 DWORD sz, type;
-                rc = RegQueryValueExW (iidKey, NULL, NULL, &type, NULL, &sz);
+                rc = RegQueryValueExW(iidKey, NULL, NULL, &type, NULL, &sz);
                 if (rc == ERROR_SUCCESS && type == REG_SZ)
                 {
                     /* query the value to BSTR */
-                    *aName = SysAllocStringLen (NULL, (sz + 1) /
-                                                      sizeof (TCHAR) + 1);
-                    rc = RegQueryValueExW (iidKey, NULL, NULL, NULL,
-                                           (LPBYTE) *aName, &sz);
+                    *aName = SysAllocStringLen(NULL, (sz + 1) / sizeof(TCHAR) + 1);
+                    rc = RegQueryValueExW(iidKey, NULL, NULL, NULL, (LPBYTE) *aName, &sz);
                     if (rc != ERROR_SUCCESS)
                     {
-                        SysFreeString (*aName);
+                        SysFreeString(*aName);
                         aName = NULL;
                     }
                 }
-                RegCloseKey (iidKey);
+                RegCloseKey(iidKey);
             }
-            RegCloseKey (ifaceKey);
+            RegCloseKey(ifaceKey);
         }
-        CoTaskMemFree (iidStr);
+        CoTaskMemFree(iidStr);
     }
 
@@ -111 +108 @@
 
     nsresult rv;
-    nsCOMPtr <nsIInterfaceInfoManager> iim =
-        do_GetService (NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID, &rv);
+    nsCOMPtr<nsIInterfaceInfoManager> iim =
+        do_GetService(NS_INTERFACEINFOMANAGER_SERVICE_CONTRACTID, &rv);
     if (NS_SUCCEEDED(rv))
     {
-        nsCOMPtr <nsIInterfaceInfo> iinfo;
-        rv = iim->GetInfoForIID (&aIID, getter_AddRefs (iinfo));
+        nsCOMPtr<nsIInterfaceInfo> iinfo;
+        rv = iim->GetInfoForIID(&aIID, getter_AddRefs(iinfo));
         if (NS_SUCCEEDED(rv))
         {
             const char *iname = NULL;
-            iinfo->GetNameShared (&iname);
+            iinfo->GetNameShared(&iname);
             char *utf8IName = NULL;
-            if (RT_SUCCESS(RTStrCurrentCPToUtf8 (&utf8IName, iname)))
+            if (RT_SUCCESS(RTStrCurrentCPToUtf8(&utf8IName, iname)))
             {
                 PRTUTF16 utf16IName = NULL;
-                if (RT_SUCCESS(RTStrToUtf16 (utf8IName, &utf16IName)))
+                if (RT_SUCCESS(RTStrToUtf16(utf8IName, &utf16IName)))
                 {
-                    *aName = SysAllocString ((OLECHAR *) utf16IName);
-                    RTUtf16Free (utf16IName);
+                    *aName = SysAllocString((OLECHAR *) utf16IName);
+                    RTUtf16Free(utf16IName);
                 }
-                RTStrFree (utf8IName);
+                RTStrFree(utf8IName);
             }
         }
@@ -146 +143 @@
     *aDir = 0;
 
-    const char *VBoxUserHome = RTEnvGet("VBOX_USER_HOME");
-
-    char path [RTPATH_MAX];
-    int vrc = VINF_SUCCESS;
-
-    if (VBoxUserHome)
+    char szTmp[RTPATH_MAX];
+    int vrc = RTEnvGetEx(RTENV_DEFAULT, "VBOX_USER_HOME", szTmp, sizeof(szTmp), NULL);
+    if (RT_SUCCESS(vrc) || vrc == VERR_ENV_VAR_NOT_FOUND)
     {
-        /* get the full path name */
-        char *VBoxUserHomeUtf8 = NULL;
-        vrc = RTStrCurrentCPToUtf8(&VBoxUserHomeUtf8, VBoxUserHome);
         if (RT_SUCCESS(vrc))
         {
-            vrc = RTPathAbs(VBoxUserHomeUtf8, path, sizeof (path));
+            /* get the full path name */
+            vrc = RTPathAbs(szTmp, aDir, aDirLen);
+        }
+        else
+        {
+            /* compose the config directory (full path) */
+            /** @todo r=bird: RTPathUserHome doesn't necessarily return a full (abs) path
+             *        like the comment above seems to indicate. */
+            vrc = RTPathUserHome(aDir, aDirLen);
             if (RT_SUCCESS(vrc))
-            {
-                if (aDirLen < strlen(path) + 1)
-                    vrc = VERR_BUFFER_OVERFLOW;
-                else
-                    strcpy(aDir, path);
-            }
-            RTStrFree(VBoxUserHomeUtf8);
+                vrc = RTPathAppend(aDir, aDirLen, VBOX_USER_HOME_SUFFIX);
         }
+
+        /* ensure the home directory exists */
+        if (RT_SUCCESS(vrc))
+            if (!RTDirExists(aDir))
+                vrc = RTDirCreateFullPath(aDir, 0777);
     }
-    else
-    {
-        /* compose the config directory (full path) */
-        vrc = RTPathUserHome(path, sizeof(path));
-        if (RT_SUCCESS(vrc))
-        {
-            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;
-        }
-    }
-
-    /* ensure the home directory exists */
-    if (RT_SUCCESS(vrc))
-        if (!RTDirExists(aDir))
-            vrc = RTDirCreateFullPath(aDir, 0777);
 
     return vrc;
@@ -196 +177 @@
 
 /* static */
-const nsID *SafeGUIDArray::nsIDRef::Empty = (const nsID *) Guid::Empty.raw();
+const nsID *SafeGUIDArray::nsIDRef::Empty = (const nsID *)Guid::Empty.raw();
 
 #endif /* (VBOX_WITH_XPCOM) */