Reactos

[MAPI32] Sync with Wine Staging 3.3. CORE-14434

+100 -16
+17 -1
dll/win32/mapi32/imalloc.c
··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include "precomp.h" 21 + #include <stdarg.h> 22 + 23 + #define COBJMACROS 24 + 25 + #include "windef.h" 26 + #include "winbase.h" 27 + #include "winreg.h" 28 + #include "winuser.h" 29 + #include "winerror.h" 30 + #include "winternl.h" 31 + #include "objbase.h" 32 + #include "shlwapi.h" 33 + #include "mapiutil.h" 34 + #include "util.h" 35 + #include "wine/debug.h" 36 + 37 + WINE_DEFAULT_DEBUG_CHANNEL(mapi); 22 38 23 39 static const IMallocVtbl MAPI_IMalloc_vt; 24 40
+14 -1
dll/win32/mapi32/mapi32_main.c
··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include "precomp.h" 21 + #include <stdarg.h> 22 + 23 + #include "windef.h" 24 + #include "winbase.h" 25 + #include "winerror.h" 26 + #include "objbase.h" 27 + #include "initguid.h" 28 + #include "mapix.h" 29 + #include "mapiform.h" 30 + #include "mapi.h" 31 + #include "wine/debug.h" 32 + #include "util.h" 33 + 34 + WINE_DEFAULT_DEBUG_CHANNEL(mapi); 22 35 23 36 DECLSPEC_HIDDEN LONG MAPI_ObjectCount = 0; 24 37 DECLSPEC_HIDDEN HINSTANCE hInstMAPI32;
+2 -3
dll/win32/mapi32/precomp.h
··· 1 + 1 2 #ifndef _MAPI32_PCH_ 2 3 #define _MAPI32_PCH_ 3 4 ··· 25 26 26 27 #include "util.h" 27 28 28 - WINE_DEFAULT_DEBUG_CHANNEL(mapi); 29 - 30 - #endif /* _MAPI32_PCH_ */ 29 + #endif /* !_MAPI32_PCH_ */
+14 -2
dll/win32/mapi32/prop.c
··· 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 19 19 */ 20 20 21 - #include "precomp.h" 21 + #include <stdarg.h> 22 22 23 - #include <wine/list.h> 23 + #include "windef.h" 24 + #include "winbase.h" 25 + #include "winreg.h" 26 + #include "winerror.h" 27 + #include "winternl.h" 28 + #include "objbase.h" 29 + #include "shlwapi.h" 30 + #include "wine/list.h" 31 + #include "wine/debug.h" 32 + #include "wine/unicode.h" 33 + #include "mapival.h" 34 + 35 + WINE_DEFAULT_DEBUG_CHANNEL(mapi); 24 36 25 37 BOOL WINAPI FBadRglpszA(LPSTR*,ULONG); 26 38
+2
dll/win32/mapi32/res.h
··· 21 21 22 22 #pragma once 23 23 24 + #include <windef.h> 25 + 24 26 /* Strings */ 25 27 #define IDS_NO_MAPI_CLIENT 1 26 28 #define IDS_SEND_MAIL 2
+23 -2
dll/win32/mapi32/sendmail.c
··· 19 19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 20 20 */ 21 21 22 - #include "precomp.h" 22 + #include "config.h" 23 + #include "wine/port.h" 24 + 25 + #include <stdio.h> 26 + #include <stdarg.h> 23 27 24 - #include <winuser.h> 28 + #define COBJMACROS 25 29 30 + #include "windef.h" 31 + #include "winbase.h" 32 + #include "winerror.h" 33 + #include "winuser.h" 34 + #include "objbase.h" 35 + #include "objidl.h" 36 + #include "mapi.h" 37 + #include "mapix.h" 38 + #include "mapiutil.h" 39 + #include "mapidefs.h" 40 + #include "winreg.h" 41 + #include "shellapi.h" 42 + #include "shlwapi.h" 43 + #include "wine/debug.h" 44 + #include "util.h" 26 45 #include "res.h" 46 + 47 + WINE_DEFAULT_DEBUG_CHANNEL(mapi); 27 48 28 49 #define READ_BUF_SIZE 4096 29 50
+2
dll/win32/mapi32/stubs.c
··· 1 1 #include "precomp.h" 2 2 3 + WINE_DEFAULT_DEBUG_CHANNEL(mapi); 4 + 3 5 typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK; 4 6 5 7 HRESULT
+20 -5
dll/win32/mapi32/util.c
··· 19 19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA 20 20 */ 21 21 22 - #include "precomp.h" 22 + #include <stdarg.h> 23 + #include <stdio.h> 24 + 25 + #define COBJMACROS 26 + 27 + #include "windef.h" 28 + #include "winbase.h" 29 + #include "winreg.h" 30 + #include "winuser.h" 31 + #include "winerror.h" 32 + #include "winternl.h" 33 + #include "objbase.h" 34 + #include "shlwapi.h" 35 + #include "wine/debug.h" 36 + #include "wine/unicode.h" 37 + #include "mapival.h" 38 + #include "xcmc.h" 39 + #include "msi.h" 40 + #include "util.h" 23 41 24 - #include <stdio.h> 25 - #include <winternl.h> 26 - #include <xcmc.h> 27 - #include <msi.h> 42 + WINE_DEFAULT_DEBUG_CHANNEL(mapi); 28 43 29 44 static const BYTE digitsToHex[] = { 30 45 0,1,2,3,4,5,6,7,8,9,0xff,0xff,0xff,0xff,0xff,0xff,0xff,10,11,12,13,14,15,
+5 -1
dll/win32/mapi32/util.h
··· 19 19 */ 20 20 21 21 #ifndef _MAPI_UTIL_H 22 + 22 23 #define _MAPI_UTIL_H 24 + 25 + #include <mapi.h> 26 + #include <mapix.h> 23 27 24 28 extern void load_mapi_providers(void) DECLSPEC_HIDDEN; 25 29 extern void unload_mapi_providers(void) DECLSPEC_HIDDEN; ··· 61 65 extern MAPI_FUNCTIONS mapiFunctions DECLSPEC_HIDDEN; 62 66 extern HINSTANCE hInstMAPI32 DECLSPEC_HIDDEN; 63 67 64 - #endif /* _MAPI_UTIL_H */ 68 + #endif
+1 -1
media/doc/README.WINE
··· 89 89 reactos/dll/win32/jsproxy # Synced to WineStaging-3.3 90 90 reactos/dll/win32/loadperf # Synced to WineStaging-3.3 91 91 reactos/dll/win32/lz32 # Synced to WineStaging-3.3 92 - reactos/dll/win32/mapi32 # Synced to WineStaging-2.16 92 + reactos/dll/win32/mapi32 # Synced to WineStaging-3.3 93 93 reactos/dll/win32/mciavi32 # Synced to WineStaging-2.9 94 94 reactos/dll/win32/mcicda # Synced to WineStaging-2.9 95 95 reactos/dll/win32/mciqtz32 # Synced to WineStaging-2.9