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

Piotr Caban : include: Add ddk/winddi.h header.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 7a15c777b1f630ef15041ec3449cf4f5417d5630 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a15c777b1f630ef15041ec3449cf4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 14 18:55:37 2023 +0200 include: Add ddk/winddi.h header. --- include/Makefile.in | 1 + include/ddk/winddi.h | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 0dae4cab2bf..e9f0aa8d5fb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -213,6 +213,7 @@ SOURCES = \ ddk/usbioctl.h \ ddk/usbiodef.h \ ddk/wdm.h \ + ddk/winddi.h \ ddk/winddiui.h \ ddk/winsplp.h \ ddk/wsk.h \ diff --git a/include/ddk/winddi.h b/include/ddk/winddi.h new file mode 100644 index 00000000000..8f3a38e0b84 --- /dev/null +++ b/include/ddk/winddi.h @@ -0,0 +1,100 @@ +/* + * Definitions for Graphics Device Drivers interface + * + * Copyright 2023 Piotr Caban + * + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINDDI_ +#define _WINDDI_ + +typedef LONG PTRDIFF; +typedef SHORT FWORD; + +#define FM_SEL_ITALIC 0x1 +#define FM_SEL_UNDERSCORE 0x2 +#define FM_SEL_NEGATIVE 0x4 +#define FM_SEL_OUTLINED 0x8 +#define FM_SEL_STRIKEOUT 0x10 +#define FM_SEL_BOLD 0x20 +#define FM_SEL_REGULAR 0x40 + +typedef struct _IFIMETRICS { + ULONG cjThis; + ULONG cjIfiExtra; + PTRDIFF dpwszFamilyName; + PTRDIFF dpwszStyleName; + PTRDIFF dpwszFaceName; + PTRDIFF dpwszUniqueName; + PTRDIFF dpFontSim; + LONG lEmbedId; + LONG lItalicAngle; + LONG lCharBias; + PTRDIFF dpCharSets; + BYTE jWinCharSet; + BYTE jWinPitchAndFamily; + USHORT usWinWeight; + ULONG flInfo; + USHORT fsSelection; + USHORT fsType; + FWORD fwdUnitsPerEm; + FWORD fwdLowestPPEm; + FWORD fwdWinAscender; + FWORD fwdWinDescender; + FWORD fwdMacAscender; + FWORD fwdMacDescender; + FWORD fwdMacLineGap; + FWORD fwdTypoAscender; + FWORD fwdTypoDescender; + FWORD fwdTypoLineGap; + FWORD fwdAveCharWidth; + FWORD fwdMaxCharInc; + FWORD fwdCapHeight; + FWORD fwdXHeight; + FWORD fwdSubscriptXSize; + FWORD fwdSubscriptYSize; + FWORD fwdSubscriptXOffset; + FWORD fwdSubscriptYOffset; + FWORD fwdSuperscriptXSize; + FWORD fwdSuperscriptYSize; + FWORD fwdSuperscriptXOffset; + FWORD fwdSuperscriptYOffset; + FWORD fwdUnderscoreSize; + FWORD fwdUnderscorePosition; + FWORD fwdStrikeoutSize; + FWORD fwdStrikeoutPosition; + BYTE chFirstChar; + BYTE chLastChar; + BYTE chDefaultChar; + BYTE chBreakChar; + WCHAR wcFirstChar; + WCHAR wcLastChar; + WCHAR wcDefaultChar; + WCHAR wcBreakChar; + POINTL ptlBaseline; + POINTL ptlAspect; + POINTL ptlCaret; + RECTL rclFontBox; + BYTE achVendId[4]; + ULONG cKerningPairs; + ULONG ulPanoseCulture; + PANOSE panose; +#ifdef _WIN64 + PVOID Align; +#endif +} IFIMETRICS, *PIFIMETRICS; + +#endif /* _WINDDI_ */

1 0

Piotr Caban : wineps: Store builtin fonts list in DEVMODE.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: b55576b6c37bbf4c566912069bd97d5f00e066fa URL: https://gitlab.winehq.org/wine/wine/-/commit/b55576b6c37bbf4c566912069bd97d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun May 14 14:45:28 2023 +0200 wineps: Store builtin fonts list in DEVMODE. --- dlls/wineps.drv/init.c | 16 ++++++++++++++-- dlls/wineps.drv/psdrv.h | 1 + dlls/wineps.drv/unixlib.h | 5 +++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0da75ac60c9..7c2b71b46dd 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -503,11 +503,12 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) WCHAR *ppd_filename = NULL; char *nameA = NULL; BOOL using_default_devmode = FALSE; - int i, len, input_slots, resolutions, page_sizes, font_subs, size; + int i, len, input_slots, resolutions, page_sizes, font_subs, installed_fonts, size; struct input_slot *dm_slot; struct resolution *dm_res; struct page_size *dm_page; struct font_sub *dm_sub; + struct installed_font *dm_font; INPUTSLOT *slot; RESOLUTION *res; PAGESIZE *page; @@ -551,11 +552,13 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) resolutions = list_count( &pi->ppd->Resolutions ); page_sizes = list_count( &pi->ppd->PageSizes ); font_subs = pi->FontSubTableSize; + installed_fonts = list_count( &pi->ppd->InstalledFonts ); size = FIELD_OFFSET(PSDRV_DEVMODE, data[ input_slots * sizeof(struct input_slot) + resolutions * sizeof(struct resolution) + page_sizes * sizeof(struct page_size) + - font_subs * sizeof(struct font_sub)]); + font_subs * sizeof(struct font_sub) + + installed_fonts * sizeof(struct installed_font)]); pi->Devmode = get_devmode( hPrinter, name, &using_default_devmode, size ); if (!pi->Devmode) goto fail; @@ -590,6 +593,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Devmode->input_slots = input_slots; pi->Devmode->resolutions = resolutions; pi->Devmode->page_sizes = page_sizes; + pi->Devmode->font_subs = font_subs; + pi->Devmode->installed_fonts = installed_fonts; dm_slot = (struct input_slot *)pi->Devmode->data; LIST_FOR_EACH_ENTRY( slot, &pi->ppd->InputSlots, INPUTSLOT, entry ) @@ -637,6 +642,13 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) lstrcpynW(dm_sub->sub, (WCHAR *)pi->FontSubTable[i].pData, ARRAY_SIZE(dm_sub->sub)); dm_sub++; } + + dm_font = (struct installed_font *)dm_sub; + LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) + { + lstrcpynA(dm_font->name, font->Name, ARRAY_SIZE(dm_font->name)); + dm_font++; + } } /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields. diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 29ce1e80d9d..1d6ff1c69dc 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -228,6 +228,7 @@ typedef struct { int resolutions; int page_sizes; int font_subs; + int installed_fonts; BYTE data[1]; } PSDRV_DEVMODE; diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index a3b1a233a4e..9c56452585b 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -66,6 +66,11 @@ struct font_sub WCHAR sub[LF_FACESIZE]; }; +struct installed_font +{ + char name[LF_FACESIZE]; +}; + /* Unix calls */ enum wineps_funcs {

1 0

Rémi Bernon : mf/tests: Release PROPVARIANT memory in check_attributes (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: ac393df4b5729f3772fa79ff24a4e0bb44a3f46c URL: https://gitlab.winehq.org/wine/wine/-/commit/ac393df4b5729f3772fa79ff24a4e0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 11 21:28:19 2023 +0200 mf/tests: Release PROPVARIANT memory in check_attributes (Valgrind). --- dlls/mf/tests/transform.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 34a00526eab..b7d8c088870 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -278,6 +278,7 @@ void check_attributes_(const char *file, int line, IMFAttributes *attributes, todo_wine_if(desc[i].todo_value) ok_(file, line)(ret == 0, "%s mismatch, type %u, value %s\n", debugstr_a(desc[i].name), value.vt, buffer); + PropVariantClear(&value); } }

1 0

Rémi Bernon : mf/tests: Avoid leaking media types in test_video_processor (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: f85c5f1c3a21b071d866aa1aefdd855ca2c91795 URL: https://gitlab.winehq.org/wine/wine/-/commit/f85c5f1c3a21b071d866aa1aefdd85… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 11 21:32:33 2023 +0200 mf/tests: Avoid leaking media types in test_video_processor (Valgrind). --- dlls/mf/tests/transform.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index b7d8c088870..ec9be42d8c8 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -6504,7 +6504,10 @@ static void test_video_processor(void) || IsEqualGUID(&expect_available_inputs[i], &MFAudioFormat_MPEG) || IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_420O) || IsEqualGUID(&expect_available_inputs[i], &MFVideoFormat_A16B16G16R16F) /* w1064v1507 */) + { + IMFMediaType_Release(media_type); continue; + } winetest_push_context("in %lu", i); ok(hr == S_OK, "GetInputAvailableType returned %#lx\n", hr);

1 0

Rémi Bernon : rtworkq: Release thread pool work object when work_item is destroyed (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: cfff3306049af5f29a168489cf8fe791b1d493d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfff3306049af5f29a168489cf8fe7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 12 09:38:47 2023 +0200 rtworkq: Release thread pool work object when work_item is destroyed (Valgrind). --- dlls/rtworkq/queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/rtworkq/queue.c b/dlls/rtworkq/queue.c index d6c28ca4566..baf648bf771 100644 --- a/dlls/rtworkq/queue.c +++ b/dlls/rtworkq/queue.c @@ -131,6 +131,7 @@ struct work_item RTWQWORKITEM_KEY key; LONG priority; DWORD flags; + TP_WORK *work_object; PTP_SIMPLE_CALLBACK finalization_callback; union { @@ -374,7 +375,6 @@ static void pool_queue_submit(struct queue *queue, struct work_item *item) { TP_CALLBACK_PRIORITY callback_priority; TP_CALLBACK_ENVIRON_V3 env; - TP_WORK *work_object; if (item->priority == 0) callback_priority = TP_CALLBACK_PRIORITY_NORMAL; @@ -389,8 +389,8 @@ static void pool_queue_submit(struct queue *queue, struct work_item *item) we need finalization callback. */ if (item->finalization_callback) IUnknown_AddRef(&item->IUnknown_iface); - work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&env); - SubmitThreadpoolWork(work_object); + item->work_object = CreateThreadpoolWork(standard_queue_worker, item, (TP_CALLBACK_ENVIRON *)&env); + SubmitThreadpoolWork(item->work_object); TRACE("dispatched %p.\n", item->result); } @@ -551,6 +551,8 @@ static ULONG WINAPI work_item_Release(IUnknown *iface) if (!refcount) { + if (item->work_object) + CloseThreadpoolWork(item->work_object); if (item->reply_result) IRtwqAsyncResult_Release(item->reply_result); IRtwqAsyncResult_Release(item->result);

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioRenderClient.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 446a8f143a8318718769853ef62c3e0b05913917 URL: https://gitlab.winehq.org/wine/wine/-/commit/446a8f143a8318718769853ef62c3e… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:12:46 2023 +0200 winecoreaudio: Use mmdevapi's AudioRenderClient. --- dlls/winecoreaudio.drv/mmdevdrv.c | 86 +-------------------------------------- 1 file changed, 1 insertion(+), 85 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 4c3fcbc5897..756aab93f71 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -52,7 +52,7 @@ static const REFERENCE_TIME DefaultPeriod = 100000; static const REFERENCE_TIME MinimumPeriod = 50000; static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -90,11 +90,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1092,85 +1087,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(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_IAudioRenderClient)) - *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 AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if(!data) - return E_POINTER; - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - UNIX_CALL(get_render_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, frames, flags); - - params.stream = This->stream; - params.written_frames = frames; - params.flags = flags; - UNIX_CALL(release_render_buffer, &params); - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioRenderClient.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 7d7da2efb111fe7318a45891730be84b2b97a6f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d7da2efb111fe7318a45891730be8… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:13:06 2023 +0200 wineoss: Use mmdevapi's AudioRenderClient. --- dlls/wineoss.drv/mmdevdrv.c | 88 +-------------------------------------------- 1 file changed, 1 insertion(+), 87 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 323e96359c4..dac5790e384 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -78,7 +78,7 @@ static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -102,11 +102,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1084,87 +1079,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(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_IAudioRenderClient)) - *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 AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if(!data) - return E_POINTER; - - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - OSS_CALL(get_render_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); - - params.stream = This->stream; - params.written_frames = written_frames; - params.flags = flags; - OSS_CALL(release_render_buffer, &params); - - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : winepulse: Move AudioRenderClient into mmdevapi.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 4f5913e0c0aef66cff4a80a538de5270c01cf4da URL: https://gitlab.winehq.org/wine/wine/-/commit/4f5913e0c0aef66cff4a80a538de52… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:10:09 2023 +0200 winepulse: Move AudioRenderClient into mmdevapi. --- dlls/mmdevapi/client.c | 93 +++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 91 +----------------------------------------- 2 files changed, 94 insertions(+), 90 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index 8c75c7d80a2..ea279da34a1 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -63,6 +63,11 @@ static inline struct audio_client *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, struct audio_client, IAudioClock2_iface); } +static inline struct audio_client *impl_from_IAudioRenderClient(IAudioRenderClient *iface) +{ + return CONTAINING_RECORD(iface, struct audio_client, IAudioRenderClient_iface); +} + static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolume *iface) { return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface); @@ -336,6 +341,94 @@ const IAudioClock2Vtbl AudioClock2_Vtbl = clock2_GetDevicePosition }; +static HRESULT WINAPI render_QueryInterface(IAudioRenderClient *iface, REFIID riid, void **ppv) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if (!ppv) + return E_POINTER; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAudioRenderClient)) + *ppv = iface; + else if (IsEqualIID(riid, &IID_IMarshal)) { + return IUnknown_QueryInterface(This->marshal, riid, ppv); + } else { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*ppv); + + return S_OK; +} + +static ULONG WINAPI render_AddRef(IAudioRenderClient *iface) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); +} + +static ULONG WINAPI render_Release(IAudioRenderClient *iface) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); +} + +static HRESULT WINAPI render_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + struct get_render_buffer_params params; + + TRACE("(%p)->(%u, %p)\n", This, frames, data); + + if (!data) + return E_POINTER; + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + *data = NULL; + + params.stream = This->stream; + params.frames = frames; + params.data = data; + + WINE_UNIX_CALL(get_render_buffer, &params); + + return params.result; +} + +static HRESULT WINAPI render_ReleaseBuffer(IAudioRenderClient *iface, UINT32 written_frames, + DWORD flags) +{ + struct audio_client *This = impl_from_IAudioRenderClient(iface); + struct release_render_buffer_params params; + + TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); + + if (!This->stream) + return AUDCLNT_E_NOT_INITIALIZED; + + params.stream = This->stream; + params.written_frames = written_frames; + params.flags = flags; + + WINE_UNIX_CALL(release_render_buffer, &params); + + return params.result; +} + +const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { + render_QueryInterface, + render_AddRef, + render_Release, + render_GetBuffer, + render_ReleaseBuffer +}; + static HRESULT WINAPI streamvolume_QueryInterface(IAudioStreamVolume *iface, REFIID riid, void **ppv) { diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 04a5fb81eb0..9ec0e3b7f46 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -125,7 +125,7 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) } static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -141,11 +141,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - static void pulse_call(enum unix_funcs code, void *params) { NTSTATUS status; @@ -1332,90 +1327,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(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_IAudioRenderClient)) - *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 AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if (!data) - return E_POINTER; - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - pulse_call(get_render_buffer, &params); - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); - - if (!This->stream) - return AUDCLNT_E_NOT_INITIALIZED; - - params.stream = This->stream; - params.written_frames = written_frames; - params.flags = flags; - pulse_call(release_render_buffer, &params); - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioRenderClient.
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: 69b4dfbc7fbbe8a57f6349075c33914095dbd6a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/69b4dfbc7fbbe8a57f6349075c3391… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Tue May 16 03:12:28 2023 +0200 winealsa: Use mmdevapi's AudioRenderClient. --- dlls/winealsa.drv/mmdevdrv.c | 90 +------------------------------------------- 1 file changed, 1 insertion(+), 89 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index c743d33c116..e556bf5d0c1 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -70,7 +70,7 @@ static WCHAR drv_key_devicesW[256]; static const WCHAR guidW[] = {'g','u','i','d',0}; static const IAudioClient3Vtbl AudioClient3_Vtbl; -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; +extern const IAudioRenderClientVtbl AudioRenderClient_Vtbl; extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; @@ -96,11 +96,6 @@ static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClient3_iface); } -static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1127,89 +1122,6 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_InitializeSharedAudioStream, }; -static HRESULT WINAPI AudioRenderClient_QueryInterface( - IAudioRenderClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioRenderClient(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_IAudioRenderClient)) - *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 AudioRenderClient_AddRef(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, - UINT32 frames, BYTE **data) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct get_render_buffer_params params; - - TRACE("(%p)->(%u, %p)\n", This, frames, data); - - if(!data) - return E_POINTER; - *data = NULL; - - params.stream = This->stream; - params.frames = frames; - params.data = data; - - ALSA_CALL(get_render_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( - IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) -{ - ACImpl *This = impl_from_IAudioRenderClient(iface); - struct release_render_buffer_params params; - - TRACE("(%p)->(%u, %lx)\n", This, written_frames, flags); - - params.stream = This->stream; - params.written_frames = written_frames; - params.flags = flags; - - ALSA_CALL(release_render_buffer, &params); - - return params.result; -} - -static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { - AudioRenderClient_QueryInterface, - AudioRenderClient_AddRef, - AudioRenderClient_Release, - AudioRenderClient_GetBuffer, - AudioRenderClient_ReleaseBuffer -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0

Rémi Bernon : dinput/tests: Add a zero-terminator for hardware ids (Valgrind).
by Alexandre Julliard May 16, 2023

May 16, 2023

Module: wine Branch: master Commit: cbbb88f2b4fd5d75eab9093aad07320b66e9f4a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbbb88f2b4fd5d75eab9093aad0732… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 16 14:12:19 2023 +0200 dinput/tests: Add a zero-terminator for hardware ids (Valgrind). --- dlls/dinput/tests/hid.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 87df44ac9a2..9a27f8e93ac 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -591,7 +591,7 @@ static BOOL find_hid_device_path( WCHAR *device_path ) BOOL bus_device_start(void) { - static const WCHAR bus_hardware_id[] = L"WINETEST\\BUS"; + static const WCHAR bus_hardware_ids[] = L"WINETEST\\BUS\0"; SP_DEVINFO_DATA device = {sizeof(SP_DEVINFO_DATA)}; const WCHAR *service_name = L"winetest_bus"; WCHAR path[MAX_PATH], filename[MAX_PATH]; @@ -666,7 +666,7 @@ BOOL bus_device_start(void) ret = SetupDiCreateDeviceInfoW( set, L"root\\winetest\\0", &GUID_NULL, NULL, NULL, 0, &device ); ok( ret, "failed to create device, error %#lx\n", GetLastError() ); - ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)bus_hardware_id, sizeof(bus_hardware_id) ); + ret = SetupDiSetDeviceRegistryPropertyW( set, &device, SPDRP_HARDWAREID, (const BYTE *)bus_hardware_ids, sizeof(bus_hardware_ids) ); ok( ret, "failed to create set hardware ID, error %lu\n", GetLastError() ); ret = SetupDiCallClassInstaller( DIF_REGISTERDEVICE, set, &device ); @@ -677,7 +677,7 @@ BOOL bus_device_start(void) GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); - ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus_hardware_id, path, INSTALLFLAG_FORCE, &need_reboot ); + ret = UpdateDriverForPlugAndPlayDevicesW( NULL, bus_hardware_ids, path, INSTALLFLAG_FORCE, &need_reboot ); ok( ret, "failed to install device, error %lu\n", GetLastError() ); ok( !need_reboot, "expected no reboot necessary\n" );

1 0