diff --git a/reactos/include/wine/objidl.h b/reactos/include/wine/objidl.h index d328f7ac0bc..d118b9051dc 100644 --- a/reactos/include/wine/objidl.h +++ b/reactos/include/wine/objidl.h @@ -4,7 +4,6 @@ #include /* First part: objidl.h copied from w32api. Fixed: - * IMallocSpy::PreRealloc, * IMarshal::MarshalInteface * IMarshal::UnmarshalInterface * IStorage_CreateStorage @@ -526,7 +525,7 @@ DECLARE_INTERFACE_(IMallocSpy,IUnknown) STDMETHOD_(void*,PostAlloc)(THIS_ void*) PURE; STDMETHOD_(void*,PreFree)(THIS_ void*,BOOL) PURE; STDMETHOD_(void,PostFree)(THIS_ BOOL) PURE; - STDMETHOD_(ULONG,PreRealloc)(THIS_ void*,ULONG,void*,BOOL) PURE; + STDMETHOD_(ULONG,PreRealloc)(THIS_ void*,ULONG,void**,BOOL) PURE; STDMETHOD_(void*,PostRealloc)(THIS_ void*,BOOL) PURE; STDMETHOD_(void*,PreGetSize)(THIS_ void*,BOOL) PURE; STDMETHOD_(ULONG,PostGetSize)(THIS_ ULONG,BOOL) PURE; @@ -884,7 +883,7 @@ DECLARE_INTERFACE_(IROTData,IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetComparisonData)(THIS_ PVOID,ULONG,PULONG) PURE; + STDMETHOD(GetComparisonData)(THIS_ PBYTE,ULONG,PULONG) PURE; }; #undef INTERFACE diff --git a/reactos/lib/oleaut32/Makefile.ros-template b/reactos/lib/oleaut32/Makefile.ros-template index 639529a3afe..af6095d3e5a 100644 --- a/reactos/lib/oleaut32/Makefile.ros-template +++ b/reactos/lib/oleaut32/Makefile.ros-template @@ -1,10 +1,10 @@ -# $Id: Makefile.ros-template,v 1.6 2004/12/03 23:37:42 blight Exp $ +# $Id: Makefile.ros-template,v 1.7 2004/12/12 18:01:23 navaraf Exp $ TARGET_NAME = oleaut32 TARGET_OBJECTS = @C_SRCS@ -TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ -DCOBJMACROS +TARGET_CFLAGS = @EXTRADEFS@ -D__REACTOS__ TARGET_SDKLIBS = @IMPORTS@ winmm.a wine.a wine_uuid.a wine_unicode.a ntdll.a diff --git a/reactos/w32api/include/objidl.h b/reactos/w32api/include/objidl.h index ad792121b1b..f87105cf11b 100644 --- a/reactos/w32api/include/objidl.h +++ b/reactos/w32api/include/objidl.h @@ -868,7 +868,7 @@ DECLARE_INTERFACE_(IROTData,IUnknown) STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE; STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; - STDMETHOD(GetComparisonData)(THIS_ PVOID,ULONG,PULONG) PURE; + STDMETHOD(GetComparisonData)(THIS_ PBYTE,ULONG,PULONG) PURE; }; #undef INTERFACE