July 2022 - Wine-Commits - list.winehq.org

Jacek Caban : win32u: Use syscall interface for window class functions.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 2ebfe2fd55ee73a8d8bc172801080d1ec594bf89 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ebfe2fd55ee73a8d8bc172801080d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 22:08:21 2022 +0200 win32u: Use syscall interface for window class functions. --- dlls/win32u/gdiobj.c | 6 -- dlls/win32u/syscall.c | 6 ++ dlls/win32u/win32u.spec | 12 ++-- dlls/win32u/win32u_private.h | 11 --- dlls/win32u/wrappers.c | 40 ----------- dlls/wow64win/syscall.h | 6 ++ dlls/wow64win/user.c | 161 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 179 insertions(+), 63 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserSystemParametersInfo.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 35a59e07b923e42d9bb391b0fef7acd25a9eb9d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/35a59e07b923e42d9bb391b0fef7ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 25 18:37:52 2022 +0200 win32u: Use syscall interface for NtUserSystemParametersInfo. --- dlls/win32u/gdiobj.c | 2 - dlls/win32u/syscall.c | 2 + dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 3 -- dlls/win32u/wrappers.c | 12 ----- dlls/wow64win/syscall.h | 2 + dlls/wow64win/user.c | 110 +++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 116 insertions(+), 19 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 0ace308c7ca..cb5297c5676 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1143,8 +1143,6 @@ static struct unix_funcs unix_funcs = NtUserReleaseDC, NtUserScrollDC, NtUserSelectPalette, - NtUserSystemParametersInfo, - NtUserSystemParametersInfoForDpi, NtUserUpdateLayeredWindow, SetDIBits, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 54a0e2436b7..532c08ef2e0 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -281,6 +281,8 @@ static void * const syscalls[] = NtUserShowScrollBar, NtUserShowWindow, NtUserShowWindowAsync, + NtUserSystemParametersInfo, + NtUserSystemParametersInfoForDpi, NtUserThunkedMenuInfo, NtUserThunkedMenuItemInfo, NtUserToUnicodeEx, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index e67db13f5c1..979fa8475b2 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1271,8 +1271,8 @@ @ stub NtUserSoundSentry @ stub NtUserStopAndEndInertia @ stub NtUserSwitchDesktop -@ stdcall NtUserSystemParametersInfo(long long ptr long) -@ stdcall NtUserSystemParametersInfoForDpi(long long ptr long long) +@ stdcall -syscall NtUserSystemParametersInfo(long long ptr long) +@ stdcall -syscall NtUserSystemParametersInfoForDpi(long long ptr long long) @ stub NtUserTestForInteractiveUser @ stdcall -syscall NtUserThunkedMenuInfo(long ptr) @ stdcall -syscall NtUserThunkedMenuItemInfo(long long long long ptr ptr) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e1f6b5ba155..d8509c83445 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -195,9 +195,6 @@ struct unix_funcs BOOL (WINAPI *pNtUserScrollDC)( HDC hdc, INT dx, INT dy, const RECT *scroll, const RECT *clip, HRGN ret_update_rgn, RECT *update_rect ); HPALETTE (WINAPI *pNtUserSelectPalette)( HDC hdc, HPALETTE hpal, WORD bkg ); - BOOL (WINAPI *pNtUserSystemParametersInfo)( UINT action, UINT val, PVOID ptr, UINT winini ); - BOOL (WINAPI *pNtUserSystemParametersInfoForDpi)( UINT action, UINT val, PVOID ptr, - UINT winini, UINT dpi ); BOOL (WINAPI *pNtUserUpdateLayeredWindow)( HWND hwnd, HDC hdc_dst, const POINT *pts_dst, const SIZE *size, HDC hdc_src, const POINT *pts_src, COLORREF key, const BLENDFUNCTION *blend, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 57951643399..f331039714e 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -763,18 +763,6 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) return unix_funcs->pNtUserSelectPalette( hdc, hpal, bkg ); } -BOOL WINAPI NtUserSystemParametersInfo( UINT action, UINT val, PVOID ptr, UINT winini ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserSystemParametersInfo( action, val, ptr, winini ); -} - -BOOL WINAPI NtUserSystemParametersInfoForDpi( UINT action, UINT val, PVOID ptr, UINT winini, UINT dpi ) -{ - if (!unix_funcs) return FALSE; - return unix_funcs->pNtUserSystemParametersInfoForDpi( action, val, ptr, winini, dpi ); -} - BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_dst, const SIZE *size, HDC hdc_src, const POINT *pts_src, COLORREF key, const BLENDFUNCTION *blend, DWORD flags, const RECT *dirty ) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 16774a25165..3c59dd00b3e 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -268,6 +268,8 @@ SYSCALL_ENTRY( NtUserShowScrollBar ) \ SYSCALL_ENTRY( NtUserShowWindow ) \ SYSCALL_ENTRY( NtUserShowWindowAsync ) \ + SYSCALL_ENTRY( NtUserSystemParametersInfo ) \ + SYSCALL_ENTRY( NtUserSystemParametersInfoForDpi ) \ SYSCALL_ENTRY( NtUserThunkedMenuInfo ) \ SYSCALL_ENTRY( NtUserThunkedMenuItemInfo ) \ SYSCALL_ENTRY( NtUserToUnicodeEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 5328edd5375..4f54921ff02 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2286,6 +2286,116 @@ NTSTATUS WINAPI wow64_NtUserShowWindowAsync( UINT *args ) return NtUserShowWindowAsync( hwnd, cmd ); } +NTSTATUS WINAPI wow64_NtUserSystemParametersInfo( UINT *args ) +{ + UINT action = get_ulong( &args ); + UINT val = get_ulong( &args ); + void *ptr = get_ptr( &args ); + UINT winini = get_ulong( &args ); + + switch (action) + { + case SPI_GETSERIALKEYS: + if (ptr) + { + struct + { + UINT cbSize; + DWORD dwFlags; + ULONG lpszActivePort; + ULONG lpszPort; + UINT iBaudRate; + UINT iPortState; + UINT iActive; + } *keys32 = ptr; + SERIALKEYSW keys; + + if (keys32->cbSize != sizeof(*keys32)) return FALSE; + keys.cbSize = sizeof(keys); + if (!NtUserSystemParametersInfo( action, val, &keys, winini )) return FALSE; + keys32->dwFlags = keys.dwFlags; + keys32->lpszActivePort = PtrToUlong( keys.lpszActivePort ); + keys32->lpszPort = PtrToUlong( keys.lpszPort ); + keys32->iBaudRate = keys.iBaudRate; + keys32->iPortState = keys.iPortState; + keys32->iActive = keys.iActive; + return TRUE; + } + break; + + case SPI_GETSOUNDSENTRY: + if (ptr) + { + struct + { + UINT cbSize; + DWORD dwFlags; + DWORD iFSTextEffect; + DWORD iFSTextEffectMSec; + DWORD iFSTextEffectColorBits; + DWORD iFSGrafEffect; + DWORD iFSGrafEffectMSec; + DWORD iFSGrafEffectColor; + DWORD iWindowsEffect; + DWORD iWindowsEffectMSec; + ULONG lpszWindowsEffectDLL; + DWORD iWindowsEffectOrdinal; + } *entry32 = ptr; + SOUNDSENTRYW entry; + + if (entry32->cbSize != sizeof(*entry32)) return FALSE; + entry.cbSize = sizeof(entry); + if (!NtUserSystemParametersInfo( action, val, &entry, winini )) return FALSE; + entry32->dwFlags = entry.dwFlags; + entry32->iFSTextEffect = entry.iFSTextEffect; + entry32->iFSTextEffectMSec = entry.iFSTextEffectMSec; + entry32->iFSTextEffectColorBits = entry.iFSTextEffectColorBits; + entry32->iFSGrafEffect = entry.iFSGrafEffect; + entry32->iFSGrafEffectMSec = entry.iFSGrafEffectMSec; + entry32->iFSGrafEffectColor = entry.iFSGrafEffectColor; + entry32->iWindowsEffect = entry.iWindowsEffect; + entry32->iWindowsEffectMSec = entry.iWindowsEffectMSec; + entry32->lpszWindowsEffectDLL = PtrToUlong( entry.lpszWindowsEffectDLL ); + entry32->iWindowsEffectOrdinal = entry.iWindowsEffectOrdinal; + return TRUE; + } + break; + + case SPI_GETHIGHCONTRAST: + if (ptr) + { + struct + { + UINT cbSize; + DWORD dwFlags; + ULONG lpszDefaultScheme; + } *info32 = ptr; + HIGHCONTRASTW info; + + if (info32->cbSize != sizeof(*info32)) return FALSE; + info.cbSize = sizeof(info); + if (!NtUserSystemParametersInfo( action, val, &info, winini )) return FALSE; + info32->dwFlags = info.dwFlags; + info32->lpszDefaultScheme = PtrToUlong( info.lpszDefaultScheme ); + return TRUE; + } + break; + } + + return NtUserSystemParametersInfo( action, val, ptr, winini ); +} + +NTSTATUS WINAPI wow64_NtUserSystemParametersInfoForDpi( UINT *args ) +{ + UINT action = get_ulong( &args ); + UINT val = get_ulong( &args ); + void *ptr = get_ptr( &args ); + UINT winini = get_ulong( &args ); + UINT dpi = get_ulong( &args ); + + return NtUserSystemParametersInfoForDpi( action, val, ptr, winini, dpi ); +} + NTSTATUS WINAPI wow64_NtUserThunkedMenuInfo( UINT *args ) { HMENU menu = get_handle( &args );

1 0

Hugh McMaster : regedit: Free temporary buffer when working with REG_DWORD and REG_QWORD values.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 57f45013d82280e9dabdb754ab638c2c817577de URL: https://gitlab.winehq.org/wine/wine/-/commit/57f45013d82280e9dabdb754ab638c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 26 12:19:43 2022 +1000 regedit: Free temporary buffer when working with REG_DWORD and REG_QWORD values. --- programs/regedit/edit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 537bcbd4541..20a0c32adda 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -104,11 +104,13 @@ static BOOL update_registry_value(HWND hwndDlg, struct edit_params *params) params->size = sizeof(DWORD); params->data = malloc(params->size); swscanf(buf, isDecimal ? L"%lu" : L"%lx", params->data); + free(buf); break; case REG_QWORD: params->size = sizeof(UINT64); params->data = malloc(params->size); swscanf(buf, isDecimal ? L"%I64u" : L"%I64x", params->data); + free(buf); break; case REG_MULTI_SZ: {

1 0

Rémi Bernon : ntdll: Use a block member in large blocks.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 5c98b608e4c26e0216d0012c18374ae6b38511ab URL: https://gitlab.winehq.org/wine/wine/-/commit/5c98b608e4c26e0216d0012c18374a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 29 16:28:34 2022 +0200 ntdll: Use a block member in large blocks. --- dlls/kernel32/tests/heap.c | 1 - dlls/ntdll/heap.c | 120 +++++++++++++++++++++++++++------------------ 2 files changed, 71 insertions(+), 50 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserSetWindow* functions.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 87b8a912a8e42d0643096a420a71a7e0054191a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/87b8a912a8e42d0643096a420a71a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 20:48:21 2022 +0200 win32u: Use syscall interface for NtUserSetWindow* functions. --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 +++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 30 ----------------------------- dlls/wow64win/syscall.h | 5 +++++ dlls/wow64win/user.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 61 insertions(+), 45 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 0c7693d24ed..c5316137df4 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1153,11 +1153,6 @@ static struct unix_funcs unix_funcs = NtUserSetClassWord, NtUserSetLayeredWindowAttributes, NtUserSetParent, - NtUserSetWindowLong, - NtUserSetWindowLongPtr, - NtUserSetWindowPlacement, - NtUserSetWindowRgn, - NtUserSetWindowWord, NtUserShowWindow, NtUserShowWindowAsync, NtUserSystemParametersInfo, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f6b044d8c38..562febcf7e0 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -259,7 +259,12 @@ static void * const syscalls[] = NtUserSetThreadDesktop, NtUserSetTimer, NtUserSetWinEventHook, + NtUserSetWindowLong, + NtUserSetWindowLongPtr, + NtUserSetWindowPlacement, NtUserSetWindowPos, + NtUserSetWindowRgn, + NtUserSetWindowWord, NtUserSetWindowsHookEx, NtUserShowCaret, NtUserShowCursor, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 8ddc4e0c9f7..18eb5e77d9c 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1246,15 +1246,15 @@ @ stub NtUserSetWindowFNID @ stub NtUserSetWindowFeedbackSetting @ stub NtUserSetWindowGroup -@ stdcall NtUserSetWindowLong(long long long long) -@ stdcall NtUserSetWindowLongPtr(long long long long) -@ stdcall NtUserSetWindowPlacement(long ptr) +@ stdcall -syscall NtUserSetWindowLong(long long long long) +@ stdcall -syscall NtUserSetWindowLongPtr(long long long long) +@ stdcall -syscall NtUserSetWindowPlacement(long ptr) @ stdcall -syscall NtUserSetWindowPos(long long long long long long long) -@ stdcall NtUserSetWindowRgn(long long long) +@ stdcall -syscall NtUserSetWindowRgn(long long long) @ stub NtUserSetWindowRgnEx @ stub NtUserSetWindowShowState @ stub NtUserSetWindowStationUser -@ stdcall NtUserSetWindowWord(long long long) +@ stdcall -syscall NtUserSetWindowWord(long long long) @ stub NtUserSetWindowsHookAW @ stdcall -syscall NtUserSetWindowsHookEx(ptr ptr long long ptr long) @ stdcall -syscall NtUserShowCaret(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index aec24b73f53..582facc0ddf 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -209,11 +209,6 @@ struct unix_funcs WORD (WINAPI *pNtUserSetClassWord)( HWND hwnd, INT offset, WORD newval ); BOOL (WINAPI *pNtUserSetLayeredWindowAttributes)( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ); HWND (WINAPI *pNtUserSetParent)( HWND hwnd, HWND parent ); - LONG (WINAPI *pNtUserSetWindowLong)( HWND hwnd, INT offset, LONG newval, BOOL ansi ); - LONG_PTR (WINAPI *pNtUserSetWindowLongPtr)( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); - BOOL (WINAPI *pNtUserSetWindowPlacement)( HWND hwnd, const WINDOWPLACEMENT *wpl ); - int (WINAPI *pNtUserSetWindowRgn)( HWND hwnd, HRGN hrgn, BOOL redraw ); - WORD (WINAPI *pNtUserSetWindowWord)( HWND hwnd, INT offset, WORD newval ); BOOL (WINAPI *pNtUserShowWindow)( HWND hwnd, INT cmd ); BOOL (WINAPI *pNtUserShowWindowAsync)( HWND hwnd, INT cmd ); BOOL (WINAPI *pNtUserSystemParametersInfo)( UINT action, UINT val, PVOID ptr, UINT winini ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index b2b143cc136..290c4a51f1d 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -826,36 +826,6 @@ HWND WINAPI NtUserSetParent( HWND hwnd, HWND parent ) return unix_funcs->pNtUserSetParent( hwnd, parent ); } -LONG WINAPI NtUserSetWindowLong( HWND hwnd, INT offset, LONG newval, BOOL ansi ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserSetWindowLong( hwnd, offset, newval, ansi ); -} - -LONG_PTR WINAPI NtUserSetWindowLongPtr( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserSetWindowLongPtr( hwnd, offset, newval, ansi ); -} - -BOOL WINAPI NtUserSetWindowPlacement( HWND hwnd, const WINDOWPLACEMENT *wpl ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserSetWindowPlacement( hwnd, wpl ); -} - -int WINAPI NtUserSetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserSetWindowRgn( hwnd, hrgn, redraw ); -} - -WORD WINAPI NtUserSetWindowWord( HWND hwnd, INT offset, WORD newval ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtUserSetWindowWord( hwnd, offset, newval ); -} - BOOL WINAPI NtUserShowWindowAsync( HWND hwnd, INT cmd ) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 3a2cdf3f8ec..6a42e1ee7d7 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -246,7 +246,12 @@ SYSCALL_ENTRY( NtUserSetThreadDesktop ) \ SYSCALL_ENTRY( NtUserSetTimer ) \ SYSCALL_ENTRY( NtUserSetWinEventHook ) \ + SYSCALL_ENTRY( NtUserSetWindowLong ) \ + SYSCALL_ENTRY( NtUserSetWindowLongPtr ) \ + SYSCALL_ENTRY( NtUserSetWindowPlacement ) \ SYSCALL_ENTRY( NtUserSetWindowPos ) \ + SYSCALL_ENTRY( NtUserSetWindowRgn ) \ + SYSCALL_ENTRY( NtUserSetWindowWord ) \ SYSCALL_ENTRY( NtUserSetWindowsHookEx ) \ SYSCALL_ENTRY( NtUserShowCaret ) \ SYSCALL_ENTRY( NtUserShowCursor ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index a6acccf5089..12ede1397c1 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1959,6 +1959,34 @@ NTSTATUS WINAPI wow64_NtUserSetWinEventHook( UINT *args ) return HandleToUlong( ret ); } +NTSTATUS WINAPI wow64_NtUserSetWindowLong( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + INT offset = get_ulong( &args ); + LONG newval = get_ulong( &args ); + BOOL ansi = get_ulong( &args ); + + return NtUserSetWindowLong( hwnd, offset, newval, ansi ); +} + +NTSTATUS WINAPI wow64_NtUserSetWindowLongPtr( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + INT offset = get_ulong( &args ); + LONG_PTR newval = get_ulong( &args ); + BOOL ansi = get_ulong( &args ); + + return NtUserSetWindowLongPtr( hwnd, offset, newval, ansi ); +} + +NTSTATUS WINAPI wow64_NtUserSetWindowPlacement( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + const WINDOWPLACEMENT *wpl = get_ptr( &args ); + + return NtUserSetWindowPlacement( hwnd, wpl ); +} + NTSTATUS WINAPI wow64_NtUserSetWindowPos( UINT *args ) { HWND hwnd = get_handle( &args ); @@ -1972,6 +2000,24 @@ NTSTATUS WINAPI wow64_NtUserSetWindowPos( UINT *args ) return NtUserSetWindowPos( hwnd, after, x, y, cx, cy, flags ); } +NTSTATUS WINAPI wow64_NtUserSetWindowRgn( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + HRGN hrgn = get_handle( &args ); + BOOL redraw = get_ulong( &args ); + + return NtUserSetWindowRgn( hwnd, hrgn, redraw ); +} + +NTSTATUS WINAPI wow64_NtUserSetWindowWord( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + INT offset = get_ulong( &args ); + WORD newval = get_ulong( &args ); + + return NtUserSetWindowWord( hwnd, offset, newval ); +} + NTSTATUS WINAPI wow64_NtUserSetWindowsHookEx( UINT *args ) { HINSTANCE inst = get_handle( &args );

1 0

Jacek Caban : win32u: Use syscall interface for scroll bar functions.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: c660d37ae725531ef0accce504adebd2b19a2687 URL: https://gitlab.winehq.org/wine/wine/-/commit/c660d37ae725531ef0accce504adeb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 20:39:00 2022 +0200 win32u: Use syscall interface for scroll bar functions. --- dlls/win32u/gdiobj.c | 4 ---- dlls/win32u/syscall.c | 4 ++++ dlls/win32u/win32u.spec | 8 ++++---- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 24 ------------------------ dlls/wow64win/syscall.h | 4 ++++ dlls/wow64win/user.c | 37 +++++++++++++++++++++++++++++++++++++ 7 files changed, 49 insertions(+), 36 deletions(-)

1 0

Giovanni Mascellani : mfplat/tests: Merge and reorganize image format tests.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: a04e890f3751a3c324303b178f45444605351abb URL: https://gitlab.winehq.org/wine/wine/-/commit/a04e890f3751a3c324303b178f4544… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 14 12:43:26 2022 +0200 mfplat/tests: Merge and reorganize image format tests. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 262 +++++++++++++++++++-------------------------- 1 file changed, 113 insertions(+), 149 deletions(-)

1 0

Giovanni Mascellani : mfplat/tests: Mark some tests as broken on Win 8 and 10 v1507.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 51835957d029d0b82f1a043e3e221f8b13ec2043 URL: https://gitlab.winehq.org/wine/wine/-/commit/51835957d029d0b82f1a043e3e221f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 29 12:35:17 2022 +0200 mfplat/tests: Mark some tests as broken on Win 8 and 10 v1507. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7b5e4d1c680..375947da028 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6431,6 +6431,7 @@ static void test_MFCreateDXSurfaceBuffer(void) DWORD length, max_length; IDirect3DDevice9 *device; IMF2DBuffer2 *_2dbuffer2; + BOOL value, broken_test; IMFMediaBuffer *buffer; IMF2DBuffer *_2dbuffer; BYTE *data, *data2; @@ -6439,7 +6440,6 @@ static void test_MFCreateDXSurfaceBuffer(void) HWND window; HRESULT hr; LONG pitch; - BOOL value; if (!pMFCreateDXSurfaceBuffer) { @@ -6512,7 +6512,9 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, NULL, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(length == max_length, "Unexpected length %lu instead of %lu.\n", length, max_length); + /* Broken on Windows 8 and 10 v1507 */ + broken_test = length == 0; + ok(length == max_length || broken(broken_test), "Unexpected length %lu instead of %lu.\n", length, max_length); /* You can lock the surface while the media buffer is locked. */ hr = IDirect3DSurface9_LockRect(backbuffer, &locked_rect, NULL, 0); @@ -6529,7 +6531,7 @@ static void test_MFCreateDXSurfaceBuffer(void) /* Unlock twice. */ hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#lx.\n", hr); @@ -6546,7 +6548,7 @@ static void test_MFCreateDXSurfaceBuffer(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2dbuffer); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -6618,9 +6620,9 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(data[0] == 0xab, "Unexpected leading byte.\n"); + ok(data[0] == 0xab || broken(broken_test), "Unexpected leading byte.\n"); hr = IMFMediaBuffer_Unlock(buffer); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(broken_test), "Unexpected hr %#lx.\n", hr); hr = IMF2DBuffer2_Lock2DSize(_2dbuffer2, MF2DBuffer_LockFlags_ReadWrite, &data, &pitch, &data2, &length); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Hugh McMaster : gitlab: Build-Depend on libfreetype-dev.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 3d0358fa546146182a7fb7887b230144917b1a1f URL: https://gitlab.winehq.org/wine/wine/-/commit/3d0358fa546146182a7fb7887b2301… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 26 18:36:26 2022 +1000 gitlab: Build-Depend on libfreetype-dev. libfreetype6-dev is a transitional package on Debian Bullseye. --- tools/gitlab/image.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/gitlab/image.docker b/tools/gitlab/image.docker index b1835d6dd55..b3191079dee 100644 --- a/tools/gitlab/image.docker +++ b/tools/gitlab/image.docker @@ -19,7 +19,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ libcups2-dev:amd64 libcups2-dev:i386 \ libdbus-1-dev:amd64 libdbus-1-dev:i386 \ libfontconfig-dev:amd64 libfontconfig-dev:i386 \ - libfreetype6-dev:amd64 libfreetype6-dev:i386 \ + libfreetype-dev:amd64 libfreetype-dev:i386 \ libgl1-mesa-dev:amd64 libgl1-mesa-dev:i386 \ libgnutls28-dev:amd64 libgnutls28-dev:i386 \ libgphoto2-dev:amd64 libgphoto2-dev:i386 \

1 0

David Kahurani : riched20: Remove duplicate code.
by Alexandre Julliard July 26, 2022

July 26, 2022

Module: wine Branch: master Commit: 3588479e1a674e5f43f1acb9e7c0aa8cecf98f25 URL: https://gitlab.winehq.org/wine/wine/-/commit/3588479e1a674e5f43f1acb9e7c0aa… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Jul 25 22:18:22 2022 +0300 riched20: Remove duplicate code. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/riched20/run.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index f6e6f08d12a..f01f61c181a 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -902,9 +902,8 @@ void ME_GetCharFormat( ME_TextEditor *editor, const ME_Cursor *from, run_copy_char_fmt( run, &tmp ); assert((tmp.dwMask & dwAttribs) == dwAttribs); - /* reset flags that differ */ - if (fmt->yHeight != tmp.yHeight) fmt->dwMask &= ~CFM_SIZE; + /* reset flags that differ */ if (fmt->dwMask & CFM_FACE) { if (!(tmp.dwMask & CFM_FACE))

1 0