Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove -DCOBJMACROS from oleaut32 makefile.

Browse source 
- Minor fixes to OLE interface prototypes.

svn path=/trunk/; revision=12052
This commit is contained in:
Filip Navara 2004-12-12 18:01:23 +00:00
parent 0ced40be8e
commit db8aa43455
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/include/wine/objidl.h
View file

@ -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 @@ 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

4
reactos/lib/oleaut32/Makefile.ros-template
View file

@ -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

2
reactos/w32api/include/objidl.h
View file

@ -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