https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd78a4bf830e2efb1cf25708b0a2b38d50dc1246
commit dd78a4bf830e2efb1cf25708b0a2b38d50dc1246 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Jan 26 13:13:59 2019 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Jan 26 13:13:59 2019 +0100 [MAPI32] Sync with Wine Staging 4.0. CORE-15682 --- dll/win32/mapi32/sendmail.c | 8 ++++---- dll/win32/mapi32/util.c | 2 +- media/doc/README.WINE | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/mapi32/sendmail.c b/dll/win32/mapi32/sendmail.c index 9ebb220c03..407dd13041 100644 --- a/dll/win32/mapi32/sendmail.c +++ b/dll/win32/mapi32/sendmail.c @@ -542,8 +542,8 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, } /* Display an error message since we apparently have no mail clients */ - LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); - LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, ARRAY_SIZE(error_msg)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, ARRAY_SIZE(msg_title)); MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); @@ -701,8 +701,8 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, } /* Display an error message since we apparently have no mail clients */ - LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, sizeof(error_msg) / sizeof(WCHAR)); - LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, sizeof(msg_title) / sizeof(WCHAR)); + LoadStringW(hInstMAPI32, IDS_NO_MAPI_CLIENT, error_msg, ARRAY_SIZE(error_msg)); + LoadStringW(hInstMAPI32, IDS_SEND_MAIL, msg_title, ARRAY_SIZE(msg_title)); MessageBoxW((HWND) uiparam, error_msg, msg_title, MB_ICONEXCLAMATION); diff --git a/dll/win32/mapi32/util.c b/dll/win32/mapi32/util.c index 13e4affc39..9c3b01944a 100644 --- a/dll/win32/mapi32/util.c +++ b/dll/win32/mapi32/util.c @@ -903,7 +903,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path char lcid_ver[20]; UINT i; - for (i = 0; i < sizeof(fmt)/sizeof(fmt[0]); i++) + for (i = 0; i < ARRAY_SIZE(fmt); i++) { /* FIXME: what's the correct behaviour here? */ if (!qualifier || qualifier == lcid_ver) diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 090c2971cd..db06b180c8 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -89,7 +89,7 @@ reactos/dll/win32/jscript # Synced to WineStaging-4.0 reactos/dll/win32/jsproxy # Synced to WineStaging-4.0 reactos/dll/win32/loadperf # Synced to WineStaging-3.3 reactos/dll/win32/lz32 # Synced to WineStaging-3.3 -reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 +reactos/dll/win32/mapi32 # Synced to WineStaging-4.0 reactos/dll/win32/mciavi32 # Synced to WineStaging-3.3 reactos/dll/win32/mcicda # Synced to WineStaging-3.3 reactos/dll/win32/mciqtz32 # Synced to WineStaging-3.3
