From a5035abfac1e155a4d15cbca22966ff0b8331081 Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sat, 26 Apr 2003 08:48:03 +0000 Subject: [PATCH] * include/oaidl.h (ITypeMarshal): Add interface. --- winsup/w32api/ChangeLog | 13 ++++++++----- winsup/w32api/include/oaidl.h | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index d18bd7fba..7d1604efe 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,7 @@ +2003-04-26 Danny Smith + + * include/oaidl.h (ITypeMarshal): Add interface. + 2003-04-26 Danny Smith * include/winioctl.h: Clean up formatting. @@ -38,13 +42,12 @@ PARTITION_INFORMATION_EX, DRIVE_LAYOUT_INFORMATION_EX, MOVE_FILE_DATA, RETRIEVAL_POINTERS_BUFFER, STARTING_LCN_INPUT_BUFFER, - STARTING_VCN_INPUT_BUFFER, VOLUME_BITMAP_BUFFER): Add structs + STARTING_VCN_INPUT_BUFFER, VOLUME_BITMAP_BUFFER): Add structs. (PARTITION_STYLE, DISK_CACHE_RETENTION_PRIORITY): Add enums. (MEDIA_TYPE): Add F3_120M_512, F3_640_512, F5_640_512, - F5_720_512, - F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024, F3_128Mb_512, - F3_230Mb_512, - F8_256_128, F3_200Mb_512, F3_240M_512, and F3_32M_512. + F5_720_512, F3_1Pt2_512, F3_1Pt23_1024, F5_1Pt23_1024, + F3_128Mb_512, F3_230Mb_512, F8_256_128, F3_200Mb_512, + F3_240M_512, and F3_32M_512. * lib/kernel32.def (GetVolumePathNamesForVolumeName[AW]): Add stubs. diff --git a/winsup/w32api/include/oaidl.h b/winsup/w32api/include/oaidl.h index fb6fd4ecf..06125ed80 100644 --- a/winsup/w32api/include/oaidl.h +++ b/winsup/w32api/include/oaidl.h @@ -79,6 +79,7 @@ extern const IID IID_IEnumVARIANT; extern const IID IID_ICreateErrorInfo; extern const IID IID_ISupportErrorInfo; extern const IID IID_IRecordInfo; +extern const IID IID_ITypeMarshal; typedef enum tagSYSKIND { SYS_WIN16,SYS_WIN32,SYS_MAC @@ -603,6 +604,20 @@ DECLARE_INTERFACE_(IRecordInfo, IUnknown) STDMETHOD(RecordDestroy )(THIS_ PVOID) PURE; }; +EXTERN_C const IID IID_ITypeMarshal; +#undef INTERFACE +#define INTERFACE ITypeMarshal +DECLARE_INTERFACE_(ITypeMarshal, IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(Size)(THIS_ PVOID,DWORD,PVOID,ULONG*) PURE; + STDMETHOD(Marshal)(THIS_ PVOID,DWORD,PVOID,ULONG,BYTE*,ULONG*) PURE; + STDMETHOD(Unmarshal)(THIS_ PVOID,DWORD,ULONG,BYTE*,ULONG*) PURE; + STDMETHOD(Free)(THIS_ PVOID) PURE; +}; + #ifdef __cplusplus } #endif