]>
Commit | Line | Data |
---|---|---|
4c2d8a30 RS |
1 | *** \gcc-inc\basetyps.h Sat Jul 31 16:48:36 1999 |
2 | --- basetyps.h Fri Aug 06 11:14:36 1999 | |
3 | *************** | |
4 | *** 74,91 **** | |
5 | --- 74,97 ---- | |
6 | STDMETHOD(Clone)(IENUM_THIS_(I) I**) PURE; \ | |
7 | } | |
8 | #define DECLARE_ENUMERATOR(T) DECLARE_ENUMERATOR_(IEnum##T,T) | |
9 | ||
10 | + #ifndef GUID_DEFINED | |
11 | + #define GUID_DEFINED | |
12 | typedef struct _GUID | |
13 | { | |
14 | unsigned long Data1; | |
15 | unsigned short Data2; | |
16 | unsigned short Data3; | |
17 | unsigned char Data4[8]; | |
18 | } GUID; | |
19 | + #endif /* GUID_DEFINED */ | |
20 | typedef GUID *REFGUID; | |
21 | typedef GUID *LPGUID; | |
22 | + #ifndef UUID_DEFINED | |
23 | + #define UUID_DEFINED | |
24 | typedef GUID UUID; | |
25 | + #endif /* UUID_DEFINED */ | |
26 | typedef GUID IID; | |
27 | typedef GUID CLSID; | |
28 | typedef CLSID *LPCLSID; | |
29 | typedef IID *LPIID; | |
30 | ||
31 | ||
32 | *** \gcc-inc\oaidl.h Sat Jul 31 16:48:42 1999 | |
33 | --- oaidl.h Fri Aug 06 13:18:48 1999 | |
34 | *************** | |
35 | *** 39,44 **** | |
36 | --- 39,53 ---- | |
37 | #define IMPLTYPEFLAG_FRESTRICTED 4 | |
38 | #define IMPLTYPEFLAG_FDEFAULTVTABLE 8 | |
39 | ||
40 | + #define DISPID_UNKNOWN ( -1 ) | |
41 | + #define DISPID_VALUE ( 0 ) | |
42 | + #define DISPID_PROPERTYPUT ( -3 ) | |
43 | + #define DISPID_NEWENUM ( -4 ) | |
44 | + #define DISPID_EVALUATE ( -5 ) | |
45 | + #define DISPID_CONSTRUCTOR ( -6 ) | |
46 | + #define DISPID_DESTRUCTOR ( -7 ) | |
47 | + #define DISPID_COLLECT ( -8 ) | |
48 | + | |
49 | typedef interface ITypeLib *LPTYPELIB; | |
50 | typedef interface ICreateTypeInfo *LPCREATETYPEINFO; | |
51 | typedef interface ICreateTypeInfo2 *LPCREATETYPEINFO2; | |
52 | *************** | |
53 | *** 49,54 **** | |
54 | --- 58,73 ---- | |
55 | typedef interface IDispatch *LPDISPATCH; | |
56 | typedef interface ICreateErrorInfo *LPCREATEERRORINFO; | |
57 | ||
58 | + extern "C" const IID IID_ITypeLib; | |
59 | + extern "C" const IID IID_ICreateTypeInfo; | |
60 | + extern "C" const IID IID_ICreateTypeInfo2; | |
61 | + extern "C" const IID IID_ICreateTypeLib; | |
62 | + extern "C" const IID IID_ICreateTypeLib2; | |
63 | + extern "C" const IID IID_ITypeInfo; | |
64 | + extern "C" const IID IID_IErrorInfo; | |
65 | + extern "C" const IID IID_IDispatch; | |
66 | + extern "C" const IID IID_ICreateErrorInfo; | |
67 | + | |
68 | typedef enum tagSYSKIND { | |
69 | SYS_WIN16,SYS_WIN32,SYS_MAC | |
70 | } SYSKIND; | |
71 | *************** | |
72 | *** 375,382 **** | |
73 | STDMETHOD_(ULONG,Release)(THIS) PURE; | |
74 | STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE; | |
75 | STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE; | |
76 | ! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID) | |
77 | PURE; | |
3f9ca770 | 78 | ! STDMETHOD(Invoked)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; |
4c2d8a30 RS |
79 | }; |
80 | ||
81 | #ifdef __cplusplus | |
82 | --- 394,401 ---- | |
83 | STDMETHOD_(ULONG,Release)(THIS) PURE; | |
84 | STDMETHOD(GetTypeInfoCount)(THIS_ UINT*) PURE; | |
85 | STDMETHOD(GetTypeInfo)(THIS_ UINT,LCID,LPTYPEINFO*) PURE; | |
86 | ! STDMETHOD(GetIDsOfNames)(THIS_ REFIID,LPOLESTR*,UINT,LCID,DISPID*) | |
87 | PURE; | |
3f9ca770 | 88 | ! STDMETHOD(Invoke)(THIS_ DISPID,REFIID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,UINT*) PURE; |
4c2d8a30 RS |
89 | }; |
90 | ||
91 | #ifdef __cplusplus | |
92 | ||
93 | ||
94 | *** \gcc-inc\objidl.h Sat Jul 31 16:48:42 1999 | |
95 | --- objidl.h Fri Aug 06 11:00:19 1999 | |
96 | *************** | |
97 | *** 627,633 **** | |
98 | STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE; | |
99 | STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE; | |
100 | STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE; | |
101 | ! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC*) PURE; | |
102 | STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE; | |
103 | STDMETHOD(DUnadvise)(THIS_ DWORD) PURE; | |
104 | STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**); | |
105 | --- 627,633 ---- | |
106 | STDMETHOD(QueryGetData)(THIS_ FORMATETC*) PURE; | |
107 | STDMETHOD(GetCanonicalFormatEtc)(THIS_ FORMATETC*,FORMATETC*) PURE; | |
108 | STDMETHOD(SetData)(THIS_ FORMATETC*,STGMEDIUM*,BOOL) PURE; | |
109 | ! STDMETHOD(EnumFormatEtc)(THIS_ DWORD,IEnumFORMATETC**) PURE; | |
110 | STDMETHOD(DAdvise)(THIS_ FORMATETC*,DWORD,IAdviseSink*,PDWORD) PURE; | |
111 | STDMETHOD(DUnadvise)(THIS_ DWORD) PURE; | |
112 | STDMETHOD(EnumDAdvise)(THIS_ IEnumSTATDATA**); | |
113 | ||
114 | ||
115 | ||
116 |