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

Giovanni Mascellani : vkd3d-shader/hlsl: Allow majority modifiers on function declarations.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: vkd3d Branch: master Commit: bb49bdba6a4d33c2c33d9061f8b6f151aabf113e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bb49bdba6a4d33c2c33d906… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 10 15:08:37 2022 +0200 vkd3d-shader/hlsl: Allow majority modifiers on function declarations. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 44e4964f..faac562a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2726,14 +2726,18 @@ func_prototype: /* var_modifiers is necessary to avoid shift/reduce conflicts. */ var_modifiers type var_identifier '(' parameters ')' colon_attribute { + unsigned int modifiers = $1; struct hlsl_ir_var *var; + struct hlsl_type *type; - if ($1) + if (modifiers & ~HLSL_MODIFIERS_MAJORITY_MASK) { hlsl_error(ctx, &@1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers are not allowed on functions."); + "Only majority modifiers are allowed on functions."); YYABORT; } + if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) + YYABORT; if ((var = hlsl_get_var(ctx->globals, $3))) { hlsl_error(ctx, &@3, VKD3D_SHADER_ERROR_HLSL_REDEFINED, @@ -2742,7 +2746,7 @@ func_prototype: "\"%s\" was previously declared here.", $3); YYABORT; } - if (hlsl_types_are_equal($2, ctx->builtin_types.Void) && $7.semantic.name) + if (hlsl_types_are_equal(type, ctx->builtin_types.Void) && $7.semantic.name) { hlsl_error(ctx, &@7, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Semantics are not allowed on void functions."); @@ -2751,7 +2755,7 @@ func_prototype: if ($7.reg_reservation.type) FIXME("Unexpected register reservation for a function.\n"); - if (!($$.decl = hlsl_new_func_decl(ctx, $2, $5, &$7.semantic, @3))) + if (!($$.decl = hlsl_new_func_decl(ctx, type, $5, &$7.semantic, @3))) YYABORT; $$.name = $3; ctx->cur_function = $$.decl;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Offset register id for input/ouput variables.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: vkd3d Branch: master Commit: e39559690be3ede767ebe5a178bbd33f7e733662 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e39559690be3ede767ebe5a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue May 10 15:08:36 2022 +0200 vkd3d-shader/hlsl: Offset register id for input/ouput variables. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index a5fc094b..a6ac2aa3 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -891,7 +891,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (has_idx) { - reg->idx[0] = var->semantic.index; + reg->idx[0] = var->semantic.index + offset / 4; reg->idx_count = 1; } @@ -922,7 +922,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (has_idx) { - reg->idx[0] = var->semantic.index; + reg->idx[0] = var->semantic.index + offset / 4; reg->idx_count = 1; }

1 0

Conor McCarthy : vkd3d: Map timeline semaphore values to fence virtual values and buffer out-of-order waits.
by Alexandre Julliard May 13, 2022

May 13, 2022

Module: vkd3d Branch: master Commit: 8cae04680307141c06c5d7f82b5568a8b3380e96 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cae04680307141c06c5d7f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 13 01:11:06 2022 +1000 vkd3d: Map timeline semaphore values to fence virtual values and buffer out-of-order waits. Strictly increasing timeline values must be mapped to fence virtual values to avoid invalid use of Vulkan timeline semaphores. In particular, non- increasing values and value jumps of >= 4G are permitted in d3d12. Different virtual D3D12 command queues may map to the same Vulkan queue. If a wait of value N is submitted on one command queue, and then a signal for >= N is submitted on another, but they are sent to the same Vk queue, the wait will never complete. The solution is to buffer out-of-order waits and any subsequent queue commands until an unblocking signal value is submitted to a different D3D12 queue, or signaled on the CPU. Buffering out-of-order waits also fixes the old fence implementation so it is fully functional, though a bit less efficient than timeline semaphores. Based in part on vkd3d-proton patches by Hans-Kristian Arntzen. Unlike the vkd3d-proton implementation, this patch does not use worker threads for submissions to the Vulkan queue. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 894 +++++++++++++++++++++++++++------------------ libs/vkd3d/device.c | 81 +--- libs/vkd3d/vkd3d_private.h | 78 +++- tests/d3d12.c | 4 +- 4 files changed, 602 insertions(+), 455 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=8cae04680307141c06c…

1 0

Jeremy Newman : fix date
by Jeremy Newman May 13, 2022

May 13, 2022

Module: website Branch: master Commit: 9a3ad2d6b19cc0c64fa2ec064403c5941d44136c URL: https://source.winehq.org/git/website.git/?a=commit;h=9a3ad2d6b19cc0c64fa2e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 13 08:48:50 2022 -0500 fix date --- news/en/2022051302.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/en/2022051302.xml b/news/en/2022051302.xml index fcba75b4..b2bfbf8c 100644 --- a/news/en/2022051302.xml +++ b/news/en/2022051302.xml @@ -1,5 +1,5 @@ <news> - <date>May 5, 2022</date> + <date>May 13, 2022</date> <title>World Wine News Issue 418</title> <body> <a href="{$root}/wwn/418">WWN Issue 418</a> was released today.

1 0

Cressida Silver : WWN #418.
by Jeremy Newman May 13, 2022

May 13, 2022

Module: website Branch: master Commit: 8119a086d7346629ce29447901aaac9636bd49b3 URL: https://source.winehq.org/git/website.git/?a=commit;h=8119a086d7346629ce294… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri May 13 08:14:25 2022 -0500 WWN #418. --- news/en/2022051302.xml | 13 ++ wwn/en/wn20220513_418.xml | 456 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 469 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=8119a086d7346629c…

1 0

Piotr Caban : msvcrt: Reject UTF-8 locales in setlocale function.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: b35faeb5035a8ed1480577a34603170fc0e2f901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b35faeb5035a8ed1480577a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 16:54:03 2022 +0200 msvcrt: Reject UTF-8 locales in setlocale function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 2 +- dlls/msvcrt/locale.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 55d077c6de9..d6502b0f0fa 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -134,7 +134,7 @@ static void test_setlocale(void) ok(ret != NULL, "expected success, but got NULL\n"); if(!strcmp(names[i], "syr-SY") && GetACP() == CP_UTF8) { - todo_wine ok(!strcmp(ret, "LC_COLLATE=syr-SY;LC_CTYPE=EN-US;LC_MONETARY=syr-SY;" + ok(!strcmp(ret, "LC_COLLATE=syr-SY;LC_CTYPE=EN-US;LC_MONETARY=syr-SY;" "LC_NUMERIC=syr-SY;LC_TIME=syr-SY"), "got %s\n", ret); } else diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 0fd99a40c86..16ed68cdebd 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1334,6 +1334,14 @@ static pthreadlocinfo create_locinfo(int category, } for(i=1; i<6; i++) { +#if _MSVCR_VER < 140 + if(i==LC_CTYPE && cp[i]==CP_UTF8) { + locale_name[i] = NULL; + locale_len[i] = 0; + lcid[i] = old_locinfo ? old_locinfo->lc_handle[i] : 0; + cp[i] = old_locinfo ? old_locinfo->lc_id[i].wCodePage : 0; + } +#endif if(category!=LC_ALL && category!=i) { if(old_locinfo) { lcid[i] = old_locinfo->lc_handle[i];

1 0

Piotr Caban : msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: fac521ee33aa9ca793967d6e3a89821f760ab262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fac521ee33aa9ca793967d6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 12 16:53:57 2022 +0200 msvcr110/tests: Fix setlocale test failure on systems with UTF-8 locales enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52937 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr110/tests/msvcr110.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index f88e3122ac9..55d077c6de9 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -132,7 +132,15 @@ static void test_setlocale(void) for(i=0; i<ARRAY_SIZE(names); i++) { ret = p_setlocale(LC_ALL, names[i]); ok(ret != NULL, "expected success, but got NULL\n"); - ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret); + if(!strcmp(names[i], "syr-SY") && GetACP() == CP_UTF8) + { + todo_wine ok(!strcmp(ret, "LC_COLLATE=syr-SY;LC_CTYPE=EN-US;LC_MONETARY=syr-SY;" + "LC_NUMERIC=syr-SY;LC_TIME=syr-SY"), "got %s\n", ret); + } + else + { + ok(!strcmp(ret, names[i]), "expected %s, got %s\n", names[i], ret); + } } ret = p_setlocale(LC_ALL, "en-us.1250");

1 0

Alistair Leslie-Hughes : include: Add TF_TMF/TMAW defines.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 5d5b2acf983dba5b44190c8b353e88444db670c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5b2acf983dba5b44190c8b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 11 08:40:11 2022 +1000 include: Add TF_TMF/TMAW defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msctf.idl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index 5ef33119fd8..dd9997211a4 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -85,6 +85,23 @@ cpp_quote("#define TF_PROFILETYPE_KEYBOARDLAYOUT 0x0002") cpp_quote("#define TF_IPSINK_FLAG_ACTIVE 0x0001") +cpp_quote("#define TF_TMAE_NOACTIVATETIP 0x00000001") +cpp_quote("#define TF_TMAE_SECUREMODE 0x00000002") +cpp_quote("#define TF_TMAE_UIELEMENTENABLEDONLY 0x00000004") +cpp_quote("#define TF_TMAE_COMLESS 0x00000008") +cpp_quote("#define TF_TMAE_WOW16 0x00000010") +cpp_quote("#define TF_TMAE_NOACTIVATEKEYBOARDLAYOUT 0x00000020") +cpp_quote("#define TF_TMAE_CONSOLE 0x00000040") + +cpp_quote("#define TF_TMF_NOACTIVATETIP TF_TMAE_NOACTIVATETIP") +cpp_quote("#define TF_TMF_SECUREMODE TF_TMAE_SECUREMODE") +cpp_quote("#define TF_TMF_UIELEMENTENABLEDONLY TF_TMAE_UIELEMENTENABLEDONLY") +cpp_quote("#define TF_TMF_COMLESS TF_TMAE_COMLESS") +cpp_quote("#define TF_TMF_WOW16 TF_TMAE_WOW16") +cpp_quote("#define TF_TMF_CONSOLE TF_TMAE_CONSOLE") +cpp_quote("#define TF_TMF_IMMERSIVEMODE 0x40000000") +cpp_quote("#define TF_TMF_ACTIVATED 0x80000000") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs;

1 0

Ziqing Hui : include: Add defines for D2D1_PROPERTY_BINDING.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 950c2da65b1dbd26f4f2a569e3d61221f3dfc7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=950c2da65b1dbd26f4f2a569… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 11 19:56:01 2022 +0800 include: Add defines for D2D1_PROPERTY_BINDING. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index b53aa515e85..a58ec35b4b5 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -18,6 +18,12 @@ import "d2d1_1.idl"; +typedef HRESULT (__stdcall *PD2D1_PROPERTY_SET_FUNCTION)(IUnknown *effect, + const BYTE *data, UINT32 data_size); + +typedef HRESULT (__stdcall *PD2D1_PROPERTY_GET_FUNCTION)(const IUnknown *effect, + BYTE *data, UINT32 data_size, UINT32 *actual_size); + typedef enum D2D1_FILTER { D2D1_FILTER_MIN_MAG_MIP_POINT = 0x00, @@ -39,6 +45,13 @@ typedef enum D2D1_FEATURE D2D1_FEATURE_FORCE_DWORD = 0xffffffff } D2D1_FEATURE; +typedef struct D2D1_PROPERTY_BINDING +{ + const WCHAR *propertyName; + PD2D1_PROPERTY_SET_FUNCTION setFunction; + PD2D1_PROPERTY_GET_FUNCTION getFunction; +} D2D1_PROPERTY_BINDING; + typedef enum D2D1_CHANNEL_DEPTH { D2D1_CHANNEL_DEPTH_DEFAULT = 0x0,

1 0

Jacek Caban : win32u: Move default WM_ERASEBKGND implementation from user32.
by Alexandre Julliard May 12, 2022

May 12, 2022

Module: wine Branch: master Commit: 63ce060e5b33ca4b58d508be11af4d3c214fae33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ce060e5b33ca4b58d508be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 11 21:00:01 2022 +0200 win32u: Move default WM_ERASEBKGND implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 19 ------------------- dlls/win32u/defwnd.c | 28 ++++++++++++++++++++++++++++ dlls/win32u/input.c | 9 --------- dlls/win32u/win32u_private.h | 1 + 4 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index af2b32614bc..74dfa609bbd 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -266,25 +266,6 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa DEFWND_Print(hwnd, (HDC)wParam, lParam); return 0; - case WM_ERASEBKGND: - case WM_ICONERASEBKGND: - { - RECT rect; - HDC hdc = (HDC)wParam; - HBRUSH hbr = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND ); - if (!hbr) return 0; - - if (GetClassLongW( hwnd, GCL_STYLE ) & CS_PARENTDC) - { - /* can't use GetClipBox with a parent DC or we fill the whole parent */ - GetClientRect( hwnd, &rect ); - DPtoLP( hdc, (LPPOINT)&rect, 2 ); - } - else GetClipBox( hdc, &rect ); - FillRect( hdc, &rect, hbr ); - return 1; - } - case WM_CTLCOLORMSGBOX: case WM_CTLCOLOREDIT: case WM_CTLCOLORLISTBOX: diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 72d9aa40164..ec9a1685325 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -31,6 +31,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush ) +{ + HBRUSH prev_brush; + + prev_brush = NtGdiSelectBrush( dc, hbrush ); + NtGdiPatBlt( dc, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, PATCOPY ); + if (prev_brush) NtGdiSelectBrush( dc, prev_brush ); +} + /*********************************************************************** * AdjustWindowRectEx (win32u.so) */ @@ -310,6 +319,25 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, result = send_message( get_parent( hwnd ), WM_MOUSEWHEEL, wparam, lparam ); break; + case WM_ERASEBKGND: + case WM_ICONERASEBKGND: + { + RECT rect; + HDC hdc = (HDC)wparam; + HBRUSH hbr = UlongToHandle( get_class_long( hwnd, GCLP_HBRBACKGROUND, FALSE )); + if (!hbr) break; + + if (get_class_long( hwnd, GCL_STYLE, FALSE ) & CS_PARENTDC) + { + /* can't use GetClipBox with a parent DC or we fill the whole parent */ + get_client_rect( hwnd, &rect ); + NtGdiTransformPoints( hdc, (POINT *)&rect, (POINT *)&rect, 1, NtGdiDPtoLP ); + } + else NtGdiGetAppClipBox( hdc, &rect ); + fill_rect( hdc, &rect, hbr ); + return 1; + } + case WM_GETDLGCODE: break; diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index 877e3f1a064..2b196fb5b1d 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1799,15 +1799,6 @@ static void display_caret( HWND hwnd, const RECT *r ) NtUserReleaseDC( hwnd, dc ); } -static void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush ) -{ - HBRUSH prev_brush; - - prev_brush = NtGdiSelectBrush( dc, hbrush ); - NtGdiPatBlt( dc, rect->left, rect->top, rect->right - rect->left, rect->bottom - rect->top, PATCOPY ); - if (prev_brush) NtGdiSelectBrush( dc, prev_brush ); -} - static unsigned int get_caret_registry_timeout(void) { char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[11 * sizeof(WCHAR)])]; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index ea6d67750b4..63eca06ecd6 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -353,6 +353,7 @@ extern void register_window_surface( struct window_surface *old, /* defwnd.c */ extern LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; +extern void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush ) DECLSPEC_HIDDEN; /* hook.c */ extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;

1 0