October 2021 - Wine-Commits

Jacek Caban : win32u: Move NtUserOpenDesktop implementation from user32.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: c07dcf59689c7b9422c85ab5007d3eb659ab807a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c07dcf59689c7b9422c85ab5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 15:21:33 2021 +0200 win32u: Move NtUserOpenDesktop implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 25 +++++++------------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 13 +++++++++++++ include/ntuser.h | 1 + 7 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 98afc499234..122d8486e1f 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -290,24 +290,13 @@ HDESK WINAPI OpenDesktopA( LPCSTR name, DWORD flags, BOOL inherit, ACCESS_MASK a HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK access ) { - HANDLE ret = 0; - DWORD len = name ? lstrlenW(name) : 0; - if (len >= MAX_PATH) - { - SetLastError( ERROR_FILENAME_EXCED_RANGE ); - return 0; - } - SERVER_START_REQ( open_desktop ) - { - req->winsta = wine_server_obj_handle( hwinsta ); - req->flags = flags; - req->access = access; - req->attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); - wine_server_add_data( req, name, len * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + + RtlInitUnicodeString( &str, name ); + InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE, hwinsta, NULL ); + if (inherit) attr.Attributes |= OBJ_INHERIT; + return NtUserOpenDesktop( &attr, flags, access ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index b4d5d718bf5..12b895eff9a 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -101,6 +101,7 @@ static void * const syscalls[] = NtUserGetObjectInformation, NtUserGetProcessWindowStation, NtUserGetThreadDesktop, + NtUserOpenDesktop, NtUserOpenInputDesktop, NtUserOpenWindowStation, NtUserSetObjectInformation, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index bb800830f3d..1c5a960e59c 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1091,7 +1091,7 @@ @ stub NtUserNotifyProcessCreate @ stub NtUserNotifyWinEvent @ stub NtUserOpenClipboard -@ stub NtUserOpenDesktop +@ stdcall -syscall NtUserOpenDesktop(ptr long long) @ stdcall -syscall NtUserOpenInputDesktop(long long long) @ stub NtUserOpenThreadDesktop @ stdcall -syscall NtUserOpenWindowStation(ptr long) diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 0d0eefcf629..aff16e2a873 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -159,6 +159,30 @@ HDESK WINAPI NtUserCreateDesktopEx( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *dev return ret; } +/*********************************************************************** + * NtUserOpenDesktop (win32u.@) + */ +HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ) +{ + HANDLE ret = 0; + if (attr->ObjectName->Length >= MAX_PATH * sizeof(WCHAR)) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return 0; + } + SERVER_START_REQ( open_desktop ) + { + req->winsta = wine_server_obj_handle( attr->RootDirectory ); + req->flags = flags; + req->access = access; + req->attributes = attr->Attributes; + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; + } + /*********************************************************************** * NtUserCloseDesktop (win32u.@) */ diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index a1dc08103d4..1d74d55e032 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -87,6 +87,7 @@ SYSCALL_ENTRY( NtUserCreateWindowStation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ + SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index b20ff3f887b..b497b0edbdf 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -92,6 +92,19 @@ NTSTATUS WINAPI wow64_NtUserCreateDesktopEx( UINT *args ) return HandleToUlong( ret ); } +NTSTATUS WINAPI wow64_NtUserOpenDesktop( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + DWORD flags = get_ulong( &args ); + ACCESS_MASK access = get_ulong( &args ); + + struct object_attr64 attr; + HANDLE ret; + + ret = NtUserOpenDesktop( objattr_32to64( &attr, attr32 ), flags, access ); + return HandleToUlong( ret ); +} + NTSTATUS WINAPI wow64_NtUserCloseDesktop( UINT *args ) { HDESK handle = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 8687a6bbc59..daac994c84d 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -36,6 +36,7 @@ HWINSTA WINAPI NtUserGetProcessWindowStation(void); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); +HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle );

1 0

Jacek Caban : win32u: Factor out reg_open_hkcu_key.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: d841b31aeee36f40436feab4e606dca2f8474f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d841b31aeee36f40436feab4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 15:21:54 2021 +0200 win32u: Factor out reg_open_hkcu_key. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index e35aeefe61f..1f9c2adc21c 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(font); static HKEY wine_fonts_key; static HKEY wine_fonts_cache_key; +static HKEY hkcu_key; struct font_physdev { @@ -616,6 +617,12 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, return ret; } +static HKEY reg_open_hkcu_key( const char *name ) +{ + WCHAR nameW[128]; + return reg_open_key( hkcu_key, nameW, asciiz_to_unicode( nameW, name ) - sizeof(WCHAR) ); +} + static void set_reg_value( HKEY hkey, const WCHAR *name, UINT type, const void *value, DWORD count ) { unsigned int name_size = name ? lstrlenW( name ) * sizeof(WCHAR) : 0; @@ -643,8 +650,8 @@ static ULONG query_reg_value( HKEY hkey, const WCHAR *name, return size - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data); } -static ULONG query_reg_ascii_value( HKEY hkey, const char *name, - KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) +ULONG query_reg_ascii_value( HKEY hkey, const char *name, + KEY_VALUE_PARTIAL_INFORMATION *info, ULONG size ) { WCHAR nameW[64]; asciiz_to_unicode( nameW, name ); @@ -4371,7 +4378,7 @@ static BOOL get_key_value( HKEY key, const char *name, DWORD *value ) return !!count; } -static UINT init_font_options( HKEY hkcu ) +static UINT init_font_options(void) { char value_buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[20 * sizeof(WCHAR)])]; KEY_VALUE_PARTIAL_INFORMATION *info = (void *)value_buffer; @@ -4379,9 +4386,6 @@ static UINT init_font_options( HKEY hkcu ) DWORD i, val, gamma = 1400; UINT dpi = 0; - static const WCHAR desktop_keyW[] = - { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p' }; - if (query_reg_ascii_value( wine_fonts_key, "AntialiasFakeBoldOrItalic", info, sizeof(value_buffer) ) && info->Type == REG_SZ) { @@ -4389,7 +4393,7 @@ static UINT init_font_options( HKEY hkcu ) antialias_fakes = (wcschr( valsW, *(const WCHAR *)info->Data ) != NULL); } - if ((key = reg_open_key( hkcu, desktop_keyW, sizeof(desktop_keyW) ))) + if ((key = reg_open_hkcu_key( "Control Panel\\Desktop" ))) { /* FIXME: handle vertical orientations even though Windows doesn't */ if (get_key_value( key, "FontSmoothingOrientation", &val )) @@ -6355,7 +6359,7 @@ UINT font_init(void) { OBJECT_ATTRIBUTES attr = { sizeof(attr) }; UNICODE_STRING name; - HANDLE mutex, hkcu; + HANDLE mutex; DWORD disposition; UINT dpi = 0; @@ -6366,10 +6370,9 @@ UINT font_init(void) {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','F','o','n','t','s'}; static const WCHAR cacheW[] = {'C','a','c','h','e'}; - if (!(hkcu = open_hkcu())) return 0; - wine_fonts_key = reg_create_key( hkcu, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); - if (wine_fonts_key) dpi = init_font_options( hkcu ); - NtClose( hkcu ); + if (!(hkcu_key = open_hkcu())) return 0; + wine_fonts_key = reg_create_key( hkcu_key, wine_fonts_keyW, sizeof(wine_fonts_keyW), 0, NULL ); + if (wine_fonts_key) dpi = init_font_options(); if (!dpi) return 96; update_codepage( dpi );

1 0

Jacek Caban : win32u: Move winstation initialization from user32.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: 2c1d00f142382f79fc70fde85a5eb110a50f7a3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1d00f142382f79fc70fde8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 15:22:40 2021 +0200 win32u: Move winstation initialization from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 105 +------------------------------- dlls/win32u/font.c | 16 +---- dlls/win32u/syscall.c | 4 +- dlls/win32u/win32u_private.h | 17 ++++++ dlls/win32u/winstation.c | 138 ++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 160 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2c1d00f142382f79fc70…

1 0

Robert Wilhelm : vbscript: Emit catch after enumnext in for each loops.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: 56010d0035b316d0906034237627e6f672c6ab4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=56010d0035b316d090603423… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu Oct 14 19:16:32 2021 +0200 vbscript: Emit catch after enumnext in for each loops. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39463 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/tests/error.vbs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index da56eac74b2..50c68a6e6b5 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -829,6 +829,10 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t return hres; label_set_addr(ctx, loop_ctx.for_end_label); + + if(!emit_catch(ctx, 0)) + return E_OUTOFMEMORY; + return S_OK; } diff --git a/dlls/vbscript/tests/error.vbs b/dlls/vbscript/tests/error.vbs index 1853f6c4bf5..9b74dc8773e 100644 --- a/dlls/vbscript/tests/error.vbs +++ b/dlls/vbscript/tests/error.vbs @@ -309,12 +309,15 @@ call ok(x = "ok", "testOnErrorClear failed") sub testForEachError() on error resume next - dim x, y + dim x, y, z y = false + z = false for each x in empty y = true next + z = true call ok(y, "for each not executed") + call ok(z, "line after next not executed") call todo_wine_ok(Err.Number = VB_E_OBJNOTCOLLECTION, "Err.Number = " & Err.Number) end sub

1 0

Alistair Leslie-Hughes : dbghelp: Support UWOP_EPILOG in unwind.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: 40f0119739d36b03f4df5d525d098ec032f1a37b URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f0119739d36b03f4df5d52… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 14 19:45:56 2021 +1100 dbghelp: Support UWOP_EPILOG in unwind. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/cpu_x86_64.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index 8e8ac85dd2f..4fd8d76e010 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -209,6 +209,19 @@ static void dump_unwind_info(struct cpu_stack_walk* csw, ULONG64 base, RUNTIME_F case UWOP_PUSH_MACHFRAME: TRACE("PUSH_MACHFRAME %u\n", info->UnwindCode[i].u.OpInfo); break; + case UWOP_EPILOG: + if (info->Version == 2) + { + unsigned int offset; + if (info->UnwindCode[i].u.OpInfo) + offset = info->UnwindCode[i].u.CodeOffset; + else + offset = (info->UnwindCode[i+1].u.OpInfo << 8) + info->UnwindCode[i+1].u.CodeOffset; + TRACE("UWOP_EPILOG %u offset %u\n", info->UnwindCode[i].u.OpInfo, offset); + i += 1; + break; + } + /* Fall through */ default: FIXME("unknown code %u\n", info->UnwindCode[i].u.UnwindOp); break; @@ -490,7 +503,7 @@ static BOOL interpret_function_table_entry(struct cpu_stack_walk* csw, return FALSE; } - if (info->Version != 1) + if (info->Version != 1 && info->Version != 2) { WARN("unknown unwind info version %u at %lx\n", info->Version, base + function->UnwindData); return FALSE;

1 0

Alistair Leslie-Hughes : include: Use known variables names in SYSTEM_INTERRUPT_INFORMATION.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: 3adee2ce3aed9d0f4e1ae49fe310cc82d454faf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3adee2ce3aed9d0f4e1ae49f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 14 19:45:57 2021 +1100 include: Use known variables names in SYSTEM_INTERRUPT_INFORMATION. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index 46ee508e89f..6b1c5b11b4f 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2469,7 +2469,12 @@ typedef struct _SYSTEM_CACHE_INFORMATION { /* System Information Class 0x17 */ typedef struct _SYSTEM_INTERRUPT_INFORMATION { - BYTE Reserved1[24]; + ULONG ContextSwitches; + ULONG DpcCount; + ULONG DpcRate; + ULONG TimeIncrement; + ULONG DpcBypassCount; + ULONG ApcBypassCount; } SYSTEM_INTERRUPT_INFORMATION, *PSYSTEM_INTERRUPT_INFORMATION; typedef struct _SYSTEM_CONFIGURATION_INFO {

1 0

Jacek Caban : win32u: Move NtUserCreateWindowStation implementation from user32.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: 1d30bac773ba95fdb49ff4ca15ab5ea810f6a05f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d30bac773ba95fdb49ff4ca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 15:20:42 2021 +0200 win32u: Move NtUserCreateWindowStation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 37 +++++++--------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 28 +++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 17 ++++++++++ dlls/wow64win/wow64win_private.h | 67 ++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 2 ++ 8 files changed, 128 insertions(+), 27 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index e2c4f0f251f..c619d3d4658 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -125,33 +125,18 @@ HWINSTA WINAPI CreateWindowStationA( LPCSTR name, DWORD flags, ACCESS_MASK acces HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD flags, ACCESS_MASK access, LPSECURITY_ATTRIBUTES sa ) { - HANDLE ret; - DWORD len = name ? lstrlenW(name) : 0; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; - if (len >= MAX_PATH) - { - SetLastError( ERROR_FILENAME_EXCED_RANGE ); - return 0; - } - if (!len) - { - name = get_winstation_default_name(); - len = lstrlenW( name ); - } - SERVER_START_REQ( create_winstation ) - { - req->flags = 0; - req->access = access; - req->attributes = OBJ_CASE_INSENSITIVE | - ((flags & CWF_CREATE_ONLY) ? 0 : OBJ_OPENIF) | - ((sa && sa->bInheritHandle) ? OBJ_INHERIT : 0); - req->rootdir = wine_server_obj_handle( get_winstations_dir_handle() ); - wine_server_add_data( req, name, len * sizeof(WCHAR) ); - wine_server_call_err( req ); - ret = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; + RtlInitUnicodeString( &str, name ); + if (!str.Length) RtlInitUnicodeString( &str, get_winstation_default_name() ); + + InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE, + get_winstations_dir_handle(), sa ); + if (!(flags & CWF_CREATE_ONLY)) attr.Attributes |= OBJ_OPENIF; + if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; + + return NtUserCreateWindowStation( &attr, access, 0, 0, 0, 0, 0 ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index f54098c5d4f..fb1bcfef093 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -96,6 +96,7 @@ static void * const syscalls[] = NtGdiTransformPoints, NtUserCloseDesktop, NtUserCloseWindowStation, + NtUserCreateWindowStation, NtUserGetObjectInformation, NtUserGetProcessWindowStation, NtUserGetThreadDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c82e974be04..013e8b89694 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -816,7 +816,7 @@ @ stub NtUserCreatePalmRejectionDelayZone @ stub NtUserCreateWindowEx @ stub NtUserCreateWindowGroup -@ stub NtUserCreateWindowStation +@ stdcall -syscall NtUserCreateWindowStation(ptr long long long long long long) @ stub NtUserCtxDisplayIOCtl @ stub NtUserDdeInitialize @ stub NtUserDefSetText diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index e787cc3884c..a0afe3a9606 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -33,6 +33,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(winstation); +/*********************************************************************** + * NtUserCreateWindowStation (win32u.@) + */ +HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access, ULONG arg3, + ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ) +{ + HANDLE ret; + + if (attr->ObjectName->Length >= MAX_PATH * sizeof(WCHAR)) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return 0; + } + + SERVER_START_REQ( create_winstation ) + { + req->flags = 0; + req->access = access; + req->attributes = attr->Attributes; + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + wine_server_call_err( req ); + ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} + /*********************************************************************** * NtUserCloseWindowStation (win32u.@) */ diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 303bdf08c57..66b48f47154 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -83,6 +83,7 @@ SYSCALL_ENTRY( NtGdiTransformPoints ) \ SYSCALL_ENTRY( NtUserCloseDesktop ) \ SYSCALL_ENTRY( NtUserCloseWindowStation ) \ + SYSCALL_ENTRY( NtUserCreateWindowStation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 59286969283..bab04018163 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -27,6 +27,23 @@ #include "ntuser.h" #include "wow64win_private.h" + +NTSTATUS WINAPI wow64_NtUserCreateWindowStation( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + ULONG arg3 = get_ulong( &args ); + ULONG arg4 = get_ulong( &args ); + ULONG arg5 = get_ulong( &args ); + ULONG arg6 = get_ulong( &args ); + ULONG arg7 = get_ulong( &args ); + + struct object_attr64 attr; + + return HandleToUlong( NtUserCreateWindowStation( objattr_32to64( &attr, attr32 ), access, + arg3, arg4, arg5, arg6, arg7 )); +} + NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args ) { HWINSTA handle = get_handle( &args ); diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h index 3d32955a9d6..3a6156f41b2 100644 --- a/dlls/wow64win/wow64win_private.h +++ b/dlls/wow64win/wow64win_private.h @@ -27,6 +27,23 @@ ALL_WIN32_SYSCALLS #undef SYSCALL_ENTRY +struct object_attr64 +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + SECURITY_DESCRIPTOR sd; +}; + +typedef struct +{ + ULONG Length; + ULONG RootDirectory; + ULONG ObjectName; + ULONG Attributes; + ULONG SecurityDescriptor; + ULONG SecurityQualityOfService; +} OBJECT_ATTRIBUTES32; + static inline ULONG get_ulong( UINT **args ) { return *(*args)++; } static inline HANDLE get_handle( UINT **args ) { return LongToHandle( *(*args)++ ); } static inline void *get_ptr( UINT **args ) { return ULongToPtr( *(*args)++ ); } @@ -55,4 +72,54 @@ static inline void put_size( ULONG *size32, SIZE_T size ) if (size32) *size32 = min( size, MAXDWORD ); } +static inline UNICODE_STRING *unicode_str_32to64( UNICODE_STRING *str, const UNICODE_STRING32 *str32 ) +{ + if (!str32) return NULL; + str->Length = str32->Length; + str->MaximumLength = str32->MaximumLength; + str->Buffer = ULongToPtr( str32->Buffer ); + return str; +} + +static inline SECURITY_DESCRIPTOR *secdesc_32to64( SECURITY_DESCRIPTOR *out, const SECURITY_DESCRIPTOR *in ) +{ + /* relative descr has the same layout for 32 and 64 */ + const SECURITY_DESCRIPTOR_RELATIVE *sd = (const SECURITY_DESCRIPTOR_RELATIVE *)in; + + if (!in) return NULL; + out->Revision = sd->Revision; + out->Sbz1 = sd->Sbz1; + out->Control = sd->Control & ~SE_SELF_RELATIVE; + if (sd->Control & SE_SELF_RELATIVE) + { + if (sd->Owner) out->Owner = (PSID)((BYTE *)sd + sd->Owner); + if (sd->Group) out->Group = (PSID)((BYTE *)sd + sd->Group); + if ((sd->Control & SE_SACL_PRESENT) && sd->Sacl) out->Sacl = (PSID)((BYTE *)sd + sd->Sacl); + if ((sd->Control & SE_DACL_PRESENT) && sd->Dacl) out->Dacl = (PSID)((BYTE *)sd + sd->Dacl); + } + else + { + out->Owner = ULongToPtr( sd->Owner ); + out->Group = ULongToPtr( sd->Group ); + if (sd->Control & SE_SACL_PRESENT) out->Sacl = ULongToPtr( sd->Sacl ); + if (sd->Control & SE_DACL_PRESENT) out->Dacl = ULongToPtr( sd->Dacl ); + } + return out; +} + +static inline OBJECT_ATTRIBUTES *objattr_32to64( struct object_attr64 *out, const OBJECT_ATTRIBUTES32 *in ) +{ + memset( out, 0, sizeof(*out) ); + if (!in) return NULL; + if (in->Length != sizeof(*in)) return &out->attr; + + out->attr.Length = sizeof(out->attr); + out->attr.RootDirectory = LongToHandle( in->RootDirectory ); + out->attr.Attributes = in->Attributes; + out->attr.ObjectName = unicode_str_32to64( &out->str, ULongToPtr( in->ObjectName )); + out->attr.SecurityQualityOfService = ULongToPtr( in->SecurityQualityOfService ); + out->attr.SecurityDescriptor = secdesc_32to64( &out->sd, ULongToPtr( in->SecurityDescriptor )); + return &out->attr; +} + #endif /* __WOW64WIN_PRIVATE_H */ diff --git a/include/ntuser.h b/include/ntuser.h index e5d16afdd53..c0976cac73d 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -24,6 +24,8 @@ BOOL WINAPI NtUserCloseDesktop( HDESK handle ); BOOL WINAPI NtUserCloseWindowStation( HWINSTA handle ); +HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK mask, ULONG arg3, + ULONG arg4, ULONG arg5, ULONG arg6, ULONG arg7 ); BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); HWINSTA WINAPI NtUserGetProcessWindowStation(void);

1 0

Jacek Caban : win32u: Move NtUserOpenWindowStation implementation from user32.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: fd840680abada377cf0f2c054a33d4d3c2ff5436 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd840680abada377cf0f2c05… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 15:20:56 2021 +0200 win32u: Move NtUserOpenWindowStation implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winstation.c | 33 +++++++++++---------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 19 +++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 10 ++++++++++ include/ntuser.h | 1 + 7 files changed, 44 insertions(+), 23 deletions(-) diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index c619d3d4658..ab1beed3c32 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -163,28 +163,17 @@ HWINSTA WINAPI OpenWindowStationA( LPCSTR name, BOOL inherit, ACCESS_MASK access */ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK access ) { - HANDLE ret = 0; - DWORD len = name ? lstrlenW(name) : 0; - if (len >= MAX_PATH) - { - SetLastError( ERROR_FILENAME_EXCED_RANGE ); - return 0; - } - if (!len) - { - name = get_winstation_default_name(); - len = lstrlenW( name ); - } - SERVER_START_REQ( open_winstation ) - { - req->access = access; - req->attributes = OBJ_CASE_INSENSITIVE | (inherit ? OBJ_INHERIT : 0); - req->rootdir = wine_server_obj_handle( get_winstations_dir_handle() ); - wine_server_add_data( req, name, len * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING str; + + RtlInitUnicodeString( &str, name ); + if (!str.Length) RtlInitUnicodeString( &str, get_winstation_default_name() ); + + InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE, + get_winstations_dir_handle(), NULL ); + if (inherit) attr.Attributes |= OBJ_INHERIT; + + return NtUserOpenWindowStation( &attr, access ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index fb1bcfef093..e8c904f9f02 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -101,6 +101,7 @@ static void * const syscalls[] = NtUserGetProcessWindowStation, NtUserGetThreadDesktop, NtUserOpenInputDesktop, + NtUserOpenWindowStation, NtUserSetObjectInformation, NtUserSetProcessWindowStation, NtUserSetThreadDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 013e8b89694..860b3626931 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1094,7 +1094,7 @@ @ stub NtUserOpenDesktop @ stdcall -syscall NtUserOpenInputDesktop(long long long) @ stub NtUserOpenThreadDesktop -@ stub NtUserOpenWindowStation +@ stdcall -syscall NtUserOpenWindowStation(ptr long) @ stub NtUserPaintDesktop @ stub NtUserPaintMenuBar @ stub NtUserPaintMonitor diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index a0afe3a9606..bd8420df05f 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -61,6 +61,25 @@ HWINSTA WINAPI NtUserCreateWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK a return ret; } +/****************************************************************************** + * NtUserOpenWindowStation (win32u.@) + */ +HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ) +{ + HANDLE ret = 0; + + SERVER_START_REQ( open_winstation ) + { + req->access = access; + req->attributes = attr->Attributes; + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + if (!wine_server_call_err( req )) ret = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} + /*********************************************************************** * NtUserCloseWindowStation (win32u.@) */ diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 66b48f47154..371ce3665fd 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -87,6 +87,7 @@ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ + SYSCALL_ENTRY( NtUserOpenWindowStation ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index bab04018163..80e85f8a631 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -44,6 +44,16 @@ NTSTATUS WINAPI wow64_NtUserCreateWindowStation( UINT *args ) arg3, arg4, arg5, arg6, arg7 )); } +NTSTATUS WINAPI wow64_NtUserOpenWindowStation( UINT *args ) +{ + OBJECT_ATTRIBUTES32 *attr32 = get_ptr( &args ); + ACCESS_MASK access = get_ulong( &args ); + + struct object_attr64 attr; + + return HandleToUlong( NtUserOpenWindowStation( objattr_32to64( &attr, attr32 ), access )); +} + NTSTATUS WINAPI wow64_NtUserCloseWindowStation( UINT *args ) { HWINSTA handle = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index c0976cac73d..648d4a3350d 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -30,6 +30,7 @@ BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); +HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle );

1 0

Rémi Bernon : dinput8/tests: Remove old packet report id checks in HID driver.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: fe78540b51423fd5fdb5db4063938ca4cbd425b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe78540b51423fd5fdb5db40… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 14 09:39:52 2021 +0200 dinput8/tests: Remove old packet report id checks in HID driver. It's superseded with the new expect list, and generally invalid if report id is not 1. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dinput8/tests/driver_hid.c b/dlls/dinput8/tests/driver_hid.c index 4a5bca85abc..45c9f3e14ab 100644 --- a/dlls/dinput8/tests/driver_hid.c +++ b/dlls/dinput8/tests/driver_hid.c @@ -498,7 +498,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -522,7 +521,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -547,7 +545,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( !in_size, "got input size %u\n", in_size ); ok( out_size == sizeof(*packet), "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer ); @@ -571,7 +568,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) ok( in_size == sizeof(*packet), "got input size %u\n", in_size ); ok( !out_size, "got output size %u\n", out_size ); - ok( packet->reportId == report_id, "got id %u\n", packet->reportId ); ok( packet->reportBufferLen >= expected_size, "got len %u\n", packet->reportBufferLen ); ok( !!packet->reportBuffer, "got buffer %p\n", packet->reportBuffer );

1 0

Rémi Bernon : joy.cpl: Consistently use the 32 buttons limit from DIJOYSTATE.
by Alexandre Julliard Oct. 14, 2021

Oct. 14, 2021

Module: wine Branch: master Commit: f10171251024d779946b6d62ebbf59b26b938c9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10171251024d779946b6d62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 14 09:39:54 2021 +0200 joy.cpl: Consistently use the 32 buttons limit from DIJOYSTATE. Based on a patch from Ivo Ivanov <logos128(a)gmail.com>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51873 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 1498021db66..4431669eee8 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -414,7 +414,7 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM * Joystick testing functions * */ -static void dump_joy_state(DIJOYSTATE* st, int num_buttons) +static void dump_joy_state(DIJOYSTATE* st) { int i; TRACE("Ax (% 5d,% 5d,% 5d)\n", st->lX,st->lY, st->lZ); @@ -423,7 +423,7 @@ static void dump_joy_state(DIJOYSTATE* st, int num_buttons) TRACE("Pov (% 5d,% 5d,% 5d,% 5d)\n", st->rgdwPOV[0], st->rgdwPOV[1], st->rgdwPOV[2], st->rgdwPOV[3]); TRACE("Buttons "); - for(i=0; i < num_buttons; i++) + for(i=0; i < TEST_MAX_BUTTONS; i++) TRACE(" %c",st->rgbButtons[i] ? 'x' : 'o'); TRACE("\n"); } @@ -474,10 +474,10 @@ static DWORD WINAPI input_thread(void *param) poll_input(&data->joysticks[data->chosen_joystick], &state); - dump_joy_state(&state, data->joysticks[data->chosen_joystick].num_buttons); + dump_joy_state(&state); /* Indicate pressed buttons */ - for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) + for (i = 0; i < TEST_MAX_BUTTONS; i++) SendMessageW(data->graphics.buttons[i], BM_SETSTATE, !!state.rgbButtons[i], 0); /* Indicate axis positions, axes showing are hardcoded for now */ @@ -766,7 +766,7 @@ static DWORD WINAPI ff_input_thread(void *param) SetWindowPos(data->graphics.ff_axis, 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); - for (i=0; i < joy->num_buttons; i++) + for (i=0; i < TEST_MAX_BUTTONS; i++) if (state.rgbButtons[i]) { IDirectInputEffect_SetParameters(joy->effects[chosen_effect].effect, dieffect, flags);

1 0