[PATCH 0/1] MR4435: wineoss: Fix sound not working.

[Davide Beatrici (＠davidebeatrici)]

Fixes #55886.

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

[PATCH 1/1] wineoss: Fix sound not working.

[Davide Beatrici]

From: Davide Beatrici <git(a)davidebeatrici.dev>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55886
---
 dlls/wineoss.drv/mmdevdrv.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 48a46473956..7b7d426d1df 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -144,18 +144,11 @@ exit:
 
 void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid)
 {
+    OSSDevice *oss_dev;
     HKEY key = NULL, dev_key;
     DWORD type, size = sizeof(*guid);
     WCHAR key_name[256];
     const unsigned int dev_size = strlen(device) + 1;
-    OSSDevice *oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size]));
-
-    if(oss_dev){
-        oss_dev->flow = flow;
-        oss_dev->guid = *guid;
-        memcpy(oss_dev->devnode, device, dev_size);
-        device_add(oss_dev);
-    }
 
     if(flow == eCapture)
         key_name[0] = '1';
@@ -171,7 +164,7 @@ void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid)
                 if(type == REG_BINARY){
                     RegCloseKey(dev_key);
                     RegCloseKey(key);
-                    return;
+                    goto exit;
                 }
                 ERR("Invalid type for device %s GUID: %lu; ignoring and overwriting\n",
                         wine_dbgstr_w(key_name), type);
@@ -183,9 +176,17 @@ void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid)
     CoCreateGuid(guid);
 
     set_device_guid(flow, key, key_name, guid);
-
+exit:
     if(key)
         RegCloseKey(key);
+
+    oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size]));
+    if(oss_dev){
+        oss_dev->flow = flow;
+        oss_dev->guid = *guid;
+        memcpy(oss_dev->devnode, device, dev_size);
+        device_add(oss_dev);
+    }
 }
 
 BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow)
-- 
GitLab

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

[PATCH 0/1] MR4435: wineoss: Fix sound not working. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4435