Skip to content

W
wine-winehq
Commit 7d43ac94 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

mfplat: Use wide strings for registry paths.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 030008f6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
dlls/mfplat/main.c
View file @ 7d43ac94
...@@ -5944,7 +5944,6 @@ static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void * ...@@ -5944,7 +5944,6 @@ static HRESULT resolver_create_registered_handler(HKEY hkey, REFIID riid, void *
static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHAR *url, DWORD flags, static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHAR *url, DWORD flags,
IMFByteStreamHandler **handler) IMFByteStreamHandler **handler)
{ {
static const char streamhandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers";
static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
WCHAR *mimeW = NULL, *urlW = NULL; WCHAR *mimeW = NULL, *urlW = NULL;
IMFAttributes *attributes; IMFAttributes *attributes;
...@@ -6008,7 +6007,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA ...@@ -6008,7 +6007,7 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA
const WCHAR *namesW[2] = { mimeW, url_ext }; const WCHAR *namesW[2] = { mimeW, url_ext };
HKEY hkey, hkey_handler; HKEY hkey, hkey_handler;
if (RegOpenKeyA(hkey_roots[i], streamhandlerspath, &hkey)) if (RegOpenKeyW(hkey_roots[i], L"Software\\Microsoft\\Windows Media Foundation\\ByteStreamHandlers", &hkey))
continue; continue;
for (j = 0; j < ARRAY_SIZE(namesW); ++j) for (j = 0; j < ARRAY_SIZE(namesW); ++j)
...@@ -6045,7 +6044,6 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA ...@@ -6045,7 +6044,6 @@ static HRESULT resolver_get_bytestream_handler(IMFByteStream *stream, const WCHA
static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, IMFSchemeHandler **handler) static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, IMFSchemeHandler **handler)
{ {
static const char schemehandlerspath[] = "Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers";
static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE }; static const HKEY hkey_roots[2] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
HRESULT hr = MF_E_UNSUPPORTED_SCHEME; HRESULT hr = MF_E_UNSUPPORTED_SCHEME;
unsigned int i; unsigned int i;
...@@ -6082,7 +6080,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, ...@@ -6082,7 +6080,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags,
hr = MF_E_UNSUPPORTED_SCHEME; hr = MF_E_UNSUPPORTED_SCHEME;
if (RegOpenKeyA(hkey_roots[i], schemehandlerspath, &hkey)) if (RegOpenKeyW(hkey_roots[i], L"Software\\Microsoft\\Windows Media Foundation\\SchemeHandlers", &hkey))
continue; continue;
if (!RegOpenKeyW(hkey, scheme, &hkey_handler)) if (!RegOpenKeyW(hkey, scheme, &hkey_handler))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment