diff --git a/reactos/include/psdk/mapi.h b/reactos/include/psdk/mapi.h index 17b20be22fe..2d335ea588a 100644 --- a/reactos/include/psdk/mapi.h +++ b/reactos/include/psdk/mapi.h @@ -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 * 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 * 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 @@ -27,15 +27,15 @@ extern "C" { #ifndef __LHANDLE #define __LHANDLE -typedef unsigned long LHANDLE, *LPLHANDLE; +typedef ULONG LHANDLE, *LPLHANDLE; #endif #define lhSessionNull ((LHANDLE)0) #ifndef WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED -typedef unsigned long FLAGS; +typedef ULONG FLAGS; #endif -typedef unsigned long* LPULONG; +typedef ULONG *LPULONG; typedef struct { @@ -191,7 +191,7 @@ typedef MAPISENDDOCUMENTS *LPMAPISENDDOCUMENTS; MAPISENDDOCUMENTS MAPISendDocuments; typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG); -typedef MAPISENDMAIL *LPMAPI; +typedef MAPISENDMAIL *LPMAPISENDMAIL; MAPISENDMAIL MAPISendMail; #ifdef __cplusplus diff --git a/reactos/include/psdk/mapicode.h b/reactos/include/psdk/mapicode.h index 9cf5a8ec2cf..31e6830f089 100644 --- a/reactos/include/psdk/mapicode.h +++ b/reactos/include/psdk/mapicode.h @@ -15,7 +15,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPICODE_H diff --git a/reactos/include/psdk/mapidefs.h b/reactos/include/psdk/mapidefs.h index 1b18dd67a31..27444275137 100644 --- a/reactos/include/psdk/mapidefs.h +++ b/reactos/include/psdk/mapidefs.h @@ -13,7 +13,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIDEFS_H @@ -24,9 +24,8 @@ #endif #include -#ifndef _OBJBASE_H_ #include -#endif +#include /* Some types from other headers */ #ifndef __LHANDLE @@ -219,7 +218,7 @@ typedef struct _MAPIUID #define MVI_FLAG (MV_FLAG|MV_INSTANCE) #define MVI_PROP(t) ((t)|MVI_FLAG) -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS # ifdef UNICODE # define PT_TSTRING PT_UNICODE # define PT_MV_TSTRING (MV_FLAG|PT_UNICODE) @@ -435,7 +434,7 @@ typedef struct _SRowSet typedef struct _SPropProblem { 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 */ } SPropProblem, *LPSPropProblem; @@ -896,17 +895,17 @@ DECLARE_INTERFACE_(IMAPIProp,IUnknown) #define IMAPIProp_AddRef(p) (p)->lpVtbl->AddRef(p) #define IMAPIProp_Release(p) (p)->lpVtbl->Release(p) /*** IMAPIProp methods ***/ -#define IMAPIProp_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) -#define IMAPIProp_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) -#define IMAPIProp_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) -#define IMAPIProp_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) -#define IMAPIProp_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) -#define IMAPIProp_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) -#define IMAPIProp_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) -#define IMAPIProp_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) -#define IMAPIProp_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) -#define IMAPIProp_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) -#define IMAPIProp_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) +#define IMAPIProp_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) +#define IMAPIProp_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) +#define IMAPIProp_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) +#define IMAPIProp_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) +#define IMAPIProp_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) +#define IMAPIProp_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) +#define IMAPIProp_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) +#define IMAPIProp_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) +#define IMAPIProp_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) +#define IMAPIProp_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) +#define IMAPIProp_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) #endif typedef IMAPIProp *LPMAPIPROP; diff --git a/reactos/include/psdk/mapiguid.h b/reactos/include/psdk/mapiguid.h index 2c8e34a94fc..26af255a7cd 100644 --- a/reactos/include/psdk/mapiguid.h +++ b/reactos/include/psdk/mapiguid.h @@ -13,7 +13,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIGUID_H diff --git a/reactos/include/psdk/mapitags.h b/reactos/include/psdk/mapitags.h index f1de4345063..abeee4845b1 100644 --- a/reactos/include/psdk/mapitags.h +++ b/reactos/include/psdk/mapitags.h @@ -6,16 +6,16 @@ * 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. + * 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 + * 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 + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPITAGS_H #define MAPITAGS_H @@ -415,7 +415,7 @@ #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_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_RECEIVE_FOLDER_SETTINGS PROP_TAG(PT_OBJECT,0x3415) #define PR_VALID_FOLDER_MASK PROP_TAG(PT_I4,0x35DF) diff --git a/reactos/include/psdk/mapiutil.h b/reactos/include/psdk/mapiutil.h index 6e512969781..8c53a1ca88b 100644 --- a/reactos/include/psdk/mapiutil.h +++ b/reactos/include/psdk/mapiutil.h @@ -13,7 +13,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIUTIL_H_ @@ -175,7 +175,7 @@ LPSPropValue WINAPI LpValFindProp(ULONG,ULONG,LPSPropValue); static inline FILETIME FtAddFt(FILETIME ftLeft, FILETIME ftRight) { LONG64 *pl = (LONG64*)&ftLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = *pl + *pr; return ftmap.ft; } @@ -183,7 +183,7 @@ static inline FILETIME FtAddFt(FILETIME ftLeft, FILETIME ftRight) static inline FILETIME FtSubFt(FILETIME ftLeft, FILETIME ftRight) { LONG64 *pl = (LONG64*)&ftLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = *pl - *pr; return ftmap.ft; } @@ -191,7 +191,7 @@ static inline FILETIME FtSubFt(FILETIME ftLeft, FILETIME ftRight) static inline FILETIME FtNegFt(FILETIME ftLeft) { LONG64 *p = (LONG64*)&ftLeft; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = -*p; return ftmap.ft; } @@ -199,7 +199,7 @@ static inline FILETIME FtNegFt(FILETIME ftLeft) static inline FILETIME FtMulDw(DWORD dwLeft, FILETIME ftRight) { LONG64 l = (LONG64)dwLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = l * (*pr); return ftmap.ft; } @@ -207,7 +207,7 @@ static inline FILETIME FtMulDw(DWORD dwLeft, FILETIME ftRight) static inline FILETIME FtMulDwDw(DWORD dwLeft, DWORD dwRight) { LONG64 l = (LONG64)dwLeft, r = (LONG64)dwRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = l * r; return ftmap.ft; } @@ -253,17 +253,17 @@ DECLARE_INTERFACE_(IPropData,IMAPIProp) #define IPropData_AddRef(p) (p)->lpVtbl->AddRef(p) #define IPropData_Release(p) (p)->lpVtbl->Release(p) /*** IMAPIProp methods ***/ -#define IPropData_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) -#define IPropData_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) -#define IPropData_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) -#define IPropData_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) -#define IPropData_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) -#define IPropData_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) -#define IPropData_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) -#define IPropData_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) -#define IPropData_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) -#define IPropData_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) -#define IPropData_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) +#define IPropData_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) +#define IPropData_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) +#define IPropData_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) +#define IPropData_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) +#define IPropData_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) +#define IPropData_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) +#define IPropData_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) +#define IPropData_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) +#define IPropData_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) +#define IPropData_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) +#define IPropData_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) #define IPropData_HrSetObjAccess(p,a) (p)->lpVtbl->HrSetObjAccess(p,a) #define IPropData_HrSetPropAccess(p,a,b) (p)->lpVtbl->HrSetPropAccess(p,a,b) #define IPropData_HrGetPropAccess(p,a,b) (p)->lpVtbl->HrGetPropAccess(p,a,b) diff --git a/reactos/include/psdk/mapival.h b/reactos/include/psdk/mapival.h index 465f9e4a7a8..82cd020db9d 100644 --- a/reactos/include/psdk/mapival.h +++ b/reactos/include/psdk/mapival.h @@ -13,7 +13,7 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIVAL_H @@ -24,6 +24,8 @@ extern "C" { #endif #include +#include +#include BOOL WINAPI FBadRglpszW(LPWSTR*,ULONG); BOOL WINAPI FBadRowSet(LPSRowSet); diff --git a/reactos/include/psdk/mapix.h b/reactos/include/psdk/mapix.h index 99cbd75d289..04e7eb147ea 100644 --- a/reactos/include/psdk/mapix.h +++ b/reactos/include/psdk/mapix.h @@ -13,24 +13,16 @@ * * 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 + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIX_H #define MAPIX_H -#ifndef MAPIDEFS_H #include -#endif -#ifndef MAPICODE_H #include -#endif -#ifndef MAPIGUID_H #include -#endif -#ifndef MAPITAGS_H #include -#endif #ifdef __cplusplus extern "C" { @@ -44,7 +36,7 @@ typedef struct IMAPISession *LPMAPISESSION; #ifndef WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED -typedef unsigned long FLAGS; +typedef ULONG FLAGS; #endif /* Flags for MAPILogon and MAPILogonEx */ @@ -114,6 +106,10 @@ typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER; MAPIFREEBUFFER MAPIFreeBuffer; #endif +typedef HRESULT (WINAPI MAPIADMINPROFILES)(ULONG,LPPROFADMIN*); +typedef MAPIADMINPROFILES *LPMAPIADMINPROFILES; +MAPIADMINPROFILES MAPIAdminProfiles; + /***************************************************************************** * IMAPISession interface */