- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : include: Add appnotify.h file.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 4ce24eb9be5c7f2896a91d1d554b20f2b8266d3f URL: https://gitlab.winehq.org/wine/wine/-/commit/4ce24eb9be5c7f2896a91d1d554b20… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue Apr 18 14:03:09 2023 -0400 include: Add appnotify.h file. --- include/Makefile.in | 1 + include/appnotify.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 7a6e5d62763..c957fed884c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -19,6 +19,7 @@ SOURCES = \ appcompatapi.h \ appmgmt.h \ appmodel.h \ + appnotify.h \ asferr.h \ asptlb.idl \ asyncinfo.idl \ diff --git a/include/appnotify.h b/include/appnotify.h new file mode 100644 index 00000000000..882b0342afb --- /dev/null +++ b/include/appnotify.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 _WINE_APISET_PSMAPPNOTIFY_H_ +#define _WINE_APISET_PSMAPPNOTIFY_H_ + +#include <windows.h> + +#ifdef _CONTRACT_GEN +#define PSM_APP_API_HOST +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(PSM_APP_API_HOST) +#define APICONTRACT +#else +#define APICONTRACT DECLSPEC_IMPORT +#endif + +typedef void (__cdecl *PAPPSTATE_CHANGE_ROUTINE)(BOOLEAN quiesced, void *context); + +typedef struct _APPSTATE_REGISTRATION *PAPPSTATE_REGISTRATION; + +APICONTRACT ULONG NTAPI RegisterAppStateChangeNotification(PAPPSTATE_CHANGE_ROUTINE,void *,PAPPSTATE_REGISTRATION *); +APICONTRACT void NTAPI UnregisterAppStateChangeNotification(PAPPSTATE_REGISTRATION); + +#ifdef __cplusplus +} +#endif + +#endif /* _WINE_APISET_PSMAPPNOTIFY_H_ */

1 0

Piotr Caban : wineps: Reset memory DC state on every page.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 537c9655e0fc3c5a12ff3475da6e0368b5d52893 URL: https://gitlab.winehq.org/wine/wine/-/commit/537c9655e0fc3c5a12ff3475da6e03… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 11:03:25 2023 +0200 wineps: Reset memory DC state on every page. --- dlls/wineps.drv/printproc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 69ee1041b69..914fc23f69e 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -3003,6 +3003,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, static BOOL print_metafile(struct pp_data *data, HANDLE hdata) { + XFORM xform = { .eM11 = 1, .eM22 = 1 }; record_hdr header; HENHMETAFILE hmf; BYTE *buf; @@ -3038,6 +3039,20 @@ static BOOL print_metafile(struct pp_data *data, HANDLE hdata) if (!hmf) return FALSE; + AbortPath(data->pdev->dev.hdc); + SetBkColor(data->pdev->dev.hdc, RGB(255, 255, 255)); + SetBkMode(data->pdev->dev.hdc, OPAQUE); + SetMapMode(data->pdev->dev.hdc, MM_TEXT); + SetPolyFillMode(data->pdev->dev.hdc, ALTERNATE); + SetROP2(data->pdev->dev.hdc, R2_COPYPEN); + SetStretchBltMode(data->pdev->dev.hdc, BLACKONWHITE); + SetTextAlign(data->pdev->dev.hdc, TA_LEFT | TA_TOP); + SetTextColor(data->pdev->dev.hdc, 0); + SetTextJustification(data->pdev->dev.hdc, 0, 0); + SetWorldTransform(data->pdev->dev.hdc, &xform); + PSDRV_SetTextColor(&data->pdev->dev, 0); + PSDRV_SetBkColor(&data->pdev->dev, RGB(255, 255, 255)); + ret = EnumEnhMetaFile(NULL, hmf, hmf_proc, (void *)data, NULL); DeleteEnhMetaFile(hmf); free(data->patterns); @@ -3133,9 +3148,6 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data) data->pdev->dev.next = &data->font_dev; data->font_dev.funcs = &font_funcs; data->font_dev.hdc = hdc; - - PSDRV_SetTextColor(&data->pdev->dev, GetTextColor(hdc)); - PSDRV_SetBkColor(&data->pdev->dev, GetBkColor(hdc)); return (HANDLE)data; }

1 0

Piotr Caban : wineps: Continue printing if path drawing function returns error.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 9b98c90e6e573d41e770948db57fe4944f37212e URL: https://gitlab.winehq.org/wine/wine/-/commit/9b98c90e6e573d41e770948db57fe4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 10:46:47 2023 +0200 wineps: Continue printing if path drawing function returns error. --- dlls/wineps.drv/printproc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index af76b76a2ba..69ee1041b69 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2605,11 +2605,14 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, handle_count); } case EMR_FILLPATH: - return PSDRV_FillPath(&data->pdev->dev); + PSDRV_FillPath(&data->pdev->dev); + return 1; case EMR_STROKEANDFILLPATH: - return PSDRV_StrokeAndFillPath(&data->pdev->dev); + PSDRV_StrokeAndFillPath(&data->pdev->dev); + return 1; case EMR_STROKEPATH: - return PSDRV_StrokePath(&data->pdev->dev); + PSDRV_StrokePath(&data->pdev->dev); + return 1; case EMR_ABORTPATH: { data->path = FALSE;

1 0

Piotr Caban : wineps: Fix default device font selection.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 4216179eaa75a12a48d96567b599be0af79e75d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4216179eaa75a12a48d96567b599be… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 24 18:52:04 2023 +0200 wineps: Fix default device font selection. --- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/printproc.c | 2 ++ dlls/wineps.drv/psdrv.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 779abf1c98b..01cfa07e591 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -92,7 +92,7 @@ static const PSDRV_DEVMODE DefaultDevmode = HINSTANCE PSDRV_hInstance = 0; HANDLE PSDRV_Heap = 0; -static HFONT PSDRV_DefaultFont = 0; +HFONT PSDRV_DefaultFont = 0; static const LOGFONTA DefaultLogFont = { 100, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, "" diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 0169873ceaf..af76b76a2ba 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1134,6 +1134,8 @@ static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, if (i & 0x80000000) { *pattern = NULL; + if ((i & 0x7fffffff) == DEVICE_DEFAULT_FONT) + return PSDRV_DefaultFont; return GetStockObject(i & 0x7fffffff); } *pattern = data->patterns + i; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 9817128fc70..81cb0206e7e 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -417,6 +417,7 @@ extern const UNICODEGLYPH PSDRV_AGLbyUV[] DECLSPEC_HIDDEN; /* duplicates inc extern HINSTANCE PSDRV_hInstance DECLSPEC_HIDDEN; extern HANDLE PSDRV_Heap DECLSPEC_HIDDEN; extern char *PSDRV_ANSIVector[256] DECLSPEC_HIDDEN; +extern HFONT PSDRV_DefaultFont DECLSPEC_HIDDEN; extern INPUTSLOT *find_slot( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN; extern PAGESIZE *find_pagesize( PPD *ppd, const PSDRV_DEVMODE *dm ) DECLSPEC_HIDDEN;

1 0

Vova Mshanetskiy : winhttp: Avoid unnecessary cast in connect_query_option().
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 8f5aece0ce396ecf5171027c126500f51787428f URL: https://gitlab.winehq.org/wine/wine/-/commit/8f5aece0ce396ecf5171027c126500… Author: Vova Mshanetskiy <vovams163(a)gmail.com> Date: Tue Apr 25 00:01:54 2023 +0300 winhttp: Avoid unnecessary cast in connect_query_option(). --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 69320bf8ee7..978bf28bc37 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -383,7 +383,7 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void { if (!validate_buffer( buffer, buflen, sizeof(HINTERNET) )) return FALSE; - *(HINTERNET *)buffer = ((struct object_header *)connect->session)->handle; + *(HINTERNET *)buffer = connect->session->hdr.handle; *buflen = sizeof(HINTERNET); return TRUE; }

1 0

Vova Mshanetskiy : winhttp: Support WINHTTP_OPTION_PARENT_HANDLE in request_query_option().
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 8bba759156f2e0e8e89aae162c916d9620ea70d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bba759156f2e0e8e89aae162c916d… Author: Vova Mshanetskiy <vovams163(a)gmail.com> Date: Mon Apr 24 23:59:36 2023 +0300 winhttp: Support WINHTTP_OPTION_PARENT_HANDLE in request_query_option(). --- dlls/winhttp/session.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 6b426bee220..69320bf8ee7 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -737,6 +737,14 @@ static BOOL request_query_option( struct object_header *hdr, DWORD option, void switch (option) { + case WINHTTP_OPTION_PARENT_HANDLE: + { + if (!validate_buffer( buffer, buflen, sizeof(HINTERNET) )) return FALSE; + + *(HINTERNET *)buffer = request->connect->hdr.handle; + *buflen = sizeof(HINTERNET); + return TRUE; + } case WINHTTP_OPTION_SECURITY_FLAGS: { DWORD flags;

1 0

Davide Beatrici : winepulse: Use dedicated macros to call interface functions.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 8d9c12723fab27a35223f335d0a8d20a864ce801 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d9c12723fab27a35223f335d0a8d2… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:45:41 2023 +0200 winepulse: Use dedicated macros to call interface functions. --- dlls/winepulse.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 12d67c45c4f..920d7a964eb 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1391,13 +1391,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1886,7 +1886,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->client = client; if (client) { ret->session = client->session; - AudioClient_AddRef(&client->IAudioClient3_iface); + IAudioClient3_AddRef(&client->IAudioClient3_iface); } return ret; @@ -1932,7 +1932,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) if (!ref) { if (This->client) { This->client->session_wrapper = NULL; - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -2156,13 +2156,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2279,13 +2279,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0

Davide Beatrici : wineoss: Use dedicated macros to call interface functions.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 22018db18df57131dda6618119867344fc8e335c URL: https://gitlab.winehq.org/wine/wine/-/commit/22018db18df57131dda66181198673… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:45:27 2023 +0200 wineoss: Use dedicated macros to call interface functions. --- dlls/wineoss.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ccabbf352a7..5a27f9e09bf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1147,13 +1147,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1459,7 +1459,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->client = client; if(client){ ret->session = client->session; - AudioClient_AddRef(&client->IAudioClient3_iface); + IAudioClient3_AddRef(&client->IAudioClient3_iface); } return ret; @@ -1507,7 +1507,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) sessions_lock(); This->client->session_wrapper = NULL; sessions_unlock(); - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -1732,13 +1732,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2011,13 +2011,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0

Davide Beatrici : winealsa: Use dedicated macros to call interface functions.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 687d5019abfc6b4bbe4d0dae4e5e7337c7eb16fa URL: https://gitlab.winehq.org/wine/wine/-/commit/687d5019abfc6b4bbe4d0dae4e5e73… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:44:30 2023 +0200 winealsa: Use dedicated macros to call interface functions. --- dlls/winealsa.drv/mmdevdrv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 049abd53f41..cab960cd838 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1191,13 +1191,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1510,7 +1510,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) ret->client = client; if(client){ ret->session = client->session; - AudioClient_AddRef(&client->IAudioClient3_iface); + IAudioClient3_AddRef(&client->IAudioClient3_iface); } return ret; @@ -1558,7 +1558,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) sessions_lock(); This->client->session_wrapper = NULL; sessions_unlock(); - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -1783,13 +1783,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2065,13 +2065,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0

Davide Beatrici : winecoreaudio: Use dedicated macros to call interface functions.
by Alexandre Julliard April 25, 2023

April 25, 2023

Module: wine Branch: master Commit: 93fae6885b5d2444587469d151a9c4ea6c8b60eb URL: https://gitlab.winehq.org/wine/wine/-/commit/93fae6885b5d2444587469d151a9c4… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat Apr 22 00:45:14 2023 +0200 winecoreaudio: Use dedicated macros to call interface functions. --- dlls/winecoreaudio.drv/mmdevdrv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 0ec1fc63c60..dc492d4affe 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1156,13 +1156,13 @@ static HRESULT WINAPI AudioRenderClient_QueryInterface( static ULONG WINAPI AudioRenderClient_AddRef(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_AddRef(&This->IAudioClient3_iface); + return IAudioClient3_AddRef(&This->IAudioClient3_iface); } static ULONG WINAPI AudioRenderClient_Release(IAudioRenderClient *iface) { ACImpl *This = impl_from_IAudioRenderClient(iface); - return AudioClient_Release(&This->IAudioClient3_iface); + return IAudioClient3_Release(&This->IAudioClient3_iface); } static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, @@ -1509,7 +1509,7 @@ static ULONG WINAPI AudioSessionControl_Release(IAudioSessionControl2 *iface) if(!ref){ if(This->client){ This->client->session_wrapper = NULL; - AudioClient_Release(&This->client->IAudioClient3_iface); + IAudioClient3_Release(&This->client->IAudioClient3_iface); } HeapFree(GetProcessHeap(), 0, This); } @@ -1736,13 +1736,13 @@ static HRESULT WINAPI SimpleAudioVolume_QueryInterface( static ULONG WINAPI SimpleAudioVolume_AddRef(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI SimpleAudioVolume_Release(ISimpleAudioVolume *iface) { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( @@ -2016,13 +2016,13 @@ static HRESULT WINAPI ChannelAudioVolume_QueryInterface( static ULONG WINAPI ChannelAudioVolume_AddRef(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_AddRef(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_AddRef(&This->IAudioSessionControl2_iface); } static ULONG WINAPI ChannelAudioVolume_Release(IChannelAudioVolume *iface) { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); - return AudioSessionControl_Release(&This->IAudioSessionControl2_iface); + return IAudioSessionControl2_Release(&This->IAudioSessionControl2_iface); } static HRESULT WINAPI ChannelAudioVolume_GetChannelCount(

1 0