[PATCH v2 0/2] MR566: shell32: Implement SHBindToFolderIDListParent.

List overview All Threads

newer

older

[PATCH 0/1] MR1179: loader:...

[PATCH v3 0/5] MR1172:...

Mohamad Al-Jaf (＠maljaf)

27 Oct 2022 27 Oct '22

1:34 a.m.

Called by IE11.

Signed-off-by: Mohamad Al-Jaf mohamadaljaf@gmail.com

v3: Fix failed test.

Don't know how to change the subject version number.

-- v2: shell32: Add SHBindToFolderIDListParent tests. shell32: Implement SHBindToFolderIDListParent.

https://gitlab.winehq.org/wine/wine/-/merge_requests/566

Show replies by date

Mohamad Al-Jaf

27 Oct 27 Oct

1:34 a.m.

New subject: [PATCH v2 1/2] shell32: Implement SHBindToFolderIDListParent.

From: Mohamad Al-Jaf mohamadaljaf@gmail.com

Called by IE11.

Signed-off-by: Mohamad Al-Jaf mohamadaljaf@gmail.com --- dlls/shell32/pidl.c | 46 +++++++++++++++++++++++++-------------- dlls/shell32/shell32.spec | 1 + include/shlobj.h | 2 ++ 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index f9c91a79132..73141c50a0b 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1286,49 +1286,63 @@ BOOL WINAPI SHGetPathFromIDListEx(LPCITEMIDLIST pidl, WCHAR *path, DWORD path_si }

/************************************************************************* - * SHBindToParent [shell version 5.0] + * SHBindToFolderIDListParent [SHELL32.@] */ -HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) { - IShellFolder * psfDesktop; - HRESULT hr=E_FAIL; + IShellFolder *psfDesktop = NULL; + HRESULT hr;

- TRACE_(shell)("pidl=%p\n", pidl); + TRACE_(shell)("%p,%p,%s\n", psf, pidl, debugstr_guid(riid)); pdump(pidl); - + + if (ppidlLast) + *ppidlLast = NULL; + if (!pidl || !ppv) return E_INVALIDARG; - + *ppv = NULL; - if (ppidlLast) - *ppidlLast = NULL;

- hr = SHGetDesktopFolder(&psfDesktop); - if (FAILED(hr)) - return hr; + if (!psf) + { + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + psf = psfDesktop; + }

if (_ILIsPidlSimple(pidl)) { /* we are on desktop level */ - hr = IShellFolder_QueryInterface(psfDesktop, riid, ppv); + hr = IShellFolder_QueryInterface(psf, riid, ppv); } else { LPITEMIDLIST pidlParent = ILClone(pidl); ILRemoveLastID(pidlParent); - hr = IShellFolder_BindToObject(psfDesktop, pidlParent, NULL, riid, ppv); + hr = IShellFolder_BindToObject(psf, pidlParent, NULL, riid, ppv); SHFree (pidlParent); }

- IShellFolder_Release(psfDesktop); + if (psfDesktop) + IShellFolder_Release(psfDesktop);

if (SUCCEEDED(hr) && ppidlLast) *ppidlLast = ILFindLastID(pidl);

- TRACE_(shell)("-- psf=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); + TRACE_(shell)("-- ppv=%p pidl=%p ret=0x%08lx\n", *ppv, (ppidlLast)?*ppidlLast:NULL, hr); return hr; }

+/************************************************************************* + * SHBindToParent [shell version 5.0] + */ +HRESULT WINAPI SHBindToParent(LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast) +{ + return SHBindToFolderIDListParent(NULL, pidl, riid, ppv, ppidlLast); +} + HRESULT WINAPI SHBindToObject(IShellFolder *psf, LPCITEMIDLIST pidl, IBindCtx *pbc, REFIID riid, void **ppv) { IShellFolder *psfDesktop = NULL; diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f8bf8f246e8..5b812774e1f 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -334,6 +334,7 @@ @ stdcall SHAssocEnumHandlers(wstr long ptr) @ stdcall SHBindToObject(ptr ptr ptr ptr ptr) @ stdcall SHBindToParent(ptr ptr ptr ptr) +@ stdcall SHBindToFolderIDListParent(ptr ptr ptr ptr ptr) @ stdcall SHBrowseForFolder(ptr) SHBrowseForFolderA @ stdcall SHBrowseForFolderA(ptr) @ stdcall SHBrowseForFolderW(ptr) diff --git a/include/shlobj.h b/include/shlobj.h index feee6cd9b98..724a2b66c11 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1742,6 +1742,8 @@ HRESULT WINAPI SHGetFolderPathW(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwF */ HRESULT WINAPI SHGetDesktopFolder(IShellFolder * *);

+HRESULT WINAPI SHBindToFolderIDListParent(IShellFolder *psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID *ppv, LPCITEMIDLIST *ppidlLast); + /**************************************************************************** * SHBindToParent API */

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/566

Zebediah Figura

28 Oct 28 Oct

7:30 p.m.

New subject: [PATCH v2 1/2] shell32: Implement SHBindToFolderIDListParent.

On 10/26/22 20:34, Mohamad Al-Jaf wrote:

...

if (ppidlLast)
```
   *ppidlLast = NULL;
```

if (!pidl || !ppv)
    return E_INVALIDARG;

```
*ppv = NULL;
```

if (ppidlLast)
```
   *ppidlLast = NULL;
```

Why are these changes being made? At least they shouldn't be part of this patch.

Mohamad Al-Jaf

27 Oct 27 Oct

1:34 a.m.

New subject: [PATCH v2 2/2] shell32: Add SHBindToFolderIDListParent tests.

From: Mohamad Al-Jaf mohamadaljaf@gmail.com

From: Dmitry Timoshkov dmitry@baikal.ru

Signed-off-by: Mohamad Al-Jaf mohamadaljaf@gmail.com --- dlls/shell32/tests/shlfolder.c | 53 ++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+)

diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 248fbd1df62..63e3b708e3e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -60,6 +60,7 @@ static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); +static HRESULT (WINAPI *pSHBindToFolderIDListParent)(IShellFolder*,LPCITEMIDLIST,REFIID,void **,LPCITEMIDLIST*);

static WCHAR *make_wstr(const char *str) { @@ -120,6 +121,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll");

#define MAKEFUNC(f) (p##f = (void*)GetProcAddress(hmod, #f)) + MAKEFUNC(SHBindToFolderIDListParent); MAKEFUNC(SHCreateItemFromIDList); MAKEFUNC(SHCreateItemFromParsingName); MAKEFUNC(SHCreateItemFromRelativeName); @@ -5497,6 +5499,56 @@ static void test_SHOpenFolderAndSelectItems(void) ILFree(folder); }

+static void test_SHBindToFolderIDListParent(void) +{ + IShellFolder *psf_desktop; + LPITEMIDLIST pidl; + HRESULT hr; + WCHAR path[MAX_PATH]; + SHITEMID empty_item = { 0, { 0 } }; + LPITEMIDLIST pidl_empty = (LPITEMIDLIST)&empty_item; + LPCITEMIDLIST pidl_last; + IShellFolder *psf; + + if (!pSHBindToFolderIDListParent) + { + win_skip("SHBindToFolderIDListParent not available\n"); + return; + } + + GetTempPathW(ARRAY_SIZE(path), path); + SHGetDesktopFolder(&psf_desktop); + + hr = IShellFolder_ParseDisplayName(psf_desktop, NULL, NULL, path, NULL, &pidl, 0); + ok(hr == S_OK, "got %#lx\n", hr); + + pidl_last = NULL; + hr = pSHBindToFolderIDListParent(psf_desktop, pidl, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last != NULL, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl_empty, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == S_OK, "got %#lx\n", hr); + ok(pidl_last == pidl_empty, "got %p\n", pidl_last); + IShellFolder_Release(psf); + + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, (void **)&psf, NULL); + ok(hr == S_OK, "got %#lx\n", hr); + IShellFolder_Release(psf); + + if (0) /* crashes under Windows */ + hr = pSHBindToFolderIDListParent(NULL, pidl, &IID_IShellFolder, NULL, NULL); + + ILFree(pidl); + IShellFolder_Release(psf_desktop); + + pidl_last = (LPITEMIDLIST)0xdeadbeef; + hr = pSHBindToFolderIDListParent(NULL, NULL, &IID_IShellFolder, (void **)&psf, &pidl_last); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); + ok(pidl_last == NULL, "got %p\n", pidl_last); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5504,6 +5556,7 @@ START_TEST(shlfolder) CO_E_NOTINITIALIZED for malformed directory names */ OleInitialize(NULL);

+ test_SHBindToFolderIDListParent(); test_ParseDisplayName(); test_SHParseDisplayName(); test_BindToObject();

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/566

Marvin

2:02 a.m.

New subject: [PATCH v2 2/2] shell32: Add SHBindToFolderIDListParent tests.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

23 TestBot errors prevented a full analysis of your patch. If the test caused the operating system (e.g. Windows) to crash or reboot you will probably have to modify it to avoid that. Other issues should be reported to the TestBot administrators.

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125476

Your paranoid android.

=== w7u_2qxl (testbot log) ===

WineRunTask.pl:error: Could not copy the test executable to the VM: Unable to open '/home/testbot/var/jobs/125476/shell32_test.exe' for reading: No such file or directory WineRunTask.pl:error: BotError: The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died) WineRunTask.pl:error: Giving up after 3 run(s)

=== w7u_adm (testbot log) ===

=== w7u_el (testbot log) ===

=== w8 (testbot log) ===

=== w8adm (testbot log) ===

=== w864 (testbot log) ===

=== w1064v1507 (testbot log) ===

=== w1064v1809 (testbot log) ===

=== w1064 (testbot log) ===

=== w1064_tsign (testbot log) ===

=== w10pro64 (testbot log) ===

=== w864 (testbot log) ===

WineRunTask.pl:error: Could not copy the test executable to the VM: Unable to open '/home/testbot/var/jobs/125476/shell32_test64.exe' for reading: No such file or directory WineRunTask.pl:error: BotError: The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died) WineRunTask.pl:error: Giving up after 3 run(s)

=== w1064v1507 (testbot log) ===

=== w1064v1809 (testbot log) ===

=== w1064 (testbot log) ===

=== w1064_2qxl (testbot log) ===

=== w1064_adm (testbot log) ===

=== w1064_tsign (testbot log) ===

=== w10pro64 (testbot log) ===

=== w10pro64_en_AE_u8 (testbot log) ===

=== w10pro64_ar (testbot log) ===

=== w10pro64_ja (testbot log) ===

=== w10pro64_zh_CN (testbot log) ===

=== debian11 (build log) ===

Task: WineTest did not produce the win32 report

=== debian11 (build log) ===

Task: WineTest did not produce the wow32 report

Marvin

2:21 p.m.

New subject: [PATCH v2 2/2] shell32: Add SHBindToFolderIDListParent tests.

Hi,

8 TestBot errors prevented a full analysis of your patch. If the test caused the operating system (e.g. Windows) to crash or reboot you will probably have to modify it to avoid that. Other issues should be reported to the TestBot administrators.

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125476

Your paranoid android.

=== w7u_2qxl (testbot log) ===

=== w7u_adm (testbot log) ===

=== w7u_el (testbot log) ===

=== w8 (testbot log) ===

=== w8adm (testbot log) ===

=== w864 (testbot log) ===

=== w10pro64 (testbot log) ===

=== w864 (testbot log) ===

Marvin

5:18 p.m.

New subject: [PATCH v2 2/2] shell32: Add SHBindToFolderIDListParent tests.

Hi,

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=125476

Your paranoid android.

=== w1064v1809 (32 bit report) ===

shell32: shlfolder.c:4992: Test failed: RMDIR: expected notification type 10, got: 40000

=== w1064 (64 bit report) ===

shell32: shlfolder.c:4992: Test failed: RMDIR: expected notification type 10, got: 40000

=== w1064_adm (64 bit report) ===

shell32: shlfolder.c:4992: Test failed: MKDIR: expected notification type 8, got: 40000

=== w1064_tsign (64 bit report) ===

shell32: shlfolder.c:5009: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2)

=== w10pro64 (64 bit report) ===

shell32: shlfolder.c:4992: Test failed: RMDIR: expected notification type 10, got: 40000

=== w10pro64_en_AE_u8 (64 bit report) ===

shell32: shlfolder.c:4992: Test failed: RMDIR: expected notification type 10, got: 40000

=== w10pro64_ar (64 bit report) ===

shell32: shlfolder.c:4992: Test failed: MKDIR: expected notification type 8, got: 40000

=== w10pro64_ja (64 bit report) ===

shell32: shlfolder.c:5009: Test failed: Didn't expect a WM_USER_NOTIFY message (event: 2)

=== debian11 (32 bit report) ===

ddraw: ddraw7.c:15681: Test failed: Expected unsynchronised map for flags 0x1000. ddraw7.c:15681: Test failed: Expected unsynchronised map for flags 0x3000.

=== debian11 (32 bit zh:CN report) ===

shell32: autocomplete.c:614: Test failed: Expected (null), got L"ab" autocomplete.c:637: Test failed: Expected (null), got L"www.ax"

=== debian11 (build log) ===

WineRunWineTest.pl:error: The previous 1 run(s) terminated abnormally

Mohamad Al-Jaf (＠maljaf)

1:47 a.m.

On Thu Oct 27 01:47:08 2022 +0000, Alexandre Julliard wrote:

...

You should merge the two code change patches to make it clear what's actually being changed.

Thank you for the feedback, much appreciated. I've merged the 2 code change commits, but I'm not sure if this is what you wanted because it still looks unclear what's being changed, at least to me.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/566#note_12308

832

Age (days ago)

833

Last active (days ago)

wine-gitlab@winehq.org

7 comments

4 participants

tags (0)

participants (4)

Marvin
Mohamad Al-Jaf
Mohamad Al-Jaf (＠maljaf)
Zebediah Figura