From a579a11b57168418c44f08fb17edbd0e290cc1a8 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Fri, 7 Jun 2002 00:30:17 +0000 Subject: 2002-06-07 Gunnar Degnbol * include/mapi.h: Change LPTSTR to LPSTR throughout. --- winsup/w32api/ChangeLog | 14 ++++++++---- winsup/w32api/include/mapi.h | 54 ++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index ad554b555..414db2e4c 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,21 +1,25 @@ -2002-06-05 Danny Smith +2002-06-07 Gunnar Degnbol + + * include/mapi.h: Change LPTSTR to LPSTR throughout. + +2002-06-05 Danny Smith * include/winnt.h (PACE_HEADER, PACCESS_ALLOWED_ACE, PACCESS_DENIED_ACE): Add typedefs. -2002-06-03 Danny Smith +2002-06-03 Danny Smith * lib/thunk32.def (LIBRARY): Change to KERNEL32.dll. -2002-06-03 Steven Edwards +2002-06-03 Steven Edwards * lib/kernel32.def (ConvertToGlobalHandle): Add stub. -2002-06-01 Danny Smith +2002-06-01 Danny Smith * include/windef.h: Fix typo in last change. -2002-06-01 Danny Smith +2002-06-01 Danny Smith * include/windef.h: Add no-op __try, __except, __finally defines from ... diff --git a/winsup/w32api/include/mapi.h b/winsup/w32api/include/mapi.h index c007ee2bd..8474f8923 100644 --- a/winsup/w32api/include/mapi.h +++ b/winsup/w32api/include/mapi.h @@ -72,8 +72,8 @@ typedef unsigned long FAR *LPLHANDLE, FAR *LPULONG; typedef struct { ULONG ulReserved; ULONG ulRecipClass; - LPTSTR lpszName; - LPTSTR lpszAddress; + LPSTR lpszName; + LPSTR lpszAddress; ULONG ulEIDSize; LPVOID lpEntryID; } MapiRecipDesc, *lpMapiRecipDesc; @@ -81,8 +81,8 @@ typedef struct { ULONG ulReserved; ULONG flFlags; ULONG nPosition; - LPTSTR lpszPathName; - LPTSTR lpszFileName; + LPSTR lpszPathName; + LPSTR lpszFileName; LPVOID lpFileType; } MapiFileDesc, *lpMapiFileDesc; typedef struct { @@ -94,11 +94,11 @@ typedef struct { } MapiFileTagExt, *lpMapiFileTagExt; typedef struct { ULONG ulReserved; - LPTSTR lpszSubject; - LPTSTR lpszNoteText; - LPTSTR lpszMessageType; - LPTSTR lpszDateReceived; - LPTSTR lpszConversationID; + LPSTR lpszSubject; + LPSTR lpszNoteText; + LPSTR lpszMessageType; + LPSTR lpszDateReceived; + LPSTR lpszConversationID; FLAGS flFlags; lpMapiRecipDesc lpOriginator; ULONG nRecipCount; @@ -107,50 +107,50 @@ typedef struct { lpMapiFileDesc lpFiles; } MapiMessage, *lpMapiMessage; -ULONG PASCAL MAPILogon (ULONG,LPTSTR,LPTSTR,FLAGS,ULONG,LPLHANDLE); +ULONG PASCAL MAPILogon (ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPLHANDLE); ULONG PASCAL MAPISendMail (LHANDLE,ULONG,lpMapiMessage,FLAGS,ULONG); -ULONG PASCAL MAPISendDocuments (ULONG,LPTSTR,LPTSTR,LPTSTR,ULONG); -ULONG PASCAL MAPIReadMail (LHANDLE,ULONG,LPTSTR,FLAGS,ULONG, +ULONG PASCAL MAPISendDocuments (ULONG,LPSTR,LPSTR,LPSTR,ULONG); +ULONG PASCAL MAPIReadMail (LHANDLE,ULONG,LPSTR,FLAGS,ULONG, lpMapiMessage*); -ULONG PASCAL MAPIFindNext (LHANDLE,ULONG,LPTSTR,LPTSTR,FLAGS,ULONG,LPTSTR); -ULONG PASCAL MAPIResolveName (LHANDLE,ULONG,LPTSTR,FLAGS,ULONG, +ULONG PASCAL MAPIFindNext (LHANDLE,ULONG,LPSTR,LPSTR,FLAGS,ULONG,LPSTR); +ULONG PASCAL MAPIResolveName (LHANDLE,ULONG,LPSTR,FLAGS,ULONG, lpMapiRecipDesc*); -ULONG PASCAL MAPIAddress (LHANDLE,ULONG,LPTSTR,ULONG,LPTSTR,ULONG, +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,LPTSTR); -ULONG PASCAL MAPIDeleteMail (LHANDLE lpSession,ULONG,LPTSTR,FLAGS,ULONG); + 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,LPTSTR,LPTSTR,FLAGS,ULONG, +typedef ULONG (PASCAL * LPMAPILOGON) (ULONG,LPSTR,LPSTR,FLAGS,ULONG, LPLHANDLE); typedef ULONG (PASCAL * LPMAPISENDMAIL) (LHANDLE,ULONG,lpMapiMessage, FLAGS,ULONG); -typedef ULONG (PASCAL * LPMAPISENDDOCUMENTS) (ULONG,LPTSTR,LPTSTR, - LPTSTR,ULONG); -typedef ULONG (PASCAL * LPMAPIREADMAIL) (LHANDLE,ULONG,LPTSTR,FLAGS, +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,LPTSTR,LPTSTR, - FLAGS,ULONG,LPTSTR); -typedef ULONG (PASCAL * LPMAPIRESOLVENAME) (LHANDLE,ULONG,LPTSTR,FLAGS, +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,LPTSTR,ULONG,LPTSTR, +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,LPTSTR); + FLAGS,ULONG,LPSTR); typedef ULONG (PASCAL * LPMAPIDELETEMAIL) (LHANDLE lpSession,ULONG, - LPTSTR, FLAGS,ULONG); + LPSTR, FLAGS,ULONG); typedef ULONG (PASCAL * LPMAPILOGOFF)(LHANDLE,ULONG,FLAGS,ULONG); #endif /* RC_INVOKED */ -- cgit v1.2.3