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

Jacek Caban : win32u: Use user message packing for WM_DEVICECHANGE.
by Alexandre Julliard 02 Aug '23

02 Aug '23

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: Move more of unpack_message implementation from user32.
by Alexandre Julliard 02 Aug '23

02 Aug '23

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 process_packed_message.
by Alexandre Julliard 02 Aug '23

02 Aug '23

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

Jacek Caban : win32u: Remove no longer needed needs_unpack from win_proc_params.
by Alexandre Julliard 02 Aug '23

02 Aug '23

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 NtUserSendDriverMessage.
by Alexandre Julliard 02 Aug '23

02 Aug '23

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

Mohamad Al-Jaf : msvcp140_codecvt_ids: Add DLL.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 7ac4bbb2de9ad3137fb746b44074377297bc07ba URL: https://gitlab.winehq.org/wine/wine/-/commit/7ac4bbb2de9ad3137fb746b4407437… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jul 27 19:23:30 2023 -0400 msvcp140_codecvt_ids: Add DLL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55344 --- configure | 2 ++ configure.ac | 1 + dlls/msvcp140_codecvt_ids/Makefile.in | 4 +++ dlls/msvcp140_codecvt_ids/main.c | 32 ++++++++++++++++++++++ .../msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec | 4 +++ 5 files changed, 43 insertions(+) diff --git a/configure b/configure index 9c15f952298..df70e31a897 100755 --- a/configure +++ b/configure @@ -1270,6 +1270,7 @@ enable_msvcp140 enable_msvcp140_1 enable_msvcp140_2 enable_msvcp140_atomic_wait +enable_msvcp140_codecvt_ids enable_msvcp60 enable_msvcp70 enable_msvcp71 @@ -21575,6 +21576,7 @@ wine_fn_config_makefile dlls/msvcp140_1/tests enable_tests wine_fn_config_makefile dlls/msvcp140_2 enable_msvcp140_2 wine_fn_config_makefile dlls/msvcp140_atomic_wait enable_msvcp140_atomic_wait wine_fn_config_makefile dlls/msvcp140_atomic_wait/tests enable_tests +wine_fn_config_makefile dlls/msvcp140_codecvt_ids enable_msvcp140_codecvt_ids wine_fn_config_makefile dlls/msvcp60 enable_msvcp60 wine_fn_config_makefile dlls/msvcp60/tests enable_tests wine_fn_config_makefile dlls/msvcp70 enable_msvcp70 diff --git a/configure.ac b/configure.ac index dab2bb07302..cf26113ca06 100644 --- a/configure.ac +++ b/configure.ac @@ -2837,6 +2837,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcp140_1/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp140_2) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait) WINE_CONFIG_MAKEFILE(dlls/msvcp140_atomic_wait/tests) +WINE_CONFIG_MAKEFILE(dlls/msvcp140_codecvt_ids) WINE_CONFIG_MAKEFILE(dlls/msvcp60) WINE_CONFIG_MAKEFILE(dlls/msvcp60/tests) WINE_CONFIG_MAKEFILE(dlls/msvcp70) diff --git a/dlls/msvcp140_codecvt_ids/Makefile.in b/dlls/msvcp140_codecvt_ids/Makefile.in new file mode 100644 index 00000000000..14e820b01fe --- /dev/null +++ b/dlls/msvcp140_codecvt_ids/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msvcp140_codecvt_ids.dll + +C_SRCS = \ + main.c diff --git a/dlls/msvcp140_codecvt_ids/main.c b/dlls/msvcp140_codecvt_ids/main.c new file mode 100644 index 00000000000..d71263a3e5d --- /dev/null +++ b/dlls/msvcp140_codecvt_ids/main.c @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * 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 + */ + +#include <stdarg.h> + +typedef struct { + size_t id; +} locale_id; + +/* ?id@?$codecvt(a)_SDU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char16_id = {0}; +/* ?id@?$codecvt(a)_S_QU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char16_char8_id = {0}; +/* ?id@?$codecvt(a)_UDU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char32_id = {0}; +/* ?id@?$codecvt(a)_U_QU_Mbstatet@@@std@@2V0locale(a)2@A */ +locale_id codecvt_char32_char8_id = {0}; diff --git a/dlls/msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec b/dlls/msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec new file mode 100644 index 00000000000..4fd4b65e32a --- /dev/null +++ b/dlls/msvcp140_codecvt_ids/msvcp140_codecvt_ids.spec @@ -0,0 +1,4 @@ +@ extern ?id@?$codecvt(a)_SDU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char16_id +@ extern ?id@?$codecvt(a)_S_QU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char16_char8_id +@ extern ?id@?$codecvt(a)_UDU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char32_id +@ extern ?id@?$codecvt(a)_U_QU_Mbstatet@@@std@@2V0locale(a)2@A codecvt_char32_char8_id

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLOptionElementFactory.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 67d7cb3a62c96cd27f1a16016667dcbfc47869f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/67d7cb3a62c96cd27f1a16016667dc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:25 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLOptionElementFactory. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlselect.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index cbbd9ebcc69..b48805de64d 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -487,10 +487,8 @@ static ULONG WINAPI HTMLOptionElementFactory_Release(IHTMLOptionElementFactory * TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -591,6 +589,12 @@ static inline HTMLOptionElementFactory *HTMLOptionElementFactory_from_DispatchEx return CONTAINING_RECORD(iface, HTMLOptionElementFactory, dispex); } +static void HTMLOptionElementFactory_destructor(DispatchEx *dispex) +{ + HTMLOptionElementFactory *This = HTMLOptionElementFactory_from_DispatchEx(dispex); + free(This); +} + static HRESULT HTMLOptionElementFactory_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) @@ -629,7 +633,7 @@ static const tid_t HTMLOptionElementFactory_iface_tids[] = { }; static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = { - NULL, + HTMLOptionElementFactory_destructor, NULL, HTMLOptionElementFactory_value, NULL,

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for HTMLXMLHttpRequestFactory.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 2e5ac78a7c0ca6a65d1ec97184c4053186fa1005 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e5ac78a7c0ca6a65d1ec97184c405… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:25 2023 +0300 mshtml: Use unlink and destructor in the vtbl for HTMLXMLHttpRequestFactory. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/xmlhttprequest.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 4803b5c55a1..73eea9d7f6d 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1640,10 +1640,8 @@ static ULONG WINAPI HTMLXMLHttpRequestFactory_Release(IHTMLXMLHttpRequestFactory TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -1766,6 +1764,12 @@ static inline HTMLXMLHttpRequestFactory *factory_from_DispatchEx(DispatchEx *ifa return CONTAINING_RECORD(iface, HTMLXMLHttpRequestFactory, dispex); } +static void HTMLXMLHttpRequestFactory_destructor(DispatchEx *dispex) +{ + HTMLXMLHttpRequestFactory *This = factory_from_DispatchEx(dispex); + free(This); +} + static HRESULT HTMLXMLHttpRequestFactory_value(DispatchEx *iface, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { @@ -1790,7 +1794,7 @@ static HRESULT HTMLXMLHttpRequestFactory_value(DispatchEx *iface, LCID lcid, WOR } static const dispex_static_data_vtbl_t HTMLXMLHttpRequestFactory_dispex_vtbl = { - NULL, + HTMLXMLHttpRequestFactory_destructor, NULL, HTMLXMLHttpRequestFactory_value };

1 0

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for the MutationObserver constructor.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: f937b89cd7b8ebd5e685fa5ea92c3dab66d2b07b URL: https://gitlab.winehq.org/wine/wine/-/commit/f937b89cd7b8ebd5e685fa5ea92c3d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:25 2023 +0300 mshtml: Use unlink and destructor in the vtbl for the MutationObserver constructor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mutation.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index e6d080cff16..3f544e0a90f 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1303,10 +1303,8 @@ static ULONG WINAPI mutation_observer_ctor_Release(IUnknown *iface) TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -1317,6 +1315,12 @@ static const IUnknownVtbl mutation_observer_ctor_vtbl = { mutation_observer_ctor_Release, }; +static void mutation_observer_ctor_destructor(DispatchEx *dispex) +{ + struct mutation_observer_ctor *This = mutation_observer_ctor_from_DispatchEx(dispex); + free(This); +} + static HRESULT mutation_observer_ctor_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) @@ -1365,7 +1369,9 @@ static HRESULT mutation_observer_ctor_value(DispatchEx *dispex, LCID lcid, } static dispex_static_data_vtbl_t mutation_observer_ctor_dispex_vtbl = { - .value = mutation_observer_ctor_value + mutation_observer_ctor_destructor, + NULL, + mutation_observer_ctor_value }; static const tid_t mutation_observer_ctor_iface_tids[] = {

1 0

David Kahurani : gdiplus: Use helper to calculate transform properties.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 326a9e18bbd93ad3fd9dc70de94faffcbef5fa23 URL: https://gitlab.winehq.org/wine/wine/-/commit/326a9e18bbd93ad3fd9dc70de94faf… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Tue Aug 1 11:45:09 2023 +0300 gdiplus: Use helper to calculate transform properties. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/gdiplus/font.c | 14 +------ dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 88 ++++++++++++++---------------------------- 3 files changed, 32 insertions(+), 71 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 024d27c1ce7..316f65d84cf 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -456,7 +456,6 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW { REAL angle, rel_height, height; GpMatrix matrix; - GpPointF pt[3]; TRACE("(%p, %p, %p)\n", font, graphics, lf); @@ -479,19 +478,8 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW height = units_to_pixels(font->emSize, font->unit, graphics->yres, graphics->printer_display); } - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - pt[2].X = 0.0; - pt[2].Y = 1.0; - GdipMultiplyMatrix(&matrix, &graphics->gdi_transform, MatrixOrderAppend); - GdipTransformMatrixPoints(&matrix, pt, 3); - angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); - rel_height = sqrt((pt[2].Y - pt[0].Y) * (pt[2].Y - pt[0].Y)+ - (pt[2].X - pt[0].X) * (pt[2].X - pt[0].X)); - + transform_properties(graphics, &matrix, FALSE, NULL, &rel_height, &angle); lf->lfHeight = -gdip_round(height * rel_height); lf->lfWidth = 0; lf->lfEscapement = lf->lfOrientation = gdip_round((angle / M_PI) * 1800.0); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c292318b06e..1bc058b3413 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -69,6 +69,7 @@ extern GpStatus get_graphics_transform(GpGraphics *graphics, GpCoordinateSpace d GpCoordinateSpace src_space, GpMatrix *matrix); extern GpStatus gdip_transform_points(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpPointF *points, INT count); +void transform_properties(GpGraphics *, GDIPCONST GpMatrix *, BOOL, REAL *, REAL *, REAL *); extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics); extern GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST EncoderParameters* params); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6dc34707bbf..758889eca06 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2303,7 +2303,6 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, LOGFONTW *lfw_return, GDIPCONST GpMatrix *matrix) { HDC hdc = CreateCompatibleDC(0); - GpPointF pt[3]; REAL angle, rel_width, rel_height, font_height; LOGFONTW lfw; HFONT unscaled_font; @@ -2321,24 +2320,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, font_height = font->emSize * unit_scale; } - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - pt[2].X = 0.0; - pt[2].Y = 1.0; - if (matrix) - { - GpMatrix xform = *matrix; - GdipTransformMatrixPoints(&xform, pt, 3); - } - - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); - angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); - rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ - (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); - rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ - (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + transform_properties(graphics, matrix, TRUE, &rel_width, &rel_height, &angle); /* If the font unit is not pixels scaling should not be applied */ if (font->unit != UnitPixel && font->unit != UnitWorld) { @@ -5373,6 +5355,31 @@ GpStatus gdip_format_string(HDC hdc, return stat; } +void transform_properties(GpGraphics *graphics, GDIPCONST GpMatrix *matrix, BOOL graphics_transform, + REAL *rel_width, REAL *rel_height, REAL *angle) +{ + GpPointF pt[3] = {{0.0f, 0.0f}, {1.0f, 0.0f}, {0.0f, 1.0f}}; + GpMatrix xform; + + if (matrix) + { + xform = *matrix; + GdipTransformMatrixPoints(&xform, pt, 3); + } + + if (graphics_transform) + gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); + + if (rel_width) + *rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + if (rel_height) + *rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + if (angle) + *angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); +} + struct measure_ranges_args { GpRegion **regions; REAL rel_width, rel_height; @@ -5427,7 +5434,6 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, HFONT gdifont, oldfont; struct measure_ranges_args args; HDC hdc, temp_hdc=NULL; - GpPointF pt[3]; RectF scaled_rect; REAL margin_x; @@ -5451,21 +5457,10 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - pt[2].X = 0.0; - pt[2].Y = 1.0; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); - args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ - (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); - args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ - (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); margin_x = stringFormat->generic_typographic ? 0.0 : font->emSize / 6.0; margin_x *= units_scale(font->unit, graphics->unit, graphics->xres, graphics->printer_display); - + transform_properties(graphics, NULL, TRUE, &args.rel_width, &args.rel_height, NULL); scaled_rect.X = (layoutRect->X + margin_x) * args.rel_width; scaled_rect.Y = layoutRect->Y * args.rel_height; scaled_rect.Width = layoutRect->Width * args.rel_width; @@ -5554,7 +5549,6 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, HFONT oldfont, gdifont; struct measure_string_args args; HDC temp_hdc=NULL, hdc; - GpPointF pt[3]; RectF scaled_rect; REAL margin_x; INT lines, glyphs; @@ -5580,18 +5574,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if(format) TRACE("may be ignoring some format flags: attr %x\n", format->attr); - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - pt[2].X = 0.0; - pt[2].Y = 1.0; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); - args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ - (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); - args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ - (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - + transform_properties(graphics, NULL, TRUE, &args.rel_width, &args.rel_height, NULL); margin_x = (format && format->generic_typographic) ? 0.0 : font->emSize / 6.0; margin_x *= units_scale(font->unit, graphics->unit, graphics->xres, graphics->printer_display); @@ -5699,7 +5682,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string { HRGN rgn = NULL; HFONT gdifont; - GpPointF pt[3], rectcpy[4]; + GpPointF rectcpy[4]; POINT corners[4]; REAL rel_width, rel_height, margin_x; INT save_state, format_flags = 0; @@ -5748,18 +5731,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string save_state = SaveDC(hdc); - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - pt[2].X = 0.0; - pt[2].Y = 1.0; - gdip_transform_points(graphics, WineCoordinateSpaceGdiDevice, CoordinateSpaceWorld, pt, 3); - rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ - (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); - rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ - (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - + transform_properties(graphics, NULL, TRUE, &rel_width, &rel_height, NULL); rectcpy[3].X = rectcpy[0].X = rect->X; rectcpy[1].Y = rectcpy[0].Y = rect->Y; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width;

1 0