safearray.c test fix

[Francois Gouget]

With this patch safearray.c compiles on Windows. Next up is patching
Visual Studio to get vartype.c to compile.

Changelog:

 * dlls/oleaut32/tests/safearray.c

   Remove references to ICOM_THIS and WINE_UNUSED as they don't exist on
Windows.
   Define COBJMACROS so we get the IRecordInfo_* macros.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                     f u kn rd ts, ur wy 2 gky 4 ur wn gd.
-------------- next part --------------
Index: dlls/oleaut32/tests/safearray.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/tests/safearray.c,v
retrieving revision 1.15
diff -u -r1.15 safearray.c
--- dlls/oleaut32/tests/safearray.c	24 Aug 2004 18:42:53 -0000	1.15
+++ dlls/oleaut32/tests/safearray.c	1 Sep 2004 01:32:12 -0000
@@ -26,6 +26,7 @@
 #include <float.h>
 #include <time.h>
 
+#define COBJMACROS
 #include "wine/test.h"
 #include "windef.h"
 #include "winbase.h"
@@ -94,28 +95,28 @@
 
 static ULONG CALLBACK IRecordInfoImpl_AddRef(IRecordInfo *iface)
 {
-  ICOM_THIS(IRecordInfoImpl, iface);
+  IRecordInfoImpl* This=(IRecordInfoImpl*)iface;
   return ++This->ref;
 }
 
 static ULONG CALLBACK IRecordInfoImpl_Release(IRecordInfo *iface)
 {
-  ICOM_THIS(IRecordInfoImpl, iface);
+  IRecordInfoImpl* This=(IRecordInfoImpl*)iface;
   return --This->ref;
 }
 
 static BOOL fail_GetSize; /* Whether to fail the GetSize call */
 
-static HRESULT CALLBACK IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting WINE_UNUSED)
+static HRESULT CALLBACK IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting)
 {
-  ICOM_THIS(IRecordInfoImpl, iface);
+  IRecordInfoImpl* This=(IRecordInfoImpl*)iface;
   This->clearCalled++;
   return S_OK;
 }
 
 static HRESULT CALLBACK IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG* size)
 {
-  ICOM_THIS(IRecordInfoImpl, iface);
+  IRecordInfoImpl* This=(IRecordInfoImpl*)iface;
   This->sizeCalled++;
   *size = 17;
   if (fail_GetSize)
@@ -124,7 +125,7 @@
   return S_OK;
 }
 
-static HRESULT CALLBACK IRecordInfoImpl_Dummy(IRecordInfo *iface WINE_UNUSED)
+static HRESULT CALLBACK IRecordInfoImpl_Dummy(IRecordInfo *iface)
 {
   trace("Called an unexpected IRecordInfo method - please report!\n");
   /* Quit because we'll just crash anyway */