Changeset 5856 for trunk/src

Timestamp:

Jun 1, 2001, 9:50:02 AM (24 years ago)

Author:

sandervl

Message:

Added OleLoadPictureEx stub

Location:

trunk/src/oleaut32

Files:

• oleaut32.def (modified) (2 diffs)
• olepicture.c (modified) (3 diffs)

trunk/src/oleaut32/oleaut32.def

@@ -1 @@
-;/* $Id: oleaut32.def,v 1.5 2000-12-16 22:53:31 bird Exp $ */
+;/* $Id: oleaut32.def,v 1.6 2001-06-01 07:50:02 sandervl Exp $ */
 LIBRARY OLAUTOS2 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - OleAut32'
@@ -290 +290 @@
 OleCreatePictureIndirect = _OleCreatePictureIndirect@16  @419
 OleCreateFontIndirect = _OleCreateFontIndirect@12  @420
-OleTranslateColor = _OleTranslateColor@12  @421
+OleTranslateColor = _OleTranslateColor@12    @421
 OleLoadPictureFile = _OleLoadPictureFile@20  @422
-OleSavePictureFile = _OleSavePictureFile@8  @423
+OleSavePictureFile = _OleSavePictureFile@8   @423
 OleLoadPicturePath = _OleLoadPicturePath@24  @424
+OleLoadPictureEx   = _OleLoadPictureEx@32    @425

trunk/src/oleaut32/olepicture.c

@@ -36 +36 @@
 #include "wine/obj_picture.h"
 #include "debugtools.h"
+
+#ifdef __WIN32OS2__
+#undef FIXME
+#undef TRACE
+#ifdef DEBUG
+#define TRACE WriteLog("%s", __FUNCTION__); WriteLog
+#define FIXME WriteLog("FIXME %s", __FUNCTION__); WriteLog
+#else
+#define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
+#endif
+#endif
 
 DEFAULT_DEBUG_CHANNEL(ole);
@@ -741 +753 @@
 
 
+ 
+#ifdef __WIN32OS2__
+
+/***********************************************************************
+ * OleLoadPictureEx
+ */
+HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
+                            REFIID reed, DWORD xsiz, DWORD ysiz, DWORD flags, LPVOID *ppvObj )
+{
+  FIXME("(%p,%ld,%d,%p,%lx,%lx,%lx,%p), not implemented\n",
+        lpstream, lSize, fRunmode, reed, xsiz, ysiz, flags, ppvObj);
+  return E_NOTIMPL;
+}
+
 /***********************************************************************
  * OleLoadPicture
@@ -749 +775 @@
   FIXME("(%p,%ld,%d,%p,%p), not implemented\n",
         lpstream, lSize, fRunmode, reed, ppvObj);
-  return S_OK;
-}
- 
-#ifdef __WIN32OS2__
+  return OleLoadPictureEx(lpstream, lSize, fRunmode, reed, 0, 0, 0, ppvObj);
+}
+
 // ----------------------------------------------------------------------
 // OleLoadPictureFile