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

Rémi Bernon : kernelbase: Use HEAP_ADD_USER_INFO for HLOCAL allocations.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 06b582e69534561fb3cc8bec439d334257ad63ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=06b582e69534561fb3cc8bec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 00:08:04 2022 +0200 kernelbase: Use HEAP_ADD_USER_INFO for HLOCAL allocations. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 736d3642995..776f0aafa18 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -713,6 +713,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH HeapWalk( HANDLE heap, PROCESS_HEAP_ENTRY *entry ) * Global/local heap functions ***********************************************************************/ +/* some undocumented flags (names are made up) */ +#define HEAP_ADD_USER_INFO 0x00000100 + /* not compatible with windows */ struct kernelbase_global_data { @@ -826,15 +829,15 @@ HGLOBAL WINAPI DECLSPEC_HOTPATCH GlobalFree( HLOCAL handle ) */ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) { + DWORD heap_flags = HEAP_ADD_USER_INFO; HANDLE heap = GetProcessHeap(); struct mem_entry *mem; - DWORD heap_flags = 0; HLOCAL handle; void *ptr; TRACE_(globalmem)( "flags %#x, size %#Ix\n", flags, size ); - if (flags & LMEM_ZEROINIT) heap_flags = HEAP_ZERO_MEMORY; + if (flags & LMEM_ZEROINIT) heap_flags |= HEAP_ZERO_MEMORY; if (!(flags & LMEM_MOVEABLE)) /* pointer */ { @@ -964,13 +967,15 @@ LPVOID WINAPI DECLSPEC_HOTPATCH LocalLock( HLOCAL handle ) */ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalReAlloc( HLOCAL handle, SIZE_T size, UINT flags ) { + DWORD heap_flags = HEAP_ADD_USER_INFO; struct mem_entry *mem; HLOCAL ret = 0; - DWORD heap_flags = (flags & LMEM_ZEROINIT) ? HEAP_ZERO_MEMORY : 0; void *ptr; TRACE_(globalmem)( "handle %p, size %#Ix, flags %#x\n", handle, size, flags ); + if (flags & LMEM_ZEROINIT) heap_flags |= HEAP_ZERO_MEMORY; + RtlLockHeap( GetProcessHeap() ); if (flags & LMEM_MODIFY) /* modify flags */ {

1 0

Rémi Bernon : ntdll: Add block padding when HEAP_ADD_USER_INFO flag is set.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 31df70a3ded5c9e29ba218d1ffc1aa6d24a820b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31df70a3ded5c9e29ba218d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 23:46:08 2022 +0200 ntdll: Add block padding when HEAP_ADD_USER_INFO flag is set. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 3 +-- dlls/ntdll/heap.c | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 91f582f36de..97f4d9c9fe3 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2277,14 +2277,13 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags expect_size = max( alloc_size, 2 * sizeof(void *) ); expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size + 2 * sizeof(void *) ); diff = min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ); - todo_wine ok( diff == expect_size, "got diff %#Ix\n", diff ); ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); ok( !memcmp( ptr2 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); - todo_wine + todo_wine_if( global_flags & FLG_HEAP_ENABLE_FREE_CHECK ) ok( !memcmp( ptr0 + alloc_size + tail_size, padd_buf, 2 * sizeof(void *) ), "unexpected padding\n" ); tmp_ptr = (void *)0xdeadbeef; diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0ecff6f6cba..6d9f949b6a9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -212,6 +212,7 @@ C_ASSERT( offsetof(HEAP, subheap) <= COMMIT_MASK ); /* some undocumented flags (names are made up) */ #define HEAP_PRIVATE 0x00001000 +#define HEAP_ADD_USER_INFO 0x00000100 #define HEAP_PAGE_ALLOCS 0x01000000 #define HEAP_VALIDATE 0x10000000 #define HEAP_VALIDATE_ALL 0x20000000 @@ -451,7 +452,7 @@ static RTL_CRITICAL_SECTION_DEBUG process_heap_cs_debug = static inline ULONG heap_get_flags( const HEAP *heap, ULONG flags ) { if (flags & (HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED)) flags |= HEAP_CHECKING_ENABLED; - flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | HEAP_REALLOC_IN_PLACE_ONLY | HEAP_CHECKING_ENABLED; + flags &= HEAP_GENERATE_EXCEPTIONS | HEAP_NO_SERIALIZE | HEAP_ZERO_MEMORY | HEAP_REALLOC_IN_PLACE_ONLY | HEAP_CHECKING_ENABLED | HEAP_ADD_USER_INFO; return heap->flags | flags; } @@ -1476,7 +1477,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) static SIZE_T heap_get_block_size( HEAP *heap, ULONG flags, SIZE_T size ) { - static const ULONG padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS; + static const ULONG padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS | HEAP_ADD_USER_INFO; static const ULONG check_flags = HEAP_TAIL_CHECKING_ENABLED | HEAP_FREE_CHECKING_ENABLED | HEAP_CHECKING_ENABLED; SIZE_T overhead;

1 0

Hugh McMaster : conhost: Update debug output and comments when loading/saving settings.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 577258a98106271d0aaa43beb660b42cfc4b3894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=577258a98106271d0aaa43be… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 19:35:16 2022 +1000 conhost: Update debug output and comments when loading/saving settings. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index b72278ddc0e..3db4b159696 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -239,7 +239,7 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) HKEY key, app_key; - TRACE("loading %s registry settings.\n", wine_dbgstr_w( key_name )); + TRACE( "Loading default console settings\n" ); memcpy( config->color_map, color_map, sizeof(color_map) ); memset( config->face_name, 0, sizeof(config->face_name) ); @@ -265,13 +265,15 @@ static void load_config( const WCHAR *key_name, struct console_config *config ) config->win_pos.Y = 0; config->edition_mode = 0; - /* read global settings */ + /* Load default console settings */ if (!RegOpenKeyW( HKEY_CURRENT_USER, L"Console", &key )) { load_registry_key( key, config ); - /* if requested, load part related to console title */ + + /* Load app-specific console settings (if any) */ if (key_name && !RegOpenKeyW( key, key_name, &app_key )) { + TRACE( "Loading %s console settings\n", wine_dbgstr_w(key_name) ); load_registry_key( app_key, config ); RegCloseKey( app_key ); } @@ -408,7 +410,7 @@ static void save_config( const WCHAR *key_name, const struct console_config *con { HKEY key, app_key; - TRACE( "%s %s\n", debugstr_w( key_name ), debugstr_config( config )); + TRACE( "Saving %s console settings\n", key_name ? debugstr_w( key_name ) : "default" ); if (RegCreateKeyW( HKEY_CURRENT_USER, L"Console", &key )) {

1 0

Hugh McMaster : conhost: Show caret immediately after reshaping.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 1c9c1ebc808ea61d572d35650d678eb00781116c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9c1ebc808ea61d572d3565… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 3 19:33:33 2022 +1000 conhost: Show caret immediately after reshaping. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index cc2df3e6e7b..b72278ddc0e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -659,8 +659,11 @@ static void update_window( struct console *console ) if (console->win == GetFocus()) { if (console->window->cursor_visible) + { CreateCaret( console->win, console->window->cursor_bitmap, console->active->font.width, console->active->font.height ); + update_window_cursor( console ); + } else DestroyCaret(); }

1 0

Zebediah Figura : hidclass.sys: No longer set the DEVPROPKEY_HID_HANDLE property.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: e63cdb3cadf301ed1893298a306771665d0c7753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e63cdb3cadf301ed1893298a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 9 20:32:53 2022 +0200 hidclass.sys: No longer set the DEVPROPKEY_HID_HANDLE property. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index cc4e3b96c82..873c55c4a67 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -24,7 +24,6 @@ #include "initguid.h" #include "hid.h" #include "devguid.h" -#include "devpkey.h" #include "ntddmou.h" #include "ntddkbd.h" #include "ddk/hidtypes.h" @@ -37,7 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); -DEFINE_DEVPROPKEY(DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda, 0x63, 0x6f, 0xb5, 0x9f, 0x08, 0x98, 2); DEFINE_GUID(GUID_DEVINTERFACE_WINEXINPUT, 0x6c53d5fd, 0x6480, 0x440f, 0xb6, 0x18, 0x47, 0x67, 0x50, 0xc5, 0xe1, 0xa6); #ifdef __ASM_USE_FASTCALL_WRAPPER @@ -286,15 +284,6 @@ static void create_child(minidriver *minidriver, DEVICE_OBJECT *fdo) IoInvalidateDeviceRelations(fdo_ext->u.fdo.hid_ext.PhysicalDeviceObject, BusRelations); - if ((status = IoSetDevicePropertyData(child_pdo, &DEVPROPKEY_HID_HANDLE, LOCALE_NEUTRAL, - PLUGPLAY_PROPERTY_PERSISTENT, DEVPROP_TYPE_UINT32, - sizeof(pdo_ext->u.pdo.rawinput_handle), &pdo_ext->u.pdo.rawinput_handle))) - { - ERR( "Failed to set device handle property, status %#lx\n", status ); - IoDeleteDevice(child_pdo); - return; - } - pdo_ext->u.pdo.poll_interval = DEFAULT_POLL_INTERVAL; HID_StartDeviceThread(child_pdo);

1 0

Jacek Caban : winex11: Use LoadImageW in fetch_icon_data.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 9c6895e37d00ea78d6be0dc5116fc8ad4dcab865 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c6895e37d00ea78d6be0dc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 12 00:16:57 2022 +0200 winex11: Use LoadImageW in fetch_icon_data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/dllmain.c | 7 ------- dlls/winex11.drv/unixlib.h | 1 - dlls/winex11.drv/window.c | 5 +++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index e2cbd51351d..b7c5692b32d 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -27,12 +27,6 @@ static unixlib_handle_t x11drv_handle; NTSTATUS (CDECL *x11drv_unix_call)( enum x11drv_funcs code, void *params ); -static NTSTATUS x11drv_load_icon( UINT id ) -{ - return HandleToUlong( LoadIconW( NULL, UlongToPtr( id ))); -} - - typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { @@ -43,7 +37,6 @@ static const callback_func callback_funcs[] = x11drv_ime_set_cursor_pos, x11drv_ime_set_open_status, x11drv_ime_update_association, - x11drv_load_icon, }; C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 451c308f0cd..d490600226f 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -105,7 +105,6 @@ enum client_callback client_ime_set_cursor_pos, client_ime_set_open_status, client_ime_update_association, - client_load_icon, client_funcs_count }; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 5d9a93688c3..3ebbee0856e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -631,8 +631,9 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) icon_big = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), &ii ); if (!icon_big) { - UINT winlogo = x11drv_client_call( client_load_icon, IDI_WINLOGO ); - icon_big = get_icon_info( UlongToHandle( winlogo ), &ii ); + icon_big = LoadImageW( 0, (const WCHAR *)IDI_WINLOGO, IMAGE_ICON, 0, 0, + LR_SHARED | LR_DEFAULTSIZE ); + icon_big = get_icon_info( icon_big, &ii ); } } if (!icon_small)

1 0

Louis Lenders : wbemprox: Add a few properties to Win32_QuickFixEngineering.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 4e19dbbbf2beeb6dc48357b05da9afd76aabb941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e19dbbbf2beeb6dc48357b0… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 9 08:12:18 2022 +0200 wbemprox: Add a few properties to Win32_QuickFixEngineering. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52879 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 8 +++++++- dlls/wbemprox/tests/query.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d27130b00c9..725f3816ad9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -367,7 +367,10 @@ static const struct column col_qualifier[] = static const struct column col_quickfixengineering[] = { { L"Caption", CIM_STRING }, + { L"Description", CIM_STRING }, { L"HotFixID", CIM_STRING|COL_FLAG_KEY }, + { L"InstalledBy", CIM_STRING }, + { L"InstalledOn", CIM_STRING }, }; static const struct column col_rawsmbiostables[] = { @@ -805,7 +808,10 @@ struct record_qualifier struct record_quickfixengineering { const WCHAR *caption; + const WCHAR *description; const WCHAR *hotfixid; + const WCHAR *installedby; + const WCHAR *installedon; }; struct record_rawsmbiostables { @@ -1011,7 +1017,7 @@ static const struct record_qualifier data_qualifier[] = static const struct record_quickfixengineering data_quickfixengineering[] = { - { L"http://winehq.org", L"KB1234567" }, + { L"http://winehq.org", L"Update", L"KB1234567", L"", L"22/2/2022" }, }; static const struct record_softwarelicensingproduct data_softwarelicensingproduct[] = diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f6faaea0d99..6c66fd93d95 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1998,7 +1998,11 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) "unexpected variant type %#x\n", V_VT( &caption ) ); ok( type == CIM_STRING, "unexpected type %#lx\n", type ); + check_property( obj, L"Description", VT_BSTR, CIM_STRING ); check_property( obj, L"HotFixID", VT_BSTR, CIM_STRING ); + check_property( obj, L"InstalledBy", VT_BSTR, CIM_STRING ); + check_property( obj, L"InstalledOn", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); if (total++ >= 10) break; }

1 0

Akihiro Sagawa : msvcrt: Avoid passing an invalid LCID to LCMapStringW.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: b4f20eec463d5bffe543305eeab4875074080e04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4f20eec463d5bffe543305e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jun 8 21:38:02 2022 +0900 msvcrt: Avoid passing an invalid LCID to LCMapStringW. Because it complains as follows on startup in Japanese locale: 002c:err:msvcrt:create_mbcinfo WideCharToMultiByte failed for cp 932, ret=0 (exp 196), error=122 This happens after commit c2a455a20d7b5124bab0086df75178d8c53f27ef. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index fa25a7092e3..dc9abca1b44 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -333,8 +333,8 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) } GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); - LCMapStringW(lcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); - LCMapStringW(lcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); + LCMapStringW(mbcinfo->mblcid, LCMAP_LOWERCASE, bufW, charcount, lowW, charcount); + LCMapStringW(mbcinfo->mblcid, LCMAP_UPPERCASE, bufW, charcount, upW, charcount); charcount = 0; for (i = 0; i < maxchar; i++)

1 0

Jacek Caban : win32u: Move NtUserScrollWindowEx implementation from user32.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: b2db69efcf473a2b7dc6e26155069a4f4094db9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2db69efcf473a2b7dc6e261… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 19:15:14 2022 +0200 win32u: Move NtUserScrollWindowEx implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/edit.c | 4 +- dlls/user32/listbox.c | 8 +- dlls/user32/mdi.c | 8 +- dlls/user32/painting.c | 240 +------------------------------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/dce.c | 204 ++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 + dlls/win32u/window.c | 2 +- dlls/win32u/wrappers.c | 9 ++ include/ntuser.h | 6 ++ 12 files changed, 239 insertions(+), 251 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2db69efcf473a2b7dc6…

1 0

Jacek Caban : win32u: Move SetWindowContextHelpId implementation from user32.
by Alexandre Julliard June 9, 2022

June 9, 2022

Module: wine Branch: master Commit: 540dc761fc4bc8df3a73eb15ceab1415f94d9a7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=540dc761fc4bc8df3a73eb15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 20:15:02 2022 +0200 win32u: Move SetWindowContextHelpId implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/win.c | 11 +---------- dlls/win32u/window.c | 18 ++++++++++++++++++ include/ntuser.h | 6 ++++++ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index bac75063f7d..4adffc37d6b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1475,16 +1475,7 @@ DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) */ BOOL WINAPI SetWindowContextHelpId( HWND hwnd, DWORD id ) { - WND *wnd = WIN_GetPtr( hwnd ); - if (!wnd || wnd == WND_DESKTOP) return FALSE; - if (wnd == WND_OTHER_PROCESS) - { - if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); - return FALSE; - } - wnd->helpContext = id; - WIN_ReleasePtr( wnd ); - return TRUE; + return NtUserSetWindowContextHelpId( hwnd, id ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 34bf87bc9ba..d09a719185a 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4539,6 +4539,21 @@ static DWORD get_window_context_help_id( HWND hwnd ) return retval; } +/* see SetWindowContextHelpId */ +static BOOL set_window_context_help_id( HWND hwnd, DWORD id ) +{ + WND *win = get_win_ptr( hwnd ); + if (!win || win == WND_DESKTOP) return FALSE; + if (win == WND_OTHER_PROCESS) + { + if (is_window( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); + return FALSE; + } + win->helpContext = id; + release_win_ptr( win ); + return TRUE; +} + /*********************************************************************** * send_destroy_message */ @@ -5432,6 +5447,9 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) case NtUserCallHwndParam_SetForegroundWindow: return set_foreground_window( hwnd, param ); + case NtUserCallHwndParam_SetWindowContextHelpId: + return set_window_context_help_id( hwnd, param ); + case NtUserCallHwndParam_SetWindowPixelFormat: return set_window_pixel_format( hwnd, param ); diff --git a/include/ntuser.h b/include/ntuser.h index b6b69879dd7..482bdbcbddd 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -1021,6 +1021,7 @@ enum NtUserCallHwndParam_MonitorFromWindow, NtUserCallHwndParam_ScreenToClient, NtUserCallHwndParam_SetForegroundWindow, + NtUserCallHwndParam_SetWindowContextHelpId, NtUserCallHwndParam_SetWindowPixelFormat, NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ @@ -1171,6 +1172,11 @@ static inline BOOL NtUserSetForegroundWindow( HWND hwnd, BOOL mouse ) return NtUserCallHwndParam( hwnd, mouse, NtUserCallHwndParam_SetForegroundWindow ); } +static inline BOOL NtUserSetWindowContextHelpId( HWND hwnd, DWORD id ) +{ + return NtUserCallHwndParam( hwnd, id, NtUserCallHwndParam_SetWindowContextHelpId ); +} + static inline BOOL NtUserSetWindowPixelFormat( HWND hwnd, int format ) { return NtUserCallHwndParam( hwnd, format, NtUserCallHwndParam_SetWindowPixelFormat );

1 0