shell32: Check if known folder's relative path was passed to function.

All non-virtual known folders must have set relative path field.

shell32: Check if known folder's relative path was passed to function.
f3bd5210 · Mariusz Pluciński · Alexandre Julliard · faa9d41e · f3bd5210
Commit f3bd5210 authored Aug 04, 2011 by Mariusz Pluciński Committed by Alexandre Julliard Aug 04, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

shellpath.c dlls/shell32/shellpath.c +10 -1

No files found.
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -3846,9 +3846,18 @@ static HRESULT WINAPI foldermanager_RegisterFolder(
        }

        if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL)
-            hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) ));
+        {
+            if(!pKFD->pszRelativePath)
+                hr = E_INVALIDARG;
+
+            if(SUCCEEDED(hr))
+                hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) ));
+        }

        RegCloseKey(hKey);
+
+        if(FAILED(hr))
+            SHDeleteKeyW(HKEY_LOCAL_MACHINE, registryPath);
    }

    HeapFree(GetProcessHeap(), 0, registryPath);