[PATCH 0/3] MR8679: [DRAFT] winecfg: Fix audio tab functionality.

[Patrick Hibbs (＠hibbsncc1701)]

See also the linked bug report, but the short description is that some wine-only fake device was removed at some point, and winecfg's audio tab was never updated to handle that situation. This MR fixes that problem by using real devices and filling in some data structures to make that work.

I'm marking this as a draft so that others can suggest improvements or alternatives, as I'm not sure if this means of doing it is acceptable to Wine.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58204

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8679

[PATCH 1/3] mmdevapi: Set DEVPKEY_Device_Driver during MMDevice_Create().

[Patrick Hibbs]

From: Patrick Hibbs <hibbsncc1701(a)gmail.com>

So that winecfg can fetch the used audio driver.
---
 dlls/mmdevapi/devenum.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
index adce05da954..d147d246636 100644
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/mmdevapi/devenum.c
@@ -543,6 +543,11 @@ static MMDevice *MMDevice_Create(const WCHAR *name, GUID *id, EDataFlow flow, DW
                 PropVariantClear(&pv2);
             }
 
+            pv.vt = VT_LPWSTR;
+            pv.pwszVal = drvs.module_name;
+
+            MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_Driver, &pv);
+
             RegCloseKey(keyprop);
         }
         RegCloseKey(key);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8679

[PATCH 2/3] mmdevapi: Set DEVPKEY_Device_InstanceId during MMDevice_Create().

[Patrick Hibbs]

From: Patrick Hibbs <hibbsncc1701(a)gmail.com>

According to MSDN, DEVPKEY_Device_InstanceId should be the same value as IMMDevice::GetId().
See also: https://learn.microsoft.com/en-us/windows/win32/coreaudio/device-properties
---
 dlls/mmdevapi/devenum.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
index d147d246636..cd81d1c34ab 100644
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/mmdevapi/devenum.c
@@ -548,6 +548,13 @@ static MMDevice *MMDevice_Create(const WCHAR *name, GUID *id, EDataFlow flow, DW
 
             MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_Driver, &pv);
 
+            if (!FAILED(IMMDevice_GetId(&(cur->IMMDevice_iface), &pv.pwszVal))) {
+                MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_InstanceId, &pv);
+                CoTaskMemFree(pv.pwszVal);
+                pv.vt = VT_EMPTY;
+                pv.pwszVal = NULL;
+            }
+
             RegCloseKey(keyprop);
         }
         RegCloseKey(key);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8679

[PATCH 3/3] winecfg: Fix audio tab by fetching the default device's audio driver.

[Patrick Hibbs]

From: Patrick Hibbs <hibbsncc1701(a)gmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58204
---
 programs/winecfg/audio.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index b98efbc2ec6..e4b33f16a45 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -184,12 +184,15 @@ static BOOL get_driver_name(IMMDeviceEnumerator *devenum, PROPVARIANT *pv)
     IPropertyStore *ps;
     HRESULT hr;
 
-    hr = IMMDeviceEnumerator_GetDevice(devenum, L"Wine info device", &device);
-    if(FAILED(hr))
+    hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(devenum, eRender, eConsole, &device);
+    if(FAILED(hr)) {
+        ERR("Could not get Wine info device.\n");
         return FALSE;
+    }
 
     hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps);
     if(FAILED(hr)){
+        ERR("Could not get property store for device (0x%p).\n", device);
         IMMDevice_Release(device);
         return FALSE;
     }
@@ -198,8 +201,10 @@ static BOOL get_driver_name(IMMDeviceEnumerator *devenum, PROPVARIANT *pv)
             (const PROPERTYKEY *)&DEVPKEY_Device_Driver, pv);
     IPropertyStore_Release(ps);
     IMMDevice_Release(device);
-    if(FAILED(hr))
+    if(FAILED(hr) || pv == NULL || pv->pwszVal == NULL) {
+        ERR("Could not get device driver property value.\n");
         return FALSE;
+    }
 
     return TRUE;
 }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8679