reactos/include/wine
diff -u -r1.6 -r1.7
--- objidl.h 1 Dec 2004 20:06:14 -0000 1.6
+++ objidl.h 12 Dec 2004 18:01:22 -0000 1.7
@@ -4,7 +4,6 @@
#include <unknwn.h>
/* First part: objidl.h copied from w32api. Fixed:
- * IMallocSpy::PreRealloc,
* IMarshal::MarshalInteface
* IMarshal::UnmarshalInterface
* IStorage_CreateStorage
@@ -526,7 +525,7 @@
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 @@
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
reactos/lib/oleaut32
diff -u -r1.6 -r1.7
--- Makefile.ros-template 3 Dec 2004 23:37:42 -0000 1.6
+++ Makefile.ros-template 12 Dec 2004 18:01:23 -0000 1.7
@@ -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
reactos/w32api/include
diff -u -r1.4 -r1.5
--- objidl.h 1 Dec 2004 20:06:15 -0000 1.4
+++ objidl.h 12 Dec 2004 18:01:23 -0000 1.5
@@ -868,7 +868,7 @@
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