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

Jinoh Kang : riched20: Don't assume that TxDraw preserves the device context's brush selection.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 519971773efb56fd6d4ca45719093d406bb8dbaa URL: https://gitlab.winehq.org/wine/wine/-/commit/519971773efb56fd6d4ca45719093d… 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. (cherry picked from commit 2027be7e0370c92595f126a0b0dd167a635d50a2) --- 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

Hans Leidekker : wbemprox: Implement Win32_Volume.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 2992f6f4f971c6804d1b74f3c07738ea35a89504 URL: https://gitlab.winehq.org/wine/wine/-/commit/2992f6f4f971c6804d1b74f3c07738… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 22 13:07:05 2022 +0100 wbemprox: Implement Win32_Volume. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54030 (cherry picked from commit 337f3848a8d0a36c5b7858589f35bcf26b7f6d38) --- dlls/wbemprox/builtin.c | 69 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 40 ++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6066f8c9fbf..54a66c2aa8a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -483,6 +483,13 @@ static const struct column col_videocontroller[] = { L"VideoModeDescription", CIM_STRING|COL_FLAG_DYNAMIC }, { L"VideoProcessor", CIM_STRING|COL_FLAG_DYNAMIC }, }; + +static const struct column col_volume[] = +{ + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { L"DriveLetter", CIM_STRING|COL_FLAG_DYNAMIC }, +}; + static const struct column col_winsat[] = { { L"CPUScore", CIM_REAL32 }, @@ -925,6 +932,13 @@ struct record_videocontroller const WCHAR *videomodedescription; const WCHAR *videoprocessor; }; + +struct record_volume +{ + const WCHAR *deviceid; + const WCHAR *driveletter; +}; + struct record_winsat { FLOAT cpuscore; @@ -4188,6 +4202,60 @@ static enum fill_status fill_videocontroller( struct table *table, const struct return status; } +static WCHAR *get_volume_driveletter( const WCHAR *volume ) +{ + DWORD len = 0; + WCHAR *ret; + + if (!GetVolumePathNamesForVolumeNameW( volume, NULL, 0, &len ) && GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + if (!GetVolumePathNamesForVolumeNameW( volume, ret, len, &len ) || !wcschr( ret, ':' )) + { + free( ret ); + return NULL; + } + wcschr( ret, ':' )[1] = 0; + return ret; +} + +static enum fill_status fill_volume( struct table *table, const struct expr *cond ) +{ + struct record_volume *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + UINT row = 0, offset = 0; + WCHAR path[MAX_PATH]; + HANDLE handle; + + if (!resize_table( table, 2, sizeof(*rec) )) return FILL_STATUS_FAILED; + + handle = FindFirstVolumeW( path, ARRAY_SIZE(path) ); + while (handle != INVALID_HANDLE_VALUE) + { + if (!resize_table( table, row + 1, sizeof(*rec) )) return FILL_STATUS_FAILED; + + rec = (struct record_volume *)(table->data + offset); + rec->deviceid = wcsdup( path ); + rec->driveletter = get_volume_driveletter( path ); + + if (!match_row( table, row, cond, &status )) free_row_values( table, row ); + else + { + offset += sizeof(*rec); + row++; + } + + if (!FindNextVolumeW( handle, path, ARRAY_SIZE(path) )) + { + FindVolumeClose( handle ); + handle = INVALID_HANDLE_VALUE; + } + } + + TRACE("created %u rows\n", row); + table->num_rows = row; + return status; +} + static WCHAR *get_sounddevice_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) { static const WCHAR fmtW[] = L"HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%04X\\0&DEADBEEF&0&DEAD"; @@ -4270,6 +4338,7 @@ static struct table cimv2_builtin_classes[] = { L"Win32_SoundDevice", C(col_sounddevice), 0, 0, NULL, fill_sounddevice }, { L"Win32_SystemEnclosure", C(col_systemenclosure), 0, 0, NULL, fill_systemenclosure }, { L"Win32_VideoController", C(col_videocontroller), 0, 0, NULL, fill_videocontroller }, + { L"Win32_Volume", C(col_volume), 0, 0, NULL, fill_volume }, { L"Win32_WinSAT", C(col_winsat), D(data_winsat) }, }; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 57721ed2c92..beceffe7e69 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1795,6 +1795,45 @@ static void test_Win32_VideoController( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_Volume( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Volume" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + VARIANT val; + CIMTYPE type; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_Volume not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"DeviceID", VT_BSTR, CIM_STRING ); + + type = 0xdeadbeef; + memset( &val, 0, sizeof(val) ); + hr = IWbemClassObject_Get( obj, L"DriveLetter", 0, &val, &type, NULL ); + ok( hr == S_OK, "got %#lx\n", hr ); + ok( V_VT( &val ) == VT_BSTR || V_VT( &val ) == VT_NULL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type %#lx\n", type ); + trace( "driveletter %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_Printer( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_Printer" ); @@ -2349,6 +2388,7 @@ START_TEST(query) test_Win32_SoundDevice( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); + test_Win32_Volume( services ); test_Win32_WinSAT( services ); test_SystemRestore( services ); test_empty_namespace( locator );

1 0

Zhiyi Zhang : comctl32/tests: Add WM_STYLECHANGED tests for changing listview view styles.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 789721f5e7a33659652f5f6b800915b4c7d5f182 URL: https://gitlab.winehq.org/wine/wine/-/commit/789721f5e7a33659652f5f6b800915… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Jan 21 15:39:17 2023 +0800 comctl32/tests: Add WM_STYLECHANGED tests for changing listview view styles. Changing view styles should repaint listviews according to the newly added tests. (cherry picked from commit cc84be8d897b88a767bb14341fdf6688df92742a) --- dlls/comctl32/tests/misc.c | 65 +++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5613fba15f5..d128c202c67 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -1021,6 +1021,15 @@ static const struct message wm_stylechanged_combox_seq[] = {0} }; +static const struct message wm_stylechanged_listview_report_seq[] = +{ + {WM_STYLECHANGED, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {WM_PAINT, sent}, + {WM_ERASEBKGND, sent | defwinproc}, + {0} +}; + static const struct message wm_stylechanged_pager_seq[] = { {WM_STYLECHANGED, sent}, @@ -1081,37 +1090,39 @@ static void test_WM_STYLECHANGED(void) static const struct test { const CHAR *class_name; + DWORD add_style; const struct message *seq; BOOL todo; } tests[] = { - {ANIMATE_CLASSA, wm_stylechanged_seq}, - {WC_BUTTONA, wm_stylechanged_seq}, - {WC_COMBOBOXA, wm_stylechanged_combox_seq, TRUE}, - {WC_COMBOBOXEXA, wm_stylechanged_seq}, - {DATETIMEPICK_CLASSA, wm_stylechanged_seq}, - {WC_EDITA, wm_stylechanged_seq}, - {WC_HEADERA, wm_stylechanged_repaint_seq, TRUE}, - {HOTKEY_CLASSA, wm_stylechanged_seq}, - {WC_IPADDRESSA, wm_stylechanged_seq}, - {WC_LISTBOXA, wm_stylechanged_repaint_seq, TRUE}, - {WC_LISTVIEWA, wm_stylechanged_seq}, - {MONTHCAL_CLASSA, wm_stylechanged_repaint_seq, TRUE}, - {WC_NATIVEFONTCTLA, wm_stylechanged_seq}, - {WC_PAGESCROLLERA, wm_stylechanged_pager_seq, TRUE}, - {PROGRESS_CLASSA, wm_stylechanged_progress_seq}, - {REBARCLASSNAMEA, wm_stylechanged_seq}, - {WC_STATICA, wm_stylechanged_seq}, - {STATUSCLASSNAMEA, wm_stylechanged_seq}, - {"SysLink", wm_stylechanged_seq}, - {WC_TABCONTROLA, wm_stylechanged_seq}, - {TOOLBARCLASSNAMEA, wm_stylechanged_seq}, - {TOOLTIPS_CLASSA, wm_stylechanged_seq}, - {TRACKBAR_CLASSA, wm_stylechanged_trackbar_seq, TRUE}, - {WC_TREEVIEWA, wm_stylechanged_seq}, - {UPDOWN_CLASSA, wm_stylechanged_seq}, - {WC_SCROLLBARA, wm_stylechanged_seq}, + {ANIMATE_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_BUTTONA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_COMBOBOXA, WS_TABSTOP, wm_stylechanged_combox_seq, TRUE}, + {WC_COMBOBOXEXA, WS_TABSTOP, wm_stylechanged_seq}, + {DATETIMEPICK_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_EDITA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_HEADERA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {HOTKEY_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_IPADDRESSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_LISTBOXA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {WC_LISTVIEWA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_LISTVIEWA, LVS_REPORT, wm_stylechanged_listview_report_seq, TRUE}, + {MONTHCAL_CLASSA, WS_TABSTOP, wm_stylechanged_repaint_seq, TRUE}, + {WC_NATIVEFONTCTLA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_PAGESCROLLERA, WS_TABSTOP, wm_stylechanged_pager_seq, TRUE}, + {PROGRESS_CLASSA, WS_TABSTOP, wm_stylechanged_progress_seq}, + {REBARCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_STATICA, WS_TABSTOP, wm_stylechanged_seq}, + {STATUSCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {"SysLink", WS_TABSTOP, wm_stylechanged_seq}, + {WC_TABCONTROLA, WS_TABSTOP, wm_stylechanged_seq}, + {TOOLBARCLASSNAMEA, WS_TABSTOP, wm_stylechanged_seq}, + {TOOLTIPS_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {TRACKBAR_CLASSA, WS_TABSTOP, wm_stylechanged_trackbar_seq, TRUE}, + {WC_TREEVIEWA, WS_TABSTOP, wm_stylechanged_seq}, + {UPDOWN_CLASSA, WS_TABSTOP, wm_stylechanged_seq}, + {WC_SCROLLBARA, WS_TABSTOP, wm_stylechanged_seq}, }; parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, @@ -1137,7 +1148,7 @@ static void test_WM_STYLECHANGED(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); style.styleOld = GetWindowLongA(hwnd, GWL_STYLE); - style.styleNew = style.styleOld | WS_TABSTOP; + style.styleNew = style.styleOld | tests[i].add_style; SendMessageA(hwnd, WM_STYLECHANGED, GWL_STYLE, (LPARAM)&style); flush_events(); ok_sequence(sequences, CHILD_SEQ_INDEX, tests[i].seq, "WM_STYLECHANGED", tests[i].todo);

1 0

Zhiyi Zhang : comctl32/listview: Repaint when changing view styles.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 3450a5ec4aed9bdba369b0485378132440c0baed URL: https://gitlab.winehq.org/wine/wine/-/commit/3450a5ec4aed9bdba369b048537813… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jan 22 12:39:53 2023 +0800 comctl32/listview: Repaint when changing view styles. Changing listview view styles should repaint according to the tests in test_WM_STYLECHANGED(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54215 (cherry picked from commit 1f1f99025d92e8e8b4428f3efc103ba7be9b63b8) --- dlls/comctl32/listview.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 07bea8574b6..fc22818c37b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -11212,6 +11212,7 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, const STYLESTRUCT *lpss) { UINT uNewView, uOldView; + BOOL repaint = FALSE; UINT style; TRACE("styletype %Ix, styleOld %#lx, styleNew %#lx\n", @@ -11236,6 +11237,8 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, { HIMAGELIST himl; + repaint = TRUE; + /* LVM_SETVIEW doesn't change window style bits within LVS_TYPEMASK, changing style updates current view only when view bits change. */ map_style_view(infoPtr); @@ -11297,6 +11300,9 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, /* add scrollbars if needed */ LISTVIEW_UpdateScroll(infoPtr); + if (repaint) + LISTVIEW_InvalidateList(infoPtr); + return 0; }

1 0

Paul Gofman : ntdll: Factor out context_copy_ranges() function.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 751d252924bcc14379e543dd0e0731127105afd8 URL: https://gitlab.winehq.org/wine/wine/-/commit/751d252924bcc14379e543dd0e0731… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 11 12:52:56 2023 -0600 ntdll: Factor out context_copy_ranges() function. (cherry picked from commit 4679b556a26da5a220b2cd8eb324f45d0c45c142) --- dlls/ntdll/exception.c | 51 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 22c9c829a4d..fa30118f142 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -961,6 +961,32 @@ ULONG64 WINAPI RtlGetExtendedFeaturesMask( CONTEXT_EX *context_ex ) } +static void context_copy_ranges( BYTE *d, DWORD context_flags, BYTE *s, const struct context_parameters *p ) +{ + const struct context_copy_range *range; + unsigned int start; + + *((ULONG *)(d + p->flags_offset)) |= context_flags; + + start = 0; + range = p->copy_ranges; + do + { + if (range->flag & context_flags) + { + if (!start) + start = range->start; + } + else if (start) + { + memcpy( d + start, s + start, range->start - start ); + start = 0; + } + } + while (range++->start != p->context_size); +} + + /*********************************************************************** * RtlCopyContext (NTDLL.@) */ @@ -1010,12 +1036,9 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src */ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CONTEXT_EX *src ) { - const struct context_copy_range *range; const struct context_parameters *p; XSTATE *dst_xs, *src_xs; ULONG64 feature_mask; - unsigned int start; - BYTE *d, *s; TRACE( "dst %p, context_flags %#lx, src %p.\n", dst, context_flags, src ); @@ -1025,27 +1048,7 @@ NTSTATUS WINAPI RtlCopyExtendedContext( CONTEXT_EX *dst, ULONG context_flags, CO if (!(feature_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0 )) && context_flags & 0x40) return STATUS_NOT_SUPPORTED; - d = RtlLocateLegacyContext( dst, NULL ); - s = RtlLocateLegacyContext( src, NULL ); - - *((ULONG *)(d + p->flags_offset)) |= context_flags; - - start = 0; - range = p->copy_ranges; - do - { - if (range->flag & context_flags) - { - if (!start) - start = range->start; - } - else if (start) - { - memcpy( d + start, s + start, range->start - start ); - start = 0; - } - } - while (range++->start != p->context_size); + context_copy_ranges( RtlLocateLegacyContext( dst, NULL ), context_flags, RtlLocateLegacyContext( src, NULL ), p ); if (!(context_flags & 0x40)) return STATUS_SUCCESS;

1 0

Paul Gofman : ntdll: Do not use extended context in RtlCopyContext() if extended state is not copied.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 349838884e6460a0a6d7d04e4a6e721bf0e9d409 URL: https://gitlab.winehq.org/wine/wine/-/commit/349838884e6460a0a6d7d04e4a6e72… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 11 12:32:58 2023 -0600 ntdll: Do not use extended context in RtlCopyContext() if extended state is not copied. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54289 (cherry picked from commit a98319d0c58cc448b14037cae32d042adfedd94d) --- dlls/ntdll/exception.c | 12 ++++++++++-- dlls/ntdll/tests/exception.c | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index fa30118f142..556b424ac6e 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -994,6 +994,7 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src { DWORD context_size, arch_flag, flags_offset, dst_flags, src_flags; static const DWORD arch_mask = CONTEXT_i386 | CONTEXT_AMD64; + const struct context_parameters *p; BYTE *d, *s; TRACE("dst %p, context_flags %#lx, src %p.\n", dst, context_flags, src); @@ -1026,8 +1027,15 @@ NTSTATUS WINAPI RtlCopyContext( CONTEXT *dst, DWORD context_flags, CONTEXT *src context_flags &= src_flags; if (context_flags & ~dst_flags & 0x40) return STATUS_BUFFER_OVERFLOW; - return RtlCopyExtendedContext( (CONTEXT_EX *)(d + context_size), context_flags, - (CONTEXT_EX *)(s + context_size) ); + if (context_flags & 0x40) + return RtlCopyExtendedContext( (CONTEXT_EX *)(d + context_size), context_flags, + (CONTEXT_EX *)(s + context_size) ); + + if (!(p = context_get_parameters( context_flags ))) + return STATUS_INVALID_PARAMETER; + + context_copy_ranges( d, context_flags, s, p ); + return STATUS_SUCCESS; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 4bf2e4ec78e..1f3b7359a13 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -10496,6 +10496,26 @@ static void test_copy_context(void) enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); + memset(dst_context_buffer, 0xdd, sizeof(dst_context_buffer)); + memset(src_context_buffer, 0xcc, sizeof(src_context_buffer)); + + status = pRtlInitializeExtendedContext(src_context_buffer, CONTEXT_ALL | CONTEXT_XSTATE, &src_ex); + if (!status) + { + src = pRtlLocateLegacyContext(src_ex, NULL); + dst = (CONTEXT *)dst_context_buffer; + dst->ContextFlags = CONTEXT_ALL; + status = pRtlCopyContext(dst, dst->ContextFlags, src); + ok(!status, "Got status %#lx.\n", status); + check_changes_in_range((BYTE *)dst, CONTEXT_ALL & CONTEXT_AMD64 ? &ranges_amd64[0] : &ranges_x86[0], + CONTEXT_ALL, sizeof(CONTEXT)); + } + else + { + ok(status == STATUS_NOT_SUPPORTED, "Got status %#lx.\n", status); + skip("Extended context is not supported.\n"); + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { flags = tests[i];

1 0

Akihiro Sagawa : user32/tests: Add DBCS WM_CHAR tests for edit control.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 6519feb40ac9b447ec61f8d7bda5890fd0199310 URL: https://gitlab.winehq.org/wine/wine/-/commit/6519feb40ac9b447ec61f8d7bda589… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 20 23:51:36 2023 +0900 user32/tests: Add DBCS WM_CHAR tests for edit control. (cherry picked from commit cbe3a39b647e029df16faf1dcce2958f1ee418d0) --- dlls/user32/tests/edit.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b70cf2d6e06..0409b3fde7c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -3366,6 +3366,58 @@ static void test_wordbreak_proc(void) DestroyWindow(hwnd); } +static void test_dbcs_WM_CHAR(void) +{ + WCHAR textW[] = { 0x4e00, 0x4e8c, 0x4e09, 0 }; /* one, two, three */ + unsigned char bytes[7]; + HWND hwnd[2]; + int i; + + WideCharToMultiByte(CP_ACP, 0, textW, -1, (char *)bytes, ARRAY_SIZE(bytes), NULL, NULL); + if (!IsDBCSLeadByte(bytes[0])) + { + skip("Skipping DBCS WM_CHAR test in this codepage\n"); + return; + } + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < ARRAY_SIZE(hwnd); i++) + { + const unsigned char* p; + WCHAR strW[4]; + char str[7]; + MSG msg; + BOOL r; + int n; + + winetest_push_context("%c", i ? 'W' : 'A'); + + r = SetWindowTextA(hwnd[i], ""); + ok(r, "SetWindowText failed\n"); + + for (p = bytes; *p; p++) + PostMessageA(hwnd[i], WM_CHAR, *p, 1); + + while (PeekMessageA(&msg, hwnd[i], 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + + n = GetWindowTextW(hwnd[i], strW, ARRAY_SIZE(strW)); + ok(n > 0, "GetWindowTextW failed\n"); + todo_wine ok(!wcscmp(strW, textW), "got %s, expected %s\n", + wine_dbgstr_w(strW), wine_dbgstr_w(textW)); + + n = GetWindowTextA(hwnd[i], str, ARRAY_SIZE(str)); + ok(n > 0, "GetWindowText failed\n"); + todo_wine ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n", + wine_dbgstr_a(str), wine_dbgstr_a((char *)bytes)); + + DestroyWindow(hwnd[i]); + + winetest_pop_context(); + } +} + START_TEST(edit) { BOOL b; @@ -3403,6 +3455,7 @@ START_TEST(edit) test_paste(); test_EM_GETLINE(); test_wordbreak_proc(); + test_dbcs_WM_CHAR(); UnregisterWindowClasses(); }

1 0

Akihiro Sagawa : user32/edit: Fix WM_CHAR handler for double-byte characters.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 091d600ef70ffe23031841471d0cb9b17f1d28ea URL: https://gitlab.winehq.org/wine/wine/-/commit/091d600ef70ffe23031841471d0cb9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jan 20 23:55:59 2023 +0900 user32/edit: Fix WM_CHAR handler for double-byte characters. After commit 2aa54a90bd24f6aa422a2eb832a54d9afe585259, a double-byte character is sent to the edit control by double WM_CHAR messages. However, its WM_CHAR handler (ANSI version) can't process a double- byte character properly because the handler converts WM_CHAR to WCHAR one by one. This fix queues the double-byte lead byte as it comes in and then uses it afterwards for the WCHAR conversion. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54337 (cherry picked from commit c385b6475e6ad07227a1ef29593170af1c3cbf99) --- dlls/user32/edit.c | 21 +++++++++++++++++++-- dlls/user32/tests/edit.c | 4 ++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 74411d385e2..47c61f59c24 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -113,6 +113,7 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ + BYTE lead_byte; /* DBCS lead byte store for WM_CHAR */ /* * only for multi line controls */ @@ -4975,8 +4976,24 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B charW = wParam; else { - CHAR charA = wParam; - MultiByteToWideChar(CP_ACP, 0, &charA, 1, &charW, 1); + BYTE low = wParam; + DWORD cp = get_input_codepage(); + if (es->lead_byte) + { + char ch[2]; + ch[0] = es->lead_byte; + ch[1] = low; + MultiByteToWideChar(cp, 0, ch, 2, &charW, 1); + } + else if (IsDBCSLeadByteEx(cp, low)) + { + es->lead_byte = low; + result = 1; + break; + } + else + MultiByteToWideChar(cp, 0, (char *)&low, 1, &charW, 1); + es->lead_byte = 0; } if (es->hwndListBox) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0409b3fde7c..78328ee1729 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -3404,12 +3404,12 @@ static void test_dbcs_WM_CHAR(void) n = GetWindowTextW(hwnd[i], strW, ARRAY_SIZE(strW)); ok(n > 0, "GetWindowTextW failed\n"); - todo_wine ok(!wcscmp(strW, textW), "got %s, expected %s\n", + ok(!wcscmp(strW, textW), "got %s, expected %s\n", wine_dbgstr_w(strW), wine_dbgstr_w(textW)); n = GetWindowTextA(hwnd[i], str, ARRAY_SIZE(str)); ok(n > 0, "GetWindowText failed\n"); - todo_wine ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n", + ok(!strcmp(str, (char*)bytes), "got %s, expected %s\n", wine_dbgstr_a(str), wine_dbgstr_a((char *)bytes)); DestroyWindow(hwnd[i]);

1 0

Paul Gofman : cryptnet: Cache revocation status in verify_cert_revocation().
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: 24c531f7bc04bde6cd646e884f3ef838ddf0594b URL: https://gitlab.winehq.org/wine/wine/-/commit/24c531f7bc04bde6cd646e884f3ef8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 24 11:51:08 2023 -0600 cryptnet: Cache revocation status in verify_cert_revocation(). (cherry picked from commit 6e782449ab72cc5d20877934c580a45e8df46a04) --- dlls/cryptnet/cryptnet_main.c | 56 ++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 516bbad9ca4..211b5c3cf8c 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1683,7 +1683,8 @@ static const CRL_CONTEXT *retrieve_crl_from_dist_points(const CRYPT_URL_ARRAY *a } static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, - FILETIME *time, DWORD flags, const CERT_REVOCATION_PARA *params, CERT_REVOCATION_STATUS *status) + FILETIME *time, DWORD flags, const CERT_REVOCATION_PARA *params, CERT_REVOCATION_STATUS *status, + FILETIME *next_update) { DWORD url_array_size, error; CRYPT_URL_ARRAY *url_array; @@ -1719,7 +1720,7 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * error = verify_cert_revocation_with_crl_online(cert, crl, time, status); - cache_revocation_status(&cert->pCertInfo->SerialNumber, &crl->pCrlInfo->NextUpdate, status); + *next_update = crl->pCrlInfo->NextUpdate; CertFreeCRLContext(crl); CryptMemFree(url_array); @@ -1920,12 +1921,11 @@ static DWORD check_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *is } static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_INFO *issuer, - const CRYPT_OBJID_BLOB *blob) + const CRYPT_OBJID_BLOB *blob, FILETIME *next_update) { OCSP_BASIC_SIGNED_RESPONSE_INFO *info; DWORD size, error, status = CRYPT_E_REVOCATION_OFFLINE; CRYPT_ALGORITHM_IDENTIFIER *alg; - FILETIME next_update; CRYPT_BIT_BLOB *sig; HCRYPTPROV prov = 0; HCRYPTHASH hash = 0; @@ -1935,7 +1935,7 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ if (!CryptDecodeObjectEx(X509_ASN_ENCODING, OCSP_BASIC_SIGNED_RESPONSE, blob->pbData, blob->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size)) return GetLastError(); - if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status, &next_update))) goto done; + if ((error = check_ocsp_response_info(cert, issuer, &info->ToBeSigned, &status, next_update))) goto done; alg = &info->SignatureInfo.SignatureAlgorithm; if (!alg->pszObjId || !(algid = CertOIDToAlgId(alg->pszObjId))) @@ -1964,16 +1964,6 @@ static DWORD verify_signed_ocsp_response_info(const CERT_INFO *cert, const CERT_ else error = ERROR_SUCCESS; done: - if (next_update.dwLowDateTime || next_update.dwHighDateTime) - { - CERT_REVOCATION_STATUS rev_status; - - memset(&rev_status, 0, sizeof(rev_status)); - rev_status.cbSize = sizeof(rev_status); - rev_status.dwError = status; - cache_revocation_status(&cert->SerialNumber, &next_update, &rev_status); - } - CryptDestroyKey(key); CryptDestroyHash(hash); CryptReleaseContext(prov, 0); @@ -1983,7 +1973,7 @@ done: } static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer, const BYTE *encoded, - DWORD encoded_size) + DWORD encoded_size, FILETIME *next_update) { OCSP_RESPONSE_INFO *info; DWORD size, error = CRYPT_E_NO_REVOCATION_CHECK; @@ -1999,7 +1989,7 @@ static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer FIXME("unhandled response type %s\n", debugstr_a(info->pszObjId)); break; } - error = verify_signed_ocsp_response_info(cert, issuer, &info->Value); + error = verify_signed_ocsp_response_info(cert, issuer, &info->Value, next_update); break; default: @@ -2012,7 +2002,7 @@ static DWORD handle_ocsp_response(const CERT_INFO *cert, const CERT_INFO *issuer } static DWORD verify_cert_revocation_with_ocsp(const CERT_CONTEXT *cert, const WCHAR *base_url, - const CERT_REVOCATION_PARA *revpara) + const CERT_REVOCATION_PARA *revpara, FILETIME *next_update) { HINTERNET ses, con, req = NULL; BYTE *request_data = NULL, *response_data = NULL; @@ -2081,7 +2071,8 @@ static DWORD verify_cert_revocation_with_ocsp(const CERT_CONTEXT *cert, const WC !response_len || !(response_data = malloc(response_len)) || !InternetReadFile(req, response_data, response_len, &count) || count != response_len) goto done; - ret = handle_ocsp_response(cert->pCertInfo, revpara->pIssuerCert->pCertInfo, response_data, response_len); + ret = handle_ocsp_response(cert->pCertInfo, revpara->pIssuerCert->pCertInfo, response_data, response_len, + next_update); done: free(url); @@ -2093,7 +2084,8 @@ done: } static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, const CERT_CONTEXT *cert, - FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) + FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus, + FILETIME *next_update) { BOOL ret; DWORD size, i, error = CRYPT_E_NO_REVOCATION_CHECK; @@ -2111,7 +2103,7 @@ static DWORD verify_cert_revocation_from_aia_ext(const CRYPT_DATA_BLOB *value, c { const WCHAR *url = aia->rgAccDescr[i].AccessLocation.u.pwszURL; TRACE("OCSP URL = %s\n", debugstr_w(url)); - error = verify_cert_revocation_with_ocsp(cert, url, pRevPara); + error = verify_cert_revocation_with_ocsp(cert, url, pRevPara, next_update); } else { @@ -2157,6 +2149,7 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, DWORD dwFlags, CERT_REVOCATION_PARA *pRevPara, CERT_REVOCATION_STATUS *pRevStatus) { DWORD error = ERROR_SUCCESS; + FILETIME next_update = {0}; PCERT_EXTENSION ext; if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) @@ -2167,15 +2160,17 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, if ((ext = CertFindExtension(szOID_AUTHORITY_INFO_ACCESS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { - error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus); + error = verify_cert_revocation_from_aia_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus, + &next_update); TRACE("verify_cert_revocation_from_aia_ext() returned %08lx\n", error); - if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) return error; + if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) goto done; } if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) { - error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus); + error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, pTime, dwFlags, pRevPara, pRevStatus, + &next_update); TRACE("verify_cert_revocation_from_dist_points_ext() returned %08lx\n", error); - if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) return error; + if (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED) goto done; } if (!ext) { @@ -2247,6 +2242,17 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, error = CRYPT_E_NO_REVOCATION_CHECK; } } +done: + if ((next_update.dwLowDateTime || next_update.dwHighDateTime) + && (error == ERROR_SUCCESS || error == CRYPT_E_REVOKED)) + { + CERT_REVOCATION_STATUS rev_status; + + memset(&rev_status, 0, sizeof(rev_status)); + rev_status.cbSize = sizeof(rev_status); + rev_status.dwError = error; + cache_revocation_status(&cert->pCertInfo->SerialNumber, &next_update, &rev_status); + } return error; }

1 0

Paul Gofman : cryptnet: Use cert data hash as cache id instead of serial number.
by Alexandre Julliard 20 Apr '23

20 Apr '23

Module: wine Branch: stable Commit: b5e7429548d561a6a48c14a4999775ff0c9f6120 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5e7429548d561a6a48c14a4999775… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jan 24 11:54:23 2023 -0600 cryptnet: Use cert data hash as cache id instead of serial number. (cherry picked from commit f114ab57d268bfc7803bbba82e9877cc6178fd0d) --- dlls/cryptnet/cryptnet_main.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 211b5c3cf8c..7d1c01363c0 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1537,11 +1537,16 @@ BOOL WINAPI CryptRetrieveObjectByUrlW(LPCWSTR pszURL, LPCSTR pszObjectOid, static const char revocation_cache_signature[] = "Wine cached revocation"; -static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const WCHAR *mode, int sharing) +#define CACHED_CERT_HASH_SIZE 20 + +static FILE *open_cached_revocation_file(const CERT_CONTEXT *cert, const WCHAR *mode, int sharing) { + BYTE hash_data[CACHED_CERT_HASH_SIZE]; WCHAR path[MAX_PATH]; WCHAR *appdata_path; - DWORD len, i; + DWORD len, i, size; + HCRYPTPROV prov; + HCRYPTHASH hash; HRESULT hr; if (FAILED(hr = SHGetKnownFolderPath(&FOLDERID_LocalAppDataLow, 0, NULL, &appdata_path))) @@ -1553,24 +1558,32 @@ static FILE *open_cached_revocation_file(const CRYPT_INTEGER_BLOB *serial, const len = swprintf(path, ARRAY_SIZE(path), L"%s\\Microsoft\\CryptnetUrlCache\\Content\\", appdata_path); CoTaskMemFree(appdata_path); - if (len + serial->cbData * 2 * sizeof(WCHAR) > ARRAY_SIZE(path) - 1) + if (len + CACHED_CERT_HASH_SIZE * 2 * sizeof(WCHAR) > ARRAY_SIZE(path) - 1) { - WARN("Serial length exceeds static buffer; not caching.\n"); + WARN("Hash length exceeds static buffer; not caching.\n"); return INVALID_HANDLE_VALUE; } + CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + CryptCreateHash(prov, CALG_SHA1, 0, 0, &hash); + CryptHashData(hash, cert->pbCertEncoded, cert->cbCertEncoded, 0); + size = sizeof(hash_data); + CryptGetHashParam(hash, HP_HASHVAL, hash_data, &size, 0); + CryptDestroyHash(hash); + CryptReleaseContext(prov, 0); + SHCreateDirectoryExW(NULL, path, NULL); - for (i = 0; i < serial->cbData; ++i) + for (i = 0; i < CACHED_CERT_HASH_SIZE; ++i) { - swprintf(path + len, 3, L"%02x", serial->pbData[i]); + swprintf(path + len, 3, L"%02x", hash_data[i]); len += 2; } return _wfsopen(path, mode, sharing); } -static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, +static BOOL find_cached_revocation_status(const CERT_CONTEXT *cert, const FILETIME *time, CERT_REVOCATION_STATUS *status) { char buffer[sizeof(revocation_cache_signature)]; @@ -1578,7 +1591,7 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, FILE *file; int len; - if (!(file = open_cached_revocation_file(serial, L"rb", _SH_DENYWR))) + if (!(file = open_cached_revocation_file(cert, L"rb", _SH_DENYWR))) return FALSE; if ((len = fread(buffer, 1, sizeof(buffer), file)) != sizeof(buffer) @@ -1621,12 +1634,12 @@ static BOOL find_cached_revocation_status(const CRYPT_INTEGER_BLOB *serial, return TRUE; } -static void cache_revocation_status(const CRYPT_INTEGER_BLOB *serial, +static void cache_revocation_status(const CERT_CONTEXT *cert, const FILETIME *time, const CERT_REVOCATION_STATUS *status) { FILE *file; - if (!(file = open_cached_revocation_file(serial, L"wb", _SH_DENYRW))) + if (!(file = open_cached_revocation_file(cert, L"wb", _SH_DENYRW))) return; fwrite(revocation_cache_signature, 1, sizeof(revocation_cache_signature), file); fwrite(time, sizeof(*time), 1, file); @@ -2152,7 +2165,7 @@ static DWORD verify_cert_revocation(const CERT_CONTEXT *cert, FILETIME *pTime, FILETIME next_update = {0}; PCERT_EXTENSION ext; - if (find_cached_revocation_status(&cert->pCertInfo->SerialNumber, pTime, pRevStatus)) + if (find_cached_revocation_status(cert, pTime, pRevStatus)) { if (pRevStatus->dwError == ERROR_SUCCESS || pRevStatus->dwError == CRYPT_E_REVOKED) return pRevStatus->dwError; @@ -2251,7 +2264,7 @@ done: memset(&rev_status, 0, sizeof(rev_status)); rev_status.cbSize = sizeof(rev_status); rev_status.dwError = error; - cache_revocation_status(&cert->pCertInfo->SerialNumber, &next_update, &rev_status); + cache_revocation_status(cert, &next_update, &rev_status); } return error; }

1 0