Changeset 1729 for trunk/src


Ignore:
Timestamp:
Nov 14, 1999, 2:27:36 AM (26 years ago)
Author:
davidr
Message:

Added beginnings of IPicture interface for VB6 support.

Location:
trunk/src/oleaut32
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/oleaut32/makefile

    r1661 r1729  
    1 #/* $Id: makefile,v 1.5 1999-11-09 14:16:43 sandervl Exp $ */
     1#/* $Id: makefile,v 1.6 1999-11-14 01:26:36 davidr Exp $ */
    22#
    33# PD-Win32 API
    … …  
    2525        typelib.obj variant.obj \
    2626        ole2disp.obj parsedt.obj \
     27        ipicture.obj \
    2728        safearray.obj stubs.obj
    2829
    … …  
    5556typelib.obj:    typelib.cpp oleaut32.h
    5657olefont.obj:    olefont.cpp oleaut32.h
     58ipicture.obj:   ipicture.cpp oleaut32.h
    5759parsedt.obj:    parsedt.cpp parsedt.h
    5860safearray.obj:  safearray.cpp oleaut32.h
    … …  
    6668
    6769
     70
     71

  • trunk/src/oleaut32/oleaut32.h

    r879 r1729  
    1 /* $Id: oleaut32.h,v 1.5 1999-09-08 15:23:23 davidr Exp $ */
     1/* $Id: oleaut32.h,v 1.6 1999-11-14 01:26:36 davidr Exp $ */
    22/*
    33 * Win32 OLE stubs for OS/2
    … …  
    3030#include <winbase.h>
    3131#include "oleauto.h"
    32 //#include <uconv.h>
    3332#undef CALLCONV
    3433
    … …  
    3837#include <winreg.h>
    3938
     39#include "objbase.h"            // Common obj include
     40#include "wine/obj_inplace.h"
     41#include "wine/obj_oleobj.h"
     42#include "wine/obj_surrogate.h"
     43#include "wine/obj_oleview.h"
     44#include "wine/obj_cache.h"
    4045
    41 #include "wine/obj_base.h"
    42 #include "wine/obj_oleview.h"
    43 #include "wine/obj_misc.h"
    44 #include "wine/obj_inplace.h"
    45 #include "wine/obj_dataobject.h"
    46 #include "wine/obj_oleobj.h"
    47 #include "wine/obj_marshal.h"
    48 #include "wine/obj_moniker.h"
    49 #include "wine/obj_clientserver.h"
    50 #include "wine/obj_dragdrop.h"
    51 #include "wine/obj_property.h"
    52 #include "wine/obj_olefont.h"
    53 #include "wine/obj_oleundo.h"
     46#include "wine/obj_property.h"  // needed for oleundo
     47#include "wine/obj_olefont.h"   // needed for oleundo
     48#include "wine/obj_oleundo.h"   // for OLE_COLOR of all things :-)
     49
     50#include "wine/obj_picture.h"
     51
    5452#include <heapstring.h>
    5553

  • trunk/src/oleaut32/stubs.cpp

    r879 r1729  
    1 /* $Id: stubs.cpp,v 1.1 1999-09-08 15:23:23 davidr Exp $ */
     1/* $Id: stubs.cpp,v 1.2 1999-11-14 01:26:36 davidr Exp $ */
    22/*
    33 * Win32 COM/OLE stubs for OS/2
    … …  
    993993}
    994994
    995 //*****************************************************************************
    996 //*****************************************************************************
    997 HRESULT WIN32API OleLoadPicture(LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
    998     REFIID riid, LPVOID * lplpvObj)
    999 {
    1000     dprintf(("OLEAUT32: OleLoadPicture - stub"));
    1001     return S_OK;
    1002 }
    1003 
    1004 //*****************************************************************************
    1005 //*****************************************************************************
    1006 
    1007 #define PICTYPE_UNINITIALIZED (-1)
    1008 #define PICTYPE_NONE            0
    1009 #define PICTYPE_BITMAP          1
    1010 #define PICTYPE_METAFILE        2
    1011 #define PICTYPE_ICON            3
    1012 #define PICTYPE_ENHMETAFILE     4
    1013 
    1014 typedef struct tagPICTDESC
    1015 {
    1016     UINT cbSizeofstruct;
    1017     UINT picType;
    1018     union
    1019     {
    1020         struct
    1021         {
    1022             HBITMAP   hbitmap;        // Bitmap
    1023             HPALETTE  hpal;           // Accompanying palette
    1024         } bmp;
    1025 
    1026         struct
    1027         {
    1028             HMETAFILE hmeta;          // Metafile
    1029             int       xExt;
    1030             int       yExt;           // Extent
    1031         } wmf;
    1032 
    1033         struct
    1034         {
    1035             HICON hicon;              // Icon
    1036         } icon;
    1037 
    1038         struct
    1039         {
    1040             HENHMETAFILE hemf;        // Enhanced Metafile
    1041         } emf;
    1042     } u;
    1043 
    1044 } PICTDESC, * LPPICTDESC;
    1045 
    1046 HRESULT WIN32API OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
    1047     BOOL fOwn, LPVOID * lplpvObj)
    1048 {
    1049     dprintf(("OLEAUT32: OleCreatePictureIndirect - stub"));
    1050     return S_OK;
    1051 }
    1052 
    1053 //*****************************************************************************
    1054 //*****************************************************************************
    1055 HRESULT WIN32API OleLoadPictureFile(VARIANT varFileName, LPDISPATCH* lplpdispPicture)
    1056 {
    1057     dprintf(("OLEAUT32: OleLoadPictureFile - stub"));
    1058     return S_OK;
    1059 }
    1060 
    1061 //*****************************************************************************
    1062 //*****************************************************************************
    1063 HRESULT WIN32API OleSavePictureFile(LPDISPATCH lpdispPicture,
    1064     BSTR bstrFileName)
    1065 {
    1066     dprintf(("OLEAUT32: OleSavePictureFile - stub"));
    1067     return S_OK;
    1068 }
    1069 
    1070 //*****************************************************************************
    1071 //*****************************************************************************
    1072 HRESULT WIN32API OleLoadPicturePath
    1073    (LPOLESTR            szURLorPath,
    1074     LPUNKNOWN           punkCaller,
    1075     DWORD               dwReserved,
    1076     OLE_COLOR           clrReserved,
    1077     REFIID              riid,
    1078     LPVOID *            ppvRet )
    1079 {
    1080     dprintf(("OLEAUT32: OleLoadPicturePath - stub"));
    1081     return S_OK;
    1082 }
    1083 
Note: See TracChangeset for help on using the changeset viewer.