diff --git a/reactos/include/psdk/richedit.h b/reactos/include/psdk/richedit.h index f4f0ab5da00..02ebdc2f93a 100644 --- a/reactos/include/psdk/richedit.h +++ b/reactos/include/psdk/richedit.h @@ -516,7 +516,7 @@ DECL_WINELIB_TYPE_AW(TEXTRANGE) typedef struct _editstream { - DWORD dwCookie; + DWORD_PTR dwCookie; DWORD dwError; EDITSTREAMCALLBACK pfnCallback; } EDITSTREAM; diff --git a/reactos/include/psdk/stdole2.idl b/reactos/include/psdk/stdole2.idl index 187982cdf56..072743f3153 100644 --- a/reactos/include/psdk/stdole2.idl +++ b/reactos/include/psdk/stdole2.idl @@ -35,7 +35,7 @@ library stdole typedef unsigned long HRESULT; typedef void *VARIANT; typedef unsigned long SCODE; - + typedef struct GUID { unsigned long Data1; unsigned short Data2; @@ -64,7 +64,8 @@ library stdole [ odl, - uuid(00000000-0000-0000-C000-000000000046) + uuid(00000000-0000-0000-C000-000000000046), + hidden ] interface IUnknown { @@ -82,7 +83,8 @@ library stdole [ odl, - uuid(00020400-0000-0000-C000-000000000046) + uuid(00020400-0000-0000-C000-000000000046), + restricted ] interface IDispatch : IUnknown { @@ -119,7 +121,8 @@ library stdole [ odl, - uuid(00020404-0000-0000-C000-000000000046) + uuid(00020404-0000-0000-C000-000000000046), + hidden ] interface IEnumVARIANT : IUnknown { @@ -225,12 +228,12 @@ library stdole helpstring("Font Object"), hidden ] - interface IFont { + interface IFont : IUnknown { [propget] HRESULT Name([out, retval] BSTR *pname); [propput] HRESULT Name([in] BSTR pname); [propget] HRESULT Size([out, retval] CURRENCY *psize); - [propput] HRESULT Size([in] BSTR psize); + [propput] HRESULT Size([in] CURRENCY psize); [propget] HRESULT Bold([out, retval] VARIANT_BOOL *pbold); [propput] HRESULT Bold([in] VARIANT_BOOL pbold); @@ -300,7 +303,7 @@ library stdole helpstring("Picture Object"), hidden ] - interface IPicture /*: IUnknown*/ { + interface IPicture : IUnknown { [propget] HRESULT Handle([out, retval] OLE_HANDLE *phandle); [propget] HRESULT hPal([out, retval] OLE_HANDLE *phpal); @@ -353,7 +356,7 @@ library stdole [id(0x2)] OLE_HANDLE hPal; [id(0x3), readonly] short Type; [id(0x4), readonly] OLE_XSIZE_HIMETRIC Width; - [id(0x5), readonly] OLE_XSIZE_HIMETRIC Height; + [id(0x5), readonly] OLE_YSIZE_HIMETRIC Height; methods: [id(0x6)] void Render(int hdc, long x, diff --git a/reactos/include/psdk/xmldom.idl b/reactos/include/psdk/xmldom.idl index bf85acfb7f0..31c5e6628a1 100644 --- a/reactos/include/psdk/xmldom.idl +++ b/reactos/include/psdk/xmldom.idl @@ -720,6 +720,20 @@ interface IXMLDOMParseError : IDispatch HRESULT filepos([retval, out] long * filePos); } +[ + hidden, + uuid(3efaa427-272f-11d2-836f-0000f87a7782) +] +dispinterface XMLDOMDocumentEvents +{ + properties: + methods: + [id(DISPID_XMLDOMEVENT_ONDATAAVAILABLE)] + HRESULT ondataavailable(); + + [id(DISPID_XMLDOMEVENT_ONREADYSTATECHANGE)] + HRESULT onreadystatechange(); +} [ uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) diff --git a/reactos/include/psdk/xmldomdid.h b/reactos/include/psdk/xmldomdid.h index a299157c3ac..d241a9cd10d 100644 --- a/reactos/include/psdk/xmldomdid.h +++ b/reactos/include/psdk/xmldomdid.h @@ -197,5 +197,9 @@ #define DISPID_DOM_ERROR_FILEPOS 0x000000b7 #define DISPID_DOM_ERROR__TOP 0x000000b8 +#define DISPID_XMLDOMEVENT 197 +#define DISPID_XMLDOMEVENT_ONREADYSTATECHANGE DISPID_READYSTATECHANGE +#define DISPID_XMLDOMEVENT_ONDATAAVAILABLE 198 +#define DISPID_XMLDOMEVENT__TOP 199 #endif /* __XMLDOMDID_H__ */