Commit 252b0fe0 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Implemented OleLoadPicture.

Added support for loading JPEG, Bitmap and Icons from persistant streams. Implemented JPEG support using libjpeg, added necessary configure.in options. Added IConnectionPoint style notifications to the IPicture iface. Implemented several of the stubs already there, added some more.
parent 822ab453
......@@ -122,6 +122,16 @@ AC_CHECK_HEADERS(dlfcn.h,
LIBEXT="a"
)
JPEGLIB=""
AC_SUBST(JPEGLIB)
AC_CHECK_HEADERS(jpeglib.h,
AC_CHECK_LIB(jpeg,jpeg_start_decompress,
AC_DEFINE(HAVE_LIBJPEG,1,[Define if you have libjpeg including devel headers])
JPEGLIB="-ljpeg"
)
)
AC_SUBST(XLIB)
AC_SUBST(X_DLLS)
X_DLLS=""
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = oleaut32
ALTNAMES = ole2disp typelib
EXTRALIBS = $(LIBUUID)
EXTRALIBS = $(LIBUUID) @JPEGLIB@
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
......
......@@ -241,6 +241,9 @@
/* Define if you have the <ieeefp.h> header file. */
#undef HAVE_IEEEFP_H
/* Define if you have the <jpeglib.h> header file. */
#undef HAVE_JPEGLIB_H
/* Define if you have the <libio.h> header file. */
#undef HAVE_LIBIO_H
......@@ -418,6 +421,9 @@
/* Define if TRACE messages are to be compiled out */
#undef NO_TRACE_MSGS
/* Define if you have libjpeg including devel headers */
#undef HAVE_LIBJPEG
/* Define if you have the Xpm library */
#undef HAVE_LIBXXPM
......
......@@ -227,6 +227,14 @@ HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
#define DISPID_FONT_STRIKE 6
#define DISPID_FONT_WEIGHT 7
#define DISPID_FONT_CHARSET 8
/* IPicture */
#define DISPID_PICT_HANDLE 0
#define DISPID_PICT_HPAL 2
#define DISPID_PICT_TYPE 3
#define DISPID_PICT_WIDTH 4
#define DISPID_PICT_HEIGHT 5
#define DISPID_PICT_RENDER 6
/* Reflected Window Message IDs */
#define OCM__BASE (WM_USER+0x1c00)
......
......@@ -20,7 +20,10 @@ typedef LONG OLE_YPOS_HIMETRIC;
typedef LONG OLE_XSIZE_HIMETRIC;
typedef LONG OLE_YSIZE_HIMETRIC;
typedef enum tagPicture { /* bitmasks */
PICTURE_SCALABLE = 0x1,
PICTURE_TRANSPARENT = 0x2
} PICTUREATTRIBUTES;
/*****************************************************************************
* Predeclare the interfaces
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment