September 2022 - Wine-Commits

Jacob Czekalla : notepad: Show status bar.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: dd3fa4e9ef0700fa02b9013eb56aef73f287081f URL: https://gitlab.winehq.org/wine/wine/-/commit/dd3fa4e9ef0700fa02b9013eb56aef… Author: Jacob Czekalla <jacobczekalla(a)gmail.com> Date: Fri Sep 9 21:17:56 2022 -0400 notepad: Show status bar. --- po/ar.po | 96 +++++++++++++++++++++--------------------- po/ast.po | 96 +++++++++++++++++++++--------------------- po/bg.po | 96 +++++++++++++++++++++--------------------- po/ca.po | 96 +++++++++++++++++++++--------------------- po/cs.po | 96 +++++++++++++++++++++--------------------- po/da.po | 96 +++++++++++++++++++++--------------------- po/de.po | 96 +++++++++++++++++++++--------------------- po/el.po | 96 +++++++++++++++++++++--------------------- po/en.po | 96 +++++++++++++++++++++--------------------- po/en_US.po | 96 +++++++++++++++++++++--------------------- po/eo.po | 96 +++++++++++++++++++++--------------------- po/es.po | 96 +++++++++++++++++++++--------------------- po/fa.po | 96 +++++++++++++++++++++--------------------- po/fi.po | 96 +++++++++++++++++++++--------------------- po/fr.po | 96 +++++++++++++++++++++--------------------- po/he.po | 96 +++++++++++++++++++++--------------------- po/hi.po | 96 +++++++++++++++++++++--------------------- po/hr.po | 96 +++++++++++++++++++++--------------------- po/hu.po | 96 +++++++++++++++++++++--------------------- po/it.po | 96 +++++++++++++++++++++--------------------- po/ja.po | 96 +++++++++++++++++++++--------------------- po/ko.po | 96 +++++++++++++++++++++--------------------- po/lt.po | 96 +++++++++++++++++++++--------------------- po/ml.po | 96 +++++++++++++++++++++--------------------- po/nb_NO.po | 96 +++++++++++++++++++++--------------------- po/nl.po | 96 +++++++++++++++++++++--------------------- po/or.po | 96 +++++++++++++++++++++--------------------- po/pa.po | 96 +++++++++++++++++++++--------------------- po/pl.po | 96 +++++++++++++++++++++--------------------- po/pt_BR.po | 96 +++++++++++++++++++++--------------------- po/pt_PT.po | 96 +++++++++++++++++++++--------------------- po/rm.po | 96 +++++++++++++++++++++--------------------- po/ro.po | 96 +++++++++++++++++++++--------------------- po/ru.po | 96 +++++++++++++++++++++--------------------- po/si.po | 96 +++++++++++++++++++++--------------------- po/sk.po | 96 +++++++++++++++++++++--------------------- po/sl.po | 96 +++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 96 +++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 96 +++++++++++++++++++++--------------------- po/sv.po | 96 +++++++++++++++++++++--------------------- po/ta.po | 96 +++++++++++++++++++++--------------------- po/te.po | 96 +++++++++++++++++++++--------------------- po/th.po | 96 +++++++++++++++++++++--------------------- po/tr.po | 96 +++++++++++++++++++++--------------------- po/uk.po | 96 +++++++++++++++++++++--------------------- po/wa.po | 96 +++++++++++++++++++++--------------------- po/wine.pot | 96 +++++++++++++++++++++--------------------- po/zh_CN.po | 96 +++++++++++++++++++++--------------------- po/zh_TW.po | 96 +++++++++++++++++++++--------------------- programs/notepad/dialog.c | 1 + programs/notepad/main.c | 42 +++++++++++++++++- programs/notepad/main.h | 4 ++ programs/notepad/notepad.rc | 4 ++ programs/notepad/notepad_res.h | 1 + 54 files changed, 2402 insertions(+), 2354 deletions(-)

1 0

Alexandre Julliard : winetest: Report failure for tests that print too much output.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 657cdc1861c0054d5dfd96fe9491b2790a0e93e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/657cdc1861c0054d5dfd96fe9491b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 17:03:24 2022 +0200 winetest: Report failure for tests that print too much output. --- programs/winetest/main.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index e7b365d2091..c24af4952c7 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -42,6 +42,9 @@ /* Don't submit the results if more than FAILURES_LIMIT tests have failed */ #define FAILURES_LIMIT 50 +/* Maximum output size for individual test */ +#define MAX_OUTPUT_SIZE (32 * 1024) + struct wine_test { char *name; @@ -871,19 +874,25 @@ run_test (struct wine_test* test, const char* subtest, HANDLE out_file, const ch char *data, tmpname[MAX_PATH]; HANDLE tmpfile = create_temp_file( tmpname ); status = run_ex (cmd, tmpfile, tempdir, 120000, FALSE, &pid); - if (status) - { - data = flush_temp_file( tmpname, tmpfile, &size ); - WriteFile( out_file, data, size, &size, NULL ); - free( data ); - } - else close_temp_file( tmpname, tmpfile ); + data = flush_temp_file( tmpname, tmpfile, &size ); + if (status || size > MAX_OUTPUT_SIZE) WriteFile( out_file, data, size, &size, NULL ); + free( data ); + } + else + { + DWORD start_size = GetFileSize( out_file, NULL ); + status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); + size = GetFileSize( out_file, NULL ) - start_size; } - else status = run_ex (cmd, out_file, tempdir, 120000, FALSE, &pid); if (status == -2) status = -GetLastError(); free(cmd); - xprintf ("%s:%s:%04x done (%d) in %ds\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000); - if (status) failures++; + xprintf ("%s:%s:%04x done (%d) in %ds %uB\n", test->name, subtest, pid, status, (GetTickCount()-start)/1000, size); + if (size > MAX_OUTPUT_SIZE) + { + xprintf ("%s:%s:%04x The test prints too much data (%u bytes)\n", test->name, subtest, pid, size); + failures++; + } + else if (status) failures++; } if (failures) report (R_STATUS, "Running tests - %u failures", failures); }

1 0

Alexandre Julliard : ntdll/tests: Re-add workaround for check that is still broken on win7.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 93250eb56e2361f3d7a5550478f28408c3cebd5e URL: https://gitlab.winehq.org/wine/wine/-/commit/93250eb56e2361f3d7a5550478f284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 14:53:27 2022 +0200 ntdll/tests: Re-add workaround for check that is still broken on win7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53679 --- dlls/ntdll/tests/env.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 33a6eb277bf..4a6257ecff1 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -271,7 +271,8 @@ static UINT_PTR check_string_( int line, RTL_USER_PROCESS_PARAMETERS *params, UN return pos; } if (expect) - ok_(__FILE__,line)( (UINT_PTR)str->Buffer == align(pos, sizeof(void *)), + ok_(__FILE__,line)( (UINT_PTR)str->Buffer == align(pos, sizeof(void *)) || + broken( (UINT_PTR)str->Buffer == align(pos, 4) ), /* win7 */ "wrong buffer %Ix/%Ix\n", (UINT_PTR)str->Buffer, pos ); else /* initial params are not aligned */ ok_(__FILE__,line)( (UINT_PTR)str->Buffer == pos,

1 0

Alexandre Julliard : user32/tests: Fix a few more assumptions about window positions.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: e79b12906446dbe06cc2ffffae36c5609b5eae67 URL: https://gitlab.winehq.org/wine/wine/-/commit/e79b12906446dbe06cc2ffffae36c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 12:58:47 2022 +0200 user32/tests: Fix a few more assumptions about window positions. --- dlls/user32/tests/input.c | 27 +++++++++++++++++++-------- dlls/user32/tests/msg.c | 8 ++++++-- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 8477645fad5..37b1a4aef6d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3466,7 +3466,8 @@ static void test_Input_mouse(void) 100, 100, 100, 100, 0, NULL, NULL, NULL); ok(button_win != 0, "CreateWindow failed\n"); - pt.x = pt.y = 150; + pt.x = pt.y = 50; + ClientToScreen(button_win, &pt); hwnd = WindowFromPoint(pt); if (hwnd != button_win) { @@ -3476,7 +3477,7 @@ static void test_Input_mouse(void) } /* simple button click test */ - simulate_click(TRUE, 150, 150); + simulate_click(TRUE, pt.x, pt.y); got_button_down = got_button_up = FALSE; while (wait_for_message(&msg)) { @@ -3501,7 +3502,7 @@ static void test_Input_mouse(void) ok(static_win != 0, "CreateWindow failed\n"); def_static_proc = (void*)SetWindowLongPtrA(static_win, GWLP_WNDPROC, (LONG_PTR)static_hook_proc); - simulate_click(FALSE, 150, 150); + simulate_click(FALSE, pt.x, pt.y); hittest_no = 0; got_button_down = got_button_up = FALSE; while (wait_for_message(&msg)) @@ -3531,7 +3532,9 @@ static void test_Input_mouse(void) ok(static_win != 0, "CreateWindow failed\n"); def_static_proc = (void*)SetWindowLongPtrA(static_win, GWLP_WNDPROC, (LONG_PTR)static_hook_proc); - simulate_click(TRUE, 150, 150); + pt.x = pt.y = 50; + ClientToScreen(static_win, &pt); + simulate_click(TRUE, pt.x, pt.y); hittest_no = 0; got_button_down = got_button_up = FALSE; while (wait_for_message(&msg)) @@ -3565,7 +3568,9 @@ static void test_Input_mouse(void) hittest_no = 0; got_button_down = got_button_up = FALSE; WaitForSingleObject(thread_data.start_event, INFINITE); - simulate_click(FALSE, 150, 150); + pt.x = pt.y = 50; + ClientToScreen(thread_data.win, &pt); + simulate_click(FALSE, pt.x, pt.y); while (wait_for_message(&msg)) { DispatchMessageA(&msg); @@ -3593,7 +3598,9 @@ static void test_Input_mouse(void) "AttachThreadInput failed\n"); while (wait_for_message(&msg)) DispatchMessageA(&msg); SetWindowPos(thread_data.win, button_win, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - simulate_click(TRUE, 150, 150); + pt.x = pt.y = 50; + ClientToScreen(thread_data.win, &pt); + simulate_click(TRUE, pt.x, pt.y); while (wait_for_message(&msg)) { DispatchMessageA(&msg); @@ -3615,7 +3622,9 @@ static void test_Input_mouse(void) ok(hwnd != 0, "CreateWindow failed\n"); SetCapture(button_win); got_button_down = got_button_up = FALSE; - simulate_click(FALSE, 50, 50); + pt.x = pt.y = 50; + ClientToScreen(hwnd, &pt); + simulate_click(FALSE, pt.x, pt.y); while (wait_for_message(&msg)) { DispatchMessageA(&msg); @@ -3641,7 +3650,9 @@ static void test_Input_mouse(void) 0, 0, 100, 100, button_win, NULL, NULL, NULL); ok(hwnd != 0, "CreateWindow failed\n"); got_button_down = got_button_up = FALSE; - simulate_click(TRUE, 150, 150); + pt.x = pt.y = 50; + ClientToScreen(hwnd, &pt); + simulate_click(TRUE, pt.x, pt.y); while (wait_for_message(&msg)) { DispatchMessageA(&msg); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6336664199c..8bed81b6faf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17470,7 +17470,8 @@ static void test_keyflags(void) MSG msg; test_window = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 100, 100, 200, 200, 0, 0, 0, NULL); + 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + 0, 0, 0, NULL); flush_events(); flush_sequence(); @@ -17705,8 +17706,11 @@ static void test_hotkey(void) "unexpected error %ld\n", GetLastError()); test_window = CreateWindowExA(0, "HotkeyWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, - 100, 100, 200, 200, 0, 0, 0, NULL); + 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + 0, 0, 0, NULL); + SetForegroundWindow(test_window); + flush_events(); flush_sequence(); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : win32u: Fix Get/SetWindowWord behavior on 32-bit.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 2784c1caa0a84ada15a37a457dc7d9d5156d9f0e URL: https://gitlab.winehq.org/wine/wine/-/commit/2784c1caa0a84ada15a37a457dc7d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 13 22:23:55 2022 +0200 win32u: Fix Get/SetWindowWord behavior on 32-bit. --- dlls/user.exe16/message.c | 2 +- dlls/user.exe16/window.c | 20 ++++++++++++++++++-- dlls/user32/tests/win.c | 20 -------------------- dlls/win32u/window.c | 33 +++++++-------------------------- 4 files changed, 26 insertions(+), 49 deletions(-) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 46561d722ed..9af217bf5f1 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -248,7 +248,7 @@ static LRESULT call_window_proc16( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPA memset(&context, 0, sizeof(context)); context.SegDs = context.SegEs = CURRENT_SS; - if (!(context.Eax = GetWindowWord( HWND_32(hwnd), GWLP_HINSTANCE ))) context.Eax = context.SegDs; + if (!(context.Eax = (WORD)GetWindowLongA( HWND_32(hwnd), GWLP_HINSTANCE ))) context.Eax = context.SegDs; context.SegCs = SELECTOROF(func); context.Eip = OFFSETOF(func); context.Ebp = CURRENT_SP + FIELD_OFFSET(STACK16FRAME, bp); diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index e54dd6a803e..69d178e31b0 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -838,7 +838,15 @@ LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval ) */ WORD WINAPI GetWindowWord16( HWND16 hwnd, INT16 offset ) { - return GetWindowWord( WIN_Handle32(hwnd), offset ); + switch(offset) + { + case GWLP_ID: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + return GetWindowLongA( WIN_Handle32(hwnd), offset ); + default: + return GetWindowWord( WIN_Handle32(hwnd), offset ); + } } @@ -847,7 +855,15 @@ WORD WINAPI GetWindowWord16( HWND16 hwnd, INT16 offset ) */ WORD WINAPI SetWindowWord16( HWND16 hwnd, INT16 offset, WORD newval ) { - return SetWindowWord( WIN_Handle32(hwnd), offset, newval ); + switch(offset) + { + case GWLP_ID: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + return SetWindowLongA( WIN_Handle32(hwnd), offset, newval ); + default: + return SetWindowWord( WIN_Handle32(hwnd), offset, newval ); + } } diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6daef2ffa44..5f2e11ce367 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7090,33 +7090,25 @@ static void test_set_window_long_size(void) retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); ok(retval > 123, "Unexpected user data.\n"); ret = GetWindowWord(hwnd, GWLP_USERDATA); - todo_wine ok(ret == 123, "Unexpected user data %#lx.\n", ret); ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); - todo_wine ok(ret == 123, "Unexpected user data %#lx.\n", ret); ret = GetWindowLongA(hwnd, GWLP_USERDATA); - todo_wine ok(ret == 124, "Unexpected user data %#lx.\n", ret); retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); - todo_wine ok(retval == 124, "Unexpected user data.\n"); SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123); ret = GetWindowLongA(hwnd, GWLP_USERDATA); ok(ret == ((1 << 16) | 123), "Unexpected user data %#lx.\n", ret); ret = GetWindowWord(hwnd, GWLP_USERDATA); - todo_wine ok(ret == 123, "Unexpected user data %#lx.\n", ret); ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); - todo_wine ok(ret == 123, "Unexpected user data %#lx.\n", ret); ret = GetWindowLongA(hwnd, GWLP_USERDATA); - todo_wine ok(ret == ((1 << 16) | 124), "Unexpected user data %#lx.\n", ret); ret = GetWindowWord(hwnd, GWLP_USERDATA); - todo_wine ok(ret == 124, "Unexpected user data %#lx.\n", ret); /* GWLP_ID */ @@ -7138,7 +7130,6 @@ static void test_set_window_long_size(void) ok(retval > 123, "Unexpected id.\n"); SetLastError(0xdeadbeef); ret = GetWindowWord(hwnd, GWLP_ID); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#lx.\n", ret); /* GWLP_HINSTANCE */ @@ -7155,7 +7146,6 @@ static void test_set_window_long_size(void) SetLastError(0xdeadbeef); ret = GetWindowWord(hwnd, GWLP_HINSTANCE); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret); SetLastError(0xdeadbeef); @@ -7181,7 +7171,6 @@ static void test_set_window_long_size(void) SetLastError(0xdeadbeef); ret = GetWindowWord(hwnd, GWLP_HWNDPARENT); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#lx.\n", ret); DestroyWindow(hwnd); @@ -7221,16 +7210,12 @@ static void test_set_window_word_size(void) ret = GetWindowLongA(hwnd, GWLP_USERDATA); ok(ret > 123, "Unexpected user data %#lx.\n", ret); ret = GetWindowWord(hwnd, GWLP_USERDATA); - todo_wine ok(ret == 123, "Unexpected user data %#lx.\n", ret); ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); - todo_wine ok(ret == 123, "Unexpected user data %#lx.\n", ret); ret = GetWindowWord(hwnd, GWLP_USERDATA); - todo_wine ok(ret == 124, "Unexpected user data %#lx.\n", ret); ret = GetWindowLongA(hwnd, GWLP_USERDATA); - todo_wine ok(ret == ((1 << 16) | 124), "Unexpected user data %#lx.\n", ret); /* GWLP_ID */ @@ -7241,11 +7226,9 @@ static void test_set_window_word_size(void) SetLastError(0xdeadbeef); ret = GetWindowWord(hwnd, GWLP_ID); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#lx.\n", ret); SetLastError(0xdeadbeef); ret = SetWindowWord(hwnd, GWLP_ID, 2); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#lx.\n", ret); /* GWLP_HINSTANCE */ @@ -7254,12 +7237,10 @@ static void test_set_window_word_size(void) SetLastError(0xdeadbeef); ret = GetWindowWord(hwnd, GWLP_HINSTANCE); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret); SetLastError(0xdeadbeef); ret = SetWindowWord(hwnd, GWLP_HINSTANCE, 0xdead); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#lx.\n", ret); /* GWLP_HWNDPARENT */ @@ -7268,7 +7249,6 @@ static void test_set_window_word_size(void) SetLastError(0xdeadbeef); ret = GetWindowWord(hwnd, GWLP_HWNDPARENT); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#lx.\n", ret); DestroyWindow(hwnd); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index d53dfde2fbb..d7263875b17 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1101,20 +1101,10 @@ ULONG_PTR get_window_long_ptr( HWND hwnd, INT offset, BOOL ansi ) /* see GetWindowWord */ static WORD get_window_word( HWND hwnd, INT offset ) { - switch(offset) + if (offset < 0 && offset != GWLP_USERDATA) { - case GWLP_ID: - case GWLP_HINSTANCE: - case GWLP_HWNDPARENT: - break; - default: - if (offset < 0) - { - WARN("Invalid offset %d\n", offset ); - RtlSetLastWin32Error( ERROR_INVALID_INDEX ); - return 0; - } - break; + RtlSetLastWin32Error( ERROR_INVALID_INDEX ); + return 0; } return get_window_long_size( hwnd, offset, sizeof(WORD), TRUE ); } @@ -1354,6 +1344,7 @@ LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOO req->is_unicode = (win->flags & WIN_ISUNICODE) != 0; break; case GWLP_USERDATA: + if (size == sizeof(WORD)) newval = MAKELONG( newval, win->userdata >> 16 ); req->flags = SET_WIN_USERDATA; req->user_data = newval; break; @@ -1426,20 +1417,10 @@ LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOO */ WORD WINAPI NtUserSetWindowWord( HWND hwnd, INT offset, WORD newval ) { - switch(offset) + if (offset < 0 && offset != GWLP_USERDATA) { - case GWLP_ID: - case GWLP_HINSTANCE: - case GWLP_HWNDPARENT: - break; - default: - if (offset < 0) - { - WARN("Invalid offset %d\n", offset ); - RtlSetLastWin32Error( ERROR_INVALID_INDEX ); - return 0; - } - break; + RtlSetLastWin32Error( ERROR_INVALID_INDEX ); + return 0; } return set_window_long( hwnd, offset, sizeof(WORD), newval, TRUE ); }

1 0

Alexandre Julliard : winex11: Don't send WM_CANCELMODE to iconified windows.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: f3eebcfa4d4e773313defe851bf99fbe0110e470 URL: https://gitlab.winehq.org/wine/wine/-/commit/f3eebcfa4d4e773313defe851bf99f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 11:56:02 2022 +0200 winex11: Don't send WM_CANCELMODE to iconified windows. --- dlls/user32/tests/msg.c | 2 +- dlls/winex11.drv/event.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 610228c3559..6336664199c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5572,7 +5572,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 25ca9d885a7..4a1a8dc0443 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -837,7 +837,8 @@ static void focus_out( Display *display , HWND hwnd ) return; } if (hwnd != NtUserGetForegroundWindow()) return; - send_message( hwnd, WM_CANCELMODE, 0, 0 ); + if (!(NtUserGetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE)) + send_message( hwnd, WM_CANCELMODE, 0, 0 ); /* don't reset the foreground window, if the window which is getting the focus is a Wine window */

1 0

Alexandre Julliard : unicode: Update to Unicode 15.0.0.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 7ab46c4f21d18c355cffd94df1f67602abb47e0d URL: https://gitlab.winehq.org/wine/wine/-/commit/7ab46c4f21d18c355cffd94df1f676… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 10:16:54 2022 +0200 unicode: Update to Unicode 15.0.0. --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/direction.c | 578 +++++------ dlls/dwrite/linebreak.c | 1847 +++++++++++++++++----------------- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 1064 ++++++++++---------- dlls/dwrite/scripts.h | 2 +- dlls/dwrite/shapers/arabic_table.c | 584 +++++------ dlls/gdi32/uniscribe/bracket.c | 2 +- dlls/gdi32/uniscribe/direction.c | 578 +++++------ dlls/gdi32/uniscribe/indicsyllable.c | 14 +- dlls/gdi32/uniscribe/linebreak.c | 1847 +++++++++++++++++----------------- dlls/gdi32/uniscribe/mirror.c | 2 +- dlls/gdi32/uniscribe/shaping.c | 172 ++-- dlls/kernel32/tests/locale.c | 2 + dlls/win32u/vertical.c | 2 +- dlls/wineps.drv/vertical.c | 2 +- nls/locale.nls | Bin 739542 -> 736194 bytes nls/normidna.nls | Bin 83820 -> 84710 bytes nls/normnfc.nls | Bin 58422 -> 58934 bytes nls/normnfd.nls | Bin 51722 -> 52234 bytes nls/normnfkc.nls | Bin 80626 -> 81434 bytes nls/normnfkd.nls | Bin 74246 -> 75054 bytes nls/sortdefault.nls | Bin 3378116 -> 3378116 bytes tools/make_unicode | 8 +- 24 files changed, 3396 insertions(+), 3312 deletions(-)

1 0

Rémi Bernon : mf/tests: Factor IMFTransform required attributes checks together.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: a66690d2de92e500dd0a76ad02ff2e3d23dcad0d URL: https://gitlab.winehq.org/wine/wine/-/commit/a66690d2de92e500dd0a76ad02ff2e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 8 09:42:32 2022 +0200 mf/tests: Factor IMFTransform required attributes checks together. --- dlls/mf/tests/mf.c | 81 ++++---- dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 490 ++++++++++++++++++---------------------------- 3 files changed, 237 insertions(+), 335 deletions(-)

1 0

Rémi Bernon : mf/tests: Split create_transform into check_(mft|dmo)_(enum|get_info).
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: a131a0594f2586794b3fc5add9c6426318f8ee42 URL: https://gitlab.winehq.org/wine/wine/-/commit/a131a0594f2586794b3fc5add9c642… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 13 15:05:00 2022 +0200 mf/tests: Split create_transform into check_(mft|dmo)_(enum|get_info). --- dlls/mf/tests/transform.c | 690 ++++++++++++++++++++++++++-------------------- 1 file changed, 386 insertions(+), 304 deletions(-)

1 0

Rémi Bernon : mf/tests: Test AAC encoder MFT presence and media types.
by Alexandre Julliard Sept. 13, 2022

Sept. 13, 2022

Module: wine Branch: master Commit: 4e2faca523eb3a9dffbe1c77a5aa7bc6651924f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e2faca523eb3a9dffbe1c77a5aa7b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 6 08:04:19 2022 +0200 mf/tests: Test AAC encoder MFT presence and media types. --- dlls/mf/tests/transform.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 2bcb3805a14..cc2907c51c1 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -890,6 +890,159 @@ static void check_sample_pcm16_(int line, IMFSample *sample, const BYTE *expect_ ok_(__FILE__, line)(ret == 1, "Release returned %lu\n", ret); } +static const BYTE aac_codec_data[14] = {0x00,0x00,0x29,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x08}; + +static void test_aac_encoder(void) +{ + const GUID *const class_id = &CLSID_AACMFTEncoder; + const struct transform_info expect_mft_info = + { + .name = L"Microsoft AAC Audio Encoder MFT", + .major_type = &MFMediaType_Audio, + .inputs = + { + {.subtype = &MFAudioFormat_PCM}, + }, + .outputs = + { + {.subtype = &MFAudioFormat_AAC}, + }, + }; + + static const struct attribute_desc input_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100), + {0}, + }; + const struct attribute_desc output_type_desc[] = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_AAC), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 12000), + {0}, + }; + + static const struct attribute_desc expect_input_type_desc[] = + { + ATTR_GUID(MF_MT_AM_FORMAT_TYPE, FORMAT_WaveFormatEx), + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 44100 * 2), + ATTR_UINT32(MF_MT_AVG_BITRATE, 44100 * 2 * 8), + ATTR_UINT32(MF_MT_COMPRESSED, 0), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_UINT32(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1), + {0}, + }; + const struct attribute_desc expect_output_type_desc[] = + { + ATTR_GUID(MF_MT_AM_FORMAT_TYPE, FORMAT_WaveFormatEx), + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_AAC), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 1), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 12000), + ATTR_UINT32(MF_MT_AVG_BITRATE, 96000), + ATTR_UINT32(MF_MT_COMPRESSED, 1), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 0), + ATTR_UINT32(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1), + ATTR_UINT32(MF_MT_AAC_AUDIO_PROFILE_LEVEL_INDICATION, 41), + ATTR_UINT32(MF_MT_AAC_PAYLOAD_TYPE, 0), + ATTR_BLOB(MF_MT_USER_DATA, aac_codec_data, sizeof(aac_codec_data)), + {0}, + }; + + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_AAC}; + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_PCM}; + MFT_OUTPUT_STREAM_INFO output_info; + MFT_INPUT_STREAM_INFO input_info; + IMFMediaType *media_type; + IMFTransform *transform; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); + + winetest_push_context("aacenc"); + + if (!check_mft_enum(MFT_CATEGORY_AUDIO_ENCODER, &input_type, &output_type, class_id)) + goto failed; + check_mft_get_info(class_id, &expect_mft_info); + + if (FAILED(hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, + &IID_IMFTransform, (void **)&transform))) + goto failed; + + check_interface(transform, &IID_IMFTransform, TRUE); + check_interface(transform, &IID_IMediaObject, FALSE); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); + init_media_type(media_type, input_type_desc, -1); + hr = IMFTransform_SetInputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 1, "Release returned %lu\n", ret); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "MFCreateMediaType returned %#lx\n", hr); + init_media_type(media_type, output_type_desc, -1); + hr = IMFTransform_SetOutputType(transform, 0, media_type, 0); + ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); + ret = IMFMediaType_Release(media_type); + ok(ret == 1, "Release returned %lu\n", ret); + + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "GetInputCurrentType returned %#lx.\n", hr); + check_media_type(media_type, expect_input_type_desc, -1); + ret = IMFMediaType_Release(media_type); + ok(ret <= 1, "Release returned %lu\n", ret); + + hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "GetOutputCurrentType returned %#lx.\n", hr); + check_media_type(media_type, expect_output_type_desc, -1); + ret = IMFMediaType_Release(media_type); + ok(ret <= 1, "Release returned %lu\n", ret); + + memset(&input_info, 0xcd, sizeof(input_info)); + hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); + ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); + ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %I64d\n", input_info.hnsMaxLatency); + ok(input_info.dwFlags == 0, "got dwFlags %#lx\n", input_info.dwFlags); + ok(input_info.cbSize == 0, "got cbSize %lu\n", input_info.cbSize); + ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); + ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); + + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + ok(hr == S_OK, "GetOutputStreamInfo returned %#lx\n", hr); + ok(output_info.dwFlags == 0, "got dwFlags %#lx\n", output_info.dwFlags); + ok(output_info.cbSize == 0x600, "got cbSize %#lx\n", output_info.cbSize); + ok(output_info.cbAlignment == 0, "got cbAlignment %#lx\n", output_info.cbAlignment); + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %lu\n", ret); + +failed: + winetest_pop_context(); + CoUninitialize(); +} + static const BYTE wma_codec_data[10] = {0, 0x44, 0, 0, 0x17, 0, 0, 0, 0, 0}; static const ULONG wmaenc_block_size = 1487; static const ULONG wmadec_block_size = 0x2000; @@ -4418,6 +4571,7 @@ START_TEST(transform) test_sample_copier(); test_sample_copier_output_processing(); + test_aac_encoder(); test_wma_encoder(); test_wma_decoder(); test_h264_decoder();

1 0