Index: /trunk/include/VBox/VBoxGuestLib.h =================================================================== --- /trunk/include/VBox/VBoxGuestLib.h (revision 86886) +++ /trunk/include/VBox/VBoxGuestLib.h (revision 86887) @@ -816,7 +816,7 @@ /** @name DRM client handling * @{ */ -VBGLR3DECL(bool) VbglR3DRMClientIsNeeded(void); -VBGLR3DECL(bool) VbglR3DRMClientIsRunning(void); -VBGLR3DECL(int) VbglR3DRMClientStart(void); +VBGLR3DECL(bool) VbglR3DrmClientIsNeeded(void); +VBGLR3DECL(bool) VbglR3DrmClientIsRunning(void); +VBGLR3DECL(int) VbglR3DrmClientStart(void); /** @} */ Index: /trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk (revision 86886) +++ /trunk/src/VBox/Additions/common/VBoxGuest/lib/Makefile.kmk (revision 86887) @@ -122,5 +122,5 @@ VBoxGuestR3LibCpuHotPlug.cpp \ VBoxGuestR3LibCredentials.cpp \ - VBoxGuestR3LibDRMClient.cpp \ + VBoxGuestR3LibDrmClient.cpp \ VBoxGuestR3LibEvent.cpp \ VBoxGuestR3LibGuestUser.cpp \ Index: unk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDRMClient.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDRMClient.cpp (revision 86886) +++ (revision ) @@ -1,99 +1,0 @@ -/* $Id$ */ -/** @file - * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, DRM client handling. - */ - -/* - * Copyright (C) 2020 Oracle Corporation - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * The contents of this file may alternatively be used under the terms - * of the Common Development and Distribution License Version 1.0 - * (CDDL) only, as it comes in the "COPYING.CDDL" file of the - * VirtualBox OSE distribution, in which case the provisions of the - * CDDL are applicable instead of those of the GPL. - * - * You may elect to license modified versions of this file under the - * terms and conditions of either the GPL or the CDDL or both. - */ - - -/********************************************************************************************************************************* -* Header Files * -*********************************************************************************************************************************/ -#include "VBoxGuestR3LibInternal.h" - -#include -#include -#include - -/** Defines the DRM client executable (image). */ -#define VBOX_DRMCLIENT_EXECUTABLE "VBoxDRMClient" -/** 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" - -/** - * Returns if the DRM resizing client is needed. - * This is achieved by querying existence of a guest property. - * - * @returns \c true if the DRM resizing client is needed, \c false if not. - */ -VBGLR3DECL(bool) VbglR3DRMClientIsNeeded(void) -{ - bool fStartClient = false; - -#ifdef VBOX_WITH_GUEST_PROPS - uint32_t idClient; - int rc = VbglR3GuestPropConnect(&idClient); - if (RT_SUCCESS(rc)) - { - fStartClient = VbglR3GuestPropExist(idClient, VBOX_DRMCLIENT_GUEST_PROP_RESIZE /*pszPropName*/); - VbglR3GuestPropDisconnect(idClient); - } -#endif - - return fStartClient; -} - -/** - * Returns if the DRM resizing client already is running. - * This is achieved by querying existence of a guest property. - * - * @returns \c true if the DRM resizing client is running, \c false if not. - */ -VBGLR3DECL(bool) VbglR3DRMClientIsRunning(void) -{ - return VbglR3DRMClientIsNeeded(); -} - -/** - * Starts (executes) the DRM resizing client process ("VBoxDRMClient"). - * - * @returns VBox status code. - */ -VBGLR3DECL(int) VbglR3DRMClientStart(void) -{ - char szDRMClientPath[RTPATH_MAX]; - int rc = RTPathExecDir(szDRMClientPath, RTPATH_MAX); - if (RT_SUCCESS(rc)) - { - RTPathStripSuffix(szDRMClientPath); - rc = RTPathAppend(szDRMClientPath, RTPATH_MAX, VBOX_DRMCLIENT_EXECUTABLE); - if (RT_SUCCESS(rc)) - { - const char *apszArgs[1] = { NULL }; /** @todo r=andy Pass path + process name as argv0? */ - rc = RTProcCreate(VBOX_DRMCLIENT_EXECUTABLE, apszArgs, RTENV_DEFAULT, - RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_SEARCH_PATH, NULL); - } - } - - return rc; -} - Index: /trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp (revision 86887) +++ /trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDrmClient.cpp (revision 86887) @@ -0,0 +1,99 @@ +/* $Id$ */ +/** @file + * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, DRM client handling. + */ + +/* + * Copyright (C) 2020 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. + */ + + +/********************************************************************************************************************************* +* Header Files * +*********************************************************************************************************************************/ +#include "VBoxGuestR3LibInternal.h" + +#include +#include +#include + +/** Defines the DRM client executable (image). */ +#define VBOX_DRMCLIENT_EXECUTABLE "VBoxDRMClient" +/** 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" + +/** + * Returns if the DRM resizing client is needed. + * This is achieved by querying existence of a guest property. + * + * @returns \c true if the DRM resizing client is needed, \c false if not. + */ +VBGLR3DECL(bool) VbglR3DrmClientIsNeeded(void) +{ + bool fStartClient = false; + +#ifdef VBOX_WITH_GUEST_PROPS + uint32_t idClient; + int rc = VbglR3GuestPropConnect(&idClient); + if (RT_SUCCESS(rc)) + { + fStartClient = VbglR3GuestPropExist(idClient, VBOX_DRMCLIENT_GUEST_PROP_RESIZE /*pszPropName*/); + VbglR3GuestPropDisconnect(idClient); + } +#endif + + return fStartClient; +} + +/** + * Returns if the DRM resizing client already is running. + * This is achieved by querying existence of a guest property. + * + * @returns \c true if the DRM resizing client is running, \c false if not. + */ +VBGLR3DECL(bool) VbglR3DrmClientIsRunning(void) +{ + return VbglR3DrmClientIsNeeded(); +} + +/** + * Starts (executes) the DRM resizing client process ("VBoxDRMClient"). + * + * @returns VBox status code. + */ +VBGLR3DECL(int) VbglR3DrmClientStart(void) +{ + char szDRMClientPath[RTPATH_MAX]; + int rc = RTPathExecDir(szDRMClientPath, RTPATH_MAX); + if (RT_SUCCESS(rc)) + { + RTPathStripSuffix(szDRMClientPath); + rc = RTPathAppend(szDRMClientPath, RTPATH_MAX, VBOX_DRMCLIENT_EXECUTABLE); + if (RT_SUCCESS(rc)) + { + const char *apszArgs[1] = { NULL }; /** @todo r=andy Pass path + process name as argv0? */ + rc = RTProcCreate(VBOX_DRMCLIENT_EXECUTABLE, apszArgs, RTENV_DEFAULT, + RTPROC_FLAGS_DETACHED | RTPROC_FLAGS_SEARCH_PATH, NULL); + } + } + + return rc; +} + Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp =================================================================== --- /trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (revision 86886) +++ /trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (revision 86887) @@ -1160,7 +1160,7 @@ #ifdef VBOX_WITH_VBOXSERVICE_DRMRESIZE - if (VbglR3DRMClientIsNeeded()) - { - rc = VbglR3DRMClientStart(); + if (VbglR3DrmClientIsNeeded()) + { + rc = VbglR3DrmClientStart(); if (RT_FAILURE(rc)) VGSvcError("Starting DRM resizing client failed with %Rrc\n", rc); Index: /trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp =================================================================== --- /trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (revision 86886) +++ /trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (revision 86887) @@ -690,5 +690,5 @@ * So for 32-bit GAs we use our DRM client. */ #if ARCH_BITS == 32 - rc = VbglR3DRMClientStart(); + rc = VbglR3DrmClientStart(); if (RT_FAILURE(rc)) VBClLogError("Starting DRM resizing client (32-bit) failed with %Rrc\n", rc); @@ -697,5 +697,5 @@ /* If DRM client is already running don't start this service. */ - if (VbglR3DRMClientIsRunning()) + if (VbglR3DrmClientIsRunning()) { VBClLogInfo("DRM resizing is already running. Exiting this service\n"); @@ -705,5 +705,5 @@ if (isXwayland()) { - rc = VbglR3DRMClientStart(); + rc = VbglR3DrmClientStart(); if (RT_FAILURE(rc)) VBClLogError("Starting DRM resizing client failed with %Rrc\n", rc);