September 2022 - Wine-Commits

Nikolay Sivov : cryptowinrt: Implement GenerateRandomNumber().
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 5e0acc095d67eceb58131e5daa753a4237261a9e URL: https://gitlab.winehq.org/wine/wine/-/commit/5e0acc095d67eceb58131e5daa753a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 19 22:40:19 2022 +0300 cryptowinrt: Implement GenerateRandomNumber(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/cryptowinrt/Makefile.in | 2 +- dlls/cryptowinrt/main.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/cryptowinrt/Makefile.in b/dlls/cryptowinrt/Makefile.in index 0129e83fb63..192ef49f178 100644 --- a/dlls/cryptowinrt/Makefile.in +++ b/dlls/cryptowinrt/Makefile.in @@ -1,5 +1,5 @@ MODULE = cryptowinrt.dll -IMPORTS = combase uuid +IMPORTS = combase bcrypt uuid C_SRCS = \ main.c diff --git a/dlls/cryptowinrt/main.c b/dlls/cryptowinrt/main.c index 811975d8d79..720b137e4a9 100644 --- a/dlls/cryptowinrt/main.c +++ b/dlls/cryptowinrt/main.c @@ -29,6 +29,8 @@ #include "initguid.h" #include "activation.h" +#include "bcrypt.h" + #define WIDL_using_Windows_Foundation #define WIDL_using_Windows_Foundation_Collections #include "windows.foundation.h" @@ -214,9 +216,10 @@ static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GenerateRandom( static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_GenerateRandomNumber( ICryptographicBufferStatics *iface, UINT32 *value) { - FIXME("iface %p, value %p stub!\n", iface, value); + TRACE("iface %p, value %p.\n", iface, value); - return E_NOTIMPL; + BCryptGenRandom(NULL, (UCHAR *)value, sizeof(*value), BCRYPT_USE_SYSTEM_PREFERRED_RNG); + return S_OK; } static HRESULT STDMETHODCALLTYPE cryptobuffer_statics_CreateFromByteArray(

1 0

Jacek Caban : winemac: Implement wow64 thunks.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 9128587e4b40fb5e1aeda3f218f266296c7437eb URL: https://gitlab.winehq.org/wine/wine/-/commit/9128587e4b40fb5e1aeda3f218f266… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 18 02:18:55 2022 +0200 winemac: Implement wow64 thunks. --- dlls/winemac.drv/macdrv_main.c | 134 ++++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/unixlib.h | 2 +- 2 files changed, 133 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 1f8ea268f45..2350ec61b21 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -32,6 +32,7 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "macdrv.h" +#include "shellapi.h" #include "wine/server.h" WINE_DEFAULT_DEBUG_CHANNEL(macdrv); @@ -413,12 +414,13 @@ static void load_strings(struct localized_string *str) { if (str->str && str->len) { + const UniChar *ptr = param_ptr(str->str); CFNumberRef key = CFNumberCreate(NULL, kCFNumberIntType, &str->id); - CFStringRef value = CFStringCreateWithCharacters(NULL, (UniChar*)str->str, str->len); + CFStringRef value = CFStringCreateWithCharacters(NULL, ptr, str->len); if (key && value) CFDictionarySetValue(dict, key, value); else - ERR("Failed to add string ID 0x%04x %s\n", str->id, debugstr_wn(str->str, str->len)); + ERR("Failed to add string ID 0x%04x %s\n", str->id, debugstr_wn(ptr, str->len)); } else ERR("Failed to load string ID 0x%04x\n", str->id); @@ -653,3 +655,131 @@ const unixlib_entry_t __wine_unix_call_funcs[] = }; C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + +#ifdef _WIN64 + +static NTSTATUS wow64_dnd_get_data(void *arg) +{ + struct + { + UINT64 handle; + UINT format; + ULONG size; + ULONG data; + } *params32 = arg; + struct dnd_get_data_params params; + + params.handle = params32->handle; + params.format = params32->format; + params.size = params32->size; + params.data = UlongToPtr(params32->data); + return macdrv_dnd_get_data(&params); +} + +static NTSTATUS wow64_ime_process_text_input(void *arg) +{ + struct + { + UINT vkey; + UINT scan; + UINT repeat; + ULONG key_state; + ULONG himc; + ULONG done; + } *params32 = arg; + struct process_text_input_params params; + + params.vkey = params32->vkey; + params.scan = params32->scan; + params.repeat = params32->repeat; + params.key_state = UlongToPtr(params32->key_state); + params.himc = UlongToPtr(params32->himc); + params.done = UlongToPtr(params32->done); + return macdrv_ime_process_text_input(&params); +} + +static NTSTATUS wow64_init(void *arg) +{ + struct + { + ULONG strings; + } *params32 = arg; + struct init_params params; + + params.strings = UlongToPtr(params32->strings); + return macdrv_init(&params); +} + +static NTSTATUS wow64_notify_icon(void *arg) +{ + struct + { + DWORD msg; + ULONG data; + } *params32 = arg; + struct + { + DWORD cbSize; + ULONG hWnd; + UINT uID; + UINT uFlags; + UINT uCallbackMessage; + ULONG hIcon; + WCHAR szTip[128]; + DWORD dwState; + DWORD dwStateMask; + WCHAR szInfo[256]; + UINT uTimeout; + WCHAR szInfoTitle[64]; + DWORD dwInfoFlags; + GUID guidItem; + ULONG hBalloonIcon; + } *data32 = UlongToPtr(params32->data); + + struct notify_icon_params params; + NOTIFYICONDATAW data; + + params.msg = params32->msg; + params.data = &data; + + data.cbSize = sizeof(data); + data.hWnd = UlongToHandle(data32->hWnd); + data.uID = data32->uID; + data.uFlags = data32->uFlags; + data.uCallbackMessage = data32->uCallbackMessage; + data.hIcon = UlongToHandle(data32->hIcon); + if (data.uFlags & NIF_TIP) + wcscpy(data.szTip, data32->szTip); + data.dwState = data32->dwState; + data.dwStateMask = data32->dwStateMask; + if (data.uFlags & NIF_INFO) + { + wcscpy(data.szInfoTitle, data32->szInfoTitle); + wcscpy(data.szInfo, data32->szInfo); + data.uTimeout = data32->uTimeout; + data.dwInfoFlags = data32->dwInfoFlags; + } + data.guidItem = data32->guidItem; + data.hBalloonIcon = UlongToHandle(data32->hBalloonIcon); + + return macdrv_notify_icon(&params); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + wow64_dnd_get_data, + macdrv_dnd_get_formats, + macdrv_dnd_have_format, + macdrv_dnd_release, + macdrv_dnd_retain, + macdrv_ime_clear, + wow64_ime_process_text_input, + macdrv_ime_using_input_method, + wow64_init, + wow64_notify_icon, + macdrv_quit_result, +}; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + +#endif /* _WIN64 */ diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h index 3ebd0ceb48a..5fe19a94fee 100644 --- a/dlls/winemac.drv/unixlib.h +++ b/dlls/winemac.drv/unixlib.h @@ -77,7 +77,7 @@ struct localized_string { UINT id; UINT len; - const WCHAR *str; + UINT64 str; }; struct init_params

1 0

Jacek Caban : winemac: Use platform-independent types for user callback params.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 1b69aae3f45666cb3fd72ea8fcd3a739cac068f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1b69aae3f45666cb3fd72ea8fcd3a7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 17 19:04:26 2022 +0200 winemac: Use platform-independent types for user callback params. --- dlls/winemac.drv/dllmain.c | 13 +++++++------ dlls/winemac.drv/dragdrop.c | 6 +++--- dlls/winemac.drv/event.c | 16 ++++++++-------- dlls/winemac.drv/image.c | 9 +++++---- dlls/winemac.drv/ime.c | 11 ++++++----- dlls/winemac.drv/unixlib.h | 27 ++++++++++++++++----------- 6 files changed, 45 insertions(+), 37 deletions(-)

1 0

Jacek Caban : win32u: Introduce NtUserSendDriverMessage.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 4467589a4a52207098cf786b55b960881b5d6ccf URL: https://gitlab.winehq.org/wine/wine/-/commit/4467589a4a52207098cf786b55b960… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Sep 17 18:52:24 2022 +0200 win32u: Introduce NtUserSendDriverMessage. And use it in display drivers. --- dlls/win32u/message.c | 4 ++++ dlls/winemac.drv/macdrv.h | 2 +- dlls/winex11.drv/x11drv.h | 2 +- include/ntuser.h | 9 +++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 57e9b26b33d..51967d2598a 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -3209,6 +3209,10 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa else RtlSetLastWin32Error( ERROR_MESSAGE_SYNC_ONLY ); return FALSE; + case NtUserSendDriverMessage: + /* used by driver to send packed messages */ + return send_message( hwnd, msg, wparam, lparam ); + case NtUserSpyEnter: spy_enter_message( ansi, hwnd, msg, wparam, lparam ); return 0; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 1b7e6318f1a..ada7ca35587 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -289,7 +289,7 @@ extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *pa static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE); + return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendDriverMessage, FALSE); } static inline LRESULT send_message_timeout(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 07bdd7610d5..8721360536f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -861,7 +861,7 @@ static inline UINT get_palette_entries( HPALETTE palette, UINT start, UINT count static inline LRESULT send_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE ); + return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, NtUserSendDriverMessage, FALSE ); } static inline LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, diff --git a/include/ntuser.h b/include/ntuser.h index 961d34d4db6..d724ccad103 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,10 +297,11 @@ enum /* Wine-specific exports */ NtUserClipboardWindowProc = 0x0300, NtUserGetDispatchParams = 0x3001, - NtUserSpyGetMsgName = 0x3002, - NtUserSpyEnter = 0x0303, - NtUserSpyExit = 0x0304, - NtUserWinProcResult = 0x0305, + NtUserSendDriverMessage = 0x3002, + NtUserSpyGetMsgName = 0x3003, + NtUserSpyEnter = 0x0304, + NtUserSpyExit = 0x0305, + NtUserWinProcResult = 0x0306, }; /* NtUserThunkedMenuItemInfo codes */

1 0

Hans Leidekker : adsldp/tests: Limit the number of search results.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 4f9e80de0f38422156ca06baf47ac9614362be5d URL: https://gitlab.winehq.org/wine/wine/-/commit/4f9e80de0f38422156ca06baf47ac9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 10:51:05 2022 +0200 adsldp/tests: Limit the number of search results. --- dlls/adsldp/tests/ldap.c | 61 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 558dc02c0c5..8010837243e 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -226,7 +226,7 @@ static void do_search(const struct search *s) { HRESULT hr; IDirectorySearch *ds; - ADS_SEARCHPREF_INFO pref; + ADS_SEARCHPREF_INFO pref[2]; ADS_SEARCH_HANDLE sh; ADS_SEARCH_COLUMN col; LPWSTR name; @@ -242,13 +242,20 @@ static void do_search(const struct search *s) } ok(hr == S_OK, "got %#lx\n", hr); - pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; - pref.vValue.dwType = ADSTYPE_INTEGER; - pref.vValue.Integer = s->scope; - pref.dwStatus = 0xdeadbeef; - hr = IDirectorySearch_SetSearchPreference(ds, &pref, 1); + pref[0].dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref[0].vValue.dwType = ADSTYPE_INTEGER; + pref[0].vValue.Integer = s->scope; + pref[0].dwStatus = 0xdeadbeef; + + pref[1].dwSearchPref = ADS_SEARCHPREF_SIZE_LIMIT; + pref[1].vValue.dwType = ADSTYPE_INTEGER; + pref[1].vValue.Integer = 5; + pref[1].dwStatus = 0xdeadbeef; + + hr = IDirectorySearch_SetSearchPreference(ds, pref, ARRAY_SIZE(pref)); ok(hr == S_OK, "got %#lx\n", hr); - ok(pref.dwStatus == ADS_STATUS_S_OK, "got %d\n", pref.dwStatus); + ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %u\n", pref[0].dwStatus); + ok(pref[1].dwStatus == ADS_STATUS_S_OK, "got %u\n", pref[1].dwStatus); hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == S_OK, "got %#lx\n", hr); @@ -346,7 +353,7 @@ static void test_DirectorySearch(void) }; HRESULT hr; IDirectorySearch *ds; - ADS_SEARCHPREF_INFO pref; + ADS_SEARCHPREF_INFO pref[2]; ADS_SEARCH_HANDLE sh; ADS_SEARCH_COLUMN col; LPWSTR name; @@ -370,13 +377,20 @@ static void test_DirectorySearch(void) } ok(hr == S_OK, "got %#lx\n", hr); - pref.dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; - pref.vValue.dwType = ADSTYPE_INTEGER; - pref.vValue.Integer = ADS_SCOPE_BASE; - pref.dwStatus = 0xdeadbeef; - hr = IDirectorySearch_SetSearchPreference(ds, &pref, 1); + pref[0].dwSearchPref = ADS_SEARCHPREF_SEARCH_SCOPE; + pref[0].vValue.dwType = ADSTYPE_INTEGER; + pref[0].vValue.Integer = ADS_SCOPE_BASE; + pref[0].dwStatus = 0xdeadbeef; + + pref[1].dwSearchPref = ADS_SEARCHPREF_SIZE_LIMIT; + pref[1].vValue.dwType = ADSTYPE_INTEGER; + pref[1].vValue.Integer = 5; + pref[1].dwStatus = 0xdeadbeef; + + hr = IDirectorySearch_SetSearchPreference(ds, pref, ARRAY_SIZE(pref)); ok(hr == S_OK, "got %#lx\n", hr); - ok(pref.dwStatus == ADS_STATUS_S_OK, "got %d\n", pref.dwStatus); + ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %u\n", pref[0].dwStatus); + ok(pref[1].dwStatus == ADS_STATUS_S_OK, "got %u\n", pref[1].dwStatus); hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, NULL); ok(hr == E_ADS_BAD_PARAMETER, "got %#lx\n", hr); @@ -475,7 +489,7 @@ static void test_DirectoryObject(void) IDirectoryObject *dirobj; IUnknown *unk; IDirectorySearch *ds; - ADS_SEARCHPREF_INFO pref[2]; + ADS_SEARCHPREF_INFO pref[3]; ADS_SEARCH_HANDLE sh; ADS_SEARCH_COLUMN col; @@ -504,15 +518,23 @@ static void test_DirectoryObject(void) pref[0].vValue.dwType = ADSTYPE_INTEGER; pref[0].vValue.Integer = ADS_SCOPE_BASE; pref[0].dwStatus = 0xdeadbeef; + pref[1].dwSearchPref = ADS_SEARCHPREF_SECURITY_MASK; pref[1].vValue.dwType = ADSTYPE_INTEGER; pref[1].vValue.Integer = ADS_SECURITY_INFO_OWNER | ADS_SECURITY_INFO_GROUP | ADS_SECURITY_INFO_DACL; pref[1].dwStatus = 0xdeadbeef; + + pref[2].dwSearchPref = ADS_SEARCHPREF_SIZE_LIMIT; + pref[2].vValue.dwType = ADSTYPE_INTEGER; + pref[2].vValue.Integer = 5; + pref[2].dwStatus = 0xdeadbeef; + hr = IDirectorySearch_SetSearchPreference(ds, pref, ARRAY_SIZE(pref)); ok(hr == S_ADS_ERRORSOCCURRED, "got %#lx\n", hr); ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[0].dwStatus); /* ldap.forumsys.com doesn't support NT security, real ADs DC - does */ ok(pref[1].dwStatus == ADS_STATUS_INVALID_SEARCHPREF, "got %d\n", pref[1].dwStatus); + ok(pref[2].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[2].dwStatus); hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == S_OK, "got %#lx\n", hr); @@ -530,9 +552,16 @@ static void test_DirectoryObject(void) pref[0].vValue.dwType = ADSTYPE_BOOLEAN; pref[0].vValue.Integer = 1; pref[0].dwStatus = 0xdeadbeef; - hr = IDirectorySearch_SetSearchPreference(ds, pref, 1); + + pref[1].dwSearchPref = ADS_SEARCHPREF_SIZE_LIMIT; + pref[1].vValue.dwType = ADSTYPE_INTEGER; + pref[1].vValue.Integer = 5; + pref[1].dwStatus = 0xdeadbeef; + + hr = IDirectorySearch_SetSearchPreference(ds, pref, 2); ok(hr == S_OK, "got %#lx\n", hr); ok(pref[0].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[0].dwStatus); + ok(pref[1].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[1].dwStatus); hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == HRESULT_FROM_WIN32(ERROR_DS_UNAVAILABLE_CRIT_EXTENSION) || broken(hr == S_OK) /* XP */, "got %#lx\n", hr);

1 0

Hans Leidekker : adsldp/tests: Get rid of workarounds for Windows XP.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: fa058bc3f0eab2039b98696e3816205a9cb7a0ac URL: https://gitlab.winehq.org/wine/wine/-/commit/fa058bc3f0eab2039b98696e381620… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 11:36:49 2022 +0200 adsldp/tests: Get rid of workarounds for Windows XP. --- dlls/adsldp/tests/ldap.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 8010837243e..23cca695c3a 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -395,11 +395,8 @@ static void test_DirectorySearch(void) hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, NULL); ok(hr == E_ADS_BAD_PARAMETER, "got %#lx\n", hr); - if (0) /* crashes under XP */ - { hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, 1, &sh); ok(hr == E_ADS_BAD_PARAMETER, "got %#lx\n", hr); - } hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); ok(hr == S_OK, "got %#lx\n", hr); @@ -435,8 +432,8 @@ static void test_DirectorySearch(void) name = (void *)0xdeadbeef; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); - ok(hr == S_ADS_NOMORE_COLUMNS || broken(hr == S_OK) /* XP */, "got %#lx\n", hr); - ok(name == NULL || broken(name && !wcscmp(name, L"ADsPath")) /* XP */, "got %p/%s\n", name, wine_dbgstr_w(name)); + ok(hr == S_ADS_NOMORE_COLUMNS, "got %#lx\n", hr); + ok(name == NULL, "got %p/%s\n", name, wine_dbgstr_w(name)); } hr = IDirectorySearch_GetNextRow(ds, sh); @@ -445,21 +442,18 @@ static void test_DirectorySearch(void) name = NULL; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); todo_wine - ok(hr == S_OK || broken(hr == S_ADS_NOMORE_COLUMNS) /* XP */, "got %#lx\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); todo_wine - ok((name && !wcscmp(name, L"ADsPath")) || broken(!name) /* XP */, "got %s\n", wine_dbgstr_w(name)); + ok(name && !wcscmp(name, L"ADsPath"), "got %s\n", wine_dbgstr_w(name)); FreeADsMem(name); name = (void *)0xdeadbeef; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); - ok(hr == S_ADS_NOMORE_COLUMNS || broken(hr == S_OK) /* XP */, "got %#lx\n", hr); - ok(name == NULL || broken(name && !wcscmp(name, L"ADsPath")) /* XP */, "got %p/%s\n", name, wine_dbgstr_w(name)); + ok(hr == S_ADS_NOMORE_COLUMNS, "got %#lx\n", hr); + ok(name == NULL, "got %p/%s\n", name, wine_dbgstr_w(name)); - if (0) /* crashes under XP */ - { hr = IDirectorySearch_GetColumn(ds, sh, NULL, &col); ok(hr == E_ADS_BAD_PARAMETER, "got %#lx\n", hr); - } hr = IDirectorySearch_GetFirstRow(ds, sh); ok(hr == S_OK, "got %#lx\n", hr); @@ -467,8 +461,8 @@ static void test_DirectorySearch(void) memset(&col, 0x55, sizeof(col)); hr = IDirectorySearch_GetColumn(ds, sh, (WCHAR *)L"deadbeef", &col); ok(hr == E_ADS_COLUMN_NOT_SET, "got %#lx\n", hr); - ok(!col.pszAttrName || broken(col.pszAttrName != NULL) /* XP */, "got %p\n", col.pszAttrName); - ok(col.dwADsType == ADSTYPE_INVALID || broken(col.dwADsType != ADSTYPE_INVALID) /* XP */, "got %d\n", col.dwADsType); + ok(!col.pszAttrName, "got %p\n", col.pszAttrName); + ok(col.dwADsType == ADSTYPE_INVALID, "got %d\n", col.dwADsType); ok(!col.pADsValues, "got %p\n", col.pADsValues); ok(!col.dwNumValues, "got %lu\n", col.dwNumValues); ok(!col.hReserved, "got %p\n", col.hReserved); @@ -564,7 +558,7 @@ static void test_DirectoryObject(void) ok(pref[1].dwStatus == ADS_STATUS_S_OK, "got %d\n", pref[1].dwStatus); hr = IDirectorySearch_ExecuteSearch(ds, (WCHAR *)L"(objectClass=*)", NULL, ~0, &sh); - ok(hr == HRESULT_FROM_WIN32(ERROR_DS_UNAVAILABLE_CRIT_EXTENSION) || broken(hr == S_OK) /* XP */, "got %#lx\n", hr); + todo_wine ok(hr == S_OK, "got %#lx\n", hr); if (hr == S_OK) { hr = IDirectorySearch_GetNextRow(ds, sh);

1 0

Hans Leidekker : adsldp: Implement ADS_SEARCHPREF_SIZE_LIMIT.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 2281b06766674557175774816cac4a66576fd928 URL: https://gitlab.winehq.org/wine/wine/-/commit/2281b06766674557175774816cac4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 20 10:49:12 2022 +0200 adsldp: Implement ADS_SEARCHPREF_SIZE_LIMIT. --- dlls/adsldp/adsldp.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c79a77211f3..115c7cfb77e 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -400,6 +400,7 @@ typedef struct { ADS_SCOPEENUM scope; int pagesize; + int size_limit; BOOL cache_results; BOOL attribtypes_only; BOOL tombstone; @@ -1272,6 +1273,19 @@ static HRESULT WINAPI search_SetSearchPreference(IDirectorySearch *iface, PADS_S prefs[i].dwStatus = ADS_STATUS_S_OK; break; + case ADS_SEARCHPREF_SIZE_LIMIT: + if (prefs[i].vValue.dwType != ADSTYPE_INTEGER) + { + FIXME("ADS_SEARCHPREF_SIZE_LIMIT: unsupported dwType %d\n", prefs[i].vValue.dwType); + prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREFVALUE; + break; + } + + TRACE("SIZE_LIMIT: %ld\n", prefs[i].vValue.u.Integer); + ldap->search.size_limit = prefs[i].vValue.u.Integer; + prefs[i].dwStatus = ADS_STATUS_S_OK; + break; + default: FIXME("pref %d, type %u: stub\n", prefs[i].dwSearchPref, prefs[i].vValue.dwType); prefs[i].dwStatus = ADS_STATUS_INVALID_SEARCHPREF; @@ -1339,7 +1353,7 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte { ldap_ctx->page = ldap_search_init_pageW(ldap->ld, ldap->object, ldap->search.scope, filter, props, ldap->search.attribtypes_only, - ctrls, NULL, 0, 0, NULL); + ctrls, NULL, 0, ldap->search.size_limit, NULL); if (ldap_ctx->page) err = ldap_get_next_page_s(ldap->ld, ldap_ctx->page, NULL, ldap->search.pagesize, &count, &ldap_ctx->res); @@ -1348,7 +1362,8 @@ static HRESULT WINAPI search_ExecuteSearch(IDirectorySearch *iface, LPWSTR filte } else err = ldap_search_ext_sW(ldap->ld, ldap->object, ldap->search.scope, filter, props, - ldap->search.attribtypes_only, ctrls, NULL, NULL, 0, &ldap_ctx->res); + ldap->search.attribtypes_only, ctrls, NULL, NULL, ldap->search.size_limit, + &ldap_ctx->res); heap_free(props); if (err != LDAP_SUCCESS) { @@ -1972,6 +1987,7 @@ static HRESULT LDAPNamespace_create(REFIID riid, void **obj) ldap->attrs = NULL; ldap->search.scope = ADS_SCOPE_SUBTREE; ldap->search.pagesize = 0; + ldap->search.size_limit = 0; ldap->search.cache_results = TRUE; ldap->search.attribtypes_only = FALSE; ldap->search.tombstone = FALSE;

1 0

Nikolay Sivov : cryptowinrt: Add a stub module.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 09cb9cd1c6addb21d6a7e0cbb03694c75c482020 URL: https://gitlab.winehq.org/wine/wine/-/commit/09cb9cd1c6addb21d6a7e0cbb03694… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 19 22:26:56 2022 +0300 cryptowinrt: Add a stub module. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 2 + configure.ac | 1 + dlls/cryptowinrt/Makefile.in | 7 + dlls/cryptowinrt/classes.idl | 21 +++ dlls/cryptowinrt/cryptowinrt.spec | 3 + dlls/cryptowinrt/main.c | 339 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 373 insertions(+)

1 0

Zebediah Figura : ntdll: Add a fast path for NtDeviceIoControlFile(INVALID_HANDLE_VALUE).
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: d0f34c232abb07c0e679d92917254c2f05b001c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d0f34c232abb07c0e679d92917254c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 19 23:31:43 2022 -0500 ntdll: Add a fast path for NtDeviceIoControlFile(INVALID_HANDLE_VALUE). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53706 --- dlls/ntdll/unix/file.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b31ce4fbb3d..7eb8dbe7ad4 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5760,6 +5760,11 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT TRACE( "(%p,%p,%p,%p,%p,0x%08x,%p,0x%08x,%p,0x%08x)\n", handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); + /* some broken applications call this frequently with INVALID_HANDLE_VALUE, + * and run slowly if we make a server call every time */ + if (HandleToLong( handle ) == ~0) + return STATUS_INVALID_HANDLE; + switch (device) { case FILE_DEVICE_BEEP:

1 0

Connor McAdams : uiautomationcore: Shutdown provider thread when all returned nodes are released.
by Alexandre Julliard Sept. 20, 2022

Sept. 20, 2022

Module: wine Branch: master Commit: 858596bbd5dadee8eb877195f1e9152579448299 URL: https://gitlab.winehq.org/wine/wine/-/commit/858596bbd5dadee8eb877195f1e915… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 12 11:42:20 2022 -0400 uiautomationcore: Shutdown provider thread when all returned nodes are released. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 18 +++--------------- dlls/uiautomationcore/uia_private.h | 20 ++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 22 +++++++++++++++++++++- 3 files changed, 44 insertions(+), 16 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 0ff01eba5af..c1fb880c9f1 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -269,21 +269,6 @@ static IRawElementProviderSimple *get_provider_hwnd_fragment_root(IRawElementPro /* * IWineUiaNode interface. */ -struct uia_node { - IWineUiaNode IWineUiaNode_iface; - LONG ref; - - IWineUiaProvider *prov; - DWORD git_cookie; - - HWND hwnd; -}; - -static inline struct uia_node *impl_from_IWineUiaNode(IWineUiaNode *iface) -{ - return CONTAINING_RECORD(iface, struct uia_node, IWineUiaNode_iface); -} - static HRESULT WINAPI uia_node_QueryInterface(IWineUiaNode *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -328,6 +313,9 @@ static ULONG WINAPI uia_node_Release(IWineUiaNode *iface) } IWineUiaProvider_Release(node->prov); + if (node->nested_node) + uia_stop_provider_thread(); + heap_free(node); } diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index f92d4bd3721..1efc8fbd1e4 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -29,4 +29,24 @@ enum uia_prop_type { PROP_TYPE_SPECIAL, }; +struct uia_node { + IWineUiaNode IWineUiaNode_iface; + LONG ref; + + IWineUiaProvider *prov; + DWORD git_cookie; + + HWND hwnd; + BOOL nested_node; +}; + +static inline struct uia_node *impl_from_IWineUiaNode(IWineUiaNode *iface) +{ + return CONTAINING_RECORD(iface, struct uia_node, IWineUiaNode_iface); +} + +/* uia_ids.c */ const struct uia_prop_info *uia_prop_info_from_id(PROPERTYID prop_id) DECLSPEC_HIDDEN; + +/* uia_provider.c */ +void uia_stop_provider_thread(void) DECLSPEC_HIDDEN; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index f1d175ad4c1..7b4a6be4042 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1132,6 +1132,7 @@ struct uia_provider_thread { HANDLE hthread; HWND hwnd; + LONG ref; }; static struct uia_provider_thread provider_thread; @@ -1145,6 +1146,7 @@ static CRITICAL_SECTION_DEBUG provider_thread_cs_debug = static CRITICAL_SECTION provider_thread_cs = { &provider_thread_cs_debug, -1, 0, 0, 0, 0 }; #define WM_GET_OBJECT_UIA_NODE (WM_USER + 1) +#define WM_UIA_PROVIDER_THREAD_STOP (WM_USER + 2) static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -1153,8 +1155,12 @@ static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM case WM_GET_OBJECT_UIA_NODE: { HUIANODE node = (HUIANODE)lparam; + struct uia_node *node_data; LRESULT lr; + node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); + node_data->nested_node = TRUE; + /* * LresultFromObject returns an index into the global atom string table, * which has a valid range of 0xc000-0xffff. @@ -1204,6 +1210,8 @@ static DWORD WINAPI uia_provider_thread_proc(void *arg) TRACE("Provider thread started.\n"); while (GetMessageW(&msg, NULL, 0, 0)) { + if (msg.message == WM_UIA_PROVIDER_THREAD_STOP) + break; TranslateMessage(&msg); DispatchMessageW(&msg); } @@ -1220,7 +1228,7 @@ static BOOL uia_start_provider_thread(void) BOOL started = TRUE; EnterCriticalSection(&provider_thread_cs); - if (!provider_thread.hwnd) + if (++provider_thread.ref == 1) { HANDLE ready_event; HANDLE events[2]; @@ -1261,6 +1269,18 @@ exit: return started; } +void uia_stop_provider_thread(void) +{ + EnterCriticalSection(&provider_thread_cs); + if (!--provider_thread.ref) + { + PostMessageW(provider_thread.hwnd, WM_UIA_PROVIDER_THREAD_STOP, 0, 0); + CloseHandle(provider_thread.hthread); + memset(&provider_thread, 0, sizeof(provider_thread)); + } + LeaveCriticalSection(&provider_thread_cs); +} + /* * Pass our IWineUiaNode interface to the provider thread for marshaling. UI * Automation has to work regardless of whether or not COM is initialized on

1 0