[PATCH 0/2] MR31: shell32: Only call HCR_GetFolderAttributes with simple pidls

[Fabian Maurer (＠DarkShadow44)]

The function returns false with not-simple pidls anyways.
This fixes an "ERR" message when opening a control panel applet from explorer

Signed-off-by: Fabian Maurer

[PATCH 1/2] shell32: Only call HCR_GetFolderAttributes with simple pidls

[Fabian Maurer]

From: Fabian Maurer

The function returns false with not-simple pidls anyways.
This fixes an "ERR" message when opening a control panel applet from explorer

Signed-off-by: Fabian Maurer 
---
 dlls/shell32/shlfolder.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 120376ba82c..01496714c6a 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -415,7 +415,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO
     if (_ILIsDrive (pidl)) {
         *pdwAttributes &= SFGAO_HASSUBFOLDER|SFGAO_FILESYSTEM|SFGAO_FOLDER|SFGAO_FILESYSANCESTOR|
        SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK;
-    } else if (has_guid && HCR_GetFolderAttributes(pidl, &dwAttributes)) {
+    } else if (has_guid && _ILIsPidlSimple(pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) {
    *pdwAttributes = dwAttributes;
     } else if (_ILGetDataPointer (pidl)) {
    DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0);

[PATCH 1/2] shell32: Only call HCR_GetFolderAttributes with simple pidls

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=114068

Your paranoid android.

=== debian11 (64 bit WoW report) ===

shell32:
shelllink.c:814: Test failed: failed to delete link 'C:\users\winetest\Temp\test.lnk' (32)

[PATCH 2/2] shell32: Fix regression preventing explorer to open control panel applets

[Fabian Maurer]

From: Fabian Maurer

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52394
Signed-off-by: Fabian Maurer 
---
 dlls/shell32/shlfolder.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 01496714c6a..dcc62108c1e 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -384,6 +384,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO
 {
     DWORD dwAttributes;
     BOOL has_guid;
+    PIDLDATA* data;
     static const DWORD dwSupportedAttr=
                           SFGAO_CANCOPY |           /*0x00000001 */
                           SFGAO_CANMOVE |           /*0x00000002 */
@@ -409,6 +410,7 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO
     }

has_guid = _ILGetGUIDPointer(pidl) != NULL;
+    data = _ILGetDataPointer (pidl);

dwAttributes = *pdwAttributes;

@@ -417,10 +419,10 @@ HRESULT SHELL32_GetItemAttributes (IShellFolder2 *psf, LPCITEMIDLIST pidl, LPDWO
        SFGAO_DROPTARGET|SFGAO_HASPROPSHEET|SFGAO_CANLINK;
     } else if (has_guid && _ILIsPidlSimple(pidl) && HCR_GetFolderAttributes(pidl, &dwAttributes)) {
    *pdwAttributes = dwAttributes;
-    } else if (_ILGetDataPointer (pidl)) {
+    } else if (data) {
    DWORD file_attr = _ILGetFileAttributes (pidl, NULL, 0);

-        if (!file_attr) {
+        if (!file_attr && data->type != PT_CPLAPPLET) {
        WCHAR path[MAX_PATH];
        STRRET strret;

[PATCH 2/2] shell32: Fix regression preventing explorer to open control panel applets

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=114069

Your paranoid android.

=== debian11 (64 bit WoW report) ===

shell32:
shelllink.c:814: Test failed: failed to delete link 'C:\users\winetest\Temp\test.lnk' (32)