Changeset 70472 in vbox

Timestamp:

Jan 5, 2018 4:07:29 PM (7 years ago)

Author:

vboxsync

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

120080

Message:

Audio/DrvHostDSound.cpp: Implemented OS detection when intending to use the IMMNotificationClient interface (only Vista and up). This might help running on older and/or more exotic/unsupported OSes (like WinXP 64).

File:

• trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 
 #include <iprt/alloc.h>
+#include <iprt/system.h>
 #include <iprt/uuid.h>
 
@@ -2641 +2642 @@
 
 #ifdef VBOX_WITH_AUDIO_MMNOTIFICATION_CLIENT
-    try
-    {
-        pThis->m_pNotificationClient = new VBoxMMNotificationClient();
-
-        HRESULT hr = pThis->m_pNotificationClient->Initialize();
-        if (FAILED(hr))
-            rc = VERR_AUDIO_BACKEND_INIT_FAILED;
-    }
-    catch (std::bad_alloc &ex)
-    {
-        NOREF(ex);
-        rc = VERR_NO_MEMORY;
-    }
+    bool fUseNotificationClient = false;
+
+    char szOSVersion[32];
+    rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, szOSVersion, sizeof(szOSVersion));
+    if (RT_SUCCESS(rc))
+    {
+        /* IMMNotificationClient is available starting at Windows Vista. */
+        if (RTStrVersionCompare(szOSVersion, "6.0") >= 0)
+            fUseNotificationClient = true;
+    }
+
+    if (fUseNotificationClient)
+    {
+        try
+        {
+            pThis->m_pNotificationClient = new VBoxMMNotificationClient();
+
+            HRESULT hr = pThis->m_pNotificationClient->Initialize();
+            if (FAILED(hr))
+                rc = VERR_AUDIO_BACKEND_INIT_FAILED;
+        }
+        catch (std::bad_alloc &ex)
+        {
+            NOREF(ex);
+            rc = VERR_NO_MEMORY;
+        }
+    }
+
+    LogRel2(("DSound: Notification client is %s\n", fUseNotificationClient ? "enabled" : "disabled"));
 #endif