August 2023 - Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/preproc: Expand macro arguments in macro invocations.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: vkd3d Branch: master Commit: 3a235b57f6db30d877400144f9c1082c254bbd1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3a235b57f6db30d877400144f9c10… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:13:41 2023 -0500 vkd3d-shader/preproc: Expand macro arguments in macro invocations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55361 --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++++++++ tests/preproc-macro.shader_test | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 20bf5cb5..faeb5d7a 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -634,6 +634,26 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (token) { + /* Most text gets left alone (e.g. if it contains macros, + * the macros should be evaluated later). + * Arguments are a special case, and are replaced with + * their values immediately. */ + case T_IDENTIFIER: + case T_IDENTIFIER_PAREN: + { + const struct preproc_text *expansion; + + if ((expansion = find_arg_expansion(ctx, text))) + { + preproc_push_expansion(ctx, expansion, NULL); + continue; + } + + if (current_arg) + preproc_text_add(current_arg, text); + break; + } + case T_NEWLINE: if (current_arg) preproc_text_add(current_arg, " "); diff --git a/tests/preproc-macro.shader_test b/tests/preproc-macro.shader_test index b2f2530e..8f073965 100644 --- a/tests/preproc-macro.shader_test +++ b/tests/preproc-macro.shader_test @@ -305,3 +305,9 @@ __LINE__ [preproc] #define KEY pass apple # KEY + +[preproc] +#define KEY2(x) x ## ss +#define KEY(a) KEY2(a) + +KEY(pa)

1 0

Zebediah Figura : vkd3d-shader/preproc: Parse hash marks as two separate tokens when not in stringification contexts.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: vkd3d Branch: master Commit: 9b98489155fb479d6b4c891db9a345086e830f3d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9b98489155fb479d6b4c891db9a34… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:08:29 2023 -0500 vkd3d-shader/preproc: Parse hash marks as two separate tokens when not in stringification contexts. --- libs/vkd3d-shader/preproc.l | 37 ++++++++++++++++++++++--------------- tests/preproc-macro.shader_test | 4 ++++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 8e35e355..20bf5cb5 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -29,6 +29,13 @@ #define YY_DECL static int preproc_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner) +static struct preproc_macro *preproc_get_top_macro(struct preproc_ctx *ctx) +{ + if (!ctx->expansion_count) + return NULL; + return ctx->expansion_stack[ctx->expansion_count - 1].macro; +} + static void update_location(struct preproc_ctx *ctx); #define YY_USER_ACTION update_location(yyget_extra(yyscanner)); @@ -124,7 +131,20 @@ INT_SUFFIX [uUlL]{0,2} const char *p; if (!ctx->last_was_newline) - return T_HASHSTRING; + { + struct preproc_macro *macro; + + /* Stringification is only done for function-like macro bodies. + * Anywhere else, we need to parse it as two separate tokens. + * We could use a state for this, but yyless() is easier and cheap. + */ + + if ((macro = preproc_get_top_macro(ctx)) && macro->arg_count) + return T_HASHSTRING; + + yyless(1); + return T_TEXT; + } for (p = yytext + 1; strchr(" \t", *p); ++p) ; @@ -218,13 +238,6 @@ static bool preproc_is_writing(struct preproc_ctx *ctx) return file->if_stack[file->if_count - 1].current_true; } -static struct preproc_macro *preproc_get_top_macro(struct preproc_ctx *ctx) -{ - if (!ctx->expansion_count) - return NULL; - return ctx->expansion_stack[ctx->expansion_count - 1].macro; -} - /* Concatenation is not done for object-like macros, but is done for both * function-like macro bodies and their arguments. */ static bool should_concat(struct preproc_ctx *ctx) @@ -440,9 +453,6 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (func_state->state) { case STATE_NONE: - { - struct preproc_macro *macro; - if (token == T_CONCAT && should_concat(ctx)) { while (ctx->buffer.content_size @@ -451,9 +461,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) break; } - /* Stringification, however, is only done for function-like - * macro bodies. */ - if (token == T_HASHSTRING && (macro = preproc_get_top_macro(ctx)) && macro->arg_count) + if (token == T_HASHSTRING) { const struct preproc_text *expansion; const char *p = text + 1; @@ -585,7 +593,6 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) else vkd3d_string_buffer_printf(&ctx->buffer, "%s ", text); break; - } case STATE_IDENTIFIER: if (token == '(') diff --git a/tests/preproc-macro.shader_test b/tests/preproc-macro.shader_test index 0fe73f7c..b2f2530e 100644 --- a/tests/preproc-macro.shader_test +++ b/tests/preproc-macro.shader_test @@ -301,3 +301,7 @@ fail [preproc] #define __LINE__ pass __LINE__ + +[preproc] +#define KEY pass +apple # KEY

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Free vkd3d_bytecode_buffer data on failure.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: vkd3d Branch: master Commit: 6e370777b484237f94800ec95c7b241755697b33 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6e370777b484237f94800ec95c7b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 27 00:42:46 2023 -0500 vkd3d-shader/d3dbc: Free vkd3d_bytecode_buffer data on failure. --- libs/vkd3d-shader/d3dbc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 34dc4bab..91910850 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2460,5 +2460,9 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun out->code = buffer.data; out->size = buffer.size; } + else + { + vkd3d_free(buffer.data); + } return ret; }

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Return ctx->result from hlsl_sm1_write().
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: vkd3d Branch: master Commit: 71afb78126488008f64716ae1df41910a8c5a2ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/71afb78126488008f64716ae1df41… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 26 18:42:42 2023 -0500 vkd3d-shader/d3dbc: Return ctx->result from hlsl_sm1_write(). --- libs/vkd3d-shader/d3dbc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 91910850..fe739339 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2442,7 +2442,6 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, struct vkd3d_shader_code *out) { struct vkd3d_bytecode_buffer buffer = {0}; - int ret; put_u32(&buffer, sm1_version(ctx->profile->type, ctx->profile->major_version, ctx->profile->minor_version)); @@ -2455,7 +2454,10 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun put_u32(&buffer, D3DSIO_END); - if (!(ret = buffer.status)) + if (buffer.status) + ctx->result = buffer.status; + + if (!ctx->result) { out->code = buffer.data; out->size = buffer.size; @@ -2464,5 +2466,5 @@ int hlsl_sm1_write(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun { vkd3d_free(buffer.data); } - return ret; + return ctx->result; }

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Skip generic sampler declarations.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: vkd3d Branch: master Commit: 1bd873fb2b887d6b4a21d0f009374ddf7cff8303 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1bd873fb2b887d6b4a21d0f009374… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 26 18:41:26 2023 -0500 vkd3d-shader/d3dbc: Skip generic sampler declarations. Instead of asserting. --- libs/vkd3d-shader/d3dbc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 9a147e3d..34dc4bab 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2034,7 +2034,12 @@ static void write_sm1_sampler_dcls(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b if (var->objects_usage[HLSL_REGSET_SAMPLERS][i].used) { sampler_dim = var->objects_usage[HLSL_REGSET_SAMPLERS][i].sampler_dim; - assert(sampler_dim != HLSL_SAMPLER_DIM_GENERIC); + if (sampler_dim == HLSL_SAMPLER_DIM_GENERIC) + { + /* These can appear in sm4-style combined sample instructions. */ + hlsl_fixme(ctx, &var->loc, "Generic samplers need to be lowered."); + continue; + } reg_id = var->regs[HLSL_REGSET_SAMPLERS].id + i; write_sm1_sampler_dcl(ctx, buffer, reg_id, sampler_dim);

1 0

Jacek Caban : win32u: Move more of unpack_message implementation from user32.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: b9740fcf4b57204ebc4ea1c52a01a16e3948af6f URL: https://gitlab.winehq.org/wine/wine/-/commit/b9740fcf4b57204ebc4ea1c52a01a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 00:49:42 2023 +0200 win32u: Move more of unpack_message implementation from user32. --- dlls/user32/user_private.h | 2 +- dlls/user32/winproc.c | 127 +++++---------------------------------------- dlls/win32u/message.c | 43 +++++++++++++++ 3 files changed, 56 insertions(+), 116 deletions(-) diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1a467712f0e..9330174a778 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -51,7 +51,7 @@ extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM const void *buffer, size_t size ) DECLSPEC_HIDDEN; extern void free_cached_data( UINT format, HANDLE handle ) DECLSPEC_HIDDEN; extern HANDLE render_synthesized_format( UINT format, UINT from ) DECLSPEC_HIDDEN; -extern BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, +extern void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void *buffer, size_t size, BOOL ansi ); extern void CLIPBOARD_ReleaseOwner( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 7d53269dc80..d0ebbb5ea8d 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -176,8 +176,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, { LRESULT ret = 0; - TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", - hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE( "(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); switch(msg) { @@ -415,8 +414,8 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, case WM_PAINTCLIPBOARD: case WM_SIZECLIPBOARD: - FIXME_(msg)( "message %s (0x%x) needs translation, please report\n", - SPY_GetMsgName(msg, hwnd), msg ); + FIXME( "message %s (0x%x) needs translation, please report\n", + SPY_GetMsgName(msg, hwnd), msg ); break; default: @@ -437,8 +436,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { LRESULT ret = 0; - TRACE_(msg)("(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", - hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam); + TRACE( "(hwnd=%p,msg=%s,wp=%08Ix,lp=%08Ix)\n", hwnd, SPY_GetMsgName(msg, hwnd), wParam, lParam ); switch(msg) { @@ -683,8 +681,8 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN case WM_PAINTCLIPBOARD: case WM_SIZECLIPBOARD: - FIXME_(msg)( "message %s (%04x) needs translation, please report\n", - SPY_GetMsgName(msg, hwnd), msg ); + FIXME( "message %s (%04x) needs translation, please report\n", + SPY_GetMsgName(msg, hwnd), msg ); break; default: @@ -738,13 +736,11 @@ static size_t string_size( const void *str, BOOL ansi ) /*********************************************************************** * unpack_message * - * Unpack a message received from another process. + * Unpack a message received from win32u. */ -BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, +void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void *buffer, size_t size, BOOL ansi ) { - size_t minsize = 0; - switch(message) { case WM_NCCREATE: @@ -784,7 +780,7 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, DWORD *ptr = buffer; *wparam = (WPARAM)ptr++; *lparam = (LPARAM)ptr; - return TRUE; + return; } case WM_MDICREATE: { @@ -802,108 +798,9 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, } break; } - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - case WM_WININICHANGE: - case WM_SETTEXT: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - case WM_GETMINMAXINFO: - case WM_DRAWITEM: - case WM_MEASUREITEM: - case WM_DELETEITEM: - case WM_COMPAREITEM: - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - case WM_HELP: - case WM_STYLECHANGING: - case WM_STYLECHANGED: - case WM_GETDLGCODE: - case SBM_SETSCROLLINFO: - case SBM_GETSCROLLINFO: - case SBM_GETSCROLLBARINFO: - case EM_GETRECT: - case LB_GETITEMRECT: - case CB_GETDROPPEDCONTROLRECT: - case EM_SETRECT: - case EM_SETRECTNP: - case EM_GETLINE: - case EM_SETTABSTOPS: - case LB_SETTABSTOPS: - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - case LB_ADDSTRING: - case LB_INSERTSTRING: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - case CB_GETLBTEXT: - case LB_GETTEXT: - case LB_GETSELITEMS: - case WM_NEXTMENU: - case WM_SIZING: - case WM_MOVING: - case CB_GETCOMBOBOXINFO: - case WM_MDIGETACTIVE: - case WM_DEVICECHANGE: - break; - case WM_NOTIFY: - /* WM_NOTIFY cannot be sent across processes (MSDN) */ - return FALSE; - case WM_NCPAINT: - if (*wparam <= 1) return TRUE; - FIXME( "WM_NCPAINT hdc unpacking not supported\n" ); - return FALSE; - case WM_PAINT: - if (!*wparam) return TRUE; - /* fall through */ - - /* these contain an HFONT */ - case WM_SETFONT: - case WM_GETFONT: - /* these contain an HDC */ - case WM_ERASEBKGND: - case WM_ICONERASEBKGND: - case WM_CTLCOLORMSGBOX: - case WM_CTLCOLOREDIT: - case WM_CTLCOLORLISTBOX: - case WM_CTLCOLORBTN: - case WM_CTLCOLORDLG: - case WM_CTLCOLORSCROLLBAR: - case WM_CTLCOLORSTATIC: - case WM_PRINT: - case WM_PRINTCLIENT: - /* these contain an HGLOBAL */ - case WM_PAINTCLIPBOARD: - case WM_SIZECLIPBOARD: - /* these contain HICON */ - case WM_GETICON: - case WM_SETICON: - case WM_QUERYDRAGICON: - case WM_QUERYPARKICON: - /* these contain pointers */ - case WM_DROPOBJECT: - case WM_QUERYDROPOBJECT: - case WM_DRAGLOOP: - case WM_DRAGSELECT: - case WM_DRAGMOVE: - FIXME( "msg %x (%s) not supported yet\n", message, SPY_GetMsgName(message, hwnd) ); - return FALSE; - - default: - return TRUE; /* message doesn't need any unpacking */ } - /* default exit for most messages: check minsize and store buffer in lparam */ - if (size < minsize) return FALSE; *lparam = (LPARAM)buffer; - return TRUE; } BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) @@ -917,9 +814,9 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) size -= sizeof(*params); buffer = params + 1; - if (!unpack_message( params->hwnd, params->msg, &params->wparam, - &params->lparam, buffer, size, params->ansi )) - return 0; + if (size) + unpack_message( params->hwnd, params->msg, &params->wparam, + &params->lparam, buffer, size, params->ansi ); result = dispatch_win_proc_params( params ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 56a05ba7eac..6e5b686c32e 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -880,6 +880,49 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!(*wparam & 0x8000)) return TRUE; minsize = sizeof(DEV_BROADCAST_HDR); break; + case WM_NOTIFY: + /* WM_NOTIFY cannot be sent across processes (MSDN) */ + return FALSE; + case WM_NCPAINT: + if (*wparam <= 1) return TRUE; + FIXME( "WM_NCPAINT hdc unpacking not supported\n" ); + return FALSE; + case WM_PAINT: + if (!*wparam) return TRUE; + /* fall through */ + + /* these contain an HFONT */ + case WM_SETFONT: + case WM_GETFONT: + /* these contain an HDC */ + case WM_ERASEBKGND: + case WM_ICONERASEBKGND: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + case WM_PRINT: + case WM_PRINTCLIENT: + /* these contain an HGLOBAL */ + case WM_PAINTCLIPBOARD: + case WM_SIZECLIPBOARD: + /* these contain HICON */ + case WM_GETICON: + case WM_SETICON: + case WM_QUERYDRAGICON: + case WM_QUERYPARKICON: + /* these contain pointers */ + case WM_DROPOBJECT: + case WM_QUERYDROPOBJECT: + case WM_DRAGLOOP: + case WM_DRAGSELECT: + case WM_DRAGMOVE: + FIXME( "msg %x (%s) not supported yet\n", message, debugstr_msg_name( message, hwnd )); + return FALSE; + default: return TRUE; /* message doesn't need any unpacking */ }

1 0

Jacek Caban : win32u: Remove no longer needed NtUserSendDriverMessage.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 61b80f67044d1bd720740b6e017a91bd9a026f61 URL: https://gitlab.winehq.org/wine/wine/-/commit/61b80f67044d1bd720740b6e017a91… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 1 17:24:19 2023 +0200 win32u: Remove no longer needed NtUserSendDriverMessage. All messages are packed now anyway. --- dlls/win32u/message.c | 4 ---- dlls/winemac.drv/macdrv.h | 2 +- dlls/winex11.drv/x11drv.h | 2 +- include/ntuser.h | 9 ++++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index b83ab32976b..71c1017a3f0 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -4286,10 +4286,6 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa else RtlSetLastWin32Error( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; - case NtUserSendDriverMessage: - /* used by driver to send packed messages */ - return send_message( hwnd, msg, wparam, lparam ); - case NtUserSpyEnter: spy_enter_message( ansi, hwnd, msg, wparam, lparam ); return 0; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 35ee6425b86..bcb048707ca 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -290,7 +290,7 @@ extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *pa static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendDriverMessage, FALSE); + return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE); } static inline LRESULT send_message_timeout(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3c41ce60854..9ee6498a02e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -862,7 +862,7 @@ static inline UINT get_palette_entries( HPALETTE palette, UINT start, UINT count static inline LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserSendDriverMessage, FALSE ); + return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE ); } static inline LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, diff --git a/include/ntuser.h b/include/ntuser.h index 2d6c41f0e62..b873512dbd1 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -301,11 +301,10 @@ enum /* Wine-specific exports */ NtUserClipboardWindowProc = 0x0300, NtUserGetDispatchParams = 0x3001, - NtUserSendDriverMessage = 0x3002, - NtUserSpyGetMsgName = 0x3003, - NtUserSpyEnter = 0x0304, - NtUserSpyExit = 0x0305, - NtUserImeDriverCall = 0x0306, + NtUserSpyGetMsgName = 0x3002, + NtUserSpyEnter = 0x0303, + NtUserSpyExit = 0x0304, + NtUserImeDriverCall = 0x0305, }; /* NtUserThunkedMenuItemInfo codes */

1 0

Jacek Caban : win32u: Use user message packing for WM_DEVICECHANGE.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 140f9e82f96fc825ac72a217339104fb8e81dc83 URL: https://gitlab.winehq.org/wine/wine/-/commit/140f9e82f96fc825ac72a217339104… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 00:35:31 2023 +0200 win32u: Use user message packing for WM_DEVICECHANGE. --- dlls/user32/winproc.c | 3 --- dlls/win32u/message.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index b1193773ed2..7d53269dc80 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -851,10 +851,7 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case WM_MOVING: case CB_GETCOMBOBOXINFO: case WM_MDIGETACTIVE: - break; case WM_DEVICECHANGE: - if (!(*wparam & 0x8000)) return TRUE; - minsize = sizeof(DEV_BROADCAST_HDR); break; case WM_NOTIFY: /* WM_NOTIFY cannot be sent across processes (MSDN) */ diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 28a2b7d39cc..56a05ba7eac 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -876,6 +876,10 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!*lparam) return TRUE; if (!get_buffer_space( buffer, sizeof(BOOL), size )) return FALSE; break; + case WM_DEVICECHANGE: + if (!(*wparam & 0x8000)) return TRUE; + minsize = sizeof(DEV_BROADCAST_HDR); + break; default: return TRUE; /* message doesn't need any unpacking */ } @@ -1704,6 +1708,13 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, case WM_MDIGETACTIVE: if (lparam) size = sizeof(BOOL); break; + case WM_DEVICECHANGE: + if ((wparam & 0x8000) && lparam) + { + const DEV_BROADCAST_HDR *header = lparam_ptr; + size = header->dbch_size; + } + break; } return size;

1 0

Jacek Caban : win32u: Remove no longer needed needs_unpack from win_proc_params.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: f693d66086bc117a032d2c96529f3a339aeb6461 URL: https://gitlab.winehq.org/wine/wine/-/commit/f693d66086bc117a032d2c96529f3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 13:59:25 2023 +0200 win32u: Remove no longer needed needs_unpack from win_proc_params. --- dlls/user32/winproc.c | 32 ++++++++++++++------------------ dlls/win32u/message.c | 16 +++++++++------- dlls/wow64win/user.c | 16 ++++++++++------ include/ntuser.h | 1 - 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index d0ebbb5ea8d..5ab85eb81cd 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -805,31 +805,27 @@ void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) { + size_t packed_size = 0; + void *buffer = NULL; LRESULT result; - if (params->needs_unpack) + if (size > sizeof(*params)) { - void *buffer; + const size_t offset = (sizeof(*params) + 15) & ~15; + packed_size = size - offset; + buffer = (char *)params + offset; - size -= sizeof(*params); - buffer = params + 1; - - if (size) - unpack_message( params->hwnd, params->msg, &params->wparam, - &params->lparam, buffer, size, params->ansi ); + unpack_message( params->hwnd, params->msg, &params->wparam, &params->lparam, + buffer, packed_size, params->ansi ); + } - result = dispatch_win_proc_params( params ); + result = dispatch_win_proc_params( params ); - if (size) - { - LRESULT *result_ptr = (LRESULT *)buffer - 1; - *result_ptr = result; - return NtCallbackReturn( result_ptr, sizeof(*result_ptr) + size, TRUE ); - } - } - else + if (packed_size) { - result = dispatch_win_proc_params( params ); + LRESULT *result_ptr = (LRESULT *)buffer - 1; + *result_ptr = result; + return NtCallbackReturn( result_ptr, sizeof(*result_ptr) + packed_size, TRUE ); } return NtCallbackReturn( &result, sizeof(result), TRUE ); } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 588cd4e7cc8..b83ab32976b 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -377,7 +377,6 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN params->wparam = wparam; params->lparam = lparam; params->ansi = params->ansi_dst = ansi; - params->needs_unpack = FALSE; params->mapping = WMCHAR_MAP_CALLWINDOWPROC; params->dpi_awareness = get_window_dpi_awareness_context( params->hwnd ); get_winproc_params( params, TRUE ); @@ -409,7 +408,6 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->wparam = wParam; params->lparam = lParam; params->ansi = ansi; - params->needs_unpack = FALSE; params->mapping = mapping; params->dpi_awareness = get_window_dpi_awareness_context( params->hwnd ); get_winproc_params( params, !is_dialog ); @@ -2155,10 +2153,10 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar { struct win_proc_params p, *params = &p; BOOL ansi = ansi_dst && type == MSG_ASCII; + size_t packed_size = 0, offset = sizeof(*params); LRESULT result = 0; CWPSTRUCT cwp; CWPRETSTRUCT cwpret; - size_t packed_size = 0; void *ret_ptr; size_t ret_len = 0; @@ -2177,7 +2175,12 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar call_message_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp), packed_size, ansi ); - if (packed_size && !(params = malloc( sizeof(*params) + packed_size ))) return 0; + if (packed_size) + { + offset = (offset + 15) & ~15; + if (!(params = malloc( offset + packed_size ))) return 0; + } + if (!init_window_call_params( params, hwnd, msg, wparam, lparam, ansi_dst, mapping )) { if (params != &p) free( params ); @@ -2185,11 +2188,10 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar } if (type == MSG_OTHER_PROCESS) params->ansi = FALSE; - params->needs_unpack = packed_size != 0; if (packed_size) - pack_user_message( params + 1, packed_size, msg, wparam, lparam, ansi ); + pack_user_message( (char *)params + offset, packed_size, msg, wparam, lparam, ansi ); - result = dispatch_win_proc_params( params, sizeof(*params) + packed_size, &ret_ptr, &ret_len ); + result = dispatch_win_proc_params( params, offset + packed_size, &ret_ptr, &ret_len ); if (params != &p) free( params ); copy_user_result( ret_ptr, min( ret_len, packed_size ), result, msg, wparam, lparam, ansi ); diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index e593da7ba53..b15f0a263cf 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -353,7 +353,6 @@ struct win_proc_params32 ULONG lparam; BOOL ansi; BOOL ansi_dst; - BOOL needs_unpack; enum wm_char_mapping mapping; ULONG dpi_awareness; ULONG procA; @@ -471,7 +470,6 @@ static void win_proc_params_64to32( const struct win_proc_params *src, struct wi params.lparam = src->lparam; params.ansi = src->ansi; params.ansi_dst = src->ansi_dst; - params.needs_unpack = src->needs_unpack; params.mapping = src->mapping; params.dpi_awareness = HandleToUlong( src->dpi_awareness ); params.procA = PtrToUlong( src->procA ); @@ -932,7 +930,7 @@ static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) { struct win_proc_params *params = arg; struct win_proc_params32 *params32 = arg; - size_t lparam_size = 0; + size_t lparam_size = 0, offset32 = sizeof(*params32); LRESULT result = 0; void *ret_ptr; ULONG ret_len; @@ -940,11 +938,17 @@ static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) win_proc_params_64to32( params, params32 ); if (size > sizeof(*params)) - lparam_size = packed_message_64to32( params32->msg, params32->wparam, params + 1, params32 + 1, - size - sizeof(*params) ); + { + const size_t offset64 = (sizeof(*params) + 15) & ~15; + offset32 = (offset32 + 15) & ~15; + lparam_size = packed_message_64to32( params32->msg, params32->wparam, + (char *)params + offset64, + (char *)params32 + offset32, + size - offset64 ); + } status = Wow64KiUserCallbackDispatcher( NtUserCallWinProc, params32, - sizeof(*params32) + lparam_size, + offset32 + lparam_size, &ret_ptr, &ret_len ); if (ret_len >= sizeof(LONG)) diff --git a/include/ntuser.h b/include/ntuser.h index 110aa3a3c54..2d6c41f0e62 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -149,7 +149,6 @@ struct win_proc_params LPARAM lparam; BOOL ansi; BOOL ansi_dst; - BOOL needs_unpack; enum wm_char_mapping mapping; DPI_AWARENESS_CONTEXT dpi_awareness; WNDPROC procA;

1 0

Jacek Caban : win32u: Remove no longer needed process_packed_message.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 813e04e6554bec6799c8eb2d38a5896d479f0401 URL: https://gitlab.winehq.org/wine/wine/-/commit/813e04e6554bec6799c8eb2d38a589… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 01:09:37 2023 +0200 win32u: Remove no longer needed process_packed_message. --- dlls/win32u/message.c | 62 +++++++++++---------------------------------------- 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 6e5b686c32e..588cd4e7cc8 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2150,11 +2150,11 @@ BOOL WINAPI NtUserGetGUIThreadInfo( DWORD id, GUITHREADINFO *info ) * Call a window procedure and the corresponding hooks. */ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, - BOOL unicode, BOOL same_thread, enum wm_char_mapping mapping, - BOOL needs_unpack, void *buffer, size_t size ) + enum message_type type, BOOL same_thread, + enum wm_char_mapping mapping, BOOL ansi_dst ) { struct win_proc_params p, *params = &p; - BOOL ansi = !unicode && !needs_unpack; + BOOL ansi = ansi_dst && type == MSG_ASCII; LRESULT result = 0; CWPSTRUCT cwp; CWPRETSTRUCT cwpret; @@ -2165,11 +2165,9 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar if (msg & 0x80000000) return handle_internal_message( hwnd, msg, wparam, lparam ); - if (!needs_unpack) size = 0; if (!is_current_thread_window( hwnd )) return 0; - packed_size = user_message_size( hwnd, msg, wparam, lparam, needs_unpack, ansi ); - if (packed_size) size = packed_size; + packed_size = user_message_size( hwnd, msg, wparam, lparam, type == MSG_OTHER_PROCESS, ansi ); /* first the WH_CALLWNDPROC hook */ cwp.lParam = lparam; @@ -2179,21 +2177,19 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar call_message_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp), packed_size, ansi ); - if (size && !(params = malloc( sizeof(*params) + size ))) return 0; - if (!init_window_call_params( params, hwnd, msg, wparam, lparam, !unicode, mapping )) + if (packed_size && !(params = malloc( sizeof(*params) + packed_size ))) return 0; + if (!init_window_call_params( params, hwnd, msg, wparam, lparam, ansi_dst, mapping )) { if (params != &p) free( params ); return 0; } - if (needs_unpack) params->ansi = FALSE; - params->needs_unpack = needs_unpack || packed_size; + if (type == MSG_OTHER_PROCESS) params->ansi = FALSE; + params->needs_unpack = packed_size != 0; if (packed_size) pack_user_message( params + 1, packed_size, msg, wparam, lparam, ansi ); - else if (size) - memcpy( params + 1, buffer, size ); - result = dispatch_win_proc_params( params, sizeof(*params) + size, &ret_ptr, &ret_len ); + result = dispatch_win_proc_params( params, sizeof(*params) + packed_size, &ret_ptr, &ret_len ); if (params != &p) free( params ); copy_user_result( ret_ptr, min( ret_len, packed_size ), result, msg, wparam, lparam, ansi ); @@ -2637,7 +2633,6 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, NTSTATUS res; size_t size = 0; const message_data_t *msg_data = buffer; - BOOL needs_unpack = FALSE; thread_info->client_info.msg_source = prev_source; @@ -2703,7 +2698,6 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, if (!unpack_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, &info.msg.lParam, &buffer, size )) continue; - needs_unpack = TRUE; break; case MSG_CALLBACK: info.flags = ISMEX_CALLBACK; @@ -2786,7 +2780,6 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, reply_message( &info, 0, &info.msg ); continue; } - needs_unpack = TRUE; break; case MSG_HARDWARE: if (size >= sizeof(msg_data->hardware)) @@ -2867,8 +2860,8 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, thread_info->client_info.msg_source = msg_source_unavailable; thread_info->client_info.receive_flags = info.flags; result = call_window_proc( info.msg.hwnd, info.msg.message, info.msg.wParam, - info.msg.lParam, (info.type != MSG_ASCII), FALSE, - WMCHAR_MAP_RECVMESSAGE, needs_unpack, buffer, size ); + info.msg.lParam, info.type, FALSE, WMCHAR_MAP_RECVMESSAGE, + info.type == MSG_ASCII ); if (thread_info->receive_info == &info) reply_winproc_result( result, info.msg.hwnd, info.msg.message, info.msg.wParam, info.msg.lParam ); @@ -3643,31 +3636,6 @@ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_pt return TRUE; } -static BOOL process_packed_message( struct send_message_info *info, LRESULT *res_ptr, BOOL ansi ) -{ - struct packed_message data; - size_t buffer_size = 0, i; - void *buffer = NULL; - char *ptr; - - pack_message( info->hwnd, info->msg, info->wparam, info->lparam, &data ); - if (data.count == -1) return FALSE; - - for (i = 0; i < data.count; i++) buffer_size += data.size[i]; - if (!(buffer = malloc( buffer_size ))) return FALSE; - for (ptr = buffer, i = 0; i < data.count; i++) - { - memcpy( ptr, data.data[i], data.size[i] ); - ptr += data.size[i]; - } - - *res_ptr = call_window_proc( info->hwnd, info->msg, info->wparam, info->lparam, - !ansi, TRUE, info->wm_char, TRUE, buffer, buffer_size ); - - free( buffer ); - return TRUE; -} - static inline void *get_buffer( void *static_buffer, size_t size, size_t need ) { if (size >= need) return static_buffer; @@ -3974,18 +3942,14 @@ static BOOL process_message( struct send_message_info *info, DWORD_PTR *res_ptr, else ret = send_inter_thread_message( info, &result ); } - else if (info->type != MSG_OTHER_PROCESS) + else { result = call_window_proc( info->hwnd, info->msg, info->wparam, info->lparam, - !ansi, TRUE, info->wm_char, FALSE, NULL, 0 ); + info->type, TRUE, info->wm_char, ansi ); if (info->type == MSG_CALLBACK) call_sendmsg_callback( info->callback, info->hwnd, info->msg, info->data, result ); ret = TRUE; } - else - { - ret = process_packed_message( info, &result, ansi ); - } spy_exit_message( SPY_RESULT_OK, info->hwnd, info->msg, result, info->wparam, info->lparam ); thread_info->msg_source = prev_source;

1 0