- Wine-Commits - list.winehq.org

Rémi Bernon : include: Rename winetest thread data struct and getter.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: wine Branch: master Commit: 615ceb3be3c52514d9c988378da6b9c8b6f7f251 URL: https://gitlab.winehq.org/wine/wine/-/commit/615ceb3be3c52514d9c988378da6b9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 21:57:05 2023 +0200 include: Rename winetest thread data struct and getter. --- include/wine/test.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 3bb50ad22cf..88884946e89 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -203,7 +203,7 @@ static LONG winetest_muted_todo_successes; /* same as todo_successes but silent static LONG line_counters[16384]; /* The following data must be kept track of on a per-thread basis */ -struct tls_data +struct winetest_thread_data { const char* current_file; /* file of current check */ int current_line; /* line of current check */ @@ -218,9 +218,9 @@ struct tls_data }; static DWORD tls_index; -static struct tls_data *get_tls_data(void) +static struct winetest_thread_data *winetest_get_thread_data(void) { - struct tls_data *data; + struct winetest_thread_data *data; DWORD last_error; last_error=GetLastError(); @@ -244,7 +244,7 @@ static void exit_process( int code ) void winetest_set_location( const char* file, int line ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); data->current_file=strrchr(file,'/'); if (data->current_file==NULL) data->current_file=strrchr(file,'\\'); @@ -276,7 +276,7 @@ static const char color_bright_purple[] = "\x1b[1;95m"; static void winetest_printf( const char *msg, ... ) __WINE_PRINTF_ATTR(1,2); static void winetest_printf( const char *msg, ... ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); va_list valist; printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); @@ -286,7 +286,7 @@ static void winetest_printf( const char *msg, ... ) } static void winetest_print_context( const char *msgtype ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); unsigned int i; winetest_printf( "%s", msgtype ); @@ -333,13 +333,13 @@ int broken( int condition ) static LONG winetest_add_line( void ) { - struct tls_data *data; + struct winetest_thread_data *data; int index, count; if (winetest_debug > 1) return 0; - data = get_tls_data(); + data = winetest_get_thread_data(); index = data->current_line % ARRAY_SIZE(line_counters); count = InterlockedIncrement(line_counters + index) - 1; if (count == winetest_mute_threshold) @@ -364,7 +364,7 @@ static LONG winetest_add_line( void ) */ int winetest_vok( int condition, const char *msg, va_list args ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); if (data->todo_level) { @@ -512,14 +512,14 @@ void winetest_win_skip( const char *msg, ... ) void winetest_start_flaky( int is_flaky ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); data->flaky_level = (data->flaky_level << 1) | (is_flaky != 0); data->flaky_do_loop = 1; } int winetest_loop_flaky(void) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); int do_flaky = data->flaky_do_loop; data->flaky_do_loop = 0; return do_flaky; @@ -527,20 +527,20 @@ int winetest_loop_flaky(void) void winetest_end_flaky(void) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); data->flaky_level >>= 1; } void winetest_start_todo( int is_todo ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); data->todo_level = (data->todo_level << 1) | (is_todo != 0); data->todo_do_loop=1; } int winetest_loop_todo(void) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); int do_loop=data->todo_do_loop; data->todo_do_loop=0; return do_loop; @@ -548,13 +548,13 @@ int winetest_loop_todo(void) void winetest_end_todo(void) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); data->todo_level >>= 1; } void winetest_push_context( const char *fmt, ... ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); va_list valist; if (data->context_count < ARRAY_SIZE(data->context)) @@ -569,7 +569,7 @@ void winetest_push_context( const char *fmt, ... ) void winetest_pop_context(void) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); if (data->context_count) --data->context_count; @@ -707,7 +707,7 @@ static void usage( const char *argv0 ) /* trap unhandled exceptions */ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) { - struct tls_data *data = get_tls_data(); + struct winetest_thread_data *data = winetest_get_thread_data(); winetest_print_lock(); if (data->current_file)

1 0

Rémi Bernon : include: Prefix winetest global counters with winetest_.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: wine Branch: master Commit: 58ec77757ca680e9c37a4ed256d1c1d6077e2f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/58ec77757ca680e9c37a4ed256d1c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 29 17:56:28 2023 +0200 include: Prefix winetest global counters with winetest_. --- include/wine/test.h | 67 +++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 73d6d164c46..3bb50ad22cf 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -189,15 +189,15 @@ static char** winetest_argv; static const struct test *current_test; /* test currently being run */ -static LONG successes; /* number of successful tests */ -static LONG failures; /* number of failures */ -static LONG flaky_failures; /* number of failures inside flaky block */ -static LONG skipped; /* number of skipped test chunks */ -static LONG todo_successes; /* number of successful tests inside todo block */ -static LONG todo_failures; /* number of failures inside todo block */ -static LONG muted_traces; /* number of silenced traces */ -static LONG muted_skipped; /* same as skipped but silent */ -static LONG muted_todo_successes; /* same as todo_successes but silent */ +static LONG winetest_successes; /* number of successful tests */ +static LONG winetest_failures; /* number of failures */ +static LONG winetest_flaky_failures; /* number of failures inside flaky block */ +static LONG winetest_skipped; /* number of skipped test chunks */ +static LONG winetest_todo_successes; /* number of successful tests inside todo block */ +static LONG winetest_todo_failures; /* number of failures inside todo block */ +static LONG winetest_muted_traces; /* number of silenced traces */ +static LONG winetest_muted_skipped; /* same as skipped but silent */ +static LONG winetest_muted_todo_successes; /* same as todo_successes but silent */ /* counts how many times a given line printed a message */ static LONG line_counters[16384]; @@ -376,14 +376,14 @@ int winetest_vok( int condition, const char *msg, va_list args ) if (winetest_color) printf( color_dark_purple ); winetest_print_context( "Test succeeded inside flaky todo block: " ); vprintf(msg, args); - InterlockedIncrement(&flaky_failures); + InterlockedIncrement( &winetest_flaky_failures ); } else { if (winetest_color) printf( color_dark_red ); winetest_print_context( "Test succeeded inside todo block: " ); vprintf(msg, args); - InterlockedIncrement(&todo_failures); + InterlockedIncrement( &winetest_todo_failures ); } if (winetest_color) printf( color_reset ); winetest_print_unlock(); @@ -403,10 +403,9 @@ int winetest_vok( int condition, const char *msg, va_list args ) if (winetest_color) printf( color_reset ); winetest_print_unlock(); } - InterlockedIncrement(&todo_successes); + InterlockedIncrement( &winetest_todo_successes ); } - else - InterlockedIncrement(&muted_todo_successes); + else InterlockedIncrement( &winetest_muted_todo_successes ); return 1; } } @@ -420,14 +419,14 @@ int winetest_vok( int condition, const char *msg, va_list args ) if (winetest_color) printf( color_bright_purple ); winetest_print_context( "Test marked flaky: " ); vprintf(msg, args); - InterlockedIncrement(&flaky_failures); + InterlockedIncrement( &winetest_flaky_failures ); } else { if (winetest_color) printf( color_bright_red ); winetest_print_context( "Test failed: " ); vprintf(msg, args); - InterlockedIncrement(&failures); + InterlockedIncrement( &winetest_failures ); } if (winetest_color) printf( color_reset ); winetest_print_unlock(); @@ -444,7 +443,7 @@ int winetest_vok( int condition, const char *msg, va_list args ) if (winetest_color) printf( color_reset ); winetest_print_unlock(); } - InterlockedIncrement(&successes); + InterlockedIncrement( &winetest_successes ); return 1; } } @@ -474,8 +473,7 @@ void winetest_trace( const char *msg, ... ) va_end(valist); winetest_print_unlock(); } - else - InterlockedIncrement(&muted_traces); + else InterlockedIncrement( &winetest_muted_traces ); } void winetest_vskip( const char *msg, va_list args ) @@ -488,10 +486,9 @@ void winetest_vskip( const char *msg, va_list args ) vprintf(msg, args); if (winetest_color) printf( color_reset ); winetest_print_unlock(); - InterlockedIncrement(&skipped); + InterlockedIncrement( &winetest_skipped ); } - else - InterlockedIncrement(&muted_skipped); + else InterlockedIncrement( &winetest_muted_skipped ); } void winetest_skip( const char *msg, ... ) @@ -586,13 +583,12 @@ int winetest_get_mainargs( char*** pargv ) LONG winetest_get_failures(void) { - return failures; + return winetest_failures; } void winetest_add_failures( LONG new_failures ) { - while (new_failures-- > 0) - InterlockedIncrement( &failures ); + while (new_failures-- > 0) InterlockedIncrement( &winetest_failures ); } void winetest_wait_child_process( HANDLE process ) @@ -620,15 +616,14 @@ void winetest_wait_child_process( HANDLE process ) winetest_printf( "unhandled exception %08x in child process %04x\n", (UINT)exit_code, (UINT)pid ); if (winetest_color) printf( color_reset ); winetest_print_unlock(); - InterlockedIncrement( &failures ); + InterlockedIncrement( &winetest_failures ); } else if (exit_code) { winetest_print_lock(); winetest_printf( "%u failures in child process\n", (UINT)exit_code ); winetest_print_unlock(); - while (exit_code-- > 0) - InterlockedIncrement(&failures); + while (exit_code-- > 0) InterlockedIncrement( &winetest_failures ); } } } @@ -682,20 +677,20 @@ static int run_test( const char *name ) if (winetest_debug) { winetest_print_lock(); - if (muted_todo_successes || muted_skipped || muted_traces) + if (winetest_muted_todo_successes || winetest_muted_skipped || winetest_muted_traces) printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), - (UINT)muted_todo_successes, (UINT)muted_skipped, (UINT)muted_traces); + (UINT)winetest_muted_todo_successes, (UINT)winetest_muted_skipped, (UINT)winetest_muted_traces); printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d as flaky, %d %s), %d skipped.\n", (UINT)GetCurrentProcessId(), test->name, winetest_elapsed(), - (UINT)(successes + failures + flaky_failures + todo_successes + todo_failures), - (UINT)todo_successes, (UINT)flaky_failures, (UINT)(failures + todo_failures), - (failures + todo_failures != 1) ? "failures" : "failure", - (UINT)skipped ); + (UINT)(winetest_successes + winetest_failures + winetest_flaky_failures + winetest_todo_successes + winetest_todo_failures), + (UINT)winetest_todo_successes, (UINT)winetest_flaky_failures, (UINT)(winetest_failures + winetest_todo_failures), + (winetest_failures + winetest_todo_failures != 1) ? "failures" : "failure", + (UINT)winetest_skipped ); winetest_print_unlock(); } - status = failures + todo_failures; - if (winetest_report_flaky) status += flaky_failures; + status = winetest_failures + winetest_todo_failures; + if (winetest_report_flaky) status += winetest_flaky_failures; if (status > 255) status = 255; return status; }

1 0

Biswapriyo Nath : include: Add Windows.Media.Capture.MediaCategory enumeration.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: wine Branch: master Commit: a0b28edabeb26556dfde667b12c818fda7e79fcb URL: https://gitlab.winehq.org/wine/wine/-/commit/a0b28edabeb26556dfde667b12c818… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Aug 30 08:32:25 2023 +0530 include: Add Windows.Media.Capture.MediaCategory enumeration. Required for Windows.Media.Effects.IAudioEffectsManagerStatics interface. --- include/Makefile.in | 1 + include/windows.media.capture.idl | 48 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c0f2e873837..507686917a3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -839,6 +839,7 @@ SOURCES = \ windows.graphics.holographic.idl \ windows.h \ windows.management.deployment.idl \ + windows.media.capture.idl \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ windows.media.idl \ diff --git a/include/windows.media.capture.idl b/include/windows.media.capture.idl new file mode 100644 index 00000000000..6598467005a --- /dev/null +++ b/include/windows.media.capture.idl @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2023 Biswapriyo Nath + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.foundation.idl"; + +namespace Windows.Media.Capture { + typedef enum MediaCategory MediaCategory; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum MediaCategory + { + Other = 0, + Communications = 1, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Media = 2, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + GameChat = 3, + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + Speech = 4, + [contract(Windows.Foundation.UniversalApiContract, 12.0)] + FarFieldSpeech = 5, + [contract(Windows.Foundation.UniversalApiContract, 12.0)] + UniformSpeech = 6, + [contract(Windows.Foundation.UniversalApiContract, 12.0)] + VoiceTyping = 7, + }; +}

1 0

Paul Gofman : user32/msgbox: Implement MB_TOPMOST.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: wine Branch: master Commit: b34c21637682673ca9c822e13e915df52232db35 URL: https://gitlab.winehq.org/wine/wine/-/commit/b34c21637682673ca9c822e13e915d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 29 18:19:44 2023 -0600 user32/msgbox: Implement MB_TOPMOST. --- dlls/user32/msgbox.c | 6 ++++-- dlls/user32/tests/dialog.c | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 4a14a868c73..4d345777a10 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -110,10 +110,12 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) } /* handle modal message boxes */ - if (((lpmb->dwStyle & MB_TASKMODAL) && (lpmb->hwndOwner==NULL))) - NtUserSetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); + if (lpmb->dwStyle & MB_TASKMODAL && lpmb->hwndOwner == NULL) + NtUserSetWindowPos( hwnd, lpmb->dwStyle & MB_TOPMOST ? HWND_TOPMOST : HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE ); else if (lpmb->dwStyle & MB_SYSTEMMODAL) NtUserSetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED ); + else if (lpmb->dwStyle & MB_TOPMOST) + NtUserSetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); TRACE_(msgbox)("%s\n", debugstr_w(lpszText)); SetWindowTextW(GetDlgItem(hwnd, MSGBOX_IDTEXT), lpszText); diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 99f52769e73..a24bfafd0b9 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2149,8 +2149,7 @@ static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) if (!system_modal) expected_exstyles |= WS_EX_DLGMODALFRAME; - todo_wine_if((system_modal && exstyles == (expected_exstyles | WS_EX_DLGMODALFRAME)) - || (!system_modal && msgbox_type & MB_TOPMOST)) + todo_wine_if(system_modal && exstyles == (expected_exstyles | WS_EX_DLGMODALFRAME)) ok(exstyles == expected_exstyles, "got %#lx, expected %#lx\n", exstyles, expected_exstyles); text[0] = 0;

1 0

Paul Gofman : user32/tests: Test more flags for MessageBox.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: wine Branch: master Commit: adf77c1abe6af1dfa746a5299c772947c575070a URL: https://gitlab.winehq.org/wine/wine/-/commit/adf77c1abe6af1dfa746a5299c7729… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Aug 29 19:13:56 2023 -0600 user32/tests: Test more flags for MessageBox. --- dlls/user32/tests/dialog.c | 72 ++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 21958ddb193..99f52769e73 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -2123,15 +2123,36 @@ static void test_timer_message(void) DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc); } +static unsigned int msgbox_hook_proc_called; +static UINT msgbox_type; + static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) { + static const LONG considered_ex_styles = WS_EX_CONTROLPARENT | WS_EX_WINDOWEDGE | WS_EX_DLGMODALFRAME | WS_EX_TOPMOST; + if (code == HCBT_ACTIVATE) { HWND msgbox = (HWND)wParam, msghwnd; + LONG exstyles, expected_exstyles; + BOOL system_modal; char text[64]; if (msgbox) { + exstyles = GetWindowLongA(msgbox, GWL_EXSTYLE) & considered_ex_styles; + + ++msgbox_hook_proc_called; + system_modal = msgbox_type & MB_SYSTEMMODAL && !(msgbox_type & MB_TASKMODAL); + expected_exstyles = WS_EX_CONTROLPARENT | WS_EX_WINDOWEDGE; + if ((msgbox_type & MB_TOPMOST) || system_modal) + expected_exstyles |= WS_EX_TOPMOST; + if (!system_modal) + expected_exstyles |= WS_EX_DLGMODALFRAME; + + todo_wine_if((system_modal && exstyles == (expected_exstyles | WS_EX_DLGMODALFRAME)) + || (!system_modal && msgbox_type & MB_TOPMOST)) + ok(exstyles == expected_exstyles, "got %#lx, expected %#lx\n", exstyles, expected_exstyles); + text[0] = 0; GetWindowTextA(msgbox, text, sizeof(text)); ok(!strcmp(text, "MSGBOX caption"), "Unexpected window text \"%s\"\n", text); @@ -2141,26 +2162,9 @@ static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) text[0] = 0; GetWindowTextA(msghwnd, text, sizeof(text)); - ok(!strcmp(text, "Text"), "Unexpected window text \"%s\"\n", text); - - SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); - SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0); - } - } - - return CallNextHookEx(NULL, code, wParam, lParam); -} - -static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARAM lParam) -{ - if (code == HCBT_ACTIVATE) - { - HWND msgbox = (HWND)wParam; - LONG exstyles = GetWindowLongA(msgbox, GWL_EXSTYLE); - if (msgbox) - { - ok(exstyles & WS_EX_TOPMOST, "expected message box to have topmost exstyle set\n"); + todo_wine_if(msgbox_type != MB_OKCANCEL && !*text) + ok(!strcmp(text, "Text"), "Unexpected window text \"%s\"\n", text); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONDOWN, 0, 0); SendDlgItemMessageA(msgbox, IDCANCEL, WM_LBUTTONUP, 0, 0); @@ -2172,20 +2176,32 @@ static LRESULT CALLBACK msgbox_sysmodal_hook_proc(INT code, WPARAM wParam, LPARA static void test_MessageBox(void) { + static const UINT tests[] = + { + MB_OKCANCEL, + MB_OKCANCEL | MB_SYSTEMMODAL, + MB_OKCANCEL | MB_TASKMODAL | MB_SYSTEMMODAL, + MB_OKCANCEL | MB_TOPMOST, + MB_OKCANCEL | MB_TOPMOST | MB_SYSTEMMODAL, + MB_OKCANCEL | MB_TASKMODAL | MB_TOPMOST, + MB_OKCANCEL | MB_TASKMODAL | MB_SYSTEMMODAL | MB_TOPMOST, + }; + unsigned int i; HHOOK hook; int ret; hook = SetWindowsHookExA(WH_CBT, msgbox_hook_proc, NULL, GetCurrentThreadId()); - ret = MessageBoxA(NULL, "Text", "MSGBOX caption", MB_OKCANCEL); - ok(ret == IDCANCEL, "got %d\n", ret); - - UnhookWindowsHookEx(hook); - - /* Test for MB_SYSTEMMODAL */ - hook = SetWindowsHookExA(WH_CBT, msgbox_sysmodal_hook_proc, NULL, GetCurrentThreadId()); - - MessageBoxA(NULL, NULL, "system modal", MB_OKCANCEL | MB_SYSTEMMODAL); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + msgbox_type = tests[i]; + winetest_push_context("type %#x", msgbox_type); + msgbox_hook_proc_called = 0; + ret = MessageBoxA(NULL, "Text", "MSGBOX caption", msgbox_type); + ok(ret == IDCANCEL, "got %d\n", ret); + ok(msgbox_hook_proc_called, "got %u.\n", msgbox_hook_proc_called); + winetest_pop_context(); + } UnhookWindowsHookEx(hook); }

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX instruction StoreOutput.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: vkd3d Branch: master Commit: d27b8eb2c0d8e62d95558b72da31e5dbb406fa14 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d27b8eb2c0d8e62d95558b72da31e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 17 11:48:08 2023 +1000 vkd3d-shader/dxil: Implement DX instruction StoreOutput. --- libs/vkd3d-shader/dxil.c | 250 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 245 insertions(+), 5 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Declare shader outputs.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: vkd3d Branch: master Commit: bf49a1a95b50723ea41d12b23a79361f9d1eb915 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bf49a1a95b50723ea41d12b23a793… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 21 15:41:43 2023 +1000 vkd3d-shader/dxil: Declare shader outputs. --- include/vkd3d_shader.h | 2 + libs/vkd3d-shader/dxil.c | 96 +++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 3 -- 3 files changed, 98 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cfe54dbf..d329e205 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1463,6 +1463,8 @@ enum vkd3d_shader_sysval_semantic VKD3D_SHADER_SV_TESS_FACTOR_TRIINT = 0x0e, VKD3D_SHADER_SV_TESS_FACTOR_LINEDET = 0x0f, VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN = 0x10, + /** Render target; SV_Target in Direct3D shader model 6 shaders. */ + VKD3D_SHADER_SV_TARGET = 0x40, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC), }; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index fd5873dd..db03f0dd 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -290,6 +290,8 @@ struct sm6_parser struct sm6_symbol *global_symbols; size_t global_symbol_count; + struct vkd3d_shader_dst_param *output_params; + struct sm6_function *functions; size_t function_count; @@ -1951,6 +1953,81 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) return VKD3D_OK; } +static void dst_param_io_init(struct vkd3d_shader_dst_param *param, + const struct signature_element *e, enum vkd3d_shader_register_type reg_type) +{ + enum vkd3d_shader_component_type component_type; + + param->write_mask = e->mask; + param->modifiers = 0; + param->shift = 0; + /* DXIL types do not have signedness. Load signed elements as unsigned. */ + component_type = e->component_type == VKD3D_SHADER_COMPONENT_INT ? VKD3D_SHADER_COMPONENT_UINT : e->component_type; + shader_register_init(&param->reg, reg_type, vkd3d_data_type_from_component_type(component_type), 0); +} + +static void sm6_parser_init_signature(struct sm6_parser *sm6, const struct shader_signature *s, + enum vkd3d_shader_register_type reg_type, struct vkd3d_shader_dst_param *params) +{ + struct vkd3d_shader_dst_param *param; + const struct signature_element *e; + unsigned int i; + + for (i = 0; i < s->element_count; ++i) + { + e = &s->elements[i]; + + param = &params[i]; + dst_param_io_init(param, e, reg_type); + param->reg.idx[0].offset = i; + param->reg.idx_count = 1; + } +} + +static void sm6_parser_emit_signature(struct sm6_parser *sm6, const struct shader_signature *s, + enum vkd3d_shader_opcode handler_idx, enum vkd3d_shader_opcode siv_handler_idx, + struct vkd3d_shader_dst_param *params) +{ + struct vkd3d_shader_instruction *ins; + struct vkd3d_shader_dst_param *param; + const struct signature_element *e; + unsigned int i; + + for (i = 0; i < s->element_count; ++i) + { + e = &s->elements[i]; + + /* Do not check e->used_mask because in some cases it is zero for used elements. + * TODO: scan ahead for used I/O elements. */ + + if (e->sysval_semantic != VKD3D_SHADER_SV_NONE && e->sysval_semantic != VKD3D_SHADER_SV_TARGET) + { + ins = sm6_parser_add_instruction(sm6, siv_handler_idx); + param = &ins->declaration.register_semantic.reg; + ins->declaration.register_semantic.sysval_semantic = vkd3d_siv_from_sysval(e->sysval_semantic); + } + else + { + ins = sm6_parser_add_instruction(sm6, handler_idx); + param = &ins->declaration.dst; + } + + *param = params[i]; + } +} + +static void sm6_parser_init_output_signature(struct sm6_parser *sm6, const struct shader_signature *output_signature) +{ + sm6_parser_init_signature(sm6, output_signature, + (sm6->p.shader_version.type == VKD3D_SHADER_TYPE_PIXEL) ? VKD3DSPR_COLOROUT : VKD3DSPR_OUTPUT, + sm6->output_params); +} + +static void sm6_parser_emit_output_signature(struct sm6_parser *sm6, const struct shader_signature *output_signature) +{ + sm6_parser_emit_signature(sm6, output_signature, VKD3DSIH_DCL_OUTPUT, VKD3DSIH_DCL_OUTPUT_SIV, sm6->output_params); +} + static const struct sm6_value *sm6_parser_next_function_definition(struct sm6_parser *sm6) { size_t i, count = sm6->function_count; @@ -2365,6 +2442,7 @@ static const struct vkd3d_shader_parser_ops sm6_parser_ops = static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t *byte_code, size_t byte_code_size, const char *source_name, struct vkd3d_shader_message_context *message_context) { + const struct shader_signature *output_signature = &sm6->p.shader_desc.output_signature; const struct vkd3d_shader_location location = {.source_name = source_name}; uint32_t version_token, dxil_version, token_count, magic; unsigned int chunk_offset, chunk_size; @@ -2520,6 +2598,14 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + if (!(sm6->output_params = shader_parser_get_dst_params(&sm6->p, output_signature->element_count))) + { + ERR("Failed to allocate output parameters.\n"); + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory allocating output parameters."); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + function_count = dxil_block_compute_function_count(&sm6->root_block); if (!(sm6->functions = vkd3d_calloc(function_count, sizeof(*sm6->functions)))) { @@ -2550,6 +2636,8 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + sm6_parser_init_output_signature(sm6, output_signature); + if ((ret = sm6_parser_module_init(sm6, &sm6->root_block, 0)) < 0) { if (ret == VKD3D_ERROR_OUT_OF_MEMORY) @@ -2561,6 +2649,14 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } + if (!sm6_parser_require_space(sm6, output_signature->element_count)) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory emitting shader signature declarations."); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + sm6_parser_emit_output_signature(sm6, output_signature); + for (i = 0; i < sm6->function_count; ++i) { if (!sm6_block_emit_instructions(sm6->functions[i].blocks[0], sm6)) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 38f90966..273a543a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1771,9 +1771,6 @@ void *shader_param_allocator_get(struct vkd3d_shader_param_allocator *allocator, { void *params; - if (!count) - return NULL; - if (count > allocator->count - allocator->index) { struct vkd3d_shader_param_node *next = shader_param_allocator_node_create(allocator);

1 0

Conor McCarthy : vkd3d-shader/dxil: Replace the result type enum with a bool.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: vkd3d Branch: master Commit: 720a087c2846f0f8ec458a01c85cfd6e7cdbf3dc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/720a087c2846f0f8ec458a01c85cf… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 30 11:45:59 2023 +1000 vkd3d-shader/dxil: Replace the result type enum with a bool. Changes to failure handling make the enum unnecessary. --- libs/vkd3d-shader/dxil.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e1cef5dc..96e593b8 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1855,15 +1855,10 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const { struct vkd3d_shader_instruction *ins; const struct dxil_record *record; + bool ret_found, is_terminator; struct sm6_block *code_block; struct sm6_value *dst; size_t i, block_idx; - bool ret_found; - enum - { - RESULT_VALUE, - RESULT_TERMINATE, - } result_type; if (sm6->function_count) { @@ -1934,14 +1929,14 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const dst = sm6_parser_get_current_value(sm6); dst->type = NULL; dst->value_type = VALUE_TYPE_REG; - result_type = RESULT_VALUE; + is_terminator = false; record = block->records[i]; switch (record->code) { case FUNC_CODE_INST_RET: sm6_parser_emit_ret(sm6, record, code_block, ins); - result_type = RESULT_TERMINATE; + is_terminator = true; ret_found = true; break; default: @@ -1949,7 +1944,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const return VKD3D_ERROR_INVALID_SHADER; } - if (result_type == RESULT_TERMINATE) + if (is_terminator) { ++block_idx; code_block = (block_idx < function->block_count) ? function->blocks[block_idx] : NULL;

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement the DXIL CALL instruction.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: vkd3d Branch: master Commit: e54f770669fb8ba8a8ebf7bd4c0a039be23e6279 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e54f770669fb8ba8a8ebf7bd4c0a0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed May 17 00:09:19 2023 +1000 vkd3d-shader/dxil: Implement the DXIL CALL instruction. --- libs/vkd3d-shader/dxil.c | 263 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 9 ++ 3 files changed, 270 insertions(+), 4 deletions(-)

1 0

Conor McCarthy : vkd3d-shader/dxil: Validate the function block count.
by Alexandre Julliard Aug. 30, 2023

Aug. 30, 2023

Module: vkd3d Branch: master Commit: 58d6e445014ba88010ef2b083414799d1eb83349 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/58d6e445014ba88010ef2b0834147… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jul 31 16:23:08 2023 +1000 vkd3d-shader/dxil: Validate the function block count. --- libs/vkd3d-shader/dxil.c | 8 ++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f9efe47f..e1cef5dc 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -1911,6 +1911,14 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const { sm6->p.location.column = i; + if (!code_block) + { + WARN("Invalid block count %zu.\n", function->block_count); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, + "Invalid block count %zu.", function->block_count); + return VKD3D_ERROR_INVALID_SHADER; + } + /* block->record_count - 1 is the instruction count, but some instructions * can emit >1 IR instruction, so extra may be used. */ if (!vkd3d_array_reserve((void **)&code_block->instructions, &code_block->instruction_capacity, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 84614a4e..35f9acd9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -173,6 +173,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_FUNCTION_DCL = 8009, VKD3D_SHADER_ERROR_DXIL_INVALID_TYPE_ID = 8010, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE = 8011, + VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND = 8012, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301,

1 0