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

Timestamp:

Jan 18, 2022 5:36:02 PM (3 years ago)

Author:

vboxsync

Message:

Additions: Guest Lib: VBoxGuestR3LibDrmClient: do not expose Linux specific code to other platforms, bugref:10134.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp

@@ -35 +35 @@
 #include <iprt/process.h>
 
+#if defined(RT_OS_LINUX)
+
 /** Defines the DRM client executable (image). */
-#define VBOX_DRMCLIENT_EXECUTABLE           "/usr/bin/VBoxDRMClient"
-#define VBOX_DRMCLIENT_LEGACY_EXECUTABLE    "/usr/bin/VBoxClient"
+# define VBOX_DRMCLIENT_EXECUTABLE           "/usr/bin/VBoxDRMClient"
+# define VBOX_DRMCLIENT_LEGACY_EXECUTABLE    "/usr/bin/VBoxClient"
 /** Defines the guest property that defines if the DRM resizing client needs to be active or not. */
-#define VBOX_DRMCLIENT_GUEST_PROP_RESIZE    "/VirtualBox/GuestAdd/DRMResize"
+# define VBOX_DRMCLIENT_GUEST_PROP_RESIZE    "/VirtualBox/GuestAdd/DRMResize"
+
+#endif /* RT_OS_LINUX */
 
 /**
@@ -49 +53 @@
 VBGLR3DECL(bool) VbglR3DrmClientIsNeeded(void)
 {
+#if defined(RT_OS_LINUX)
     bool fStartClient = false;
 
-#ifdef VBOX_WITH_GUEST_PROPS
+# ifdef VBOX_WITH_GUEST_PROPS
     uint32_t idClient;
     int rc = VbglR3GuestPropConnect(&idClient);
@@ -59 +64 @@
         VbglR3GuestPropDisconnect(idClient);
     }
+# endif
+    return fStartClient;
+
+#else /* !RT_OS_LINUX */
+    return false;
 #endif
-
-    return fStartClient;
 }
 
@@ -77 +85 @@
 static int VbglR3DrmStart(const char *pszCmd, const char **apszArgs)
 {
+#if defined(RT_OS_LINUX)
     return RTProcCreate(pszCmd, apszArgs, RTENV_DEFAULT,
                         RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_SEARCH_PATH, NULL);
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
 }
 
@@ -88 +100 @@
 VBGLR3DECL(int) VbglR3DrmClientStart(void)
 {
+#if defined(RT_OS_LINUX)
     const char *apszArgs[1] = { NULL }; /** @todo r=andy Pass path + process name as argv0? */
     return VbglR3DrmStart(VBOX_DRMCLIENT_EXECUTABLE, apszArgs);
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
 }
 
@@ -99 +115 @@
 VBGLR3DECL(int) VbglR3DrmLegacyClientStart(void)
 {
+#if defined(RT_OS_LINUX)
     const char *apszArgs[3] = { VBOX_DRMCLIENT_LEGACY_EXECUTABLE, "--vmsvga", NULL };
     return VbglR3DrmStart(VBOX_DRMCLIENT_LEGACY_EXECUTABLE, apszArgs);
+#else
+    return VERR_NOT_SUPPORTED;
+#endif
 }