shell32: UNIX paths should be parsed by unixfs.

Some tests show that trying to create a PIDL from a path starting with '/' fails in Windows, so this change shouldn't cause a conflict with the shell namespace.

shell32: UNIX paths should be parsed by unixfs.
a77fb7f5 · Andrew Eikum · Alexandre Julliard · da31fc06 · a77fb7f5
Commit a77fb7f5 authored Jun 28, 2010 by Andrew Eikum Committed by Alexandre Julliard Jun 29, 2010
Show whitespace changes
Inline Side-by-side

Showing with 16 additions and 1 deletion

shfldr_desktop.c dlls/shell32/shfldr_desktop.c +16 -1

No files found.
--- a/dlls/shell32/shfldr_desktop.c
+++ b/dlls/shell32/shfldr_desktop.c
@@ -213,10 +213,24 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
        if (*lpszDisplayName)
        {
+            if (*lpszDisplayName == '/')
+            {
+                /* UNIX paths should be parsed by unixfs */
+                IShellFolder *unixFS;
+                hr = UnixFolder_Constructor(NULL, &IID_IShellFolder, (LPVOID*)&unixFS);
+                if (SUCCEEDED(hr))
+                {
+                    hr = IShellFolder_ParseDisplayName(unixFS, NULL, NULL,
+                            lpszDisplayName, NULL, &pidlTemp, NULL);
+                    IShellFolder_Release(unixFS);
+                }
+            }
+            else
+            {
+                /* build a complete path to create a simple pidl */
                WCHAR szPath[MAX_PATH];
                LPWSTR pathPtr;
-            /* build a complete path to create a simple pidl */
                lstrcpynW(szPath, This->sPathTarget, MAX_PATH);
                pathPtr = PathAddBackslashW(szPath);
                if (pathPtr)
@@ -230,6 +244,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
                    hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
                }
            }
+        }
        else
            pidlTemp = _ILCreateMyComputer();