November 2022 - Wine-Commits

Nikolay Sivov : user32/edit: Check for control destruction on notification return.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: b40ddf42370e8344a862fbbc40384678db3871a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b40ddf42370e8344a862fbbc403846… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 6 18:07:38 2022 +0300 user32/edit: Check for control destruction on notification return. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/edit.c | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index e48d63f2870..d950cb89889 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -141,15 +141,13 @@ typedef struct #define SWAP_UINT32(x,y) do { UINT temp = (UINT)(x); (x) = (UINT)(y); (y) = temp; } while(0) #define ORDER_UINT(x,y) do { if ((UINT)(y) < (UINT)(x)) SWAP_UINT32((x),(y)); } while(0) -/* used for disabled or read-only edit control */ -#define EDIT_NOTIFY_PARENT(es, wNotifyCode) \ - do \ - { /* Notify parent which has created this edit control */ \ - TRACE("notification " #wNotifyCode " sent to hwnd=%p\n", es->hwndParent); \ - SendMessageW(es->hwndParent, WM_COMMAND, \ - MAKEWPARAM(GetWindowLongPtrW((es->hwndSelf),GWLP_ID), wNotifyCode), \ - (LPARAM)(es->hwndSelf)); \ - } while(0) +static inline BOOL notify_parent(const EDITSTATE *es, INT code) +{ + HWND hwnd = es->hwndSelf; + TRACE("notification %d sent to %p.\n", code, es->hwndParent); + SendMessageW(es->hwndParent, WM_COMMAND, MAKEWPARAM(GetWindowLongPtrW(es->hwndSelf, GWLP_ID), code), (LPARAM)es->hwndSelf); + return IsWindow(hwnd); +} static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap); @@ -1364,7 +1362,7 @@ static BOOL EDIT_MakeFit(EDITSTATE *es, UINT size) if (es->buffer_size < size) { WARN("FAILED ! We now have %d+1\n", es->buffer_size); - EDIT_NOTIFY_PARENT(es, EN_ERRSPACE); + notify_parent(es, EN_ERRSPACE); return FALSE; } else { TRACE("We now have %d+1\n", es->buffer_size); @@ -1411,7 +1409,7 @@ static void EDIT_UpdateTextRegion(EDITSTATE *es, HRGN hrgn, BOOL bErase) { if (es->flags & EF_UPDATE) { es->flags &= ~EF_UPDATE; - EDIT_NOTIFY_PARENT(es, EN_UPDATE); + if (!notify_parent(es, EN_UPDATE)) return; } NtUserInvalidateRgn(es->hwndSelf, hrgn, bErase); } @@ -1426,7 +1424,7 @@ static void EDIT_UpdateText(EDITSTATE *es, const RECT *rc, BOOL bErase) { if (es->flags & EF_UPDATE) { es->flags &= ~EF_UPDATE; - EDIT_NOTIFY_PARENT(es, EN_UPDATE); + if (!notify_parent(es, EN_UPDATE)) return; } NtUserInvalidateRect(es->hwndSelf, rc, bErase); } @@ -1706,9 +1704,9 @@ static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy) EDIT_UpdateScrollInfo(es); } if (dx && !(es->flags & EF_HSCROLL_TRACK)) - EDIT_NOTIFY_PARENT(es, EN_HSCROLL); + notify_parent(es, EN_HSCROLL); if (dy && !(es->flags & EF_VSCROLL_TRACK)) - EDIT_NOTIFY_PARENT(es, EN_VSCROLL); + notify_parent(es, EN_VSCROLL); return TRUE; } @@ -2567,8 +2565,9 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r /* Issue the EN_MAXTEXT notification and continue with replacing text * so that buffer limit is honored. */ - if ((honor_limit) && (size > es->buffer_limit)) { - EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); + if ((honor_limit) && (size > es->buffer_limit)) + { + if (!notify_parent(es, EN_MAXTEXT)) return; /* Buffer limit can be smaller than the actual length of text in combobox */ if (es->buffer_limit < (tl - (e-s))) strl = 0; @@ -2626,7 +2625,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r strl = 0; e = s; SetRectRgn(hrgn, 0, 0, 0, 0); - EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); + if (!notify_parent(es, EN_MAXTEXT)) return; } } else { @@ -2643,7 +2642,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r EDIT_CalcLineWidth_SL(es); } text_buffer_changed(es); - EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); + if (!notify_parent(es, EN_MAXTEXT)) return; } } @@ -2734,7 +2733,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_r if(send_update || (es->flags & EF_UPDATE)) { es->flags &= ~EF_UPDATE; - EDIT_NOTIFY_PARENT(es, EN_CHANGE); + if (!notify_parent(es, EN_CHANGE)) return; } EDIT_InvalidateUniscribeData(es); } @@ -3044,7 +3043,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) EDIT_EM_ReplaceSel(es, TRUE, utext, ulength, TRUE, TRUE); EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); /* send the notification after the selection start and end are set */ - EDIT_NOTIFY_PARENT(es, EN_CHANGE); + if (!notify_parent(es, EN_CHANGE)) return TRUE; EDIT_EM_ScrollCaret(es); HeapFree(GetProcessHeap(), 0, utext); @@ -3565,7 +3564,7 @@ static LRESULT EDIT_WM_KillFocus(EDITSTATE *es) DestroyCaret(); if(!(es->style & ES_NOHIDESEL)) EDIT_InvalidateText(es, es->selection_start, es->selection_end); - EDIT_NOTIFY_PARENT(es, EN_KILLFOCUS); + if (!notify_parent(es, EN_KILLFOCUS)) return 0; /* throw away left over scroll when we lose focus */ es->wheelDeltaRemainder = 0; return 0; @@ -3808,7 +3807,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_SetCaretPos(es, es->selection_end, es->flags & EF_AFTER_WRAP); NtUserShowCaret( es->hwndSelf ); - EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); + notify_parent(es, EN_SETFOCUS); } static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm, BOOL unicode) @@ -3948,8 +3947,8 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode) */ if( !((es->style & ES_MULTILINE) || es->hwndListBox)) { - EDIT_NOTIFY_PARENT(es, EN_UPDATE); - EDIT_NOTIFY_PARENT(es, EN_CHANGE); + if (!notify_parent(es, EN_UPDATE)) return; + if (!notify_parent(es, EN_CHANGE)) return; } EDIT_EM_ScrollCaret(es); EDIT_UpdateScrollInfo(es); @@ -4150,7 +4149,7 @@ static LRESULT EDIT_WM_HScroll(EDITSTATE *es, INT action, INT pos) if (!dx) { /* force scroll info update */ EDIT_UpdateScrollInfo(es); - EDIT_NOTIFY_PARENT(es, EN_HSCROLL); + notify_parent(es, EN_HSCROLL); } break; case SB_ENDSCROLL: @@ -4273,7 +4272,7 @@ static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos) { /* force scroll info update */ EDIT_UpdateScrollInfo(es); - EDIT_NOTIFY_PARENT(es, EN_VSCROLL); + notify_parent(es, EN_VSCROLL); } break; case SB_ENDSCROLL:

1 0

Zhiyi Zhang : d2d1: Use D2D1_ALPHA_MODE_IGNORE if D2D1_ALPHA_MODE_UNKNOWN is used for creating hwnd render targets.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: 225daac8790146fe5886995b330ce4dd77c60775 URL: https://gitlab.winehq.org/wine/wine/-/commit/225daac8790146fe5886995b330ce4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 3 17:21:16 2022 +0800 d2d1: Use D2D1_ALPHA_MODE_IGNORE if D2D1_ALPHA_MODE_UNKNOWN is used for creating hwnd render targets. Also, alpha mode should not be overwritten with D2D1_ALPHA_MODE_IGNORE just because DXGI_FORMAT_UNKNOWN is specified. --- dlls/d2d1/hwnd_render_target.c | 4 ++-- dlls/d2d1/tests/d2d1.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 5338ca3383f..4d3fe43a1b3 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -835,10 +835,10 @@ HRESULT d2d_hwnd_render_target_init(struct d2d_hwnd_render_target *render_target ID2D1Factory1_GetDesktopDpi(factory, &dxgi_rt_desc.dpiX, &dxgi_rt_desc.dpiY); if (dxgi_rt_desc.pixelFormat.format == DXGI_FORMAT_UNKNOWN) - { dxgi_rt_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + + if (dxgi_rt_desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_UNKNOWN) dxgi_rt_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; - } swapchain_desc.BufferDesc.Width = hwnd_rt_desc->pixelSize.width; swapchain_desc.BufferDesc.Height = hwnd_rt_desc->pixelSize.height; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 67cb83bdd4a..a065c8ddfb5 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6088,15 +6088,14 @@ static void test_hwnd_target(BOOL d3d11) D2D1_PIXEL_FORMAT format; D2D1_PIXEL_FORMAT expected_format; BOOL expected_failure; - BOOL todo; } format_tests[] = { {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, - {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, FALSE, TRUE}, + {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT}, TRUE}, {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_IGNORE}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, - {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}, FALSE, TRUE}, + {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT}, TRUE}, {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, @@ -6172,7 +6171,6 @@ static void test_hwnd_target(BOOL d3d11) pixel_format = ID2D1HwndRenderTarget_GetPixelFormat(rt); ok(pixel_format.format == format_tests[i].expected_format.format, "Got unexpected format %#x.\n", pixel_format.format); - todo_wine_if(format_tests[i].todo) ok(pixel_format.alphaMode == format_tests[i].expected_format.alphaMode, "Got unexpected alpha mode %d.\n", pixel_format.alphaMode);

1 0

Zhiyi Zhang : d2d1/tests: Add hwnd render target pixel format tests.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: 1e4d31199953a76c1ab4914e2af41b14ef5de2d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e4d31199953a76c1ab4914e2af41b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 3 17:15:39 2022 +0800 d2d1/tests: Add hwnd render target pixel format tests. --- dlls/d2d1/tests/d2d1.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 99a1013a333..67cb83bdd4a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6075,12 +6075,33 @@ static void test_hwnd_target(BOOL d3d11) ID2D1GdiInteropRenderTarget *interop; D2D1_RENDER_TARGET_PROPERTIES desc; ID2D1HwndRenderTarget *rt, *rt2; + D2D1_PIXEL_FORMAT pixel_format; struct d2d1_test_context ctx; ID2D1RenderTarget *rt3; ID2D1Factory *factory; D2D1_SIZE_U size; + unsigned int i; HRESULT hr; + static const struct format_test + { + D2D1_PIXEL_FORMAT format; + D2D1_PIXEL_FORMAT expected_format; + BOOL expected_failure; + BOOL todo; + } + format_tests[] = + { + {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, FALSE, TRUE}, + {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_STRAIGHT}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT}, TRUE}, + {{DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_IGNORE}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}, FALSE, TRUE}, + {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED}}, + {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_STRAIGHT}, TRUE}, + {{DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}, {DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE}}, + }; + if (!init_test_context(&ctx, d3d11)) return; release_test_context(&ctx); @@ -6132,6 +6153,33 @@ static void test_hwnd_target(BOOL d3d11) ID2D1HwndRenderTarget_Release(rt); + /* Test render target format */ + for (i = 0; i < ARRAY_SIZE(format_tests); ++i) + { + winetest_push_context("test %d", i); + + desc.pixelFormat = format_tests[i].format; + hr = ID2D1Factory_CreateHwndRenderTarget(factory, &desc, &hwnd_rt_desc, &rt); + if (format_tests[i].expected_failure) + { + todo_wine + ok(FAILED(hr), "Got unexpected hr %#lx.\n", hr); + winetest_pop_context(); + continue; + } + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + pixel_format = ID2D1HwndRenderTarget_GetPixelFormat(rt); + ok(pixel_format.format == format_tests[i].expected_format.format, + "Got unexpected format %#x.\n", pixel_format.format); + todo_wine_if(format_tests[i].todo) + ok(pixel_format.alphaMode == format_tests[i].expected_format.alphaMode, + "Got unexpected alpha mode %d.\n", pixel_format.alphaMode); + + ID2D1HwndRenderTarget_Release(rt); + winetest_pop_context(); + } + DestroyWindow(hwnd_rt_desc.hwnd); ID2D1Factory_Release(factory); }

1 0

Alex Henrie : include: Add sdkddkver.h.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: bae772695e055ab1e3260eeddb06104448165f39 URL: https://gitlab.winehq.org/wine/wine/-/commit/bae772695e055ab1e3260eeddb0610… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 6 20:20:03 2022 -0700 include: Add sdkddkver.h. Needed to compile Tera Term. --- include/Makefile.in | 1 + include/sdkddkver.h | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/windows.h | 1 + 3 files changed, 84 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6083fd2754d..0fc34cbdf7c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -666,6 +666,7 @@ SOURCES = \ schemadef.h \ schnlsp.h \ sddl.h \ + sdkddkver.h \ secext.h \ security.h \ sensapi.h \ diff --git a/include/sdkddkver.h b/include/sdkddkver.h new file mode 100644 index 00000000000..baffe7a4a28 --- /dev/null +++ b/include/sdkddkver.h @@ -0,0 +1,82 @@ +/* + * Copyright 2022 Alex Henrie + * + * 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 + */ + +#ifndef _INC_SDKDDKVER +#define _INC_SDKDDKVER + +#define NTDDI_WIN2K 0x05000000 +#define NTDDI_WIN2KSP1 0x05000100 +#define NTDDI_WIN2KSP2 0x05000200 +#define NTDDI_WIN2KSP3 0x05000300 +#define NTDDI_WIN2KSP4 0x05000400 + +#define NTDDI_WINXP 0x05010000 +#define NTDDI_WINXPSP1 0x05010100 +#define NTDDI_WINXPSP2 0x05010200 +#define NTDDI_WINXPSP3 0x05010300 +#define NTDDI_WINXPSP4 0x05010400 + +#define NTDDI_WS03 0x05020000 +#define NTDDI_WS03SP1 0x05020100 +#define NTDDI_WS03SP2 0x05020200 +#define NTDDI_WS03SP3 0x05020300 +#define NTDDI_WS03SP4 0x05020400 + +#define NTDDI_LONGHORN 0x06000000 +#define NTDDI_VISTA 0x06000000 +#define NTDDI_WIN6 0x06000000 +#define NTDDI_VISTASP1 0x06000100 +#define NTDDI_WIN6SP1 0x06000100 +#define NTDDI_WS08 0x06000100 +#define NTDDI_VISTASP2 0x06000200 +#define NTDDI_WIN6SP2 0x06000200 +#define NTDDI_WS08SP2 0x06000200 +#define NTDDI_VISTASP3 0x06000300 +#define NTDDI_WIN6SP3 0x06000300 +#define NTDDI_WS08SP3 0x06000300 +#define NTDDI_VISTASP4 0x06000400 +#define NTDDI_WIN6SP4 0x06000400 +#define NTDDI_WS08SP4 0x06000400 + +#define NTDDI_WIN7 0x06010000 + +#define NTDDI_WIN8 0x06020000 + +#define NTDDI_WINBLUE 0x06030000 + +#define NTDDI_WINTHRESHOLD 0x0A000000 +#define NTDDI_WIN10 0x0A000000 +#define NTDDI_WIN10_TH2 0x0A000001 +#define NTDDI_WIN10_RS1 0x0A000002 +#define NTDDI_WIN10_RS2 0x0A000003 +#define NTDDI_WIN10_RS3 0x0A000004 +#define NTDDI_WIN10_RS4 0x0A000005 +#define NTDDI_WIN10_RS5 0x0A000006 +#define NTDDI_WIN10_19H1 0x0A000007 +#define NTDDI_WIN10_VB 0x0A000008 +#define NTDDI_WIN10_MN 0x0A000009 +#define NTDDI_WIN10_FE 0x0A00000A + +#define NTDDI_VERSION_FROM_WIN32_WINNT2(ver) ver##0000 +#define NTDDI_VERSION_FROM_WIN32_WINNT(ver) NTDDI_VERSION_FROM_WIN32_WINNT2(ver) + +#if !defined(NTDDI_VERSION) && defined(_WIN32_WINNT) +#define NTDDI_VERSION NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT) +#endif + +#endif /* _INC_SDKDDKVER */ diff --git a/include/windows.h b/include/windows.h index 47f13e395d2..19e1fd4fc49 100644 --- a/include/windows.h +++ b/include/windows.h @@ -33,6 +33,7 @@ /* All the basic includes */ #include <excpt.h> +#include <sdkddkver.h> #include <stdarg.h> #include <windef.h> #include <winbase.h>

1 0

Alexandre Julliard : ntdll: Reimplement KeUserModeCallback in assembly on ARM64.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: 4069a8b384c15a90a7af66636ec5650eeb53b391 URL: https://gitlab.winehq.org/wine/wine/-/commit/4069a8b384c15a90a7af66636ec565… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 12:29:18 2022 +0100 ntdll: Reimplement KeUserModeCallback in assembly on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 130 +++++++++++++++++++++++++++-------------- 1 file changed, 85 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 19d08e2270a..bc8225d7ec8 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -876,56 +876,104 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } -struct user_callback_frame -{ - struct syscall_frame frame; - void **ret_ptr; - ULONG *ret_len; - __wine_jmp_buf jmpbuf; - NTSTATUS status; - void *teb_frame; -}; +/*********************************************************************** + * call_user_mode_callback + */ +extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, + ULONG *ret_len, TEB *teb ); +__ASM_GLOBAL_FUNC( call_user_mode_callback, + "stp x29, x30, [sp,#-0xc0]!\n\t" + "mov x29, sp\n\t" + "mov x16, x0\n\t" /* func */ + "mov x17, x1\n\t" /* stack */ + "mov x18, x4\n\t" /* teb */ + "stp x19, x20, [x29, #0x10]\n\t" + "stp x21, x22, [x29, #0x20]\n\t" + "stp x23, x24, [x29, #0x30]\n\t" + "stp x25, x26, [x29, #0x40]\n\t" + "stp x27, x28, [x29, #0x50]\n\t" + "stp d8, d9, [x29, #0x60]\n\t" + "stp d10, d11, [x29, #0x70]\n\t" + "stp d12, d13, [x29, #0x80]\n\t" + "stp d14, d15, [x29, #0x90]\n\t" + "stp x2, x3, [x29, #0xa0]\n\t" /* ret_ptr, ret_len */ + "mrs x5, fpcr\n\t" + "mrs x6, fpsr\n\t" + "bfi x5, x6, #0, #32\n\t" + "ldr x6, [x18]\n\t" /* teb->Tib.ExceptionList */ + "stp x5, x6, [x29, #0xb0]\n\t" + + "ldr x7, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "sub x5, sp, #0x330\n\t" /* sizeof(struct syscall_frame) */ + "str x5, [x18, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x8, [x7, #0x118]\n\t" /* prev_frame->syscall_table */ + "ldp x0, x1, [x17]\n\t" /* id, args */ + "ldr x2, [x17, #0x10]\n\t" /* len */ + "mov sp, x17\n\t" + "stp x7, x8, [x5, #0x110]\n\t" /* frame->prev_frame, frame->syscall_table */ + "br x16" ) + + +/*********************************************************************** + * user_mode_callback_return + */ +extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ); +__ASM_GLOBAL_FUNC( user_mode_callback_return, + "ldr x4, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "ldr x5, [x4, #0x110]\n\t" /* prev_frame */ + "str x5, [x3, #0x2f8]\n\t" /* arm64_thread_data()->syscall_frame */ + "add x29, x4, #0x330\n\t" /* sizeof(struct syscall_frame) */ + "ldp x5, x6, [x29, #0xb0]\n\t" + "str x6, [x3]\n\t" /* teb->Tib.ExceptionList */ + "msr fpcr, x5\n\t" + "lsr x5, x5, #32\n\t" + "msr fpsr, x5\n\t" + "ldp x19, x20, [x29, #0x10]\n\t" + "ldp x21, x22, [x29, #0x20]\n\t" + "ldp x23, x24, [x29, #0x30]\n\t" + "ldp x25, x26, [x29, #0x40]\n\t" + "ldp x27, x28, [x29, #0x50]\n\t" + "ldp d8, d9, [x29, #0x60]\n\t" + "ldp d10, d11, [x29, #0x70]\n\t" + "ldp d12, d13, [x29, #0x80]\n\t" + "ldp d14, d15, [x29, #0x90]\n\t" + "ldp x5, x6, [x29, #0xa0]\n\t" /* ret_ptr, ret_len */ + "str x0, [x5]\n\t" /* ret_ptr */ + "str x1, [x6]\n\t" /* ret_len */ + "mov x0, x2\n\t" /* status */ + "mov sp, x29\n\t" + "ldp x29, x30, [sp], #0xc0\n\t" + "ret" ) + /*********************************************************************** * KeUserModeCallback */ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { - struct user_callback_frame callback_frame = { {{ 0 }}, ret_ptr, ret_len }; + struct syscall_frame *frame = arm64_thread_data()->syscall_frame; + void *args_data = (void *)((frame->sp - len) & ~15); + ULONG_PTR *stack = args_data; /* if we have no syscall frame, call the callback directly */ - if ((char *)&callback_frame < (char *)ntdll_get_thread_data()->kernel_stack || - (char *)&callback_frame > (char *)arm64_thread_data()->syscall_frame) + if ((char *)&frame < (char *)ntdll_get_thread_data()->kernel_stack || + (char *)&frame > (char *)arm64_thread_data()->syscall_frame) { NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; return func( args, len ); } - if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&callback_frame) + if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; - if (!__wine_setjmpex( &callback_frame.jmpbuf, NULL )) - { - struct syscall_frame *frame = arm64_thread_data()->syscall_frame; - void *args_data = (void *)((frame->sp - len) & ~15); - - memcpy( args_data, args, len ); - - callback_frame.frame.x[0] = id; - callback_frame.frame.x[1] = (ULONG_PTR)args; - callback_frame.frame.x[2] = len; - callback_frame.frame.x[18] = frame->x[18]; - callback_frame.frame.sp = (ULONG_PTR)args_data; - callback_frame.frame.pc = (ULONG_PTR)pKiUserCallbackDispatcher; - callback_frame.frame.restore_flags = CONTEXT_INTEGER; - callback_frame.frame.syscall_table = frame->syscall_table; - callback_frame.frame.prev_frame = frame; - callback_frame.teb_frame = NtCurrentTeb()->Tib.ExceptionList; - arm64_thread_data()->syscall_frame = &callback_frame.frame; - - __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); - } - return callback_frame.status; + memcpy( args_data, args, len ); + *(--stack) = 0; + *(--stack) = len; + *(--stack) = (ULONG_PTR)args_data; + *(--stack) = id; + + return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); } @@ -934,16 +982,8 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void */ NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { - struct user_callback_frame *frame = (struct user_callback_frame *)arm64_thread_data()->syscall_frame; - - if (!frame->frame.prev_frame) return STATUS_NO_CALLBACK_ACTIVE; - - *frame->ret_ptr = ret_ptr; - *frame->ret_len = ret_len; - frame->status = status; - arm64_thread_data()->syscall_frame = frame->frame.prev_frame; - NtCurrentTeb()->Tib.ExceptionList = frame->teb_frame; - __wine_longjmp( &frame->jmpbuf, 1 ); + if (!arm64_thread_data()->syscall_frame->prev_frame) return STATUS_NO_CALLBACK_ACTIVE; + user_mode_callback_return( ret_ptr, ret_len, status, NtCurrentTeb() ); }

1 0

Jinoh Kang : comctl32/tests: Flush events before testing edit control IME messages.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: b6a41a2f98c815689525ce343b8bd3a93bceaaae URL: https://gitlab.winehq.org/wine/wine/-/commit/b6a41a2f98c815689525ce343b8bd3… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Nov 4 00:32:09 2022 +0900 comctl32/tests: Flush events before testing edit control IME messages. --- dlls/comctl32/tests/edit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index ccdeed95d92..876cddf0de2 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -3641,6 +3641,7 @@ static void test_ime(void) /* Test IME messages when EIMES_GETCOMPSTRATONCE is not set */ old_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)edit_ime_subclass_proc); SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)old_proc); + flush_events(); himc = ImmGetContext(hwnd); ret = ImmSetCompositionStringA(himc, SCS_SETSTR, "Wine", 4, NULL, 0);

1 0

Jinoh Kang : comctl32/tests: Flush events before testing edit control SetFocus() messages.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: 7a772a7feb69c0fb0a6e24ac0471fb03b31e8f3c URL: https://gitlab.winehq.org/wine/wine/-/commit/7a772a7feb69c0fb0a6e24ac0471fb… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Fri Nov 4 00:31:26 2022 +0900 comctl32/tests: Flush events before testing edit control SetFocus() messages. --- dlls/comctl32/tests/edit.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 5f23fff2c9c..ccdeed95d92 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -54,6 +54,24 @@ struct edit_notify { static struct edit_notify notifications; +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + MSG msg; + int diff = 200; + int min_timeout = 100; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static INT_PTR CALLBACK multi_edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { static int num_ok_commands = 0; @@ -3445,6 +3463,7 @@ static void test_change_focus(void) SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); SetCursorPos(400, 400); + flush_events(); SetFocus(parent_wnd); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Alexandre Julliard : ntdll: Reimplement KeUserModeCallback in assembly on x86_64.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: 8e9551f32435d76df87864147cc2119fd6555ef3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e9551f32435d76df87864147cc211… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 12:28:56 2022 +0100 ntdll: Reimplement KeUserModeCallback in assembly on x86_64. --- dlls/ntdll/unix/signal_x86_64.c | 194 +++++++++++++++++++++++++++++----------- 1 file changed, 144 insertions(+), 50 deletions(-)

1 0

Alexandre Julliard : ntdll: Reimplement KeUserModeCallback in assembly on ARM.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: b60d076b09315a5b1abb740dcadb136b7440f564 URL: https://gitlab.winehq.org/wine/wine/-/commit/b60d076b09315a5b1abb740dcadb13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 7 12:29:08 2022 +0100 ntdll: Reimplement KeUserModeCallback in assembly on ARM. --- dlls/ntdll/unix/signal_arm.c | 113 ++++++++++++++++++++++++++----------------- 1 file changed, 69 insertions(+), 44 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 9300ea2adc3..9eef8ff7c69 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1149,55 +1149,88 @@ NTSTATUS call_user_exception_dispatcher( EXCEPTION_RECORD *rec, CONTEXT *context } -struct user_callback_frame -{ - struct syscall_frame frame; - void **ret_ptr; - ULONG *ret_len; - __wine_jmp_buf jmpbuf; - NTSTATUS status; - void *teb_frame; -}; +/*********************************************************************** + * call_user_mode_callback + */ +extern NTSTATUS CDECL call_user_mode_callback( void *func, void *stack, void **ret_ptr, + ULONG *ret_len, TEB *teb ); +__ASM_GLOBAL_FUNC( call_user_mode_callback, + "push {r2-r12,lr}\n\t" + "ldr r4, [sp, #0x30]\n\t" /* teb */ + "ldr r5, [r4]\n\t" /* teb->Tib.ExceptionList */ + "str r5, [sp, #0x28]\n\t" +#ifndef __SOFTFP__ + "sub sp, sp, #0x90\n\t" + "mov r5, sp\n\t" + "vmrs r6, fpscr\n\t" + "vstm r5, {d8-d15}\n\t" + "str r6, [r5, #0x80]\n\t" +#endif + "sub sp, sp, #0x160\n\t" /* sizeof(struct syscall_frame) + registers */ + "ldr r5, [r4, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ + "str r5, [sp, #0x4c]\n\t" /* frame->prev_frame */ + "str sp, [r4, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ + "ldr r6, [r5, #0x50]\n\t" /* prev_frame->syscall_table */ + "str r6, [sp, #0x50]\n\t" /* frame->syscall_table */ + "mov ip, r0\n\t" + "mov sp, r1\n\t" + "pop {r0-r3}\n\t" + "bx ip" ) + + +/*********************************************************************** + * user_mode_callback_return + */ +extern void CDECL DECLSPEC_NORETURN user_mode_callback_return( void *ret_ptr, ULONG ret_len, + NTSTATUS status, TEB *teb ); +__ASM_GLOBAL_FUNC( user_mode_callback_return, + "ldr r4, [r3, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ + "ldr r5, [r4, #0x4c]\n\t" /* frame->prev_frame */ + "str r5, [r3, #0x1d8]\n\t" /* arm_thread_data()->syscall_frame */ + "add r5, r4, #0x160\n\t" +#ifndef __SOFTFP__ + "vldm r5, {d8-d15}\n\t" + "ldr r6, [r5, #0x80]\n\t" + "vmsr fpscr, r6\n\t" + "add r5, r5, #0x90\n\t" +#endif + "mov sp, r5\n\t" + "ldr r5, [sp, #0x28]\n\t" + "str r5, [r3]\n\t" /* teb->Tib.ExceptionList */ + "pop {r5, r6}\n\t" /* ret_ptr, ret_len */ + "str r0, [r5]\n\t" /* ret_ptr */ + "str r1, [r6]\n\t" /* ret_len */ + "mov r0, r2\n\t" /* status */ + "pop {r4-r12,pc}" ) + /*********************************************************************** * KeUserModeCallback */ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { - struct user_callback_frame callback_frame = { { 0 }, ret_ptr, ret_len }; + struct syscall_frame *frame = arm_thread_data()->syscall_frame; + void *args_data = (void *)((frame->sp - len) & ~15); + ULONG_PTR *stack = args_data; /* if we have no syscall frame, call the callback directly */ - if ((char *)&callback_frame < (char *)ntdll_get_thread_data()->kernel_stack || - (char *)&callback_frame > (char *)arm_thread_data()->syscall_frame) + if ((char *)&frame < (char *)ntdll_get_thread_data()->kernel_stack || + (char *)&frame > (char *)arm_thread_data()->syscall_frame) { NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; return func( args, len ); } - if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&callback_frame) + if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; - if (!__wine_setjmpex( &callback_frame.jmpbuf, NULL )) - { - struct syscall_frame *frame = arm_thread_data()->syscall_frame; - void *args_data = (void *)((frame->sp - len) & ~15); - - memcpy( args_data, args, len ); - - callback_frame.frame.r0 = id; - callback_frame.frame.r1 = (ULONG_PTR)args; - callback_frame.frame.r2 = len; - callback_frame.frame.sp = (ULONG_PTR)args_data; - callback_frame.frame.pc = (ULONG_PTR)pKiUserCallbackDispatcher; - callback_frame.frame.restore_flags = CONTEXT_INTEGER; - callback_frame.frame.syscall_table = frame->syscall_table; - callback_frame.frame.prev_frame = frame; - callback_frame.teb_frame = NtCurrentTeb()->Tib.ExceptionList; - arm_thread_data()->syscall_frame = &callback_frame.frame; - - __wine_syscall_dispatcher_return( &callback_frame.frame, 0 ); - } - return callback_frame.status; + memcpy( args_data, args, len ); + *(--stack) = 0; + *(--stack) = len; + *(--stack) = (ULONG_PTR)args_data; + *(--stack) = id; + + return call_user_mode_callback( pKiUserCallbackDispatcher, stack, ret_ptr, ret_len, NtCurrentTeb() ); } @@ -1206,16 +1239,8 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void */ NTSTATUS WINAPI NtCallbackReturn( void *ret_ptr, ULONG ret_len, NTSTATUS status ) { - struct user_callback_frame *frame = (struct user_callback_frame *)arm_thread_data()->syscall_frame; - - if (!frame->frame.prev_frame) return STATUS_NO_CALLBACK_ACTIVE; - - *frame->ret_ptr = ret_ptr; - *frame->ret_len = ret_len; - frame->status = status; - arm_thread_data()->syscall_frame = frame->frame.prev_frame; - NtCurrentTeb()->Tib.ExceptionList = frame->teb_frame; - __wine_longjmp( &frame->jmpbuf, 1 ); + if (!arm_thread_data()->syscall_frame->prev_frame) return STATUS_NO_CALLBACK_ACTIVE; + user_mode_callback_return( ret_ptr, ret_len, status, NtCurrentTeb() ); }

1 0

Alexandre Julliard : xslt: Use WINAPIV calling convention for variadic functions.
by Alexandre Julliard Nov. 7, 2022

Nov. 7, 2022

Module: wine Branch: master Commit: 1a652d2c9e48fa239d10e53a37be98c102e226af URL: https://gitlab.winehq.org/wine/wine/-/commit/1a652d2c9e48fa239d10e53a37be98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 4 21:18:16 2022 +0100 xslt: Use WINAPIV calling convention for variadic functions. --- libs/xslt/libxslt/xsltutils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/xslt/libxslt/xsltutils.h b/libs/xslt/libxslt/xsltutils.h index 12e4c75f5b9..7f35cc7ed20 100644 --- a/libs/xslt/libxslt/xsltutils.h +++ b/libs/xslt/libxslt/xsltutils.h @@ -157,7 +157,7 @@ XSLTPUBFUN void XSLTCALL xsltSetTransformErrorFunc (xsltTransformContextPtr ctxt, void *ctx, xmlGenericErrorFunc handler); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void WINAPIV xsltTransformError (xsltTransformContextPtr ctxt, xsltStylesheetPtr style, xmlNodePtr node,

1 0