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

Timestamp:

Aug 14, 2024 7:02:00 PM (9 months ago)

Author:

vboxsync

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

164374

Message:

GA/Windows: Enable displayconfig subservice in VBoxService. bugref:10714

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (1 diff)
• VBoxServiceDisplayConfig.cpp (modified) (4 diffs)
• VBoxServiceInternal.h (modified) (1 diff)

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

@@ -186 +186 @@
 #ifdef VBOX_WITH_SHARED_FOLDERS
     { &g_AutoMount,     NIL_RTTHREAD, false, false, false, false, true },
+#endif
+#ifdef RT_OS_WINDOWS
+    { &g_DisplayConfig, NIL_RTTHREAD, false, false, false, false, true },
 #endif
 };

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

@@ -29 +29 @@
 
 #include <iprt/errcore.h>
+#include <iprt/system.h>
 
 #include <VBox/VBoxGuestLib.h>
@@ -60 +61 @@
 static DECLCALLBACK(int) vgsvcDisplayConfigInit(void)
 {
+    if (RTSystemGetNtVersion() < RTSYSTEM_MAKE_NT_VERSION(6, 0, 0))
+    {
+        VGSvcVerbose(1, "displayconfig requires Windows Vista or later\n");
+        return VERR_SERVICE_DISABLED;
+    }
+
     RTLDRMOD hLdrMod;
     int rc = RTLdrLoadSystem("gdi32.dll", true /*fNoUnload*/, &hLdrMod);
@@ -75 +82 @@
     }
 
-    VGSvcVerbose(3, "DXGK d3dkmthk callbacks are %s\n", RT_SUCCESS(rc) ? "Ok" : "Fail");
+    if (RT_FAILURE(rc))
+    {
+        VGSvcVerbose(1, "d3dkmthk API is not available (%Rrc)\n", rc);
+        g_pfnD3DKMTEnumAdapters = NULL;
+        g_pfnD3DKMTOpenAdapterFromLuid = NULL;
+        g_pfnD3DKMTCloseAdapter = NULL;
+        g_pfnD3DKMTEscape = NULL;
+        return VERR_SERVICE_DISABLED;
+    }
 
     rc = RTLdrLoadSystem("wtsapi32.dll", true /*fNoUnload*/, &hLdrMod);
@@ -91 +106 @@
     if (RT_FAILURE(rc))
     {
-        VGSvcVerbose(1, "WtsApi32.dll APIs are not available (%Rrc)\n", rc);
+        VGSvcVerbose(1, "WtsApi32.dll API is not available (%Rrc)\n", rc);
         g_pfnWTSFreeMemory = NULL;
         g_pfnWTSQuerySessionInformationA = NULL;
         g_pfnWTSEnumerateSessionsA = NULL;
-        // Assert(RTSystemGetNtVersion() < RTSYSTEM_MAKE_NT_VERSION(5, 0, 0));
+        return VERR_SERVICE_DISABLED;
     }
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -213 +213 @@
 extern VBOXSERVICE  g_AutoMount;
 #endif
+
+#ifdef RT_OS_WINDOWS
+extern VBOXSERVICE g_DisplayConfig;
+#endif
+
 #ifdef DEBUG
 extern RTCRITSECT   g_csLog; /* For guest process stdout dumping. */