July 2022 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: aca2cac6e21c8b368da7a02cf036f4c60da9167d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca2cac6e21c8b368da7a02c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 12:30:57 2022 +0200 ntdll/tests: Remove some workarounds for older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 215 ++++++++++++++++++------------------------------- 1 file changed, 80 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aca2cac6e21c8b368da7…

1 0

Alexandre Julliard : ntdll/tests: Add a few more tests for registry path names.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: a4373db64e9c883c49cf41246d602855d962cb93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4373db64e9c883c49cf4124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 13:59:43 2022 +0200 ntdll/tests: Add a few more tests for registry path names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a619241c8e5..a0d07c9fc21 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -412,6 +412,12 @@ static void test_NtOpenKey(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\\\\\" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine + ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine @@ -425,6 +431,13 @@ static void test_NtOpenKey(void) pNtClose( key ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\\\" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + pNtClose( key ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" ); status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine @@ -493,7 +506,7 @@ static void test_NtCreateKey(void) { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - HANDLE key, subkey; + HANDLE key, subkey, subkey2; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; UNICODE_STRING str; @@ -545,11 +558,20 @@ static void test_NtCreateKey(void) ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\\\subkey" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\subkey\\" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); @@ -557,6 +579,18 @@ static void test_NtCreateKey(void) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey2\\\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey2\\\\test\\\\" ); + status = pNtCreateKey( &subkey2, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pNtDeleteKey( subkey2 ); + pNtClose( subkey2 ); + pNtDeleteKey( subkey ); + pNtClose( subkey ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); @@ -594,6 +628,14 @@ static void test_NtCreateKey(void) if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + todo_wine + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); todo_wine

1 0

Alexandre Julliard : ntdll: Fix returned error for NtCreateKey with empty name.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 95ddb7576d13d3b4bb1aa213a045771cb70a3d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ddb7576d13d3b4bb1aa213… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:03:34 2022 +0200 ntdll: Fix returned error for NtCreateKey with empty name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 1 - dlls/ntdll/unix/registry.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a0d07c9fc21..e791271ed17 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -603,7 +603,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 8901c350868..47547d42f09 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -81,6 +81,7 @@ NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI *key = 0; if (attr->Length != sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; + if (!attr->ObjectName->Length && !attr->RootDirectory) return STATUS_OBJECT_PATH_SYNTAX_BAD; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; TRACE( "(%p,%s,%s,%x,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName),

1 0

Alexandre Julliard : server: Fix access check for NtQueryKey.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: ec8edb66df7fdcfe15c5b8499b95026b9c769189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8edb66df7fdcfe15c5b849… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:08:43 2022 +0200 server: Fix access check for NtQueryKey. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 1 - server/registry.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index e791271ed17..242a5b5e898 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2153,7 +2153,6 @@ static void test_NtRenameKey(void) info = (KEY_NAME_INFORMATION *)buffer; status = pNtQueryKey(subkey, KeyNameInformation, info, sizeof(buffer), &size); - todo_wine ok(!status, "Unexpected status %#lx.\n", status); if (status == STATUS_SUCCESS) { diff --git a/server/registry.c b/server/registry.c index 6fe44b4351d..70a304a4c86 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2272,8 +2272,7 @@ DECL_HANDLER(enum_key) { struct key *key; - if ((key = get_hkey_obj( req->hkey, - req->index == -1 ? KEY_QUERY_VALUE : KEY_ENUMERATE_SUB_KEYS ))) + if ((key = get_hkey_obj( req->hkey, req->index == -1 ? 0 : KEY_ENUMERATE_SUB_KEYS ))) { enum_key( key, req->index, req->info_class, reply ); release_object( key );

1 0

Alexandre Julliard : server: Return the standard status code when the key exists in NtCreateKey.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 68a69b51bb82541f57b83e7674341a1417f1e8e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a69b51bb82541f57b83e76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:18:26 2022 +0200 server: Return the standard status code when the key exists in NtCreateKey. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/registry.c | 12 +++++++++++- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 - server/registry.c | 10 ++++------ server/request.h | 1 - server/trace.c | 1 - 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 47547d42f09..9c98bf48399 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -95,10 +95,19 @@ NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI if (class) wine_server_add_data( req, class->Buffer, class->Length ); ret = wine_server_call( req ); *key = wine_server_ptr_handle( reply->hkey ); - if (dispos && !ret) *dispos = reply->created ? REG_CREATED_NEW_KEY : REG_OPENED_EXISTING_KEY; } SERVER_END_REQ; + if (ret == STATUS_OBJECT_NAME_EXISTS) + { + if (dispos) *dispos = REG_OPENED_EXISTING_KEY; + ret = STATUS_SUCCESS; + } + else if (ret == STATUS_SUCCESS) + { + if (dispos) *dispos = REG_CREATED_NEW_KEY; + } + TRACE( "<- %p\n", *key ); free( objattr ); return ret; @@ -700,6 +709,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil req->file = wine_server_obj_handle( key ); wine_server_add_data( req, objattr, len ); ret = wine_server_call( req ); + if (ret == STATUS_OBJECT_NAME_EXISTS) ret = STATUS_SUCCESS; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ce1b2630f53..0f39333919b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2191,7 +2191,7 @@ struct create_key_reply { struct reply_header __header; obj_handle_t hkey; - int created; + char __pad_12[4]; }; @@ -6304,7 +6304,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 752 +#define SERVER_PROTOCOL_VERSION 753 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index a8beccaf468..6cb6275f2f2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1718,7 +1718,6 @@ struct process_info VARARG(class,unicode_str); /* class name */ @REPLY obj_handle_t hkey; /* handle to the created key */ - int created; /* has it been newly created? */ @END /* Open a registry key */ diff --git a/server/registry.c b/server/registry.c index 70a304a4c86..d3c1e5e7ad1 100644 --- a/server/registry.c +++ b/server/registry.c @@ -803,12 +803,11 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un static struct key *create_key( struct key *key, const struct unicode_str *name, const struct unicode_str *class, unsigned int options, unsigned int access, unsigned int attributes, - const struct security_descriptor *sd, int *created ) + const struct security_descriptor *sd ) { int index; struct unicode_str token, next; - *created = 0; if (!(key = open_key_prefix( key, name, access, &token, &index ))) return NULL; if (!token.len) /* the key already exists */ @@ -827,6 +826,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, if (debug_level > 1) dump_operation( key, NULL, "Open" ); if (key->flags & KEY_PREDEF) set_error( STATUS_PREDEFINED_HANDLE ); grab_object( key ); + set_error( STATUS_OBJECT_NAME_EXISTS ); return key; } @@ -844,7 +844,6 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, set_error( STATUS_CHILD_MUST_BE_VOLATILE ); return NULL; } - *created = 1; make_dirty( key ); if (!(key = alloc_subkey( key, &token, index, current_time ))) return NULL; @@ -2212,7 +2211,7 @@ DECL_HANDLER(create_key) if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { if ((key = create_key( parent, &name, &class, req->options, access, - objattr->attributes, sd, &reply->created ))) + objattr->attributes, sd ))) { reply->hkey = alloc_handle( current->process, key, access, objattr->attributes ); release_object( key ); @@ -2367,8 +2366,7 @@ DECL_HANDLER(load_registry) if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { - int dummy; - if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, sd, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, sd ))) { load_registry( key, req->file ); release_object( key ); diff --git a/server/request.h b/server/request.h index cbb4c5d7a01..dc9c4e82029 100644 --- a/server/request.h +++ b/server/request.h @@ -1174,7 +1174,6 @@ C_ASSERT( FIELD_OFFSET(struct create_key_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_key_request, options) == 16 ); C_ASSERT( sizeof(struct create_key_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_key_reply, hkey) == 8 ); -C_ASSERT( FIELD_OFFSET(struct create_key_reply, created) == 12 ); C_ASSERT( sizeof(struct create_key_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_key_request, parent) == 12 ); C_ASSERT( FIELD_OFFSET(struct open_key_request, access) == 16 ); diff --git a/server/trace.c b/server/trace.c index 4d4789d050a..c3dd1199f06 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2295,7 +2295,6 @@ static void dump_create_key_request( const struct create_key_request *req ) static void dump_create_key_reply( const struct create_key_reply *req ) { fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", created=%d", req->created ); } static void dump_open_key_request( const struct open_key_request *req )

1 0

Alexandre Julliard : server: Avoid potential NULL dereference in create_named_object().
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 248231468d39cabcff04dd2ec57652cf3763c577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=248231468d39cabcff04dd2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:33:33 2022 +0200 server: Avoid potential NULL dereference in create_named_object(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/object.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server/object.c b/server/object.c index 907bc087444..5bb999d1fc7 100644 --- a/server/object.c +++ b/server/object.c @@ -331,31 +331,31 @@ void *create_named_object( struct object *parent, const struct object_ops *ops, free_object( new_obj ); return NULL; } - goto done; } - - if (!(obj = lookup_named_object( parent, name, attributes, &new_name ))) return NULL; - - if (!new_name.len) + else { - if (attributes & OBJ_OPENIF && obj->ops == ops) - set_error( STATUS_OBJECT_NAME_EXISTS ); - else + if (!(obj = lookup_named_object( parent, name, attributes, &new_name ))) return NULL; + + if (!new_name.len) { + if (attributes & OBJ_OPENIF && obj->ops == ops) + { + set_error( STATUS_OBJECT_NAME_EXISTS ); + return obj; + } release_object( obj ); - obj = NULL; if (attributes & OBJ_OPENIF) set_error( STATUS_OBJECT_TYPE_MISMATCH ); else set_error( STATUS_OBJECT_NAME_COLLISION ); + return NULL; } - return obj; - } - new_obj = create_object( obj, ops, &new_name, attributes, sd ); - release_object( obj ); + new_obj = create_object( obj, ops, &new_name, attributes, sd ); + release_object( obj ); + if (!new_obj) return NULL; + } -done: if (attributes & OBJ_PERMANENT) { make_object_permanent( new_obj );

1 0

Jacek Caban : user32: Use SIF_RETURNPREV for SetScrollPos implementation.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 9d3058aa3a7ff9e86d6f78007b2e727110848284 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d3058aa3a7ff9e86d6f7800… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 3 23:34:38 2022 +0200 user32: Use SIF_RETURNPREV for SetScrollPos implementation. --- dlls/user32/scroll.c | 12 ++++-------- dlls/user32/tests/scroll.c | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index e368a2feb70..c92ec6459d9 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -518,18 +518,14 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO in * Note the ambiguity when 0 is returned. Use GetLastError * to make sure there was an error (and to know which one). */ -INT WINAPI DECLSPEC_HOTPATCH SetScrollPos( HWND hwnd, INT nBar, INT nPos, BOOL bRedraw) +int WINAPI DECLSPEC_HOTPATCH SetScrollPos( HWND hwnd, int bar, int pos, BOOL redraw ) { SCROLLINFO info; - SCROLLBAR_INFO *infoPtr; - INT oldPos = 0; - if ((infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, FALSE ))) oldPos = infoPtr->curVal; info.cbSize = sizeof(info); - info.nPos = nPos; - info.fMask = SIF_POS; - NtUserSetScrollInfo( hwnd, nBar, &info, bRedraw ); - return oldPos; + info.nPos = pos; + info.fMask = SIF_POS | SIF_RETURNPREV; + return NtUserSetScrollInfo( hwnd, bar, &info, redraw ); } diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 95782a47a6e..481219665ec 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -738,7 +738,6 @@ static void test_subclass(void) res = SetScrollPos(hwnd, SB_CTL, 1, FALSE); ok(res == 2, "SetScrollPos returned %Iu\n", res); ok(set_scrollinfo.cbSize == sizeof(SCROLLINFO), "cbSize = %u\n", set_scrollinfo.cbSize); - todo_wine ok(set_scrollinfo.fMask == (0x1000 | SIF_POS), "fMask = %x\n", set_scrollinfo.fMask); ok(set_scrollinfo.nPos == 1, "nPos = %x\n", set_scrollinfo.nPos); @@ -780,7 +779,6 @@ static void test_subclass(void) res = SetScrollPos(hwnd, SB_CTL, 1, FALSE); ok(res == 0, "SetScrollPos returned %Iu\n", res); ok(set_scrollinfo.cbSize == sizeof(SCROLLINFO), "cbSize = %u\n", set_scrollinfo.cbSize); - todo_wine ok(set_scrollinfo.fMask == (0x1000 | SIF_POS), "fMask = %x\n", set_scrollinfo.fMask); ok(set_scrollinfo.nPos == 1, "nPos = %x\n", set_scrollinfo.nPos);

1 0

Jacek Caban : win32u: Move scroll bar proc implementation from user32.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 48441212986817bd485df23654413fec6f7f3725 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48441212986817bd485df236… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 3 23:06:44 2022 +0200 win32u: Move scroll bar proc implementation from user32. --- dlls/user32/scroll.c | 65 +-------------------------------------- dlls/win32u/scroll.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 64 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index c92ec6459d9..8eb4b1d23ff 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -311,42 +311,6 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } -/*********************************************************************** - * SCROLL_HandleKbdEvent - * - * Handle a keyboard event (only for SB_CTL scrollbars with focus). - * - * PARAMS - * hwnd [I] Handle of window with scrollbar(s) - * wParam [I] Variable input including enable state - * lParam [I] Variable input including input point - */ -static void SCROLL_HandleKbdEvent(HWND hwnd, WPARAM wParam, LPARAM lParam) -{ - TRACE("hwnd=%p wParam=%Id lParam=%Id\n", hwnd, wParam, lParam); - - /* hide caret on first KEYDOWN to prevent flicker */ - if ((lParam & PFD_DOUBLEBUFFER_DONTCARE) == 0) - NtUserHideCaret( hwnd ); - - switch(wParam) - { - case VK_PRIOR: wParam = SB_PAGEUP; break; - case VK_NEXT: wParam = SB_PAGEDOWN; break; - case VK_HOME: wParam = SB_TOP; break; - case VK_END: wParam = SB_BOTTOM; break; - case VK_UP: wParam = SB_LINEUP; break; - case VK_DOWN: wParam = SB_LINEDOWN; break; - case VK_LEFT: wParam = SB_LINEUP; break; - case VK_RIGHT: wParam = SB_LINEDOWN; break; - default: return; - } - SendMessageW(GetParent(hwnd), - ((GetWindowLongW( hwnd, GWL_STYLE ) & SBS_VERT) ? - WM_VSCROLL : WM_HSCROLL), wParam, (LPARAM)hwnd); -} - - /************************************************************************* * SCROLL_GetScrollPos * @@ -391,18 +355,10 @@ static BOOL SCROLL_GetScrollRange(HWND hwnd, INT nBar, LPINT lpMin, LPINT lpMax) LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { - if (!IsWindow( hwnd )) return 0; - switch(message) { case WM_KEYDOWN: - SCROLL_HandleKbdEvent(hwnd, wParam, lParam); - break; - case WM_KEYUP: - NtUserShowCaret( hwnd ); - break; - case WM_ENABLE: case WM_SETFOCUS: case WM_KILLFOCUS: @@ -415,28 +371,11 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA case SBM_GETSCROLLINFO: case SBM_GETSCROLLBARINFO: case SBM_SETSCROLLINFO: - return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserScrollBarWndProc, !unicode ); - case WM_SETCURSOR: - if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) - { - ULONG_PTR cursor = (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? IDC_SIZENESW : IDC_SIZENWSE; - return (LRESULT)NtUserSetCursor( LoadCursorA( 0, (LPSTR)cursor )); - } - return DefWindowProcW( hwnd, message, wParam, lParam ); - case SBM_SETPOS: - return SetScrollPos( hwnd, SB_CTL, wParam, (BOOL)lParam ); - case SBM_GETPOS: - return SCROLL_GetScrollPos(hwnd, SB_CTL); - case SBM_GETRANGE: - return SCROLL_GetScrollRange(hwnd, SB_CTL, (LPINT)wParam, (LPINT)lParam); - case SBM_ENABLE_ARROWS: - return NtUserEnableScrollBar( hwnd, SB_CTL, wParam ); - case 0x00e5: case 0x00e7: case 0x00e8: @@ -444,9 +383,7 @@ LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARA case 0x00ed: case 0x00ee: case 0x00ef: - ERR("unknown Win32 msg %04x wp=%08Ix lp=%08Ix\n", - message, wParam, lParam ); - break; + return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserScrollBarWndProc, !unicode ); default: if (message >= WM_USER) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index d48755cec7c..c4c26e3bc6e 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -1130,6 +1130,32 @@ static void create_scroll_bar( HWND hwnd, CREATESTRUCTW *create ) } } +static void handle_kbd_event( HWND hwnd, WPARAM wparam, LPARAM lparam ) +{ + TRACE( "hwnd=%p wparam=%ld lparam=%ld\n", hwnd, wparam, lparam ); + + /* hide caret on first KEYDOWN to prevent flicker */ + if ((lparam & PFD_DOUBLEBUFFER_DONTCARE) == 0) + NtUserHideCaret( hwnd ); + + switch (wparam) + { + case VK_PRIOR: wparam = SB_PAGEUP; break; + case VK_NEXT: wparam = SB_PAGEDOWN; break; + case VK_HOME: wparam = SB_TOP; break; + case VK_END: wparam = SB_BOTTOM; break; + case VK_UP: wparam = SB_LINEUP; break; + case VK_DOWN: wparam = SB_LINEDOWN; break; + case VK_LEFT: wparam = SB_LINEUP; break; + case VK_RIGHT: wparam = SB_LINEDOWN; break; + default: return; + } + + send_message( get_parent(hwnd), + (get_window_long( hwnd, GWL_STYLE ) & SBS_VERT) ? WM_VSCROLL : WM_HSCROLL, + wparam, (LPARAM)hwnd); +} + static int get_scroll_pos(HWND hwnd, int bar) { struct scroll_info *scroll = get_scroll_info_ptr( hwnd, bar, FALSE ); @@ -1155,14 +1181,35 @@ static BOOL set_scroll_range( HWND hwnd, int bar, int min_val, int max_val ) return TRUE; } +static BOOL get_scroll_range( HWND hwnd, int nBar, int *min, int *max ) +{ + struct scroll_info *info; + + if (!(info = get_scroll_info_ptr( hwnd, nBar, FALSE ))) return FALSE; + if (min) *min = info ? info->minVal : 0; + if (max) *max = info ? info->maxVal : 0; + release_scroll_info_ptr( info ); + return TRUE; +} + LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) { + if (!is_window( hwnd )) return 0; + switch (msg) { case WM_CREATE: create_scroll_bar( hwnd, (CREATESTRUCTW *)lparam ); return 0; + case WM_KEYDOWN: + handle_kbd_event( hwnd, wparam, lparam ); + return 0; + + case WM_KEYUP: + NtUserShowCaret( hwnd ); + return 0; + case WM_LBUTTONDBLCLK: case WM_LBUTTONDOWN: if (get_window_long( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) @@ -1282,7 +1329,47 @@ LRESULT scroll_bar_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpara case SBM_SETSCROLLINFO: return set_scroll_info( hwnd, SB_CTL, (SCROLLINFO *)lparam, wparam ); + case WM_SETCURSOR: + if (get_window_long( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) + { + ULONG_PTR cursor = (get_window_long( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? + IDC_SIZENESW : IDC_SIZENWSE; + return (LRESULT)NtUserSetCursor( LoadImageW( 0, (const WCHAR *)cursor, IMAGE_CURSOR, + 0, 0, LR_SHARED | LR_DEFAULTSIZE )); + } + return default_window_proc( hwnd, msg, wparam, lparam, ansi ); + + case SBM_SETPOS: + { + SCROLLINFO info; + info.cbSize = sizeof(info); + info.nPos = wparam; + info.fMask = SIF_POS | SIF_RETURNPREV; + return NtUserSetScrollInfo( hwnd, SB_CTL, &info, lparam ); + } + + case SBM_GETPOS: + return get_scroll_pos( hwnd, SB_CTL ); + + case SBM_GETRANGE: + return get_scroll_range( hwnd, SB_CTL, (int *)wparam, (int *)lparam ); + + case SBM_ENABLE_ARROWS: + return NtUserEnableScrollBar( hwnd, SB_CTL, wparam ); + + case 0x00e5: + case 0x00e7: + case 0x00e8: + case 0x00ec: + case 0x00ed: + case 0x00ee: + case 0x00ef: + ERR( "unknown Win32 msg %04x wp=%08lx lp=%08lx\n", msg, wparam, lparam ); + return 0; + default: + if (msg >= WM_USER) + WARN( "unknown msg %04x wp=%08lx lp=%08lx\n", msg, wparam, lparam ); return default_window_proc( hwnd, msg, wparam, lparam, ansi ); } }

1 0

Jacek Caban : user32: Use GetScrollInfo for GetScrollPos implementation.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 67630d0f4c2c5b24f9219f9787bf93efeeec32d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67630d0f4c2c5b24f9219f97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 3 23:44:35 2022 +0200 user32: Use GetScrollInfo for GetScrollPos implementation. --- dlls/user32/scroll.c | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 8eb4b1d23ff..566bf9ecb21 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -311,22 +311,6 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } -/************************************************************************* - * SCROLL_GetScrollPos - * - * Internal helper for the API function - * - * PARAMS - * hwnd [I] Handle of window with scrollbar(s) - * nBar [I] One of SB_HORZ, SB_VERT, or SB_CTL - */ -static INT SCROLL_GetScrollPos(HWND hwnd, INT nBar) -{ - LPSCROLLBAR_INFO infoPtr = SCROLL_GetInternalInfo(hwnd, nBar, FALSE); - return infoPtr ? infoPtr->curVal: 0; -} - - /************************************************************************* * SCROLL_GetScrollRange * @@ -483,15 +467,19 @@ int WINAPI DECLSPEC_HOTPATCH SetScrollPos( HWND hwnd, int bar, int pos, BOOL red * There is ambiguity when 0 is returned. Use GetLastError * to make sure there was an error (and to know which one). */ -INT WINAPI DECLSPEC_HOTPATCH GetScrollPos(HWND hwnd, INT nBar) +int WINAPI DECLSPEC_HOTPATCH GetScrollPos( HWND hwnd, int bar ) { - TRACE("hwnd=%p nBar=%d\n", hwnd, nBar); + SCROLLINFO info; + + TRACE( "hwnd=%p bar=%d\n", hwnd, bar ); /* Refer SB_CTL requests to the window */ - if (nBar == SB_CTL) - return SendMessageW(hwnd, SBM_GETPOS, 0, 0); - else - return SCROLL_GetScrollPos(hwnd, nBar); + if (bar == SB_CTL) + return SendMessageW( hwnd, SBM_GETPOS, 0, 0 ); + + info.cbSize = sizeof(info); + info.fMask = SIF_POS; + return GetScrollInfo( hwnd, bar, &info ) ? info.nPos : 0; }

1 0

Jacek Caban : user32: Use GetScrollInfo for GetScrollRange implementation.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 5f93b3ca93835f501a801836b9104d40d64f07e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f93b3ca93835f501a801836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 3 23:57:43 2022 +0200 user32: Use GetScrollInfo for GetScrollRange implementation. --- dlls/user32/scroll.c | 47 +++++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 566bf9ecb21..54517311731 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -311,32 +311,6 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } -/************************************************************************* - * SCROLL_GetScrollRange - * - * Internal helper for the API function - * - * PARAMS - * hwnd [I] Handle of window with scrollbar(s) - * nBar [I] One of SB_HORZ, SB_VERT, or SB_CTL - * lpMin [O] Where to store minimum value - * lpMax [O] Where to store maximum value - * - * RETURNS - * Success: TRUE - * Failure: FALSE - */ -static BOOL SCROLL_GetScrollRange(HWND hwnd, INT nBar, LPINT lpMin, LPINT lpMax) -{ - LPSCROLLBAR_INFO infoPtr = SCROLL_GetInternalInfo(hwnd, nBar, FALSE); - - if (lpMin) *lpMin = infoPtr ? infoPtr->minVal : 0; - if (lpMax) *lpMax = infoPtr ? infoPtr->maxVal : 0; - - return TRUE; -} - - LRESULT WINAPI USER_ScrollBarProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { switch(message) @@ -530,15 +504,24 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetScrollRange(HWND hwnd, INT nBar, INT minVal, IN * RETURNS * TRUE if values is filled */ -BOOL WINAPI DECLSPEC_HOTPATCH GetScrollRange(HWND hwnd, INT nBar, LPINT lpMin, LPINT lpMax) +BOOL WINAPI DECLSPEC_HOTPATCH GetScrollRange( HWND hwnd, int bar, int *min, int *max ) { - TRACE("hwnd=%p nBar=%d lpMin=%p lpMax=%p\n", hwnd, nBar, lpMin, lpMax); + SCROLLINFO info; + + TRACE( "hwnd=%p nBar=%d lpMin=%p lpMax=%p\n", hwnd, bar, min, max ); /* Refer SB_CTL requests to the window */ - if (nBar == SB_CTL) - SendMessageW(hwnd, SBM_GETRANGE, (WPARAM)lpMin, (LPARAM)lpMax); - else - SCROLL_GetScrollRange(hwnd, nBar, lpMin, lpMax); + if (bar == SB_CTL) + { + SendMessageW( hwnd, SBM_GETRANGE, (WPARAM)min, (LPARAM)max ); + return TRUE; + } + info.cbSize = sizeof(info); + info.fMask = SIF_RANGE; + info.nMin = info.nMax = 0; + GetScrollInfo( hwnd, bar, &info ); + if (min) *min = info.nMin; + if (max) *max = info.nMax; return TRUE; }

1 0