- Wine-Commits - list.winehq.org

Alexandre Julliard : wineps: Don't use CDECL for private functions.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: ea958228d980831170d6b32530ad78d4fc11f52d URL: https://gitlab.winehq.org/wine/wine/-/commit/ea958228d980831170d6b32530ad78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:06:20 2023 +0200 wineps: Don't use CDECL for private functions. --- dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/bitmap.c | 6 ++-- dlls/wineps.drv/brush.c | 8 ++--- dlls/wineps.drv/color.c | 4 +-- dlls/wineps.drv/escape.c | 10 +++--- dlls/wineps.drv/font.c | 4 +-- dlls/wineps.drv/graphics.c | 42 ++++++++++++------------- dlls/wineps.drv/init.c | 4 +-- dlls/wineps.drv/pen.c | 8 ++--- dlls/wineps.drv/psdrv.h | 78 ++++++++++++++++++++++------------------------ dlls/wineps.drv/text.c | 4 +-- 11 files changed, 84 insertions(+), 86 deletions(-)

1 0

Jacek Caban : win32u: Don't use CDECL for gdi_dc_funcs entries.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 8c5dd2214e0808783d426bb87774495e2708d19f URL: https://gitlab.winehq.org/wine/wine/-/commit/8c5dd2214e0808783d426bb8777449… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 11:11:17 2023 +0200 win32u: Don't use CDECL for gdi_dc_funcs entries. --- dlls/win32u/bitblt.c | 20 ++--- dlls/win32u/dib.c | 12 +-- dlls/win32u/dibdrv/bitblt.c | 26 +++--- dlls/win32u/dibdrv/dc.c | 104 +++++++++++----------- dlls/win32u/dibdrv/dibdrv.h | 90 +++++++++---------- dlls/win32u/dibdrv/graphics.c | 54 ++++++------ dlls/win32u/dibdrv/objects.c | 8 +- dlls/win32u/driver.c | 159 +++++++++++++++++----------------- dlls/win32u/emfdrv.c | 79 ++++++++--------- dlls/win32u/font.c | 51 ++++++----- dlls/win32u/ntgdi_private.h | 74 ++++++++-------- dlls/win32u/painting.c | 20 ++--- dlls/win32u/palette.c | 6 +- dlls/win32u/path.c | 71 ++++++++------- dlls/wineandroid.drv/init.c | 7 +- dlls/winemac.drv/gdi.c | 9 +- dlls/winemac.drv/macdrv.h | 4 +- dlls/wineps.drv/unixlib.c | 22 ++--- dlls/winex11.drv/bitblt.c | 20 ++--- dlls/winex11.drv/brush.c | 4 +- dlls/winex11.drv/graphics.c | 46 +++++----- dlls/winex11.drv/init.c | 17 ++-- dlls/winex11.drv/palette.c | 10 +-- dlls/winex11.drv/pen.c | 4 +- dlls/winex11.drv/x11drv.h | 94 ++++++++++---------- dlls/winex11.drv/x11drv_main.c | 10 +-- dlls/winex11.drv/xrender.c | 45 +++++----- dlls/winex11.drv/xvidmode.c | 16 +--- include/wine/gdi_driver.h | 192 ++++++++++++++++++++--------------------- 29 files changed, 626 insertions(+), 648 deletions(-)

1 0

Jacek Caban : wineps: Don't include gdi_driver.h from PE module.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 7aa109501c095fcf2780e5c22c7086e287767ea2 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aa109501c095fcf2780e5c22c7086… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 31 10:41:38 2023 +0200 wineps: Don't include gdi_driver.h from PE module. --- dlls/win32u/main.c | 1 - dlls/wineps.drv/bitblt.c | 2 +- dlls/wineps.drv/bitmap.c | 8 ++++---- dlls/wineps.drv/brush.c | 2 +- dlls/wineps.drv/pen.c | 2 +- dlls/wineps.drv/printproc.c | 24 +++++++++++----------- dlls/wineps.drv/psdrv.h | 49 ++++++++++++++++++++++++++++++++++++--------- include/wine/gdi_driver.h | 8 ++++---- 8 files changed, 62 insertions(+), 34 deletions(-)

1 0

Alexandre Julliard : include: Only enable the non-inline NtCurrentTeb() on the Unix side.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 56cfbf6b860b46768eeae60eef7dfe0a988c4df3 URL: https://gitlab.winehq.org/wine/wine/-/commit/56cfbf6b860b46768eeae60eef7dfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:27:56 2023 +0200 include: Only enable the non-inline NtCurrentTeb() on the Unix side. --- include/winnt.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 409dbceee59..c0967ac4459 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2357,14 +2357,20 @@ typedef struct _NT_TIB struct _TEB; -#if defined(__i386__) && defined(__GNUC__) && !defined(WINE_UNIX_LIB) +#ifdef WINE_UNIX_LIB +# ifdef __GNUC__ +struct _TEB * WINAPI NtCurrentTeb(void) __attribute__((pure)); +# else +struct _TEB * WINAPI NtCurrentTeb(void); +# endif +#elif defined(__i386__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; __asm__(".byte 0x64\n\tmovl (0x18),%0" : "=r" (teb)); return teb; } -#elif defined(__i386__) && defined(_MSC_VER) && !defined(WINE_UNIX_LIB) +#elif defined(__i386__) && defined(_MSC_VER) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; @@ -2372,34 +2378,34 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm mov teb, eax; return teb; } -#elif defined(__x86_64__) && defined(__GNUC__) && !defined(WINE_UNIX_LIB) +#elif defined(__x86_64__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; __asm__(".byte 0x65\n\tmovq (0x30),%0" : "=r" (teb)); return teb; } -#elif defined(__x86_64__) && defined(_MSC_VER) && !defined(WINE_UNIX_LIB) +#elif defined(__x86_64__) && defined(_MSC_VER) unsigned __int64 __readgsqword(unsigned long); #pragma intrinsic(__readgsqword) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } -#elif defined(__arm__) && defined(__GNUC__) && !defined(WINE_UNIX_LIB) +#elif defined(__arm__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb; __asm__("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb)); return teb; } -#elif defined(__arm__) && defined(_MSC_VER) && !defined(WINE_UNIX_LIB) +#elif defined(__arm__) && defined(_MSC_VER) #pragma intrinsic(_MoveFromCoprocessor) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)_MoveFromCoprocessor(15, 0, 13, 0, 2); } -#elif defined(__aarch64__) && defined(__MINGW32__) +#elif defined(__aarch64__) && defined(__GNUC__) register struct _TEB *__wine_current_teb __asm__("x18"); static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { @@ -2412,10 +2418,8 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { return (struct _TEB *)__getReg(18); } -#elif defined(__GNUC__) -extern struct _TEB * WINAPI NtCurrentTeb(void) __attribute__((pure)); -#else -extern struct _TEB * WINAPI NtCurrentTeb(void); +#elif !defined(RC_INVOKED) +# error You must define NtCurrentTeb() for your architecture #endif #ifdef NONAMELESSUNION

1 0

Martin Storsjö : include: Fix the use of __getReg for aarch64/msvc mode.
by Alexandre Julliard May 31, 2023

May 31, 2023

Module: wine Branch: master Commit: 0fac6bcfa4e607dd7fa475f4663a08bd5c193701 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fac6bcfa4e607dd7fa475f4663a08… Author: Martin Storsjö <martin(a)martin.st> Date: Wed May 31 10:07:50 2023 +0300 include: Fix the use of __getReg for aarch64/msvc mode. Clang requires the __getReg function to be declared in addition to be declared as an intrinsic with the pragma. This fixes the following error: ../wine/include/winnt.h:2412:27: error: call to undeclared library function '__getReg' with type 'unsigned long long (int)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] return (struct _TEB *)__getReg(18); ^ ../wine/include/winnt.h:2412:27: note: include the header <intrin.h> or explicitly provide a declaration for '__getReg' 1 error generated. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/winnt.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnt.h b/include/winnt.h index 0117100a921..409dbceee59 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2406,6 +2406,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) return __wine_current_teb; } #elif defined(__aarch64__) && defined(_MSC_VER) +unsigned __int64 __getReg(int); #pragma intrinsic(__getReg) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) {

1 0

Rémi Bernon : imm32: Query the new input context in ImmAssociateContextEx / IACE_DEFAULT.
by Alexandre Julliard May 30, 2023

May 30, 2023

Module: wine Branch: master Commit: 7ed63c30e8dee3509c52e11230470be2dcfe6cf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ed63c30e8dee3509c52e11230470b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 30 11:01:17 2023 +0200 imm32: Query the new input context in ImmAssociateContextEx / IACE_DEFAULT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54991 --- dlls/imm32/imm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c2cd5415e98..cc843ce4a8e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1038,6 +1038,7 @@ BOOL WINAPI ImmAssociateContextEx( HWND hwnd, HIMC new_himc, DWORD flags ) ret = NtUserAssociateInputContext( hwnd, new_himc, flags ); if (ret == AICR_FOCUS_CHANGED) { + if (flags == IACE_DEFAULT) new_himc = NtUserGetWindowInputContext( hwnd ); ImmSetActiveContext( hwnd, old_himc, FALSE ); ImmSetActiveContext( hwnd, new_himc, TRUE ); if (hwnd == GetFocus()) set_ime_ui_window_himc( new_himc );

1 0

Davide Beatrici : wineoss: Use mmdevapi's AudioClient3.
by Alexandre Julliard May 30, 2023

May 30, 2023

Module: wine Branch: master Commit: 11cc7af2e6d53120c2786eeac4f4d1e9a4394ca6 URL: https://gitlab.winehq.org/wine/wine/-/commit/11cc7af2e6d53120c2786eeac4f4d1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri May 26 23:04:10 2023 +0200 wineoss: Use mmdevapi's AudioClient3. --- dlls/wineoss.drv/mmdevdrv.c | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9537a2f92fc..ef6eb77a9cf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -999,38 +999,16 @@ static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface, +extern 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) -{ - 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); + UINT32 *min_period_frames, UINT32 *max_period_frames); - FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); +extern HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, + WAVEFORMATEX **cur_format, UINT32 *cur_period_frames); - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface, +extern HRESULT WINAPI client_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; -} + const GUID *session_guid); static const IAudioClient3Vtbl AudioClient3_Vtbl = { @@ -1052,9 +1030,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsOffloadCapable, AudioClient_SetClientProperties, AudioClient_GetBufferSizeLimits, - AudioClient_GetSharedModeEnginePeriod, - AudioClient_GetCurrentSharedModeEnginePeriod, - AudioClient_InitializeSharedAudioStream, + client_GetSharedModeEnginePeriod, + client_GetCurrentSharedModeEnginePeriod, + client_InitializeSharedAudioStream, }; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)

1 0

Gabriel Ivăncescu : mshtml: Handle protocols with no ports when checking target origin.
by Alexandre Julliard May 30, 2023

May 30, 2023

Module: wine Branch: master Commit: 0db9f33b7df9ea089fab8080c3a0309165c0a9a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0db9f33b7df9ea089fab8080c3a030… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 30 19:44:13 2023 +0300 mshtml: Handle protocols with no ports when checking target origin. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6c550172d68..c6072c7e9fa 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3161,6 +3161,7 @@ static HRESULT WINAPI window_private_matchMedia(IWineHTMLWindowPrivate *iface, B static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_origin) { + BOOL no_port = FALSE; IUri *uri, *target; DWORD port, port2; BSTR bstr, bstr2; @@ -3219,11 +3220,20 @@ static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_ goto done; hres = IUri_GetPort(uri, &port); - if(hres != S_OK) - goto done; + if(hres != S_OK) { + if(FAILED(hres)) + goto done; + no_port = TRUE; /* some protocols don't have ports (e.g. res) */ + } hres = IUri_GetPort(target, &port2); - if(hres == S_OK && port != port2) + if(hres != S_OK) { + if(FAILED(hres)) + goto done; + if(no_port) + hres = S_OK; + }else if(no_port || port != port2) { hres = S_FALSE; + } done: IUri_Release(target);

1 0

Eric Pouech : dbghelp: Better handle very long C++ qualified identifiers in dwarf.
by Alexandre Julliard May 30, 2023

May 30, 2023

Module: wine Branch: master Commit: 542ccaaf8459133cbb552b7e969d5e1143150eb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/542ccaaf8459133cbb552b7e969d5e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue May 30 19:03:08 2023 +0200 dbghelp: Better handle very long C++ qualified identifiers in dwarf. This fixes some crashes especially when dealing with very long C++ names (like template classes). Fortunately, dwarf internals don't require type lookup by name (eg. on forward declaration), so the impact of thrashing some names is limited. It's very likely native doesn't store directly these very long names (it could either store the qualified mangled name - which can be way shorter for template classes - or use the names in lexical hierarchy: both boil down to storing less information, and recompute it (unmangle or class hierarchy walk) upon request). But this would need a proper C++ support in dbghelp. Not for today. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dwarf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1402ffcb941..46da2968dbb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1177,7 +1177,10 @@ static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name } if (!di->unit_ctx->cpp_name) + { di->unit_ctx->cpp_name = pool_alloc(&di->unit_ctx->pool, MAX_SYM_NAME); + if (!di->unit_ctx->cpp_name) return name; + } last = di->unit_ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; strcpy(last, name); @@ -1194,7 +1197,11 @@ static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name { size_t len = strlen(diname.u.string); last -= 2 + len; - if (last < di->unit_ctx->cpp_name) return NULL; + if (last < di->unit_ctx->cpp_name) + { + WARN("Too long C++ qualified identifier for %s... using unqualified identifier\n", name); + return name; + } memcpy(last, diname.u.string, len); last[len] = last[len + 1] = ':'; }

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient3.
by Alexandre Julliard May 30, 2023

May 30, 2023

Module: wine Branch: master Commit: f10b5dcb8a2c9d5533416c5c5de0eaf108e5bf9a URL: https://gitlab.winehq.org/wine/wine/-/commit/f10b5dcb8a2c9d5533416c5c5de0ea… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri May 26 23:03:02 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient3. --- dlls/winecoreaudio.drv/mmdevdrv.c | 40 +++++++++------------------------------ 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 0372e320680..66f7b658e24 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1001,38 +1001,16 @@ static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface, +extern 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) -{ - 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); + UINT32 *min_period_frames, UINT32 *max_period_frames); - FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); +extern HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, + WAVEFORMATEX **cur_format, UINT32 *cur_period_frames); - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface, +extern HRESULT WINAPI client_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; -} + const GUID *session_guid); static const IAudioClient3Vtbl AudioClient3_Vtbl = { @@ -1054,9 +1032,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsOffloadCapable, AudioClient_SetClientProperties, AudioClient_GetBufferSizeLimits, - AudioClient_GetSharedModeEnginePeriod, - AudioClient_GetCurrentSharedModeEnginePeriod, - AudioClient_InitializeSharedAudioStream, + client_GetSharedModeEnginePeriod, + client_GetCurrentSharedModeEnginePeriod, + client_InitializeSharedAudioStream, }; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)

1 0