[fireball] 21622: Sync to Wine-0_9_9: Francois Gouget <fgouget@free.fr> - mapi: Add some missing MAPI prototypes. Add some missing MAPI prototypes to mapi.h (spotted by winapi_check) and include it where they are implemented. Make mapi.h and mapix.h compatible. gcc does not like macros and prototypes to be redefined so this involved protecting against multiple definitions. Fix the MAPISendMail() implementation prototype. Sync to Wine-0_9_8: Hans Leidekker <hans@it.vu.nl> - mapi32: Implementation
17 Apr
2006
17 Apr
'06
7:45 a.m.
Author: fireball
Date: Mon Apr 17 11:45:48 2006
New Revision: 21622
URL: http://svn.reactos.ru/svn/reactos?rev=21622&view=rev
Log:
Sync to Wine-0_9_9:
Francois Gouget <fgouget(a)free.fr>
- mapi: Add some missing MAPI prototypes.
Add some missing MAPI prototypes to mapi.h (spotted by winapi_check)
and include it where they are implemented.
Make mapi.h and mapix.h compatible. gcc does not like macros and
prototypes to be redefined so this involved protecting against
multiple definitions.
Fix the MAPISendMail() implementation prototype.
Sync to Wine-0_9_8:
Hans Leidekker <hans(a)it.vu.nl>
- mapi32: Implementation for MAPISendMail.
Implement MAPISendMail, stub MAPILogoff and make the stubs for
MAPIInitialize, MAPILogon{,Ex} and MAPILogoff return success.
- mapi32: Prevent freeing non-allocated memory.
Added:
trunk/reactos/dll/win32/mapi32/sendmail.c
- copied unchanged from r21360, vendor/wine/dlls/mapi32/current/sendmail.c
Modified:
trunk/reactos/dll/win32/mapi32/mapi32.rbuild
trunk/reactos/dll/win32/mapi32/mapi32.spec
trunk/reactos/dll/win32/mapi32/mapi32_main.c
trunk/reactos/include/mapi.h
trunk/reactos/include/mapicode.h
trunk/reactos/include/mapix.h
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.rbu…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32.rbuild (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild Mon Apr 17 11:45:48 2006
@@ -14,6 +14,7 @@
<file>mapi32_main.c</file>
<file>imalloc.c</file>
<file>prop.c</file>
+ <file>sendmail.c</file>
<file>util.c</file>
<file>mapi32.spec</file>
</module>
Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.spe…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32.spec (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32.spec Mon Apr 17 11:45:48 2006
@@ -147,8 +147,8 @@
207 stdcall CbOfEncoded@4(ptr) CbOfEncoded
208 stub MAPISendDocuments
209 stdcall MAPILogon(long ptr ptr long long ptr)
-210 stub MAPILogoff
-211 stub MAPISendMail
+210 stdcall MAPILogoff(long long long long)
+211 stdcall MAPISendMail(long long ptr long long)
212 stub MAPISaveMail
213 stub MAPIReadMail
214 stub MAPIFindNext
Modified: trunk/reactos/dll/win32/mapi32/mapi32_main.c
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32_mai…
==============================================================================
--- trunk/reactos/dll/win32/mapi32/mapi32_main.c (original)
+++ trunk/reactos/dll/win32/mapi32/mapi32_main.c Mon Apr 17 11:45:48 2006
@@ -25,6 +25,7 @@
#include "winerror.h"
#include "objbase.h"
#include "mapix.h"
+#include "mapi.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(mapi);
@@ -67,28 +68,39 @@
return MAPI_ObjectCount == 0 ? S_OK : S_FALSE;
}
-HRESULT WINAPI MAPIInitialize ( LPVOID lpMapiInit )
+HRESULT WINAPI MAPIInitialize(LPVOID init)
{
- ERR("Stub\n");
- return MAPI_E_NOT_INITIALIZED;
+ FIXME("(%p) Stub\n", init);
+ return SUCCESS_SUCCESS;
}
-ULONG WINAPI MAPILogon(ULONG ulUIParam, LPSTR lpszProfileName, LPSTR
-lpszPassword, FLAGS flFlags, ULONG ulReserver, LPLHANDLE lplhSession)
+ULONG WINAPI MAPILogon(ULONG uiparam, LPSTR profile, LPSTR password,
+ FLAGS flags, ULONG reserved, LPLHANDLE session)
{
- ERR("Stub\n");
- return MAPI_E_LOGON_FAILED;
+ FIXME("(0x%08lx %s %p 0x%08lx 0x%08lx %p) Stub\n", uiparam,
+ debugstr_a(profile), password, flags, reserved, session);
+
+ if (session) *session = 1;
+ return SUCCESS_SUCCESS;
}
-HRESULT WINAPI MAPILogonEx(ULONG_PTR ulUIParam, LPWSTR lpszProfileName,
- LPWSTR lpszPassword, ULONG flFlags,
- LPMAPISESSION *lppSession)
+ULONG WINAPI MAPILogoff(LHANDLE session, ULONG uiparam, FLAGS flags,
+ ULONG reserved )
{
- ERR("Stub\n");
- return MAPI_E_LOGON_FAILED;
+ FIXME("(0x%08lx 0x%08lx 0x%08lx 0x%08lx) Stub\n", session,
+ uiparam, flags, reserved);
+ return SUCCESS_SUCCESS;
+}
+
+HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile,
+ LPWSTR password, ULONG flags, LPMAPISESSION *session)
+{
+ FIXME("(0x%08lx %s %p 0x%08lx %p) Stub\n", uiparam,
+ debugstr_w(profile), password, flags, session);
+ return SUCCESS_SUCCESS;
}
VOID WINAPI MAPIUninitialize(void)
{
- ERR("Stub\n");
+ FIXME("Stub\n");
}
Modified: trunk/reactos/include/mapi.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/include/mapi.h?rev=21622&am…
==============================================================================
--- trunk/reactos/include/mapi.h (original)
+++ trunk/reactos/include/mapi.h Mon Apr 17 11:45:48 2006
@@ -1,163 +1,201 @@
-#ifndef _MAPI_H
-#define _MAPI_H
-#if __GNUC__ >=3
-#pragma GCC system_header
-#endif
+/*
+ * Copyright (C) 2000 François Gouget
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef MAPI_H
+#define MAPI_H
#ifdef __cplusplus
extern "C" {
#endif
-#define SUCCESS_SUCCESS 0
-#define MAPI_USER_ABORT 1
-#define MAPI_E_USER_ABORT 1
-#define MAPI_E_FAILURE 2
-#define MAPI_E_LOGIN_FAILURE 3
-#define MAPI_E_LOGON_FAILURE 3
-#define MAPI_E_DISK_FULL 4
-#define MAPI_E_INSUFFICIENT_MEMORY 5
-#define MAPI_E_ACCESS_DENIED 6
-#define MAPI_E_BLK_TOO_SMALL 6
-#define MAPI_E_TOO_MANY_SESSIONS 8
-#define MAPI_E_TOO_MANY_FILES 9
-#define MAPI_E_TOO_MANY_RECIPIENTS 10
-#define MAPI_E_ATTACHMENT_NOT_FOUND 11
-#define MAPI_E_ATTACHMENT_OPEN_FAILURE 12
-#define MAPI_E_ATTACHMENT_WRITE_FAILURE 13
-#define MAPI_E_UNKNOWN_RECIPIENT 14
-#define MAPI_E_BAD_RECIPTYPE 15
-#define MAPI_E_NO_MESSAGES 16
-#define MAPI_E_INVALID_MESSAGE 17
-#define MAPI_E_TEXT_TOO_LARGE 18
-#define MAPI_E_INVALID_SESSION 19
-#define MAPI_E_TYPE_NOT_SUPPORTED 20
-#define MAPI_E_AMBIGUOUS_RECIPIENT 21
-#define MAPI_E_AMBIGUOUS_RECIP 21
-#define MAPI_E_MESSAGE_IN_USE 22
-#define MAPI_E_NETWORK_FAILURE 23
-#define MAPI_E_INVALID_EDITFIELDS 24
-#define MAPI_E_INVALID_RECIPS 25
-#define MAPI_E_NOT_SUPPORTED 26
-
-#define MAPI_ORIG 0
-#define MAPI_TO 1
-#define MAPI_CC 2
-#define MAPI_BCC 3
-
-#define MAPI_LOGON_UI 0x0001
-#define MAPI_NEW_SESSION 0x0002
-#define MAPI_FORCE_DOWNLOAD 0x1000
-#define MAPI_LOGOFF_SHARED 0x0001
-#define MAPI_LOGOFF_UI 0x0002
-#define MAPI_DIALOG 0x0008
-#define MAPI_UNREAD_ONLY 0x0020
-#define MAPI_LONG_MSGID 0x4000
-#define MAPI_GUARANTEE_FIFO 0x0100
-#define MAPI_ENVELOPE_ONLY 0x0040
-#define MAPI_PEEK 0x0080
-#define MAPI_BODY_AS_FILE 0x0200
-#define MAPI_SUPPRESS_ATTACH 0x0800
-#define MAPI_AB_NOMODIFY 0x0400
-#define MAPI_OLE 0x0001
-#define MAPI_OLE_STATIC 0x0002
-#define MAPI_UNREAD 0x0001
-#define MAPI_RECEIPT_REQUESTED 0x0002
-#define MAPI_SENT 0x0004
-
-#ifndef RC_INVOKED
-typedef unsigned long FLAGS;
-typedef unsigned long LHANDLE;
-typedef unsigned long FAR *LPLHANDLE, FAR *LPULONG;
-
-typedef struct {
- ULONG ulReserved;
- ULONG ulRecipClass;
- LPSTR lpszName;
- LPSTR lpszAddress;
- ULONG ulEIDSize;
- LPVOID lpEntryID;
+/* Some types */
+
+#ifndef __LHANDLE
+#define __LHANDLE
+typedef unsigned long LHANDLE, *LPLHANDLE;
+#endif
+#define lhSessionNull ((LHANDLE)0)
+
+#ifndef WINE_FLAGS_DEFINED
+#define WINE_FLAGS_DEFINED
+typedef unsigned long FLAGS;
+#endif
+typedef unsigned long* LPULONG;
+
+typedef struct
+{
+ ULONG ulReserved;
+ ULONG flFlags;
+ ULONG nPosition;
+ LPSTR lpszPathName;
+ LPSTR lpszFileName;
+ LPVOID lpFileType;
+} MapiFileDesc, *lpMapiFileDesc;
+
+#ifndef MAPI_ORIG
+#define MAPI_ORIG 0
+#define MAPI_TO 1
+#define MAPI_CC 2
+#define MAPI_BCC 3
+#endif
+
+typedef struct
+{
+ ULONG ulReserved;
+ ULONG ulRecipClass;
+ LPSTR lpszName;
+ LPSTR lpszAddress;
+ ULONG ulEIDSize;
+ LPVOID lpEntryID;
} MapiRecipDesc, *lpMapiRecipDesc;
-typedef struct {
- ULONG ulReserved;
- ULONG flFlags;
- ULONG nPosition;
- LPSTR lpszPathName;
- LPSTR lpszFileName;
- LPVOID lpFileType;
-} MapiFileDesc, *lpMapiFileDesc;
-typedef struct {
- ULONG ulReserved;
- ULONG cbTag;
- LPBYTE lpTag;
- ULONG cbEncoding;
- LPBYTE lpEncoding;
-} MapiFileTagExt, *lpMapiFileTagExt;
-typedef struct {
- ULONG ulReserved;
- LPSTR lpszSubject;
- LPSTR lpszNoteText;
- LPSTR lpszMessageType;
- LPSTR lpszDateReceived;
- LPSTR lpszConversationID;
- FLAGS flFlags;
- lpMapiRecipDesc lpOriginator;
- ULONG nRecipCount;
- lpMapiRecipDesc lpRecips;
- ULONG nFileCount;
- lpMapiFileDesc lpFiles;
+
+typedef struct
+{
+ ULONG ulReserved;
+ LPSTR lpszSubject;
+ LPSTR lpszNoteText;
+ LPSTR lpszMessageType;
+ LPSTR lpszDateReceived;
+ LPSTR lpszConversationID;
+ FLAGS flFlags;
+ lpMapiRecipDesc lpOriginator;
+ ULONG nRecipCount;
+ lpMapiRecipDesc lpRecips;
+ ULONG nFileCount;
+ lpMapiFileDesc lpFiles;
} MapiMessage, *lpMapiMessage;
-ULONG PASCAL MAPILogon (ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE);
-ULONG PASCAL MAPISendMail (LHANDLE,ULONG,lpMapiMessage,FLAGS,ULONG);
-ULONG PASCAL MAPISendDocuments (ULONG,LPSTR,LPSTR,LPSTR,ULONG);
-ULONG PASCAL MAPIReadMail (LHANDLE,ULONG,LPSTR,FLAGS,ULONG,
- lpMapiMessage*);
-ULONG PASCAL MAPIFindNext (LHANDLE,ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPSTR);
-ULONG PASCAL MAPIResolveName (LHANDLE,ULONG,LPSTR,FLAGS,ULONG,
- lpMapiRecipDesc*);
-ULONG PASCAL MAPIAddress (LHANDLE,ULONG,LPSTR,ULONG,LPSTR,ULONG,
- lpMapiRecipDesc,FLAGS,ULONG,LPULONG,
- lpMapiRecipDesc*);
-ULONG PASCAL MAPIFreeBuffer (LPVOID);
-ULONG PASCAL MAPIDetails (LHANDLE,ULONG,lpMapiRecipDesc,FLAGS,ULONG);
-ULONG PASCAL MAPISaveMail (LHANDLE,ULONG,lpMapiMessage lpszMessage,
- FLAGS,ULONG,LPSTR);
-ULONG PASCAL MAPIDeleteMail (LHANDLE lpSession,ULONG,LPSTR,FLAGS,ULONG);
-ULONG PASCAL MAPILogoff (LHANDLE,ULONG,FLAGS,ULONG);
-/* Netscape extensions. */
-ULONG PASCAL MAPIGetNetscapeVersion (void);
-ULONG PASCAL MAPI_NSCP_SynchronizeClient (LHANDLE,ULONG);
-
-/* Handles for use with GetProcAddress */
-typedef ULONG (PASCAL * LPMAPILOGON) (ULONG,LPSTR,LPSTR,FLAGS,ULONG,
- LPLHANDLE);
-typedef ULONG (PASCAL * LPMAPISENDMAIL) (LHANDLE,ULONG,lpMapiMessage,
- FLAGS,ULONG);
-typedef ULONG (PASCAL * LPMAPISENDDOCUMENTS) (ULONG,LPSTR,LPSTR,
- LPSTR,ULONG);
-typedef ULONG (PASCAL * LPMAPIREADMAIL) (LHANDLE,ULONG,LPSTR,FLAGS,
- ULONG,lpMapiMessage*);
-typedef ULONG (PASCAL * LPMAPIFINDNEXT) (LHANDLE,ULONG,LPSTR,LPSTR,
- FLAGS,ULONG,LPSTR);
-typedef ULONG (PASCAL * LPMAPIRESOLVENAME) (LHANDLE,ULONG,LPSTR,FLAGS,
- ULONG,lpMapiRecipDesc*);
-typedef ULONG (PASCAL * LPMAPIADDRESS) (LHANDLE,ULONG,LPSTR,ULONG,LPSTR,
- ULONG,lpMapiRecipDesc,FLAGS,ULONG,
- LPULONG,lpMapiRecipDesc*);
-typedef ULONG (PASCAL * LPMAPIFREEBUFFER) (LPVOID lpv);
-typedef ULONG (PASCAL * LPMAPIDETAILS) (LHANDLE,ULONG,lpMapiRecipDesc,
- FLAGS,ULONG);
-typedef ULONG (PASCAL * LPMAPISAVEMAIL) (LHANDLE,ULONG,lpMapiMessage,
- FLAGS,ULONG,LPSTR);
-typedef ULONG (PASCAL * LPMAPIDELETEMAIL) (LHANDLE lpSession,ULONG,
- LPSTR, FLAGS,ULONG);
-typedef ULONG (PASCAL * LPMAPILOGOFF)(LHANDLE,ULONG,FLAGS,ULONG);
-
-#endif /* RC_INVOKED */
+
+/* Error codes */
+
+#ifndef SUCCESS_SUCCESS
+#define SUCCESS_SUCCESS 0L
+#endif
+
+#define MAPI_USER_ABORT 1
+#define MAPI_E_USER_ABORT MAPI_USER_ABORT
+#define MAPI_E_FAILURE 2
+#define MAPI_E_LOGON_FAILURE 3
+#define MAPI_E_LOGIN_FAILURE MAPI_E_LOGON_FAILURE
+#define MAPI_E_DISK_FULL 4
+#define MAPI_E_INSUFFICIENT_MEMORY 5
+#define MAPI_E_ACCESS_DENIED 6
+#define MAPI_E_TOO_MANY_SESSIONS 8
+#define MAPI_E_TOO_MANY_FILES 9
+#define MAPI_E_TOO_MANY_RECIPIENTS 10
+#define MAPI_E_ATTACHMENT_NOT_FOUND 11
+#define MAPI_E_ATTACHMENT_OPEN_FAILURE 12
+#define MAPI_E_ATTACHMENT_WRITE_FAILURE 13
+#define MAPI_E_UNKNOWN_RECIPIENT 14
+#define MAPI_E_BAD_RECIPTYPE 15
+#define MAPI_E_NO_MESSAGES 16
+#define MAPI_E_INVALID_MESSAGE 17
+#define MAPI_E_TEXT_TOO_LARGE 18
+#define MAPI_E_INVALID_SESSION 19
+#define MAPI_E_TYPE_NOT_SUPPORTED 20
+#define MAPI_E_AMBIGUOUS_RECIPIENT 21
+#define MAPI_E_AMBIG_RECIP MAPI_E_AMBIGUOUS_RECIPIENT
+#define MAPI_E_MESSAGE_IN_USE 22
+#define MAPI_E_NETWORK_FAILURE 23
+#define MAPI_E_INVALID_EDITFIELDS 24
+#define MAPI_E_INVALID_RECIPS 25
+#define MAPI_E_NOT_SUPPORTED 26
+
+
+/* MAPILogon */
+
+#ifndef MAPI_LOGON_UI
+#define MAPI_LOGON_UI 0x00000001
+#endif
+#ifndef MAPI_NEW_SESSION
+#define MAPI_NEW_SESSION 0x00000002
+#endif
+#ifndef MAPI_EXTENDED
+#define MAPI_EXTENDED 0x00000020
+#endif
+#ifndef MAPI_FORCE_DOWNLOAD
+#define MAPI_FORCE_DOWNLOAD 0x00001000
+#endif
+#ifndef MAPI_PASSWORD_UI
+#define MAPI_PASSWORD_UI 0x00020000
+#endif
+
+
+/* MAPISendMail */
+
+#define MAPI_DIALOG 0x00000008
+
+
+/* API typedefs and prototypes */
+
+typedef ULONG (WINAPI
MAPIADDRESS)(LHANDLE,ULONG_PTR,LPSTR,ULONG,LPSTR,ULONG,lpMapiRecipDesc,FLAGS,ULONG,LPULONG,lpMapiRecipDesc*);
+typedef MAPIADDRESS *LPMAPIADDRESS;
+MAPIADDRESS MAPIAddress;
+
+typedef ULONG (WINAPI MAPIDELETEMAIL)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG);
+typedef MAPIDELETEMAIL *LPMAPIDELETEMAIL;
+MAPIDELETEMAIL MAPIDeleteMail;
+
+typedef ULONG (WINAPI MAPIDETAILS)(LHANDLE,ULONG_PTR,lpMapiRecipDesc,FLAGS,ULONG);
+typedef MAPIDETAILS *LPMAPIDETAILS;
+MAPIDETAILS MAPIDetails;
+
+typedef ULONG (WINAPI MAPIFINDNEXT)(LHANDLE,ULONG_PTR,LPSTR,LPSTR,FLAGS,ULONG,LPSTR);
+typedef MAPIFINDNEXT *LPMAPIFINDNEXT;
+MAPIFINDNEXT MAPIFindNext;
+
+#ifndef MAPIFREEBUFFER_DEFINED
+#define MAPIFREEBUFFER_DEFINED
+typedef ULONG (WINAPI MAPIFREEBUFFER)(LPVOID);
+typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER;
+MAPIFREEBUFFER MAPIFreeBuffer;
+#endif
+
+typedef ULONG (WINAPI MAPILOGOFF)(LHANDLE,ULONG_PTR,FLAGS,ULONG);
+typedef MAPILOGOFF *LPMAPILOGOFF;
+MAPILOGOFF MAPILogoff;
+
+typedef ULONG (WINAPI MAPILOGON)(ULONG_PTR,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE);
+typedef MAPILOGON *LPMAPILOGON;
+MAPILOGON MAPILogon;
+
+typedef ULONG (WINAPI MAPIREADMAIL)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG,lpMapiMessage);
+typedef MAPIREADMAIL *LPMAPIREADMAIL;
+MAPIREADMAIL MAPIReadMail;
+
+typedef ULONG (WINAPI
MAPIRESOLVENAME)(LHANDLE,ULONG_PTR,LPSTR,FLAGS,ULONG,lpMapiRecipDesc*);
+typedef MAPIRESOLVENAME *LPMAPIRESOLVENAME;
+MAPIRESOLVENAME MAPIResolveName;
+
+typedef ULONG (WINAPI MAPISAVEMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG,LPSTR);
+typedef MAPISAVEMAIL *LPMAPISAVEMAIL;
+MAPISAVEMAIL MAPISaveMail;
+
+typedef ULONG (WINAPI MAPISENDDOCUMENTS)(ULONG_PTR,LPSTR,LPSTR,LPSTR,ULONG);
+typedef MAPISENDDOCUMENTS *LPMAPISENDDOCUMENTS;
+MAPISENDDOCUMENTS MAPISendDocuments;
+
+typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG);
+typedef MAPISENDMAIL *LPMAPI;
+MAPISENDMAIL MAPISendMail;
#ifdef __cplusplus
}
#endif
-#endif /* Not _MAPI_H */
-
+#endif /* MAPI_H */
Modified: trunk/reactos/include/mapicode.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/include/mapicode.h?rev=2162…
==============================================================================
--- trunk/reactos/include/mapicode.h (original)
+++ trunk/reactos/include/mapicode.h Mon Apr 17 11:45:48 2006
@@ -28,6 +28,10 @@
#define MAKE_MAPI_E(e) (MAKE_MAPI_SCODE(1,FACILITY_ITF,(e)))
#define MAKE_MAPI_S(e) (MAKE_MAPI_SCODE(0,FACILITY_ITF,(e)))
+
+#ifndef SUCCESS_SUCCESS
+#define SUCCESS_SUCCESS 0L
+#endif
/* Errors */
#define MAPI_E_ACCOUNT_DISABLED ((SCODE)0x80040124)
Modified: trunk/reactos/include/mapix.h
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/include/mapix.h?rev=21622&a…
==============================================================================
--- trunk/reactos/include/mapix.h (original)
+++ trunk/reactos/include/mapix.h Mon Apr 17 11:45:48 2006
@@ -42,20 +42,33 @@
typedef IMsgServiceAdmin *LPSERVICEADMIN;
typedef struct IMAPISession *LPMAPISESSION;
-typedef unsigned long FLAGS;
+#ifndef WINE_FLAGS_DEFINED
+#define WINE_FLAGS_DEFINED
+typedef unsigned long FLAGS;
+#endif
/* Flags for MAPILogon and MAPILogonEx */
-#define MAPI_LOGON_UI 0x000001
-#define MAPI_NEW_SESSION 0x000002
-#define MAPI_EXTENDED 0x000020
-#define MAPI_FORCE_DOWNLOAD 0x001000
-#define MAPI_PASSWORD_UI 0x020000
-#define MAPI_ALLOW_OTHERS 0x000008
-#define MAPI_EXPLICIT_PROFILE 0x000010
-#define MAPI_SERVICE_UI_ALWAYS 0x002000
-#define MAPI_NO_MAIL 0x008000
-#define MAPI_NT_SERVICE 0x010000
-#define MAPI_TIMEOUT_SHORT 0x100000
+#ifndef MAPI_LOGON_UI
+#define MAPI_LOGON_UI 0x00000001
+#endif
+#ifndef MAPI_NEW_SESSION
+#define MAPI_NEW_SESSION 0x00000002
+#endif
+#define MAPI_ALLOW_OTHERS 0x00000008
+#define MAPI_EXPLICIT_PROFILE 0x00000010
+#ifndef MAPI_EXTENDED
+#define MAPI_EXTENDED 0x00000020
+#endif
+#ifndef MAPI_FORCE_DOWNLOAD
+#define MAPI_FORCE_DOWNLOAD 0x00001000
+#endif
+#ifndef MAPI_PASSWORD_UI
+#define MAPI_PASSWORD_UI 0x00020000
+#endif
+#define MAPI_SERVICE_UI_ALWAYS 0x00002000
+#define MAPI_NO_MAIL 0x00008000
+#define MAPI_NT_SERVICE 0x00010000
+#define MAPI_TIMEOUT_SHORT 0x00100000
#define MAPI_SIMPLE_DEFAULT (MAPI_LOGON_UI|MAPI_ALLOW_OTHERS|MAPI_FORCE_DOWNLOAD)
#define MAPI_SIMPLE_EXPLICIT
(MAPI_NEW_SESSION|MAPI_EXPLICIT_PROFILE|MAPI_FORCE_DOWNLOAD)
@@ -94,9 +107,12 @@
typedef MAPIALLOCATEMORE *LPMAPIALLOCATEMORE;
MAPIALLOCATEMORE MAPIAllocateMore;
+#ifndef MAPIFREEBUFFER_DEFINED
+#define MAPIFREEBUFFER_DEFINED
typedef ULONG (WINAPI MAPIFREEBUFFER)(LPVOID);
typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER;
MAPIFREEBUFFER MAPIFreeBuffer;
+#endif
/*****************************************************************************
* IMAPISession interface
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2…
==============================================================================
--- trunk/reactos/media/doc/README.WINE (original)
+++ trunk/reactos/media/doc/README.WINE Mon Apr 17 11:45:48 2006
@@ -43,11 +43,11 @@
reactos/dll/win32/comdlg32 # Synced to Wine-0_9_5
reactos/dll/win32/crypt32 # Synced to Wine-0_9_10
reactos/dll/win32/dbghelp #
-reactos/dll/win32/icmp # Synced to Wine-0_9_5
+reactos/dll/win32/icmp # Synced to Wine-0_9_10
reactos/dll/win32/imm32 # Synced to Wine-0_9_10
reactos/dll/win32/iphlpapi # Out of sync
reactos/dll/win32/imagehlp # Patches for BindImage need review and submission to
winehq.
-reactos/dll/win32/mapi32 # Synced to Wine-0_9_5
+reactos/dll/win32/mapi32 # Synced to Wine-0_9_10
reactos/dll/win32/msvcrt20 # Out of sync
reactos/dll/win32/mpr # Synced to Wine-0_9_5
reactos/dll/win32/msacm # Out of sync
6829
days inactive
6829
days old
0 comments
1 participants
participants (1)
-
fireball＠svn.reactos.org