https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4dd96d425c5158a3dc6b49...
commit 4dd96d425c5158a3dc6b49d475e65db0d43b59bd Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Sat Mar 17 13:16:08 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Sat Mar 17 13:16:08 2018 +0100
[MAPI32] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/mapi32/imalloc.c | 18 +++++++++++++++++- dll/win32/mapi32/mapi32_main.c | 15 ++++++++++++++- dll/win32/mapi32/precomp.h | 5 ++--- dll/win32/mapi32/prop.c | 18 +++++++++++++++--- dll/win32/mapi32/res.h | 2 ++ dll/win32/mapi32/sendmail.c | 29 +++++++++++++++++++++++++---- dll/win32/mapi32/stubs.c | 2 ++ dll/win32/mapi32/util.c | 25 ++++++++++++++++++++----- dll/win32/mapi32/util.h | 6 +++++- media/doc/README.WINE | 2 +- 10 files changed, 103 insertions(+), 19 deletions(-)
diff --git a/dll/win32/mapi32/imalloc.c b/dll/win32/mapi32/imalloc.c index 01cc61cf10..3e95a6c7cd 100644 --- a/dll/win32/mapi32/imalloc.c +++ b/dll/win32/mapi32/imalloc.c @@ -18,7 +18,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "mapiutil.h" +#include "util.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi);
static const IMallocVtbl MAPI_IMalloc_vt;
diff --git a/dll/win32/mapi32/mapi32_main.c b/dll/win32/mapi32/mapi32_main.c index 471010aaa6..0dcc811c24 100644 --- a/dll/win32/mapi32/mapi32_main.c +++ b/dll/win32/mapi32/mapi32_main.c @@ -18,7 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "objbase.h" +#include "initguid.h" +#include "mapix.h" +#include "mapiform.h" +#include "mapi.h" +#include "wine/debug.h" +#include "util.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi);
DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; diff --git a/dll/win32/mapi32/precomp.h b/dll/win32/mapi32/precomp.h index c22246fedf..36a4771cbb 100644 --- a/dll/win32/mapi32/precomp.h +++ b/dll/win32/mapi32/precomp.h @@ -1,3 +1,4 @@ + #ifndef _MAPI32_PCH_ #define _MAPI32_PCH_
@@ -25,6 +26,4 @@
#include "util.h"
-WINE_DEFAULT_DEBUG_CHANNEL(mapi); - -#endif /* _MAPI32_PCH_ */ +#endif /* !_MAPI32_PCH_ */ diff --git a/dll/win32/mapi32/prop.c b/dll/win32/mapi32/prop.c index 1e323b1f15..03df644f21 100644 --- a/dll/win32/mapi32/prop.c +++ b/dll/win32/mapi32/prop.c @@ -18,9 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" - -#include <wine/list.h> +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "wine/list.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "mapival.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi);
BOOL WINAPI FBadRglpszA(LPSTR*,ULONG);
diff --git a/dll/win32/mapi32/res.h b/dll/win32/mapi32/res.h index 28b33d44c3..4952a2dd20 100644 --- a/dll/win32/mapi32/res.h +++ b/dll/win32/mapi32/res.h @@ -21,6 +21,8 @@
#pragma once
+#include <windef.h> + /* Strings */ #define IDS_NO_MAPI_CLIENT 1 #define IDS_SEND_MAIL 2 diff --git a/dll/win32/mapi32/sendmail.c b/dll/win32/mapi32/sendmail.c index 26883b0e53..9ebb220c03 100644 --- a/dll/win32/mapi32/sendmail.c +++ b/dll/win32/mapi32/sendmail.c @@ -19,12 +19,33 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" - -#include <winuser.h> - +#include "config.h" +#include "wine/port.h" + +#include <stdio.h> +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winerror.h" +#include "winuser.h" +#include "objbase.h" +#include "objidl.h" +#include "mapi.h" +#include "mapix.h" +#include "mapiutil.h" +#include "mapidefs.h" +#include "winreg.h" +#include "shellapi.h" +#include "shlwapi.h" +#include "wine/debug.h" +#include "util.h" #include "res.h"
+WINE_DEFAULT_DEBUG_CHANNEL(mapi); + #define READ_BUF_SIZE 4096
#define STORE_UNICODE_OK 0x00040000 diff --git a/dll/win32/mapi32/stubs.c b/dll/win32/mapi32/stubs.c index 65da2d5db4..87e4f2ffb3 100644 --- a/dll/win32/mapi32/stubs.c +++ b/dll/win32/mapi32/stubs.c @@ -1,5 +1,7 @@ #include "precomp.h"
+WINE_DEFAULT_DEBUG_CHANNEL(mapi); + typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK;
HRESULT diff --git a/dll/win32/mapi32/util.c b/dll/win32/mapi32/util.c index 913497fa5e..13e4affc39 100644 --- a/dll/win32/mapi32/util.c +++ b/dll/win32/mapi32/util.c @@ -19,12 +19,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */
-#include "precomp.h" - +#include <stdarg.h> #include <stdio.h> -#include <winternl.h> -#include <xcmc.h> -#include <msi.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "winerror.h" +#include "winternl.h" +#include "objbase.h" +#include "shlwapi.h" +#include "wine/debug.h" +#include "wine/unicode.h" +#include "mapival.h" +#include "xcmc.h" +#include "msi.h" +#include "util.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mapi);
static const BYTE digitsToHex[] = { 0,1,2,3,4,5,6,7,8,9,0xff,0xff,0xff,0xff,0xff,0xff,0xff,10,11,12,13,14,15, diff --git a/dll/win32/mapi32/util.h b/dll/win32/mapi32/util.h index 20db3d51ce..e8a524173f 100644 --- a/dll/win32/mapi32/util.h +++ b/dll/win32/mapi32/util.h @@ -19,8 +19,12 @@ */
#ifndef _MAPI_UTIL_H + #define _MAPI_UTIL_H
+#include <mapi.h> +#include <mapix.h> + extern void load_mapi_providers(void) DECLSPEC_HIDDEN; extern void unload_mapi_providers(void) DECLSPEC_HIDDEN;
@@ -61,4 +65,4 @@ typedef struct MAPI_FUNCTIONS { extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN;
-#endif /* _MAPI_UTIL_H */ +#endif diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 5e7bf6d162..a07c99f423 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -89,7 +89,7 @@ reactos/dll/win32/jscript # Synced to WineStaging-3.3 reactos/dll/win32/jsproxy # Synced to WineStaging-3.3 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-2.16 +reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 reactos/dll/win32/mcicda # Synced to WineStaging-2.9 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9
-
Amine Khaldi