diff options
| author | Danny Smith <dannysmith@users.sourceforge.net> | 2003-03-01 09:51:51 +0300 |
|---|---|---|
| committer | Danny Smith <dannysmith@users.sourceforge.net> | 2003-03-01 09:51:51 +0300 |
| commit | 8c061d6294a65ef25cdecb4393ab25b083dba7dc (patch) | |
| tree | c68e35d62bdc18e0bb8939f207de7a9d4829f4f0 | |
| parent | dbc49afd5279aa30ca5ca98189443c69f65e6a22 (diff) | |
2003-03-01 Heiko Gerdau <hg@technosis.de>
* include/oleidl.h (USERCLASSTYPE): Add enum.
* include/ocidl.h (IObjectWithSite): Add interface.
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/ocidl.h | 12 | ||||
| -rw-r--r-- | winsup/w32api/include/oleidl.h | 5 |
3 files changed, 23 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index c5a1e9eb5..98b466089 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,4 +1,9 @@ -2003-02-28 Roland Schwingel <roland.schwingel@onevision.de> +2003-03-01 Heiko Gerdau <hg@technosis.de> + + * include/oleidl.h (USERCLASSTYPE): Add enum. + * include/ocidl.h (IObjectWithSite): Add interface. + +2003-02-28 Roland Schwingel <roland.schwingel@onevision.de> Fixup UNICODE thinko in 2003-02-22 patch. * include/wingdi.h (AddFontMemResourceEx): Add. diff --git a/winsup/w32api/include/ocidl.h b/winsup/w32api/include/ocidl.h index 9727c78b9..79938b346 100644 --- a/winsup/w32api/include/ocidl.h +++ b/winsup/w32api/include/ocidl.h @@ -41,6 +41,18 @@ DECLARE_INTERFACE_(IOleInPlaceSiteEx,IOleInPlaceSite) STDMETHOD(RequestUIActivate)(THIS) PURE; }; +EXTERN_C const IID IID_IObjectWithSite; +#undef INTERFACE +#define INTERFACE IObjectWithSite +DECLARE_INTERFACE_(IObjectWithSite,IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(SetSite)(THIS_ IUnknown*) PURE; + STDMETHOD(GetSite)(THIS_ REFIID, void**) PURE; +}; + #ifdef __cplusplus } #endif diff --git a/winsup/w32api/include/oleidl.h b/winsup/w32api/include/oleidl.h index 3d4e8e0d6..095cbebe3 100644 --- a/winsup/w32api/include/oleidl.h +++ b/winsup/w32api/include/oleidl.h @@ -40,6 +40,11 @@ typedef enum tagOLEGETMONIKER { OLEGETMONIKER_UNASSIGN, OLEGETMONIKER_TEMPFORUSER } OLEGETMONIKER; +typedef enum tagUSERCLASSTYPE { + USERCLASSTYPE_FULL=1, + USERCLASSTYPE_SHORT, + USERCLASSTYPE_APPNAME +} USERCLASSTYPE; #ifdef __GNUC__ __extension__ /* IS0 C says enums limited to range of int */ #endif |