ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfplat: Use wide strings for registry paths. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-10-22 08:24:22 +03:00 committed by Alexandre Julliard
parent 030008f6cc
commit 7d43ac9474
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/mfplat/main.c
View File

@ -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
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
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,
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))