Changeset 10797 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 22, 2008 8:12:42 AM (17 years ago)

Author:

vboxsync

Message:

Guest properties: initial commit of new interface

Location:

trunk/src/VBox/Additions/common

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxControl/Makefile.kmk (modified) (1 diff)
• VBoxControl/VBoxControl.cpp (modified) (11 diffs)
• VBoxControl/VBoxControl.rc (added)
• VBoxGuestLib/Makefile.kmk (modified) (4 diffs)
• VBoxGuestLib/VBGLR3Internal.h (modified) (1 diff)
• VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (moved) (moved from trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp ) (10 diffs)
• VBoxGuestLib/VBoxGuestR3LibVideo.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/common/Makefile.kmk

@@ -30 +30 @@
 # Include sub-makefile.
 include $(PATH_SUB_CURRENT)/VBoxGuestLib/Makefile.kmk
-if1of ($(KBUILD_TARGET), freebsd linux os2 solaris)
 include $(PATH_SUB_CURRENT)/VBoxControl/Makefile.kmk
-endif
 if1of ($(KBUILD_TARGET), freebsd os2 solaris)
 include $(PATH_SUB_CURRENT)/VBoxGuest/Makefile.kmk

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

@@ -33 +33 @@
 PROGRAMS += VBoxControl
 VBoxControl_TEMPLATE = VBOXGUESTR3EXE
-ifdef VBOX_WITH_INFO_SVC
- VBoxControl_DEFS += VBOX_HGCM VBOX_WITH_INFO_SVC
+ifeq ($(KBUILD_TARGET),win)
+ ifdef VBOX_SIGN_ADDITIONS # (See the main Windows Additions makefile.)
+  VBoxControl_NOINST  = true
+ endif
 endif
+VBoxControl_DEFS     += \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS VBOX_HGCM,)
 VBoxControl_SOURCES = \
         VBoxControl.cpp \
         VBoxControlSVN.cpp
+VBoxControl_SOURCES.win = \
+        VBoxControl.rc
 VBoxControl_LIBS = \
         $(VBOX_LIB_IPRT_GUEST_R3) \

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

@@ -25 +25 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include <iprt/thread.h>
+#include <iprt/mem.h>
 #include <iprt/string.h>
 #include <iprt/stream.h>
 #include <iprt/path.h>
 #include <iprt/initterm.h>
+#include <VBox/log.h>
 #include <VBox/VBoxGuest.h>
 #include <VBox/version.h>
-#ifdef VBOX_WITH_INFO_SVC
-# include <VBox/HostServices/VBoxInfoSvc.h>
+#ifdef RT_OS_WINDOWS
+# include <windows.h>
+# include <malloc.h>  /* for alloca */
+#endif
+#ifdef VBOX_WITH_GUEST_PROPS
+# include <VBox/HostServices/GuestPropertySvc.h>
 #endif
 #include "VBoxControl.h"
@@ -57 +62 @@
 static void doUsage(char const *line, char const *name = "", char const *command = "")
 {
-    RTPrintf("%s %-*s%s", name, 30 - strlen(name), command, line);
+    RTPrintf("%s %-*s%s", name, 32 - strlen(name), command, line);
 }
 
@@ -63 +68 @@
 enum g_eUsage
 {
-#ifdef VBOX_WITH_INFO_SVC
+#ifdef RT_OS_WINDOWS
+    GET_VIDEO_ACCEL,
+    SET_VIDEO_ACCEL,
+    LIST_CUST_MODES,
+    ADD_CUST_MODE,
+    REMOVE_CUST_MODE,
+    SET_VIDEO_MODE,
+#endif
+#ifdef VBOX_WITH_GUEST_PROPS
     GET_GUEST_PROP,
     SET_GUEST_PROP,
@@ -73 +86 @@
 {
     RTPrintf("Usage:\n\n");
-    RTPrintf("%s [-v|--version]    print version number and exit\n", g_pszProgName);
-    RTPrintf("%s --nologo ...      suppress the logo\n\n", g_pszProgName);
-
-#ifdef VBOX_WITH_INFO_SVC
+    RTPrintf("%s [-v|--version]       print version number and exit\n", g_pszProgName);
+    RTPrintf("%s --nologo ...         suppress the logo\n\n", g_pszProgName);
+
+#ifdef RT_OS_WINDOWS
+    if ((GET_VIDEO_ACCEL == eWhich) || (USAGE_ALL == eWhich))
+        doUsage("\n", g_pszProgName, "getvideoacceleration");
+    if ((SET_VIDEO_ACCEL == eWhich) || (USAGE_ALL == eWhich))
+        doUsage("<on|off>\n", g_pszProgName, "setvideoacceleration");
+    if ((LIST_CUST_MODES == eWhich) || (USAGE_ALL == eWhich))
+        doUsage("\n", g_pszProgName, "listcustommodes");
+    if ((ADD_CUST_MODE == eWhich) || (USAGE_ALL == eWhich))
+        doUsage("<width> <height> <bpp>\n", g_pszProgName, "addcustommode");
+    if ((REMOVE_CUST_MODE == eWhich) || (USAGE_ALL == eWhich))
+        doUsage("<width> <height> <bpp>\n", g_pszProgName, "removecustommode");
+    if ((SET_VIDEO_MODE == eWhich) || (USAGE_ALL == eWhich))
+        doUsage("<width> <height> <bpp> <screen>\n", g_pszProgName, "setvideomode");
+#endif
+#ifdef VBOX_WITH_GUEST_PROPS
     if ((GET_GUEST_PROP == eWhich) || (USAGE_ALL == eWhich))
-        doUsage("<key>\n", g_pszProgName, "getguestproperty");
+        doUsage("<name>\n", g_pszProgName, "getguestproperty");
     if ((SET_GUEST_PROP == eWhich) || (USAGE_ALL == eWhich))
-        doUsage("<key> [<value>] (no value deletes key)\n", g_pszProgName, "setguestproperty");
+        doUsage("<name> [<value>] (no value deletes property)\n", g_pszProgName, "setguestproperty");
 #endif
 }
@@ -101 +128 @@
 }
 
-#ifdef VBOX_WITH_INFO_SVC
+#ifdef RT_OS_WINDOWS
+
+LONG (WINAPI * gpfnChangeDisplaySettingsEx)(LPCTSTR lpszDeviceName, LPDEVMODE lpDevMode, HWND hwnd, DWORD dwflags, LPVOID lParam);
+
+static unsigned nextAdjacentRectXP (RECTL *paRects, unsigned nRects, unsigned iRect)
+{
+    unsigned i;
+    for (i = 0; i < nRects; i++)
+    {
+        if (paRects[iRect].right == paRects[i].left)
+        {
+            return i;
+        }
+    }
+    return ~0;
+}
+
+static unsigned nextAdjacentRectXN (RECTL *paRects, unsigned nRects, unsigned iRect)
+{
+    unsigned i;
+    for (i = 0; i < nRects; i++)
+    {
+        if (paRects[iRect].left == paRects[i].right)
+        {
+            return i;
+        }
+    }
+    return ~0;
+}
+
+static unsigned nextAdjacentRectYP (RECTL *paRects, unsigned nRects, unsigned iRect)
+{
+    unsigned i;
+    for (i = 0; i < nRects; i++)
+    {
+        if (paRects[iRect].bottom == paRects[i].top)
+        {
+            return i;
+        }
+    }
+    return ~0;
+}
+
+unsigned nextAdjacentRectYN (RECTL *paRects, unsigned nRects, unsigned iRect)
+{
+    unsigned i;
+    for (i = 0; i < nRects; i++)
+    {
+        if (paRects[iRect].top == paRects[i].bottom)
+        {
+            return i;
+        }
+    }
+    return ~0;
+}
+
+void resizeRect(RECTL *paRects, unsigned nRects, unsigned iPrimary, unsigned iResized, int NewWidth, int NewHeight)
+{
+    RECTL *paNewRects = (RECTL *)alloca (sizeof (RECTL) * nRects);
+    memcpy (paNewRects, paRects, sizeof (RECTL) * nRects);
+    paNewRects[iResized].right += NewWidth - (paNewRects[iResized].right - paNewRects[iResized].left);
+    paNewRects[iResized].bottom += NewHeight - (paNewRects[iResized].bottom - paNewRects[iResized].top);
+    
+    /* Verify all pairs of originally adjacent rectangles for all 4 directions. 
+     * If the pair has a "good" delta (that is the first rectangle intersects the second)
+     * at a direction and the second rectangle is not primary one (which can not be moved),
+     * move the second rectangle to make it adjacent to the first one.
+     */
+    
+    /* X positive. */
+    unsigned iRect;
+    for (iRect = 0; iRect < nRects; iRect++)
+    {
+        /* Find the next adjacent original rect in x positive direction. */
+        unsigned iNextRect = nextAdjacentRectXP (paRects, nRects, iRect);
+        Log(("next %d -> %d\n", iRect, iNextRect));
+        
+        if (iNextRect == ~0 || iNextRect == iPrimary)
+        {
+            continue;
+        }
+        
+        /* Check whether there is an X intesection between these adjacent rects in the new rectangles
+         * and fix the intersection if delta is "good".
+         */
+        int delta = paNewRects[iRect].right - paNewRects[iNextRect].left;
+        
+        if (delta > 0)
+        {
+            Log(("XP intersection right %d left %d, diff %d\n",
+                     paNewRects[iRect].right, paNewRects[iNextRect].left,
+                     delta));
+            
+            paNewRects[iNextRect].left += delta;
+            paNewRects[iNextRect].right += delta;
+        }
+    }
+    
+    /* X negative. */
+    for (iRect = 0; iRect < nRects; iRect++)
+    {
+        /* Find the next adjacent original rect in x negative direction. */
+        unsigned iNextRect = nextAdjacentRectXN (paRects, nRects, iRect);
+        Log(("next %d -> %d\n", iRect, iNextRect));
+        
+        if (iNextRect == ~0 || iNextRect == iPrimary)
+        {
+            continue;
+        }
+        
+        /* Check whether there is an X intesection between these adjacent rects in the new rectangles
+         * and fix the intersection if delta is "good".
+         */
+        int delta = paNewRects[iRect].left - paNewRects[iNextRect].right;
+        
+        if (delta < 0)
+        {
+            Log(("XN intersection left %d right %d, diff %d\n",
+                     paNewRects[iRect].left, paNewRects[iNextRect].right,
+                     delta));
+            
+            paNewRects[iNextRect].left += delta;
+            paNewRects[iNextRect].right += delta;
+        }
+    }
+    
+    /* Y positive (in the computer sence, top->down). */
+    for (iRect = 0; iRect < nRects; iRect++)
+    {
+        /* Find the next adjacent original rect in y positive direction. */
+        unsigned iNextRect = nextAdjacentRectYP (paRects, nRects, iRect);
+        Log(("next %d -> %d\n", iRect, iNextRect));
+        
+        if (iNextRect == ~0 || iNextRect == iPrimary)
+        {
+            continue;
+        }
+        
+        /* Check whether there is an Y intesection between these adjacent rects in the new rectangles
+         * and fix the intersection if delta is "good".
+         */
+        int delta = paNewRects[iRect].bottom - paNewRects[iNextRect].top;
+        
+        if (delta > 0)
+        {
+            Log(("YP intersection bottom %d top %d, diff %d\n",
+                     paNewRects[iRect].bottom, paNewRects[iNextRect].top,
+                     delta));
+            
+            paNewRects[iNextRect].top += delta;
+            paNewRects[iNextRect].bottom += delta;
+        }
+    }
+    
+    /* Y negative (in the computer sence, down->top). */
+    for (iRect = 0; iRect < nRects; iRect++)
+    {
+        /* Find the next adjacent original rect in x negative direction. */
+        unsigned iNextRect = nextAdjacentRectYN (paRects, nRects, iRect);
+        Log(("next %d -> %d\n", iRect, iNextRect));
+        
+        if (iNextRect == ~0 || iNextRect == iPrimary)
+        {
+            continue;
+        }
+        
+        /* Check whether there is an Y intesection between these adjacent rects in the new rectangles
+         * and fix the intersection if delta is "good".
+         */
+        int delta = paNewRects[iRect].top - paNewRects[iNextRect].bottom;
+        
+        if (delta < 0)
+        {
+            Log(("YN intersection top %d bottom %d, diff %d\n",
+                     paNewRects[iRect].top, paNewRects[iNextRect].bottom,
+                     delta));
+            
+            paNewRects[iNextRect].top += delta;
+            paNewRects[iNextRect].bottom += delta;
+        }
+    }
+    
+    memcpy (paRects, paNewRects, sizeof (RECTL) * nRects);
+    return;
+}
+
+/* Returns TRUE to try again. */
+static BOOL ResizeDisplayDevice(ULONG Id, DWORD Width, DWORD Height, DWORD BitsPerPixel)
+{
+    BOOL fModeReset = (Width == 0 && Height == 0 && BitsPerPixel == 0);
+    
+    DISPLAY_DEVICE DisplayDevice;
+
+    ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
+    DisplayDevice.cb = sizeof(DisplayDevice);
+    
+    /* Find out how many display devices the system has */
+    DWORD NumDevices = 0;
+    DWORD i = 0;
+    while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
+    { 
+        Log(("[%d] %s\n", i, DisplayDevice.DeviceName));
+
+        if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
+        {
+            Log(("Found primary device. err %d\n", GetLastError ()));
+            NumDevices++;
+        }
+        else if (!(DisplayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER))
+        {
+            
+            Log(("Found secondary device. err %d\n", GetLastError ()));
+            NumDevices++;
+        }
+        
+        ZeroMemory(&DisplayDevice, sizeof(DisplayDevice));
+        DisplayDevice.cb = sizeof(DisplayDevice);
+        i++;
+    }
+    
+    Log(("Found total %d devices. err %d\n", NumDevices, GetLastError ()));
+    
+    if (NumDevices == 0 || Id >= NumDevices)
+    {
+        Log(("Requested identifier %d is invalid. err %d\n", Id, GetLastError ()));
+        return FALSE;
+    }
+    
+    DISPLAY_DEVICE *paDisplayDevices = (DISPLAY_DEVICE *)alloca (sizeof (DISPLAY_DEVICE) * NumDevices);
+    DEVMODE *paDeviceModes = (DEVMODE *)alloca (sizeof (DEVMODE) * NumDevices);
+    RECTL *paRects = (RECTL *)alloca (sizeof (RECTL) * NumDevices);
+    
+    /* Fetch information about current devices and modes. */
+    DWORD DevNum = 0;
+    DWORD DevPrimaryNum = 0;
+    
+    ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE));
+    DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
+    
+    i = 0;
+    while (EnumDisplayDevices (NULL, i, &DisplayDevice, 0))
+    { 
+        Log(("[%d(%d)] %s\n", i, DevNum, DisplayDevice.DeviceName));
+        
+        BOOL bFetchDevice = FALSE;
+
+        if (DisplayDevice.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
+        {
+            Log(("Found primary device. err %d\n", GetLastError ()));
+            DevPrimaryNum = DevNum;
+            bFetchDevice = TRUE;
+        }
+        else if (!(DisplayDevice.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER))
+        {
+            
+            Log(("Found secondary device. err %d\n", GetLastError ()));
+            bFetchDevice = TRUE;
+        }
+        
+        if (bFetchDevice)
+        {
+            if (DevNum >= NumDevices)
+            {
+                Log(("%d >= %d\n", NumDevices, DevNum));
+                return FALSE;
+            }
+        
+            paDisplayDevices[DevNum] = DisplayDevice;
+            
+            ZeroMemory(&paDeviceModes[DevNum], sizeof(DEVMODE));
+            paDeviceModes[DevNum].dmSize = sizeof(DEVMODE);
+            if (!EnumDisplaySettings((LPSTR)DisplayDevice.DeviceName,
+                 ENUM_REGISTRY_SETTINGS, &paDeviceModes[DevNum]))
+            {
+                Log(("EnumDisplaySettings err %d\n", GetLastError ()));
+                return FALSE;
+            }
+            
+            Log(("%dx%d at %d,%d\n",
+                    paDeviceModes[DevNum].dmPelsWidth,
+                    paDeviceModes[DevNum].dmPelsHeight,
+                    paDeviceModes[DevNum].dmPosition.x,
+                    paDeviceModes[DevNum].dmPosition.y));
+                    
+            paRects[DevNum].left   = paDeviceModes[DevNum].dmPosition.x;
+            paRects[DevNum].top    = paDeviceModes[DevNum].dmPosition.y;
+            paRects[DevNum].right  = paDeviceModes[DevNum].dmPosition.x + paDeviceModes[DevNum].dmPelsWidth;
+            paRects[DevNum].bottom = paDeviceModes[DevNum].dmPosition.y + paDeviceModes[DevNum].dmPelsHeight;
+            DevNum++;
+        }
+        
+        ZeroMemory(&DisplayDevice, sizeof(DISPLAY_DEVICE));
+        DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
+        i++;
+    }
+    
+    if (Width == 0)
+    {
+        Width = paRects[Id].right - paRects[Id].left;
+    }
+
+    if (Height == 0)
+    {
+        Height = paRects[Id].bottom - paRects[Id].top;
+    }
+
+    /* Check whether a mode reset or a change is requested. */
+    if (   !fModeReset
+        && paRects[Id].right - paRects[Id].left == Width
+        && paRects[Id].bottom - paRects[Id].top == Height
+        && paDeviceModes[Id].dmBitsPerPel == BitsPerPixel)
+    {
+        Log(("VBoxDisplayThread : already at desired resolution.\n"));
+        return FALSE;
+    }
+
+    resizeRect(paRects, NumDevices, DevPrimaryNum, Id, Width, Height);
+#ifdef Log
+    for (i = 0; i < NumDevices; i++)
+    {
+        Log(("[%d]: %d,%d %dx%d\n",
+                i, paRects[i].left, paRects[i].top,
+                paRects[i].right - paRects[i].left,
+                paRects[i].bottom - paRects[i].top));
+    }
+#endif /* Log */
+    
+    /* Without this, Windows will not ask the miniport for its
+     * mode table but uses an internal cache instead.
+     */
+    DEVMODE tempDevMode;
+    ZeroMemory (&tempDevMode, sizeof (tempDevMode));
+    tempDevMode.dmSize = sizeof(DEVMODE);
+    EnumDisplaySettings(NULL, 0xffffff, &tempDevMode);
+
+    /* Assign the new rectangles to displays. */
+    for (i = 0; i < NumDevices; i++)
+    {
+        paDeviceModes[i].dmPosition.x = paRects[i].left;
+        paDeviceModes[i].dmPosition.y = paRects[i].top;
+        paDeviceModes[i].dmPelsWidth  = paRects[i].right - paRects[i].left;
+        paDeviceModes[i].dmPelsHeight = paRects[i].bottom - paRects[i].top;
+        
+        paDeviceModes[i].dmFields = DM_POSITION | DM_PELSHEIGHT | DM_PELSWIDTH;
+        
+        if (   i == Id
+            && BitsPerPixel != 0)
+        {
+            paDeviceModes[i].dmFields |= DM_BITSPERPEL;
+            paDeviceModes[i].dmBitsPerPel = BitsPerPixel;
+        }
+        Log(("calling pfnChangeDisplaySettingsEx %x\n", gpfnChangeDisplaySettingsEx));     
+        gpfnChangeDisplaySettingsEx((LPSTR)paDisplayDevices[i].DeviceName, 
+                 &paDeviceModes[i], NULL, CDS_NORESET | CDS_UPDATEREGISTRY, NULL); 
+        Log(("ChangeDisplaySettings position err %d\n", GetLastError ()));
+    }
+    
+    /* A second call to ChangeDisplaySettings updates the monitor. */
+    LONG status = ChangeDisplaySettings(NULL, 0); 
+    Log(("ChangeDisplaySettings update status %d\n", status));
+    if (status == DISP_CHANGE_SUCCESSFUL || status == DISP_CHANGE_BADMODE)
+    {
+        /* Successfully set new video mode or our driver can not set the requested mode. Stop trying. */
+        return FALSE;
+    }
+
+    /* Retry the request. */
+    return TRUE;
+}
+
+int handleSetVideoMode(int argc, char *argv[])
+{
+    if (argc != 3 && argc != 4)
+    {
+        usage(SET_VIDEO_MODE);
+        return 1;
+    }
+
+    DWORD xres = atoi(argv[0]);
+    DWORD yres = atoi(argv[1]);
+    DWORD bpp  = atoi(argv[2]);
+    DWORD scr  = 0;
+
+    if (argc == 4)
+    {
+        scr = atoi(argv[3]);
+    }
+
+    HMODULE hUser = GetModuleHandle("USER32");
+
+    if (hUser)
+    {
+        *(uintptr_t *)&gpfnChangeDisplaySettingsEx = (uintptr_t)GetProcAddress(hUser, "ChangeDisplaySettingsExA");
+        Log(("VBoxService: pChangeDisplaySettingsEx = %p\n", gpfnChangeDisplaySettingsEx));
+        
+        if (gpfnChangeDisplaySettingsEx)
+        {
+            /* The screen index is 0 based in the ResizeDisplayDevice call. */
+            scr = scr > 0? scr - 1: 0;
+            
+            /* Horizontal resolution must be a multiple of 8, round down. */
+            xres &= ~0x7;
+
+            ResizeDisplayDevice(scr, xres, yres, bpp);
+        }
+    }
+    return 0;
+}
+
+HKEY getVideoKey(bool writable)
+{
+    HKEY hkeyDeviceMap = 0;
+    HKEY hkeyVideo = 0;
+    LONG status;
+
+    status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "HARDWARE\\DEVICEMAP\\VIDEO", 0, KEY_READ, &hkeyDeviceMap);
+    if ((status != ERROR_SUCCESS) || !hkeyDeviceMap)
+    {
+        VBoxControlError("Error opening video device map registry key!\n");
+        return 0;
+    }
+    char szVideoLocation[256];
+    DWORD dwKeyType;
+    szVideoLocation[0] = 0;
+    DWORD len = sizeof(szVideoLocation);
+    status = RegQueryValueExA(hkeyDeviceMap, "\\Device\\Video0", NULL, &dwKeyType, (LPBYTE)szVideoLocation, &len);
+    /*
+     * This value will start with a weird value: \REGISTRY\Machine
+     * Make sure this is true.
+     */
+    if (   (status == ERROR_SUCCESS)
+        && (dwKeyType == REG_SZ)
+        && (_strnicmp(szVideoLocation, "\\REGISTRY\\Machine", 17) == 0))
+    {
+        /* open that branch */
+        status = RegOpenKeyExA(HKEY_LOCAL_MACHINE, &szVideoLocation[18], 0, KEY_READ | (writable ? KEY_WRITE : 0), &hkeyVideo);
+    }
+    else
+    {
+        VBoxControlError("Error opening registry key '%s'\n", &szVideoLocation[18]);
+    }
+    RegCloseKey(hkeyDeviceMap);
+    return hkeyVideo;
+}
+
+int handleGetVideoAcceleration(int argc, char *argv[])
+{
+    ULONG status;
+    HKEY hkeyVideo = getVideoKey(false);
+
+    if (hkeyVideo)
+    {
+        /* query the actual value */
+        DWORD fAcceleration = 1;
+        DWORD len = sizeof(fAcceleration);
+        DWORD dwKeyType;
+        status = RegQueryValueExA(hkeyVideo, "EnableVideoAccel", NULL, &dwKeyType, (LPBYTE)&fAcceleration, &len);
+        if (status != ERROR_SUCCESS)
+            RTPrintf("Video acceleration: default\n");
+        else
+            RTPrintf("Video acceleration: %s\n", fAcceleration ? "on" : "off");
+        RegCloseKey(hkeyVideo);
+    }
+    return 0;
+}
+
+int handleSetVideoAcceleration(int argc, char *argv[])
+{
+    ULONG status;
+    HKEY hkeyVideo;
+
+    /* must have exactly one argument: the new offset */
+    if (   (argc != 1)
+        || (   strcmp(argv[0], "on")
+            && strcmp(argv[0], "off")))
+    {
+        usage(SET_VIDEO_ACCEL);
+        return 1;
+    }
+
+    hkeyVideo = getVideoKey(true);
+
+    if (hkeyVideo)
+    {
+        int fAccel = 0;
+        if (!strcmp(argv[0], "on"))
+            fAccel = 1;
+        /* set a new value */
+        status = RegSetValueExA(hkeyVideo, "EnableVideoAccel", 0, REG_DWORD, (LPBYTE)&fAccel, sizeof(fAccel));
+        if (status != ERROR_SUCCESS)
+        {
+            VBoxControlError("Error %d writing video acceleration status!\n", status);
+        }
+        RegCloseKey(hkeyVideo);
+    }
+    return 0;
+}
+
+#define MAX_CUSTOM_MODES 128
+
+/* the table of custom modes */
+struct
+{
+    DWORD xres;
+    DWORD yres;
+    DWORD bpp;
+} customModes[MAX_CUSTOM_MODES] = {0};
+
+void getCustomModes(HKEY hkeyVideo)
+{
+    ULONG status;
+    int curMode = 0;
+
+    /* null out the table */
+    memset(customModes, 0, sizeof(customModes));
+
+    do
+    {
+        char valueName[20];
+        DWORD xres, yres, bpp = 0;
+        DWORD dwType;
+        DWORD dwLen = sizeof(DWORD);
+
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dWidth", curMode);
+        status = RegQueryValueExA(hkeyVideo, valueName, NULL, &dwType, (LPBYTE)&xres, &dwLen);
+        if (status != ERROR_SUCCESS)
+            break;
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dHeight", curMode);
+        status = RegQueryValueExA(hkeyVideo, valueName, NULL, &dwType, (LPBYTE)&yres, &dwLen);
+        if (status != ERROR_SUCCESS)
+            break;
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dBPP", curMode);
+        status = RegQueryValueExA(hkeyVideo, valueName, NULL, &dwType, (LPBYTE)&bpp, &dwLen);
+        if (status != ERROR_SUCCESS)
+            break;
+
+        /* check if the mode is OK */
+        if (   (xres > (1 << 16))
+            && (yres > (1 << 16))
+            && (   (bpp != 16)
+                || (bpp != 24)
+                || (bpp != 32)))
+            break;
+
+        /* add mode to table */
+        customModes[curMode].xres = xres;
+        customModes[curMode].yres = yres;
+        customModes[curMode].bpp  = bpp;
+
+        ++curMode;
+
+        if (curMode >= MAX_CUSTOM_MODES)
+            break;
+    } while(1);
+}
+
+void writeCustomModes(HKEY hkeyVideo)
+{
+    ULONG status;
+    int tableIndex = 0;
+    int modeIndex = 0;
+
+    /* first remove all values */
+    for (int i = 0; i < MAX_CUSTOM_MODES; i++)
+    {
+        char valueName[20];
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dWidth", i);
+        RegDeleteValueA(hkeyVideo, valueName);
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dHeight", i);
+        RegDeleteValueA(hkeyVideo, valueName);
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dBPP", i);
+        RegDeleteValueA(hkeyVideo, valueName);
+    }
+
+    do
+    {
+        if (tableIndex >= MAX_CUSTOM_MODES)
+            break;
+
+        /* is the table entry present? */
+        if (   (!customModes[tableIndex].xres)
+            || (!customModes[tableIndex].yres)
+            || (!customModes[tableIndex].bpp))
+        {
+            tableIndex++;
+            continue;
+        }
+
+        RTPrintf("writing mode %d (%dx%dx%d)\n", modeIndex, customModes[tableIndex].xres, customModes[tableIndex].yres, customModes[tableIndex].bpp);
+        char valueName[20];
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dWidth", modeIndex);
+        status = RegSetValueExA(hkeyVideo, valueName, 0, REG_DWORD, (LPBYTE)&customModes[tableIndex].xres,
+                                sizeof(customModes[tableIndex].xres));
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dHeight", modeIndex);
+        RegSetValueExA(hkeyVideo, valueName, 0, REG_DWORD, (LPBYTE)&customModes[tableIndex].yres,
+                       sizeof(customModes[tableIndex].yres));
+        RTStrPrintf(valueName, sizeof(valueName), "CustomMode%dBPP", modeIndex);
+        RegSetValueExA(hkeyVideo, valueName, 0, REG_DWORD, (LPBYTE)&customModes[tableIndex].bpp,
+                       sizeof(customModes[tableIndex].bpp));
+
+        modeIndex++;
+        tableIndex++;
+
+    } while(1);
+
+}
+
+int handleListCustomModes(int argc, char *argv[])
+{
+    if (argc != 0)
+    {
+        usage(LIST_CUST_MODES);
+        return 1;
+    }
+
+    HKEY hkeyVideo = getVideoKey(false);
+
+    if (hkeyVideo)
+    {
+        getCustomModes(hkeyVideo);
+        for (int i = 0; i < (sizeof(customModes) / sizeof(customModes[0])); i++)
+        {
+            if (   !customModes[i].xres
+                || !customModes[i].yres
+                || !customModes[i].bpp)
+                continue;
+
+            RTPrintf("Mode: %d x %d x %d\n",
+                             customModes[i].xres, customModes[i].yres, customModes[i].bpp);
+        }
+        RegCloseKey(hkeyVideo);
+    }
+    return 0;
+}
+
+int handleAddCustomMode(int argc, char *argv[])
+{
+    if (argc != 3)
+    {
+        usage(ADD_CUST_MODE);
+        return 1;
+    }
+
+    DWORD xres = atoi(argv[0]);
+    DWORD yres = atoi(argv[1]);
+    DWORD bpp  = atoi(argv[2]);
+
+    /** @todo better check including xres mod 8 = 0! */
+    if (   (xres > (1 << 16))
+        && (yres > (1 << 16))
+        && (   (bpp != 16)
+            || (bpp != 24)
+            || (bpp != 32)))
+    {
+        VBoxControlError("Error: invalid mode specified!\n");
+        return 1;
+    }
+
+    HKEY hkeyVideo = getVideoKey(true);
+
+    if (hkeyVideo)
+    {
+        int i;
+        int fModeExists = 0;
+        getCustomModes(hkeyVideo);
+        for (i = 0; i < MAX_CUSTOM_MODES; i++)
+        {
+            /* mode exists? */
+            if (   customModes[i].xres == xres
+                && customModes[i].yres == yres
+                && customModes[i].bpp  == bpp
+               )
+            {
+                fModeExists = 1;
+            }
+        }
+        if (!fModeExists)
+        {
+            for (i = 0; i < MAX_CUSTOM_MODES; i++)
+            {
+                /* item free? */
+                if (!customModes[i].xres)
+                {
+                    customModes[i].xres = xres;
+                    customModes[i].yres = yres;
+                    customModes[i].bpp  = bpp;
+                    break;
+                }
+            }
+            writeCustomModes(hkeyVideo);
+        }
+        RegCloseKey(hkeyVideo);
+    }
+    return 0;
+}
+
+int handleRemoveCustomMode(int argc, char *argv[])
+{
+    if (argc != 3)
+    {
+        usage(REMOVE_CUST_MODE);
+        return 1;
+    }
+
+    DWORD xres = atoi(argv[0]);
+    DWORD yres = atoi(argv[1]);
+    DWORD bpp  = atoi(argv[2]);
+
+    HKEY hkeyVideo = getVideoKey(true);
+
+    if (hkeyVideo)
+    {
+        getCustomModes(hkeyVideo);
+        for (int i = 0; i < MAX_CUSTOM_MODES; i++)
+        {
+            /* correct item? */
+            if (   (customModes[i].xres == xres)
+                && (customModes[i].yres == yres)
+                && (customModes[i].bpp  == bpp))
+            {
+                RTPrintf("found mode at index %d\n", i);
+                memset(&customModes[i], 0, sizeof(customModes[i]));
+                break;
+            }
+        }
+        writeCustomModes(hkeyVideo);
+        RegCloseKey(hkeyVideo);
+    }
+}
+
+#endif /* RT_OS_WINDOWS */
+
+#ifdef VBOX_WITH_GUEST_PROPS
 /**
- * Retrieves a value from the host/guest configuration registry.
- * This is accessed through the "VBoxSharedInfoSvc" HGCM service.
+ * Retrieves a value from the guest property store.
+ * This is accessed through the "VBoxGuestPropSvc" HGCM service.
  *
  * @returns 0 on success, 1 on failure
- * @param   key  (string) the key which the value is stored under.
+ * @param   name  (string) the name of the property.
  */
 int getGuestProperty(int argc, char **argv)
 {
-    using namespace svcInfo;
+    using namespace guestProp;
+
+    if (argc != 1)
+    {
+        usage(GET_GUEST_PROP);
+        return 1;
+    }
 
     uint32_t u32ClientID = 0;
     int rc = VINF_SUCCESS;
-    char *pszKey = NULL;
-    char szValue[KEY_MAX_VALUE_LEN];
-
-    if (argc != 1)
-    {
-        usage(GET_GUEST_PROP);
-        return 1;
-    }
-    rc = RTStrCurrentCPToUtf8(&pszKey, argv[0]);
+    char *pszName = argv[0];
+    char *pszValue = NULL;
+
+    rc = VbglR3GuestPropConnect(&u32ClientID);
     if (!RT_SUCCESS(rc))
-        VBoxControlError("Failed to convert the key name to Utf8, error %Rrc\n", rc);
+        VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
     if (RT_SUCCESS(rc))
     {
-        rc = VbglR3InfoSvcConnect(&u32ClientID);
-        if (!RT_SUCCESS(rc))
-            VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
-    }
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3InfoSvcReadKey(u32ClientID, argv[0], szValue, sizeof(szValue), NULL);
+        rc = VbglR3GuestPropReadValueAlloc(u32ClientID, pszName, &pszValue);
         if (!RT_SUCCESS(rc) && (rc != VERR_NOT_FOUND))
             VBoxControlError("Failed to retrieve the property value, error %Rrc\n", rc);
@@ -141 +895 @@
         RTPrintf("No value set!\n");
     if (RT_SUCCESS(rc))
-        RTPrintf("Value: %S\n", szValue);
+        RTPrintf("Value: %S\n", pszValue);
     if (u32ClientID != 0)
-        VbglR3InfoSvcDisconnect(u32ClientID);
-    RTStrFree(pszKey);
+        VbglR3GuestPropDisconnect(u32ClientID);
+    VbglR3GuestPropReadValueFree(pszValue);
     return RT_SUCCESS(rc) ? 0 : 1;
 }
@@ -150 +904 @@
 
 /**
- * Writes a value to the host/guest configuration registry.
- * This is accessed through the "VBoxSharedInfoSvc" HGCM service.
+ * Writes a value to the guest property store.
+ * This is accessed through the "VBoxGuestPropSvc" HGCM service.
  *
  * @returns 0 on success, 1 on failure
- * @param   key   (string) the key which the value is stored under.
- * @param   value (string) the value to write.  If empty, the key will be
+ * @param   name  (string) the name of the property.
+ * @param   value (string) the value to write.  If empty, the property will be
  *                removed.
  */
 static int setGuestProperty(int argc, char *argv[])
 {
+    if (argc != 1 && argc != 2)
+    {
+        usage(SET_GUEST_PROP);
+        return 1;
+    }
+
     uint32_t u32ClientID = 0;
     int rc = VINF_SUCCESS;
-    char *pszKey = NULL;
+    char *pszName = argv[0];
     char *pszValue = NULL;
-
-    if (argc != 1 && argc != 2)
-    {
-        usage();
-        return 1;
-    }
-    rc = RTStrCurrentCPToUtf8(&pszKey, argv[0]);
+    if (2 == argc)
+        pszValue = argv[1];
+
+    rc = VbglR3GuestPropConnect(&u32ClientID);
     if (!RT_SUCCESS(rc))
-        VBoxControlError("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))
-            VBoxControlError("Failed to convert the key value to Utf8, error %Rrc\n", rc);
-    }
+        VBoxControlError("Failed to connect to the guest property service, error %Rrc\n", rc);
     if (RT_SUCCESS(rc))
     {
-        rc = VbglR3InfoSvcConnect(&u32ClientID);
-        if (!RT_SUCCESS(rc))
-            VBoxControlError("Failed to connect to the host/guest registry service, error %Rrc\n", rc);
-    }
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3InfoSvcWriteKey(u32ClientID, argv[0], pszValue);
+        rc = VbglR3GuestPropWriteValue(u32ClientID, pszName, pszValue);
         if (!RT_SUCCESS(rc))
             VBoxControlError("Failed to store the property value, error %Rrc\n", rc);
     }
     if (u32ClientID != 0)
-        VbglR3InfoSvcDisconnect(u32ClientID);
-    RTStrFree(pszKey);
-    RTStrFree(pszValue);
+        VbglR3GuestPropDisconnect(u32ClientID);
     return RT_SUCCESS(rc) ? 0 : 1;
 }
@@ -210 +953 @@
 } g_commandHandlers[] =
 {
-#ifdef VBOX_WITH_INFO_SVC
+#ifdef RT_OS_WINDOWS
+    { "getvideoacceleration", handleGetVideoAcceleration },
+    { "setvideoacceleration", handleSetVideoAcceleration },
+    { "listcustommodes", handleListCustomModes },
+    { "addcustommode", handleAddCustomMode },
+    { "removecustommode", handleRemoveCustomMode },
+    { "setvideomode", handleSetVideoMode },
+#endif
+#ifdef VBOX_WITH_GUEST_PROPS
     { "getguestproperty", getGuestProperty },
     { "setguestproperty", setGuestProperty },
@@ -243 +994 @@
         if (   (0 == strcmp(argv[iArg], "-v"))
             || (0 == strcmp(argv[iArg], "--version"))
+            || (0 == strcmp(argv[iArg], "-version"))
+            || (0 == strcmp(argv[iArg], "getversion"))
            )
             {
@@ -311 +1064 @@
     if (!onlyinfo && (0 == rc))
     {
+        /*
+         * The input is in the guest OS'es codepage (NT guarantees ACP).
+         * For VBox we use UTF-8.  For simplicity, just convert the argv[] array
+         * here.
+         */
+        for (int i = iArg; i < argc; i++)
+        {
+            char *converted;
+            RTStrCurrentCPToUtf8(&converted, argv[i]);
+            argv[i] = converted;
+        }
+
         if (argc > iArg)
         {
@@ -340 +1105 @@
             usage();
         }
+
+        /*
+         * Free converted argument vector
+         */
+        for (int i = iArg; i < argc; i++)
+            RTStrFree(argv[i]);
+
     }
 

trunk/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk

@@ -86 +86 @@
 VBoxGuestR3Lib_DEFS        = \
         VBOX_HGCM \
-        $(if $(VBOX_WITH_INFO_SVC),VBOX_WITH_INFO_SVC,)
+        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
 VBoxGuestR3Lib_SOURCES     = \
         VBoxGuestR3Lib.cpp \
@@ -92 +92 @@
         VBoxGuestR3LibDaemonize.cpp \
         VBoxGuestR3LibGR.cpp \
-        $(if $(VBOX_WITH_INFO_SVC),VBoxGuestR3LibInfoSvc.cpp,) \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
         VBoxGuestR3LibMouse.cpp \
         VBoxGuestR3LibMisc.cpp \
@@ -102 +102 @@
         VBoxGuestR3Lib.cpp \
         VBoxGuestR3LibGR.cpp \
-        $(if $(VBOX_WITH_INFO_SVC),VBoxGuestR3LibInfoSvc.cpp,) \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
         VBoxGuestR3LibMisc.cpp  
 endif
@@ -124 +124 @@
 VBoxGuestR3LibXFree86_DEFS     = \
         VBOX_HGCM VBOX_VBGLR3_XFREE86 \
-        $(if $(VBOX_WITH_INFO_SVC),VBOX_WITH_INFO_SVC,)
+        $(if $(VBOX_WITH_GUEST_PROPS),VBOX_WITH_GUEST_PROPS,)
 VBoxGuestR3LibXFree86_SOURCES  = \
         VBoxGuestR3Lib.cpp \
         VBoxGuestR3LibGR.cpp \
-        $(if $(VBOX_WITH_INFO_SVC),VBoxGuestR3LibInfoSvc.cpp,) \
+        $(if $(VBOX_WITH_GUEST_PROPS),VBoxGuestR3LibGuestProp.cpp,) \
         VBoxGuestR3LibMouse.cpp \
         VBoxGuestR3LibMisc.cpp \

trunk/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h

@@ -56 +56 @@
 
 
+DECLINLINE(void) VbglHGCMParmUInt64Set(HGCMFunctionParameter *pParm, uint64_t u64)
+{
+    pParm->type      = VMMDevHGCMParmType_64bit;
+    pParm->u.value64 = u64;
+}
+
+
+DECLINLINE(int) VbglHGCMParmUInt64Get(HGCMFunctionParameter *pParm, uint64_t *pu64)
+{
+    if (pParm->type == VMMDevHGCMParmType_64bit)
+    {
+        *pu64 = pParm->u.value64;
+        return VINF_SUCCESS;
+    }
+    return VERR_INVALID_PARAMETER;
+}
+
+
 DECLINLINE(void) VbglHGCMParmPtrSet(HGCMFunctionParameter *pParm, void *pv, uint32_t cb)
 {

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, information service.
+ * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions,
+ * guest properties.
  */
 
@@ -28 +29 @@
 #include <iprt/assert.h>
 #include <VBox/log.h>
-#include <VBox/HostServices/VBoxInfoSvc.h>  /* For Save and RetrieveVideoMode */
+#include <VBox/HostServices/GuestPropertySvc.h>
 
 #include "VBGLR3Internal.h"
 
-using namespace svcInfo;
-
-/**
- * Connects to the information service.
+using namespace guestProp;
+
+/**
+ * Connects to the guest property service.
  *
  * @returns VBox status code
@@ -41 +42 @@
  *                          must be passed to all the other calls to the service.
  */
-VBGLR3DECL(int) VbglR3InfoSvcConnect(uint32_t *pu32ClientId)
+VBGLR3DECL(int) VbglR3GuestPropConnect(uint32_t *pu32ClientId)
 {
     VBoxGuestHGCMConnectInfo Info;
@@ -47 +48 @@
     Info.Loc.type = VMMDevHGCMLoc_LocalHost_Existing;
     memset(&Info.Loc.u, 0, sizeof(Info.Loc.u));
-    strcpy(Info.Loc.u.host.achName, "VBoxSharedInfoSvc");
+    strcpy(Info.Loc.u.host.achName, "VBoxGuestPropSvc");
     Info.u32ClientID = UINT32_MAX;  /* try make valgrid shut up. */
 
@@ -62 +63 @@
 
 /**
- * Disconnect from the information service.
+ * Disconnect from the guest property service.
  *
  * @returns VBox status code.
  * @param   u32ClientId     The client id returned by VbglR3InfoSvcConnect().
  */
-VBGLR3DECL(int) VbglR3InfoSvcDisconnect(uint32_t u32ClientId)
+VBGLR3DECL(int) VbglR3GuestPropDisconnect(uint32_t u32ClientId)
 {
     VBoxGuestHGCMDisconnectInfo Info;
@@ -81 +82 @@
 
 /**
- * Write a key value.
+ * Write a property value.
  *
  * @returns VBox status code.
  * @param   u32ClientId     The client id returned by VbglR3InvsSvcConnect().
- * @param   pszKey          The key to save to.  Utf8
+ * @param   pszName         The property to save to.  Utf8
  * @param   pszValue        The value to store.  Utf8.  If this is NULL then
- *                          the key will be removed.
- */
-VBGLR3DECL(int) VbglR3InfoSvcWriteKey(uint32_t u32ClientId, char *pszKey, char *pszValue)
+ *                          the property will be removed.
+ * @param   pszFlags        The flags for the property
+ */
+VBGLR3DECL(int) VbglR3GuestPropWrite(uint32_t u32ClientId, char *pszName, char *pszValue, char *pszFlags)
 {
     int rc;
@@ -95 +97 @@
     if (pszValue != NULL)
     {
-        SetConfigKey Msg;
+        SetProperty Msg;
 
         Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
         Msg.hdr.u32ClientID = u32ClientId;
-        Msg.hdr.u32Function = SET_CONFIG_KEY;
+        Msg.hdr.u32Function = SET_PROP_VALUE;
         Msg.hdr.cParms = 2;
-        VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
+        VbglHGCMParmPtrSet(&Msg.name, pszName, strlen(pszName) + 1);
+        VbglHGCMParmPtrSet(&Msg.value, pszValue, strlen(pszValue) + 1);
+        VbglHGCMParmPtrSet(&Msg.flags, pszFlags, strlen(pszFlags) + 1);
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+            rc = Msg.hdr.result;
+    }
+    else
+    {
+        DelProperty Msg;
+
+        Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
+        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32Function = DEL_PROP;
+        Msg.hdr.cParms = 1;
+        VbglHGCMParmPtrSet(&Msg.name, pszName, strlen(pszName) + 1);
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+            rc = Msg.hdr.result;
+    }
+    return rc;
+}
+
+
+/**
+ * Write a property value.
+ *
+ * @returns VBox status code.
+ * @param   u32ClientId     The client id returned by VbglR3InvsSvcConnect().
+ * @param   pszName         The property to save to.  Utf8
+ * @param   pszValue        The value to store.  Utf8.  If this is NULL then
+ *                          the property will be removed.
+ * @note  if the property already exists and pszValue is not NULL then the
+ *        property's flags field will be left unchanged
+ */
+VBGLR3DECL(int) VbglR3GuestPropWriteValue(uint32_t u32ClientId, char *pszName, char *pszValue)
+{
+    int rc;
+
+    if (pszValue != NULL)
+    {
+        SetPropertyValue Msg;
+
+        Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
+        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32Function = SET_PROP_VALUE;
+        Msg.hdr.cParms = 2;
+        VbglHGCMParmPtrSet(&Msg.name, pszName, strlen(pszName) + 1);
         VbglHGCMParmPtrSet(&Msg.value, pszValue, strlen(pszValue) + 1);
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
@@ -109 +158 @@
     else
     {
-        DelConfigKey Msg;
+        DelProperty Msg;
 
         Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
         Msg.hdr.u32ClientID = u32ClientId;
-        Msg.hdr.u32Function = DEL_CONFIG_KEY;
+        Msg.hdr.u32Function = DEL_PROP;
         Msg.hdr.cParms = 1;
-        VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
+        VbglHGCMParmPtrSet(&Msg.name, pszName, strlen(pszName) + 1);
         rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
         if (RT_SUCCESS(rc))
@@ -125 +174 @@
 
 /**
- * Retrieve a key value.
- *
- * @returns VBox status code.
- * @retval  VINF_SUCCESS on success, pszValue and pcbActual containing valid data.
- * @retval  VERR_BUFFER_OVERFLOW if the buffer is too small, pcbActual will contain
- *          the require buffer size. Note race condition here when retrying wrt
- *          someone updating it.
+ * Retrieve a property.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success, pszValue, pu64Timestamp and pszFlags
+ *          containing valid data.
+ * @retval  VERR_BUFFER_OVERFLOW if the scratch buffer @a pcBuf is not large
+ *          enough.  In this case the size needed will be placed in
+ *          @a pcbBufActual if it is not NULL.
  * @retval  VERR_NOT_FOUND if the key wasn't found.
  *
  * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
- * @param   pszKey          The key to read.  Utf8
- * @param   pszValue        Where to store the value retrieved.  Utf8.
- * @param   cbValue         The size of the buffer pszValue points to.
- * @param   pcbActual       Where to store the required buffer size if cbValue
- *                          is too small.  On success this contains the
- *                          actual size of the value retrieved.  Optional.
- */
-VBGLR3DECL(int) VbglR3InfoSvcReadKey(uint32_t u32ClientId, char *pszKey,
-                                     char *pszValue, uint32_t cbValue, uint32_t *pcbActual)
-{
-    GetConfigKey Msg;
+ * @param   pszName         The value to read.  Utf8
+ * @param   pcBuf           A scratch buffer to store the data retrieved into.
+ *                          The returned data is only valid for it's lifetime.
+ * @param   cbBuf           The size of @a pcBuf
+ * @param   pszValue        Where to store the pointer to the value retrieved.
+ * @param   pu64Timestamp   Where to store the timestamp.  Optional.
+ * @param   pszFlags        Where to store the pointer to the flags.  Optional.
+ * @param   pcbBufActual    If @a pcBuf is not large enough, the size needed.
+ *                          Optional.
+ */
+VBGLR3DECL(int) VbglR3GuestPropRead(uint32_t u32ClientId, const char *pszName,
+                                    void *pvBuf, uint32_t cbBuf,
+                                    char **ppszValue, uint64_t *pu64Timestamp,
+                                    char **ppszFlags,
+                                    uint32_t *pcbBufActual)
+{
+    GetProperty Msg;
 
     Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
     Msg.hdr.u32ClientID = u32ClientId;
-    Msg.hdr.u32Function = GET_CONFIG_KEY;
-    Msg.hdr.cParms = 3;
-    VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
-    VbglHGCMParmPtrSet(&Msg.value, pszValue, cbValue);
+    Msg.hdr.u32Function = GET_PROP;
+    Msg.hdr.cParms = 4;
+    VbglHGCMParmPtrSet(&Msg.name, const_cast<char *>(pszName),
+                       strlen(pszName) + 1);
+    VbglHGCMParmPtrSet(&Msg.buffer, pvBuf, cbBuf);
+    VbglHGCMParmUInt64Set(&Msg.timestamp, 0);
     VbglHGCMParmUInt32Set(&Msg.size, 0);
 
@@ -158 +216 @@
     if (RT_SUCCESS(rc))
         rc = Msg.hdr.result;
-    uint32_t cbActual;
-    if (RT_SUCCESS(rc) || (VERR_BUFFER_OVERFLOW == rc))
-    {
-        int rc2 = VbglHGCMParmUInt32Get(&Msg.size, &cbActual);
-        if (RT_SUCCESS(rc2))
+    if ((VERR_BUFFER_OVERFLOW == rc) && (pcbBufActual != NULL))
+    {
+        int rc2 = VbglHGCMParmUInt32Get(&Msg.size, pcbBufActual);
+        if (!RT_SUCCESS(rc2))
+            rc = rc2;
+    }
+    if (RT_SUCCESS(rc) && (pu64Timestamp != NULL))
+        rc = VbglHGCMParmUInt64Get(&Msg.timestamp, pu64Timestamp);
+    if (RT_SUCCESS(rc))
+        *ppszValue = reinterpret_cast<char *>(pvBuf);
+    if (RT_SUCCESS(rc) && (ppszFlags != NULL))
+    {
+        bool found = false;
+        size_t i = 0;
+        char *pcBuf = reinterpret_cast<char *>(pvBuf);
+        for (; i < cbBuf && !found; ++i)
+            if (0 == pcBuf[i])
+                found = true;
+        if (!found)
+            /* To my mind this is an internal error, but whatever */
+            rc = VERR_TOO_MUCH_DATA;
+        else
+            *ppszFlags = pcBuf + i;
+    }
+    return rc;
+}
+
+
+/**
+ * Retrieve a property value, allocating space for it.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success, pszValue containing valid data.
+ * @retval  VERR_NOT_FOUND if the key wasn't found.
+ *
+ * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
+ * @param   pszName         The value to read.  Utf8
+ * @param   ppszValue       Where to store the pointer to the value returned.
+ */
+VBGLR3DECL(int) VbglR3GuestPropReadValueAlloc(uint32_t u32ClientId,
+                                              const char *pszName,
+                                              char **ppszValue)
+{
+    int rc = VINF_SUCCESS;
+    uint32_t cchBuf = 1024;
+    void *pvBuf = RTMemAlloc(cchBuf);
+    char *pszValue = NULL;
+    if (NULL == pvBuf)
+        rc = VERR_NO_MEMORY;
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cchBuf,
+                                 &pszValue, NULL, NULL, &cchBuf);
+        if (VERR_BUFFER_OVERFLOW == rc)
         {
-            if (pcbActual != NULL)
-                *pcbActual = cbActual;
+            /** @todo how should we handle the race condition here? */
+            pvBuf = RTMemRealloc(pvBuf, cchBuf);
+            if (pvBuf != NULL)
+                rc = VbglR3GuestPropRead(u32ClientId, pszName, pvBuf, cchBuf,
+                                         &pszValue, NULL, NULL, NULL);
+            else
+                rc = VERR_NO_MEMORY;
+            if (VERR_BUFFER_OVERFLOW == rc)
+                /* VERR_BUFFER_OVERFLOW has a different meaning here as a
+                 * return code */
+                rc = VERR_TOO_MUCH_DATA;
         }
-        else
-            rc = rc2;
-    }
-    return rc;
-}
+    }
+    if (RT_SUCCESS(rc))
+        *ppszValue = pszValue;
+    return rc;
+}
+
+/**
+ * Free the memory used by VbglR3GuestPropReadValueAlloc for returning a
+ * value.
+ * 
+ * @param pszValue   the memory to be freed.  NULL pointers will be ignored.
+ */
+VBGLR3DECL(void) VbglR3GuestPropReadValueFree(char *pszValue)
+{
+    RTMemFree(pszValue);
+}
+
+
+/**
+ * Retrieve a property value, using a user-provided buffer to store it.
+ *
+ * @returns VBox status code.
+ * @retval  VINF_SUCCESS on success, pszValue containing valid data.
+ * @retval  VERR_BUFFER_OVERFLOW and the size needed in pcchValueActual if the
+ *          buffer provided was too small
+ * @retval  VERR_NOT_FOUND if the key wasn't found.
+ *
+ * @note    There is a race here between obtaining the size of the buffer
+ *          needed to hold the value and the value being updated.
+ *
+ * @param   u32ClientId     The client id returned by VbglR3ClipboardConnect().
+ * @param   pszName         The value to read.  Utf8
+ * @param   pszValue        Where to store the value retrieved.
+ * @param   cchValue        The size of the buffer pointed to by @a pszValue
+ * @param   pcchValueActual Where to store the size of the buffer needed if
+ *                          the buffer supplied is too small.  Optional.
+ */
+VBGLR3DECL(int) VbglR3GuestPropReadValue(uint32_t u32ClientId, const char *pszName,
+                                         char *pszValue, uint32_t cchValue,
+                                         uint32_t *pcchValueActual)
+{
+    char *pcBuf = NULL;
+    int rc = VbglR3GuestPropReadValueAlloc(u32ClientId, pszName, &pcBuf);
+    if (RT_SUCCESS(rc))
+    {
+        uint32_t cchValueActual = strlen(pcBuf) + 1;
+        if (cchValueActual > cchValue)
+        {
+            if (pcchValueActual != NULL)
+                *pcchValueActual = cchValueActual;
+            rc = VERR_BUFFER_OVERFLOW;
+        }
+        if (RT_SUCCESS(rc))
+            strcpy(pszValue, pcBuf);
+    }
+    VbglR3GuestPropReadValueFree(pcBuf);
+    return rc;
+}

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp

@@ -28 +28 @@
 #include <iprt/assert.h>
 #include <VBox/log.h>
-#include <VBox/HostServices/VBoxInfoSvc.h>  /* For Save and RetrieveVideoMode */
+#include <VBox/HostServices/GuestPropertySvc.h>  /* For Save and RetrieveVideoMode */
 
 #include "VBGLR3Internal.h"
 
+#define VIDEO_PROP_PREFIX "/VirtualBox/GuestAdd/Vbgl/Video/"
 
 /**
@@ -228 +229 @@
     if (RT_SUCCESS(rc) && RT_SUCCESS(req.header.rc))
         fRc = req.fSupported;
-    else
-        LogRelFunc(("error querying video mode supported status from VMMDev."
-                    "rc = %Vrc, VMMDev rc = %Vrc\n", rc, req.header.rc));
     return fRc;
 }
@@ -245 +243 @@
 VBGLR3DECL(int) VbglR3SaveVideoMode(const char *pszName, uint32_t cx, uint32_t cy, uint32_t cBits)
 {
-#ifdef VBOX_WITH_INFO_SVC
-    using namespace svcInfo;
-
-    char szModeName[KEY_MAX_LEN];
-    char szModeParms[KEY_MAX_VALUE_LEN];
+#ifdef VBOX_WITH_GUEST_PROPS
+    using namespace guestProp;
+
+    char szModeName[MAX_NAME_LEN];
+    char szModeParms[MAX_VALUE_LEN];
     uint32_t u32ClientId = 0;
-    RTStrPrintf(szModeName, sizeof(szModeName), "VideoMode/%s", pszName);
+    RTStrPrintf(szModeName, sizeof(szModeName), VIDEO_PROP_PREFIX"%s", pszName);
     RTStrPrintf(szModeParms, sizeof(szModeParms), "%dx%dx%d", cx, cy, cBits);
-    int rc = VbglR3InfoSvcConnect(&u32ClientId);
-    if (RT_SUCCESS(rc))
-        rc = VbglR3InfoSvcWriteKey(u32ClientId, szModeName, szModeParms);
+    int rc = VbglR3GuestPropConnect(&u32ClientId);
+    if (RT_SUCCESS(rc))
+        rc = VbglR3GuestPropWriteValue(u32ClientId, szModeName, szModeParms);
     if (u32ClientId != 0)
-        VbglR3InfoSvcDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
-    return rc;
-#else /* VBOX_WITH_INFO_SVC not defined */
+        VbglR3GuestPropDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
+    return rc;
+#else /* VBOX_WITH_GUEST_PROPS not defined */
     return VERR_NOT_IMPLEMENTED;
-#endif /* VBOX_WITH_INFO_SVC not defined */
-}
-
-
-/**
- * Retrieve video mode parameters from the registry.
+#endif /* VBOX_WITH_GUEST_PROPS not defined */
+}
+
+
+/**
+ * Retrieve video mode parameters from the guest property store.
  *
  * @returns iprt status value
@@ -276 +274 @@
 VBGLR3DECL(int) VbglR3RetrieveVideoMode(const char *pszName, uint32_t *pcx, uint32_t *pcy, uint32_t *pcBits)
 {
-#ifdef VBOX_WITH_INFO_SVC
-    using namespace svcInfo;
-
-    char szModeParms[KEY_MAX_VALUE_LEN];
-    char *pszNext;
+#ifdef VBOX_WITH_GUEST_PROPS
+    using namespace guestProp;
+
+/*
+ * First we retreive the video mode which is saved as a string in the
+ * guest property store.
+ */
+    /* The buffer for VbglR3GuestPropReadValue.  If this is too small then
+     * something is wrong with the data stored in the property. */
+    char szModeParms[1024];
     uint32_t u32ClientId = 0;
     uint32_t cx, cy, cBits;
 
-    int rc = VbglR3InfoSvcConnect(&u32ClientId);
-    if (RT_SUCCESS(rc))
-    {
-        char szModeName[KEY_MAX_LEN];
-        RTStrPrintf(szModeName, sizeof(szModeName), "VideoMode/%s", pszName);
-        rc = VbglR3InfoSvcReadKey(u32ClientId, szModeName, szModeParms,
-                                  sizeof(szModeParms), NULL); /** @todo add a VbglR3InfoSvcReadKeyF/FV that does the RTStrPrintf for you. */
-    }
+    int rc = VbglR3GuestPropConnect(&u32ClientId);
+    if (RT_SUCCESS(rc))
+    {
+        char szModeName[MAX_NAME_LEN];
+        RTStrPrintf(szModeName, sizeof(szModeName), VIDEO_PROP_PREFIX"%s", pszName);
+        /** @todo add a VbglR3GuestPropReadValueF/FV that does the RTStrPrintf for you. */
+        rc = VbglR3GuestPropReadValue(u32ClientId, szModeName, szModeParms,
+                                      sizeof(szModeParms), NULL);
+    }
+
+/*
+ * Now we convert the string returned to numeric values.
+ */
+    char *pszNext;
     if (RT_SUCCESS(rc))
         /* Extract the width from the string */
@@ -299 +308 @@
     if (RT_SUCCESS(rc))
     {
+        /* Extract the height from the string */
         ++pszNext;
         rc = RTStrToUInt32Ex(pszNext, &pszNext, 10, &cy);
@@ -306 +316 @@
     if (RT_SUCCESS(rc))
     {
+        /* Extract the bpp from the string */
         ++pszNext;
         rc = RTStrToUInt32Full(pszNext, 10, &cBits);
@@ -311 +322 @@
     if (rc != VINF_SUCCESS)
         rc = VERR_PARSE_ERROR;
+
+/*
+ * And clean up and return the values if we successfully obtained them.
+ */
     if (u32ClientId != 0)
-        VbglR3InfoSvcDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
+        VbglR3GuestPropDisconnect(u32ClientId);  /* Return value ignored, because what can we do anyway? */
     if (RT_SUCCESS(rc))
     {
@@ -320 +335 @@
     }
     return rc;
-#else /* VBOX_WITH_INFO_SVC not defined */
+#else /* VBOX_WITH_GUEST_PROPS not defined */
     return VERR_NOT_IMPLEMENTED;
-#endif /* VBOX_WITH_INFO_SVC not defined */
-}
+#endif /* VBOX_WITH_GUEST_PROPS not defined */
+}