shell32: Construct the proper path target for UnixFolder.

Worse than just no unix integration is that it can actually crash if you parse e.g. "/". Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

shell32: Construct the proper path target for UnixFolder.
a9b3fdd3 · Gabriel Ivăncescu · Alexandre Julliard · 40afa8d9 · a9b3fdd3
Commit a9b3fdd3 authored Mar 04, 2024 by Gabriel Ivăncescu Committed by Alexandre Julliard Mar 12, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 6 deletions

shfldr_fs.c dlls/shell32/shfldr_fs.c +16 -6

No files found.
--- a/dlls/shell32/shfldr_fs.c
+++ b/dlls/shell32/shfldr_fs.c
@@ -1797,7 +1797,7 @@ static const IDropTargetVtbl dtvt = {
    ISFDropTarget_Drop
 };

-static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CLSID *clsid)
+static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CLSID *clsid, const WCHAR *path_target)
 {
    IGenericSFImpl *sf;
    HRESULT hr;
@@ -1820,6 +1820,16 @@ static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CL
    sf->ISFHelper_iface.lpVtbl = &shvt;
    sf->pclsid = clsid;
    sf->outer_unk = outer_unk ? outer_unk : &sf->IUnknown_inner;
+    if (path_target)
+    {
+        SIZE_T size = (wcslen(path_target) + 1) * sizeof(WCHAR);
+        if (!(sf->sPathTarget = SHAlloc(size)))
+        {
+            LocalFree(sf);
+            return E_OUTOFMEMORY;
+        }
+        memcpy(sf->sPathTarget, path_target, size);
+    }

    hr = IUnknown_QueryInterface(&sf->IUnknown_inner, riid, ppv);
    IUnknown_Release(&sf->IUnknown_inner);
@@ -1830,25 +1840,25 @@ static HRESULT create_fs( IUnknown *outer_unk, REFIID riid, void **ppv, const CL

 HRESULT WINAPI IFSFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv)
 {
-    return create_fs( outer_unk, riid, ppv, &CLSID_ShellFSFolder );
+    return create_fs( outer_unk, riid, ppv, &CLSID_ShellFSFolder, NULL );
 }

 HRESULT WINAPI UnixFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv)
 {
-    return create_fs( outer_unk, riid, ppv, &CLSID_UnixFolder );
+    return create_fs( outer_unk, riid, ppv, &CLSID_UnixFolder, L"\\\\?\\unix\\" );
 }

 HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv)
 {
-    return create_fs( outer_unk, riid, ppv, &CLSID_UnixDosFolder );
+    return create_fs( outer_unk, riid, ppv, &CLSID_UnixDosFolder, NULL );
 }

 HRESULT WINAPI FolderShortcut_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv)
 {
-    return create_fs( outer_unk, riid, ppv, &CLSID_FolderShortcut );
+    return create_fs( outer_unk, riid, ppv, &CLSID_FolderShortcut, NULL );
 }

 HRESULT WINAPI MyDocuments_Constructor(IUnknown *outer_unk, REFIID riid, void **ppv)
 {
-    return create_fs( outer_unk, riid, ppv, &CLSID_MyDocuments );
+    return create_fs( outer_unk, riid, ppv, &CLSID_MyDocuments, NULL );
 }