March 2023 - Wine-Commits - list.winehq.org

Hans Leidekker : wininet: Always reset the second input buffer in netcon_secure_connect_setup().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: f7e092d5ca0f1a7c360b8e911f9e4c903656d144 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e092d5ca0f1a7c360b8e911f9e4c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 6 10:32:18 2022 +0200 wininet: Always reset the second input buffer in netcon_secure_connect_setup(). (cherry picked from commit f83a66f052162c1e0db6121128fe7e804ac15ee1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/netconnection.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 4280d4ddf43..642268c3aba 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -493,14 +493,12 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode memmove(read_buf, (BYTE*)in_bufs[0].pvBuffer+in_bufs[0].cbBuffer-in_bufs[1].cbBuffer, in_bufs[1].cbBuffer); in_bufs[0].cbBuffer = in_bufs[1].cbBuffer; - - in_bufs[1].BufferType = SECBUFFER_EMPTY; - in_bufs[1].cbBuffer = 0; - in_bufs[1].pvBuffer = NULL; } assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); in_bufs[1].BufferType = SECBUFFER_EMPTY; + in_bufs[1].cbBuffer = 0; + in_bufs[1].pvBuffer = NULL; if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf;

1 0

Hans Leidekker : wininet: Remove assertion that is no longer valid in Windows 10.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 92a8451b9384709cd9214dd548a9a1fab77445be URL: https://gitlab.winehq.org/wine/wine/-/commit/92a8451b9384709cd9214dd548a9a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:55:52 2022 +0200 wininet: Remove assertion that is no longer valid in Windows 10. (cherry picked from commit fc701aa14ce8c1d7aeb3b3d9b35edd1cd860c9ef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/netconnection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 71ce3401cdd..4280d4ddf43 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -500,7 +500,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); - assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + in_bufs[1].BufferType = SECBUFFER_EMPTY; if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf;

1 0

Alistair Leslie-Hughes : ntdll/tests: Add RtlFirstFreeAce tests.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 925b15e28858fe808cd1392ca64cabaf96be4638 URL: https://gitlab.winehq.org/wine/wine/-/commit/925b15e28858fe808cd1392ca64cab… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jul 11 14:19:41 2022 +1000 ntdll/tests: Add RtlFirstFreeAce tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> (cherry picked from commit d70273363be2e2abc5d5af17341a7e6a31156abb) Conflicts: dlls/ntdll/tests/rtl.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index c0168884a0a..5fcf958d3b9 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3682,6 +3682,54 @@ static void test_RtlDestroyHeap(void) RtlRemoveVectoredExceptionHandler( handler ); } +static void test_RtlFirstFreeAce(void) +{ + PACL acl; + PACE_HEADER first; + BOOL ret; + DWORD size; + BOOLEAN found; + + size = sizeof(ACL) + (sizeof(ACCESS_ALLOWED_ACE)); + acl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + ret = InitializeAcl(acl, sizeof(ACL), ACL_REVISION); + ok(ret, "InitializeAcl failed with error %d\n", GetLastError()); + + /* AceCount = 0 */ + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(found, "RtlFirstFreeAce failed\n"); + ok(first == (PACE_HEADER)(acl + 1), "Failed to find ACL\n"); + + acl->AclSize = sizeof(ACL) - 1; + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(found, "RtlFirstFreeAce failed\n"); + ok(first == NULL, "Found FirstAce = %p\n", first); + + /* AceCount = 1 */ + acl->AceCount = 1; + acl->AclSize = size; + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(found, "RtlFirstFreeAce failed\n"); + ok(first == (PACE_HEADER)(acl + 1), "Failed to find ACL %p, %p\n", first, (PACE_HEADER)(acl + 1)); + + acl->AclSize = sizeof(ACL) - 1; + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(!found, "RtlFirstFreeAce failed\n"); + ok(first == NULL, "Found FirstAce = %p\n", first); + + acl->AclSize = sizeof(ACL); + first = (ACE_HEADER *)0xdeadbeef; + found = RtlFirstFreeAce(acl, &first); + ok(!found, "RtlFirstFreeAce failed\n"); + ok(first == NULL, "Found FirstAce = %p\n", first); + + HeapFree(GetProcessHeap(), 0, acl); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3725,4 +3773,5 @@ START_TEST(rtl) test_LdrRegisterDllNotification(); test_DbgPrint(); test_RtlDestroyHeap(); + test_RtlFirstFreeAce(); }

1 0

Zhiyi Zhang : shell32: Implement SHOpenFolderAndSelectItems().
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 8d922aadb38385d3833db64f7817d0aaaf47cb05 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d922aadb38385d3833db64f7817d0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 8 17:13:49 2022 +0800 shell32: Implement SHOpenFolderAndSelectItems(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39987 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit c03409e9d782ccd96ce4f14913814acc0184ee43) Conflicts: dlls/shell32/shlfolder.c dlls/shell32/tests/shlfolder.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfolder.c | 138 ++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 11 ---- programs/explorer/explorer.c | 39 ++++++++++++ 3 files changed, 175 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index b70bfbda4c7..b98c57e7d4d 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -615,8 +615,142 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObje HRESULT WINAPI SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD flags) { - FIXME("%p %u %p 0x%x: stub\n", pidlFolder, cidl, apidl, flags); - return E_NOTIMPL; + static const unsigned int magic = 0xe32ee32e; + unsigned int i, uint_flags, size, child_count = 0; + const ITEMIDLIST *pidl_parent, *pidl_child; + VARIANT var_parent, var_empty; + ITEMIDLIST *pidl_tmp = NULL; + SHELLEXECUTEINFOW sei = {0}; + COPYDATASTRUCT cds = {0}; + IDispatch *dispatch; + int timeout = 1000; + unsigned char *ptr; + IShellWindows *sw; + BOOL ret = FALSE; + HRESULT hr; + LONG hwnd; + + TRACE("%p %u %p 0x%x\n", pidlFolder, cidl, apidl, flags); + + if (!pidlFolder) + return E_INVALIDARG; + + if (flags & OFASI_OPENDESKTOP) + FIXME("Ignoring unsupported OFASI_OPENDESKTOP flag.\n"); + + if (flags & OFASI_EDIT && cidl > 1) + flags &= ~OFASI_EDIT; + + hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, + (void **)&sw); + if (FAILED(hr)) + return hr; + + if (!cidl) + { + pidl_tmp = ILClone(pidlFolder); + ILRemoveLastID(pidl_tmp); + pidl_parent = pidl_tmp; + + pidl_child = ILFindLastID(pidlFolder); + apidl = &pidl_child; + cidl = 1; + } + else + { + pidl_parent = pidlFolder; + } + + /* Find the existing explorer window for the parent path. Create a new one if not present. */ + VariantInit(&var_empty); + VariantInit(&var_parent); + size = ILGetSize(pidl_parent); + V_VT(&var_parent) = VT_ARRAY | VT_UI1; + V_ARRAY(&var_parent) = SafeArrayCreateVector(VT_UI1, 0, size); + memcpy(V_ARRAY(&var_parent)->pvData, pidl_parent, size); + hr = IShellWindows_FindWindowSW(sw, &var_parent, &var_empty, SWC_EXPLORER, &hwnd, 0, &dispatch); + if (hr != S_OK) + { + sei.cbSize = sizeof(sei); + sei.fMask = SEE_MASK_FLAG_NO_UI | SEE_MASK_IDLIST | SEE_MASK_NOASYNC | SEE_MASK_WAITFORINPUTIDLE; + sei.lpVerb = L"explore"; + sei.lpIDList = (void *)pidl_parent; + sei.nShow = SW_NORMAL; + if (!ShellExecuteExW(&sei)) + { + WARN("Failed to create a explorer window.\n"); + goto done; + } + + while (timeout > 0) + { + hr = IShellWindows_FindWindowSW(sw, &var_parent, &var_empty, SWC_EXPLORER, &hwnd, 0, + &dispatch); + if (hr == S_OK) + break; + + timeout -= 100; + Sleep(100); + } + + if (hr != S_OK) + { + WARN("Failed to find the explorer window.\n"); + goto done; + } + } + + /* Send WM_COPYDATA to tell explorer.exe to open windows */ + size = sizeof(cidl) + sizeof(uint_flags); + for (i = 0; i < cidl; ++i) + size += ILGetSize(apidl[i]); + + cds.dwData = magic; + cds.cbData = size; + cds.lpData = malloc(size); + if (!cds.lpData) + { + hr = E_OUTOFMEMORY; + goto done; + } + + /* Add the count of child ITEMIDLIST, set its value at the end */ + ptr = (unsigned char *)cds.lpData + sizeof(cidl); + + /* Add flags. Have to use unsigned int because DWORD may have a different size */ + uint_flags = flags; + memcpy(ptr, &uint_flags, sizeof(uint_flags)); + ptr += sizeof(uint_flags); + + /* Add child ITEMIDLIST */ + for (i = 0; i < cidl; ++i) + { + if (apidl != &pidl_child) + pidl_child = ILFindChild(pidl_parent, apidl[i]); + + if (pidl_child) + { + size = ILGetSize(pidl_child); + memcpy(ptr, pidl_child, size); + ptr += size; + ++child_count; + } + } + + /* Set the count of child ITEMIDLIST */ + memcpy(cds.lpData, &child_count, sizeof(child_count)); + + SetForegroundWindow(GetAncestor((HWND)(LONG_PTR)hwnd, GA_ROOT)); + ret = SendMessageW((HWND)(LONG_PTR)hwnd, WM_COPYDATA, 0, (LPARAM)&cds); + hr = ret ? S_OK : E_FAIL; + +done: + free(cds.lpData); + VariantClear(&var_parent); + if (pidl_tmp) + ILFree(pidl_tmp); + IShellWindows_Release(sw); + return hr; } /*********************************************************************** diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c1fdf3699ae..74e66fee4c2 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -5398,15 +5398,12 @@ static void test_SHOpenFolderAndSelectItems(void) /* NULL folder */ hr = SHOpenFolderAndSelectItems(NULL, 0, NULL, 0); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* Open and select folder without child items */ folder = ILCreateFromPathW(L"C:\\Windows\\System32"); hr = SHOpenFolderAndSelectItems(folder, 0, NULL, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(folder); @@ -5414,9 +5411,7 @@ static void test_SHOpenFolderAndSelectItems(void) folder = ILCreateFromPathW(L"C:\\Windows"); items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[0]); ILFree(folder); @@ -5426,9 +5421,7 @@ static void test_SHOpenFolderAndSelectItems(void) items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[1]); ILFree(items[0]); @@ -5438,9 +5431,7 @@ static void test_SHOpenFolderAndSelectItems(void) folder = ILCreateFromPathW(L"C:\\Windows"); items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, OFASI_EDIT); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[0]); ILFree(folder); @@ -5450,9 +5441,7 @@ static void test_SHOpenFolderAndSelectItems(void) items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(check_window_exists("Windows"), "Failed to create window.\n"); ILFree(items[1]); ILFree(items[0]); diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 8fa732d6c1a..78bf8107f2c 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -659,6 +659,43 @@ static LRESULT explorer_on_notify(explorer_info* info,NMHDR* notification) return 0; } +static BOOL handle_copydata(const explorer_info *info, const COPYDATASTRUCT *cds) +{ + static const unsigned int magic = 0xe32ee32e; + unsigned int i, flags, count; + const ITEMIDLIST *child; + unsigned char *ptr; + IShellView *sv; + SVSIF sv_flags; + + TRACE("\n"); + + /* For SHOpenFolderAndSelectItems() */ + if (cds->dwData != magic) + return FALSE; + + ptr = cds->lpData; + memcpy(&count, ptr, sizeof(count)); + ptr += sizeof(count); + memcpy(&flags, ptr, sizeof(flags)); + ptr += sizeof(flags); + + sv_flags = flags & OFASI_EDIT ? SVSI_EDIT : SVSI_SELECT; + + IExplorerBrowser_GetCurrentView(info->browser, &IID_IShellView, (void **)&sv); + for (i = 0; i < count; ++i) + { + child = (const ITEMIDLIST *)ptr; + if (i == 0) + IShellView_SelectItem(sv, child, sv_flags | SVSI_ENSUREVISIBLE | SVSI_FOCUSED | SVSI_DESELECTOTHERS); + else + IShellView_SelectItem(sv, child, sv_flags); + ptr += ILGetSize(child); + } + IShellView_Release(sv); + return TRUE; +} + static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { explorer_info *info @@ -710,6 +747,8 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L case WM_SIZE: update_window_size(info,HIWORD(lParam),LOWORD(lParam)); break; + case WM_COPYDATA: + return handle_copydata(info, (const COPYDATASTRUCT *)lParam); default: return DefWindowProcW(hwnd,uMsg,wParam,lParam); }

1 0

Alistair Leslie-Hughes : ntdll: RtlFirstFreeAce only return FALSE on error.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 18ca759234ac7cb00ba37999422dd974d5c7afff URL: https://gitlab.winehq.org/wine/wine/-/commit/18ca759234ac7cb00ba37999422dd9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 8 13:16:52 2021 +1100 ntdll: RtlFirstFreeAce only return FALSE on error. (cherry picked from commit 0cc26c121831be32bb20092398668f4dfd732327) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/sec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 5c1c9b1fbb0..9cebcb4f58e 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1149,9 +1149,8 @@ BOOLEAN WINAPI RtlFirstFreeAce( return FALSE; ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); } - if ((BYTE *)ace >= (BYTE *)acl + acl->AclSize) - return FALSE; - *x = ace; + if ((BYTE *)ace <= (BYTE *)acl + acl->AclSize) + *x = ace; return TRUE; }

1 0

Alistair Leslie-Hughes : ntdll: Check return parameter before use.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 6d0c0a7ed485fef067e0cdadc2f96bcea6ed674b URL: https://gitlab.winehq.org/wine/wine/-/commit/6d0c0a7ed485fef067e0cdadc2f96b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 3 08:56:39 2021 +1100 ntdll: Check return parameter before use. (cherry picked from commit 0cbfd7ab4cd1b4102bfd6204ff4ed64cca8f5b55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/sec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index eccfc82ce8c..5c1c9b1fbb0 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1172,6 +1172,8 @@ NTSTATUS WINAPI RtlAddAce( return STATUS_INVALID_PARAMETER; if (!RtlFirstFreeAce(acl,&targetace)) return STATUS_INVALID_PARAMETER; + if (!targetace) + return STATUS_ALLOTTED_SPACE_EXCEEDED; nrofaces=0;ace=acestart; while (((BYTE *)ace - (BYTE *)acestart) < acelen) { nrofaces++;

1 0

Zhiyi Zhang : shell32/tests: Add SHOpenFolderAndSelectItems() tests.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 25a2351bc36c4fcc355bade4738b3e9b69a81bf2 URL: https://gitlab.winehq.org/wine/wine/-/commit/25a2351bc36c4fcc355bade4738b3e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:19:52 2022 +0800 shell32/tests: Add SHOpenFolderAndSelectItems() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 7c60e6233aa7ff1bef8e2db69e685f40547a1bbf) Conflicts: dlls/shell32/tests/shlfolder.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 100 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 29fcd0b7754..c1fdf3699ae 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -83,6 +83,37 @@ static WCHAR *make_wstr(const char *str) return ret; } +static BOOL check_window_exists(const char *name) +{ + HWND window = NULL; + int i; + + for (i = 0; i < 10; i++) + { + if ((window = FindWindowA("ExplorerWClass", name)) + || (window = FindWindowA("CabinetWClass", name))) + { + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; + } + + Sleep(100); + } + + if (!window) + return FALSE; + + for (i = 0; i < 10; i++) + { + if (!IsWindow(window)) + break; + + Sleep(100); + } + + return TRUE; +} + static void init_function_pointers(void) { HMODULE hmod; @@ -5360,6 +5391,74 @@ static void test_SHGetSetFolderCustomSettings(void) RemoveDirectoryW(pathW); } +static void test_SHOpenFolderAndSelectItems(void) +{ + PIDLIST_ABSOLUTE folder, items[2]; + HRESULT hr; + + /* NULL folder */ + hr = SHOpenFolderAndSelectItems(NULL, 0, NULL, 0); + todo_wine + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* Open and select folder without child items */ + folder = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 0, NULL, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(folder); + + /* Open folder and select one child item */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select two child items */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); + hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[1]); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select one child item with OFASI_EDIT */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + hr = SHOpenFolderAndSelectItems(folder, 1, (PCUITEMID_CHILD_ARRAY)items, OFASI_EDIT); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[0]); + ILFree(folder); + + /* Open folder and select two child items and OFASI_EDIT */ + folder = ILCreateFromPathW(L"C:\\Windows"); + items[0] = ILCreateFromPathW(L"C:\\Windows\\System32"); + items[1] = ILCreateFromPathW(L"C:\\Windows\\Resources"); + hr = SHOpenFolderAndSelectItems(folder, 2, (PCUITEMID_CHILD_ARRAY)items, 0); + todo_wine + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine + ok(check_window_exists("Windows"), "Failed to create window.\n"); + ILFree(items[1]); + ILFree(items[0]); + ILFree(folder); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5404,6 +5503,7 @@ START_TEST(shlfolder) test_GetDefaultSearchGUID(); test_SHLimitInputEdit(); test_SHGetSetFolderCustomSettings(); + test_SHOpenFolderAndSelectItems(); OleUninitialize(); }

1 0

Zhiyi Zhang : include: Add SHOpenFolderAndSelectItems() declaration and flags.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: f25b2e28c15bc89ad04f3085d1150eac2666f359 URL: https://gitlab.winehq.org/wine/wine/-/commit/f25b2e28c15bc89ad04f3085d1150e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:19:07 2022 +0800 include: Add SHOpenFolderAndSelectItems() declaration and flags. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit f6206bccde6be70e10a6d77fb0b7605056ff18e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/shlobj.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/shlobj.h b/include/shlobj.h index d30944662f7..8d6eab85eb6 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -96,6 +96,7 @@ BOOL WINAPI SHGetPathFromIDListEx(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_ INT WINAPI SHHandleUpdateImage(LPCITEMIDLIST); HRESULT WINAPI SHILCreateFromPath(LPCWSTR,LPITEMIDLIST*,DWORD*); HRESULT WINAPI SHLoadOLE(LPARAM); +HRESULT WINAPI SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE,UINT,PCUITEMID_CHILD_ARRAY,DWORD); HRESULT WINAPI SHParseDisplayName(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); HRESULT WINAPI SHPathPrepareForWriteA(HWND,IUnknown*,LPCSTR,DWORD); HRESULT WINAPI SHPathPrepareForWriteW(HWND,IUnknown*,LPCWSTR,DWORD); @@ -142,6 +143,10 @@ BOOL WINAPI ImportPrivacySettings(LPCWSTR, BOOL*, BOOL*); #define SHOP_FILEPATH 0x02 #define SHOP_VOLUMEGUID 0x04 +/* SHOpenFolderAndSelectItems flags */ +#define OFASI_EDIT 0x0001 +#define OFASI_OPENDESKTOP 0x0002 + BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); #define PCS_FATAL 0x80000000

1 0

Zhiyi Zhang : shell32: Correct SHOpenFolderAndSelectItems() prototype.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 7f67fe0fcb39d973356a91e1895f8be800601d33 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f67fe0fcb39d973356a91e1895f8b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jul 11 12:17:51 2022 +0800 shell32: Correct SHOpenFolderAndSelectItems() prototype. The third parameter is of type PCUITEMID_CHILD_ARRAY, not PCUITEMID_CHILD_ARRAY *. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 7884c142420f96e54b33f8b5cf28ea2ec6ec619b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfolder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c index 10aafc160c0..b70bfbda4c7 100644 --- a/dlls/shell32/shlfolder.c +++ b/dlls/shell32/shlfolder.c @@ -612,8 +612,8 @@ HRESULT WINAPI SHCreateLinks( HWND hWnd, LPCSTR lpszDir, LPDATAOBJECT lpDataObje * * Added in XP. */ -HRESULT WINAPI SHOpenFolderAndSelectItems( PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, - PCUITEMID_CHILD_ARRAY *apidl, DWORD flags ) +HRESULT WINAPI SHOpenFolderAndSelectItems(PCIDLIST_ABSOLUTE pidlFolder, UINT cidl, + PCUITEMID_CHILD_ARRAY apidl, DWORD flags) { FIXME("%p %u %p 0x%x: stub\n", pidlFolder, cidl, apidl, flags); return E_NOTIMPL;

1 0

Paul Gofman : msxml3: Use node_get_text() in domelem_get_nodeTypedValue() if no type is present.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 6d098b162a0154f0aa1e87241797afd2eb7773af URL: https://gitlab.winehq.org/wine/wine/-/commit/6d098b162a0154f0aa1e87241797af… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 25 15:02:08 2022 -0500 msxml3: Use node_get_text() in domelem_get_nodeTypedValue() if no type is present. (cherry picked from commit 89bbd1327e42e62f7ebd1a2efaeee6dfbdfe20a0) Conflicts: dlls/msxml3/tests/domdoc.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/element.c | 8 ++++- dlls/msxml3/tests/domdoc.c | 75 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index e1462c47d88..3037a042da5 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -455,7 +455,6 @@ static inline HRESULT variant_from_dt(XDR_DT dt, xmlChar* str, VARIANT* v) switch (dt) { - case DT_INVALID: case DT_STRING: case DT_NMTOKEN: case DT_NMTOKENS: @@ -737,6 +736,13 @@ static HRESULT WINAPI domelem_get_nodeTypedValue( V_VT(v) = VT_NULL; dt = element_get_dt(get_element(This)); + + if (dt == DT_INVALID) + { + if (SUCCEEDED(hr = node_get_text(&This->node, &V_BSTR(v)))) + V_VT(v) = VT_BSTR; + return hr; + } content = xmlNodeGetContent(get_element(This)); hr = variant_from_dt(dt, content, v); xmlFree(content); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e931c683fb8..ddffd2143d6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -910,7 +910,11 @@ static const CHAR szTypeValueXML[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" "<root xmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n" " <string>Wine</string>\n" -" <string2 dt:dt=\"string\">String</string2>\n" +" <string2 dt:dt=\"string\">String </string2>\n" +" <string3> Wine Wine </string3>\n" +" <string4>\nWine Wine\t</string4>\n" +" <string5> </string5>\n" +" <nested><s1> s1 </s1><s2>\ns2 s2\t</s2></nested>\n" " <number dt:dt=\"number\">12.44</number>\n" " <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n" " <int dt:dt=\"int\">-13</int>\n" @@ -6855,11 +6859,16 @@ typedef struct _nodetypedvalue_t { const char *name; VARTYPE type; const char *value; /* value in string format */ + BOOL no_type; } nodetypedvalue_t; static const nodetypedvalue_t get_nodetypedvalue[] = { - { "root/string", VT_BSTR, "Wine" }, - { "root/string2", VT_BSTR, "String" }, + { "root/string", VT_BSTR, "Wine", TRUE }, + { "root/string2", VT_BSTR, "String " }, + { "root/string3", VT_BSTR, " Wine Wine ", TRUE }, + { "root/string4", VT_BSTR, "\nWine Wine\t", TRUE }, + { "root/string5", VT_BSTR, "", TRUE }, + { "root/nested", VT_BSTR, " s1 \ns2 s2\t", TRUE }, { "root/number", VT_BSTR, "12.44" }, { "root/number2", VT_BSTR, "-3.71e3" }, { "root/int", VT_I4, "-13" }, @@ -6886,6 +6895,24 @@ static const nodetypedvalue_t get_nodetypedvalue[] = { { 0 } }; +static const char *strip_spaces(const char *str) +{ + static char buf[256]; + const char *p; + + while (isspace(*str)) + ++str; + + p = str + strlen(str); + while (p != str && isspace(p[-1])) + --p; + + memcpy(buf, str, p - str); + buf[p - str] = 0; + + return buf; +} + static void test_nodeTypedValue(void) { const nodetypedvalue_t *entry = get_nodetypedvalue; @@ -7081,8 +7108,46 @@ static void test_nodeTypedValue(void) "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); } else - ok(lstrcmpW( V_BSTR(&value), _bstr_(entry->value)) == 0, - "expected %s, got %s\n", entry->value, wine_dbgstr_w(V_BSTR(&value))); + { + BSTR bstr, expected; + + expected = entry->no_type ? _bstr_(strip_spaces(entry->value)) : _bstr_(entry->value); + ok(!wcscmp( V_BSTR(&value), expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(V_BSTR(&value))); + if (entry->no_type) + { + VariantClear( &value ); + + hr = IXMLDOMDocument_get_preserveWhiteSpace(doc, &b); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok(b == VARIANT_FALSE, "got %d\n", b); + + hr = IXMLDOMNode_get_text(node, &bstr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!wcscmp( bstr, expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + + expected = _bstr_(entry->value); + hr = IXMLDOMNode_get_text(node, &bstr); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!wcscmp( bstr, expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + + hr = IXMLDOMNode_get_nodeTypedValue(node, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + ok(V_VT(&value) == entry->type, "incorrect type, expected %d, got %d\n", entry->type, V_VT(&value)); + ok(!wcscmp( V_BSTR(&value), expected ), "expected %s, got %s\n", + debugstr_w(expected), wine_dbgstr_w(V_BSTR(&value))); + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_FALSE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr ); + } + } VariantClear( &value ); IXMLDOMNode_Release(node);

1 0