[PATCH 9/9] wineoss: Remove GetEndpointIDs.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/wineoss.drv/mmdevdrv.c       | 103 ++++++------------------------
 dlls/wineoss.drv/wineoss.drv.spec |   1 -
 2 files changed, 21 insertions(+), 83 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 9f983504e80..48a46473956 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -95,6 +95,18 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     return TRUE;
 }

+static void device_add(OSSDevice *oss_dev)
+{
+    OSSDevice *dev_item;
+    LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)
+        if(IsEqualGUID(&oss_dev->guid, &dev_item->guid)){ /* already in list */
+            HeapFree(GetProcessHeap(), 0, oss_dev);
+            return;
+        }
+
+    list_add_tail(&g_devices, &oss_dev->entry);
+}
+
 static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name,
         GUID *guid)
 {
@@ -135,6 +147,15 @@ void WINAPI get_device_guid(EDataFlow flow, const char *device, GUID *guid)
     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';
@@ -184,85 +205,3 @@ BOOL WINAPI get_device_name_from_guid(GUID *guid, char **name, EDataFlow *flow)

return FALSE;
 }
-
-static void device_add(OSSDevice *oss_dev)
-{
-    OSSDevice *dev_item;
-    LIST_FOR_EACH_ENTRY(dev_item, &g_devices, OSSDevice, entry)
-        if(IsEqualGUID(&oss_dev->guid, &dev_item->guid)){ /* already in list */
-            HeapFree(GetProcessHeap(), 0, oss_dev);
-            return;
-        }
-
-    list_add_tail(&g_devices, &oss_dev->entry);
-}
-
-HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out,
-        UINT *num, UINT *def_index)
-{
-    struct get_endpoint_ids_params params;
-    GUID *guids = NULL;
-    WCHAR **ids = NULL;
-    unsigned int i;
-
-    TRACE("%d %p %p %p %p\n", flow, ids, guids, num, def_index);
-
-    params.flow = flow;
-    params.size = 1000;
-    params.endpoints = NULL;
-    do{
-        HeapFree(GetProcessHeap(), 0, params.endpoints);
-        params.endpoints = HeapAlloc(GetProcessHeap(), 0, params.size);
-        OSS_CALL(get_endpoint_ids, &params);
-    }while(params.result == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER));
-
-    if(FAILED(params.result)) goto end;
-
-    ids = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, params.num * sizeof(*ids));
-    guids = HeapAlloc(GetProcessHeap(), 0, params.num * sizeof(*guids));
-    if(!ids || !guids){
-        params.result = E_OUTOFMEMORY;
-        goto end;
-    }
-
-    for(i = 0; i < params.num; i++){
-        WCHAR *name = (WCHAR *)((char *)params.endpoints + params.endpoints[i].name);
-        char *device = (char *)params.endpoints + params.endpoints[i].device;
-        unsigned int name_size = (wcslen(name) + 1) * sizeof(WCHAR);
-        unsigned int dev_size = strlen(device) + 1;
-        OSSDevice *oss_dev;
-
-        ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size);
-        oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size]));
-        if(!ids[i] || !oss_dev){
-            HeapFree(GetProcessHeap(), 0, oss_dev);
-            params.result = E_OUTOFMEMORY;
-            goto end;
-        }
-        memcpy(ids[i], name, name_size);
-        get_device_guid(flow, device, guids + i);
-
-        oss_dev->flow = flow;
-        oss_dev->guid = guids[i];
-        memcpy(oss_dev->devnode, device, dev_size);
-        device_add(oss_dev);
-    }
-    *def_index = params.default_idx;
-
-end:
-    HeapFree(GetProcessHeap(), 0, params.endpoints);
-    if(FAILED(params.result)){
-        HeapFree(GetProcessHeap(), 0, guids);
-        if(ids){
-            for(i = 0; i < params.num; i++)
-                HeapFree(GetProcessHeap(), 0, ids[i]);
-            HeapFree(GetProcessHeap(), 0, ids);
-        }
-    }else{
-        *ids_out = ids;
-        *guids_out = guids;
-        *num = params.num;
-    }
-
-    return params.result;
-}
diff --git a/dlls/wineoss.drv/wineoss.drv.spec b/dlls/wineoss.drv/wineoss.drv.spec
index f8b1420901d..c6d68a70eee 100644
--- a/dlls/wineoss.drv/wineoss.drv.spec
+++ b/dlls/wineoss.drv/wineoss.drv.spec
@@ -7,4 +7,3 @@
 # MMDevAPI driver functions
 @ stdcall -private get_device_guid(long ptr ptr) get_device_guid
 @ stdcall -private get_device_name_from_guid(ptr ptr ptr) get_device_name_from_guid
-@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs