mpr: Add support for REG_EXPAND_SZ for providers path.

Signed-off-by: Pierre Schweitzer <pierre@reactos.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

mpr: Add support for REG_EXPAND_SZ for providers path.
80eb2fa0 · Pierre Schweitzer · Alexandre Julliard · 198e0d5d · 80eb2fa0
Commit 80eb2fa0 authored Jan 25, 2016 by Pierre Schweitzer Committed by Alexandre Julliard Jan 26, 2016
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

wnet.c dlls/mpr/wnet.c +7 -1

No files found.
--- a/dlls/mpr/wnet.c
+++ b/dlls/mpr/wnet.c
@@ -133,11 +133,17 @@ static void _tryLoadProvider(PCWSTR provider)
        DWORD type, size = sizeof(providerPath);

        if (RegQueryValueExW(hKey, szProviderPath, NULL, &type,
-         (LPBYTE)providerPath, &size) == ERROR_SUCCESS && type == REG_SZ)
+         (LPBYTE)providerPath, &size) == ERROR_SUCCESS && (type == REG_SZ || type == REG_EXPAND_SZ))
        {
            static const WCHAR szProviderName[] = { 'N','a','m','e',0 };
            PWSTR name = NULL;

+            if (type == REG_EXPAND_SZ)
+            {
+                WCHAR path[MAX_PATH];
+                if (ExpandEnvironmentStringsW(providerPath, path, MAX_PATH)) lstrcpyW( providerPath, path );
+            }
+
            size = 0;
            RegQueryValueExW(hKey, szProviderName, NULL, NULL, NULL, &size);
            if (size)