[PATCH v3 0/4] MR2855: wine{alsa,coreaudio,oss,pulse}: Move AudioClient into mmdevapi.

[Davide Beatrici (＠davidebeatrici)]

--
  v3: wineoss: Use mmdevapi's AudioClient.
      winecoreaudio: Use mmdevapi's AudioClient.
      winealsa: Use mmdevapi's AudioClient.
      winepulse: Move AudioClient into mmdevapi.

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

[PATCH v3 1/4] winepulse: Move AudioClient into mmdevapi.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/mmdevapi/Makefile.in           |   2 +-
 dlls/mmdevapi/audiosessionmanager.c |  11 +
 dlls/mmdevapi/client.c              | 787 ++++++++++++++++++++++++++++
 dlls/mmdevapi/main.c                |   2 +
 dlls/mmdevapi/mmdevapi_private.h    |   2 +
 dlls/mmdevapi/session.c             |  28 +
 dlls/winealsa.drv/Makefile.in       |   2 +-
 dlls/winealsa.drv/mmdevdrv.c        |   4 +-
 dlls/winecoreaudio.drv/Makefile.in  |   2 +-
 dlls/winecoreaudio.drv/mmdevdrv.c   |   4 +-
 dlls/wineoss.drv/Makefile.in        |   2 +-
 dlls/wineoss.drv/mmdevdrv.c         |   4 +-
 dlls/winepulse.drv/mmdevdrv.c       | 747 +-------------------------
 dlls/winepulse.drv/pulse.c          |   9 +-
 14 files changed, 850 insertions(+), 756 deletions(-)

diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in
index ee2848ff2de..027854ea97b 100644
--- a/dlls/mmdevapi/Makefile.in
+++ b/dlls/mmdevapi/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = mmdevapi.dll
-IMPORTS   = uuid ole32 oleaut32 user32 advapi32
+IMPORTS   = uuid ole32 oleaut32 user32 advapi32 version

C_SRCS = \
    audiosessionmanager.c \
diff --git a/dlls/mmdevapi/audiosessionmanager.c b/dlls/mmdevapi/audiosessionmanager.c
index 71799590e5e..6d177aa465c 100644
--- a/dlls/mmdevapi/audiosessionmanager.c
+++ b/dlls/mmdevapi/audiosessionmanager.c
@@ -47,6 +47,17 @@ void sessions_unlock(void)
     LeaveCriticalSection(&g_sessions_lock);
 }

+HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device, UINT channels,
+                          AudioSession **out)
+{
+    (void)sessionguid;
+    (void)device;
+    (void)channels;
+    (void)out;
+
+    return E_NOTIMPL;
+}
+
 static inline struct session_mgr *impl_from_IAudioSessionManager2(IAudioSessionManager2 *iface)
 {
     return CONTAINING_RECORD(iface, struct session_mgr, IAudioSessionManager2_iface);
diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c
index ea279da34a1..ce8bae62b03 100644
--- a/dlls/mmdevapi/client.c
+++ b/dlls/mmdevapi/client.c
@@ -21,6 +21,8 @@

#define COBJMACROS

+#include <wchar.h>
+
 #include <audiopolicy.h>
 #include <mmdeviceapi.h>
 #include <winternl.h>
@@ -33,9 +35,29 @@

WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi);

+typedef struct tagLANGANDCODEPAGE
+{
+    WORD wLanguage;
+    WORD wCodePage;
+} LANGANDCODEPAGE;
+
 extern void sessions_lock(void) DECLSPEC_HIDDEN;
 extern void sessions_unlock(void) DECLSPEC_HIDDEN;

+extern HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device, UINT channels,
+                                 AudioSession **out) DECLSPEC_HIDDEN;
+extern struct audio_session_wrapper *session_wrapper_create(struct audio_client *client) DECLSPEC_HIDDEN;
+
+static HANDLE g_main_loop_thread;
+
+void stop_main_loop(void)
+{
+    if (g_main_loop_thread) {
+        WaitForSingleObject(g_main_loop_thread, INFINITE);
+        CloseHandle(g_main_loop_thread);
+    }
+}
+
 void set_stream_volumes(struct audio_client *This)
 {
     struct set_volumes_params params;
@@ -53,6 +75,11 @@ static inline struct audio_client *impl_from_IAudioCaptureClient(IAudioCaptureCl
     return CONTAINING_RECORD(iface, struct audio_client, IAudioCaptureClient_iface);
 }

+static inline struct audio_client *impl_from_IAudioClient3(IAudioClient3 *iface)
+{
+    return CONTAINING_RECORD(iface, struct audio_client, IAudioClient3_iface);
+}
+
 static inline struct audio_client *impl_from_IAudioClock(IAudioClock *iface)
 {
     return CONTAINING_RECORD(iface, struct audio_client, IAudioClock_iface);
@@ -73,6 +100,178 @@ static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolu
     return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface);
 }

+static void dump_fmt(const WAVEFORMATEX *fmt)
+{
+    TRACE("wFormatTag: 0x%x (", fmt->wFormatTag);
+    switch (fmt->wFormatTag) {
+        case WAVE_FORMAT_PCM:
+            TRACE("WAVE_FORMAT_PCM");
+            break;
+        case WAVE_FORMAT_IEEE_FLOAT:
+            TRACE("WAVE_FORMAT_IEEE_FLOAT");
+            break;
+        case WAVE_FORMAT_EXTENSIBLE:
+            TRACE("WAVE_FORMAT_EXTENSIBLE");
+            break;
+        default:
+            TRACE("Unknown");
+            break;
+    }
+    TRACE(")\n");
+
+    TRACE("nChannels: %u\n", fmt->nChannels);
+    TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec);
+    TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec);
+    TRACE("nBlockAlign: %u\n", fmt->nBlockAlign);
+    TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample);
+    TRACE("cbSize: %u\n", fmt->cbSize);
+
+    if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
+        WAVEFORMATEXTENSIBLE *fmtex = (void *)fmt;
+        TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask);
+        TRACE("Samples: %04x\n", fmtex->Samples.wReserved);
+        TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat));
+    }
+}
+
+static DWORD CALLBACK main_loop_func(void *event)
+{
+    struct main_loop_params params;
+
+    SetThreadDescription(GetCurrentThread(), L"audio_client_mainloop");
+
+    params.event = event;
+
+    WINE_UNIX_CALL(main_loop, &params);
+
+    return 0;
+}
+
+static DWORD CALLBACK timer_loop_func(void *user)
+{
+    struct timer_loop_params params;
+    struct audio_client *This = user;
+
+    SetThreadDescription(GetCurrentThread(), L"audio_client_timer");
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(timer_loop, &params);
+
+    return 0;
+}
+
+static HRESULT stream_release(stream_handle stream, HANDLE timer_thread)
+{
+    struct release_stream_params params;
+
+    params.stream       = stream;
+    params.timer_thread = timer_thread;
+
+    WINE_UNIX_CALL(release_stream, &params);
+
+    return params.result;
+}
+
+static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len)
+{
+    WCHAR pn[37];
+    swprintf(pn, ARRAY_SIZE(pn), L"\StringFileInfo\%04x%04x\ProductName", lang->wLanguage, lang->wCodePage);
+    return VerQueryValueW(data, pn, buffer, len) && *len;
+}
+
+static WCHAR *get_application_name(void)
+{
+    WCHAR path[MAX_PATH], *name;
+    UINT translate_size, productname_size;
+    LANGANDCODEPAGE *translate;
+    LPVOID productname;
+    BOOL found = FALSE;
+    void *data = NULL;
+    unsigned int i;
+    LCID locale;
+    DWORD size;
+
+    GetModuleFileNameW(NULL, path, ARRAY_SIZE(path));
+
+    size = GetFileVersionInfoSizeW(path, NULL);
+    if (!size)
+        goto skip;
+
+    data = malloc(size);
+    if (!data)
+        goto skip;
+
+    if (!GetFileVersionInfoW(path, 0, size, data))
+        goto skip;
+
+    if (!VerQueryValueW(data, L"\VarFileInfo\Translation", (LPVOID *)&translate, &translate_size))
+        goto skip;
+
+    /* No translations found. */
+    if (translate_size < sizeof(LANGANDCODEPAGE))
+        goto skip;
+
+    /* The following code will try to find the best translation. We first search for an
+     * exact match of the language, then a match of the language PRIMARYLANGID, then we
+     * search for a LANG_NEUTRAL match, and if that still doesn't work we pick the
+     * first entry which contains a proper productname. */
+    locale = GetThreadLocale();
+
+    for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); ++i) {
+        if (translate[i].wLanguage == locale &&
+            query_productname(data, &translate[i], &productname, &productname_size)) {
+            found = TRUE;
+            break;
+        }
+    }
+
+    if (!found) {
+        for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); ++i) {
+            if (PRIMARYLANGID(translate[i].wLanguage) == PRIMARYLANGID(locale) &&
+                query_productname(data, &translate[i], &productname, &productname_size)) {
+                found = TRUE;
+                break;
+            }
+        }
+    }
+
+    if (!found) {
+        for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); ++i) {
+            if (PRIMARYLANGID(translate[i].wLanguage) == LANG_NEUTRAL &&
+                query_productname(data, &translate[i], &productname, &productname_size)) {
+                found = TRUE;
+                break;
+            }
+        }
+    }
+
+    if (!found) {
+        for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); ++i) {
+            if (query_productname(data, &translate[i], &productname, &productname_size)) {
+                found = TRUE;
+                break;
+            }
+        }
+    }
+skip:
+    if (found) {
+        name = wcsdup(productname);
+        free(data);
+        return name;
+    }
+
+    free(data);
+
+    name = wcsrchr(path, '\');
+    if (!name)
+        name = path;
+    else
+        ++name;
+
+    return wcsdup(name);
+}
+
 static HRESULT WINAPI capture_QueryInterface(IAudioCaptureClient *iface, REFIID riid, void **ppv)
 {
     struct audio_client *This = impl_from_IAudioCaptureClient(iface);
@@ -341,6 +540,594 @@ const IAudioClock2Vtbl AudioClock2_Vtbl =
     clock2_GetDevicePosition
 };

+static HRESULT WINAPI client_QueryInterface(IAudioClient3 *iface, REFIID riid, void **ppv)
+{
+    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
+
+    if (!ppv)
+        return E_POINTER;
+
+    if (IsEqualIID(riid, &IID_IUnknown) ||
+        IsEqualIID(riid, &IID_IAudioClient) ||
+        IsEqualIID(riid, &IID_IAudioClient2) ||
+        IsEqualIID(riid, &IID_IAudioClient3))
+        *ppv = iface;
+    else if(IsEqualIID(riid, &IID_IMarshal)) {
+        struct audio_client *This = impl_from_IAudioClient3(iface);
+        return IUnknown_QueryInterface(This->marshal, riid, ppv);
+    } else {
+        *ppv = NULL;
+        return E_NOINTERFACE;
+    }
+
+    IUnknown_AddRef((IUnknown *)*ppv);
+
+    return S_OK;
+}
+
+static ULONG WINAPI client_AddRef(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    ULONG ref = InterlockedIncrement(&This->ref);
+    TRACE("(%p) Refcount now %lu\n", This, ref);
+    return ref;
+}
+
+static ULONG WINAPI client_Release(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    ULONG ref = InterlockedDecrement(&This->ref);
+    TRACE("(%p) Refcount now %lu\n", This, ref);
+
+    if (!ref) {
+        IAudioClient3_Stop(iface);
+        IMMDevice_Release(This->parent);
+        IUnknown_Release(This->marshal);
+
+        if (This->session) {
+            sessions_lock();
+            list_remove(&This->entry);
+            sessions_unlock();
+        }
+
+        HeapFree(GetProcessHeap(), 0, This->vols);
+
+        if (This->stream)
+            stream_release(This->stream, This->timer_thread);
+
+        HeapFree(GetProcessHeap(), 0, This);
+    }
+
+    return ref;
+}
+
+static HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode, DWORD flags,
+                                        REFERENCE_TIME duration, REFERENCE_TIME period,
+                                        const WAVEFORMATEX *fmt, const GUID *sessionguid)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct create_stream_params params;
+    unsigned int i, channel_count;
+    stream_handle stream;
+    WCHAR *name;
+
+    TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags, wine_dbgstr_longlong(duration),
+                                               wine_dbgstr_longlong(period), fmt,
+                                               debugstr_guid(sessionguid));
+
+    if (!fmt)
+        return E_POINTER;
+
+    dump_fmt(fmt);
+
+    if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE)
+        return E_INVALIDARG;
+
+    if (flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS |
+                  AUDCLNT_STREAMFLAGS_LOOPBACK |
+                  AUDCLNT_STREAMFLAGS_EVENTCALLBACK |
+                  AUDCLNT_STREAMFLAGS_NOPERSIST |
+                  AUDCLNT_STREAMFLAGS_RATEADJUST |
+                  AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED |
+                  AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE |
+                  AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED |
+                  AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY |
+                  AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) {
+        FIXME("Unknown flags: %08lx\n", flags);
+        return E_INVALIDARG;
+    }
+
+    sessions_lock();
+
+    if (This->stream) {
+        sessions_unlock();
+        return AUDCLNT_E_ALREADY_INITIALIZED;
+    }
+
+    if (!g_main_loop_thread) {
+        HANDLE event = CreateEventW(NULL, TRUE, FALSE, NULL);
+        if (!(g_main_loop_thread = CreateThread(NULL, 0, main_loop_func, event, 0, NULL)))
+        {
+            ERR("Failed to create mainloop thread.\n");
+            sessions_unlock();
+            CloseHandle(event);
+            return E_FAIL;
+        }
+
+        SetThreadPriority(g_main_loop_thread, THREAD_PRIORITY_TIME_CRITICAL);
+        WaitForSingleObject(event, INFINITE);
+        CloseHandle(event);
+    }
+
+    channel_count = fmt->nChannels;
+
+    params.name = name   = get_application_name();
+    params.device        = This->device_name;
+    params.flow          = This->dataflow;
+    params.share         = mode;
+    params.flags         = flags;
+    params.duration      = duration;
+    params.period        = period;
+    params.fmt           = fmt;
+    params.channel_count = &channel_count;
+    params.stream        = &stream;
+
+    WINE_UNIX_CALL(create_stream, &params);
+
+    free(name);
+
+    if (FAILED(params.result)) {
+        sessions_unlock();
+        return params.result;
+    }
+
+    if (!(This->vols = malloc(channel_count * sizeof(*This->vols)))) {
+        params.result = E_OUTOFMEMORY;
+        goto fail;
+    }
+
+    for (i = 0; i < channel_count; ++i)
+        This->vols[i] = 1.f;
+
+    params.result = get_audio_session(sessionguid, This->parent, channel_count, &This->session);
+    if (FAILED(params.result)) {
+        free(This->vols);
+        This->vols = NULL;
+
+        goto fail;
+    }
+
+    This->stream = stream;
+    This->channel_count = channel_count;
+
+    list_add_tail(&This->session->clients, &This->entry);
+
+    set_stream_volumes(This);
+
+    return S_OK;
+fail:
+    stream_release(stream, NULL);
+    sessions_unlock();
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_GetBufferSize(IAudioClient3 *iface, UINT32 *out)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct get_buffer_size_params params;
+
+    TRACE("(%p)->(%p)\n", This, out);
+
+    if (!out)
+        return E_POINTER;
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+    params.frames = out;
+
+    WINE_UNIX_CALL(get_buffer_size, &params);
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct get_latency_params params;
+
+    TRACE("(%p)->(%p)\n", This, latency);
+
+    if (!latency)
+        return E_POINTER;
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream  = This->stream;
+    params.latency = latency;
+
+    WINE_UNIX_CALL(get_latency, &params);
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_GetCurrentPadding(IAudioClient3 *iface, UINT32 *out)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct get_current_padding_params params;
+
+    TRACE("(%p)->(%p)\n", This, out);
+
+    if (!out)
+        return E_POINTER;
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream  = This->stream;
+    params.padding = out;
+
+    WINE_UNIX_CALL(get_current_padding, &params);
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_IsFormatSupported(IAudioClient3 *iface, AUDCLNT_SHAREMODE mode,
+                                               const WAVEFORMATEX *fmt, WAVEFORMATEX **out)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct is_format_supported_params params;
+
+    TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out);
+
+    if (!fmt)
+        return E_POINTER;
+
+    dump_fmt(fmt);
+
+    switch (mode) {
+        case AUDCLNT_SHAREMODE_SHARED:
+            if (!out)
+                return E_POINTER;
+
+            params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out));
+            break;
+        case AUDCLNT_SHAREMODE_EXCLUSIVE:
+            params.fmt_out = NULL;
+            break;
+        default:
+            return E_INVALIDARG;
+    }
+
+    params.device  = This->device_name;
+    params.flow    = This->dataflow;
+    params.share   = mode;
+    params.fmt_in  = fmt;
+
+    WINE_UNIX_CALL(is_format_supported, &params);
+
+    if (params.result == S_FALSE) {
+        *out = &params.fmt_out->Format;
+        TRACE("Suggesting the following format:\n");
+        dump_fmt(*out);
+    } else {
+        if (out)
+            *out = NULL;
+
+        CoTaskMemFree(params.fmt_out);
+    }
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_GetMixFormat(IAudioClient3 *iface, WAVEFORMATEX **pwfx)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct get_mix_format_params params;
+
+    TRACE("(%p)->(%p)\n", This, pwfx);
+
+    if (!pwfx)
+        return E_POINTER;
+
+    *pwfx = NULL;
+
+    params.device = This->device_name;
+    params.flow   = This->dataflow;
+    params.fmt    = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
+    if (!params.fmt)
+        return E_OUTOFMEMORY;
+
+    WINE_UNIX_CALL(get_mix_format, &params);
+
+    if (SUCCEEDED(params.result)) {
+        *pwfx = &params.fmt->Format;
+        dump_fmt(*pwfx);
+    } else
+        CoTaskMemFree(params.fmt);
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_GetDevicePeriod(IAudioClient3 *iface, REFERENCE_TIME *defperiod,
+                                             REFERENCE_TIME *minperiod)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct get_device_period_params params;
+
+    TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
+
+    if (!defperiod && !minperiod)
+        return E_POINTER;
+
+    params.device     = This->device_name;
+    params.flow       = This->dataflow;
+    params.def_period = defperiod;
+    params.min_period = minperiod;
+
+    WINE_UNIX_CALL(get_device_period, &params);
+
+    return S_OK;
+}
+
+static HRESULT WINAPI client_Start(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct start_params params;
+
+    TRACE("(%p)\n", This);
+
+    sessions_lock();
+
+    if (!This->stream) {
+        sessions_unlock();
+        return AUDCLNT_E_NOT_INITIALIZED;
+    }
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(start, &params);
+
+    if (SUCCEEDED(params.result) && !This->timer_thread) {
+        This->timer_thread = CreateThread(NULL, 0, timer_loop_func, This, 0, NULL);
+        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
+    }
+
+    sessions_unlock();
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_Stop(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct stop_params params;
+
+    TRACE("(%p)\n", This);
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(stop, &params);
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_Reset(IAudioClient3 *iface)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct reset_params params;
+
+    TRACE("(%p)\n", This);
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+
+    WINE_UNIX_CALL(reset, &params);
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface, HANDLE event)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    struct set_event_handle_params params;
+
+    TRACE("(%p)->(%p)\n", This, event);
+
+    if (!event)
+        return E_INVALIDARG;
+
+    if (!This->stream)
+        return AUDCLNT_E_NOT_INITIALIZED;
+
+    params.stream = This->stream;
+    params.event  = event;
+
+    WINE_UNIX_CALL(set_event_handle, &params);
+
+    return params.result;
+}
+
+static HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid, void **ppv)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
+
+    if (!ppv)
+        return E_POINTER;
+
+    *ppv = NULL;
+
+    sessions_lock();
+
+    if (!This->stream) {
+        sessions_unlock();
+        return AUDCLNT_E_NOT_INITIALIZED;
+    }
+
+    if (IsEqualIID(riid, &IID_IAudioRenderClient)) {
+        if (This->dataflow != eRender) {
+            sessions_unlock();
+            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
+        }
+        *ppv = &This->IAudioRenderClient_iface;
+    } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) {
+        if (This->dataflow != eCapture) {
+            sessions_unlock();
+            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
+        }
+        *ppv = &This->IAudioCaptureClient_iface;
+    } else if (IsEqualIID(riid, &IID_IAudioClock)) {
+        *ppv = &This->IAudioClock_iface;
+    } else if (IsEqualIID(riid, &IID_IAudioStreamVolume)) {
+        *ppv = &This->IAudioStreamVolume_iface;
+    } else if (IsEqualIID(riid, &IID_IAudioSessionControl) ||
+               IsEqualIID(riid, &IID_IChannelAudioVolume) ||
+               IsEqualIID(riid, &IID_ISimpleAudioVolume)) {
+        if (!This->session_wrapper) {
+            This->session_wrapper = session_wrapper_create(This);
+            if (!This->session_wrapper) {
+                sessions_unlock();
+                return E_OUTOFMEMORY;
+            }
+        }
+        if (IsEqualIID(riid, &IID_IAudioSessionControl))
+            *ppv = &This->session_wrapper->IAudioSessionControl2_iface;
+        else if (IsEqualIID(riid, &IID_IChannelAudioVolume))
+            *ppv = &This->session_wrapper->IChannelAudioVolume_iface;
+        else if (IsEqualIID(riid, &IID_ISimpleAudioVolume))
+            *ppv = &This->session_wrapper->ISimpleAudioVolume_iface;
+    }
+
+    if (*ppv) {
+        IUnknown_AddRef((IUnknown*)*ppv);
+        sessions_unlock();
+        return S_OK;
+    }
+
+    sessions_unlock();
+
+    return E_NOINTERFACE;
+}
+
+static HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface, AUDIO_STREAM_CATEGORY category,
+                                              BOOL *offload_capable)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable);
+
+    if (!offload_capable)
+        return E_INVALIDARG;
+
+    *offload_capable = FALSE;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI client_SetClientProperties(IAudioClient3 *iface,
+                                                 const AudioClientProperties *prop)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop;
+
+    TRACE("(%p)->(%p)\n", This, prop);
+
+    if (!legacy_prop)
+        return E_POINTER;
+
+    if (legacy_prop->cbSize == sizeof(AudioClientProperties)) {
+        TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n", legacy_prop->bIsOffload,
+                                                                      legacy_prop->eCategory,
+                                                                      prop->Options);
+    } else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)) {
+        TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n", legacy_prop->bIsOffload,
+                                                       legacy_prop->eCategory);
+    } else {
+        WARN("Unsupported Size = %d\n", legacy_prop->cbSize);
+        return E_INVALIDARG;
+    }
+
+    if (legacy_prop->bIsOffload)
+        return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE;
+
+    return S_OK;
+}
+
+static HRESULT WINAPI client_GetBufferSizeLimits(IAudioClient3 *iface, const WAVEFORMATEX *format,
+                                                 BOOL event_driven, REFERENCE_TIME *min_duration,
+                                                 REFERENCE_TIME *max_duration)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    FIXME("(%p)->(%p, %u, %p, %p) - stub\n", This, format, event_driven, min_duration, max_duration);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface,
+                                                       const WAVEFORMATEX *format,
+                                                       UINT32 *default_period_frames,
+                                                       UINT32 *unit_period_frames,
+                                                       UINT32 *min_period_frames,
+                                                       UINT32 *max_period_frames)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    FIXME("(%p)->(%p, %p, %p, %p, %p) - stub\n", This, format, default_period_frames,
+                                                 unit_period_frames, min_period_frames,
+                                                 max_period_frames);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
+                                                              WAVEFORMATEX **cur_format,
+                                                              UINT32 *cur_period_frames)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    FIXME("(%p)->(%p, %p) - stub\n", This, cur_format, cur_period_frames);
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags,
+                                                         UINT32 period_frames,
+                                                         const WAVEFORMATEX *format,
+                                                         const GUID *session_guid)
+{
+    struct audio_client *This = impl_from_IAudioClient3(iface);
+    FIXME("(%p)->(0x%lx, %u, %p, %s) - stub\n", This, flags, period_frames, format, debugstr_guid(session_guid));
+    return E_NOTIMPL;
+}
+
+const IAudioClient3Vtbl AudioClient3_Vtbl =
+{
+    client_QueryInterface,
+    client_AddRef,
+    client_Release,
+    client_Initialize,
+    client_GetBufferSize,
+    client_GetStreamLatency,
+    client_GetCurrentPadding,
+    client_IsFormatSupported,
+    client_GetMixFormat,
+    client_GetDevicePeriod,
+    client_Start,
+    client_Stop,
+    client_Reset,
+    client_SetEventHandle,
+    client_GetService,
+    client_IsOffloadCapable,
+    client_SetClientProperties,
+    client_GetBufferSizeLimits,
+    client_GetSharedModeEnginePeriod,
+    client_GetCurrentSharedModeEnginePeriod,
+    client_InitializeSharedAudioStream,
+};
+
 static HRESULT WINAPI render_QueryInterface(IAudioRenderClient *iface, REFIID riid, void **ppv)
 {
     struct audio_client *This = impl_from_IAudioRenderClient(iface);
diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c
index d3d4ec6a905..7647cd92bbf 100644
--- a/dlls/mmdevapi/main.c
+++ b/dlls/mmdevapi/main.c
@@ -196,6 +196,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
             DisableThreadLibraryCalls(hinstDLL);
             break;
         case DLL_PROCESS_DETACH:
+            stop_main_loop();
+
             if (drvs.module_unixlib) {
                 const NTSTATUS status = __wine_unix_call(drvs.module_unixlib, process_detach, NULL);
                 if (status)
diff --git a/dlls/mmdevapi/mmdevapi_private.h b/dlls/mmdevapi/mmdevapi_private.h
index 684d303eefb..4ae7de65fb8 100644
--- a/dlls/mmdevapi/mmdevapi_private.h
+++ b/dlls/mmdevapi/mmdevapi_private.h
@@ -80,4 +80,6 @@ extern HRESULT SpatialAudioClient_Create(IMMDevice *device, ISpatialAudioClient
 extern HRESULT load_devices_from_reg(void) DECLSPEC_HIDDEN;
 extern HRESULT load_driver_devices(EDataFlow flow) DECLSPEC_HIDDEN;

+extern void stop_main_loop(void) DECLSPEC_HIDDEN;
+
 extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN;
diff --git a/dlls/mmdevapi/session.c b/dlls/mmdevapi/session.c
index 81cea5b3482..fa012392108 100644
--- a/dlls/mmdevapi/session.c
+++ b/dlls/mmdevapi/session.c
@@ -1,4 +1,9 @@
 /*
+ * Copyright 2011-2012 Maarten Lankhorst
+ * Copyright 2010-2011 Maarten Lankhorst for CodeWeavers
+ * Copyright 2011 Andrew Eikum for CodeWeavers
+ * Copyright 2022 Huw Davies
+ * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -545,3 +550,26 @@ const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl =
     simplevolume_SetMute,
     simplevolume_GetMute
 };
+
+struct audio_session_wrapper *session_wrapper_create(struct audio_client *client)
+{
+    struct audio_session_wrapper *ret;
+
+    ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct audio_session_wrapper));
+    if (!ret)
+        return NULL;
+
+    ret->IAudioSessionControl2_iface.lpVtbl = &AudioSessionControl2_Vtbl;
+    ret->IChannelAudioVolume_iface.lpVtbl   = &ChannelAudioVolume_Vtbl;
+    ret->ISimpleAudioVolume_iface.lpVtbl    = &SimpleAudioVolume_Vtbl;
+
+    ret->ref    = !client;
+    ret->client = client;
+
+    if (client) {
+        ret->session = client->session;
+        IAudioClient3_AddRef(&client->IAudioClient3_iface);
+    }
+
+    return ret;
+}
diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
index 9494858c4dd..d1387520742 100644
--- a/dlls/winealsa.drv/Makefile.in
+++ b/dlls/winealsa.drv/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = winealsa.drv
 UNIXLIB   = winealsa.so
-IMPORTS   = uuid ole32 advapi32
+IMPORTS   = uuid ole32 advapi32 version
 PARENTSRC = ../mmdevapi
 DELAYIMPORTS = winmm
 UNIX_LIBS    = $(ALSA_LIBS) $(PTHREAD_LIBS)
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 57a0ed06733..242fc05602e 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -539,8 +539,8 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device,

/* if channels == 0, then this will return or create a session with
  * matching dataflow and GUID. otherwise, channels must also match */
-static HRESULT get_audio_session(const GUID *sessionguid,
-        IMMDevice *device, UINT channels, AudioSession **out)
+HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device,
+        UINT channels, AudioSession **out)
 {
     AudioSession *session;

diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in
index 01c5a3d0073..ecf85cffda4 100644
--- a/dlls/winecoreaudio.drv/Makefile.in
+++ b/dlls/winecoreaudio.drv/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = winecoreaudio.drv
 UNIXLIB   = winecoreaudio.so
-IMPORTS   = uuid ole32 user32 advapi32
+IMPORTS   = uuid ole32 user32 advapi32 version
 PARENTSRC = ../mmdevapi
 DELAYIMPORTS = winmm
 UNIX_LIBS    = $(COREAUDIO_LIBS)
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index 0372e320680..de68d09955e 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -511,8 +511,8 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device,

/* if channels == 0, then this will return or create a session with
  * matching dataflow and GUID. otherwise, channels must also match */
-static HRESULT get_audio_session(const GUID *sessionguid,
-        IMMDevice *device, UINT channels, AudioSession **out)
+HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device,
+        UINT channels, AudioSession **out)
 {
     AudioSession *session;

diff --git a/dlls/wineoss.drv/Makefile.in b/dlls/wineoss.drv/Makefile.in
index 121595a7c6c..f571397257b 100644
--- a/dlls/wineoss.drv/Makefile.in
+++ b/dlls/wineoss.drv/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = wineoss.drv
 UNIXLIB   = wineoss.so
-IMPORTS   = uuid ole32 user32 advapi32
+IMPORTS   = uuid ole32 user32 advapi32 version
 PARENTSRC = ../mmdevapi
 DELAYIMPORTS = winmm
 UNIX_LIBS    = $(OSS4_LIBS) $(PTHREAD_LIBS)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 9537a2f92fc..ffc2b2ef544 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -511,8 +511,8 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device,

/* if channels == 0, then this will return or create a session with
  * matching dataflow and GUID. otherwise, channels must also match */
-static HRESULT get_audio_session(const GUID *sessionguid,
-        IMMDevice *device, UINT channels, AudioSession **out)
+HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device,
+        UINT channels, AudioSession **out)
 {
     AudioSession *session;

diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
index 110f23e1319..e3cb084aea4 100644
--- a/dlls/winepulse.drv/mmdevdrv.c
+++ b/dlls/winepulse.drv/mmdevdrv.c
@@ -54,9 +54,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse);

#define MAX_PULSE_NAME_LEN 256

-#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
-
-static HANDLE pulse_thread;
 static struct list g_sessions = LIST_INIT(g_sessions);
 static struct list g_devices_cache = LIST_INIT(g_devices_cache);

@@ -115,16 +112,11 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)

LIST_FOR_EACH_ENTRY_SAFE(device, device_next, &g_devices_cache, struct device_cache, entry)
             free(device);
-
-        if (pulse_thread) {
-            WaitForSingleObject(pulse_thread, INFINITE);
-            CloseHandle(pulse_thread);
-        }
     }
     return TRUE;
 }

-static const IAudioClient3Vtbl AudioClient3_Vtbl;
+extern const IAudioClient3Vtbl AudioClient3_Vtbl;
 extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
 extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
@@ -134,13 +126,6 @@ extern const IAudioClockVtbl AudioClock_Vtbl;
 extern const IAudioClock2Vtbl AudioClock2_Vtbl;
 extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;

-static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
-
-static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface);
-}
-
 static void pulse_call(enum unix_funcs code, void *params)
 {
     NTSTATUS status;
@@ -148,152 +133,6 @@ static void pulse_call(enum unix_funcs code, void *params)
     assert(!status);
 }

-static void pulse_release_stream(stream_handle stream, HANDLE timer)
-{
-    struct release_stream_params params;
-    params.stream       = stream;
-    params.timer_thread = timer;
-    pulse_call(release_stream, &params);
-}
-
-static DWORD CALLBACK pulse_mainloop_thread(void *event)
-{
-    struct main_loop_params params;
-    params.event = event;
-    SetThreadDescription(GetCurrentThread(), L"winepulse_mainloop");
-    pulse_call(main_loop, &params);
-    return 0;
-}
-
-typedef struct tagLANGANDCODEPAGE
-{
-    WORD wLanguage;
-    WORD wCodePage;
-} LANGANDCODEPAGE;
-
-static BOOL query_productname(void *data, LANGANDCODEPAGE *lang, LPVOID *buffer, UINT *len)
-{
-    WCHAR pn[37];
-    swprintf(pn, ARRAY_SIZE(pn), L"\StringFileInfo\%04x%04x\ProductName", lang->wLanguage, lang->wCodePage);
-    return VerQueryValueW(data, pn, buffer, len) && *len;
-}
-
-static WCHAR *get_application_name(BOOL query_app_name)
-{
-    WCHAR path[MAX_PATH], *name;
-
-    GetModuleFileNameW(NULL, path, ARRAY_SIZE(path));
-
-    if (query_app_name)
-    {
-        UINT translate_size, productname_size;
-        LANGANDCODEPAGE *translate;
-        LPVOID productname;
-        BOOL found = FALSE;
-        void *data = NULL;
-        unsigned int i;
-        LCID locale;
-        DWORD size;
-
-        size = GetFileVersionInfoSizeW(path, NULL);
-        if (!size)
-            goto skip;
-
-        data = malloc(size);
-        if (!data)
-            goto skip;
-
-        if (!GetFileVersionInfoW(path, 0, size, data))
-            goto skip;
-
-        if (!VerQueryValueW(data, L"\VarFileInfo\Translation", (LPVOID *)&translate, &translate_size))
-            goto skip;
-
-        /* no translations found */
-        if (translate_size < sizeof(LANGANDCODEPAGE))
-            goto skip;
-
-        /* The following code will try to find the best translation. We first search for an
-         * exact match of the language, then a match of the language PRIMARYLANGID, then we
-         * search for a LANG_NEUTRAL match, and if that still doesn't work we pick the
-         * first entry which contains a proper productname. */
-        locale = GetThreadLocale();
-
-        for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) {
-            if (translate[i].wLanguage == locale &&
-                    query_productname(data, &translate[i], &productname, &productname_size)) {
-                found = TRUE;
-                break;
-            }
-        }
-
-        if (!found) {
-            for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) {
-                if (PRIMARYLANGID(translate[i].wLanguage) == PRIMARYLANGID(locale) &&
-                        query_productname(data, &translate[i], &productname, &productname_size)) {
-                    found = TRUE;
-                    break;
-                }
-            }
-        }
-
-        if (!found) {
-            for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) {
-                if (PRIMARYLANGID(translate[i].wLanguage) == LANG_NEUTRAL &&
-                        query_productname(data, &translate[i], &productname, &productname_size)) {
-                    found = TRUE;
-                    break;
-                }
-            }
-        }
-
-        if (!found) {
-            for (i = 0; i < translate_size / sizeof(LANGANDCODEPAGE); i++) {
-                if (query_productname(data, &translate[i], &productname, &productname_size)) {
-                    found = TRUE;
-                    break;
-                }
-            }
-        }
-
-    skip:
-        if (found)
-        {
-            name = wcsdup(productname);
-            free(data);
-            return name;
-        }
-        free(data);
-    }
-
-    name = wcsrchr(path, '\');
-    if (!name)
-        name = path;
-    else
-        name++;
-    return wcsdup(name);
-}
-
-static DWORD WINAPI pulse_timer_cb(void *user)
-{
-    struct timer_loop_params params;
-    ACImpl *This = user;
-    params.stream = This->stream;
-    SetThreadDescription(GetCurrentThread(), L"winepulse_timer_loop");
-    pulse_call(timer_loop, &params);
-    return 0;
-}
-
-static void set_stream_volumes(ACImpl *This)
-{
-    struct set_volumes_params params;
-    params.stream          = This->stream;
-    params.master_volume   = This->session->mute ? 0.0f : This->session->master_vol;
-    params.volumes         = This->vols;
-    params.session_volumes = This->session->channel_vols;
-    pulse_call(set_volumes, &params);
-}
-
 static void get_device_guid(HKEY drv_key, EDataFlow flow, const char *pulse_name, GUID *guid)
 {
     WCHAR key_name[MAX_PULSE_NAME_LEN + 2];
@@ -528,98 +367,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if (!ppv)
-        return E_POINTER;
-
-    *ppv = NULL;
-    if (IsEqualIID(riid, &IID_IUnknown) ||
-            IsEqualIID(riid, &IID_IAudioClient) ||
-            IsEqualIID(riid, &IID_IAudioClient2) ||
-            IsEqualIID(riid, &IID_IAudioClient3))
-        *ppv = iface;
-    if (*ppv) {
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-
-    if (IsEqualIID(riid, &IID_IMarshal))
-        return IUnknown_QueryInterface(This->marshal, riid, ppv);
-
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-    ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    return ref;
-}
-
-static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-    ref = InterlockedDecrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    if (!ref) {
-        if (This->stream) {
-            pulse_release_stream(This->stream, This->timer_thread);
-            This->stream = 0;
-            sessions_lock();
-            list_remove(&This->entry);
-            sessions_unlock();
-        }
-        IUnknown_Release(This->marshal);
-        IMMDevice_Release(This->parent);
-        HeapFree(GetProcessHeap(), 0, This);
-    }
-    return ref;
-}
-
-static void dump_fmt(const WAVEFORMATEX *fmt)
-{
-    TRACE("wFormatTag: 0x%x (", fmt->wFormatTag);
-    switch(fmt->wFormatTag) {
-    case WAVE_FORMAT_PCM:
-        TRACE("WAVE_FORMAT_PCM");
-        break;
-    case WAVE_FORMAT_IEEE_FLOAT:
-        TRACE("WAVE_FORMAT_IEEE_FLOAT");
-        break;
-    case WAVE_FORMAT_EXTENSIBLE:
-        TRACE("WAVE_FORMAT_EXTENSIBLE");
-        break;
-    default:
-        TRACE("Unknown");
-        break;
-    }
-    TRACE(")\n");
-
-    TRACE("nChannels: %u\n", fmt->nChannels);
-    TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec);
-    TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec);
-    TRACE("nBlockAlign: %u\n", fmt->nBlockAlign);
-    TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample);
-    TRACE("cbSize: %u\n", fmt->cbSize);
-
-    if (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE) {
-        WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt;
-        TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask);
-        TRACE("Samples: %04x\n", fmtex->Samples.wReserved);
-        TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat));
-    }
-}
-
 static void session_init_vols(AudioSession *session, UINT channels)
 {
     if (session->channel_count < channels) {
@@ -667,8 +414,8 @@ static AudioSession *create_session(const GUID *guid, IMMDevice *device,

/* if channels == 0, then this will return or create a session with
  * matching dataflow and GUID. otherwise, channels must also match */
-static HRESULT get_audio_session(const GUID *sessionguid,
-        IMMDevice *device, UINT channels, AudioSession **out)
+HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device,
+        UINT channels, AudioSession **out)
 {
     AudioSession *session;

@@ -699,494 +446,6 @@ static HRESULT get_audio_session(const GUID *sessionguid,
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
-        REFERENCE_TIME period, const WAVEFORMATEX *fmt,
-        const GUID *sessionguid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct create_stream_params params;
-    unsigned int i, channel_count;
-    stream_handle stream;
-    WCHAR *name;
-    HRESULT hr;
-
-    TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags,
-          wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid));
-
-    if (!fmt)
-        return E_POINTER;
-    dump_fmt(fmt);
-
-    if (mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE)
-        return E_INVALIDARG;
-    if (mode == AUDCLNT_SHAREMODE_EXCLUSIVE)
-        return AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED;
-
-    if (flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS |
-                AUDCLNT_STREAMFLAGS_LOOPBACK |
-                AUDCLNT_STREAMFLAGS_EVENTCALLBACK |
-                AUDCLNT_STREAMFLAGS_NOPERSIST |
-                AUDCLNT_STREAMFLAGS_RATEADJUST |
-                AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED |
-                AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY |
-                AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)) {
-        FIXME("Unknown flags: %08lx\n", flags);
-        return E_INVALIDARG;
-    }
-
-    sessions_lock();
-
-    if (This->stream) {
-        sessions_unlock();
-        return AUDCLNT_E_ALREADY_INITIALIZED;
-    }
-
-    if (!pulse_thread)
-    {
-        HANDLE event = CreateEventW(NULL, TRUE, FALSE, NULL);
-        if (!(pulse_thread = CreateThread(NULL, 0, pulse_mainloop_thread, event, 0, NULL)))
-        {
-            ERR("Failed to create mainloop thread.\n");
-            sessions_unlock();
-            CloseHandle(event);
-            return E_FAIL;
-        }
-        SetThreadPriority(pulse_thread, THREAD_PRIORITY_TIME_CRITICAL);
-        WaitForSingleObject(event, INFINITE);
-        CloseHandle(event);
-    }
-
-    params.name = name = get_application_name(TRUE);
-    params.device   = This->device_name;
-    params.flow     = This->dataflow;
-    params.share    = mode;
-    params.flags    = flags;
-    params.duration = duration;
-    params.period   = period;
-    params.fmt      = fmt;
-    params.stream   = &stream;
-    params.channel_count = &channel_count;
-    pulse_call(create_stream, &params);
-    free(name);
-    if (FAILED(hr = params.result))
-    {
-        sessions_unlock();
-        return hr;
-    }
-
-    if (!(This->vols = malloc(channel_count * sizeof(*This->vols))))
-    {
-        pulse_release_stream(stream, NULL);
-        sessions_unlock();
-        return E_OUTOFMEMORY;
-    }
-    for (i = 0; i < channel_count; i++)
-        This->vols[i] = 1.f;
-
-    hr = get_audio_session(sessionguid, This->parent, channel_count, &This->session);
-    if (FAILED(hr))
-    {
-        free(This->vols);
-        This->vols = NULL;
-        sessions_unlock();
-        pulse_release_stream(stream, NULL);
-        return E_OUTOFMEMORY;
-    }
-
-    This->stream = stream;
-    This->channel_count = channel_count;
-    list_add_tail(&This->session->clients, &This->entry);
-    set_stream_volumes(This);
-
-    sessions_unlock();
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface,
-        UINT32 *out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_buffer_size_params params;
-
-    TRACE("(%p)->(%p)\n", This, out);
-
-    if (!out)
-        return E_POINTER;
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.frames = out;
-    pulse_call(get_buffer_size, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface,
-        REFERENCE_TIME *latency)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_latency_params params;
-
-    TRACE("(%p)->(%p)\n", This, latency);
-
-    if (!latency)
-        return E_POINTER;
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream  = This->stream;
-    params.latency = latency;
-    pulse_call(get_latency, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,
-        UINT32 *out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_current_padding_params params;
-
-    TRACE("(%p)->(%p)\n", This, out);
-
-    if (!out)
-        return E_POINTER;
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream  = This->stream;
-    params.padding = out;
-    pulse_call(get_current_padding, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt,
-        WAVEFORMATEX **out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct is_format_supported_params params;
-
-    TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out);
-
-    if (fmt)
-        dump_fmt(fmt);
-
-    params.device  = This->device_name;
-    params.flow    = This->dataflow;
-    params.share   = mode;
-    params.fmt_in  = fmt;
-    params.fmt_out = NULL;
-
-    if (out) {
-        *out = NULL;
-        if (mode == AUDCLNT_SHAREMODE_SHARED)
-            params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out));
-    }
-
-    pulse_call(is_format_supported, &params);
-
-    if (params.result == S_FALSE)
-        *out = &params.fmt_out->Format;
-    else
-        CoTaskMemFree(params.fmt_out);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface,
-        WAVEFORMATEX **pwfx)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_mix_format_params params;
-
-    TRACE("(%p)->(%p)\n", This, pwfx);
-
-    if (!pwfx)
-        return E_POINTER;
-    *pwfx = NULL;
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
-    if (!params.fmt)
-        return E_OUTOFMEMORY;
-
-    pulse_call(get_mix_format, &params);
-
-    if (SUCCEEDED(params.result)) {
-        *pwfx = &params.fmt->Format;
-        dump_fmt(*pwfx);
-    } else {
-        CoTaskMemFree(params.fmt);
-    }
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
-        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
-{
-    struct get_device_period_params params;
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
-
-    if (!defperiod && !minperiod)
-        return E_POINTER;
-
-    params.flow = This->dataflow;
-    params.device = This->device_name;
-    params.def_period = defperiod;
-    params.min_period = minperiod;
-
-    pulse_call(get_device_period, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-    HRESULT hr;
-
-    TRACE("(%p)\n", This);
-
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    pulse_call(start, &params);
-    if (FAILED(hr = params.result))
-        return hr;
-
-    if (!This->timer_thread) {
-        This->timer_thread = CreateThread(NULL, 0, pulse_timer_cb, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    pulse_call(stop, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    pulse_call(reset, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
-
-    TRACE("(%p)->(%p)\n", This, event);
-
-    if (!event)
-        return E_INVALIDARG;
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event  = event;
-    pulse_call(set_event_handle, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
-        void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
-
-    if (!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    if (!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    if (IsEqualIID(riid, &IID_IAudioRenderClient)) {
-        if (This->dataflow != eRender)
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        *ppv = &This->IAudioRenderClient_iface;
-    } else if (IsEqualIID(riid, &IID_IAudioCaptureClient)) {
-        if (This->dataflow != eCapture)
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        *ppv = &This->IAudioCaptureClient_iface;
-    } else if (IsEqualIID(riid, &IID_IAudioClock)) {
-        *ppv = &This->IAudioClock_iface;
-    } else if (IsEqualIID(riid, &IID_IAudioStreamVolume)) {
-        *ppv = &This->IAudioStreamVolume_iface;
-    } else if (IsEqualIID(riid, &IID_IAudioSessionControl) ||
-               IsEqualIID(riid, &IID_IChannelAudioVolume) ||
-               IsEqualIID(riid, &IID_ISimpleAudioVolume)) {
-        if (!This->session_wrapper) {
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if (!This->session_wrapper)
-                return E_OUTOFMEMORY;
-        }
-        if (IsEqualIID(riid, &IID_IAudioSessionControl))
-            *ppv = &This->session_wrapper->IAudioSessionControl2_iface;
-        else if (IsEqualIID(riid, &IID_IChannelAudioVolume))
-            *ppv = &This->session_wrapper->IChannelAudioVolume_iface;
-        else if (IsEqualIID(riid, &IID_ISimpleAudioVolume))
-            *ppv = &This->session_wrapper->ISimpleAudioVolume_iface;
-    }
-
-    if (*ppv) {
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-
-    FIXME("stub %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient3 *iface,
-        AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable);
-
-    if(!offload_capable)
-        return E_INVALIDARG;
-
-    *offload_capable = FALSE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface,
-        const AudioClientProperties *prop)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop;
-
-    TRACE("(%p)->(%p)\n", This, prop);
-
-    if(!legacy_prop)
-        return E_POINTER;
-
-    if(legacy_prop->cbSize == sizeof(AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory,
-                prop->Options);
-    }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory);
-    }else{
-        WARN("Unsupported Size = %d\n", legacy_prop->cbSize);
-        return E_INVALIDARG;
-    }
-
-
-    if(legacy_prop->bIsOffload)
-        return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
-        REFERENCE_TIME *max_duration)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames,
-        UINT32 *min_period_frames, UINT32 *max_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames,
-            min_period_frames, max_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
-        WAVEFORMATEX **cur_format, UINT32 *cur_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface,
-        DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format,
-        const GUID *session_guid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid));
-
-    return E_NOTIMPL;
-}
-
-static const IAudioClient3Vtbl AudioClient3_Vtbl =
-{
-    AudioClient_QueryInterface,
-    AudioClient_AddRef,
-    AudioClient_Release,
-    AudioClient_Initialize,
-    AudioClient_GetBufferSize,
-    AudioClient_GetStreamLatency,
-    AudioClient_GetCurrentPadding,
-    AudioClient_IsFormatSupported,
-    AudioClient_GetMixFormat,
-    AudioClient_GetDevicePeriod,
-    AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
-    AudioClient_GetService,
-    AudioClient_IsOffloadCapable,
-    AudioClient_SetClientProperties,
-    AudioClient_GetBufferSizeLimits,
-    AudioClient_GetSharedModeEnginePeriod,
-    AudioClient_GetCurrentSharedModeEnginePeriod,
-    AudioClient_InitializeSharedAudioStream,
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;
diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
index 5ba66a8aa1d..ed56e6a11d3 100644
--- a/dlls/winepulse.drv/pulse.c
+++ b/dlls/winepulse.drv/pulse.c
@@ -1116,12 +1116,17 @@ static NTSTATUS pulse_create_stream(void *args)
     struct pulse_stream *stream;
     unsigned int i, bufsize_bytes;
     HRESULT hr;
-    char *name = wstr_to_str(params->name);
+    char *name;
+
+    if (params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) {
+        params->result = AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED;
+        return STATUS_SUCCESS;
+    }

pulse_lock();

+    name = wstr_to_str(params->name);
     params->result = pulse_connect(name);
-
     free(name);

if (FAILED(params->result))

[PATCH v3 2/4] winealsa: Use mmdevapi's AudioClient.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winealsa.drv/alsa.c     |  24 +-
 dlls/winealsa.drv/mmdevdrv.c | 664 +----------------------------------
 2 files changed, 23 insertions(+), 665 deletions(-)

diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index dbf85a7947e..4930850e9dc 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -476,6 +476,13 @@ static WCHAR *alsa_get_card_name(int card)
     return ret;
 }

+static NTSTATUS alsa_main_loop(void *args)
+{
+    struct main_loop_params *params = args;
+    NtSetEvent(params->event, NULL);
+    return STATUS_SUCCESS;
+}
+
 static NTSTATUS alsa_get_endpoint_ids(void *args)
 {
     static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0};
@@ -2493,7 +2500,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
 {
     alsa_not_implemented,
     alsa_not_implemented,
-    alsa_not_implemented,
+    alsa_main_loop,
     alsa_get_endpoint_ids,
     alsa_create_stream,
     alsa_release_stream,
@@ -2531,6 +2538,19 @@ unixlib_entry_t __wine_unix_call_funcs[] =

typedef UINT PTR32;

+static NTSTATUS alsa_wow64_main_loop(void *args)
+{
+    struct
+    {
+        PTR32 event;
+    } *params32 = args;
+    struct main_loop_params params =
+    {
+        .event = ULongToHandle(params32->event)
+    };
+    return alsa_main_loop(&params);
+}
+
 static NTSTATUS alsa_wow64_get_endpoint_ids(void *args)
 {
     struct
@@ -2934,7 +2954,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 {
     alsa_not_implemented,
     alsa_not_implemented,
-    alsa_not_implemented,
+    alsa_wow64_main_loop,
     alsa_wow64_get_endpoint_ids,
     alsa_wow64_create_stream,
     alsa_wow64_release_stream,
diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 242fc05602e..0d642c1a562 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -51,8 +51,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(alsa);

-#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
-
 static CRITICAL_SECTION g_sessions_lock;
 static CRITICAL_SECTION_DEBUG g_sessions_lock_debug =
 {
@@ -66,7 +64,7 @@ static struct list g_sessions = LIST_INIT(g_sessions);
 static WCHAR drv_key_devicesW[256];
 static const WCHAR guidW[] = {'g','u','i','d',0};

-static const IAudioClient3Vtbl AudioClient3_Vtbl;
+extern const IAudioClient3Vtbl AudioClient3_Vtbl;
 extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
 extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
@@ -76,8 +74,6 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl;
 extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl;
 extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl;

-static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
-
 void DECLSPEC_HIDDEN sessions_lock(void)
 {
     EnterCriticalSection(&g_sessions_lock);
@@ -88,11 +84,6 @@ void DECLSPEC_HIDDEN sessions_unlock(void)
     LeaveCriticalSection(&g_sessions_lock);
 }

-static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface);
-}
-
 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
 {
     switch (reason)
@@ -122,32 +113,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     return TRUE;
 }

-static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread)
-{
-    struct release_stream_params params;
-
-    params.stream = stream;
-    params.timer_thread = timer_thread;
-
-    ALSA_CALL(release_stream, &params);
-
-    return params.result;
-}
-
-static DWORD WINAPI alsa_timer_thread(void *user)
-{
-    struct timer_loop_params params;
-    ACImpl *This = user;
-
-    SetThreadDescription(GetCurrentThread(), L"winealsa_timer");
-
-    params.stream = This->stream;
-
-    ALSA_CALL(timer_loop, &params);
-
-    return 0;
-}
-
 static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name,
         GUID *guid)
 {
@@ -220,18 +185,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid)
         RegCloseKey(key);
 }

-static void set_stream_volumes(ACImpl *This)
-{
-    struct set_volumes_params params;
-
-    params.stream = This->stream;
-    params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol);
-    params.volumes = This->vols;
-    params.session_volumes = This->session->channel_vols;
-
-    ALSA_CALL(set_volumes, &params);
-}
-
 HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out,
         UINT *num, UINT *def_index)
 {
@@ -400,98 +353,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-    if(IsEqualIID(riid, &IID_IUnknown) ||
-            IsEqualIID(riid, &IID_IAudioClient) ||
-            IsEqualIID(riid, &IID_IAudioClient2) ||
-            IsEqualIID(riid, &IID_IAudioClient3))
-        *ppv = iface;
-    else if(IsEqualIID(riid, &IID_IMarshal))
-        return IUnknown_QueryInterface(This->marshal, riid, ppv);
-
-    if(*ppv){
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-    ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    return ref;
-}
-
-static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-
-    ref = InterlockedDecrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    if(!ref){
-        IAudioClient3_Stop(iface);
-        IMMDevice_Release(This->parent);
-        IUnknown_Release(This->marshal);
-        if(This->session){
-            sessions_lock();
-            list_remove(&This->entry);
-            sessions_unlock();
-        }
-        HeapFree(GetProcessHeap(), 0, This->vols);
-        if (This->stream)
-            alsa_stream_release(This->stream, This->timer_thread);
-        HeapFree(GetProcessHeap(), 0, This);
-    }
-    return ref;
-}
-
-static void dump_fmt(const WAVEFORMATEX *fmt)
-{
-    TRACE("wFormatTag: 0x%x (", fmt->wFormatTag);
-    switch(fmt->wFormatTag){
-    case WAVE_FORMAT_PCM:
-        TRACE("WAVE_FORMAT_PCM");
-        break;
-    case WAVE_FORMAT_IEEE_FLOAT:
-        TRACE("WAVE_FORMAT_IEEE_FLOAT");
-        break;
-    case WAVE_FORMAT_EXTENSIBLE:
-        TRACE("WAVE_FORMAT_EXTENSIBLE");
-        break;
-    default:
-        TRACE("Unknown");
-        break;
-    }
-    TRACE(")\n");
-
-    TRACE("nChannels: %u\n", fmt->nChannels);
-    TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec);
-    TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec);
-    TRACE("nBlockAlign: %u\n", fmt->nBlockAlign);
-    TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample);
-    TRACE("cbSize: %u\n", fmt->cbSize);
-
-    if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
-        WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt;
-        TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask);
-        TRACE("Samples: %04x\n", fmtex->Samples.wReserved);
-        TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat));
-    }
-}
-
 static void session_init_vols(AudioSession *session, UINT channels)
 {
     if(session->channel_count < channels){
@@ -571,529 +432,6 @@ HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device,
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
-        REFERENCE_TIME period, const WAVEFORMATEX *fmt,
-        const GUID *sessionguid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct create_stream_params params;
-    stream_handle stream;
-    unsigned int i;
-
-    TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags,
-          wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid));
-
-    if(!fmt)
-        return E_POINTER;
-
-    if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE)
-        return E_INVALIDARG;
-
-    if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS |
-                AUDCLNT_STREAMFLAGS_LOOPBACK |
-                AUDCLNT_STREAMFLAGS_EVENTCALLBACK |
-                AUDCLNT_STREAMFLAGS_NOPERSIST |
-                AUDCLNT_STREAMFLAGS_RATEADJUST |
-                AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED |
-                AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY |
-                AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){
-        FIXME("Unknown flags: %08lx\n", flags);
-        return E_INVALIDARG;
-    }
-
-    sessions_lock();
-
-    if(This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_ALREADY_INITIALIZED;
-    }
-
-    dump_fmt(fmt);
-
-    params.name = NULL;
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.share = mode;
-    params.flags = flags;
-    params.duration = duration;
-    params.period = period;
-    params.fmt = fmt;
-    params.channel_count = NULL;
-    params.stream = &stream;
-
-    ALSA_CALL(create_stream, &params);
-    if(FAILED(params.result)){
-        sessions_unlock();
-        return params.result;
-    }
-
-    This->channel_count = fmt->nChannels;
-    This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float));
-    if(!This->vols){
-        params.result = E_OUTOFMEMORY;
-        goto exit;
-    }
-    for(i = 0; i < This->channel_count; ++i)
-        This->vols[i] = 1.f;
-
-    params.result = get_audio_session(sessionguid, This->parent, This->channel_count,
-                                      &This->session);
-    if(FAILED(params.result))
-        goto exit;
-
-    list_add_tail(&This->session->clients, &This->entry);
-
-exit:
-    if(FAILED(params.result)){
-        alsa_stream_release(stream, NULL);
-        HeapFree(GetProcessHeap(), 0, This->vols);
-        This->vols = NULL;
-    }else{
-        This->stream = stream;
-        set_stream_volumes(This);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface,
-        UINT32 *out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_buffer_size_params params;
-
-    TRACE("(%p)->(%p)\n", This, out);
-
-    if(!out)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.frames = out;
-
-    ALSA_CALL(get_buffer_size, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface,
-        REFERENCE_TIME *latency)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_latency_params params;
-
-    TRACE("(%p)->(%p)\n", This, latency);
-
-    if(!latency)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.latency = latency;
-
-    ALSA_CALL(get_latency, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,
-        UINT32 *out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_current_padding_params params;
-
-    TRACE("(%p)->(%p)\n", This, out);
-
-    if(!out)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.padding = out;
-
-    ALSA_CALL(get_current_padding, &params);
-
-    TRACE("pad: %u\n", *out);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt,
-        WAVEFORMATEX **out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct is_format_supported_params params;
-
-    TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out);
-    if(fmt) dump_fmt(fmt);
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.share = mode;
-    params.fmt_in = fmt;
-    params.fmt_out = NULL;
-
-    if(out){
-        *out = NULL;
-        if(mode == AUDCLNT_SHAREMODE_SHARED)
-            params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out));
-    }
-    ALSA_CALL(is_format_supported, &params);
-
-    if(params.result == S_FALSE)
-        *out = &params.fmt_out->Format;
-    else
-        CoTaskMemFree(params.fmt_out);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface,
-        WAVEFORMATEX **pwfx)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_mix_format_params params;
-
-    TRACE("(%p)->(%p)\n", This, pwfx);
-
-    if(!pwfx)
-        return E_POINTER;
-    *pwfx = NULL;
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
-    if(!params.fmt)
-        return E_OUTOFMEMORY;
-
-    ALSA_CALL(get_mix_format, &params);
-
-    if(SUCCEEDED(params.result)){
-        *pwfx = &params.fmt->Format;
-        dump_fmt(*pwfx);
-    } else
-        CoTaskMemFree(params.fmt);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
-        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_device_period_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
-
-    if (!defperiod && !minperiod)
-        return E_POINTER;
-
-    params.device     = This->device_name;
-    params.flow       = This->dataflow;
-    params.def_period = defperiod;
-    params.min_period = minperiod;
-
-    ALSA_CALL(get_device_period, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-
-    TRACE("(%p)\n", This);
-
-    sessions_lock();
-
-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
-
-    params.stream = This->stream;
-
-    ALSA_CALL(start, &params);
-
-    if(SUCCEEDED(params.result) && !This->timer_thread){
-        This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-
-    ALSA_CALL(stop, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-
-    ALSA_CALL(reset, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
-
-    TRACE("(%p)->(%p)\n", This, event);
-
-    if(!event)
-        return E_INVALIDARG;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event = event;
-
-    ALSA_CALL(set_event_handle, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
-        void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    sessions_lock();
-
-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
-
-    if(IsEqualIID(riid, &IID_IAudioRenderClient)){
-        if(This->dataflow != eRender){
-            sessions_unlock();
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        }
-        IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface);
-        *ppv = &This->IAudioRenderClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){
-        if(This->dataflow != eCapture){
-            sessions_unlock();
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        }
-        IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface);
-        *ppv = &This->IAudioCaptureClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioClock)){
-        IAudioClock_AddRef(&This->IAudioClock_iface);
-        *ppv = &This->IAudioClock_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){
-        IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface);
-        *ppv = &This->IAudioStreamVolume_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface);
-
-        *ppv = &This->session_wrapper->IAudioSessionControl2_iface;
-    }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->IChannelAudioVolume_iface;
-    }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->ISimpleAudioVolume_iface;
-    }
-
-    if(*ppv){
-        sessions_unlock();
-        return S_OK;
-    }
-
-    sessions_unlock();
-
-    FIXME("stub %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient3 *iface,
-        AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable);
-
-    if(!offload_capable)
-        return E_INVALIDARG;
-
-    *offload_capable = FALSE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface,
-        const AudioClientProperties *prop)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop;
-
-    TRACE("(%p)->(%p)\n", This, prop);
-
-    if(!legacy_prop)
-        return E_POINTER;
-
-    if(legacy_prop->cbSize == sizeof(AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory,
-                prop->Options);
-    }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory);
-    }else{
-        WARN("Unsupported Size = %d\n", legacy_prop->cbSize);
-        return E_INVALIDARG;
-    }
-
-
-    if(legacy_prop->bIsOffload)
-        return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
-        REFERENCE_TIME *max_duration)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames,
-        UINT32 *min_period_frames, UINT32 *max_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames,
-            min_period_frames, max_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
-        WAVEFORMATEX **cur_format, UINT32 *cur_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface,
-        DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format,
-        const GUID *session_guid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid));
-
-    return E_NOTIMPL;
-}
-
-static const IAudioClient3Vtbl AudioClient3_Vtbl =
-{
-    AudioClient_QueryInterface,
-    AudioClient_AddRef,
-    AudioClient_Release,
-    AudioClient_Initialize,
-    AudioClient_GetBufferSize,
-    AudioClient_GetStreamLatency,
-    AudioClient_GetCurrentPadding,
-    AudioClient_IsFormatSupported,
-    AudioClient_GetMixFormat,
-    AudioClient_GetDevicePeriod,
-    AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
-    AudioClient_GetService,
-    AudioClient_IsOffloadCapable,
-    AudioClient_SetClientProperties,
-    AudioClient_GetBufferSizeLimits,
-    AudioClient_GetSharedModeEnginePeriod,
-    AudioClient_GetCurrentSharedModeEnginePeriod,
-    AudioClient_InitializeSharedAudioStream,
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;

[PATCH v3 3/4] winecoreaudio: Use mmdevapi's AudioClient.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winecoreaudio.drv/coreaudio.c |  24 +-
 dlls/winecoreaudio.drv/mmdevdrv.c  | 633 +----------------------------
 2 files changed, 23 insertions(+), 634 deletions(-)

diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c
index d031b82583e..f41118e62f5 100644
--- a/dlls/winecoreaudio.drv/coreaudio.c
+++ b/dlls/winecoreaudio.drv/coreaudio.c
@@ -196,6 +196,13 @@ static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow)
     return ret;
 }

+static NTSTATUS unix_main_loop(void *args)
+{
+    struct main_loop_params *params = args;
+    NtSetEvent(params->event, NULL);
+    return STATUS_SUCCESS;
+}
+
 static NTSTATUS unix_get_endpoint_ids(void *args)
 {
     struct get_endpoint_ids_params *params = args;
@@ -1775,7 +1782,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
 {
     unix_not_implemented,
     unix_not_implemented,
-    unix_not_implemented,
+    unix_main_loop,
     unix_get_endpoint_ids,
     unix_create_stream,
     unix_release_stream,
@@ -1813,6 +1820,19 @@ unixlib_entry_t __wine_unix_call_funcs[] =

typedef UINT PTR32;

+static NTSTATUS unix_wow64_main_loop(void *args)
+{
+    struct
+    {
+        PTR32 event;
+    } *params32 = args;
+    struct main_loop_params params =
+    {
+        .event = ULongToHandle(params32->event)
+    };
+    return unix_main_loop(&params);
+}
+
 static NTSTATUS unix_wow64_get_endpoint_ids(void *args)
 {
     struct
@@ -2157,7 +2177,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 {
     unix_not_implemented,
     unix_not_implemented,
-    unix_not_implemented,
+    unix_wow64_main_loop,
     unix_wow64_get_endpoint_ids,
     unix_wow64_create_stream,
     unix_wow64_release_stream,
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c
index de68d09955e..45b6b53ba29 100644
--- a/dlls/winecoreaudio.drv/mmdevdrv.c
+++ b/dlls/winecoreaudio.drv/mmdevdrv.c
@@ -46,9 +46,7 @@

WINE_DEFAULT_DEBUG_CHANNEL(coreaudio);

-#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
-
-static const IAudioClient3Vtbl AudioClient3_Vtbl;
+extern const IAudioClient3Vtbl AudioClient3_Vtbl;
 extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
 extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
@@ -70,8 +68,6 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug =
 static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 };
 static struct list g_sessions = LIST_INIT(g_sessions);

-static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
-
 void DECLSPEC_HIDDEN sessions_lock(void)
 {
     EnterCriticalSection(&g_sessions_lock);
@@ -82,11 +78,6 @@ void DECLSPEC_HIDDEN sessions_unlock(void)
     LeaveCriticalSection(&g_sessions_lock);
 }

-static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface);
-}
-
 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
 {
     switch (reason)
@@ -191,18 +182,6 @@ static void get_device_guid(EDataFlow flow, const char *dev, GUID *guid)
         RegCloseKey(key);
 }

-static void set_stream_volumes(ACImpl *This)
-{
-    struct set_volumes_params params;
-
-    params.stream = This->stream;
-    params.master_volume = This->session->mute ? 0.0f : This->session->master_vol;
-    params.volumes = This->vols;
-    params.session_volumes = This->session->channel_vols;
-
-    UNIX_CALL(set_volumes, &params);
-}
-
 HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out,
         GUID **guids_out, UINT *num, UINT *def_index)
 {
@@ -370,100 +349,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-    if(IsEqualIID(riid, &IID_IUnknown) ||
-            IsEqualIID(riid, &IID_IAudioClient) ||
-            IsEqualIID(riid, &IID_IAudioClient2) ||
-            IsEqualIID(riid, &IID_IAudioClient3))
-        *ppv = iface;
-    else if(IsEqualIID(riid, &IID_IMarshal))
-        return IUnknown_QueryInterface(This->marshal, riid, ppv);
-
-    if(*ppv){
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-    ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    return ref;
-}
-
-static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-    ref = InterlockedDecrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    if(!ref){
-        if(This->stream){
-            struct release_stream_params params;
-            params.stream = This->stream;
-            params.timer_thread = This->timer_thread;
-            UNIX_CALL(release_stream, &params);
-            This->stream = 0;
-
-            sessions_lock();
-            list_remove(&This->entry);
-            sessions_unlock();
-        }
-        HeapFree(GetProcessHeap(), 0, This->vols);
-        IMMDevice_Release(This->parent);
-        IUnknown_Release(This->marshal);
-        HeapFree(GetProcessHeap(), 0, This);
-    }
-    return ref;
-}
-
-static void dump_fmt(const WAVEFORMATEX *fmt)
-{
-    TRACE("wFormatTag: 0x%x (", fmt->wFormatTag);
-    switch(fmt->wFormatTag){
-    case WAVE_FORMAT_PCM:
-        TRACE("WAVE_FORMAT_PCM");
-        break;
-    case WAVE_FORMAT_IEEE_FLOAT:
-        TRACE("WAVE_FORMAT_IEEE_FLOAT");
-        break;
-    case WAVE_FORMAT_EXTENSIBLE:
-        TRACE("WAVE_FORMAT_EXTENSIBLE");
-        break;
-    default:
-        TRACE("Unknown");
-        break;
-    }
-    TRACE(")\n");
-
-    TRACE("nChannels: %u\n", fmt->nChannels);
-    TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec);
-    TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec);
-    TRACE("nBlockAlign: %u\n", fmt->nBlockAlign);
-    TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample);
-    TRACE("cbSize: %u\n", fmt->cbSize);
-
-    if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
-        WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt;
-        TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask);
-        TRACE("Samples: %04x\n", fmtex->Samples.wReserved);
-        TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat));
-    }
-}
-
 static void session_init_vols(AudioSession *session, UINT channels)
 {
     if(session->channel_count < channels){
@@ -543,522 +428,6 @@ HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device,
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
-        REFERENCE_TIME period, const WAVEFORMATEX *fmt,
-        const GUID *sessionguid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct release_stream_params release_params;
-    struct create_stream_params params;
-    stream_handle stream;
-    UINT32 i;
-
-    TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags,
-          wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid));
-
-    if(!fmt)
-        return E_POINTER;
-
-    dump_fmt(fmt);
-
-    if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE)
-        return E_INVALIDARG;
-
-    if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS |
-                AUDCLNT_STREAMFLAGS_LOOPBACK |
-                AUDCLNT_STREAMFLAGS_EVENTCALLBACK |
-                AUDCLNT_STREAMFLAGS_NOPERSIST |
-                AUDCLNT_STREAMFLAGS_RATEADJUST |
-                AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED |
-                AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY |
-                AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){
-        FIXME("Unknown flags: %08lx\n", flags);
-        return E_INVALIDARG;
-    }
-
-    sessions_lock();
-
-    if(This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_ALREADY_INITIALIZED;
-    }
-
-    params.name = NULL;
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.share = mode;
-    params.flags = flags;
-    params.duration = duration;
-    params.period = period;
-    params.fmt = fmt;
-    params.channel_count = NULL;
-    params.stream = &stream;
-
-    UNIX_CALL(create_stream, &params);
-    if(FAILED(params.result)){
-        sessions_unlock();
-        return params.result;
-    }
-
-    This->channel_count = fmt->nChannels;
-
-    This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float));
-    if(!This->vols){
-        params.result = E_OUTOFMEMORY;
-        goto end;
-    }
-
-    for(i = 0; i < This->channel_count; ++i)
-        This->vols[i] = 1.f;
-
-    params.result = get_audio_session(sessionguid, This->parent, fmt->nChannels, &This->session);
-    if(FAILED(params.result)) goto end;
-
-    list_add_tail(&This->session->clients, &This->entry);
-
-end:
-    if(FAILED(params.result)){
-        release_params.stream = stream;
-        UNIX_CALL(release_stream, &release_params);
-        HeapFree(GetProcessHeap(), 0, This->vols);
-        This->vols = NULL;
-    }else{
-        This->stream = stream;
-        set_stream_volumes(This);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface,
-        UINT32 *frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_buffer_size_params params;
-
-    TRACE("(%p)->(%p)\n", This, frames);
-
-    if(!frames)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.frames = frames;
-    UNIX_CALL(get_buffer_size, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface,
-        REFERENCE_TIME *out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_latency_params params;
-
-    TRACE("(%p)->(%p)\n", This, out);
-
-    if(!out)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.latency = out;
-    UNIX_CALL(get_latency, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,
-        UINT32 *numpad)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_current_padding_params params;
-
-    TRACE("(%p)->(%p)\n", This, numpad);
-
-    if(!numpad)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.padding = numpad;
-    UNIX_CALL(get_current_padding, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *pwfx,
-        WAVEFORMATEX **outpwfx)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct is_format_supported_params params;
-
-    TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx);
-    if(pwfx) dump_fmt(pwfx);
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.share = mode;
-    params.fmt_in = pwfx;
-    params.fmt_out = NULL;
-
-    if(outpwfx){
-        *outpwfx = NULL;
-        if(mode == AUDCLNT_SHAREMODE_SHARED)
-            params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out));
-    }
-    UNIX_CALL(is_format_supported, &params);
-
-    if(params.result == S_FALSE)
-        *outpwfx = &params.fmt_out->Format;
-    else
-        CoTaskMemFree(params.fmt_out);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface,
-        WAVEFORMATEX **pwfx)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_mix_format_params params;
-
-    TRACE("(%p)->(%p)\n", This, pwfx);
-
-    if(!pwfx)
-        return E_POINTER;
-    *pwfx = NULL;
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
-    if(!params.fmt)
-        return E_OUTOFMEMORY;
-
-    UNIX_CALL(get_mix_format, &params);
-
-    if(SUCCEEDED(params.result)){
-        *pwfx = &params.fmt->Format;
-        dump_fmt(*pwfx);
-    }else
-        CoTaskMemFree(params.fmt);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
-        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_device_period_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
-
-    if (!defperiod && !minperiod)
-        return E_POINTER;
-
-    params.device     = This->device_name;
-    params.flow       = This->dataflow;
-    params.def_period = defperiod;
-    params.min_period = minperiod;
-
-    UNIX_CALL(get_device_period, &params);
-
-    return params.result;
-}
-
-static DWORD WINAPI ca_timer_thread(void *user)
-{
-    struct timer_loop_params params;
-    ACImpl *This = user;
-    params.stream = This->stream;
-    SetThreadDescription(GetCurrentThread(), L"winecoreaudio_timer_loop");
-    UNIX_CALL(timer_loop, &params);
-    return 0;
-}
-
-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-    HRESULT hr;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    UNIX_CALL(start, &params);
-    if(FAILED(hr = params.result))
-        return hr;
-
-    if(!This->timer_thread) {
-        This->timer_thread = CreateThread(NULL, 0, ca_timer_thread, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    UNIX_CALL(stop, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    UNIX_CALL(reset, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
-
-    TRACE("(%p)->(%p)\n", This, event);
-
-    if(!event)
-        return E_INVALIDARG;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event = event;
-    UNIX_CALL(set_event_handle, &params);
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
-        void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    HRESULT hr;
-
-    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    sessions_lock();
-
-    if(IsEqualIID(riid, &IID_IAudioRenderClient)){
-        if(This->dataflow != eRender){
-            hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-            goto end;
-        }
-        IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface);
-        *ppv = &This->IAudioRenderClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){
-        if(This->dataflow != eCapture){
-            hr = AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-            goto end;
-        }
-        IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface);
-        *ppv = &This->IAudioCaptureClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioClock)){
-        IAudioClock_AddRef(&This->IAudioClock_iface);
-        *ppv = &This->IAudioClock_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){
-        IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface);
-        *ppv = &This->IAudioStreamVolume_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                hr = E_OUTOFMEMORY;
-                goto end;
-            }
-        }else
-            IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface);
-
-        *ppv = &This->session_wrapper->IAudioSessionControl2_iface;
-    }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                hr = E_OUTOFMEMORY;
-                goto end;
-            }
-        }else
-            IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->IChannelAudioVolume_iface;
-    }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                hr = E_OUTOFMEMORY;
-                goto end;
-            }
-        }else
-            ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->ISimpleAudioVolume_iface;
-    }
-
-    if(*ppv) hr = S_OK;
-    else{
-        FIXME("stub %s\n", debugstr_guid(riid));
-        hr = E_NOINTERFACE;
-    }
-
-end:
-    sessions_unlock();
-    return hr;
-}
-
-static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient3 *iface,
-        AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable);
-
-    if(!offload_capable)
-        return E_INVALIDARG;
-
-    *offload_capable = FALSE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface,
-        const AudioClientProperties *prop)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop;
-
-    TRACE("(%p)->(%p)\n", This, prop);
-
-    if(!legacy_prop)
-        return E_POINTER;
-
-    if(legacy_prop->cbSize == sizeof(AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory,
-                prop->Options);
-    }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory);
-    }else{
-        WARN("Unsupported Size = %d\n", legacy_prop->cbSize);
-        return E_INVALIDARG;
-    }
-
-
-    if(legacy_prop->bIsOffload)
-        return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
-        REFERENCE_TIME *max_duration)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames,
-        UINT32 *min_period_frames, UINT32 *max_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames,
-            min_period_frames, max_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
-        WAVEFORMATEX **cur_format, UINT32 *cur_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface,
-        DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format,
-        const GUID *session_guid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid));
-
-    return E_NOTIMPL;
-}
-
-static const IAudioClient3Vtbl AudioClient3_Vtbl =
-{
-    AudioClient_QueryInterface,
-    AudioClient_AddRef,
-    AudioClient_Release,
-    AudioClient_Initialize,
-    AudioClient_GetBufferSize,
-    AudioClient_GetStreamLatency,
-    AudioClient_GetCurrentPadding,
-    AudioClient_IsFormatSupported,
-    AudioClient_GetMixFormat,
-    AudioClient_GetDevicePeriod,
-    AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
-    AudioClient_GetService,
-    AudioClient_IsOffloadCapable,
-    AudioClient_SetClientProperties,
-    AudioClient_GetBufferSizeLimits,
-    AudioClient_GetSharedModeEnginePeriod,
-    AudioClient_GetCurrentSharedModeEnginePeriod,
-    AudioClient_InitializeSharedAudioStream,
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;

[PATCH v3 4/4] wineoss: Use mmdevapi's AudioClient.

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/wineoss.drv/mmdevdrv.c | 649 +-----------------------------------
 dlls/wineoss.drv/oss.c      |  24 +-
 2 files changed, 23 insertions(+), 650 deletions(-)

diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index ffc2b2ef544..0dcdd34855a 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -48,8 +48,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(oss);

-#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
-
 typedef struct _OSSDevice {
     struct list entry;
     EDataFlow flow;
@@ -72,9 +70,7 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug =
 static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 };
 static struct list g_sessions = LIST_INIT(g_sessions);

-static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client);
-
-static const IAudioClient3Vtbl AudioClient3_Vtbl;
+extern const IAudioClient3Vtbl AudioClient3_Vtbl;
 extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl;
 extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl;
 extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl;
@@ -94,11 +90,6 @@ void DECLSPEC_HIDDEN sessions_unlock(void)
     LeaveCriticalSection(&g_sessions_lock);
 }

-static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface)
-{
-    return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface);
-}
-
 BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
 {
     switch (reason)
@@ -136,28 +127,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved)
     return TRUE;
 }

-static HRESULT stream_release(stream_handle stream, HANDLE timer_thread)
-{
-    struct release_stream_params params;
-
-    params.stream = stream;
-    params.timer_thread = timer_thread;
-    OSS_CALL(release_stream, &params);
-
-    return params.result;
-}
-
-static DWORD WINAPI timer_thread(void *user)
-{
-    struct timer_loop_params params;
-    ACImpl *This = user;
-
-    params.stream = This->stream;
-    OSS_CALL(timer_loop, &params);
-
-    return 0;
-}
-
 static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name,
         GUID *guid)
 {
@@ -230,17 +199,6 @@ static void get_device_guid(EDataFlow flow, const char *device, GUID *guid)
         RegCloseKey(key);
 }

-static void set_stream_volumes(ACImpl *This)
-{
-    struct set_volumes_params params;
-
-    params.stream = This->stream;
-    params.master_volume = (This->session->mute ? 0.0f : This->session->master_vol);
-    params.volumes = This->vols;
-    params.session_volumes = This->session->channel_vols;
-    OSS_CALL(set_volumes, &params);
-}
-
 static const OSSDevice *get_ossdevice_from_guid(const GUID *guid)
 {
     OSSDevice *dev_item;
@@ -373,97 +331,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev,
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface,
-        REFIID riid, void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-    if(IsEqualIID(riid, &IID_IUnknown) ||
-            IsEqualIID(riid, &IID_IAudioClient) ||
-            IsEqualIID(riid, &IID_IAudioClient2) ||
-            IsEqualIID(riid, &IID_IAudioClient3))
-        *ppv = iface;
-    else if(IsEqualIID(riid, &IID_IMarshal))
-        return IUnknown_QueryInterface(This->marshal, riid, ppv);
-    if(*ppv){
-        IUnknown_AddRef((IUnknown*)*ppv);
-        return S_OK;
-    }
-    WARN("Unknown interface %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static ULONG WINAPI AudioClient_AddRef(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-    ref = InterlockedIncrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    return ref;
-}
-
-static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    ULONG ref;
-
-    ref = InterlockedDecrement(&This->ref);
-    TRACE("(%p) Refcount now %lu\n", This, ref);
-    if(!ref){
-        IAudioClient3_Stop(iface);
-        IMMDevice_Release(This->parent);
-        IUnknown_Release(This->marshal);
-        if(This->session){
-            sessions_lock();
-            list_remove(&This->entry);
-            sessions_unlock();
-        }
-        HeapFree(GetProcessHeap(), 0, This->vols);
-        if(This->stream)
-            stream_release(This->stream, This->timer_thread);
-        HeapFree(GetProcessHeap(), 0, This);
-    }
-    return ref;
-}
-
-static void dump_fmt(const WAVEFORMATEX *fmt)
-{
-    TRACE("wFormatTag: 0x%x (", fmt->wFormatTag);
-    switch(fmt->wFormatTag){
-    case WAVE_FORMAT_PCM:
-        TRACE("WAVE_FORMAT_PCM");
-        break;
-    case WAVE_FORMAT_IEEE_FLOAT:
-        TRACE("WAVE_FORMAT_IEEE_FLOAT");
-        break;
-    case WAVE_FORMAT_EXTENSIBLE:
-        TRACE("WAVE_FORMAT_EXTENSIBLE");
-        break;
-    default:
-        TRACE("Unknown");
-        break;
-    }
-    TRACE(")\n");
-
-    TRACE("nChannels: %u\n", fmt->nChannels);
-    TRACE("nSamplesPerSec: %lu\n", fmt->nSamplesPerSec);
-    TRACE("nAvgBytesPerSec: %lu\n", fmt->nAvgBytesPerSec);
-    TRACE("nBlockAlign: %u\n", fmt->nBlockAlign);
-    TRACE("wBitsPerSample: %u\n", fmt->wBitsPerSample);
-    TRACE("cbSize: %u\n", fmt->cbSize);
-
-    if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
-        WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt;
-        TRACE("dwChannelMask: %08lx\n", fmtex->dwChannelMask);
-        TRACE("Samples: %04x\n", fmtex->Samples.wReserved);
-        TRACE("SubFormat: %s\n", wine_dbgstr_guid(&fmtex->SubFormat));
-    }
-}
-
 static void session_init_vols(AudioSession *session, UINT channels)
 {
     if(session->channel_count < channels){
@@ -543,520 +410,6 @@ HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device,
     return S_OK;
 }

-static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, DWORD flags, REFERENCE_TIME duration,
-        REFERENCE_TIME period, const WAVEFORMATEX *fmt,
-        const GUID *sessionguid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct create_stream_params params;
-    stream_handle stream;
-    unsigned int i;
-
-    TRACE("(%p)->(%x, %lx, %s, %s, %p, %s)\n", This, mode, flags,
-          wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid));
-
-    if(!fmt)
-        return E_POINTER;
-
-    dump_fmt(fmt);
-
-    if(mode != AUDCLNT_SHAREMODE_SHARED && mode != AUDCLNT_SHAREMODE_EXCLUSIVE)
-        return E_INVALIDARG;
-
-    if(flags & ~(AUDCLNT_STREAMFLAGS_CROSSPROCESS |
-                AUDCLNT_STREAMFLAGS_LOOPBACK |
-                AUDCLNT_STREAMFLAGS_EVENTCALLBACK |
-                AUDCLNT_STREAMFLAGS_NOPERSIST |
-                AUDCLNT_STREAMFLAGS_RATEADJUST |
-                AUDCLNT_SESSIONFLAGS_EXPIREWHENUNOWNED |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDE |
-                AUDCLNT_SESSIONFLAGS_DISPLAY_HIDEWHENEXPIRED |
-                AUDCLNT_STREAMFLAGS_SRC_DEFAULT_QUALITY |
-                AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM)){
-        FIXME("Unknown flags: %08lx\n", flags);
-        return E_INVALIDARG;
-    }
-
-    sessions_lock();
-
-    if(This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_ALREADY_INITIALIZED;
-    }
-
-    params.name = NULL;
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.share = mode;
-    params.flags = flags;
-    params.duration = duration;
-    params.period = period;
-    params.fmt = fmt;
-    params.channel_count = NULL;
-    params.stream = &stream;
-
-    OSS_CALL(create_stream, &params);
-    if(FAILED(params.result)){
-        sessions_unlock();
-        return params.result;
-    }
-
-    This->channel_count = fmt->nChannels;
-    This->vols = HeapAlloc(GetProcessHeap(), 0, This->channel_count * sizeof(float));
-    if(!This->vols){
-        params.result = E_OUTOFMEMORY;
-        goto exit;
-    }
-    for(i = 0; i < This->channel_count; ++i)
-        This->vols[i] = 1.f;
-
-    params.result = get_audio_session(sessionguid, This->parent, This->channel_count,
-            &This->session);
-
-exit:
-    if(FAILED(params.result)){
-        stream_release(stream, NULL);
-        HeapFree(GetProcessHeap(), 0, This->vols);
-        This->vols = NULL;
-    } else {
-        list_add_tail(&This->session->clients, &This->entry);
-        This->stream = stream;
-        set_stream_volumes(This);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface,
-        UINT32 *frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_buffer_size_params params;
-
-    TRACE("(%p)->(%p)\n", This, frames);
-
-    if(!frames)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.frames = frames;
-
-    OSS_CALL(get_buffer_size, &params);
-    TRACE("buffer size: %u\n", *frames);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface,
-        REFERENCE_TIME *latency)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_latency_params params;
-
-    TRACE("(%p)->(%p)\n", This, latency);
-
-    if(!latency)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.latency = latency;
-    OSS_CALL(get_latency, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface,
-        UINT32 *numpad)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_current_padding_params params;
-
-    TRACE("(%p)->(%p)\n", This, numpad);
-
-    if(!numpad)
-        return E_POINTER;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.padding = numpad;
-    OSS_CALL(get_current_padding, &params);
-    TRACE("padding: %u\n", *numpad);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface,
-        AUDCLNT_SHAREMODE mode, const WAVEFORMATEX *fmt,
-        WAVEFORMATEX **out)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct is_format_supported_params params;
-
-    TRACE("(%p)->(%x, %p, %p)\n", This, mode, fmt, out);
-    if(fmt) dump_fmt(fmt);
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.share = mode;
-    params.fmt_in = fmt;
-    params.fmt_out = NULL;
-
-    if(out){
-        *out = NULL;
-        if(mode == AUDCLNT_SHAREMODE_SHARED)
-            params.fmt_out = CoTaskMemAlloc(sizeof(*params.fmt_out));
-    }
-    OSS_CALL(is_format_supported, &params);
-
-    if(params.result == S_FALSE)
-        *out = &params.fmt_out->Format;
-    else
-        CoTaskMemFree(params.fmt_out);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface,
-        WAVEFORMATEX **pwfx)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_mix_format_params params;
-
-    TRACE("(%p)->(%p)\n", This, pwfx);
-
-    if(!pwfx)
-        return E_POINTER;
-    *pwfx = NULL;
-
-    params.device = This->device_name;
-    params.flow = This->dataflow;
-    params.fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
-    if(!params.fmt)
-        return E_OUTOFMEMORY;
-
-    OSS_CALL(get_mix_format, &params);
-
-    if(SUCCEEDED(params.result)){
-        *pwfx = &params.fmt->Format;
-        dump_fmt(*pwfx);
-    } else
-        CoTaskMemFree(params.fmt);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
-        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_device_period_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
-
-    if (!defperiod && !minperiod)
-        return E_POINTER;
-
-    params.device     = This->device_name;
-    params.flow       = This->dataflow;
-    params.def_period = defperiod;
-    params.min_period = minperiod;
-
-    OSS_CALL(get_device_period, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-
-    TRACE("(%p)\n", This);
-
-    sessions_lock();
-
-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
-
-    params.stream = This->stream;
-    OSS_CALL(start, &params);
-
-    if(SUCCEEDED(params.result) && !This->timer_thread){
-        This->timer_thread = CreateThread(NULL, 0, timer_thread, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    OSS_CALL(stop, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    OSS_CALL(reset, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
-
-    TRACE("(%p)->(%p)\n", This, event);
-
-    if(!event)
-        return E_INVALIDARG;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event = event;
-    OSS_CALL(set_event_handle, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
-        void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
-
-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
-
-    sessions_lock();
-
-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
-
-    if(IsEqualIID(riid, &IID_IAudioRenderClient)){
-        if(This->dataflow != eRender){
-            sessions_unlock();
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        }
-        IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface);
-        *ppv = &This->IAudioRenderClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){
-        if(This->dataflow != eCapture){
-            sessions_unlock();
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        }
-        IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface);
-        *ppv = &This->IAudioCaptureClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioClock)){
-        IAudioClock_AddRef(&This->IAudioClock_iface);
-        *ppv = &This->IAudioClock_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){
-        IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface);
-        *ppv = &This->IAudioStreamVolume_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface);
-
-        *ppv = &This->session_wrapper->IAudioSessionControl2_iface;
-    }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->IChannelAudioVolume_iface;
-    }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->ISimpleAudioVolume_iface;
-    }
-
-    if(*ppv){
-        sessions_unlock();
-        return S_OK;
-    }
-
-    sessions_unlock();
-
-    FIXME("stub %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
-
-static HRESULT WINAPI AudioClient_IsOffloadCapable(IAudioClient3 *iface,
-        AUDIO_STREAM_CATEGORY category, BOOL *offload_capable)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(0x%x, %p)\n", This, category, offload_capable);
-
-    if(!offload_capable)
-        return E_INVALIDARG;
-
-    *offload_capable = FALSE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_SetClientProperties(IAudioClient3 *iface,
-        const AudioClientProperties *prop)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    const Win8AudioClientProperties *legacy_prop = (const Win8AudioClientProperties *)prop;
-
-    TRACE("(%p)->(%p)\n", This, prop);
-
-    if(!legacy_prop)
-        return E_POINTER;
-
-    if(legacy_prop->cbSize == sizeof(AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x, Options: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory,
-                prop->Options);
-    }else if(legacy_prop->cbSize == sizeof(Win8AudioClientProperties)){
-        TRACE("{ bIsOffload: %u, eCategory: 0x%x }\n",
-                legacy_prop->bIsOffload,
-                legacy_prop->eCategory);
-    }else{
-        WARN("Unsupported Size = %d\n", legacy_prop->cbSize);
-        return E_INVALIDARG;
-    }
-
-
-    if(legacy_prop->bIsOffload)
-        return AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE;
-
-    return S_OK;
-}
-
-static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, BOOL event_driven, REFERENCE_TIME *min_duration,
-        REFERENCE_TIME *max_duration)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %u, %p, %p)\n", This, format, event_driven, min_duration, max_duration);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface,
-        const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames,
-        UINT32 *min_period_frames, UINT32 *max_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames,
-            min_period_frames, max_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface,
-        WAVEFORMATEX **cur_format, UINT32 *cur_period_frames)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames);
-
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface,
-        DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format,
-        const GUID *session_guid)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid));
-
-    return E_NOTIMPL;
-}
-
-static const IAudioClient3Vtbl AudioClient3_Vtbl =
-{
-    AudioClient_QueryInterface,
-    AudioClient_AddRef,
-    AudioClient_Release,
-    AudioClient_Initialize,
-    AudioClient_GetBufferSize,
-    AudioClient_GetStreamLatency,
-    AudioClient_GetCurrentPadding,
-    AudioClient_IsFormatSupported,
-    AudioClient_GetMixFormat,
-    AudioClient_GetDevicePeriod,
-    AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
-    AudioClient_GetService,
-    AudioClient_IsOffloadCapable,
-    AudioClient_SetClientProperties,
-    AudioClient_GetBufferSizeLimits,
-    AudioClient_GetSharedModeEnginePeriod,
-    AudioClient_GetCurrentSharedModeEnginePeriod,
-    AudioClient_InitializeSharedAudioStream,
-};
-
 static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)
 {
     AudioSessionWrapper *ret;
diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c
index df03d3286d9..5049c711e98 100644
--- a/dlls/wineoss.drv/oss.c
+++ b/dlls/wineoss.drv/oss.c
@@ -221,6 +221,13 @@ static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE])
     return;
 }

+static NTSTATUS oss_main_loop(void *args)
+{
+    struct main_loop_params *params = args;
+    NtSetEvent(params->event, NULL);
+    return STATUS_SUCCESS;
+}
+
 static NTSTATUS oss_get_endpoint_ids(void *args)
 {
     struct get_endpoint_ids_params *params = args;
@@ -1684,7 +1691,7 @@ unixlib_entry_t __wine_unix_call_funcs[] =
 {
     oss_not_implemented,
     oss_not_implemented,
-    oss_not_implemented,
+    oss_main_loop,
     oss_get_endpoint_ids,
     oss_create_stream,
     oss_release_stream,
@@ -1738,6 +1745,19 @@ static NTSTATUS oss_wow64_test_connect(void *args)
     return STATUS_SUCCESS;
 }

+static NTSTATUS oss_wow64_main_loop(void *args)
+{
+    struct
+    {
+        PTR32 event;
+    } *params32 = args;
+    struct main_loop_params params =
+    {
+        .event = ULongToHandle(params32->event)
+    };
+    return oss_main_loop(&params);
+}
+
 static NTSTATUS oss_wow64_get_endpoint_ids(void *args)
 {
     struct
@@ -2108,7 +2128,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] =
 {
     oss_not_implemented,
     oss_not_implemented,
-    oss_not_implemented,
+    oss_wow64_main_loop,
     oss_wow64_get_endpoint_ids,
     oss_wow64_create_stream,
     oss_wow64_release_stream,

[PATCH v3 4/4] wineoss: Use mmdevapi's AudioClient.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=133045

Your paranoid android.

=== debian11 (32 bit report) ===

amstream:
amstream: Timeout

qcap:
audiorecord: Timeout

windows.media.speech:
speech: Timeout

winmm:
capture: Timeout
mci: Timeout
wave: Timeout

wmp:
media: Timeout
oleobj: Timeout

xaudio2_7:
xaudio2: Timeout

[Davide Beatrici (＠davidebeatrici)]

On Wed May 24 01:31:36 2023 +0000, Davide Beatrici wrote:
> !2888

Is it good now or should I still split the vtbl?

[Huw Davies (＠huw)]

> Is it good now or should I still split the vtbl?

This is still a lot of things changing, so please try moving a few functions at a time.

[Huw Davies (＠huw)]

Huw Davies (@huw) commented about dlls/mmdevapi/audiosessionmanager.c:
>  LeaveCriticalSection(&g_sessions_lock);
>
> }
>
> +HRESULT get_audio_session(const GUID *sessionguid, IMMDevice *device, UINT channels,
> -
>                      AudioSession **out)
>
> +{
> - (void)sessionguid;

Please don't do this.

[Davide Beatrici (＠davidebeatrici)]

On Thu May 25 06:29:32 2023 +0000, Huw Davies wrote:
> Please don't do this.

Should I just leave the function's body empty?

[Davide Beatrici (＠davidebeatrici)]

On Thu May 25 06:29:31 2023 +0000, Huw Davies wrote:
> > Is it good now or should I still split the vtbl?
>
> This is still a lot of things changing, so please try moving a few
> functions at a time.

How should I do that? I mean, the vtable is fully defined in a single file.

[Huw Davies (＠huw)]

On Thu May 25 06:31:27 2023 +0000, Davide Beatrici wrote:
> Should I just leave the function's body empty?

Yes - this is just a placeholder for now, right?

[Davide Beatrici (＠davidebeatrici)]

On Thu May 25 06:39:04 2023 +0000, Huw Davies wrote:
> Yes - this is just a placeholder for now, right?

Correct.

[Huw Davies (＠huw)]

On Thu May 25 06:33:38 2023 +0000, Davide Beatrici wrote:
> How should I do that? I mean, the vtable is fully defined in a single file.

I'd imagine you could leave the vtbl in the driver for now, but write the function that's moving in `mmdevapi/client.c` and make it temporarily `extern`.

[Davide Beatrici (＠davidebeatrici)]

On Thu May 25 06:41:00 2023 +0000, Huw Davies wrote:
> I'd imagine you could leave the vtbl in the driver for now, but write
> the function that's moving in `mmdevapi/client.c` and make it
> temporarily `extern`.

Alright, that's what I thought.