[PATCH 0/2] MR3045: winepulse: get_prop_value fixes.

[Huw Davies (＠huw)]

Fixes regressions caused by 13fa7a57df0d.

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

[PATCH 1/2] winepulse: Don't overwrite the result in the insufficient buffer case.

[Huw Davies]

From: Huw Davies <huw(a)codeweavers.com>

Fixes a regression caused by 13fa7a57df0d.
---
 dlls/winepulse.drv/pulse.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
index 5ba66a8aa1d..d259902c8b5 100644
--- a/dlls/winepulse.drv/pulse.c
+++ b/dlls/winepulse.drv/pulse.c
@@ -2494,8 +2494,7 @@ static NTSTATUS pulse_get_prop_value(void *args)
         if (strcmp(params->device, dev->pulse_name))
             continue;
         if (IsEqualPropertyKey(*params->prop, devicepath_key)) {
-            if (!get_device_path(dev, params))
-                break;
+            get_device_path(dev, params);
             return STATUS_SUCCESS;
         } else if (IsEqualGUID(¶ms->prop->fmtid, &PKEY_AudioEndpoint_GUID)) {
             switch (params->prop->pid) {
-- 
GitLab


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

[PATCH 2/2] winepulse: Return E_NOTIMPL when the property is not found.

[Huw Davies]

From: Huw Davies <huw(a)codeweavers.com>

Fixes a regression caused by 13fa7a57df0d.
---
 dlls/winepulse.drv/pulse.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
index d259902c8b5..be540a4da2c 100644
--- a/dlls/winepulse.drv/pulse.c
+++ b/dlls/winepulse.drv/pulse.c
@@ -2489,7 +2489,6 @@ static NTSTATUS pulse_get_prop_value(void *args)
     struct list *list = (params->flow == eRender) ? &g_phys_speakers : &g_phys_sources;
     PhysDevice *dev;
 
-    params->result = S_OK;
     LIST_FOR_EACH_ENTRY(dev, list, PhysDevice, entry) {
         if (strcmp(params->device, dev->pulse_name))
             continue;
@@ -2501,18 +2500,19 @@ static NTSTATUS pulse_get_prop_value(void *args)
             case 0:   /* FormFactor */
                 params->value->vt = VT_UI4;
                 params->value->ulVal = dev->form;
+                params->result = S_OK;
                 return STATUS_SUCCESS;
             case 3:   /* PhysicalSpeakers */
                 if (!dev->channel_mask)
                     goto fail;
                 params->value->vt = VT_UI4;
                 params->value->ulVal = dev->channel_mask;
+                params->result = S_OK;
                 return STATUS_SUCCESS;
-            default:
-                params->result = E_NOTIMPL;
             }
         }
 
+        params->result = E_NOTIMPL;
         return STATUS_SUCCESS;
     }
 
-- 
GitLab

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

[PATCH 0/2] MR3045: winepulse: get_prop_value fixes. - approved

[Torge Matthies (＠tmatthies)]

This merge request was approved by Torge Matthies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3045