Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 22:37:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

update mapi headers to wine 1.1.13

Browse source 
svn path=/trunk/; revision=38970
This commit is contained in:
Christoph von Wittich 2009-01-20 08:19:52 +00:00
parent 2486417489
commit 7dfd3a9852
8 changed files with 54 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/include/psdk/mapi.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2000 François Gouget * Copyright (C) 2000 Francois Gouget
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPI_H #ifndef MAPI_H
@ -27,15 +27,15 @@ extern "C" {
#ifndef __LHANDLE #ifndef __LHANDLE
#define __LHANDLE #define __LHANDLE
typedef unsigned long LHANDLE, *LPLHANDLE; typedef ULONG LHANDLE, *LPLHANDLE;
#endif #endif
#define lhSessionNull ((LHANDLE)0) #define lhSessionNull ((LHANDLE)0)
#ifndef WINE_FLAGS_DEFINED #ifndef WINE_FLAGS_DEFINED
#define WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED
typedef unsigned long FLAGS; typedef ULONG FLAGS;
#endif #endif
typedef unsigned long* LPULONG; typedef ULONG *LPULONG;
typedef struct typedef struct
{ {
@ -191,7 +191,7 @@ typedef MAPISENDDOCUMENTS *LPMAPISENDDOCUMENTS;
MAPISENDDOCUMENTS MAPISendDocuments; MAPISENDDOCUMENTS MAPISendDocuments;
typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG); typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG);
typedef MAPISENDMAIL *LPMAPI; typedef MAPISENDMAIL *LPMAPISENDMAIL;
MAPISENDMAIL MAPISendMail; MAPISENDMAIL MAPISendMail;
#ifdef __cplusplus #ifdef __cplusplus

2
reactos/include/psdk/mapicode.h
View file

@ -15,7 +15,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPICODE_H #ifndef MAPICODE_H

9
reactos/include/psdk/mapidefs.h
View file

@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPIDEFS_H #ifndef MAPIDEFS_H
@ -24,9 +24,8 @@
#endif #endif
#include <winerror.h> #include <winerror.h>
#ifndef _OBJBASE_H_
#include <objbase.h> #include <objbase.h>
#endif #include <stddef.h>
/* Some types from other headers */ /* Some types from other headers */
#ifndef __LHANDLE #ifndef __LHANDLE
@ -219,7 +218,7 @@ typedef struct _MAPIUID
#define MVI_FLAG (MV_FLAG|MV_INSTANCE) #define MVI_FLAG (MV_FLAG|MV_INSTANCE)
#define MVI_PROP(t) ((t)|MVI_FLAG) #define MVI_PROP(t) ((t)|MVI_FLAG)
#ifndef __WINESRC__ #ifndef WINE_NO_UNICODE_MACROS
# ifdef UNICODE # ifdef UNICODE
# define PT_TSTRING PT_UNICODE # define PT_TSTRING PT_UNICODE
# define PT_MV_TSTRING (MV_FLAG|PT_UNICODE) # define PT_MV_TSTRING (MV_FLAG|PT_UNICODE)
@ -435,7 +434,7 @@ typedef struct _SRowSet
typedef struct _SPropProblem typedef struct _SPropProblem
{ {
ULONG ulIndex; /* Index of the property */ ULONG ulIndex; /* Index of the property */
ULONG ulPropTag; /* Proprty tag of the property */ ULONG ulPropTag; /* Property tag of the property */
SCODE scode; /* Error code of the problem */ SCODE scode; /* Error code of the problem */
} SPropProblem, *LPSPropProblem; } SPropProblem, *LPSPropProblem;

2
reactos/include/psdk/mapiguid.h
View file

@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPIGUID_H #ifndef MAPIGUID_H

10
reactos/include/psdk/mapitags.h
View file

@ -6,16 +6,16 @@
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License,or (at your option) any later version. * 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, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not,write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation,Inc.,59 Temple Place,Suite 330,Boston,MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPITAGS_H #ifndef MAPITAGS_H
#define MAPITAGS_H #define MAPITAGS_H
@ -415,7 +415,7 @@
#define PR_IPM_OUTBOX_SEARCH_KEY PROP_TAG(PT_BINARY,0x3411) #define PR_IPM_OUTBOX_SEARCH_KEY PROP_TAG(PT_BINARY,0x3411)
#define PR_IPM_WASTEBASKET_SEARCH_KEY PROP_TAG(PT_BINARY,0x3412) #define PR_IPM_WASTEBASKET_SEARCH_KEY PROP_TAG(PT_BINARY,0x3412)
#define PR_IPM_SENTMAIL_SEARCH_KEY PROP_TAG(PT_BINARY,0x3413) #define PR_IPM_SENTMAIL_SEARCH_KEY PROP_TAG(PT_BINARY,0x3413)
/* Provder-defined message store type */ /* Provider-defined message store type */
#define PR_MDB_PROVIDER PROP_TAG(PT_BINARY,0x3414) #define PR_MDB_PROVIDER PROP_TAG(PT_BINARY,0x3414)
#define PR_RECEIVE_FOLDER_SETTINGS PROP_TAG(PT_OBJECT,0x3415) #define PR_RECEIVE_FOLDER_SETTINGS PROP_TAG(PT_OBJECT,0x3415)
#define PR_VALID_FOLDER_MASK PROP_TAG(PT_I4,0x35DF) #define PR_VALID_FOLDER_MASK PROP_TAG(PT_I4,0x35DF)

2
reactos/include/psdk/mapiutil.h
View file

@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPIUTIL_H_ #ifndef MAPIUTIL_H_

4
reactos/include/psdk/mapival.h
View file

@ -13,7 +13,7 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPIVAL_H #ifndef MAPIVAL_H
@ -24,6 +24,8 @@ extern "C" {
#endif #endif
#include <mapiutil.h> #include <mapiutil.h>
#include <stddef.h>
#include <stdarg.h>
BOOL WINAPI FBadRglpszW(LPWSTR*,ULONG); BOOL WINAPI FBadRglpszW(LPWSTR*,ULONG);
BOOL WINAPI FBadRowSet(LPSRowSet); BOOL WINAPI FBadRowSet(LPSRowSet);

16
reactos/include/psdk/mapix.h
View file

@ -13,24 +13,16 @@
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#ifndef MAPIX_H #ifndef MAPIX_H
#define MAPIX_H #define MAPIX_H
#ifndef MAPIDEFS_H
#include <mapidefs.h> #include <mapidefs.h>
#endif
#ifndef MAPICODE_H
#include <mapicode.h> #include <mapicode.h>
#endif
#ifndef MAPIGUID_H
#include <mapiguid.h> #include <mapiguid.h>
#endif
#ifndef MAPITAGS_H
#include <mapitags.h> #include <mapitags.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -44,7 +36,7 @@ typedef struct IMAPISession *LPMAPISESSION;
#ifndef WINE_FLAGS_DEFINED #ifndef WINE_FLAGS_DEFINED
#define WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED
typedef unsigned long FLAGS; typedef ULONG FLAGS;
#endif #endif
/* Flags for MAPILogon and MAPILogonEx */ /* Flags for MAPILogon and MAPILogonEx */
@ -114,6 +106,10 @@ typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER;
MAPIFREEBUFFER MAPIFreeBuffer; MAPIFREEBUFFER MAPIFreeBuffer;
#endif #endif
typedef HRESULT (WINAPI MAPIADMINPROFILES)(ULONG,LPPROFADMIN*);
typedef MAPIADMINPROFILES *LPMAPIADMINPROFILES;
MAPIADMINPROFILES MAPIAdminProfiles;
/***************************************************************************** /*****************************************************************************
* IMAPISession interface * IMAPISession interface
*/ */