kernelbase: Revert some incorrect differences with shlwapi.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a226e2b7a9
commit
733cdaa698
|
@ -1518,21 +1518,20 @@ LPSTR WINAPI PathCombineA(char *dst, const char *dir, const char *file)
|
||||||
if (!dst)
|
if (!dst)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
dst[0] = 0;
|
|
||||||
|
|
||||||
if (!dir && !file)
|
if (!dir && !file)
|
||||||
return NULL;
|
goto fail;
|
||||||
|
|
||||||
if (dir && !MultiByteToWideChar(CP_ACP, 0, dir, -1, dirW, ARRAY_SIZE(dirW)))
|
if (dir && !MultiByteToWideChar(CP_ACP, 0, dir, -1, dirW, ARRAY_SIZE(dirW)))
|
||||||
return NULL;
|
goto fail;
|
||||||
|
|
||||||
if (file && !MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, ARRAY_SIZE(fileW)))
|
if (file && !MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, ARRAY_SIZE(fileW)))
|
||||||
return NULL;
|
goto fail;
|
||||||
|
|
||||||
if (PathCombineW(dstW, dir ? dirW : NULL, file ? fileW : NULL))
|
if (PathCombineW(dstW, dir ? dirW : NULL, file ? fileW : NULL))
|
||||||
if (WideCharToMultiByte(CP_ACP, 0, dstW, -1, dst, MAX_PATH, 0, 0))
|
if (WideCharToMultiByte(CP_ACP, 0, dstW, -1, dst, MAX_PATH, 0, 0))
|
||||||
return dst;
|
return dst;
|
||||||
|
fail:
|
||||||
|
dst[0] = 0;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1945,7 +1944,7 @@ void WINAPI PathRemoveExtensionA(char *path)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
path = PathFindExtensionA(path);
|
path = PathFindExtensionA(path);
|
||||||
if (path && !*path)
|
if (path && *path)
|
||||||
*path = '\0';
|
*path = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1957,7 +1956,7 @@ void WINAPI PathRemoveExtensionW(WCHAR *path)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
path = PathFindExtensionW(path);
|
path = PathFindExtensionW(path);
|
||||||
if (path && !*path)
|
if (path && *path)
|
||||||
*path = '\0';
|
*path = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3924,7 +3923,7 @@ static HRESULT url_guess_scheme(const WCHAR *url, WCHAR *out, DWORD *out_len)
|
||||||
BOOL j;
|
BOOL j;
|
||||||
|
|
||||||
MultiByteToWideChar(CP_ACP, 0,
|
MultiByteToWideChar(CP_ACP, 0,
|
||||||
"Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", 1, reg_path, MAX_PATH);
|
"Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", -1, reg_path, MAX_PATH);
|
||||||
RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey);
|
RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey);
|
||||||
index = 0;
|
index = 0;
|
||||||
while (value_len = data_len = MAX_PATH,
|
while (value_len = data_len = MAX_PATH,
|
||||||
|
|
Loading…
Reference in New Issue