summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2003-04-26 08:48:03 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2003-04-26 08:48:03 +0000
commita5035abfac1e155a4d15cbca22966ff0b8331081 (patch)
treeada5f1dc6f6a69041c0dc1ebdf3aad529053885c
parentd9d35a454bdb2220e7b4b56bfca7120c37bd72dc (diff)
downloadcygnal-a5035abfac1e155a4d15cbca22966ff0b8331081.tar.gz
cygnal-a5035abfac1e155a4d15cbca22966ff0b8331081.tar.bz2
cygnal-a5035abfac1e155a4d15cbca22966ff0b8331081.zip
* include/oaidl.h (ITypeMarshal): Add interface.
-rw-r--r--winsup/w32api/ChangeLog13
-rw-r--r--winsup/w32api/include/oaidl.h15
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,5 +1,9 @@
2003-04-26 Danny Smith <dannysmith@users.sourceforge.net>
+ * include/oaidl.h (ITypeMarshal): Add interface.
+
+2003-04-26 Danny Smith <dannysmith@users.sourceforge.net>
+
* include/winioctl.h: Clean up formatting.
(RETRIEVAL_POINTERS_BUFFER): Add fields to Extents[1] struct.
(CREATE_DISK): Add _ANONYMOUS_UNION macro.
@@ -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