Changeset 86878 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 12, 2020 6:40:58 PM (4 years ago)

Author:

vboxsync

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

141339

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. [build fix] bugref:9637

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxService/VBoxService.cpp (modified) (1 diff)
• x11/VBoxClient/display-svga-x11.cpp (modified) (2 diffs)

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

@@ -1160 +1160 @@
 
 #ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE
-        if (VbglR3DRMClientIsNeeded())
+    if (VbglR3DRMClientIsNeeded())
     {
         rc = VbglR3DRMClientStart();

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

@@ -685 +685 @@
 static DECLCALLBACK(int) vbclSVGAInit(void)
 {
+    int rc;
+
     /* In 32-bit guests GAs build on our release machines causes an xserver hang.
      * So for 32-bit GAs we use our DRM client. */
 #if ARCH_BITS == 32
-    int rc = VbglR3DRMClientStart();
+    rc = VbglR3DRMClientStart();
     if (RT_FAILURE(rc))
         VBClLogError("Starting DRM resizing client (32-bit) failed with %Rrc\n", rc);
@@ -703 +705 @@
     if (isXwayland())
     {
-        int rc = VbglR3DRMClientStart();
+        rc = VbglR3DRMClientStart();
         if (RT_FAILURE(rc))
             VBClLogError("Starting DRM resizing client failed with %Rrc\n", rc);