Import Wine commit:
- 80eb2fa08eb21ba9504438493fa66097ed03faf5, Add support for REG_EXPAND_SZ for providers path.

This fixes VMware network provider (vmhgfs.dll) not being able to be loaded in ReactOS.

CORE-10032

svn path=/trunk/; revision=70645
This commit is contained in:
Pierre Schweitzer 2016-01-26 18:09:47 +00:00
parent 259b98442e
commit 1d3fa0bb12

View file

@ -123,11 +123,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)