https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21d3faa2a61388cef1286d...
commit 21d3faa2a61388cef1286d08a7b475c28a020599 Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Mon Oct 1 00:26:43 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Mon Oct 1 00:26:43 2018 +0100
[ATL] Sync with Wine Staging 3.17. CORE-15127 --- dll/win32/atl/atl30.c | 2 +- dll/win32/atl/atl_ax.c | 2 +- dll/win32/atl/registrar.c | 4 ++-- media/doc/README.WINE | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dll/win32/atl/atl30.c b/dll/win32/atl/atl30.c index 674c1aac8d..dcdddd9632 100644 --- a/dll/win32/atl/atl30.c +++ b/dll/win32/atl/atl30.c @@ -374,7 +374,7 @@ ATOM WINAPI AtlModuleRegisterWndClassInfoW(_ATL_MODULEW *pm, _ATL_WNDCLASSINFOW if (!wci->m_wc.lpszClassName) { static const WCHAR szFormat[] = {'A','T','L','%','0','8','l','x',0}; - snprintfW(wci->m_szAutoName, sizeof(wci->m_szAutoName)/sizeof(WCHAR), szFormat, (UINT_PTR)wci); + snprintfW(wci->m_szAutoName, ARRAY_SIZE(wci->m_szAutoName), szFormat, (UINT_PTR)wci); TRACE("auto-generated class name %s\n", debugstr_w(wci->m_szAutoName)); wci->m_wc.lpszClassName = wci->m_szAutoName; } diff --git a/dll/win32/atl/atl_ax.c b/dll/win32/atl/atl_ax.c index 1765dcc689..28bec71fd9 100644 --- a/dll/win32/atl/atl_ax.c +++ b/dll/win32/atl/atl_ax.c @@ -1268,7 +1268,7 @@ static LPDLGTEMPLATEW AX_ConvertDialogTemplate(LPCDLGTEMPLATEW src_tmpl) if ( GET_WORD(tmp) == '{' ) /* all this mess created because of this line */ { static const WCHAR AtlAxWin[] = {'A','t','l','A','x','W','i','n', 0}; - PUT_BLOCK(AtlAxWin, sizeof(AtlAxWin)/sizeof(WCHAR)); + PUT_BLOCK(AtlAxWin, ARRAY_SIZE(AtlAxWin)); PUT_BLOCK(tmp, strlenW(tmp)+1); } else PUT_BLOCK(tmp, src-tmp); diff --git a/dll/win32/atl/registrar.c b/dll/win32/atl/registrar.c index 3d597ba217..d96bd34086 100644 --- a/dll/win32/atl/registrar.c +++ b/dll/win32/atl/registrar.c @@ -394,11 +394,11 @@ static HRESULT do_process_root_key(LPCOLESTR data, BOOL do_register) hres = DISP_E_EXCEPTION; break; } - for(i=0; i<sizeof(root_keys)/sizeof(root_keys[0]); i++) { + for(i=0; i<ARRAY_SIZE(root_keys); i++) { if(!lstrcmpiW(buf.str, root_keys[i].name)) break; } - if(i == sizeof(root_keys)/sizeof(root_keys[0])) { + if(i == ARRAY_SIZE(root_keys)) { WARN("Wrong root key name: %s\n", debugstr_w(buf.str)); hres = DISP_E_EXCEPTION; break; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 8f9944e010..c3651a9123 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -45,7 +45,7 @@ reactos/dll/directx/wine/wined3d # Synced to WineStaging-3.9 reactos/dll/win32/activeds # Synced to WineStaging-3.3 reactos/dll/win32/actxprxy # Synced to WineStaging-3.3 reactos/dll/win32/advpack # Synced to WineStaging-3.17 -reactos/dll/win32/atl # Synced to WineStaging-3.3 +reactos/dll/win32/atl # Synced to WineStaging-3.17 reactos/dll/win32/atl80 # Synced to WineStaging-3.3 reactos/dll/win32/atl100 # Synced to WineStaging-3.3 reactos/dll/win32/avifil32 # Synced to WineStaging-3.9
-
Amine Khaldi