Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Amine Khaldi 2018-03-17 13:16:08 +01:00
parent be44829fa2
commit 4dd96d425c
10 changed files with 100 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dll/win32/mapi32/imalloc.c
View file

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

15
dll/win32/mapi32/mapi32_main.c
View file

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

5
dll/win32/mapi32/precomp.h
View file

@ -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_ */

16
dll/win32/mapi32/prop.c
View file

@ -18,9 +18,21 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include <stdarg.h>
#include <wine/list.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);

2
dll/win32/mapi32/res.h
View file

@ -21,6 +21,8 @@
#pragma once
#include <windef.h>
/* Strings */
#define IDS_NO_MAPI_CLIENT 1
#define IDS_SEND_MAIL 2

25
dll/win32/mapi32/sendmail.c
View file

@ -19,12 +19,33 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "precomp.h"
#include "config.h"
#include "wine/port.h"
#include <winuser.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

2
dll/win32/mapi32/stubs.c
View file

@ -1,5 +1,7 @@
#include "precomp.h"
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK;
HRESULT

25
dll/win32/mapi32/util.c
View file

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

6
dll/win32/mapi32/util.h
View file

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

2
media/doc/README.WINE
View file

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