December 2022 - Wine-Commits

Jacek Caban : win32u: Move NtUserGetInternalWindowPos implementation from user32.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: f5c82753298ec76be0e32884859ee5cc9b516326 URL: https://gitlab.winehq.org/wine/wine/-/commit/f5c82753298ec76be0e32884859ee5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 01:08:25 2022 +0100 win32u: Move NtUserGetInternalWindowPos implementation from user32. --- dlls/user32/user32.spec | 2 +- dlls/user32/winpos.c | 19 ------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 14 ++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 8 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 6f827144935..a53d02cd064 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -314,7 +314,7 @@ @ stdcall GetIconInfoExW(long ptr) @ stub GetInputDesktop @ stdcall GetInputState() -@ stdcall GetInternalWindowPos(long ptr ptr) +@ stdcall GetInternalWindowPos(long ptr ptr) NtUserGetInternalWindowPos @ stdcall GetKBCodePage() @ stdcall GetKeyNameTextA(long ptr long) @ stdcall GetKeyNameTextW(long ptr long) NtUserGetKeyNameText diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 00f82c33538..6e2c892f2b7 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -195,25 +195,6 @@ BOOL WINAPI BringWindowToTop( HWND hwnd ) } -/*********************************************************************** - * GetInternalWindowPos (USER32.@) - */ -UINT WINAPI GetInternalWindowPos( HWND hwnd, LPRECT rectWnd, - LPPOINT ptIcon ) -{ - WINDOWPLACEMENT wndpl; - - wndpl.length = sizeof(wndpl); - if (NtUserGetWindowPlacement( hwnd, &wndpl )) - { - if (rectWnd) *rectWnd = wndpl.rcNormalPosition; - if (ptIcon) *ptIcon = wndpl.ptMinPosition; - return wndpl.showCmd; - } - return 0; -} - - /*********************************************************************** * AnimateWindow (USER32.@) * Shows/Hides a window with an animation diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 6aacfa47f2b..6c59c91b5b0 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -178,6 +178,7 @@ static void * const syscalls[] = NtUserGetGUIThreadInfo, NtUserGetIconInfo, NtUserGetIconSize, + NtUserGetInternalWindowPos, NtUserGetKeyNameText, NtUserGetKeyState, NtUserGetKeyboardLayout, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index e2d84238008..1ffcfcaef5a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -943,7 +943,7 @@ @ stub NtUserGetInteractiveControlDeviceInfo @ stub NtUserGetInteractiveControlInfo @ stub NtUserGetInteractiveCtrlSupportedWaveforms -@ stub NtUserGetInternalWindowPos +@ stdcall -syscall NtUserGetInternalWindowPos(long ptr ptr) @ stdcall -syscall NtUserGetKeyNameText(long ptr long) @ stdcall -syscall NtUserGetKeyState(long) @ stdcall -syscall NtUserGetKeyboardLayout(long) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 5074f255fd8..24931eab199 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2495,6 +2495,20 @@ static void make_rect_onscreen( RECT *rect ) } } +/*********************************************************************** + * NtUserGetInternalWindowPos (win32u.@) + */ +UINT WINAPI NtUserGetInternalWindowPos( HWND hwnd, RECT *rect, POINT *pt ) +{ + WINDOWPLACEMENT placement; + + placement.length = sizeof(placement); + if (!NtUserGetWindowPlacement( hwnd, &placement )) return 0; + if (rect) *rect = placement.rcNormalPosition; + if (pt) *pt = placement.ptMinPosition; + return placement.showCmd; +} + /* make sure the specified point is visible on screen */ static void make_point_onscreen( POINT *pt ) { diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 1730b6a1f60..24e52a2a476 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -164,6 +164,7 @@ SYSCALL_ENTRY( NtUserGetGUIThreadInfo ) \ SYSCALL_ENTRY( NtUserGetIconInfo ) \ SYSCALL_ENTRY( NtUserGetIconSize ) \ + SYSCALL_ENTRY( NtUserGetInternalWindowPos ) \ SYSCALL_ENTRY( NtUserGetKeyNameText ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 831ee2e84fc..c8354e6b04a 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -2050,6 +2050,15 @@ NTSTATUS WINAPI wow64_NtUserGetIconSize( UINT *args ) return NtUserGetIconSize( handle, step, width, height ); } +NTSTATUS WINAPI wow64_NtUserGetInternalWindowPos( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + RECT *rect = get_ptr( &args ); + POINT *pt = get_ptr( &args ); + + return NtUserGetInternalWindowPos( hwnd, rect, pt ); +} + NTSTATUS WINAPI wow64_NtUserGetKeyNameText( UINT *args ) { LONG lparam = get_ulong( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 34e7f5240e7..2ca383c6e69 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -744,6 +744,7 @@ BOOL WINAPI NtUserGetGUIThreadInfo( DWORD id, GUITHREADINFO *info ); BOOL WINAPI NtUserGetIconInfo( HICON icon, ICONINFO *info, UNICODE_STRING *module, UNICODE_STRING *res_name, DWORD *bpp, LONG unk ); BOOL WINAPI NtUserGetIconSize( HICON handle, UINT step, LONG *width, LONG *height ); +UINT WINAPI NtUserGetInternalWindowPos( HWND hwnd, RECT *rect, POINT *pt ); INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ); SHORT WINAPI NtUserGetKeyState( INT vkey ); HKL WINAPI NtUserGetKeyboardLayout( DWORD thread_id );

1 0

Hans Leidekker : wofutil: Stub WofShouldCompressBinaries().
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: fa533f11e100a4380470ccffb6fa496b82d834ca URL: https://gitlab.winehq.org/wine/wine/-/commit/fa533f11e100a4380470ccffb6fa49… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 13:57:50 2022 +0100 wofutil: Stub WofShouldCompressBinaries(). --- dlls/wofutil/Makefile.in | 3 +++ dlls/wofutil/main.c | 30 ++++++++++++++++++++++++++++++ dlls/wofutil/wofutil.spec | 2 +- include/Makefile.in | 1 + include/wofapi.h | 19 +++++++++++++++++++ 5 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/wofutil/Makefile.in b/dlls/wofutil/Makefile.in index 387a4264349..479dea651bc 100644 --- a/dlls/wofutil/Makefile.in +++ b/dlls/wofutil/Makefile.in @@ -1 +1,4 @@ MODULE = wofutil.dll + +C_SRCS = \ + main.c diff --git a/dlls/wofutil/main.c b/dlls/wofutil/main.c new file mode 100644 index 00000000000..1866aed7c69 --- /dev/null +++ b/dlls/wofutil/main.c @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "wofapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wofutil); + +BOOL WINAPI WofShouldCompressBinaries( const WCHAR *volume, ULONG *alg ) +{ + FIXME( "%s, %p\n", debugstr_w(volume), alg ); + return FALSE; +} diff --git a/dlls/wofutil/wofutil.spec b/dlls/wofutil/wofutil.spec index 60168790731..73f11c4f885 100644 --- a/dlls/wofutil/wofutil.spec +++ b/dlls/wofutil/wofutil.spec @@ -3,7 +3,7 @@ @ stub WofGetDriverVersion @ stub WofIsExternalFile @ stub WofSetFileDataLocation -@ stub WofShouldCompressBinaries +@ stdcall WofShouldCompressBinaries(wstr ptr) @ stub WofWimAddEntry @ stub WofWimEnumFiles @ stub WofWimRemoveEntry diff --git a/include/Makefile.in b/include/Makefile.in index d0ae4b4667e..23a4265a437 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -917,6 +917,7 @@ SOURCES = \ wmsdkidl.idl \ wmsecure.idl \ wnaspi32.h \ + wofapi.h \ wownt16.h \ wownt32.h \ wpcapi.idl \ diff --git a/include/wofapi.h b/include/wofapi.h new file mode 100644 index 00000000000..8d678dc2d08 --- /dev/null +++ b/include/wofapi.h @@ -0,0 +1,19 @@ +/* + * Copyright 2022 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +BOOL WINAPI WofShouldCompressBinaries(const WCHAR *, ULONG *);

1 0

Torge Matthies : msvcr100: Implement _StructuredTaskCollection::_RunAndWait.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 11af5b750c990d6541110527a214687f4f5c2ce2 URL: https://gitlab.winehq.org/wine/wine/-/commit/11af5b750c990d6541110527a21468… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Mon Sep 26 23:04:00 2022 +0200 msvcr100: Implement _StructuredTaskCollection::_RunAndWait. --- dlls/msvcrt/concurrency.c | 58 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index c5db2868d58..3f0fbe6b62c 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1900,6 +1900,15 @@ static ThreadScheduler *get_thread_scheduler_from_context(Context *context) return NULL; } +static void execute_chore(_UnrealizedChore *chore, + _StructuredTaskCollection *task_collection) +{ + TRACE("(%p %p)\n", chore, task_collection); + + if (chore->chore_proc) + chore->chore_proc(chore); +} + static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) { _UnrealizedChore *chore = data; @@ -1921,23 +1930,20 @@ static void CALLBACK chore_wrapper_finally(BOOL normal, void *data) new_finished = prev_finished + 1; } while (InterlockedCompareExchange(ptr, new_finished, prev_finished) != prev_finished); + RtlWakeAddressSingle((LONG*)ptr); } static void __cdecl chore_wrapper(_UnrealizedChore *chore) { - TRACE("(%p)\n", chore); - __TRY { - if (chore->chore_proc) - chore->chore_proc(chore); + execute_chore(chore, chore->task_collection); } __FINALLY_CTX(chore_wrapper_finally, chore) } -static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) +static BOOL pick_and_execute_chore(ThreadScheduler *scheduler) { - ThreadScheduler *scheduler = (ThreadScheduler*)get_current_scheduler(); struct list *entry; struct scheduled_chore *sc; _UnrealizedChore *chore; @@ -1947,7 +1953,7 @@ static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) if (scheduler->scheduler.vtable != &ThreadScheduler_vtable) { ERR("unknown scheduler set\n"); - return; + return FALSE; } EnterCriticalSection(&scheduler->cs); @@ -1956,13 +1962,19 @@ static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) list_remove(entry); LeaveCriticalSection(&scheduler->cs); if (!entry) - return; + return FALSE; sc = LIST_ENTRY(entry, struct scheduled_chore, entry); chore = sc->chore; operator_delete(sc); chore->chore_wrapper(chore); + return TRUE; +} + +static void __cdecl _StructuredTaskCollection_scheduler_cb(void *data) +{ + pick_and_execute_chore((ThreadScheduler*)get_current_scheduler()); } static bool schedule_chore(_StructuredTaskCollection *this, @@ -2044,11 +2056,35 @@ void __thiscall _StructuredTaskCollection__Schedule( /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAA?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z */ /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QAG?AW4_TaskCollectionStatus(a)23@PAV_UnrealizedChore(a)23@@Z */ /* ?_RunAndWait(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA?AW4_TaskCollectionStatus(a)23@PEAV_UnrealizedChore(a)23@@Z */ -/*enum Concurrency::details::_TaskCollectionStatus*/int __stdcall -_StructuredTaskCollection__RunAndWait( +/*_TaskCollectionStatus*/int __stdcall _StructuredTaskCollection__RunAndWait( _StructuredTaskCollection *this, _UnrealizedChore *chore) { - FIXME("(%p %p): stub!\n", this, chore); + LONG expected, val; + + TRACE("(%p %p)\n", this, chore); + + if (chore) { + if (chore->task_collection) { + invalid_multiple_scheduling e; + invalid_multiple_scheduling_ctor_str(&e, "Chore scheduled multiple times"); + _CxxThrowException(&e, &invalid_multiple_scheduling_exception_type); + } + execute_chore(chore, this); + } + + if (this->context) { + ThreadScheduler *scheduler = get_thread_scheduler_from_context(this->context); + if (scheduler) { + while (pick_and_execute_chore(scheduler)) ; + } + } + + expected = this->count ? this->count : FINISHED_INITIAL; + while ((val = this->finished) != expected) + RtlWaitOnAddress((LONG*)&this->finished, &val, sizeof(val), NULL); + + this->finished = 0; + this->count = 0; return 1; }

1 0

Hans Leidekker : wofutil: New dll.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: de026dbd8e8449404d829242440b57954483ee09 URL: https://gitlab.winehq.org/wine/wine/-/commit/de026dbd8e8449404d829242440b57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 13:55:05 2022 +0100 wofutil: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/wofutil/Makefile.in | 1 + dlls/wofutil/wofutil.spec | 11 +++++++++++ 4 files changed, 15 insertions(+) diff --git a/configure b/configure index 61f6c3c7da2..5704afc1ff8 100755 --- a/configure +++ b/configure @@ -1490,6 +1490,7 @@ enable_wmp enable_wmphoto enable_wmvcore enable_wnaspi32 +enable_wofutil enable_wow64 enable_wow64cpu enable_wow64win @@ -21927,6 +21928,7 @@ wine_fn_config_makefile dlls/wmphoto enable_wmphoto wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 +wine_fn_config_makefile dlls/wofutil enable_wofutil wine_fn_config_makefile dlls/wow32 enable_win16 wine_fn_config_makefile dlls/wow64 enable_wow64 wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu diff --git a/configure.ac b/configure.ac index 7b3734bd2e9..9115244cb78 100644 --- a/configure.ac +++ b/configure.ac @@ -3197,6 +3197,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmphoto) WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) +WINE_CONFIG_MAKEFILE(dlls/wofutil) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) WINE_CONFIG_MAKEFILE(dlls/wow64) WINE_CONFIG_MAKEFILE(dlls/wow64cpu) diff --git a/dlls/wofutil/Makefile.in b/dlls/wofutil/Makefile.in new file mode 100644 index 00000000000..387a4264349 --- /dev/null +++ b/dlls/wofutil/Makefile.in @@ -0,0 +1 @@ +MODULE = wofutil.dll diff --git a/dlls/wofutil/wofutil.spec b/dlls/wofutil/wofutil.spec new file mode 100644 index 00000000000..60168790731 --- /dev/null +++ b/dlls/wofutil/wofutil.spec @@ -0,0 +1,11 @@ +@ stub WofEnumEntries +@ stub WofFileEnumFiles +@ stub WofGetDriverVersion +@ stub WofIsExternalFile +@ stub WofSetFileDataLocation +@ stub WofShouldCompressBinaries +@ stub WofWimAddEntry +@ stub WofWimEnumFiles +@ stub WofWimRemoveEntry +@ stub WofWimSuspendEntry +@ stub WofWimUpdateEntry

1 0

Sven Baars : taskschd/tests: Fix test failures on newer version of Windows 10.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: fab6c2d687e7e680d495857d5bc51683aab4b8a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/fab6c2d687e7e680d495857d5bc516… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Thu Dec 8 09:30:23 2022 +0100 taskschd/tests: Fix test failures on newer version of Windows 10. --- dlls/taskschd/tests/scheduler.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4e156e7ef33..07ba0f4bd95 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -783,7 +783,10 @@ static void test_GetTask(void) /* Delete the folder and recreate it to prevent a crash on w1064v1507 */ hr = ITaskFolder_DeleteFolder(root, Wine, 0); - ok(hr == S_OK, "DeleteTask error %#lx\n", hr); + todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) || broken(hr == S_OK) /* w1064v1507 */, + "expected ERROR_FILE_NOT_FOUND, got %#lx\n", hr); + ITaskFolder_Release(folder); hr = ITaskFolder_CreateFolder(root, Wine, v_null, &folder); ok(hr == S_OK, "CreateFolder error %#lx\n", hr);

1 0

Hans Leidekker : wtsapi32: Improve the stub for WTSQuerySessionInformation(WTSClientProtocolType).
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 090e574adb0c65eb905f5380ff5c4f9dae9bb529 URL: https://gitlab.winehq.org/wine/wine/-/commit/090e574adb0c65eb905f5380ff5c4f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 16:01:40 2022 +0100 wtsapi32: Improve the stub for WTSQuerySessionInformation(WTSClientProtocolType). --- dlls/wtsapi32/tests/wtsapi.c | 10 ++++++++++ dlls/wtsapi32/wtsapi32.c | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 32caa05588c..2023a21e938 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -192,6 +192,7 @@ static void test_WTSQuerySessionInformation(void) WCHAR *buf1, usernameW[UNLEN + 1], computernameW[MAX_COMPUTERNAME_LENGTH + 1]; char *buf2, username[UNLEN + 1], computername[MAX_COMPUTERNAME_LENGTH + 1]; DWORD count, tempsize; + USHORT *protocol; BOOL ret; SetLastError(0xdeadbeef); @@ -283,6 +284,15 @@ static void test_WTSQuerySessionInformation(void) ok(!stricmp(buf2, computername), "expected %s, got %s\n", computername, buf2); ok(count == tempsize + 1, "expected %lu, got %lu\n", tempsize + 1, count); WTSFreeMemory(buf2); + + count = 0; + protocol = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSClientProtocolType, + (char **)&protocol, &count); + ok(ret, "got %lu\n", GetLastError()); + ok(protocol != NULL, "protocol not set\n"); + ok(count == sizeof(*protocol), "got %lu\n", count); + WTSFreeMemory(protocol); } static void test_WTSQueryUserToken(void) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index e7a6297396a..7de1b8124ea 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -418,6 +418,18 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF return FALSE; } + if (class == WTSClientProtocolType) + { + USHORT *protocol; + + if (!(protocol = heap_alloc(sizeof(*protocol)))) return FALSE; + FIXME("returning 0 protocol type\n"); + *protocol = 0; + *buffer = (char *)protocol; + *count = sizeof(*protocol); + return TRUE; + } + if (!WTSQuerySessionInformationW(server, session_id, class, &bufferW, count)) return FALSE; @@ -458,6 +470,18 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF return FALSE; } + if (class == WTSClientProtocolType) + { + USHORT *protocol; + + if (!(protocol = heap_alloc(sizeof(*protocol)))) return FALSE; + FIXME("returning 0 protocol type\n"); + *protocol = 0; + *buffer = (WCHAR *)protocol; + *count = sizeof(*protocol); + return TRUE; + } + if (class == WTSUserName) { DWORD size = UNLEN + 1;

1 0

Robert Wilhelm : wshom.ocx: Implement IWshNetwork2_get_UserName().
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 895f8006f25244a2a09bb338d10856559ffd1b70 URL: https://gitlab.winehq.org/wine/wine/-/commit/895f8006f25244a2a09bb338d10856… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Dec 6 13:50:08 2022 +0100 wshom.ocx: Implement IWshNetwork2_get_UserName(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53971 --- dlls/wshom.ocx/network.c | 20 ++++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/wshom.ocx/network.c b/dlls/wshom.ocx/network.c index c33f4347762..42ed61ffe01 100644 --- a/dlls/wshom.ocx/network.c +++ b/dlls/wshom.ocx/network.c @@ -120,9 +120,25 @@ static HRESULT WINAPI WshNetwork2_get_UserDomain(IWshNetwork2 *iface, BSTR *user static HRESULT WINAPI WshNetwork2_get_UserName(IWshNetwork2 *iface, BSTR *user_name) { - FIXME("%p stub\n", user_name); + BOOL ret; + DWORD len = 0; + + TRACE("%p\n", user_name); + + GetUserNameW(NULL, &len); + *user_name = SysAllocStringLen(NULL, len-1); + if (!*user_name) + return E_OUTOFMEMORY; + + ret = GetUserNameW(*user_name, &len); + if (!ret) { + HRESULT hr = HRESULT_FROM_WIN32(GetLastError()); + SysFreeString(*user_name); + *user_name = NULL; + return hr; + } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI WshNetwork2_get_UserProfile(IWshNetwork2 *iface, BSTR *user_profile) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 5b3b7f81720..5212dd83b5c 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -692,7 +692,11 @@ static void test_popup(void) static void test_wshnetwork(void) { IDispatch *disp; + IWshNetwork2 *nw2; + BSTR str,username; HRESULT hr; + DWORD len = 0; + BOOL ret; hr = CoCreateInstance(&CLSID_WshNetwork, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IDispatch, (void**)&disp); @@ -703,6 +707,23 @@ static void test_wshnetwork(void) check_interface(disp, &IID_IDispatchEx, FALSE); check_interface(disp, &IID_IObjectWithSite, FALSE); + hr = IDispatch_QueryInterface(disp, &IID_IWshNetwork2, (void**)&nw2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + str = NULL; + hr = IWshNetwork2_get_UserName(nw2, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(str && str[0] != 0, "got empty string\n"); + CHECK_BSTR_LENGTH(str); + GetUserNameW(NULL, &len); + ok(len > 0, "Unexpected len %ld.\n", len); + username = SysAllocStringLen(NULL, len-1); + ret = GetUserNameW(username, &len); + ok(ret == TRUE, "GetUserNameW returned %d.\n", ret); + ok(!wcscmp(str,username), "user names do not match %s %s.\n", debugstr_w(str), debugstr_w(username)); + SysFreeString(username); + SysFreeString(str); + IDispatch_Release(disp); }

1 0

Hans Leidekker : winhttp/tests: Reduce send buffer size.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 3797a66404a80b33b5618189fa6630827eb78b8a URL: https://gitlab.winehq.org/wine/wine/-/commit/3797a66404a80b33b5618189fa6630… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 8 10:08:29 2022 +0100 winhttp/tests: Reduce send buffer size. It looks like there was a change on the websocket test server that causes our send operations to block. Reducing the size of the send buffer works around the test failures. The tests still succeed on Windows, which suggests that native sends large buffers in smaller chunks. --- dlls/winhttp/tests/notification.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index a9f782f5e3d..7c313370768 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -776,7 +776,7 @@ static const struct notification websocket_test5[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; -#define BIG_BUFFER_SIZE (32 * 1024) +#define BIG_BUFFER_SIZE (16 * 1024) static void test_websocket(BOOL secure) {

1 0

Alex Henrie : include: Add corecrt_malloc.h.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 926433faa325dd075f03b12d4831eae607bae7f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/926433faa325dd075f03b12d4831ea… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 7 22:14:11 2022 -0700 include: Add corecrt_malloc.h. --- include/Makefile.in | 1 + include/msvcrt/corecrt_malloc.h | 47 +++++++++++++++++++++++++++++++++++++++++ include/msvcrt/malloc.h | 14 +----------- include/msvcrt/stdlib.h | 5 +---- 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 27c06a30906..d0ae4b4667e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -474,6 +474,7 @@ SOURCES = \ msvcrt/conio.h \ msvcrt/corecrt.h \ msvcrt/corecrt_io.h \ + msvcrt/corecrt_malloc.h \ msvcrt/corecrt_startup.h \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ diff --git a/include/msvcrt/corecrt_malloc.h b/include/msvcrt/corecrt_malloc.h new file mode 100644 index 00000000000..1478a6a6c89 --- /dev/null +++ b/include/msvcrt/corecrt_malloc.h @@ -0,0 +1,47 @@ +/* + * Heap definitions + * + * Copyright 2001 Francois Gouget. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __WINE_CORECRT_MALLOC_H +#define __WINE_CORECRT_MALLOC_H + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +_ACRTIMP void* __cdecl calloc(size_t,size_t); +_ACRTIMP void __cdecl free(void*); +_ACRTIMP void* __cdecl malloc(size_t); +_ACRTIMP void* __cdecl realloc(void*,size_t); + +_ACRTIMP void* __cdecl _expand(void*,size_t); +_ACRTIMP size_t __cdecl _msize(void*); + +_ACRTIMP void __cdecl _aligned_free(void*); +_ACRTIMP void* __cdecl _aligned_malloc(size_t,size_t); +_ACRTIMP void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t); +_ACRTIMP void* __cdecl _aligned_realloc(void*,size_t,size_t); +_ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_CORECRT_MALLOC_H */ diff --git a/include/msvcrt/malloc.h b/include/msvcrt/malloc.h index fcbadbeb4e0..359ef4578e9 100644 --- a/include/msvcrt/malloc.h +++ b/include/msvcrt/malloc.h @@ -21,6 +21,7 @@ #define __WINE_MALLOC_H #include <corecrt.h> +#include <corecrt_malloc.h> /* heap function constants */ #define _HEAPEMPTY -1 @@ -54,25 +55,12 @@ extern unsigned int _amblksiz; extern "C" { #endif -_ACRTIMP void* __cdecl _expand(void*,size_t); _ACRTIMP int __cdecl _heapadd(void*,size_t); _ACRTIMP int __cdecl _heapchk(void); _ACRTIMP int __cdecl _heapmin(void); _ACRTIMP int __cdecl _heapset(unsigned int); _ACRTIMP size_t __cdecl _heapused(size_t*,size_t*); _ACRTIMP int __cdecl _heapwalk(_HEAPINFO*); -_ACRTIMP size_t __cdecl _msize(void*); - -_ACRTIMP void* __cdecl calloc(size_t,size_t); -_ACRTIMP void __cdecl free(void*); -_ACRTIMP void* __cdecl malloc(size_t); -_ACRTIMP void* __cdecl realloc(void*,size_t); - -_ACRTIMP void __cdecl _aligned_free(void*); -_ACRTIMP void* __cdecl _aligned_malloc(size_t,size_t); -_ACRTIMP void* __cdecl _aligned_offset_malloc(size_t,size_t,size_t); -_ACRTIMP void* __cdecl _aligned_realloc(void*,size_t,size_t); -_ACRTIMP void* __cdecl _aligned_offset_realloc(void*,size_t,size_t,size_t); _ACRTIMP size_t __cdecl _get_sbh_threshold(void); _ACRTIMP int __cdecl _set_sbh_threshold(size_t size); diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h index c52423523f7..e7dd2caefc4 100644 --- a/include/msvcrt/stdlib.h +++ b/include/msvcrt/stdlib.h @@ -8,6 +8,7 @@ #ifndef __WINE_STDLIB_H #define __WINE_STDLIB_H +#include <corecrt_malloc.h> #include <corecrt_wstdlib.h> #include <limits.h> @@ -208,23 +209,19 @@ _ACRTIMP int __cdecl atoi(const char*); _ACRTIMP int __cdecl _atoi_l(const char*,_locale_t); _ACRTIMP __msvcrt_long __cdecl atol(const char*); _ACRTIMP __int64 __cdecl atoll(const char*); -_ACRTIMP void* __cdecl calloc(size_t,size_t); #ifndef __i386__ _ACRTIMP div_t __cdecl div(int,int); _ACRTIMP ldiv_t __cdecl ldiv(__msvcrt_long,__msvcrt_long); #endif _ACRTIMP lldiv_t __cdecl lldiv(__int64,__int64); _ACRTIMP DECLSPEC_NORETURN void __cdecl exit(int); -_ACRTIMP void __cdecl free(void*); _ACRTIMP char* __cdecl getenv(const char*); _ACRTIMP __msvcrt_long __cdecl labs(__msvcrt_long); _ACRTIMP __int64 __cdecl llabs(__int64); -_ACRTIMP void* __cdecl malloc(size_t); _ACRTIMP int __cdecl mblen(const char*,size_t); _ACRTIMP void __cdecl perror(const char*); _ACRTIMP int __cdecl rand(void); _ACRTIMP errno_t __cdecl rand_s(unsigned int*); -_ACRTIMP void* __cdecl realloc(void*,size_t); _ACRTIMP void __cdecl srand(unsigned int); _ACRTIMP float __cdecl strtof(const char*,char**); _ACRTIMP double __cdecl strtod(const char*,char**);

1 0

Francois Gouget : kernel32/tests: Avoid failures when processes start during the process test.
by Alexandre Julliard Dec. 8, 2022

Dec. 8, 2022

Module: wine Branch: master Commit: 508b793ec915bae900edb42e10d7bf8d659cd32a URL: https://gitlab.winehq.org/wine/wine/-/commit/508b793ec915bae900edb42e10d7bf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Dec 8 03:39:39 2022 +0100 kernel32/tests: Avoid failures when processes start during the process test. On Windows processes sometimes start during test_services_exe() so that the size returned by the first NtQuerySystemInformation() is no longer sufficient for the second call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54094 --- dlls/kernel32/tests/process.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index a15f8dd1fa8..5ac6ed57bbe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4949,16 +4949,25 @@ static void test_job_list_attribute(HANDLE parent_job) static void test_services_exe(void) { NTSTATUS status; - ULONG size, offset; + ULONG size, offset, try; char *buf; SYSTEM_PROCESS_INFORMATION *spi; ULONG services_pid = 0, services_session_id = ~0; - status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); - ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); + /* Check that passing a zero size returns a size suitable for the next call, + * taking into account that in rare cases processes may start between the + * two NtQuerySystemInformation() calls. So this may require a few tries. + */ + for (try = 0; try < 3; try++) + { + status = NtQuerySystemInformation(SystemProcessInformation, NULL, 0, &size); + ok(status == STATUS_INFO_LENGTH_MISMATCH, "got %#lx\n", status); - buf = malloc(size); - status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + buf = malloc(size); + status = NtQuerySystemInformation(SystemProcessInformation, buf, size, &size); + if (status != STATUS_INFO_LENGTH_MISMATCH) break; + free(buf); + } ok(status == STATUS_SUCCESS, "got %#lx\n", status); spi = (SYSTEM_PROCESS_INFORMATION *)buf;

1 0