wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Jacek Caban : win32u: Use syscall interface for more windowing functions.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: 561890f47e0588b2d52b059490e33b72405ef2b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/561890f47e0588b2d52b059490e33b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 21:31:35 2022 +0200 win32u: Use syscall interface for more windowing functions. --- dlls/win32u/gdiobj.c | 8 ---- dlls/win32u/syscall.c | 8 ++++ dlls/win32u/win32u.spec | 16 ++++---- dlls/win32u/win32u_private.h | 8 ---- dlls/win32u/wrappers.c | 48 ----------------------- dlls/wow64win/syscall.h | 10 ++++- dlls/wow64win/user.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 116 insertions(+), 73 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for NtUserSetWindow* functions.
by Alexandre Julliard 26 Jul '22

26 Jul '22

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 26 Jul '22

26 Jul '22

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

Jacek Caban : win32u: Use syscall interface for menu functions.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: b3c7fff85a5d3cb1896e7ee43e09a0ce245300e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3c7fff85a5d3cb1896e7ee43e09a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 21 20:27:46 2022 +0200 win32u: Use syscall interface for menu functions. --- dlls/win32u/gdiobj.c | 8 ---- dlls/win32u/syscall.c | 8 ++++ dlls/win32u/win32u.spec | 16 ++++---- dlls/win32u/win32u_private.h | 8 ---- dlls/win32u/wrappers.c | 48 ----------------------- dlls/wow64win/syscall.h | 8 ++++ dlls/wow64win/user.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 117 insertions(+), 72 deletions(-)

1 0

Brendan Shanks : wow64: Return error from NtQueryVirtualMemory(MemoryBasicInformation) for a too-large address.
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: ebb7d316f89f290f56d0f58a5a03951167c3cbc7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ebb7d316f89f290f56d0f58a5a0395… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 25 12:20:18 2022 -0700 wow64: Return error from NtQueryVirtualMemory(MemoryBasicInformation) for a too-large address. --- dlls/wow64/syscall.c | 2 ++ dlls/wow64/virtual.c | 7 +++++-- dlls/wow64/wow64_private.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 80c4bf73d8b..bc6d46258ed 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; ULONG_PTR args_alignment = 0; +ULONG_PTR highest_user_address = 0x7ffeffff; ULONG_PTR default_zero_bits = 0x7fffffff; typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); @@ -573,6 +574,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex if (!current_machine) current_machine = native_machine; args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); NtQuerySystemInformation( SystemEmulationBasicInformation, &info, sizeof(info), NULL ); + highest_user_address = (ULONG_PTR)info.HighestUserAddress; default_zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; #define GET_PTR(name) p ## name = RtlFindExportedRoutineByName( module, #name ) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 8b69432829d..8b7d022301f 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -381,7 +381,11 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) switch (class) { case MemoryBasicInformation: /* MEMORY_BASIC_INFORMATION */ - if (len >= sizeof(MEMORY_BASIC_INFORMATION32)) + if (len < sizeof(MEMORY_BASIC_INFORMATION32)) + status = STATUS_INFO_LENGTH_MISMATCH; + else if ((ULONG_PTR)addr > highest_user_address) + status = STATUS_INVALID_PARAMETER; + else { MEMORY_BASIC_INFORMATION info; MEMORY_BASIC_INFORMATION32 *info32 = ptr; @@ -397,7 +401,6 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) info32->Type = info.Type; } } - else status = STATUS_INFO_LENGTH_MISMATCH; res_len = sizeof(MEMORY_BASIC_INFORMATION32); break; diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index c089a6ec4aa..f2c405bb2c6 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -39,6 +39,7 @@ extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; +extern ULONG_PTR highest_user_address DECLSPEC_HIDDEN; extern ULONG_PTR default_zero_bits DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN;

1 0

Brendan Shanks : ntdll/tests: Add tests for the address limit of NtQueryVirtualMemory(MemoryBasicInformation).
by Alexandre Julliard 26 Jul '22

26 Jul '22

Module: wine Branch: master Commit: fb1bfebb691996a7c90a0d8b87a4143a50b7d250 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb1bfebb691996a7c90a0d8b87a414… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jul 25 16:22:50 2022 -0700 ntdll/tests: Add tests for the address limit of NtQueryVirtualMemory(MemoryBasicInformation). --- dlls/ntdll/tests/info.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c367b4f372e..53f42d5a897 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2773,6 +2773,7 @@ static void test_queryvirtualmemory(void) void *user_shared_data = (void *)0x7ffe0000; char buffer[1024]; MEMORY_SECTION_NAME *name = (MEMORY_SECTION_NAME *)buffer; + SYSTEM_BASIC_INFORMATION sbi; module = GetModuleHandleA( "ntdll.dll" ); status = pNtQueryVirtualMemory(NtCurrentProcess(), module, MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION), &readcount); @@ -2849,9 +2850,20 @@ static void test_queryvirtualmemory(void) ok(mbi.Type == MEM_PRIVATE, "mbi.Type is 0x%lx, expected 0x%x\n", mbi.Type, MEM_PRIVATE); ok(mbi.RegionSize == 0x1000, "mbi.RegionSize is 0x%Ix, expected 0x%x\n", mbi.RegionSize, 0x1000); - /* check error code when addr is higher than working set limit */ + /* check error code when addr is higher than user space limit */ + status = pNtQuerySystemInformation(SystemBasicInformation, &sbi, sizeof(sbi), NULL); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), sbi.LowestUserAddress, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)sbi.LowestUserAddress-1, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), sbi.HighestUserAddress, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08lx\n", status); + status = pNtQueryVirtualMemory(NtCurrentProcess(), (char *)sbi.HighestUserAddress+1, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08lx\n", status); + /* check error code when len is less than MEMORY_BASIC_INFORMATION size */ status = pNtQueryVirtualMemory(NtCurrentProcess(), GetProcessHeap(), MemoryBasicInformation, &mbi, sizeof(MEMORY_BASIC_INFORMATION) - 1, &readcount); ok(status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08lx\n", status);

1 0

Giovanni Mascellani : mfplat/tests: Merge and reorganize image format tests.
by Alexandre Julliard 26 Jul '22

26 Jul '22

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 26 Jul '22

26 Jul '22

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 26 Jul '22

26 Jul '22

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 26 Jul '22

26 Jul '22

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

← Newer
1
...
7
8
9
10
11
12
13
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022