Changeset 85976 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Sep 1, 2020 11:35:29 AM (4 years ago)

Author:

vboxsync

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

140171

Message:

bugref:9637. Checking if VBoxDRMClient is running during VBoxClient --vmsvga service

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• Makefile.kmk (modified) (8 diffs)
• display-svga-x11.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/Makefile.kmk

@@ -26 +26 @@
 #
 PROGRAMS += VBoxClient
+#
+# Please make sure that you grep the source tree and modify all occurences accordingly
+# if you rename the following program name.
+#
 PROGRAMS += VBoxDRMClient
 
@@ -41 +45 @@
 VBoxClient_INCS += ../x11include/randrproto-1.6.0
 VBoxClient_SOURCES = \
-        main.cpp \
-        display-svga-x11.cpp \
-        seamless.cpp \
-        seamless-x11.cpp \
-        logging.cpp \
-        hostversion.cpp
+        main.cpp \
+        display-svga-x11.cpp \
+        seamless.cpp \
+        seamless-x11.cpp \
+        logging.cpp \
+        hostversion.cpp
 
 VBoxDRMClient_TEMPLATE = NewVBoxGuestR3Exe
@@ -56 +60 @@
 
 VBoxClient_SOURCES.linux = \
-        chk_stubs.c
+        chk_stubs.c
 VBoxClient_LIBPATH = \
-        $(VBOX_LIBPATH32_X11)
+        $(VBOX_LIBPATH32_X11)
 VBoxClient_LIBS.freebsd = \
-        iconv
+        iconv
 VBoxClient_LIBS.linux = \
-        dl
+        dl
 VBoxClient_LIBS.netbsd = \
-        crypt
+        crypt
 VBoxClient_LIBS.solaris = \
-        dl
+        dl
 VBoxClient_LIBS = \
-        X11 Xt Xext Xmu
+        X11 Xt Xext Xmu
 ifdef VBOX_WITH_DISTRO_XRAND_XINERAMA
  VBoxClient_DEFS += WITH_DISTRO_XRAND_XINERAMA
@@ -76 +80 @@
 # XXX: -L comes from the template, but not rpath
 VBoxClient_LDFLAGS.netbsd = \
-        -Wl,-rpath /usr/X11R7/lib
+        -Wl,-rpath /usr/X11R7/lib
 
 ifdef VBOX_WITH_DRAG_AND_DROP
@@ -82 +86 @@
  VBoxClient_DEFS += VBOX_DND_WITH_XTEST
  VBoxClient_LIBS += \
-        Xtst
+        Xtst
  endif
 endif
@@ -91 +95 @@
 ifeq ($(KBUILD_TARGET),linux)
 VBoxClient_LDFLAGS.amd64 += \
-        -Wl,--wrap=memcpy
+        -Wl,--wrap=memcpy
 endif
 
@@ -100 +104 @@
 ifdef VBOX_WITH_DRAG_AND_DROP
 VBoxClient_DEFS += \
-        VBOX_WITH_DRAG_AND_DROP \
-        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
+        VBOX_WITH_DRAG_AND_DROP \
+        $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,)
 VBoxClient_SOURCES += \
-        draganddrop.cpp
+        draganddrop.cpp
 VBoxClient_LIBS     += \
-        $(VBOX_LIB_VBGL_R3) \
-        $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
+        $(VBOX_LIB_VBGL_R3) \
+        $(PATH_STAGE_LIB)/additions/VBoxDnDGuestR3Lib$(VBOX_SUFF_LIB)
 endif
 
 ifdef VBOX_WITH_SHARED_CLIPBOARD
  VBoxClient_DEFS += \
-        VBOX_WITH_SHARED_CLIPBOARD \
-        $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
+        VBOX_WITH_SHARED_CLIPBOARD \
+        $(if $(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS),VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS,)
  VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
-        clipboard.cpp
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
+        clipboard.cpp
  ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
   VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_GUEST
   VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
-        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp
   ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
    VBoxClient_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_FUSE
    # @todo Make this dynamic loading more generic.
    VBoxClient_SOURCES += \
-        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
-        clipboard-fuse.cpp
+        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount/fuse.cpp \
+        clipboard-fuse.cpp
    # @todo Ditto.
    VBoxClient_INCS    += \
-        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
+        $(PATH_ROOT)/src/VBox/ImageMounter/vboximg-mount
   endif
  endif
@@ -154 +158 @@
 $$(tstSeamlessX11-auto_0_OUTDIR)/tstSeamlessX11-auto.run: \
        $$(tstSeamlessX11-auto_1_STAGE_TARGET)
-        export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
-        $(QUIET)$(APPEND) -t "$@" "done"
+        export VBOX_LOG_DEST=nofile; $(tstSeamlessX11-auto_1_STAGE_TARGET) quiet
+        $(QUIET)$(APPEND) -t "$@" "done"
 
   #

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -56 +56 @@
 #include <iprt/err.h>
 #include <iprt/file.h>
+#include <iprt/mem.h>
 #include <iprt/path.h>
 #include <iprt/string.h>
@@ -679 +680 @@
 
 /**
+ * An abbreviated copy of the VGSvcReadProp from VBoxServiceUtils.cpp
+ */
+static int readGuestProperty(uint32_t u32ClientId, const char *pszPropName)
+{
+    AssertPtrReturn(pszPropName, VERR_INVALID_POINTER);
+
+    uint32_t    cbBuf = _1K;
+    void       *pvBuf = NULL;
+    int         rc    = VINF_SUCCESS;  /* MSC can't figure out the loop */
+
+    for (unsigned cTries = 0; cTries < 10; cTries++)
+    {
+        /*
+         * (Re-)Allocate the buffer and try read the property.
+         */
+        RTMemFree(pvBuf);
+        pvBuf = RTMemAlloc(cbBuf);
+        if (!pvBuf)
+        {
+            VBClLogError("Guest Property: Failed to allocate %zu bytes\n", cbBuf);
+            rc = VERR_NO_MEMORY;
+            break;
+        }
+        char    *pszValue;
+        char    *pszFlags;
+        uint64_t uTimestamp;
+        rc = VbglR3GuestPropRead(u32ClientId, pszPropName, pvBuf, cbBuf, &pszValue, &uTimestamp, &pszFlags, NULL);
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_BUFFER_OVERFLOW)
+            {
+                /* try again with a bigger buffer. */
+                cbBuf *= 2;
+                continue;
+            }
+            else
+                break;
+        }
+        else
+            break;
+    }
+
+    if (pvBuf)
+        RTMemFree(pvBuf);
+    return rc;
+}
+
+/**
  * We start VBoxDRMClient from VBoxService in case  some guest property is set.
  * We check the same guest property here and dont start this service in case
@@ -685 +734 @@
 static bool checkDRMClient()
 {
-    return false;
-    // uint32_t uGuestPropSvcClientID;
-    // int rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
-    // if (RT_SUCCESS(rc))
-    // {
-    //     rc = VGSvcCheckPropExist(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/DRMResize");
-    //     if (RT_SUCCESS(rc))
-    //         return true;
-    // }
-    // return false;
+   uint32_t uGuestPropSvcClientID;
+   int rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
+   if (RT_FAILURE(rc))
+       return false;
+   rc = readGuestProperty(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/DRMResize" /*pszPropName*/);
+   if (RT_FAILURE(rc))
+       return false;
+   return true;
 }
 
@@ -701 +748 @@
     /* If DRM client is already running don't start this service. */
     if (checkDRMClient())
+    {
+        VBClLogFatalError("DRM resizing is already running. Exiting this service\n");
         return false;
+    }
     if (isXwayland())
     {