From 80eb2fa08eb21ba9504438493fa66097ed03faf5 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 25 Jan 2016 08:17:48 +0100 Subject: [PATCH] mpr: Add support for REG_EXPAND_SZ for providers path. Signed-off-by: Pierre Schweitzer Signed-off-by: Alexandre Julliard --- dlls/mpr/wnet.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 2b53f2a5aa0..01e49e77143 100644 --- 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) -- 2.11.4.GIT