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

Timestamp:

Nov 12, 2020 6:32:51 PM (4 years ago)

Author:

vboxsync

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

141338

Message:

Additions/VBoxDRMClient: Removed code duplication between VBoxClient / VBoxService by refactoring the VBoxDRMClient routines into VbglR3. Also improved error checking here and there, added @todos. bugref:9637

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/lib/Makefile.kmk (modified) (1 diff)
• VBoxGuest/lib/VBoxGuestR3LibDRMClient.cpp (added)
• VBoxService/VBoxService.cpp (modified) (2 diffs)

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

@@ -122 +122 @@
         VBoxGuestR3LibCpuHotPlug.cpp \
         VBoxGuestR3LibCredentials.cpp \
+        VBoxGuestR3LibDRMClient.cpp \
         VBoxGuestR3LibEvent.cpp \
         VBoxGuestR3LibGuestUser.cpp \

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

@@ -894 +894 @@
 }
 
-#ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE
-/**
- * Check for a guest property and start VBoxDRMClient if it exists.
- *
- */
-static void startDRMResize(void)
-{
-    uint32_t uGuestPropSvcClientID;
-    int rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3GuestPropExist(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/DRMResize");
-        if (RT_SUCCESS(rc))
-        {
-            RTMsgInfo("Starting DRM resize service");
-            char szDRMClientPath[RTPATH_MAX];
-            RTPathExecDir(szDRMClientPath, RTPATH_MAX);
-            RTPathStripSuffix(szDRMClientPath);
-            RTPathAppend(szDRMClientPath, RTPATH_MAX, "VBoxDRMClient");
-            const char *apszArgs[1] = { NULL };
-            rc = RTProcCreate("VBoxDRMClient", apszArgs, RTENV_DEFAULT,
-                              RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_SEARCH_PATH, NULL);
-            if (rc == -1)
-                RTMsgError("Could not start DRM resize service");
-        }
-    }
-}
-#endif /* VBOX_WITH_VBOXSERVICE_DRMRESIZE */
 
 int main(int argc, char **argv)
@@ -1188 +1160 @@
 
 #ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE
-    startDRMResize();
+        if (VbglR3DRMClientIsNeeded())
+    {
+        rc = VbglR3DRMClientStart();
+        if (RT_FAILURE(rc))
+            VGSvcError("Starting DRM resizing client failed with %Rrc\n", rc);
+    }
 #endif /* VBOX_WITH_VBOXSERVICE_DRMRESIZE */