https://git.reactos.org/?p=reactos.git;a=commitdiff;h=876fef085a9929ad8306cd7d2dc7eac53e060735
commit 876fef085a9929ad8306cd7d2dc7eac53e060735 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Feb 2 14:16:02 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Feb 2 14:16:02 2019 +0100 [SHDOCVW] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/shdocvw/shdocvw_main.c | 6 +++--- dll/win32/shdocvw/shlinstobj.c | 4 ++-- media/doc/README.WINE | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/shdocvw/shdocvw_main.c b/dll/win32/shdocvw/shdocvw_main.c index ef9e3a7dfb..e699b4c2c9 100644 --- a/dll/win32/shdocvw/shdocvw_main.c +++ b/dll/win32/shdocvw/shdocvw_main.c @@ -385,7 +385,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L plen ? *plen : 0, unknown ? *unknown : 0); if (!PathIsURLW(ptr)) { - len = sizeof(buffer_in) / sizeof(buffer_in[0]); + len = ARRAY_SIZE(buffer_in); buffer_in[0] = 0; hr = UrlApplySchemeW(ptr, buffer_in, &len, URL_APPLY_GUESSSCHEME | URL_APPLY_DEFAULT); TRACE("got 0x%x with %s\n", hr, debugstr_w(buffer_in)); @@ -399,7 +399,7 @@ DWORD WINAPI ParseURLFromOutsideSourceW(LPCWSTR url, LPWSTR out, LPDWORD plen, L } } - len = sizeof(buffer_out) / sizeof(buffer_out[0]); + len = ARRAY_SIZE(buffer_out); buffer_out[0] = '\0'; hr = UrlCanonicalizeW(ptr, buffer_out, &len, URL_ESCAPE_SPACES_ONLY); needed = lstrlenW(buffer_out)+1; @@ -443,7 +443,7 @@ DWORD WINAPI ParseURLFromOutsideSourceA(LPCSTR url, LPSTR out, LPDWORD plen, LPD MultiByteToWideChar(CP_ACP, 0, url, -1, urlW, len); } - len = sizeof(buffer) / sizeof(buffer[0]); + len = ARRAY_SIZE(buffer); ParseURLFromOutsideSourceW(urlW, buffer, &len, unknown); HeapFree(GetProcessHeap(), 0, urlW); diff --git a/dll/win32/shdocvw/shlinstobj.c b/dll/win32/shdocvw/shlinstobj.c index 9c3232c65e..6f6786bdb5 100644 --- a/dll/win32/shdocvw/shlinstobj.c +++ b/dll/win32/shdocvw/shlinstobj.c @@ -361,8 +361,8 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, WCHAR wszInstanceKey[] = { 'C','L','S','I','D','\\','{','0','0','0','0','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0', '0','0','0','0','}','\\','I','n','s','t','a','n','c','e', 0 }; - const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - const WCHAR wszInitPropertyBag[] = + static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; + static const WCHAR wszInitPropertyBag[] = { 'I','n','i','t','P','r','o','p','e','r','t','y','B','a','g',0 }; WCHAR wszCLSIDInstance[CHARS_IN_GUID]; CLSID clsidInstance; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 6f654787d8..859ae5a226 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -171,7 +171,7 @@ reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-3.3 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-3.3 -reactos/dll/win32/shdocvw # Synced to WineStaging-3.3 +reactos/dll/win32/shdocvw # Synced to WineStaging-4.0 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-3.3 reactos/dll/win32/shlwapi # Synced to WineStaging-3.3
