- declare IPicture OBJC macros
- enable olepicture.c

reactos/w32api/include

diff -u -r1.2 -r1.3
--- ocidl.h	28 Feb 2004 20:14:33 -0000	1.2
+++ ocidl.h	1 Mar 2004 22:57:20 -0000	1.3
@@ -610,6 +610,26 @@

 };
 #undef INTERFACE
 

+#ifdef COBJMACROS
+#define IPicture_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
+#define IPicture_AddRef(p) (p)->lpVtbl->AddRef(p)
+#define IPicture_Release(p) (p)->lpVtbl->Release(p)
+#define IPicture_get_Handle(p,a) (p)->lpVtbl->get_Handle(p,a)
+#define IPicture_get_hPal(p,a) (p)->lpVtbl->get_hPal(p,a)
+#define IPicture_get_Type(p,a) (p)->lpVtbl->get_Type(p,a)
+#define IPicture_get_Width(p,a) (p)->lpVtbl->get_Width(p,a)
+#define IPicture_get_Height(p,a) (p)->lpVtbl->get_Height(p,a)
+#define IPicture_Render(p,a,b,c,d,e,f,g,h,i,j) (p)->lpVtbl->Render(p,a,b,c,d,e,f,g,h,i,j)
+#define IPicture_set_hPal(p,a) (p)->lpVtbl->set_hPal(p,a)
+#define IPicture_get_CurDC(p,a) (p)->lpVtbl->get_CurDC(p,a)
+#define IPicture_SelectPicture(p,a,b,c) (p)->lpVtbl->SelectPicture(p,a,b,c)
+#define IPicture_get_KeepOriginalFormat(p,a) (p)->lpVtbl->get_KeepOriginalFormat(p,a)
+#define IPicture_put_KeepOriginalFormat(p,a) (p)->lpVtbl->put_KeepOriginalFormat(p,a)
+#define IPicture_PictureChanged(p) (p)->lpVtbl->PictureChanged(p)
+#define IPicture_SaveAsFile(p,a,b,c) (p)->lpVtbl->SaveAsFile(p,a,b,c)
+#define IPicture_get_Attributes(p,a) (p)->lpVtbl->get_Attributes(p,a)
+#endif
+

 EXTERN_C const IID IID_IPictureDisp;
 #define INTERFACE IPictureDisp
 DECLARE_INTERFACE_(IPictureDisp,IDispatch)

reactos/lib/oleaut32

diff -u -r1.3 -r1.4
--- Makefile.in	29 Feb 2004 15:36:10 -0000	1.3
+++ Makefile.in	1 Mar 2004 22:57:20 -0000	1.4
@@ -16,6 +16,7 @@

 	dispatch.c \
 	hash.c \
 	oleaut.c \

+	olepicture.c \

 	stubs.c \
 	safearray.c \
 	varformat.c \

@@ -24,7 +25,6 @@

 
 #	regsvr.c \
 #	olefont.c \

-#	olepicture.c \

 #	tmarshal.c \
 #	usrmarshal.c \
 #	oaidl_p.c \

reactos/lib/oleaut32

diff -u -r1.7 -r1.8
--- oleaut32.spec	29 Feb 2004 16:37:23 -0000	1.7
+++ oleaut32.spec	1 Mar 2004 22:57:20 -0000	1.8
@@ -380,7 +380,7 @@

 397 stub UserMSG_to_local
 398 stub UserMSG_free_inst
 399 stub UserMSG_free_local

-#401 stdcall OleLoadPictureEx(ptr long long long long long long ptr)

+401 stdcall OleLoadPictureEx(ptr long long long long long long ptr)

 402 stub OleLoadPictureFileEx
 410 stdcall -private DllCanUnloadNow() OLEAUT32_DllCanUnloadNow
 411 stdcall SafeArrayCreateVector(long long long)

@@ -390,8 +390,8 @@

 415 stdcall OleIconToCursor(long long)
 416 stdcall OleCreatePropertyFrameIndirect(ptr)
 417 stdcall OleCreatePropertyFrame(ptr long long ptr long ptr long ptr ptr long ptr)

-#418 stdcall OleLoadPicture(ptr long long ptr ptr)
-#419 stdcall OleCreatePictureIndirect(ptr ptr long ptr)

+418 stdcall OleLoadPicture(ptr long long ptr ptr)
+419 stdcall OleCreatePictureIndirect(ptr ptr long ptr)

 #420 stdcall OleCreateFontIndirect(ptr ptr ptr)
 421 stdcall OleTranslateColor(long long long)
 422 stub OleLoadPictureFile

reactos/lib/oleaut32

diff -u -r1.1 -r1.2
--- olepicture.c	7 Feb 2004 18:53:58 -0000	1.1
+++ olepicture.c	1 Mar 2004 22:57:20 -0000	1.2
@@ -1105,7 +1105,6 @@

     hr = S_OK;
     break;
   }

-#ifndef __REACTOS__ /*FIXME: missing CURSORICONFILEDIR */

   case 0x0000: { /* ICON , first word is dwReserved */
     HICON hicon;
     CURSORICONFILEDIR	*cifd = (CURSORICONFILEDIR*)xbuf;

@@ -1160,7 +1159,6 @@

     }
     break;
   }

-#endif

   default:
   {
     int i;

reactos/lib/oleaut32

diff -u -r1.8 -r1.9
--- variant.c	29 Feb 2004 16:37:23 -0000	1.8
+++ variant.c	1 Mar 2004 22:57:20 -0000	1.9
@@ -603,8 +603,7 @@

         if (V_ARRAY(pVarg))
           hres = SafeArrayDestroy(V_ARRAY(pVarg));
       }

-	  else
-      if (V_VT(pVarg) == VT_BSTR)

+      else if (V_VT(pVarg) == VT_BSTR)

       {
         if (V_BSTR(pVarg))
           SysFreeString(V_BSTR(pVarg));

@@ -724,8 +723,7 @@

         if (V_ARRAY(pvargSrc))
           hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest));
       }

-	  else
-      if (V_VT(pvargSrc) == VT_BSTR)

+      else if (V_VT(pvargSrc) == VT_BSTR)

       {
         if (V_BSTR(pvargSrc))
         {

@@ -859,8 +857,7 @@

     /* Native doesn't check that *V_ARRAYREF(pSrc) is valid */
     hres = SafeArrayCopy(*V_ARRAYREF(pSrc), &V_ARRAY(pvargDest));
   }

-  else
-  if (V_VT(pSrc) == (VT_BSTR|VT_BYREF))

+  else if (V_VT(pSrc) == (VT_BSTR|VT_BYREF))

   {
     /* Native doesn't check that *V_BSTRREF(pSrc) is valid */
     V_BSTR(pvargDest) = SysAllocStringByteLen((char*)*V_BSTRREF(pSrc), SysStringByteLen(*V_BSTRREF(pSrc)));