Changeset 10142 in vbox for trunk

Timestamp:

Jul 3, 2008 9:18:18 AM (16 years ago)

Author:

vboxsync

Message:

Additions/WINNT: make the VBoxControl guest property functions utf8-safe

Location:

trunk/src/VBox/Additions/WINNT/VBoxControl

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxControl.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/WINNT/VBoxControl/Makefile.kmk

@@ -36 +36 @@
         VBoxControl.cpp \
         VBoxControl.rc
+VBoxControl_LIBS    += \
+        $(VBOX_LIB_IPRT_GUEST_R3)
 
 # VBoxControl.cpp uses VBOX_SVN_REV.

trunk/src/VBox/Additions/WINNT/VBoxControl/VBoxControl.cpp

@@ -23 +23 @@
 #include <malloc.h>
 
+#include <iprt/string.h>
+#include <iprt/stream.h>
 #include <VBox/VBoxGuest.h>
 #include <VBox/version.h>
@@ -951 +953 @@
     if (!VALID_PTR(pszKey))
         return VERR_INVALID_POINTER;
-    if (!VALID_PTR(pszValue) && (pszValue != NULL));
+    if ((pszValue != NULL) && !VALID_PTR(pszValue))
+        return VERR_INVALID_POINTER;
     int rc;
 
@@ -1014 +1017 @@
 static int handleGetGuestProperty(int argc, char *argv[])
 {
+    HANDLE hDevice = INVALID_HANDLE_VALUE;
+    uint32_t u32ClientID = 0;
+    int rc = VINF_SUCCESS;
+    char *pszKey = NULL;
+    char szValue[svcInfo::KEY_MAX_VALUE_LEN];
+
     if (argc != 1)
     {
@@ -1019 +1028 @@
         return 1;
     }
-    char szValue[svcInfo::KEY_MAX_VALUE_LEN];
-    HANDLE hDevice = INVALID_HANDLE_VALUE;
-    uint32_t u32ClientID = 0;
-    int rc = openGuestDevice(&hDevice);
+    rc = RTStrCurrentCPToUtf8(&pszKey, argv[0]);
     if (!RT_SUCCESS(rc))
-        printf("Failed to open the VirtualBox device, RT error %d\n", rc);
+        RTPrintf("Failed to convert the key name to Utf8, error %Rrc\n", rc);
+    if (RT_SUCCESS(rc))
+    {
+        rc = openGuestDevice(&hDevice);
+        if (!RT_SUCCESS(rc))
+            RTPrintf("Failed to open the VirtualBox device, error %Rrc\n", rc);
+    }
     if (RT_SUCCESS(rc))
     {
         rc = hgcmConnect(hDevice, "VBoxSharedInfoSvc", &u32ClientID);
         if (!RT_SUCCESS(rc))
-            printf("Failed to connect to the host/guest registry service, RT error %d\n", rc);
+            RTPrintf("Failed to connect to the host/guest registry service, error %Rrc\n", rc);
     }
     if (RT_SUCCESS(rc))
     {
-        rc = hgcmInfoSvcGetProp(hDevice, u32ClientID, argv[0], szValue,
+        rc = hgcmInfoSvcGetProp(hDevice, u32ClientID, pszKey, szValue,
                                 sizeof(szValue), NULL);
         if (!RT_SUCCESS(rc) && (rc != VERR_NOT_FOUND))
-            printf("Failed to retrieve the property value, RT error %d\n", rc);
-    }
-    if (RT_SUCCESS(rc) || (VERR_NOT_FOUND == rc))
-    {
-        if (RT_SUCCESS(rc))
-            printf("Value: %s\n", szValue);
-        else
-            printf("No value set!\n");
-    }
+            RTPrintf("Failed to retrieve the property value, error %Rrc\n", rc);
+    }
+    if (VERR_NOT_FOUND == rc)
+        RTPrintf("No value set!\n");
+    if (RT_SUCCESS(rc))
+        RTPrintf("Value: %S\n", szValue);
     if (u32ClientID != 0)
         hgcmDisconnect(hDevice, u32ClientID);
     if (hDevice != INVALID_HANDLE_VALUE)
         CloseHandle(hDevice);
+    RTStrFree(pszKey);
     return rc;
 }
@@ -1064 +1074 @@
 static int handleSetGuestProperty(int argc, char *argv[])
 {
+    HANDLE hDevice = INVALID_HANDLE_VALUE;
+    uint32_t u32ClientID = 0;
+    int rc = VINF_SUCCESS;
+    char *pszKey = NULL;
+    char *pszValue = NULL;
+
     if (argc != 1 && argc != 2)
     {
@@ -1069 +1085 @@
         return 1;
     }
-    HANDLE hDevice = INVALID_HANDLE_VALUE;
-    char *pszValue = NULL;
-    if (2 == argc)
-        pszValue = argv[1];
-    uint32_t u32ClientID = 0;
-    int rc = openGuestDevice(&hDevice);
+    rc = RTStrCurrentCPToUtf8(&pszKey, argv[0]);
     if (!RT_SUCCESS(rc))
-        printf("Failed to open the VirtualBox device, RT error %d\n", rc);
+        RTPrintf("Failed to convert the key name to Utf8, error %Rrc\n", rc);
+    if (RT_SUCCESS(rc) && (2 == argc))
+    {
+        rc = RTStrCurrentCPToUtf8(&pszValue, argv[1]);
+        if (!RT_SUCCESS(rc))
+            RTPrintf("Failed to convert the key value to Utf8, error %Rrc\n", rc);
+    }
+    if (RT_SUCCESS(rc))
+    {
+        rc = openGuestDevice(&hDevice);
+        if (!RT_SUCCESS(rc))
+            RTPrintf("Failed to open the VirtualBox device, error %Rrc\n", rc);
+    }
     if (RT_SUCCESS(rc))
     {
         rc = hgcmConnect(hDevice, "VBoxSharedInfoSvc", &u32ClientID);
         if (!RT_SUCCESS(rc))
-            printf("Failed to connect to the host/guest registry service, RT error %d\n", rc);
+            RTPrintf("Failed to connect to the host/guest registry service, error %Rrc\n", rc);
     }
     if (RT_SUCCESS(rc))
     {
-        rc = hgcmInfoSvcSetProp(hDevice, u32ClientID, argv[0], pszValue);
+        rc = hgcmInfoSvcSetProp(hDevice, u32ClientID, pszKey, pszValue);
         if (!RT_SUCCESS(rc))
-            printf("Failed to store the property value, RT error %d\n", rc);
+            RTPrintf("Failed to store the property value, error %Rrc\n", rc);
     }
     if (u32ClientID != 0)
@@ -1093 +1116 @@
     if (hDevice != INVALID_HANDLE_VALUE)
         CloseHandle(hDevice);
+    RTStrFree(pszKey);
+    RTStrFree(pszValue);
     return rc;
 }