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

Rémi Bernon : winex11: Force thread DPI awareness when calling NtUserSetWindowPos.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: a30efd5f0e420820466550506f51804002de9fda URL: https://gitlab.winehq.org/wine/wine/-/commit/a30efd5f0e420820466550506f5180… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 10:30:29 2024 +0200 winex11: Force thread DPI awareness when calling NtUserSetWindowPos. --- dlls/winex11.drv/event.c | 12 ++++++------ dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/x11drv.h | 9 +++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 3c4a5254b33..7adb083134c 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -974,7 +974,7 @@ static BOOL X11DRV_UnmapNotify( HWND hwnd, XEvent *event ) static void reparent_notify( Display *display, HWND hwnd, Window xparent, int x, int y ) { HWND parent, old_parent; - DWORD style; + DWORD style, flags = 0; style = NtUserGetWindowLongW( hwnd, GWL_STYLE ); if (xparent == root_window) @@ -991,9 +991,9 @@ static void reparent_notify( Display *display, HWND hwnd, Window xparent, int x, NtUserShowWindow( hwnd, SW_HIDE ); old_parent = NtUserSetParent( hwnd, parent ); NtUserSetWindowLong( hwnd, GWL_STYLE, style, FALSE ); - NtUserSetWindowPos( hwnd, HWND_TOP, x, y, 0, 0, - SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOCOPYBITS | - ((style & WS_VISIBLE) ? SWP_SHOWWINDOW : 0) ); + + if (style & WS_VISIBLE) flags = SWP_SHOWWINDOW; + set_window_pos( hwnd, HWND_TOP, x, y, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOCOPYBITS | flags ); /* make old parent destroy itself if it no longer has children */ if (old_parent != NtUserGetDesktopWindow()) NtUserPostMessage( old_parent, WM_CLOSE, 0, 0 ); @@ -1145,7 +1145,7 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) if ((flags & (SWP_NOSIZE | SWP_NOMOVE)) != (SWP_NOSIZE | SWP_NOMOVE)) { release_win_data( data ); - NtUserSetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + set_window_pos( hwnd, 0, x, y, cx, cy, flags ); return TRUE; } @@ -1183,7 +1183,7 @@ static BOOL X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) release_win_data( data ); if (window_rect.left != x || window_rect.top != y) - NtUserSetWindowPos( hwnd, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); + set_window_pos( hwnd, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index d24b1c08184..39a8d2a4b5d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -908,15 +908,15 @@ static void set_initial_wm_hints( Display *display, Window window ) */ static void make_owner_managed( HWND hwnd ) { + static const UINT flags = SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | SWP_NOREDRAW | + SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED; HWND owner; if (!(owner = NtUserGetWindowRelative( hwnd, GW_OWNER ))) return; if (is_managed( owner )) return; if (!is_managed( hwnd )) return; - NtUserSetWindowPos( owner, 0, 0, 0, 0, 0, - SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | - SWP_NOREDRAW | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED ); + set_window_pos( owner, 0, 0, 0, 0, 0, flags ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index be76dd2609e..055b1a9be8b 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -885,6 +885,15 @@ static inline BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR return NtUserMessageCall( hwnd, msg, wparam, lparam, 0, NtUserSendNotifyMessage, FALSE ); } +/* per-monitor DPI aware NtUserSetWindowPos call */ +static inline BOOL set_window_pos( HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags ) +{ + UINT context = NtUserSetThreadDpiAwarenessContext( NTUSER_DPI_PER_MONITOR_AWARE_V2 ); + BOOL ret = NtUserSetWindowPos( hwnd, after, x, y, cx, cy, flags ); + NtUserSetThreadDpiAwarenessContext( context ); + return ret; +} + static inline HWND get_focus(void) { GUITHREADINFO info;

1 0

Rémi Bernon : winemac: Force thread DPI awareness when calling NtUserSetWindowPos.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: b71c86a574d326d14a345502b400973003cc0607 URL: https://gitlab.winehq.org/wine/wine/-/commit/b71c86a574d326d14a345502b40097… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 10 10:30:29 2024 +0200 winemac: Force thread DPI awareness when calling NtUserSetWindowPos. --- dlls/winemac.drv/window.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 32e544d733b..dacda1e7e78 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -55,6 +55,25 @@ static UINT get_win_monitor_dpi(HWND hwnd) } +/* per-monitor DPI aware NtUserSetWindowPos call */ +static BOOL set_window_pos(HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags) +{ + UINT context = NtUserSetThreadDpiAwarenessContext(NTUSER_DPI_PER_MONITOR_AWARE_V2); + BOOL ret = NtUserSetWindowPos(hwnd, after, x, y, cx, cy, flags); + NtUserSetThreadDpiAwarenessContext(context); + return ret; +} + + +/* per-monitor DPI aware NtUserSetInternalWindowPos call */ +static void set_internal_window_pos(HWND hwnd, UINT cmd, RECT *rect, POINT *pt) +{ + UINT context = NtUserSetThreadDpiAwarenessContext(NTUSER_DPI_PER_MONITOR_AWARE_V2); + NtUserSetInternalWindowPos(hwnd, cmd, rect, pt); + NtUserSetThreadDpiAwarenessContext(context); +} + + /*********************************************************************** * get_cocoa_window_features */ @@ -930,10 +949,8 @@ static void set_focus(HWND hwnd, BOOL raise) if (!(hwnd = NtUserGetAncestor(hwnd, GA_ROOT))) return; - if (raise && hwnd == NtUserGetForegroundWindow() && hwnd != NtUserGetDesktopWindow() && - !is_all_the_way_front(hwnd)) - NtUserSetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER); + if (raise && hwnd == NtUserGetForegroundWindow() && hwnd != NtUserGetDesktopWindow() && !is_all_the_way_front(hwnd)) + set_window_pos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER); if (!(data = get_win_data(hwnd))) return; @@ -1480,8 +1497,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) capturePoint = pt; send_message(hwnd, WM_MOVING, 0, (LPARAM)&movedRect); - NtUserSetWindowPos(hwnd, 0, movedRect.left, movedRect.top, 0, 0, - SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER); + set_window_pos(hwnd, 0, movedRect.left, movedRect.top, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER); } } } @@ -1494,8 +1510,7 @@ static LRESULT move_window(HWND hwnd, WPARAM wparam) /* if the move is canceled, restore the previous position */ if (moved && msg.message == WM_KEYDOWN && msg.wParam == VK_ESCAPE) { - NtUserSetWindowPos(hwnd, 0, origRect.left, origRect.top, 0, 0, - SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER); + set_window_pos(hwnd, 0, origRect.left, origRect.top, 0, 0, SWP_NOACTIVATE | SWP_NOSIZE | SWP_NOZORDER); } return 0; @@ -2259,7 +2274,7 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) int send_sizemove = !event->window_frame_changed.in_resize && !being_dragged && !event->window_frame_changed.skip_size_move_loop; if (send_sizemove) send_message(hwnd, WM_ENTERSIZEMOVE, 0, 0); - NtUserSetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); + set_window_pos(hwnd, 0, rect.left, rect.top, width, height, flags); if (send_sizemove) send_message(hwnd, WM_EXITSIZEMOVE, 0, 0); } @@ -2429,7 +2444,7 @@ done: void macdrv_window_brought_forward(HWND hwnd) { TRACE("win %p\n", hwnd); - NtUserSetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + set_window_pos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); } @@ -2469,7 +2484,7 @@ void macdrv_window_restore_requested(HWND hwnd, const macdrv_event *event) release_win_data(data); - NtUserSetInternalWindowPos(hwnd, SW_SHOW, &rect, NULL); + set_internal_window_pos(hwnd, SW_SHOW, &rect, NULL); } }

1 0

Zebediah Figura : server: Generalize get_directory_entries to single_entry case.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: be427c312b5bd6a6dfcf74c6ec8c40560f29c1e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/be427c312b5bd6a6dfcf74c6ec8c40… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Apr 16 11:26:19 2022 -0500 server: Generalize get_directory_entries to single_entry case. --- dlls/ntdll/unix/sync.c | 50 ++++++++---------------------------------- include/wine/server_protocol.h | 27 +++-------------------- server/directory.c | 40 ++++----------------------------- server/protocol.def | 14 ++---------- server/request.h | 12 +++------- server/trace.c | 21 +++--------------- 6 files changed, 24 insertions(+), 140 deletions(-)

1 0

Zebediah Figura : ntdll: Implement reading multiple entries in NtQueryDirectoryObject.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: af4f252ac4426c3da773904df9ac8e64322b5c8f URL: https://gitlab.winehq.org/wine/wine/-/commit/af4f252ac4426c3da773904df9ac8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Apr 16 11:26:19 2022 -0500 ntdll: Implement reading multiple entries in NtQueryDirectoryObject. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52585 --- dlls/ntdll/tests/om.c | 57 ++++++++++++--------------- dlls/ntdll/unix/sync.c | 89 ++++++++++++++++++++++++++++++++++++++---- include/wine/server_protocol.h | 30 +++++++++++++- server/directory.c | 75 +++++++++++++++++++++++++++++++++++ server/protocol.def | 18 +++++++++ server/request.h | 7 ++++ server/trace.c | 50 ++++++++++++++++++++++++ 7 files changed, 284 insertions(+), 42 deletions(-)

1 0

Jinoh Kang : wow64: Implement reading multiple entries in wow64_NtQueryDirectoryObject.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: f8d9ad738cd06f535130cddcfee310b08a2f67ec URL: https://gitlab.winehq.org/wine/wine/-/commit/f8d9ad738cd06f535130cddcfee310… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat Nov 18 01:24:46 2023 +0900 wow64: Implement reading multiple entries in wow64_NtQueryDirectoryObject. --- dlls/wow64/sync.c | 66 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/wow64/sync.c b/dlls/wow64/sync.c index 628184ff7c1..a445da2d620 100644 --- a/dlls/wow64/sync.c +++ b/dlls/wow64/sync.c @@ -786,21 +786,63 @@ NTSTATUS WINAPI wow64_NtQueryDirectoryObject( UINT *args ) DIRECTORY_BASIC_INFORMATION *info; ULONG size = size32 + 2 * sizeof(*info) - 2 * sizeof(*info32); - if (!single_entry) FIXME( "not implemented\n" ); info = Wow64AllocateTemp( size ); status = NtQueryDirectoryObject( handle, info, size, single_entry, restart, context, &retsize ); - if (!status) + if (NT_SUCCESS(status)) { - info32->ObjectName.Buffer = PtrToUlong( info32 + 2 ); - info32->ObjectName.Length = info->ObjectName.Length; - info32->ObjectName.MaximumLength = info->ObjectName.MaximumLength; - info32->ObjectTypeName.Buffer = info32->ObjectName.Buffer + info->ObjectName.MaximumLength; - info32->ObjectTypeName.Length = info->ObjectTypeName.Length; - info32->ObjectTypeName.MaximumLength = info->ObjectTypeName.MaximumLength; - memset( info32 + 1, 0, sizeof(*info32) ); - size = info->ObjectName.MaximumLength + info->ObjectTypeName.MaximumLength; - memcpy( info32 + 2, info + 2, size ); - if (retlen) *retlen = 2 * sizeof(*info32) + size; + unsigned int i, count, used_size, used_count, strpool_head, validsize = min( size, retsize ); + + used_count = 0; + used_size = sizeof(*info32); /* "null terminator" entry */ + for (count = 0; + sizeof(*info) * (count + 1) <= validsize && info[count].ObjectName.MaximumLength; + count++) + { + unsigned int entry_size = sizeof(*info32) + + info[count].ObjectName.MaximumLength + + info[count].ObjectTypeName.MaximumLength; + + if (used_size + entry_size <= size32) + { + used_count++; + used_size += entry_size; + } + } + + if (used_count != count) + { + ERR( "64bit dir list (%u+%lu bytes, %u entries) truncated for 32bit buffer (%u+%lu bytes, %u entries)\n", + validsize, size - validsize, count, used_size, size32 - min( size32, used_size ), used_count ); + + if (!status) status = STATUS_MORE_ENTRIES; + *context -= count - used_count; + } + + /* + * Avoid making strpool_head a pointer, since it can point beyond end + * of the buffer. Out-of-bounds pointers trigger undefined behavior + * just by existing, even when they are never dereferenced. + */ + strpool_head = sizeof(*info32) * (used_count + 1); /* after the "null terminator" entry */ + for (i = 0; i < used_count; i++) + { + info32[i].ObjectName.Buffer = PtrToUlong( (char *)info32 + strpool_head ); + info32[i].ObjectName.Length = info[i].ObjectName.Length; + info32[i].ObjectName.MaximumLength = info[i].ObjectName.MaximumLength; + memcpy( (char *)info32 + strpool_head, info[i].ObjectName.Buffer, info[i].ObjectName.MaximumLength ); + strpool_head += info[i].ObjectName.MaximumLength; + + info32[i].ObjectTypeName.Buffer = PtrToUlong( (char *)info32 + strpool_head ); + info32[i].ObjectTypeName.Length = info[i].ObjectTypeName.Length; + info32[i].ObjectTypeName.MaximumLength = info[i].ObjectTypeName.MaximumLength; + memcpy( (char *)info32 + strpool_head, info[i].ObjectTypeName.Buffer, info[i].ObjectTypeName.MaximumLength ); + strpool_head += info[i].ObjectTypeName.MaximumLength; + } + + if (size32 >= sizeof(*info32)) + memset( &info32[used_count], 0, sizeof(info32[used_count]) ); + + if (retlen) *retlen = strpool_head; } else if (retlen && status == STATUS_BUFFER_TOO_SMALL) *retlen = retsize - 2 * sizeof(*info) + 2 * sizeof(*info32);

1 0

Zebediah Figura : server: Don't set error in find_object_index if the object is not found.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: 2c2b1b1f141d814441130fccc291919a15d9dc15 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c2b1b1f141d814441130fccc29191… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Apr 16 11:26:19 2022 -0500 server: Don't set error in find_object_index if the object is not found. find_object_index() sets the status code to STATUS_NO_MORE_ENTRIES to indicate that the given index does not exist in the list of the directory entries, in addition to returning NULL. STATUS_NO_MORE_ENTRIES only makes sense in the context of the function's only caller, req_get_directory_entry(), which is used to implement the NtQueryDirectoryObject() system call, specifically the single object case. Otherwise, the choice of status code is unintuitive. Remove the set_error() call in find_object_index(), and move the responsibility of setting the status code to the caller. --- server/directory.c | 1 + server/object.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/server/directory.c b/server/directory.c index e521a7b38c9..8f72fd44f6d 100644 --- a/server/directory.c +++ b/server/directory.c @@ -562,6 +562,7 @@ DECL_HANDLER(get_directory_entry) release_object( obj ); } + else set_error( STATUS_NO_MORE_ENTRIES ); release_object( dir ); } } diff --git a/server/object.c b/server/object.c index 89e541ffb6b..459ead5f3a5 100644 --- a/server/object.c +++ b/server/object.c @@ -495,7 +495,6 @@ struct object *find_object_index( const struct namespace *namespace, unsigned in if (!index--) return grab_object( ptr->obj ); } } - set_error( STATUS_NO_MORE_ENTRIES ); return NULL; }

1 0

Esme Povirk : gdiplus: Fix DIB stride calculation in GdipDrawImagePointsRect.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: 6753f25f5870744d1eaa4c80d648452db2a12e98 URL: https://gitlab.winehq.org/wine/wine/-/commit/6753f25f5870744d1eaa4c80d64845… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Jun 11 16:21:36 2024 +0000 gdiplus: Fix DIB stride calculation in GdipDrawImagePointsRect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56800 --- dlls/gdiplus/graphics.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 14e09e7cc47..265b3363ca9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3427,6 +3427,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image BITMAPINFOHEADER bih; BYTE *temp_bits; PixelFormat dst_format; + INT dib_stride; src_hdc = CreateCompatibleDC(0); @@ -3453,8 +3454,10 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image hbitmap = CreateDIBSection(src_hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); + dib_stride = ((bitmap->width * PIXELFORMATBPP(dst_format) + 31) / 8) & ~3; + convert_pixels(bitmap->width, bitmap->height, - bitmap->width*PIXELFORMATBPP(dst_format)/8, temp_bits, dst_format, bitmap->image.palette, + dib_stride, temp_bits, dst_format, bitmap->image.palette, bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette);

1 0

Eric Pouech : msvcrt/tests: Don't print a NULL string.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: 58ad68e774831671d47955243a5f3db185ed44c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/58ad68e774831671d47955243a5f3d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jun 10 12:30:59 2024 +0200 msvcrt/tests: Don't print a NULL string. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b81469009cd..bce6a0b0509 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -2025,8 +2025,8 @@ static void test_chsize( void ) LONG cur, pos, count; char temptext[] = "012345678"; char *tempfile = _tempnam( ".", "tst" ); - - ok( tempfile != NULL, "Couldn't create test file: %s\n", tempfile ); + + ok( tempfile != NULL, "Couldn't create test file\n" ); fd = _open( tempfile, _O_CREAT|_O_TRUNC|_O_RDWR, _S_IREAD|_S_IWRITE ); ok( fd > 0, "Couldn't open test file\n" );

1 0

Adam Rehn : wineserver: Report non-zero exit code for abnormal process termination.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: 2dfeb87f410a49dcf0a40d9f81315122b529fa06 URL: https://gitlab.winehq.org/wine/wine/-/commit/2dfeb87f410a49dcf0a40d9f813151… Author: Adam Rehn <adam(a)tensorworks.com.au> Date: Wed Sep 20 21:00:30 2023 +1000 wineserver: Report non-zero exit code for abnormal process termination. Signed-off-by: Adam Rehn <adam(a)tensorworks.com.au> --- server/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 66f90fb80c4..155dc050d95 100644 --- a/server/process.c +++ b/server/process.c @@ -858,7 +858,7 @@ static void process_poll_event( struct fd *fd, int event ) struct process *process = get_fd_user( fd ); assert( process->obj.ops == &process_ops ); - if (event & (POLLERR | POLLHUP)) kill_process( process, 0 ); + if (event & (POLLERR | POLLHUP)) kill_process( process, !process->is_terminating ); else if (event & POLLIN) receive_fd( process ); }

1 0

Alex Henrie : ntdll: Succeed in RtlQueryRegistryValues on direct query of nonexistent value.
by Alexandre Julliard June 11, 2024

June 11, 2024

Module: wine Branch: master Commit: bc0cd8052edb8065d50a764b23c9610627288efe URL: https://gitlab.winehq.org/wine/wine/-/commit/bc0cd8052edb8065d50a764b23c961… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 26 22:41:16 2024 -0600 ntdll: Succeed in RtlQueryRegistryValues on direct query of nonexistent value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49703 --- dlls/ntdll/reg.c | 14 ++++++++++---- dlls/ntdll/tests/reg.c | 6 +++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 57208d5d811..4af8f5edb9b 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -242,7 +242,7 @@ NTSTATUS WINAPI RtlOpenCurrentUser( static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, PRTL_QUERY_REGISTRY_TABLE pQuery, PVOID pContext, PVOID pEnvironment) { - PUNICODE_STRING str; + PUNICODE_STRING str = pQuery->EntryContext; UNICODE_STRING src, dst; LONG *bin; ULONG offset; @@ -256,7 +256,15 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (pInfo == NULL) { if (pQuery->Flags & RTL_QUERY_REGISTRY_DIRECT) - return STATUS_INVALID_PARAMETER; + { + ULONG default_size = pQuery->DefaultLength; + if (!default_size && pQuery->DefaultType == REG_SZ && pQuery->DefaultData) + default_size = wcslen(pQuery->DefaultData) + 1; + if (str->MaximumLength < default_size) + return STATUS_BUFFER_TOO_SMALL; + memcpy(str->Buffer, pQuery->DefaultData, default_size); + return STATUS_SUCCESS; + } else { status = pQuery->QueryRoutine(pQuery->Name, pQuery->DefaultType, pQuery->DefaultData, @@ -268,8 +276,6 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo, if (pQuery->Flags & RTL_QUERY_REGISTRY_DIRECT) { - str = pQuery->EntryContext; - switch(pInfo->Type) { case REG_EXPAND_SZ: diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 7c4518bb79d..3785070c962 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2726,17 +2726,17 @@ static struct query_reg_values_test query_reg_values_tests[] = { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"Some default", 4 * sizeof(WCHAR) }}, - STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA | WINE_TODO_RET | WINE_TODO_DATA + STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, - STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA | WINE_TODO_RET | WINE_TODO_DATA + STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA | WINE_TODO_DATA }, { {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist", &query_reg_values_direct_str, REG_EXPAND_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }}, - STATUS_SUCCESS, 0, WINE_TODO_RET | WINE_TODO_DATA, REG_EXPAND_SZ, L"C:" + STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_EXPAND_SZ, L"C:" }, /* DIRECT with a multi-string default value crashes on Windows */ /* {

1 0