[MAPI32] Sync with Wine Staging 4.0. CORE-15682

This commit is contained in:
Amine Khaldi 2019-01-26 13:13:59 +01:00
parent 2ea897da44
commit dd78a4bf83
3 changed files with 6 additions and 6 deletions

View file

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

View file

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

View file

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