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

Francois Gouget : winscard: Fix the spelling of a function parameter.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 5f08c8fbcc0728222155e488f6fb72f93ad69457 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f08c8fbcc0728222155e488f6fb72… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 7 13:48:18 2023 +0100 winscard: Fix the spelling of a function parameter. --- dlls/winscard/winscard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index c7954faa400..da4268442a2 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -713,7 +713,7 @@ LONG WINAPI SCardConnectW( SCARDCONTEXT context, const WCHAR *reader, DWORD shar return ret; } -LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferred_protocols, DWORD initalization, +LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferred_protocols, DWORD initialization, DWORD *protocol ) { struct handle *handle = (struct handle *)connect; @@ -721,14 +721,14 @@ LONG WINAPI SCardReconnect( SCARDHANDLE connect, DWORD share_mode, DWORD preferr UINT64 protocol64; LONG ret; - TRACE( "%Ix, %#lx, %#lx, %#lx, %p\n", connect, share_mode, preferred_protocols, initalization, protocol ); + TRACE( "%Ix, %#lx, %#lx, %#lx, %p\n", connect, share_mode, preferred_protocols, initialization, protocol ); if (!handle || handle->magic != CONNECT_MAGIC) return ERROR_INVALID_HANDLE; params.handle = handle->unix_handle; params.share_mode = share_mode; params.preferred_protocols = preferred_protocols; - params.initialization = initalization; + params.initialization = initialization; params.protocol = &protocol64; if (!(ret = UNIX_CALL( scard_reconnect, &params )) && protocol) *protocol = protocol64; TRACE( "returning %#lx\n", ret );

1 0

Rémi Bernon : win32u: Initialize IO_STATUS_BLOCK in load_directory_fonts.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: ec5d9f6413e6a1945c87651863d366e077cbe27e URL: https://gitlab.winehq.org/wine/wine/-/commit/ec5d9f6413e6a1945c87651863d366… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 6 13:11:04 2023 +0100 win32u: Initialize IO_STATUS_BLOCK in load_directory_fonts. To avoid invalid writes on WOW64 Nt calls. --- dlls/win32u/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index 742a31b59a4..1590ab00483 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -6530,9 +6530,9 @@ static void load_system_bitmap_fonts(void) static void load_directory_fonts( WCHAR *path, UINT flags ) { + IO_STATUS_BLOCK io = {{0}}; OBJECT_ATTRIBUTES attr; UNICODE_STRING nt_name; - IO_STATUS_BLOCK io; HANDLE handle; char buf[8192]; size_t len;

1 0

Jinoh Kang : riched20/tests: Test for ITextDocument::Freeze and ITextDocument::Unfreeze.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 3105fad82b9bae390fcd710a2fc10a18988b4622 URL: https://gitlab.winehq.org/wine/wine/-/commit/3105fad82b9bae390fcd710a2fc10a… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 4 21:58:40 2023 +0900 riched20/tests: Test for ITextDocument::Freeze and ITextDocument::Unfreeze. --- dlls/riched20/tests/richole.c | 86 +++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/txtsrv.c | 28 ++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 7402541ed6e..08641ce6317 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -31,6 +31,8 @@ #include <richedit.h> #include <richole.h> #include <tom.h> +#include <imm.h> +#include <textserv.h> #include <wine/test.h> #define EXPECT_TODO_WINE 0x80000000UL @@ -605,6 +607,7 @@ static HRESULT testoleobj_Create( struct testoleobj **objptr ) static HMODULE hmoduleRichEdit; DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); +DEFINE_GUID(IID_ITextServices, 0x8d33f740, 0xcf58, 0x11ce, 0xa8, 0x9d, 0x00, 0xaa, 0x00, 0x6c, 0xad, 0xc5); static const WCHAR sysW[] = {'S','y','s','t','e','m',0}; @@ -5496,6 +5499,88 @@ static void test_undo_control(void) release_interfaces(&inst.hwnd, &reole, &inst.doc, &selection); } +static void test_freeze(void) +{ + ITextSelection *selection = NULL; + DWORD lasterr, style1, style2; + IRichEditOle *reole = NULL; + ITextDocument *doc = NULL; + HRESULT hr; + LONG count; + HWND hwnd; + + create_interfaces(&hwnd, &reole, &doc, &selection); + + SetLastError(0xdeadbeef); + style1 = GetWindowLongW(hwnd, GWL_STYLE); + lasterr = GetLastError(); + ok(lasterr == 0xdeadbeefUL, "GetLastError() returned %#lx\n", lasterr); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + style2 = GetWindowLongW(hwnd, GWL_STYLE); + ok(style2 == style1, "expected window style to not change from %#lx, got %#lx\n", style1, style2); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 2, "expected count to be %d, got %ld\n", 2, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_FALSE, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + todo_wine + ok(count == 1, "expected count to be %d, got %ld\n", 1, count); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, &count); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + todo_wine + ok(count == 0, "expected count to be %d, got %ld\n", 0, count); + + count = 0xdeadbeef; + hr = ITextDocument_Freeze(doc, NULL); + todo_wine + ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); + + count = 0xdeadbeef; + hr = ITextDocument_Unfreeze(doc, NULL); + todo_wine + ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); + + release_interfaces(&hwnd, &reole, &doc, &selection); +} + START_TEST(richole) { /* Must explicitly LoadLibrary(). The test has no references to functions in @@ -5539,4 +5624,5 @@ START_TEST(richole) test_clipboard(); test_undo(); test_undo_control(); + test_freeze(); } diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 16904347919..2777f4eea21 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -815,15 +815,20 @@ static void test_TxGetNaturalSize(void) static void test_TxDraw(void) { ITextServices *txtserv; + ITextDocument *txtdoc; ITextHost *host; HRESULT hr; RECT client = {0, 0, 100, 100}; ITextHostTestImpl *host_impl; + LONG freeze_count; HDC hdc; if (!init_texthost(&txtserv, &host)) return; + hr = ITextServices_QueryInterface( txtserv, &IID_ITextDocument, (void **)&txtdoc ); + ok( hr == S_OK, "ITextServices_QueryInterface (ITextDocument) returned %#lx\n", hr ); + host_impl = impl_from_ITextHost( host ); host_impl->window = CreateWindowExA( 0, "static", NULL, WS_POPUP | WS_VISIBLE, 0, 0, 400, 400, 0, 0, 0, NULL ); @@ -856,9 +861,32 @@ static void test_TxDraw(void) NULL, NULL, 0, TXTVIEW_INACTIVE ); ok( hr == S_OK, "got %08lx\n", hr ); + freeze_count = 0xdeadbeef; + hr = ITextDocument_Freeze( txtdoc, &freeze_count ); + todo_wine + ok( hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr ); + todo_wine + ok( freeze_count == 1, "expected count to be %d, got %ld\n", 1, freeze_count ); + + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, + NULL, NULL, 0, TXTVIEW_INACTIVE ); + ok( hr == S_OK, "got %08lx\n", hr ); + hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, + NULL, NULL, 0, TXTVIEW_ACTIVE ); + todo_wine + ok( hr == E_UNEXPECTED, "got %08lx\n", hr ); + + freeze_count = 0xdeadbeef; + hr = ITextDocument_Unfreeze( txtdoc, &freeze_count ); + todo_wine + ok( hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr ); + todo_wine + ok( freeze_count == 0, "expected count to be %d, got %ld\n", 0, freeze_count ); + hr = ITextServices_OnTxInPlaceDeactivate( txtserv ); ReleaseDC( host_impl->window, hdc ); + ITextDocument_Release(txtdoc); ITextServices_Release(txtserv); DestroyWindow( host_impl->window ); ITextHost_Release(host);

1 0

Jinoh Kang : riched20: Don't assume that TxDraw preserves the device context's brush selection.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 2027be7e0370c92595f126a0b0dd167a635d50a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2027be7e0370c92595f126a0b0dd16… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 4 22:09:16 2023 +0900 riched20: Don't assume that TxDraw preserves the device context's brush selection. Today, RichEditWndProc_common assumes that ITextServices::TxDraw preserves the brush selection of the given device context. However, this invariant may be broken by misbehaving embedded OLE objects in the text document. Fix this by not assuming that the return value of the second SelectObject() call equals the brush passed to the first SelectObject() call in RichEditWndProc_common's WM_PAINT / WM_PRINTCLIENT case. --- dlls/riched20/txthost.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index cb008f19c21..ec6f8e52fa5 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1312,7 +1312,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HDC hdc; RECT rc, client, update; PAINTSTRUCT ps; - HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); + HBRUSH brush, old_brush; ITextHost_TxGetClientRect( &host->ITextHost_iface, &client ); @@ -1327,7 +1327,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, update = client; } - brush = SelectObject( hdc, brush ); + brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); + old_brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ if (update.top < client.top) @@ -1361,7 +1362,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, &update, NULL, 0, TXTVIEW_ACTIVE ); - DeleteObject( SelectObject( hdc, brush ) ); + SelectObject( hdc, old_brush ); + DeleteObject( brush ); if (msg == WM_PAINT) EndPaint( hwnd, &ps ); return 0; }

1 0

Jinoh Kang : riched20: Implement ITextDocument::Freeze and ITextDocument::Unfreeze.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 3fe15349d39ccf31026a92eae30f83f65c91cb1f URL: https://gitlab.winehq.org/wine/wine/-/commit/3fe15349d39ccf31026a92eae30f83… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Mar 4 23:12:16 2023 +0900 riched20: Implement ITextDocument::Freeze and ITextDocument::Unfreeze. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54617 --- dlls/riched20/editor.c | 1 + dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 6 ++++-- dlls/riched20/richole.c | 15 +++++++++++---- dlls/riched20/tests/richole.c | 16 ---------------- dlls/riched20/tests/txtsrv.c | 5 ----- dlls/riched20/txthost.c | 6 +++++- dlls/riched20/txtsrv.c | 2 ++ 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 704546f1e95..9c84a810569 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2994,6 +2994,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->mode |= (ed->props & TXTBIT_RICHTEXT) ? TM_RICHTEXT : TM_PLAINTEXT; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; + ed->freeze_count = 0; ed->bMouseCaptured = FALSE; ed->caret_hidden = FALSE; ed->caret_height = 0; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index db219d7e4df..cc577de14db 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -429,6 +429,7 @@ typedef struct tagME_TextEditor BOOL AutoURLDetect_bEnable; WCHAR password_char; BOOL bHaveFocus; + DWORD freeze_count; /*for IME */ int imeStartIndex; DWORD selofs; /* The size of the selection bar on the left side of control */ diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 245afff77dc..8bc1b8bcd2f 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -123,7 +123,8 @@ void ME_Repaint(ME_TextEditor *editor) ME_UpdateScrollBar(editor); FIXME("ME_Repaint had to call ME_WrapMarkedParagraphs\n"); } - ITextHost_TxViewChange(editor->texthost, TRUE); + if (!editor->freeze_count) + ITextHost_TxViewChange(editor->texthost, TRUE); } void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) @@ -140,7 +141,8 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) update_caret( editor ); - ITextHost_TxViewChange(editor->texthost, update_now); + if (!editor->freeze_count) + ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 8190a4e2753..90496742e36 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -4217,15 +4217,22 @@ static HRESULT WINAPI ITextDocument2Old_fnSave(ITextDocument2Old *iface, VARIANT static HRESULT WINAPI ITextDocument2Old_fnFreeze(ITextDocument2Old *iface, LONG *pCount) { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n", services); - return E_NOTIMPL; + + if (services->editor->freeze_count < LONG_MAX) services->editor->freeze_count++; + + if (pCount) *pCount = services->editor->freeze_count; + return services->editor->freeze_count != 0 ? S_OK : S_FALSE; } static HRESULT WINAPI ITextDocument2Old_fnUnfreeze(ITextDocument2Old *iface, LONG *pCount) { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("stub %p\n", services); - return E_NOTIMPL; + + if (services->editor->freeze_count && !--services->editor->freeze_count) + ME_RewrapRepaint(services->editor); + + if (pCount) *pCount = services->editor->freeze_count; + return services->editor->freeze_count == 0 ? S_OK : S_FALSE; } static HRESULT WINAPI ITextDocument2Old_fnBeginEditCollection(ITextDocument2Old *iface) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 08641ce6317..fb5177b83e9 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -5518,9 +5518,7 @@ static void test_freeze(void) count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); - todo_wine ok(count == 1, "expected count to be %d, got %ld\n", 1, count); style2 = GetWindowLongW(hwnd, GWL_STYLE); @@ -5528,54 +5526,40 @@ static void test_freeze(void) count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); - todo_wine ok(count == 2, "expected count to be %d, got %ld\n", 2, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_FALSE, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 1, "expected count to be %d, got %ld\n", 1, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 0, "expected count to be %d, got %ld\n", 0, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 0, "expected count to be %d, got %ld\n", 0, count); count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); - todo_wine ok(count == 1, "expected count to be %d, got %ld\n", 1, count); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, &count); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); - todo_wine ok(count == 0, "expected count to be %d, got %ld\n", 0, count); count = 0xdeadbeef; hr = ITextDocument_Freeze(doc, NULL); - todo_wine ok(hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr); count = 0xdeadbeef; hr = ITextDocument_Unfreeze(doc, NULL); - todo_wine ok(hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr); release_interfaces(&hwnd, &reole, &doc, &selection); diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 2777f4eea21..da8e9da5ea6 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -863,9 +863,7 @@ static void test_TxDraw(void) freeze_count = 0xdeadbeef; hr = ITextDocument_Freeze( txtdoc, &freeze_count ); - todo_wine ok( hr == S_OK, "ITextDocument_Freeze returned %#lx\n", hr ); - todo_wine ok( freeze_count == 1, "expected count to be %d, got %ld\n", 1, freeze_count ); hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, @@ -873,14 +871,11 @@ static void test_TxDraw(void) ok( hr == S_OK, "got %08lx\n", hr ); hr = ITextServices_TxDraw( txtserv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, (RECTL *)&client, NULL, NULL, NULL, 0, TXTVIEW_ACTIVE ); - todo_wine ok( hr == E_UNEXPECTED, "got %08lx\n", hr ); freeze_count = 0xdeadbeef; hr = ITextDocument_Unfreeze( txtdoc, &freeze_count ); - todo_wine ok( hr == S_OK, "ITextDocument_Unfreeze returned %#lx\n", hr ); - todo_wine ok( freeze_count == 0, "expected count to be %d, got %ld\n", 0, freeze_count ); hr = ITextServices_OnTxInPlaceDeactivate( txtserv ); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ec6f8e52fa5..412733edaeb 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1313,18 +1313,22 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, RECT rc, client, update; PAINTSTRUCT ps; HBRUSH brush, old_brush; + LONG view_id; ITextHost_TxGetClientRect( &host->ITextHost_iface, &client ); if (msg == WM_PAINT) { + /* TODO retrieve if the text document is frozen */ hdc = BeginPaint( hwnd, &ps ); update = ps.rcPaint; + view_id = TXTVIEW_ACTIVE; } else { hdc = (HDC)wparam; update = client; + view_id = TXTVIEW_INACTIVE; } brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); @@ -1361,7 +1365,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, } ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, - &update, NULL, 0, TXTVIEW_ACTIVE ); + &update, NULL, 0, view_id ); SelectObject( hdc, old_brush ); DeleteObject( brush ); if (msg == WM_PAINT) EndPaint( hwnd, &ps ); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 809bb5ac3ae..55e0c7e64bb 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -168,6 +168,8 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD if (aspect != DVASPECT_CONTENT || aspect_info || td || target || mf_bounds || continue_fn ) FIXME( "Many arguments are ignored\n" ); + if (view_id == TXTVIEW_ACTIVE && services->editor->freeze_count) return E_UNEXPECTED; + hr = update_client_rect( services, (RECT *)bounds ); if (FAILED( hr )) return hr; if (hr == S_OK) rewrap = TRUE;

1 0

Alexandre Julliard : wow64: Declare exported functions in winternl.h.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 63a781de1d245a0ff33d313cb0c414fc31778d78 URL: https://gitlab.winehq.org/wine/wine/-/commit/63a781de1d245a0ff33d313cb0c414… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:24:55 2023 +0100 wow64: Declare exported functions in winternl.h. --- dlls/wow64/wow64_private.h | 4 ---- dlls/wow64win/wow64win_private.h | 4 ---- include/winternl.h | 8 ++++++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index f2c405bb2c6..7eef4da3ad9 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -28,10 +28,6 @@ ALL_SYSCALLS #undef SYSCALL_ENTRY -void * WINAPI Wow64AllocateTemp( SIZE_T size ); -void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ); -void WINAPI Wow64PassExceptionToGuest( EXCEPTION_POINTERS *ptrs ); - extern void init_image_mapping( HMODULE module ) DECLSPEC_HIDDEN; extern void init_file_redirects(void) DECLSPEC_HIDDEN; extern BOOL get_file_redirect( OBJECT_ATTRIBUTES *attr ) DECLSPEC_HIDDEN; diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h index 643875c69ce..76e0c98f0f0 100644 --- a/dlls/wow64win/wow64win_private.h +++ b/dlls/wow64win/wow64win_private.h @@ -30,10 +30,6 @@ ALL_WIN32_SYSCALLS typedef NTSTATUS (WINAPI *user_callback)( void *params, ULONG size ); extern user_callback user_callbacks[] DECLSPEC_HIDDEN; -void * WINAPI Wow64AllocateTemp( SIZE_T size ); -NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, - void **ret_ptr, ULONG *ret_len ); - struct object_attr64 { OBJECT_ATTRIBUTES attr; diff --git a/include/winternl.h b/include/winternl.h index f2992b82857..5a21f167d61 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3855,6 +3855,14 @@ typedef struct _WOW64_CPU_AREA_INFO USHORT Machine; } WOW64_CPU_AREA_INFO, *PWOW64_CPU_AREA_INFO; +/* wow64.dll functions */ +void * WINAPI Wow64AllocateTemp(SIZE_T); +void WINAPI Wow64ApcRoutine(ULONG_PTR,ULONG_PTR,ULONG_PTR,CONTEXT*); +NTSTATUS WINAPI Wow64KiUserCallbackDispatcher(ULONG,void*,ULONG,void**,ULONG*); +void WINAPI Wow64PassExceptionToGuest(EXCEPTION_POINTERS*); +void WINAPI Wow64PrepareForException(EXCEPTION_RECORD*,CONTEXT*); +NTSTATUS WINAPI Wow64SystemServiceEx(UINT,UINT*); + #ifdef __WINESRC__ /* undocumented layout of LdrSystemDllInitBlock */ /* this varies across Windows version; we are using the win10-2004 layout */

1 0

Alexandre Julliard : wow64: Push a valid return address when calling KiRaiseUserExceptionDispatcher.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 96841d0358fe35c448fce4ad494a1db98f3f2e7a URL: https://gitlab.winehq.org/wine/wine/-/commit/96841d0358fe35c448fce4ad494a1d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:21:40 2023 +0100 wow64: Push a valid return address when calling KiRaiseUserExceptionDispatcher. --- dlls/wow64/syscall.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 1feeac083d9..de5a42aec4f 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -278,6 +278,8 @@ static void call_raise_user_exception_dispatcher( ULONG code ) I386_CONTEXT ctx = { CONTEXT_I386_ALL }; pBTCpuGetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + ctx.Esp -= sizeof(ULONG); + *(ULONG *)ULongToPtr( ctx.Esp ) = ctx.Eip; ctx.Eip = (ULONG_PTR)pKiRaiseUserExceptionDispatcher; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); }

1 0

Alexandre Julliard : wow64: Keep track of APC stack frames, similarly to user callback frames.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: c244fe3d2749696b8c335c1b65b9d8291f7f0e6a URL: https://gitlab.winehq.org/wine/wine/-/commit/c244fe3d2749696b8c335c1b65b9d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 17:22:46 2023 +0100 wow64: Keep track of APC stack frames, similarly to user callback frames. And use the appropriate frame to restore the context in NtContinue. --- dlls/wow64/syscall.c | 31 ++++++++++++++++++++++--------- include/winternl.h | 1 + 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index de5a42aec4f..d2bb054b6d0 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -84,6 +84,13 @@ struct user_callback_frame __wine_jmp_buf jmpbuf; }; +/* stack frame for user APCs */ +struct user_apc_frame +{ + struct user_apc_frame *prev_frame; + CONTEXT *context; + void *wow_context; +}; SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; @@ -416,8 +423,14 @@ NTSTATUS WINAPI wow64_NtContinue( UINT *args ) BOOLEAN alertable = get_ulong( &args ); NTSTATUS status = get_context_return_value( context ); + struct user_apc_frame *frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST]; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, context ); + + while (frame && frame->wow_context != context) frame = frame->prev_frame; + NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST] = frame ? frame->prev_frame : NULL; + if (frame) NtContinue( frame->context, alertable ); + if (alertable) NtTestAlert(); return status; } @@ -981,13 +994,11 @@ void * WINAPI Wow64AllocateTemp( SIZE_T size ) */ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CONTEXT *context ) { - NTSTATUS retval; + struct user_apc_frame frame; -#ifdef __x86_64__ - retval = context->Rax; -#elif defined(__aarch64__) - retval = context->X0; -#endif + frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST]; + frame.context = context; + NtCurrentTeb()->TlsSlots[WOW64_TLS_APCLIST] = &frame; /* cf. 32-bit call_user_apc_dispatcher */ switch (current_machine) @@ -1014,10 +1025,11 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON stack->arg2 = arg2; stack->arg3 = arg3; stack->context = ctx; - stack->context.Eax = retval; ctx.Esp = PtrToUlong( stack ); ctx.Eip = pLdrSystemDllInitBlock->pKiUserApcDispatcher; + frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + cpu_simulate(); } break; @@ -1035,14 +1047,15 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON stack = (struct apc_stack_layout *)ULongToPtr( ctx.Sp & ~15 ) - 1; stack->func = arg1 >> 32; stack->context = ctx; - stack->context.R0 = retval; ctx.Sp = PtrToUlong( stack ); ctx.Pc = pLdrSystemDllInitBlock->pKiUserApcDispatcher; ctx.R0 = PtrToUlong( &stack->context ); ctx.R1 = arg1; ctx.R2 = arg2; ctx.R3 = arg3; + frame.wow_context = &stack->context; pBTCpuSetContext( GetCurrentThread(), GetCurrentProcess(), NULL, &ctx ); + cpu_simulate(); } break; } @@ -1112,7 +1125,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, memcpy( args_data, args, len ); ctx.R0 = id; - ctx.R1 = PtrToUlong( args ); + ctx.R1 = PtrToUlong( args_data ); ctx.R2 = len; ctx.Sp = PtrToUlong( args_data ); ctx.Pc = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; diff --git a/include/winternl.h b/include/winternl.h index 95abf79812b..f2992b82857 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1083,6 +1083,7 @@ typedef struct _TEB64 #define WOW64_TLS_CPURESERVED 1 #define WOW64_TLS_TEMPLIST 3 #define WOW64_TLS_USERCALLBACKDATA 5 +#define WOW64_TLS_APCLIST 7 #define WOW64_TLS_FILESYSREDIR 8 #define WOW64_TLS_MAX_NUMBER 19

1 0

Alexandre Julliard : ntdll/tests: Check the default stack information against the exe header.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: c2a2f1caadae9cc7f33cdcc1bacd1bd243dd4b07 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2a2f1caadae9cc7f33cdcc1bacd1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:06:09 2023 +0100 ntdll/tests: Check the default stack information against the exe header. --- dlls/ntdll/tests/threadpool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index d8ca80a99a4..168f00c2852 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -579,6 +579,7 @@ static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) static void test_tp_simple(void) { + IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); TP_POOL_STACK_INFORMATION stack_info; TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; @@ -686,8 +687,8 @@ static void test_tp_simple(void) /* test querying and setting the stack size */ status = pTpQueryPoolStackInformation(pool, &stack_info); ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); - ok(stack_info.StackReserve == 2 * 1024 * 1024, "expected default StackReserve, got %ld\n", (ULONG)stack_info.StackReserve); - ok(stack_info.StackCommit == 4 * 1024, "expected default StackCommit, got %ld\n", (ULONG)stack_info.StackCommit); + ok(stack_info.StackReserve == nt->OptionalHeader.SizeOfStackReserve, "expected default StackReserve, got %Ix\n", stack_info.StackReserve); + ok(stack_info.StackCommit == nt->OptionalHeader.SizeOfStackCommit, "expected default StackCommit, got %Ix\n", stack_info.StackCommit); /* threadpool does not validate the stack size values */ stack_info.StackReserve = stack_info.StackCommit = 1;

1 0

Alexandre Julliard : ntdll/tests: Remove invalid instruction from KiUserExceptionDispatcher test.
by Alexandre Julliard March 7, 2023

March 7, 2023

Module: wine Branch: master Commit: 16227352a6649375cf6d7fe828ba74bdf28794b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/16227352a6649375cf6d7fe828ba74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 7 11:08:01 2023 +0100 ntdll/tests: Remove invalid instruction from KiUserExceptionDispatcher test. It trips up box86. --- dlls/ntdll/tests/exception.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 94b2ccf61a6..90d90f3b64a 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1905,8 +1905,7 @@ static void test_kiuserexceptiondispatcher(void) 0x89, 0x79, 0x0c, /* mov %edi, 0xc(%ecx) */ 0x89, 0x69, 0x10, /* mov %ebp, 0x10(%ecx) */ 0x89, 0x61, 0x14, /* mov %esp, 0x14(%ecx) */ - - 0x67, 0x48, 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ + 0x8b, 0x71, 0xf0, /* mov -0x10(%ecx),%esi */ 0xc3, /* ret */ };

1 0