February 2023 - Wine-commits

Francois Gouget : winex11.drv: Fix a typo in a comment.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 9338531ee40785f2237414205f8ba050e640acc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9338531ee40785f2237414205f8ba0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:34:44 2023 +0100 winex11.drv: Fix a typo in a comment. --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 98b0b23e103..17fc6d867f5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -984,7 +984,7 @@ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) if (!(data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()) return; - /* If the current display device handler can not detect dynamic device changes, do not use + /* If the current display device handler cannot detect dynamic device changes, do not use * _NET_WM_FULLSCREEN_MONITORS because xinerama_get_fullscreen_monitors() may report wrong * indices because of stale xinerama monitor information */ if (!X11DRV_DisplayDevices_SupportEventHandlers())

1 0

Francois Gouget : winevulkan: Add a trailing linefeed to some FIXME() thunk messages.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 348fafcdbb9f62e545ccf2ae80b0cac98c0a4d04 URL: https://gitlab.winehq.org/wine/wine/-/commit/348fafcdbb9f62e545ccf2ae80b0ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:37:37 2023 +0100 winevulkan: Add a trailing linefeed to some FIXME() thunk messages. --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 152 ++++++++++++++++++++-------------------- 2 files changed, 77 insertions(+), 77 deletions(-)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: be6cc4f135cc45fb97f892a34d41ddcdc8441c4a URL: https://gitlab.winehq.org/wine/wine/-/commit/be6cc4f135cc45fb97f892a34d41dd… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Feb 14 00:01:20 2023 +0200 po: Update Lithuanian translation. --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 1f8c29da30c..2e90152c5b3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-12-01 23:35+0200\n" +"PO-Revision-Date: 2023-02-13 23:59+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -3711,16 +3711,12 @@ msgid "High" msgstr "Aukštos" #: dlls/ir50_32/ir50_32.rc:28 -#, fuzzy -#| msgid "Index" msgid "Indeo5" -msgstr "Indeksas" +msgstr "Indeo5" #: dlls/ir50_32/ir50_32.rc:29 -#, fuzzy -#| msgid "Wine Video 1 video codec" msgid "Indeo Video Interactive version 5 video codec" -msgstr "„Wine“ Video 1 vaizdo kodekas" +msgstr "Indeo Video 5 interaktyvus vaizdo kodekas" #: dlls/joy.cpl/joy.rc:37 msgid "Joysticks"

1 0

Zebediah Figura : vkd3d-shader/hlsl: Allow empty parameter lists to be specified as "(void)".
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: vkd3d Branch: master Commit: cd6e8b5540bf278e871dbaaa6f1b750bcdd87bd4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cd6e8b5540bf278e871dbaaa6f1b7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 13 17:38:03 2023 -0600 vkd3d-shader/hlsl: Allow empty parameter lists to be specified as "(void)". --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++------ tests/hlsl-function.shader_test | 4 ++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3bad2acc..7caba3e0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3721,6 +3721,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <type> unnamed_struct_spec %type <type> struct_spec %type <type> type +%type <type> type_no_void %type <type> typedef_type %type <variable_def> type_spec @@ -4233,6 +4234,10 @@ parameters: { memset(&$$, 0, sizeof($$)); } + | scope_start KW_VOID + { + memset(&$$, 0, sizeof($$)); + } | scope_start param_list { $$ = $2; @@ -4260,7 +4265,7 @@ param_list: } parameter: - var_modifiers type any_identifier colon_attribute + var_modifiers type_no_void any_identifier colon_attribute { struct hlsl_type *type; unsigned int modifiers = $1; @@ -4321,7 +4326,7 @@ uav_type: $$ = HLSL_SAMPLER_DIM_3D; } -type: +type_no_void: KW_VECTOR '<' type ',' C_INTEGER '>' { if ($3->type != HLSL_CLASS_SCALAR) @@ -4382,10 +4387,6 @@ type: { $$ = hlsl_get_matrix_type(ctx, HLSL_TYPE_FLOAT, 4, 4); } - | KW_VOID - { - $$ = ctx->builtin_types.Void; - } | KW_SAMPLER { $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_GENERIC]; @@ -4467,6 +4468,13 @@ type: vkd3d_free($2); } +type: + type_no_void + | KW_VOID + { + $$ = ctx->builtin_types.Void; + } + declaration_statement: declaration | struct_declaration diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index 80412727..75521d4d 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -149,7 +149,7 @@ void func() { } -[pixel shader todo] +[pixel shader] /* This is something of an internal test: we need to make sure that we use the * correct variables for a function's arguments and returns regardless of @@ -176,7 +176,7 @@ float4 main() : sv_target } [test] -todo draw quad +draw quad todo probe all rgba (0.1, 0.2, 0.3, 0.4) [pixel shader]

1 0

Zebediah Figura : vkd3d-shader/hlsl: Always set ctx->cur_function in the func_prototype_no_attrs rule.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: vkd3d Branch: master Commit: 0e60f4cc69a1f8f4650eba495a04d539d9d4e685 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0e60f4cc69a1f8f4650eba495a04d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 13 17:40:18 2023 -0600 vkd3d-shader/hlsl: Always set ctx->cur_function in the func_prototype_no_attrs rule. Fixes: 4c46075d864c2959a0c042c6bc7201fc40c414ba --- libs/vkd3d-shader/hlsl.y | 3 ++- tests/hlsl-function.shader_test | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 7caba3e0..95c1c0fa 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -4138,12 +4138,13 @@ func_prototype_no_attrs: { if (!($$.decl = hlsl_new_func_decl(ctx, type, &$5, &$7.semantic, &@3))) YYABORT; - ctx->cur_function = $$.decl; hlsl_add_function(ctx, $3, $$.decl); $$.first = true; } + + ctx->cur_function = $$.decl; } func_prototype: diff --git a/tests/hlsl-function.shader_test b/tests/hlsl-function.shader_test index 75521d4d..c836808d 100644 --- a/tests/hlsl-function.shader_test +++ b/tests/hlsl-function.shader_test @@ -177,7 +177,7 @@ float4 main() : sv_target [test] draw quad -todo probe all rgba (0.1, 0.2, 0.3, 0.4) +probe all rgba (0.1, 0.2, 0.3, 0.4) [pixel shader]

1 0

Eric Pouech : riched20/tests: Add tests when pasting in plain text mode.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 82fa1048b5cc7d9c6a2a289403f25adbdd8158c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/82fa1048b5cc7d9c6a2a289403f25a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 13 13:02:52 2023 +0100 riched20/tests: Add tests when pasting in plain text mode. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/riched20/tests/editor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 07af9ab5dbd..14a7558ee17 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1409,6 +1409,7 @@ static void test_EM_SETTEXTMODE(void) { HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2A cf2, cf2test; + unsigned int len; CHARRANGE cr; int rc = 0; @@ -1480,6 +1481,10 @@ static void test_EM_SETTEXTMODE(void) /*Paste the italicized "wine" into the control*/ SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + len = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); + todo_wine + ok(len == 8 /*winewine*/, "Unexpected text length %u\n", len); + /*Select a character from the first "wine" string*/ cr.cpMin = 2; cr.cpMax = 3;

1 0

Eric Pouech : riched20: Support SFF_SELECTION when streaming in plain text.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 1b7a918bd7ec8bc2c51bcb76525b56b17c5ff0c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b7a918bd7ec8bc2c51bcb76525b56… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 13 13:02:54 2023 +0100 riched20: Support SFF_SELECTION when streaming in plain text. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/riched20/editor.c | 14 +++++++++++--- dlls/riched20/tests/editor.c | 1 - 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7b4f4b3cdf3..704546f1e95 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1609,9 +1609,17 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre { style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); - set_selection_cursors(editor, 0, 0); - ME_InternalDeleteText(editor, &editor->pCursors[1], - ME_GetTextLength(editor), FALSE); + if (format & SFF_SELECTION) + { + ME_GetSelection(editor, &selStart, &selEnd); + ME_InternalDeleteText(editor, selStart, to - from, FALSE); + } + else + { + set_selection_cursors(editor, 0, 0); + ME_InternalDeleteText(editor, &editor->pCursors[1], + ME_GetTextLength(editor), FALSE); + } from = to = 0; ME_ClearTempStyle(editor); editor_set_default_para_fmt( editor, &editor->pCursors[0].para->fmt ); diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 14a7558ee17..8fe64f1a9b5 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1482,7 +1482,6 @@ static void test_EM_SETTEXTMODE(void) SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); len = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); - todo_wine ok(len == 8 /*winewine*/, "Unexpected text length %u\n", len); /*Select a character from the first "wine" string*/

1 0

Eric Pouech : riched20/tests: Ensure clipboard has been pasted before testing the result.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 4fd5252f635817b431673accaba718c7481f48f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fd5252f635817b431673accaba718… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 13 13:02:55 2023 +0100 riched20/tests: Ensure clipboard has been pasted before testing the result. The patch does reduce error failures locally. For the record: - WM_PASTE in undo operations haven't been transformed (as it requires UNDO stack manipulation in a coherent way across platforms) Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47888 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/riched20/tests/editor.c | 53 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 8fe64f1a9b5..ab741f23035 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -1405,6 +1405,43 @@ static void test_EM_SETCHARFORMAT(void) DestroyWindow(hwndRichEdit); } +/* As the clipboard is a shared resource, it happens (on Windows) that the WM_PASTE + * is a no-op; likely because another app has opened the clipboard for inspection. + * In this case, WM_PASTE does nothing, and doesn't return an error code. + * So retry pasting a couple of times. + * Don't use this function if the paste operation shouldn't change the content of the + * editor (clipboard is empty without selection, edit control is read only...). + * Also impact on undo stack is not managed. + */ +#define send_paste(a) _send_paste(__LINE__, (a)) +static void _send_paste(unsigned int line, HWND wnd) +{ + int retries; + + SendMessageA(wnd, EM_SETMODIFY, FALSE, 0); + + for (retries = 0; retries < 7; retries++) + { + if (retries) Sleep(15); + SendMessageA(wnd, WM_PASTE, 0, 0); + if (SendMessageA(wnd, EM_GETMODIFY, 0, 0)) return; + } + ok_(__FILE__, line)(0, "Failed to paste clipboard content\n"); + { + char classname[256]; + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace("%p (%s) opened the clipboard\n", clipwnd, classname); + } +} + static void test_EM_SETTEXTMODE(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -1479,7 +1516,7 @@ static void test_EM_SETTEXTMODE(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); /*Paste the italicized "wine" into the control*/ - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); len = SendMessageA(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0); ok(len == 8 /*winewine*/, "Unexpected text length %u\n", len); @@ -1525,7 +1562,7 @@ static void test_EM_SETTEXTMODE(void) SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"wine"); /*Paste italicized "wine" into the control*/ - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); /*Select text from the first "wine" string*/ cr.cpMin = 1; @@ -1671,7 +1708,7 @@ static void test_TM_PLAINTEXT(void) /*Paste the plain text "wine" string, which should take the insert formatting, which at the moment is bold italics*/ - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); /*Select the first "wine" string and retrieve its formatting*/ @@ -4851,7 +4888,7 @@ static void test_EM_GETMODIFY(void) SendMessageA(hwndRichEdit, EM_SETMODIFY, FALSE, 0); SendMessageA(hwndRichEdit, EM_SETSEL, 0, 2); SendMessageA(hwndRichEdit, WM_COPY, 0, 0); - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); result = SendMessageA(hwndRichEdit, EM_GETMODIFY, 0, 0); ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero when pasting identical text\n"); @@ -4861,7 +4898,7 @@ static void test_EM_GETMODIFY(void) SendMessageA(hwndRichEdit, EM_SETSEL, 0, 2); SendMessageA(hwndRichEdit, WM_COPY, 0, 0); SendMessageA(hwndRichEdit, EM_SETSEL, 0, 3); - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); result = SendMessageA(hwndRichEdit, EM_GETMODIFY, 0, 0); ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero when pasting different text\n"); @@ -5561,7 +5598,7 @@ static void test_WM_PASTE(void) (MapVirtualKeyA('C', MAPVK_VK_TO_VSC) << 16) | 1); release_key(VK_CONTROL); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"testing"); ok(result == 0, @@ -5582,7 +5619,7 @@ static void test_WM_PASTE(void) ok(result == 0, "test paste: strcmp = %i, actual = '%s'\n", result, buffer); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, 0); - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer,"cut\r\n"); ok(result == 0, @@ -5632,7 +5669,7 @@ static void test_WM_PASTE(void) /* Paste multi-line text into single-line control */ hwndRichEdit = new_richedit_with_style(NULL, 0); - SendMessageA(hwndRichEdit, WM_PASTE, 0, 0); + send_paste(hwndRichEdit); SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); result = strcmp(buffer, "testing paste"); ok(result == 0,

1 0

Eric Pouech : riched20/tests: Add retry loop around OpenClipboard() to avoid access denial.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 25743d46f4103c7345c955b87b4134a065fb5f1d URL: https://gitlab.winehq.org/wine/wine/-/commit/25743d46f4103c7345c955b87b4134… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 13 13:02:57 2023 +0100 riched20/tests: Add retry loop around OpenClipboard() to avoid access denial. Reusing existing helper from user32 & comctl32. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47888 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/riched20/tests/richole.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index d648354729e..1c19d36dc0d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -4907,6 +4907,35 @@ static void test_character_movement(void) ITextRange_Release(range); } +static BOOL open_clipboard(HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + #define CLIPBOARD_RANGE_CONTAINS(range, start, end, expected) _clipboard_range_contains(range, start, end, expected, __LINE__, 0); #define TODO_CLIPBOARD_RANGE_CONTAINS(range, start, end, expected) _clipboard_range_contains(range, start, end, expected, __LINE__, 1); static void _clipboard_range_contains(ITextRange *range, LONG start, LONG end, const char *expected, int line, int todo) @@ -4921,7 +4950,7 @@ static void _clipboard_range_contains(ITextRange *range, LONG start, LONG end, c hr = ITextRange_Copy(range, NULL); ok_(__FILE__,line)(hr == S_OK, "Copy failed: 0x%08lx\n", hr); - clipboard_open = OpenClipboard(NULL); + clipboard_open = open_clipboard(NULL); ok_(__FILE__,line)(clipboard_open, "OpenClipboard failed: %ld\n", GetLastError()); global = GetClipboardData(CF_TEXT); ok_(__FILE__,line)(global != NULL, "GetClipboardData failed: %p\n", global);

1 0

Hans Leidekker : wpcap/tests: Initial tests.
by Alexandre Julliard 13 Feb '23

13 Feb '23

Module: wine Branch: master Commit: 8104688879e4cdc1110fd302a282dbdf4295fe05 URL: https://gitlab.winehq.org/wine/wine/-/commit/8104688879e4cdc1110fd302a282db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 7 09:40:54 2023 +0100 wpcap/tests: Initial tests. --- configure | 1 + configure.ac | 1 + dlls/wpcap/tests/Makefile.in | 4 + dlls/wpcap/tests/wpcap.c | 374 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 380 insertions(+)

1 0