[PATCH v2 4/5] wineoss: Move get_ossdevice_from_guid() earlier in the file.

[Huw Davies]

Signed-off-by: Huw Davies 
---
 dlls/wineoss.drv/mmdevdrv.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 8a0011ff9eb..e5206627528 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -410,6 +410,15 @@ static UINT get_default_index(EDataFlow flow)
     return 0;
 }

+static const OSSDevice *get_ossdevice_from_guid(const GUID *guid)
+{
+    OSSDevice *dev_item;
+    LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)
+        if(IsEqualGUID(guid, &dev_item->guid))
+            return dev_item;
+    return NULL;
+}
+
 HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids,
         UINT *num, UINT *def_index)
 {
@@ -544,15 +553,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids,
     return S_OK;
 }

-static const OSSDevice *get_ossdevice_from_guid(const GUID *guid)
-{
-    OSSDevice *dev_item;
-    LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)
-        if(IsEqualGUID(guid, &dev_item->guid))
-            return dev_item;
-    return NULL;
-}
-
 HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
         IAudioClient **out)
 {

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Thu, Mar 31, 2022 at 08:21:49AM +0100, Huw Davies wrote:
> Signed-off-by: Huw Davies
>
> dlls/wineoss.drv/mmdevdrv.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
> index 8a0011ff9eb..e5206627528 100644
> --- a/dlls/wineoss.drv/mmdevdrv.c
> +++ b/dlls/wineoss.drv/mmdevdrv.c
> @@ -410,6 +410,15 @@ static UINT get_default_index(EDataFlow flow)
>      return 0;
>  }
>
> +static const OSSDevice *get_ossdevice_from_guid(const GUID *guid)
> +{
> - OSSDevice *dev_item;
> - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)
> -
>    if(IsEqualGUID(guid, &dev_item->guid))
> -
>        return dev_item;
> - return NULL;
>
> +}
> -
>
> HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids,
>          UINT *num, UINT *def_index)
>  {
> @@ -544,15 +553,6 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, GUID **guids,
>      return S_OK;
>  }
>
> -static const OSSDevice *get_ossdevice_from_guid(const GUID *guid)
> -{
> - OSSDevice *dev_item;
> - LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)
> -
>    if(IsEqualGUID(guid, &dev_item->guid))
> -
>        return dev_item;
> - return NULL;
>
> -}
> -
>
> HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
>          IAudioClient **out)
>  {
> -- 
> 2.25.1