July 2024 - Wine-Commits - list.winehq.org

Rémi Bernon : win32u: Update the layered surface attributes in apply_window_pos.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 05d727a935b9009f188cc74ca77e14afc44aef30 URL: https://gitlab.winehq.org/wine/wine/-/commit/05d727a935b9009f188cc74ca77e14… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 15 21:09:37 2024 +0200 win32u: Update the layered surface attributes in apply_window_pos. And after layered window creation in NtUserUpdateLayeredWindow. --- dlls/win32u/dce.c | 2 -- dlls/win32u/window.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/dce.c b/dlls/win32u/dce.c index aa6836e3440..4a672d6c519 100644 --- a/dlls/win32u/dce.c +++ b/dlls/win32u/dce.c @@ -479,8 +479,6 @@ W32KAPI void window_surface_set_layered( struct window_surface *surface, COLORRE } } window_surface_unlock( surface ); - - window_surface_flush( surface ); } W32KAPI void window_surface_set_clip( struct window_surface *surface, HRGN clip_region ) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index c860be38c65..83fa6d6e67c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1873,6 +1873,18 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, create_offscreen_window_surface( hwnd, surface_rect, &new_surface ); } + if (new_surface && !is_layered) + { + DWORD lwa_flags = 0; + COLORREF key; + BYTE alpha; + + if (!NtUserGetLayeredWindowAttributes( hwnd, &key, &alpha, &lwa_flags )) lwa_flags = 0; + if (!(lwa_flags & LWA_ALPHA)) alpha = 255; + if (!(lwa_flags & LWA_COLORKEY)) key = CLR_INVALID; + window_surface_set_layered( new_surface, key, alpha << 24, 0 ); + } + return new_surface; } @@ -2248,6 +2260,8 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_ NtGdiDeleteObjectApp( hdc ); window_surface_unlock( surface ); + + window_surface_set_layered( surface, key, -1, 0xff000000 ); window_surface_flush( surface ); user_driver->pUpdateLayeredWindow( hwnd, &window_rect, key, alpha, flags );

1 0

Alexandre Julliard : wow64: Fix prototype for the NtTerminateThread CPU backend notification.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: d27237d204ff709d9be109bc9361777b748f054a URL: https://gitlab.winehq.org/wine/wine/-/commit/d27237d204ff709d9be109bc936177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 11 14:27:39 2024 +0200 wow64: Fix prototype for the NtTerminateThread CPU backend notification. --- dlls/ntdll/tests/wow64.c | 12 ++++++++++++ dlls/wow64/process.c | 2 +- dlls/wow64/syscall.c | 2 +- dlls/wow64/wow64_private.h | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 0ed151a3200..94420cdab4a 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1829,6 +1829,18 @@ static void test_notifications( HMODULE module, CROSS_PROCESS_WORK_LIST *list ) WriteProcessMemory( GetCurrentProcess(), ptr, old_code, sizeof(old_code), NULL ); } + if ((ptr = hook_notification_function( module, "BTCpuThreadTerm", "ThreadTerm" ))) + { + struct expected_notification expect = { 2, { 0xdead, 0xbeef } }; + + reset_results( results ); + status = NtTerminateThread( (HANDLE)0xdead, 0xbeef ); + ok( status == STATUS_INVALID_HANDLE, "NtTerminateThread failed %lx\n", status ); + expect_notifications( results, 1, &expect ); + + WriteProcessMemory( GetCurrentProcess(), ptr, old_code, sizeof(old_code), NULL ); + } + NtClose( mapping ); NtClose( file ); VirtualFree( code, 0, MEM_RELEASE ); diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 4a769c042c5..9b80d885b6a 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1073,7 +1073,7 @@ NTSTATUS WINAPI wow64_NtTerminateThread( UINT *args ) HANDLE handle = get_handle( &args ); LONG exit_code = get_ulong( &args ); - if (pBTCpuThreadTerm) pBTCpuThreadTerm( handle ); + if (pBTCpuThreadTerm) pBTCpuThreadTerm( handle, exit_code ); return NtTerminateThread( handle, exit_code ); } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index c436a2e1ea3..5ddd46ba7b9 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -115,7 +115,7 @@ void (WINAPI *pBTCpuNotifyReadFile)( HANDLE, void *, SIZE_T, BOOL, NTSTATUS void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void *, BOOL, NTSTATUS ) = NULL; NTSTATUS (WINAPI *pBTCpuResetToConsistentState)( EXCEPTION_POINTERS * ) = NULL; void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ) = NULL; -void (WINAPI *pBTCpuThreadTerm)( HANDLE ) = NULL; +void (WINAPI *pBTCpuThreadTerm)( HANDLE, LONG ) = NULL; BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index d6a8c740ba4..d5278443d5d 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -49,7 +49,7 @@ extern void (WINAPI *pBTCpuNotifyMemoryProtect)( void *, SIZE_T, ULONG, BOOL extern void (WINAPI *pBTCpuNotifyReadFile)( HANDLE, void *, SIZE_T, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuNotifyUnmapViewOfSection)( void *, BOOL, NTSTATUS ); extern void (WINAPI *pBTCpuUpdateProcessorInformation)( SYSTEM_CPU_INFORMATION * ); -extern void (WINAPI *pBTCpuThreadTerm)( HANDLE ); +extern void (WINAPI *pBTCpuThreadTerm)( HANDLE, LONG ); struct object_attr64 {

1 0

Rémi Bernon : wineandroid: Rely on win32u layered window surface attribute updates.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 4b7e860e9f2ab99118f9b39855c5b6be8b386783 URL: https://gitlab.winehq.org/wine/wine/-/commit/4b7e860e9f2ab99118f9b39855c5b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 27 17:06:01 2024 +0200 wineandroid: Rely on win32u layered window surface attribute updates. --- dlls/wineandroid.drv/android.h | 2 -- dlls/wineandroid.drv/init.c | 1 - dlls/wineandroid.drv/window.c | 69 ++++++------------------------------------ 3 files changed, 10 insertions(+), 62 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 54062b04db0..9f6bb2b999c 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -92,8 +92,6 @@ extern BOOL ANDROID_CreateWindow( HWND hwnd ); extern void ANDROID_DestroyWindow( HWND hwnd ); extern BOOL ANDROID_ProcessEvents( DWORD mask ); extern LRESULT ANDROID_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ); -extern void ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, - DWORD flags ); extern void ANDROID_SetParent( HWND hwnd, HWND parent, HWND old_parent ); extern void ANDROID_SetCapture( HWND hwnd, UINT flags ); extern void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 73fd28c7c69..25055ece395 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -344,7 +344,6 @@ static const struct user_driver_funcs android_drv_funcs = .pDestroyWindow = ANDROID_DestroyWindow, .pProcessEvents = ANDROID_ProcessEvents, .pSetCapture = ANDROID_SetCapture, - .pSetLayeredWindowAttributes = ANDROID_SetLayeredWindowAttributes, .pSetParent = ANDROID_SetParent, .pSetWindowStyle = ANDROID_SetWindowStyle, .pShowWindow = ANDROID_ShowWindow, diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 0f8cedfbd0b..553ed985fae 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -561,25 +561,6 @@ static struct android_window_surface *get_android_surface( struct window_surface return (struct android_window_surface *)surface; } -/* store the palette or color mask data in the bitmap info structure */ -static void set_color_info( BITMAPINFO *info, BOOL has_alpha ) -{ - DWORD *colors = (DWORD *)info->bmiColors; - - info->bmiHeader.biSize = sizeof(info->bmiHeader); - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biBitCount = 32; - if (has_alpha) - { - info->bmiHeader.biCompression = BI_RGB; - return; - } - info->bmiHeader.biCompression = BI_BITFIELDS; - colors[0] = 0xff0000; - colors[1] = 0x00ff00; - colors[2] = 0x0000ff; -} - /* apply the window region to a single line of the destination image. */ static void apply_line_region( DWORD *dst, int width, int x, int y, const RECT *rect, const RECT *end ) { @@ -717,8 +698,7 @@ static BOOL is_argb_surface( struct window_surface *surface ) /*********************************************************************** * create_surface */ -static struct window_surface *create_surface( HWND hwnd, const RECT *rect, - BYTE alpha, COLORREF color_key, BOOL src_alpha ) +static struct window_surface *create_surface( HWND hwnd, const RECT *rect ) { struct android_window_surface *surface; int width = rect->right - rect->left, height = rect->bottom - rect->top; @@ -726,11 +706,13 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, BITMAPINFO *info = (BITMAPINFO *)buffer; memset( info, 0, sizeof(*info) ); - set_color_info( info, src_alpha ); - info->bmiHeader.biWidth = width; - info->bmiHeader.biHeight = -height; /* top-down */ - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biSizeImage = get_dib_image_size( info ); + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = width; + info->bmiHeader.biHeight = -height; /* top-down */ + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biSizeImage = get_dib_image_size(info); + info->bmiHeader.biCompression = BI_RGB; if (!(surface = calloc( 1, sizeof(*surface) ))) return NULL; if (!window_surface_init( &surface->header, &android_surface_funcs, hwnd, rect, info, 0 )) goto failed; @@ -739,9 +721,6 @@ static struct window_surface *create_surface( HWND hwnd, const RECT *rect, TRACE( "created %p hwnd %p %s\n", surface, hwnd, wine_dbgstr_rect(rect) ); - if (src_alpha) window_surface_set_layered( &surface->header, color_key, -1, 0xff000000 ); - else window_surface_set_layered( &surface->header, color_key, alpha << 24, 0 ); - return &surface->header; failed: @@ -1089,10 +1068,6 @@ done: BOOL ANDROID_CreateWindowSurface( HWND hwnd, const RECT *surface_rect, struct window_surface **surface ) { struct android_win_data *data; - DWORD flags; - COLORREF key; - BYTE alpha; - BOOL layered = NtUserGetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED; TRACE( "hwnd %p, surface_rect %s, surface %p\n", hwnd, wine_dbgstr_rect( surface_rect ), surface ); @@ -1110,12 +1085,8 @@ BOOL ANDROID_CreateWindowSurface( HWND hwnd, const RECT *surface_rect, struct wi } } - if (!layered || !NtUserGetLayeredWindowAttributes( hwnd, &key, &alpha, &flags )) flags = 0; - if (!(flags & LWA_ALPHA)) alpha = 255; - if (!(flags & LWA_COLORKEY)) key = CLR_INVALID; - if (*surface) window_surface_release( *surface ); - *surface = create_surface( data->hwnd, surface_rect, alpha, key, FALSE ); + *surface = create_surface( data->hwnd, surface_rect ); done: release_win_data( data ); @@ -1280,30 +1251,11 @@ void ANDROID_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (data->surface) window_surface_release( data->surface ); data->surface = NULL; } - else if (data->surface) window_surface_set_layered( data->surface, CLR_INVALID, -1, 0 ); } release_win_data( data ); } -/*********************************************************************** - * ANDROID_SetLayeredWindowAttributes - */ -void ANDROID_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) -{ - struct android_win_data *data; - - if (!(flags & LWA_ALPHA)) alpha = 255; - if (!(flags & LWA_COLORKEY)) key = CLR_INVALID; - - if ((data = get_win_data( hwnd ))) - { - if (data->surface) window_surface_set_layered( data->surface, key, alpha << 24, 0 ); - release_win_data( data ); - } -} - - /***************************************************************************** * ANDROID_CreateLayeredWindow */ @@ -1324,11 +1276,10 @@ BOOL ANDROID_CreateLayeredWindow( HWND hwnd, const RECT *surface_rect, COLORREF if (!surface || !EqualRect( &surface->rect, surface_rect )) { - data->surface = create_surface( data->hwnd, surface_rect, 255, color_key, TRUE ); + data->surface = create_surface( data->hwnd, surface_rect ); if (surface) window_surface_release( surface ); surface = data->surface; } - else window_surface_set_layered( surface, color_key, -1, 0xff000000 ); if ((*window_surface = surface)) window_surface_add_ref( surface ); release_win_data( data );

1 0

Rémi Bernon : win32u: Update the window state when WS_EX_LAYERED window style changes.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 12010b7006b913f698d463f53607e3a3226e22d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/12010b7006b913f698d463f53607e3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 15 21:09:37 2024 +0200 win32u: Update the window state when WS_EX_LAYERED window style changes. In order for apply_window_pos to be called and surface to be updated. --- dlls/win32u/window.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 7edbbba29bb..c860be38c65 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1202,7 +1202,7 @@ static HWND set_window_owner( HWND hwnd, HWND owner ) /* Helper function for SetWindowLong(). */ LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOOL ansi ) { - BOOL ok, made_visible = FALSE; + BOOL ok, made_visible = FALSE, layered = TRUE; LONG_PTR retval = 0; STYLESTRUCT style; WND *win; @@ -1389,8 +1389,8 @@ LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOO } SERVER_END_REQ; - if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || - (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED))) + if (offset == GWL_EXSTYLE && ((style.styleOld ^ style.styleNew) & WS_EX_LAYERED)) layered = TRUE; + if ((offset == GWL_STYLE && ((style.styleOld ^ style.styleNew) & WS_VISIBLE)) || layered) { made_visible = (win->dwStyle & WS_VISIBLE) != 0; invalidate_dce( win, NULL ); @@ -1404,7 +1404,7 @@ LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval, BOO style.styleOld = retval; style.styleNew = newval; user_driver->pSetWindowStyle( hwnd, offset, &style ); - if (made_visible) update_window_state( hwnd ); + if (made_visible || layered) update_window_state( hwnd ); send_message( hwnd, WM_STYLECHANGED, offset, (LPARAM)&style ); }

1 0

Rémi Bernon : win32u: Check the surface layered nature when reusing window surface.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 800bb91323af078a44e75c5ac341f63df7fbf812 URL: https://gitlab.winehq.org/wine/wine/-/commit/800bb91323af078a44e75c5ac341f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jun 15 21:09:37 2024 +0200 win32u: Check the surface layered nature when reusing window surface. --- dlls/win32u/window.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index ad4d49ca034..7edbbba29bb 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1832,10 +1832,11 @@ static BOOL get_default_window_surface( HWND hwnd, const RECT *surface_rect, str return TRUE; } -static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, +static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, BOOL create_layered, + const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, RECT *surface_rect ) { - BOOL shaped, needs_surface, layered, ulw_layered = FALSE; + BOOL shaped, needs_surface, create_opaque, is_layered; struct window_surface *new_surface; RECT dummy; HRGN shape; @@ -1852,14 +1853,21 @@ static struct window_surface *create_window_surface( HWND hwnd, UINT swp_flags, if (!get_surface_rect( visible_rect, surface_rect )) needs_surface = FALSE; if (!get_default_window_surface( hwnd, surface_rect, &new_surface )) return NULL; + is_layered = new_surface && new_surface->alpha_mask; + create_opaque = !(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED); + + if ((create_opaque && is_layered) || (create_layered && !is_layered)) + { + window_surface_release( new_surface ); + new_surface = &dummy_surface; + window_surface_add_ref( new_surface ); + } + if (!needs_surface || IsRectEmpty( visible_rect )) needs_surface = FALSE; /* use default surface */ else needs_surface = !user_driver->pCreateWindowSurface( hwnd, surface_rect, &new_surface ); - if ((layered = !!(get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYERED))) - ulw_layered = !NtUserGetLayeredWindowAttributes( hwnd, NULL, NULL, NULL ); - /* create or update window surface for top-level windows if the driver doesn't implement CreateWindowSurface */ - if (needs_surface && new_surface == &dummy_surface && (!layered || !ulw_layered)) + if (needs_surface && new_surface == &dummy_surface && (create_opaque && !create_layered)) { window_surface_release( new_surface ); create_offscreen_window_surface( hwnd, surface_rect, &new_surface ); @@ -2203,7 +2211,7 @@ BOOL WINAPI NtUserUpdateLayeredWindow( HWND hwnd, HDC hdc_dst, const POINT *pts_ TRACE( "window %p win %s client %s\n", hwnd, wine_dbgstr_rect(&window_rect), wine_dbgstr_rect(&client_rect) ); - surface = create_window_surface( hwnd, swp_flags, &window_rect, &client_rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, swp_flags, TRUE, &window_rect, &client_rect, &visible_rect, &surface_rect ); apply_window_pos( hwnd, 0, swp_flags, surface, &window_rect, &client_rect, &visible_rect, NULL ); if (surface) window_surface_release( surface ); @@ -3521,7 +3529,7 @@ BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y ) calc_ncsize( winpos, &old_window_rect, &old_client_rect, &new_window_rect, &new_client_rect, valid_rects, parent_x, parent_y ); - surface = create_window_surface( winpos->hwnd, winpos->flags, &new_window_rect, &new_client_rect, + surface = create_window_surface( winpos->hwnd, winpos->flags, FALSE, &new_window_rect, &new_client_rect, &visible_rect, &surface_rect ); if (!apply_window_pos( winpos->hwnd, winpos->hwndInsertAfter, winpos->flags, surface, &new_window_rect, &new_client_rect, &visible_rect, valid_rects )) @@ -4320,7 +4328,7 @@ void update_window_state( HWND hwnd ) get_window_rects( hwnd, COORDS_PARENT, &window_rect, &client_rect, get_thread_dpi() ); valid_rects[0] = valid_rects[1] = client_rect; - surface = create_window_surface( hwnd, swp_flags, &window_rect, &client_rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, swp_flags, FALSE, &window_rect, &client_rect, &visible_rect, &surface_rect ); apply_window_pos( hwnd, 0, swp_flags, surface, &window_rect, &client_rect, &visible_rect, valid_rects ); if (surface) window_surface_release( surface ); @@ -5364,7 +5372,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, if (cs.x > 0x7fffffff - cx) rect.right = 0x7fffffff; if (cs.y > 0x7fffffff - cy) rect.bottom = 0x7fffffff; - surface = create_window_surface( hwnd, SWP_NOZORDER | SWP_NOACTIVATE, &rect, &rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, SWP_NOZORDER | SWP_NOACTIVATE, FALSE, &rect, &rect, &visible_rect, &surface_rect ); if (!apply_window_pos( hwnd, 0, SWP_NOZORDER | SWP_NOACTIVATE, surface, &rect, &rect, &visible_rect, NULL )) { if (surface) window_surface_release( surface ); @@ -5403,7 +5411,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, send_message( hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&client_rect ); map_window_points( 0, parent, (POINT *)&client_rect, 2, win_dpi ); - surface = create_window_surface( hwnd, SWP_NOACTIVATE, &rect, &client_rect, &visible_rect, &surface_rect ); + surface = create_window_surface( hwnd, SWP_NOACTIVATE, FALSE, &rect, &client_rect, &visible_rect, &surface_rect ); apply_window_pos( hwnd, insert_after, SWP_NOACTIVATE, surface, &rect, &client_rect, &visible_rect, NULL ); if (surface) window_surface_release( surface ); }

1 0

Dmitry Timoshkov : crypt32: Make CertFindCertificateInStore(CERT_FIND_ISSUER_NAME) work.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 23a042dd0611fd0cb8c2887f4b4b0d9a836a9237 URL: https://gitlab.winehq.org/wine/wine/-/commit/23a042dd0611fd0cb8c2887f4b4b0d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 18 14:21:39 2023 +0300 crypt32: Make CertFindCertificateInStore(CERT_FIND_ISSUER_NAME) work. 1. dwType (CERT_INFO_xxxx_FLAG) is not a mask. CERT_INFO_xxxx_FLAGs have values from 0 to 11, so for instance CERT_INFO_SUBJECT_FLAG is equal to 7 and CERT_INFO_ISSUER_FLAG is equal to 4. 2. CERT_COMPARE_xxxx have values from 0 to 10, so CERT_COMPARE_NAME is equal to 2 and CERT_COMPARE_SUBJECT_CERT is equal to 11, therefore combining CERT_COMPARE_NAME | CERT_COMPARE_SUBJECT_CERT doesn't make sense. 3. Because of 1 and 2 CertFindCertificateInStore(CERT_FIND_ISSUER_NAME) currently looks up a certificate by Subject instead of Issuer. Fixing just one of the problems above leads to test failures. Existing tests work because they use a self-signed certificate where Issuer and Subject are the same. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 373805e858f..7b1edaa2236 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1482,10 +1482,15 @@ static BOOL compare_cert_by_name(PCCERT_CONTEXT pCertContext, DWORD dwType, CERT_NAME_BLOB *blob = (CERT_NAME_BLOB *)pvPara, *toCompare; BOOL ret; - if (dwType & CERT_INFO_SUBJECT_FLAG) + if ((dwType & CERT_COMPARE_MASK) == CERT_INFO_SUBJECT_FLAG) toCompare = &pCertContext->pCertInfo->Subject; - else + else if ((dwType & CERT_COMPARE_MASK) == CERT_INFO_ISSUER_FLAG) toCompare = &pCertContext->pCertInfo->Issuer; + else + { + ERR("dwType %08lx doesn't specify SUBJECT or ISSUER\n", dwType); + return FALSE; + } ret = CertCompareCertificateName(pCertContext->dwCertEncodingType, toCompare, blob); return ret; @@ -1735,7 +1740,7 @@ static PCCERT_CONTEXT find_cert_by_issuer(HCERTSTORE store, DWORD dwType, } else found = cert_compare_certs_in_store(store, prev, - compare_cert_by_name, CERT_COMPARE_NAME | CERT_COMPARE_SUBJECT_CERT, + compare_cert_by_name, CERT_FIND_SUBJECT_NAME, dwFlags, &subject->pCertInfo->Issuer); return found; } @@ -1747,7 +1752,7 @@ static BOOL compare_cert_by_name_str(PCCERT_CONTEXT pCertContext, DWORD len; BOOL ret = FALSE; - if (dwType & CERT_INFO_SUBJECT_FLAG) + if ((dwType & CERT_COMPARE_MASK) == CERT_INFO_SUBJECT_FLAG) name = &pCertContext->pCertInfo->Subject; else name = &pCertContext->pCertInfo->Issuer;

1 0

Alex Henrie : ntdll/tests: Remove unused WINE_TODO_DATA flag.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 3b8774b016962a24806f9915f7d9fa57b0744fd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b8774b016962a24806f9915f7d9fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 10 22:37:21 2024 -0600 ntdll/tests: Remove unused WINE_TODO_DATA flag. --- dlls/ntdll/tests/reg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 3f41856e4d1..f264f42e98d 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2547,7 +2547,6 @@ struct query_reg_values_test WINE_TODO_NAME = 0x40, WINE_TODO_TYPE = 0x80, WINE_TODO_SIZE = 0x100, - WINE_TODO_DATA = 0x200, } flags; ULONG expected_type; @@ -2611,7 +2610,6 @@ static NTSTATUS WINAPI query_routine(const WCHAR *value_name, ULONG value_type, todo_wine_if(test->flags & WINE_TODO_SIZE) ok(value_data_size == expected_size, "Expected size %lu, got %lu\n", expected_size, value_data_size); - todo_wine_if(test->flags & WINE_TODO_DATA && !(test->flags & SPLIT_MULTI && query_routine_calls == 0)) if (expected_data == query->DefaultData || expected_data == NULL) ok(value_data == expected_data, "Expected data %p, got %p\n", expected_data, value_data); else @@ -3024,7 +3022,6 @@ static void test_RtlQueryRegistryValues(void) if (expected_data) { - todo_wine_if(test->flags & WINE_TODO_DATA) ok(!memcmp(query_reg_values_direct_str.Buffer, expected_data, expected_size), "Expected data %s, got %s\n", debugstr_w(expected_data), debugstr_w(query_reg_values_direct_str.Buffer));

1 0

Alex Henrie : ntdll: Double-null-terminate registry multi-strings in RtlQueryRegistryValues.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: 8285539b40a225919af16a8cc66f96fbf8787fb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8285539b40a225919af16a8cc66f96… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 10 22:37:21 2024 -0600 ntdll: Double-null-terminate registry multi-strings in RtlQueryRegistryValues. This reverts most of commit 2821a850d401dfabc5d76a4f40b0d6a42045fc5e which was a partial and ultimately improper solution. --- dlls/ntdll/reg.c | 32 ++++++++++++++++++++++---------- dlls/ntdll/tests/reg.c | 18 ++++++++++++++---- 2 files changed, 36 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 934124a0360..fb16f6d2dc6 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -254,6 +254,16 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, type = pInfo->Type; data = (WCHAR*)((char*)pInfo + pInfo->DataOffset); len = pInfo->DataLength; + + /* Ensure that multi-strings from the registry are double-null-terminated */ + if (type == REG_MULTI_SZ) + { + while (len < 2 * sizeof(WCHAR) || data[len / sizeof(WCHAR) - 2] || data[len / sizeof(WCHAR) - 1]) + { + data[len / sizeof(WCHAR)] = 0; + len += sizeof(WCHAR); + } + } } else { @@ -275,10 +285,13 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, break; case REG_MULTI_SZ: - for (wstr = data; *wstr; wstr += count) + wstr = data; + for (;;) { count = wcslen(wstr) + 1; len += count * sizeof(WCHAR); + if (!*wstr) break; + wstr += count; } break; } @@ -322,7 +335,6 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (!(pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) return STATUS_INVALID_PARAMETER; - len += sizeof(WCHAR); if (str->Buffer == NULL) { str->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, len); @@ -330,10 +342,8 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, } else if (str->MaximumLength < len) return STATUS_BUFFER_TOO_SMALL; - len -= sizeof(WCHAR); memcpy(str->Buffer, data, len); - str->Buffer[len / sizeof(WCHAR)] = 0; - str->Length = len; + str->Length = (len >= sizeof(WCHAR) ? len - sizeof(WCHAR) : len); break; default: @@ -379,7 +389,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, } else /* REG_MULTI_SZ */ { - for (offset = 0; offset < len; offset += count) + for (offset = 0; offset + 2 * sizeof(WCHAR) < len; offset += count) { wstr = (WCHAR*)((char*)data + offset); count = (wcslen(wstr) + 1) * sizeof(WCHAR); @@ -544,9 +554,10 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, if (status == STATUS_NO_MORE_ENTRIES) break; if (status == STATUS_BUFFER_OVERFLOW || - status == STATUS_BUFFER_TOO_SMALL) + status == STATUS_BUFFER_TOO_SMALL || + (status == STATUS_SUCCESS && pInfo->Type == REG_MULTI_SZ && buflen < len + 2 * sizeof(L'\0'))) { - buflen = len; + buflen = len + 2 * sizeof(L'\0'); RtlFreeHeap(GetProcessHeap(), 0, pInfo); pInfo = RtlAllocateHeap(GetProcessHeap(), 0, buflen); NtEnumerateValueKey(handle, i, KeyValueFullInformation, @@ -578,9 +589,10 @@ NTSTATUS WINAPI RtlQueryRegistryValues(IN ULONG RelativeTo, IN PCWSTR Path, status = NtQueryValueKey(handle, &Value, KeyValueFullInformation, pInfo, buflen, &len); if (status == STATUS_BUFFER_OVERFLOW || - status == STATUS_BUFFER_TOO_SMALL) + status == STATUS_BUFFER_TOO_SMALL || + (status == STATUS_SUCCESS && pInfo->Type == REG_MULTI_SZ && buflen < len + 2 * sizeof(L'\0'))) { - buflen = len; + buflen = len + 2 * sizeof(L'\0'); RtlFreeHeap(GetProcessHeap(), 0, pInfo); pInfo = RtlAllocateHeap(GetProcessHeap(), 0, buflen); status = NtQueryValueKey(handle, &Value, diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b9047c41972..3f41856e4d1 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2770,7 +2770,7 @@ static struct query_reg_values_test query_reg_values_tests[] = }, { {{ query_routine, RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope" }}, - STATUS_SUCCESS, 1, WINE_TODO_SIZE, REG_MULTI_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") + STATUS_SUCCESS, 1, 0, REG_MULTI_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0") }, /* The default value is used if the registry value does not exist */ { @@ -2789,6 +2789,16 @@ static struct query_reg_values_test query_reg_values_tests[] = {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0%PATH%\0" }}, STATUS_SUCCESS, 3, EXPECT_DEFAULT_DATA | SPLIT_MULTI }, + { + {{ query_routine, 0, (WCHAR*)L"I don't exist", + NULL, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C", sizeof(L"A\0B\0C") }}, + STATUS_SUCCESS, 2, EXPECT_DEFAULT_DATA | SPLIT_MULTI + }, + { + {{ query_routine, 0, (WCHAR*)L"I don't exist", + NULL, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C", sizeof(L"A\0B\0C") - sizeof(L'\0') }}, + STATUS_SUCCESS, 2, EXPECT_DEFAULT_DATA | SPLIT_MULTI + }, { {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_DWORD, (WCHAR*)0xdeadbeef }}, STATUS_SUCCESS, 1, EXPECT_DEFAULT_DATA @@ -2866,8 +2876,8 @@ static struct query_reg_values_test query_reg_values_tests[] = }, */ { {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"I don't exist", - &query_reg_values_direct_str, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C\0", sizeof(L"A\0B\0C\0") }}, - STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA | WINE_TODO_SIZE + &query_reg_values_direct_str, REG_MULTI_SZ, (WCHAR*)L"A\0B\0C", sizeof(L"A\0B\0C") - sizeof(L'\0') }}, + STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA }, /* The default value is not used if it is not valid */ { @@ -2920,7 +2930,7 @@ static void test_RtlQueryRegistryValues(void) ok(status == ERROR_SUCCESS, "Failed to create registry value WindowsDrive: %lu\n", status); status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest", L"CapitalsOfEurope", REG_MULTI_SZ, - L"Brussels\0Paris\0%PATH%", sizeof(L"Brussels\0Paris\0%PATH%")); + L"Brussels\0Paris\0%PATH%", sizeof(L"Brussels\0Paris\0%PATH%") - sizeof(L'\0')); ok(status == ERROR_SUCCESS, "Failed to create registry value CapitalsOfEurope: %lu\n", status); status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest", L"MeaningOfLife32", REG_DWORD,

1 0

Jacek Caban : mshtml: Use host object script bindings for Console class.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: a1d2c5d304cf55ba9f319f785b3c99776e818ff8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a1d2c5d304cf55ba9f319f785b3c99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 23:41:44 2024 +0200 mshtml: Use host object script bindings for Console class. --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 4 ++-- dlls/mshtml/tests/documentmode.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 40f738df8b3..88c9879ac69 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3181,7 +3181,7 @@ static HRESULT WINAPI window_private_get_console(IWineHTMLWindowPrivate *iface, TRACE("iface %p, console %p.\n", iface, console); if (!window->console) - create_console(dispex_compat_mode(&window->event_target.dispex), &window->console); + create_console(window, &window->console); *console = (IDispatch *)window->console; if (window->console) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d944c3b93fc..e41b4fd592c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1552,7 +1552,7 @@ void set_statustext(HTMLDocumentObj*,INT,LPCWSTR); IInternetSecurityManager *get_security_manager(void); extern HINSTANCE hInst; -void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret); +void create_console(HTMLInnerWindow *window, IWineMSHTMLConsole **ret); HRESULT create_media_query_list(HTMLInnerWindow *window, BSTR media_query, IDispatch **ret); HRESULT create_mutation_observer_ctor(compat_mode_t compat_mode, IDispatch **ret); diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 4eac4ffd7f8..6284858b763 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2122,7 +2122,7 @@ static dispex_static_data_t console_dispex = { console_iface_tids }; -void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret) +void create_console(HTMLInnerWindow *window, IWineMSHTMLConsole **ret) { struct console *obj; @@ -2134,7 +2134,7 @@ void create_console(compat_mode_t compat_mode, IWineMSHTMLConsole **ret) } obj->IWineMSHTMLConsole_iface.lpVtbl = &WineMSHTMLConsoleVtbl; - init_dispatch(&obj->dispex, &console_dispex, NULL, compat_mode); + init_dispatch(&obj->dispex, &console_dispex, window, dispex_compat_mode(&window->event_target.dispex)); *ret = &obj->IWineMSHTMLConsole_iface; } diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 7ee5a94b785..3d592e9c47d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -340,7 +340,7 @@ sync_test("builtin_toString", function() { } if(v >= 10) { test("classList", e.classList, "DOMTokenList", "testclass another ", true); - test("console", window.console, "Console", null, true); + test("console", window.console, "Console"); test("mediaQueryList", window.matchMedia("(hover:hover)"), "MediaQueryList"); } if(v >= 11) {

1 0

Jacek Caban : mshtml: Use host object script bindings for Selection class.
by Alexandre Julliard July 11, 2024

July 11, 2024

Module: wine Branch: master Commit: d1ca5f0d19bd6e54e61016e8cf8d862ffd6c8ec9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1ca5f0d19bd6e54e61016e8cf8d86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 10 23:18:50 2024 +0200 mshtml: Use host object script bindings for Selection class. --- dlls/mshtml/selection.c | 2 +- dlls/mshtml/tests/documentmode.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 8c457f1813f..c20c24dad5f 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -253,7 +253,7 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect if(!selection) return E_OUTOFMEMORY; - init_dispatch(&selection->dispex, &HTMLSelectionObject_dispex, NULL, + init_dispatch(&selection->dispex, &HTMLSelectionObject_dispex, doc->script_global, dispex_compat_mode(&doc->node.event_target.dispex)); selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 83559c07171..94b00a07e82 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -326,7 +326,7 @@ sync_test("builtin_toString", function() { } if(v < 11) { test("eventObject", document.createEventObject(), "MSEventObj", null, true); - test("selection", document.selection, "MSSelection", null, true); + test("selection", document.selection, "MSSelection"); } if(v >= 9) { test("computedStyle", window.getComputedStyle(e), "CSSStyleDeclaration", null, true);

1 0