June 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : d3d11/tests: Read back directly from the mipmap texture in test_generate_mips().
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 0135114951e722d714589bdadc88e69c46a668ad URL: https://gitlab.winehq.org/wine/wine/-/commit/0135114951e722d714589bdadc88e6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 14 16:21:40 2023 -0500 d3d11/tests: Read back directly from the mipmap texture in test_generate_mips(). This is far simpler than drawing with it. The immediate motivation here is that the DXGI_FORMAT_R8G8B8A8_UINT test causes a validation error when drawing, since the shader declares its resource as a float4 texture, which does not match the UINT view format. This could be fixed by using a different shader, but it seems more prudent to just simplify the test to not draw at all. --- dlls/d3d11/tests/d3d11.c | 162 +++++------------------------------------------ 1 file changed, 16 insertions(+), 146 deletions(-)

1 0

Zebediah Figura : d3d10core/tests: Read back directly from the mipmap texture in test_generate_mips().
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 9f2cf25c2def844d127c78aa91f4f14edc92f934 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f2cf25c2def844d127c78aa91f4f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 14 17:02:06 2023 -0500 d3d10core/tests: Read back directly from the mipmap texture in test_generate_mips(). This is far simpler than drawing with it. The immediate motivation here is that the DXGI_FORMAT_R8G8B8A8_UINT test causes a validation error when drawing, since the shader declares its resource as a float4 texture, which does not match the UINT view format. This could be fixed by using a different shader, but it seems more prudent to just simplify the test to not draw at all. --- dlls/d3d10core/tests/d3d10core.c | 255 ++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 152 deletions(-)

1 0

Paul Gofman : crypt32/tests: Test CertCreateSelfSignCertificate() without provider info.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: e647719eb0f13fb7abb63a86c59477a53310f28d URL: https://gitlab.winehq.org/wine/wine/-/commit/e647719eb0f13fb7abb63a86c59477… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 26 16:32:35 2023 -0600 crypt32/tests: Test CertCreateSelfSignCertificate() without provider info. --- dlls/crypt32/tests/cert.c | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 83594560efa..ac0987e76bd 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2167,17 +2167,44 @@ static void testCreateSelfSignCert(void) HCRYPTPROV csp; BOOL ret; HCRYPTKEY key; - CRYPT_KEY_PROV_INFO info; + CRYPT_KEY_PROV_INFO info, *ret_info; + DWORD size; /* This crashes: - context = CertCreateSelfSignCertificate(0, NULL, 0, NULL, NULL, NULL, NULL, - NULL); - * Calling this with no first parameter creates a new key container, which - * lasts beyond the test, so I don't test that. Nb: the generated key - * name is a GUID. - context = CertCreateSelfSignCertificate(0, &name, 0, NULL, NULL, NULL, NULL, - NULL); - */ + context = CertCreateSelfSignCertificate(0, NULL, 0, NULL, NULL, NULL, NULL, NULL); */ + + /* Test CSP created by implementation without CSP or CSP parameters provided. */ + context = CertCreateSelfSignCertificate(0, &name, 0, NULL, NULL, NULL, NULL, NULL); + ok(!!context, "failed, error %#lx.\n", GetLastError()); + size = 0; + ret = CertGetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret_info = malloc(size); + ok(!!ret_info, "memory allocation failed.\n"); + ret = CertGetCertificateContextProperty(context, CERT_KEY_PROV_INFO_PROP_ID, ret_info, &size); + ok(ret, "failed, error %#lx.\n", GetLastError()); + CertFreeCertificateContext(context); + ok(ret_info->dwKeySpec == AT_SIGNATURE, "got %#lx.\n", ret_info->dwKeySpec); + ok(!ret_info->dwFlags, "got %#lx.\n", ret_info->dwFlags); + ok(ret_info->pwszContainerName && *ret_info->pwszContainerName, "got %s.\n", + debugstr_w(ret_info->pwszContainerName)); + ret = CryptAcquireContextW(&csp, ret_info->pwszContainerName, ret_info->pwszProvName, ret_info->dwProvType, 0); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret = CryptGetUserKey(csp, AT_SIGNATURE, &key); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret = CryptDestroyKey(key); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ret = CryptGetUserKey(csp, AT_KEYEXCHANGE, &key); + ok(!ret && GetLastError() == NTE_NO_KEY, "got ret %d, error %#lx.\n", ret, GetLastError()); + CryptReleaseContext(csp, 0); + csp = 0xdeadbeef; + ret = CryptAcquireContextW(&csp, ret_info->pwszContainerName, ret_info->pwszProvName, + ret_info->dwProvType, CRYPT_DELETEKEYSET); + ok(ret, "failed, error %#lx.\n", GetLastError()); + ok(!csp, "got %p.\n", (void *)csp); + ret = CryptAcquireContextW(&csp, ret_info->pwszContainerName, ret_info->pwszProvName, ret_info->dwProvType, 0); + ok(!ret && GetLastError() == NTE_BAD_KEYSET, "got ret %d, error %#lx.\n", ret, GetLastError()); + free(ret_info); /* Acquire a CSP */ CryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Paul Gofman : Revert "crypt32: Do not create persistent container in CRYPT_CreateKeyProv().".
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 7861b1e8f005c73d5fb8d58384f0cd31597fc479 URL: https://gitlab.winehq.org/wine/wine/-/commit/7861b1e8f005c73d5fb8d58384f0cd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 26 15:32:53 2023 -0600 Revert "crypt32: Do not create persistent container in CRYPT_CreateKeyProv().". This reverts commit a19c8712917042361208b8a4a0a503e06815d20a. --- dlls/crypt32/cert.c | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index ec3cf5b15ec..b9645770ce1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3682,21 +3682,54 @@ static void CRYPT_MakeCertInfo(PCERT_INFO info, const CRYPT_DATA_BLOB *pSerialNu } } +typedef RPC_STATUS (RPC_ENTRY *UuidCreateFunc)(UUID *); +typedef RPC_STATUS (RPC_ENTRY *UuidToStringFunc)(UUID *, unsigned char **); +typedef RPC_STATUS (RPC_ENTRY *RpcStringFreeFunc)(unsigned char **); + static HCRYPTPROV CRYPT_CreateKeyProv(void) { - HCRYPTPROV prov; - HCRYPTKEY key; + HCRYPTPROV hProv = 0; + HMODULE rpcrt = LoadLibraryW(L"rpcrt4"); - if (!CryptAcquireContextA(&prov, NULL, MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_NEWKEYSET)) - return 0; - - if (!CryptGenKey(prov, AT_SIGNATURE, 0, &key)) + if (rpcrt) { - CryptReleaseContext(prov, 0); - return 0; + UuidCreateFunc uuidCreate = (UuidCreateFunc)GetProcAddress(rpcrt, + "UuidCreate"); + UuidToStringFunc uuidToString = (UuidToStringFunc)GetProcAddress(rpcrt, + "UuidToStringA"); + RpcStringFreeFunc rpcStringFree = (RpcStringFreeFunc)GetProcAddress( + rpcrt, "RpcStringFreeA"); + + if (uuidCreate && uuidToString && rpcStringFree) + { + UUID uuid; + RPC_STATUS status = uuidCreate(&uuid); + + if (status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY) + { + unsigned char *uuidStr; + + status = uuidToString(&uuid, &uuidStr); + if (status == RPC_S_OK) + { + BOOL ret = CryptAcquireContextA(&hProv, (LPCSTR)uuidStr, + MS_DEF_PROV_A, PROV_RSA_FULL, CRYPT_NEWKEYSET); + + if (ret) + { + HCRYPTKEY key; + + ret = CryptGenKey(hProv, AT_SIGNATURE, 0, &key); + if (ret) + CryptDestroyKey(key); + } + rpcStringFree(&uuidStr); + } + } + } + FreeLibrary(rpcrt); } - CryptDestroyKey(key); - return prov; + return hProv; } PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HANDLE hProv,

1 0

Alex Henrie : dbghelp: Allocate real_path with the CRT and copy it to the module heap.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 00df1bea9a965695bff48541b57b6791a58fd02d URL: https://gitlab.winehq.org/wine/wine/-/commit/00df1bea9a965695bff48541b57b67… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jun 26 20:39:27 2023 -0600 dbghelp: Allocate real_path with the CRT and copy it to the module heap. Fixes both a memory leak and an alloc/free mismatch, and the module heap is the most appropriate place to hold the variable long-term. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 1 - dlls/dbghelp/pe_module.c | 76 ++++++++++++++++++++---------------------- dlls/dbghelp/storage.c | 7 ++++ 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1ceefcdbde6..1ce221a0f27 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -44,6 +44,7 @@ void pool_destroy(struct pool* a) DECLSPEC_HIDDEN; void* pool_alloc(struct pool* a, size_t len) __WINE_ALLOC_SIZE(2) __WINE_MALLOC DECLSPEC_HIDDEN; void* pool_realloc(struct pool* a, void* ptr, size_t len) __WINE_ALLOC_SIZE(3) DECLSPEC_HIDDEN; char* pool_strdup(struct pool* a, const char* str) __WINE_MALLOC DECLSPEC_HIDDEN; +WCHAR* pool_wcsdup(struct pool* a, const WCHAR* str) __WINE_MALLOC DECLSPEC_HIDDEN; struct vector { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index bae4a77f16e..1493d3006cc 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1068,7 +1068,6 @@ BOOL module_remove(struct process* pcs, struct module* module) hash_table_destroy(&module->ht_types); HeapFree(GetProcessHeap(), 0, module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); - HeapFree(GetProcessHeap(), 0, module->real_path); pool_destroy(&module->pool); /* native dbghelp doesn't invoke registered callback(,CBA_SYMBOLS_UNLOADED,) here * so do we diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 3364498e0c7..6c07bf5826a 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -760,13 +760,10 @@ struct builtin_search static BOOL search_builtin_pe(void *param, HANDLE handle, const WCHAR *path) { struct builtin_search *search = param; - size_t size; if (!pe_map_file(handle, &search->fmap, DMT_PE)) return FALSE; - size = (lstrlenW(path) + 1) * sizeof(WCHAR); - if ((search->path = heap_alloc(size))) - memcpy(search->path, path, size); + search->path = wcsdup(path); return TRUE; } @@ -818,47 +815,48 @@ struct module* pe_load_native_module(struct process* pcs, const WCHAR* name, } if (name) lstrcpyW(loaded_name, name); } - if (!(modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) - return NULL; - modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); - if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) + + if ((modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(struct module_format) + sizeof(struct pe_module_info)))) { - struct builtin_search builtin = { NULL }; - if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && - search_dll_path(pcs, loaded_name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine, search_builtin_pe, &builtin)) - { - TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); - image_unmap_file(&modfmt->u.pe_info->fmap); - modfmt->u.pe_info->fmap = builtin.fmap; - real_path = builtin.path; - } - if (!base) base = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); - if (!size) size = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, SizeOfImage); - - module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, - modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp, - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, CheckSum), - modfmt->u.pe_info->fmap.u.pe.file_header.Machine); - if (module) - { - module->real_path = real_path; - modfmt->module = module; - modfmt->remove = pe_module_remove; - modfmt->loc_compute = NULL; - module->format_info[DFI_PE] = modfmt; - module->reloc_delta = base - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); - } - else + modfmt->u.pe_info = (struct pe_module_info*)(modfmt + 1); + if (pe_map_file(hFile, &modfmt->u.pe_info->fmap, DMT_PE)) { - ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); - heap_free(real_path); - image_unmap_file(&modfmt->u.pe_info->fmap); + struct builtin_search builtin = { NULL }; + if (opened && modfmt->u.pe_info->fmap.u.pe.builtin && + search_dll_path(pcs, loaded_name, modfmt->u.pe_info->fmap.u.pe.file_header.Machine, search_builtin_pe, &builtin)) + { + TRACE("reloaded %s from %s\n", debugstr_w(loaded_name), debugstr_w(builtin.path)); + image_unmap_file(&modfmt->u.pe_info->fmap); + modfmt->u.pe_info->fmap = builtin.fmap; + real_path = builtin.path; + } + if (!base) base = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); + if (!size) size = PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, SizeOfImage); + + module = module_new(pcs, loaded_name, DMT_PE, FALSE, base, size, + modfmt->u.pe_info->fmap.u.pe.file_header.TimeDateStamp, + PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, CheckSum), + modfmt->u.pe_info->fmap.u.pe.file_header.Machine); + if (module) + { + module->real_path = real_path ? pool_wcsdup(&module->pool, real_path) : NULL; + modfmt->module = module; + modfmt->remove = pe_module_remove; + modfmt->loc_compute = NULL; + module->format_info[DFI_PE] = modfmt; + module->reloc_delta = base - PE_FROM_OPTHDR(&modfmt->u.pe_info->fmap, ImageBase); + } + else + { + ERR("could not load the module '%s'\n", debugstr_w(loaded_name)); + image_unmap_file(&modfmt->u.pe_info->fmap); + } } + if (!module) HeapFree(GetProcessHeap(), 0, modfmt); } - if (!module) HeapFree(GetProcessHeap(), 0, modfmt); if (opened) CloseHandle(hFile); - + free(real_path); return module; } diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index daed3aa8d99..038b625cf1c 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -55,6 +55,13 @@ char* pool_strdup(struct pool* pool, const char* str) return ret; } +WCHAR* pool_wcsdup(struct pool* pool, const WCHAR* str) +{ + WCHAR* ret; + if ((ret = pool_alloc(pool, (wcslen(str) + 1) * sizeof(WCHAR)))) wcscpy(ret, str); + return ret; +} + void vector_init(struct vector* v, unsigned esz, unsigned bucket_sz) { v->buckets = NULL;

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's QueryInterface.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 39cc4fcc954d44a70d1d0e66d1469830b800f5e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/39cc4fcc954d44a70d1d0e66d14698… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:33:51 2023 +0200 wineoss: Use mmdevapi's AudioClient's QueryInterface. --- dlls/wineoss.drv/mmdevdrv.c | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dabbb829b11..48c600b089f 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -341,29 +341,8 @@ 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; -} +extern HRESULT WINAPI client_QueryInterface(IAudioClient3 *iface, + REFIID riid, void **ppv); extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); @@ -507,7 +486,7 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { - AudioClient_QueryInterface, + client_QueryInterface, client_AddRef, client_Release, client_Initialize,

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient's Release, AddRef.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 71500094c43b40c8ade4410c15148e4506563db7 URL: https://gitlab.winehq.org/wine/wine/-/commit/71500094c43b40c8ade4410c15148e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:25:23 2023 +0200 wineoss: Use mmdevapi's AudioClient's Release, AddRef. --- dlls/wineoss.drv/mmdevdrv.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 15e4308e67a..dabbb829b11 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -85,8 +85,6 @@ extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; -extern HRESULT stream_release(stream_handle stream, HANDLE timer_thread); - void DECLSPEC_HIDDEN sessions_lock(void) { EnterCriticalSection(&g_sessions_lock); @@ -367,38 +365,9 @@ static HRESULT WINAPI AudioClient_QueryInterface(IAudioClient3 *iface, 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; -} +extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); -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(); - } - free(This->vols); - if(This->stream) - stream_release(This->stream, This->timer_thread); - HeapFree(GetProcessHeap(), 0, This); - } - return ref; -} +extern ULONG WINAPI client_Release(IAudioClient3 *iface); static void session_init_vols(AudioSession *session, UINT channels) { @@ -539,8 +508,8 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { AudioClient_QueryInterface, - AudioClient_AddRef, - AudioClient_Release, + client_AddRef, + client_Release, client_Initialize, client_GetBufferSize, client_GetStreamLatency,

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient's QueryInterface.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: 79f960f6df58dff127e37a514bad52943da40f97 URL: https://gitlab.winehq.org/wine/wine/-/commit/79f960f6df58dff127e37a514bad52… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:33:26 2023 +0200 winealsa: Use mmdevapi's AudioClient's QueryInterface. --- dlls/winealsa.drv/mmdevdrv.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index fee1c196186..507613e71ad 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -363,30 +363,8 @@ 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; -} +extern HRESULT WINAPI client_QueryInterface(IAudioClient3 *iface, + REFIID riid, void **ppv); extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); @@ -530,7 +508,7 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { - AudioClient_QueryInterface, + client_QueryInterface, client_AddRef, client_Release, client_Initialize,

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient's QueryInterface.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: b064a7dcc1708f2a3107246df7ff0b0f29c7de57 URL: https://gitlab.winehq.org/wine/wine/-/commit/b064a7dcc1708f2a3107246df7ff0b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:33:41 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient's QueryInterface. --- dlls/winecoreaudio.drv/mmdevdrv.c | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2762abb7552..f4e3416dcc6 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -359,30 +359,8 @@ 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; -} +extern HRESULT WINAPI client_QueryInterface(IAudioClient3 *iface, + REFIID riid, void **ppv); extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); @@ -526,7 +504,7 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { - AudioClient_QueryInterface, + client_QueryInterface, client_AddRef, client_Release, client_Initialize,

1 0

Davide Beatrici : winepulse: Move AudioClient's QueryInterface into mmdevapi.
by Alexandre Julliard June 27, 2023

June 27, 2023

Module: wine Branch: master Commit: ab33114c69672e4f8d149f9d7ca3a1f728833d8d URL: https://gitlab.winehq.org/wine/wine/-/commit/ab33114c69672e4f8d149f9d7ca3a1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 26 23:33:00 2023 +0200 winepulse: Move AudioClient's QueryInterface into mmdevapi. --- dlls/mmdevapi/client.c | 25 +++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 31 +++---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index bec3e440b7c..8779ae1dc23 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -406,6 +406,31 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = capture_GetNextPacketSize }; +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; +} + ULONG WINAPI client_AddRef(IAudioClient3 *iface) { struct audio_client *This = impl_from_IAudioClient3(iface); diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index cdf5920d985..abde1c80b2a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -377,33 +377,8 @@ 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; -} +extern HRESULT WINAPI client_QueryInterface(IAudioClient3 *iface, + REFIID riid, void **ppv); extern ULONG WINAPI client_AddRef(IAudioClient3 *iface); @@ -547,7 +522,7 @@ extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, static const IAudioClient3Vtbl AudioClient3_Vtbl = { - AudioClient_QueryInterface, + client_QueryInterface, client_AddRef, client_Release, client_Initialize,

1 0