Changeset 4834 for trunk/include


Ignore:
Timestamp:
Dec 24, 2000, 1:28:20 PM (25 years ago)
Author:
sandervl
Message:

update

Location:
trunk/include/win
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/commctrl.h

    r4608 r4834  
    1 /* $Id: commctrl.h,v 1.36 2000-11-17 14:32:48 sandervl Exp $ */
     1/* $Id: commctrl.h,v 1.37 2000-12-24 12:28:19 sandervl Exp $ */
    22/*
    33 * Common controls definitions
    … …  
    1414//#include "prsht.h"
    1515
    16 /* c++ likes nameless unions whereas c doesnt */
    17 /* (used in property sheet structures)        */
    18 
    19 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
    20 #define DUMMYUNIONNAME
    21 #define DUMMYUNIONNAME1
    22 #define DUMMYUNIONNAME2
    23 #define DUMMYUNIONNAME3
    24 #define DUMMYUNIONNAME4
    25 #define DUMMYUNIONNAME5
    26 #else
    27 #define DUMMYUNIONNAME   u
    28 #define DUMMYUNIONNAME1  u1
    29 #define DUMMYUNIONNAME2  u2
    30 #define DUMMYUNIONNAME3  u3
    31 #define DUMMYUNIONNAME4  u4
    32 #define DUMMYUNIONNAME5  u5
    33 #endif
    3416
    3517#ifdef __cplusplus

  • trunk/include/win/debugtools.h

    r4822 r4834  
    192192#endif
    193193LPCSTR debugstr_guid1( void *id );
    194 #define debugstr_guid(a) debugstr_guid1((void *)a)
     194//#define debugstr_guid(a) debugstr_guid1((void *)a)
     195#define debugstr_guid(a) 0
    195196
    196197#ifdef __cplusplus

  • trunk/include/win/mdi.h

    r4 r4834  
    1 /* $Id: mdi.h,v 1.1 1999-05-24 20:19:14 ktk Exp $ */
     1/* $Id: mdi.h,v 1.2 2000-12-24 12:28:19 sandervl Exp $ */
    22
    33/* MDI.H
    … …  
    2222
    2323#define WM_MDICALCCHILDSCROLL   0x10AC /* this is exactly what Windows uses */
     24
     25/* "More Windows..." definitions */
     26#define MDI_MOREWINDOWSLIMIT    9       /* after this number of windows, a "More Windows..."
     27                                           option will appear under the Windows menu */
     28#define MDI_IDC_LISTBOX         100
     29#define MDI_IDS_MOREWINDOWS     13
    2430
    2531extern LRESULT WINAPI MDIClientWndProc( HWND hwnd, UINT message,

  • trunk/include/win/mmsystem.h

    r4608 r4834  
    1 /* $Id: mmsystem.h,v 1.9 2000-11-17 14:32:50 sandervl Exp $ */
     1/* $Id: mmsystem.h,v 1.10 2000-12-24 12:28:19 sandervl Exp $ */
    22/*
    33 * MMSYSTEM - Multimedia Wine Extension ... :-)
    … …  
    1616   
    1717#include "pshpack1.h"
    18 
    19 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
    20 #define DUMMYUNIONNAME
    21 #define DUMMYUNIONNAME1
    22 #define DUMMYUNIONNAME2
    23 #define DUMMYUNIONNAME3
    24 #define DUMMYUNIONNAME4
    25 #define DUMMYUNIONNAME5
    26 #else
    27 #define DUMMYUNIONNAME   u
    28 #define DUMMYUNIONNAME1  u1
    29 #define DUMMYUNIONNAME2  u2
    30 #define DUMMYUNIONNAME3  u3
    31 #define DUMMYUNIONNAME4  u4
    32 #define DUMMYUNIONNAME5  u5
    33 #endif
    34 
    35 #define DUMMYSTRUCTNAME   s
    36 #define DUMMYSTRUCTNAME1  s1
    37 
    38 //#endif /* !defined(NONAMELESSSTRUCT) */
    3918   
    4019#define MAXWAVEDRIVERS  10

  • trunk/include/win/ole.h

    r4241 r4834  
    1 /* $Id: ole.h,v 1.4 2000-09-12 18:40:15 sandervl Exp $ */
     1/* $Id: ole.h,v 1.5 2000-12-24 12:28:19 sandervl Exp $ */
    22/*
    33 *      ole.h   -       Declarations for OLESVR and OLECLI
    … …  
    169169} OLESTREAM;
    170170typedef struct _OLESERVERDOC*   LPOLESERVERDOC;
    171 typedef struct IOleObject*    LPOLEOBJECT;
    172 typedef struct _OLECLIENT*      LPOLECLIENT;
     171typedef struct _OLEOBJECT*    LPOLEOBJECT;
     172typedef struct _OLECLIENT*    LPOLECLIENT;
    173173typedef struct _OLESERVERDOCVTBL {
    174174        OLESTATUS       (* CALLBACK Save)(LPOLESERVERDOC);

  • trunk/include/win/oleauto.h

    r3850 r4834  
    1 /* $Id: oleauto.h,v 1.3 2000-07-18 18:30:35 sandervl Exp $ */
    2 
    31#ifndef __WINE_OLEAUTO_H
    42#define __WINE_OLEAUTO_H
     3
     4#include "wtypes.h"
     5#include "wine/obj_base.h"
     6#include "wine/obj_oleaut.h"
     7#include "wine/obj_errorinfo.h"
     8
     9#ifndef __WINE__
     10#include "oaidl.h"
     11#endif
     12
     13struct tagSAFEARRAY;
     14struct tagSAFEARRAYBOUND;
     15struct tagVARIANT;
    516
    617#ifdef __cplusplus
    … …  
    819#endif
    920
    10 /*#include <ole.h> */
    11 #include "mapidefs.h"
    12 #include "wine/obj_oleaut.h"
    13 #include "oaidl.h"
    14 
    15 BSTR16 WINAPI SysAllocString16(LPCOLESTR16);
     21
     22/*
     23 * BSTR API
     24 */
     25
    1626BSTR WINAPI SysAllocString(const OLECHAR*);
    17 INT16 WINAPI SysReAllocString16(LPBSTR16,LPCOLESTR16);
    18 INT WINAPI SysReAllocString(LPBSTR,const OLECHAR*);
    19 VOID WINAPI SysFreeString16(BSTR16);
    20 VOID WINAPI SysFreeString(BSTR);
    21 BSTR16 WINAPI SysAllocStringLen16(const char*, int);
    22 BSTR WINAPI SysAllocStringLen(const OLECHAR*, UINT);
    23 int WINAPI SysReAllocStringLen16(BSTR16*, const char*,  int);
    24 int WINAPI SysReAllocStringLen(BSTR*, const OLECHAR*, UINT);
    25 int WINAPI SysStringLen16(BSTR16);
    26 int WINAPI SysStringLen(BSTR);
    27 
    28  /*****************************************************************
    29  *  Time API
    30  */
    31 
    32 INT WINAPI DosDateTimeToVariantTime(USHORT wDosDate, USHORT wDosTime, DOUBLE * pvtime);
    33 
    34 INT WINAPI VariantTimeToDosDateTime(DOUBLE vtime, USHORT * pwDosDate, USHORT * pwDosTime);
    35 
    36 #ifdef _WIN32
    37 INT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME lpSystemTime, DOUBLE *pvtime);
    38 INT WINAPI VariantTimeToSystemTime(DOUBLE vtime, LPSYSTEMTIME lpSystemTime);
    39 #endif
    40 
     27BSTR WINAPI SysAllocStringByteLen(LPCSTR,UINT);
     28BSTR WINAPI SysAllocStringLen(const OLECHAR*,UINT);
     29void WINAPI SysFreeString(BSTR);
     30INT  WINAPI SysReAllocString(LPBSTR,const OLECHAR*);
     31int  WINAPI SysReAllocStringLen(BSTR*,const OLECHAR*,UINT);
     32int  WINAPI SysStringByteLen(BSTR);
     33int  WINAPI SysStringLen(BSTR);
     34
     35
     36/*****************************************************************
     37 *  ErrorInfo API
     38 */
     39
     40HRESULT WINAPI SetErrorInfo(ULONG dwReserved, IErrorInfo *perrinfo);
     41HRESULT WINAPI GetErrorInfo(ULONG dwReserved, IErrorInfo **pperrinfo);
     42HRESULT WINAPI CreateErrorInfo(ICreateErrorInfo **pperrinfo);
    4143
    4244/*****************************************************************
    … …  
    4547
    4648HRESULT WINAPI
    47 SafeArrayAllocDescriptor(UINT cDims, SAFEARRAY **ppsaOut);
    48 
    49 HRESULT WINAPI
    50 SafeArrayAllocData(SAFEARRAY *psa);
    51 
    52 SAFEARRAY* WINAPI
    53 SafeArrayCreate(VARTYPE vt, UINT cDims, SAFEARRAYBOUND *rgsabound);
    54 
    55 HRESULT WINAPI
    56 SafeArrayDestroyDescriptor(SAFEARRAY *psa);
    57 
    58 HRESULT WINAPI
    59 SafeArrayPutElement(SAFEARRAY *psa, LONG *rgIndices, void *pv);
    60 
    61 HRESULT WINAPI
    62 SafeArrayGetElement(SAFEARRAY *psa, LONG *rgIndices, void *pv);
    63 
    64 HRESULT WINAPI
    65 SafeArrayLock(SAFEARRAY *psa);
    66 
    67 HRESULT WINAPI
    68 SafeArrayUnlock(SAFEARRAY *psa);
    69 
    70 HRESULT WINAPI
    71 SafeArrayGetUBound(SAFEARRAY *psa, UINT nDim, LONG *plUbound);
    72 
    73 HRESULT WINAPI
    74 SafeArrayGetLBound(SAFEARRAY *psa, UINT nDim, LONG *plLbound);
     49SafeArrayAllocDescriptor(UINT cDims, struct tagSAFEARRAY **ppsaOut);
     50
     51HRESULT WINAPI
     52SafeArrayAllocData(struct tagSAFEARRAY *psa);
     53
     54struct tagSAFEARRAY * WINAPI
     55SafeArrayCreate(VARTYPE vt, UINT cDims, struct tagSAFEARRAYBOUND *rgsabound);
     56
     57HRESULT WINAPI
     58SafeArrayDestroyDescriptor(struct tagSAFEARRAY *psa);
     59
     60HRESULT WINAPI
     61SafeArrayPutElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
     62
     63HRESULT WINAPI
     64SafeArrayGetElement(struct tagSAFEARRAY *psa, LONG *rgIndices, void *pv);
     65
     66HRESULT WINAPI
     67SafeArrayLock(struct tagSAFEARRAY *psa);
     68
     69HRESULT WINAPI
     70SafeArrayUnlock(struct tagSAFEARRAY *psa);
     71
     72HRESULT WINAPI
     73SafeArrayGetUBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plUbound);
     74
     75HRESULT WINAPI
     76SafeArrayGetLBound(struct tagSAFEARRAY *psa, UINT nDim, LONG *plLbound);
    7577
    7678UINT  WINAPI
    77 SafeArrayGetDim(SAFEARRAY *psa);
     79SafeArrayGetDim(struct tagSAFEARRAY *psa);
    7880
    7981UINT  WINAPI
    80 SafeArrayGetElemsize(SAFEARRAY *psa);
    81 
    82 HRESULT WINAPI
    83 SafeArrayAccessData(SAFEARRAY *psa, void **ppvData);
    84 
    85 HRESULT WINAPI
    86 SafeArrayUnaccessData(SAFEARRAY *psa);
    87 
    88 HRESULT WINAPI
    89 SafeArrayPtrOfIndex(SAFEARRAY *psa, LONG *rgIndices, void **ppvData);
    90 
    91 HRESULT WINAPI
    92 SafeArrayCopyData(SAFEARRAY *psaSource, SAFEARRAY **psaTarget);
    93 
    94 HRESULT WINAPI
    95 SafeArrayDestroyData(SAFEARRAY *psa);
    96 
    97 HRESULT WINAPI
    98 SafeArrayDestroy(SAFEARRAY *psa);
    99 
    100 HRESULT WINAPI
    101 SafeArrayCopy(SAFEARRAY *psa, SAFEARRAY **ppsaOut);
    102 
    103 SAFEARRAY* WINAPI
     82SafeArrayGetElemsize(struct tagSAFEARRAY *psa);
     83
     84HRESULT WINAPI
     85SafeArrayAccessData(struct tagSAFEARRAY *psa, void **ppvData);
     86
     87HRESULT WINAPI
     88SafeArrayUnaccessData(struct tagSAFEARRAY *psa);
     89
     90HRESULT WINAPI
     91SafeArrayPtrOfIndex(struct tagSAFEARRAY *psa, LONG *rgIndices, void **ppvData);
     92
     93HRESULT WINAPI
     94SafeArrayCopyData(struct tagSAFEARRAY *psaSource, struct tagSAFEARRAY **psaTarget);
     95
     96HRESULT WINAPI
     97SafeArrayDestroyData(struct tagSAFEARRAY *psa);
     98
     99HRESULT WINAPI
     100SafeArrayDestroy(struct tagSAFEARRAY *psa);
     101
     102HRESULT WINAPI
     103SafeArrayCopy(struct tagSAFEARRAY *psa, struct tagSAFEARRAY **ppsaOut);
     104
     105struct tagSAFEARRAY *WINAPI
    104106SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements);
    105107
    106108HRESULT WINAPI
    107 SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
     109SafeArrayRedim(struct tagSAFEARRAY *psa, struct tagSAFEARRAYBOUND *psaboundNew);
    108110
    109111
    110112/* These are macros that help accessing the VARIANT date type.
    111113 */
    112 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
     114#ifdef __cplusplus
    113115#define V_UNION(A, B)   ((A)->B)
    114116#define V_VT(A)                 ((A)->vt)
    … …  
    168170 */
    169171
    170 void WINAPI VariantInit(VARIANTARG* pvarg);
    171 HRESULT WINAPI VariantClear(VARIANTARG* pvarg);
    172 HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc);
    173 HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc);
    174 HRESULT WINAPI VariantChangeType(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
     172void WINAPI VariantInit(struct tagVARIANT* pvarg);
     173HRESULT WINAPI VariantClear(struct tagVARIANT* pvarg);
     174HRESULT WINAPI VariantCopy(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc);
     175HRESULT WINAPI VariantCopyInd(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc);
     176HRESULT WINAPI VariantChangeType(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc,
    175177                                                  USHORT wFlags, VARTYPE vt);
    176 HRESULT WINAPI VariantChangeTypeEx(VARIANTARG* pvargDest, VARIANTARG* pvargSrc,
     178HRESULT WINAPI VariantChangeTypeEx(struct tagVARIANT* pvargDest, struct tagVARIANT* pvargSrc,
    177179                                                        LCID lcid, USHORT wFlags, VARTYPE vt);
    178180
    … …  
    481483#define VarUintFromInt  VarUI4FromI4
    482484
     485/*
     486 * Variant Math operations
     487 */
     488#define VARCMP_LT   0
     489#define VARCMP_EQ   1
     490#define VARCMP_GT   2
     491#define VARCMP_NULL 3
     492
     493HRESULT WINAPI VarAdd(LPVARIANT,LPVARIANT,LPVARIANT);
     494HRESULT WINAPI VarAnd(LPVARIANT,LPVARIANT,LPVARIANT);
     495HRESULT WINAPI VarCat(LPVARIANT,LPVARIANT,LPVARIANT);
     496HRESULT WINAPI VarDiv(LPVARIANT,LPVARIANT,LPVARIANT);
     497HRESULT WINAPI VarEqv(LPVARIANT,LPVARIANT,LPVARIANT);
     498HRESULT WINAPI VarIdiv(LPVARIANT,LPVARIANT,LPVARIANT);
     499HRESULT WINAPI VarImp(LPVARIANT,LPVARIANT,LPVARIANT);
     500HRESULT WINAPI VarMod(LPVARIANT,LPVARIANT,LPVARIANT);
     501HRESULT WINAPI VarMul(LPVARIANT,LPVARIANT,LPVARIANT);
     502HRESULT WINAPI VarOr(LPVARIANT,LPVARIANT,LPVARIANT);
     503HRESULT WINAPI VarPow(LPVARIANT,LPVARIANT,LPVARIANT);
     504HRESULT WINAPI VarSub(LPVARIANT,LPVARIANT,LPVARIANT);
     505HRESULT WINAPI VarXor(LPVARIANT,LPVARIANT,LPVARIANT);
     506
     507HRESULT WINAPI VarAbs(LPVARIANT,LPVARIANT);
     508HRESULT WINAPI VarFix(LPVARIANT,LPVARIANT);
     509HRESULT WINAPI VarInt(LPVARIANT,LPVARIANT);
     510HRESULT WINAPI VarNeg(LPVARIANT,LPVARIANT);
     511HRESULT WINAPI VarNot(LPVARIANT,LPVARIANT);
     512
     513HRESULT WINAPI VarRound(LPVARIANT,int,LPVARIANT);
     514
     515HRESULT WINAPI VarCmp(LPVARIANT,LPVARIANT,LCID,ULONG);
     516
     517
     518
     519typedef struct tagPARAMDATA {
     520    OLECHAR * szName;   /* parameter name */
     521    VARTYPE vt;         /* parameter type */
     522} PARAMDATA, * LPPARAMDATA;
     523
     524typedef struct tagMETHODDATA {
     525    OLECHAR * szName;   /* method name */
     526    PARAMDATA * ppdata; /* pointer to an array of PARAMDATAs */
     527    DISPID dispid;      /* method ID */
     528    UINT iMeth;         /* method index */
     529    CALLCONV_OLE2 cc;        /* calling convention */
     530    UINT cArgs;         /* count of arguments */
     531    WORD wFlags;        /* same wFlags as on IDispatch::Invoke() */
     532    VARTYPE vtReturn;
     533} METHODDATA, * LPMETHODDATA;
     534
     535typedef struct tagINTERFACEDATA {
     536    METHODDATA * pmethdata;  /* pointer to an array of METHODDATAs */
     537    UINT         cMembers;   /* count of members */
     538} INTERFACEDATA, * LPINTERFACEDATA;
     539
     540typedef enum tagREGKIND
     541{
     542    REGKIND_DEFAULT,
     543    REGKIND_REGISTER,
     544    REGKIND_NONE
     545} REGKIND;
     546
     547
     548INT WINAPI DosDateTimeToVariantTime(USHORT,USHORT,DATE*);
     549
     550ULONG WINAPI LHashValOfNameSysA(SYSKIND syskind,LCID lcid,LPCSTR szName);
     551ULONG WINAPI LHashValOfNameSys (SYSKIND syskind,LCID lcid,LPCOLESTR szName);
     552
     553HRESULT WINAPI DispGetParam(DISPPARAMS* pdispparams, UINT position,
     554            VARTYPE vtTarg, VARIANT* pvarResult, UINT* puArgErr);
     555HRESULT WINAPI DispGetIDsOfNames(ITypeInfo* ptinfo, OLECHAR** rgszNames,
     556            UINT cNames, DISPID* rgdispid);
     557HRESULT WINAPI DispInvoke(void* _this, ITypeInfo* ptinfo, DISPID dispidMember,
     558            WORD wFlags, DISPPARAMS* pparams, VARIANT* pvarResult,
     559            EXCEPINFO* pexcepinfo, UINT* puArgErr);
     560HRESULT WINAPI CreateDispTypeInfo(INTERFACEDATA* pidata, LCID lcid,
     561            ITypeInfo** pptinfo);
     562HRESULT WINAPI CreateStdDispatch(IUnknown* punkOuter, void* pvThis,
     563            ITypeInfo* ptinfo, IUnknown** ppunkStdDisp);
     564HRESULT WINAPI DispCallFunc(void* pvInstance, ULONG oVft, CALLCONV_OLE2 cc,
     565            VARTYPE vtReturn, UINT  cActuals, VARTYPE* prgvt,
     566            VARIANTARG** prgpvarg, VARIANT* pvargResult);
     567
     568
     569/*
     570 * TypeLib API
     571 */
     572
     573HRESULT WINAPI CreateTypeLib(SYSKIND,const OLECHAR*,ICreateTypeLib**);
     574HRESULT WINAPI CreateTypeLib2(SYSKIND,LPCOLESTR,ICreateTypeLib2**);
     575HRESULT WINAPI LoadRegTypeLib(REFGUID,WORD,WORD,LCID,ITypeLib**);
     576HRESULT WINAPI LoadTypeLib(const OLECHAR*,ITypeLib**);
     577HRESULT WINAPI LoadTypeLibEx(LPCOLESTR,REGKIND,ITypeLib**);
     578HRESULT WINAPI QueryPathOfRegTypeLib(REFGUID,WORD,WORD,LCID,LPBSTR);
     579HRESULT WINAPI RegisterTypeLib(ITypeLib*,OLECHAR*,OLECHAR*);
     580HRESULT WINAPI UnRegisterTypeLib(REFGUID,WORD,WORD,LCID,SYSKIND);
     581
    483582#ifdef __cplusplus
    484583} /* extern "C" */
    485584#endif
    486585
    487 typedef struct tagPARAMDATA {
    488     OLECHAR16 * szName;    /* parameter name */
    489     VARTYPE vt;         /* parameter type */
    490 } PARAMDATA, * LPPARAMDATA;
    491 
    492 typedef struct tagMETHODDATA {
    493     OLECHAR16 * szName;    /* method name */
    494     PARAMDATA * ppdata;  /* pointer to an array of PARAMDATAs */
    495     DISPID dispid;      /* method ID */
    496     UINT16 iMeth;         /* method index */
    497     CALLCONV_OLE2 cc;        /* calling convention */
    498     UINT16 cArgs;         /* count of arguments */
    499     WORD wFlags;        /* same wFlags as on IDispatch::Invoke() */
    500     VARTYPE vtReturn;
    501 } METHODDATA, * LPMETHODDATA;
    502 
    503 typedef struct tagINTERFACEDATA {
    504     METHODDATA * pmethdata;  /* pointer to an array of METHODDATAs */
    505     UINT16 cMembers;      /* count of members */
    506 } INTERFACEDATA, * LPINTERFACEDATA;
    507586
    508587#endif /*__WINE_OLEAUTO_H*/

  • trunk/include/win/olectl.h

    r1742 r4834  
    1 /* $Id: olectl.h,v 1.2 1999-11-14 21:01:22 davidr Exp $ */
    2 
    31#ifndef __WINE_OLECTL_H
    42#define __WINE_OLECTL_H
    53
    64#include "windef.h"
    7 
    8 #define WINOLECTLAPI INT WINAPI
     5#include "ocidl.h"
     6
     7#ifdef __cplusplus
     8extern "C" {
     9#endif
     10
     11
    912
    1013/*
    … …  
    8083#define FONTSIZE(n) { n##0000, 0 }
    8184
    82 /* COREL MOD PQ mar 9 - redecl in mfc */
    83 /*WINOLECTLAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid, VOID** ppvObj);*/
    84 
    85 typedef enum tagPICTURE
    86 {
    87     PICTURE_SCALEABLE           = 0x00000001,
    88     PICTURE_TRANSPARENT         = 0x00000002
    89 } PICTURE;
    90 
    9185#define PICTYPE_UNINITIALIZED (-1)
    9286#define PICTYPE_NONE          0
    … …  
    9690#define PICTYPE_ENHMETAFILE   4
    9791
    98 // DjR - Removed DUMMY stuff as it seemed unworkable in ICC
    9992typedef struct tagPICTDESC {
    100     UINT cbSizeofstruct;
    101     UINT picType;
    102     union {
    103         struct {
    104             HBITMAP hbitmap;
    105             HPALETTE hpal;
    106         } bmp;
    107         struct {
    108             HMETAFILE hmeta;
    109             int xExt;
    110             int yExt;
    111         } wmf;
    112         struct {
    113             HICON hicon;
    114         } icon;
    115         struct {
    116             HENHMETAFILE hemf;
    117         } emf;
    118     } u;
     93        UINT cbSizeofstruct;
     94        UINT picType;
     95        union {
     96                        struct {
     97                                        HBITMAP hbitmap;
     98                                        HPALETTE hpal;
     99                        } bmp;
     100                        struct {
     101                                        HMETAFILE hmeta;
     102                                        int xExt;
     103                                        int yExt;
     104                        } wmf;
     105                        struct {
     106                                        HICON hicon;
     107                        } icon;
     108                        struct {
     109                                        HENHMETAFILE hemf;
     110                        } emf;
     111        } DUMMYUNIONNAME;
    119112} PICTDESC, *LPPICTDESC;
    120113
    … …  
    138131typedef VARIANT_BOOL OLE_CANCELBOOL;
    139132typedef VARIANT_BOOL OLE_ENABLEDEFAULTBOOL;
     133
     134HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon);
     135
     136HRESULT WINAPI OleCreatePropertyFrameIndirect( LPOCPFIPARAMS lpParams);
     137
     138HRESULT WINAPI OleCreatePropertyFrame(
     139        HWND hwndOwner, UINT x, UINT y,
     140        LPCOLESTR lpszCaption, ULONG cObjects, LPUNKNOWN* ppUnk,
     141        ULONG cPages, LPCLSID pPageClsID, LCID lcid, DWORD dwReserved,
     142        LPVOID pvReserved );
     143
     144HRESULT WINAPI OleLoadPicture(  LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
     145                REFIID reed, LPVOID *lplpvObj );
     146
     147HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid,
     148                BOOL fOwn, LPVOID * lplpvObj );
     149
     150HRESULT WINAPI OleCreateFontIndirect(LPFONTDESC lpFontDesc, REFIID riid,
     151                LPVOID* lplpvObj);
     152
     153HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal,
     154                COLORREF* lpcolorref);
    140155
    141156/* standard dispatch ID's */
    … …  
    204219#define DISPID_Object                   (-802)
    205220#define DISPID_Parent                   (-803)
     221
     222#define DISPID_FONT_NAME 0
     223#define DISPID_FONT_SIZE 2
     224#define DISPID_FONT_BOLD 3
     225#define DISPID_FONT_ITALIC 4
     226#define DISPID_FONT_UNDER 5
     227#define DISPID_FONT_STRIKE 6
     228#define DISPID_FONT_WEIGHT 7
     229#define DISPID_FONT_CHARSET 8
    206230 
    207231/* Reflected Window Message IDs */
    … …  
    237261#define CONNECT_E_CANNOTCONNECT     (CONNECT_E_FIRST+2)
    238262#define CONNECT_E_OVERRIDDEN        (CONNECT_E_FIRST+3)
     263
     264#define SELFREG_E_FIRST             MAKE_SCODE(SEVERITY_ERROR,   FACILITY_ITF, 0x0200)
     265#define SELFREG_E_LAST              MAKE_SCODE(SEVERITY_ERROR,   FACILITY_ITF, 0x020F)
     266#define SELFREG_S_FIRST             MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_ITF, 0x0200)
     267#define SELFREG_S_LAST              MAKE_SCODE(SEVERITY_SUCCESS, FACILITY_ITF, 0x020F)
     268#define SELFREG_E_TYPELIB           (SELFREG_E_FIRST+0)
     269#define SELFREG_E_CLASS             (SELFREG_E_FIRST+1)
    239270
    240271#ifndef FACILITY_CONTROL
    … …  
    297328#define PERPROP_E_NOPAGEAVAILABLE   (PERPROP_E_FIRST+0)
    298329
     330
     331#ifdef __cplusplus
     332}
     333#endif
     334
    299335#endif /*  __WINE_OLECTL_H */
    300336

  • trunk/include/win/prsht.h

    r2883 r4834  
    1 /* $Id: prsht.h,v 1.5 2000-02-24 19:22:28 sandervl Exp $ */
     1/* $Id: prsht.h,v 1.6 2000-12-24 12:28:20 sandervl Exp $ */
    22
    33#ifndef _WINE_PRSHT_H
    … …  
    3434/* c++ likes nameless unions whereas c doesnt */
    3535/* (used in property sheet structures)        */
    36 
    37 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
    38 #define DUMMYUNIONNAME
    39 #define DUMMYUNIONNAME1
    40 #define DUMMYUNIONNAME2
    41 #define DUMMYUNIONNAME3
    42 #define DUMMYUNIONNAME4
    43 #define DUMMYUNIONNAME5
    44 #else
    45 #define DUMMYUNIONNAME   u
    46 #define DUMMYUNIONNAME1  u1
    47 #define DUMMYUNIONNAME2  u2
    48 #define DUMMYUNIONNAME3  u3
    49 #define DUMMYUNIONNAME4  u4
    50 #define DUMMYUNIONNAME5  u5
    51 #endif
    5236
    5337/*

  • trunk/include/win/windef.h

    r4075 r4834  
    1 /* $Id: windef.h,v 1.24 2000-08-23 18:05:56 sandervl Exp $ */
     1/* $Id: windef.h,v 1.25 2000-12-24 12:28:20 sandervl Exp $ */
    22
    33/*
    … …  
    159159#endif
    160160
     161/* Anonymous union/struct handling */
     162
     163#ifdef __WINE__
     164#if defined(__cplusplus) && !defined(NONAMELESSUNION)
     165# undef NONAMELESSSTRUCT
     166# undef NONAMELESSUNION
     167#else
     168# define NONAMELESSSTRUCT
     169# define NONAMELESSUNION
     170#endif
     171#else
     172/* Anonymous struct support starts with gcc/g++ 2.96 */
     173# if !defined(NONAMELESSSTRUCT) && defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ < 96)))
     174#  define NONAMELESSSTRUCT
     175# endif
     176/* Anonymous unions support starts with gcc 2.96/g++ 2.95 */
     177# if !defined(NONAMELESSUNION) && defined(__GNUC__) && ((__GNUC__ < 2) || ((__GNUC__ == 2) && ((__GNUC_MINOR__ < 95) || ((__GNUC_MINOR__ == 95) && !defined(__cplusplus)))))
     178#  define NONAMELESSUNION
     179# endif
     180#endif
     181
     182#ifndef NONAMELESSSTRUCT
     183#define DUMMYSTRUCTNAME
     184#define DUMMYSTRUCTNAME1
     185#define DUMMYSTRUCTNAME2
     186#define DUMMYSTRUCTNAME3
     187#define DUMMYSTRUCTNAME4
     188#define DUMMYSTRUCTNAME5
     189#else /* !defined(NONAMELESSSTRUCT) */
     190#define DUMMYSTRUCTNAME   s
     191#define DUMMYSTRUCTNAME1  s1
     192#define DUMMYSTRUCTNAME2  s2
     193#define DUMMYSTRUCTNAME3  s3
     194#define DUMMYSTRUCTNAME4  s4
     195#define DUMMYSTRUCTNAME5  s5
     196#endif /* !defined(NONAMELESSSTRUCT) */
     197
     198#ifndef NONAMELESSUNION
     199#define DUMMYUNIONNAME
     200#define DUMMYUNIONNAME1
     201#define DUMMYUNIONNAME2
     202#define DUMMYUNIONNAME3
     203#define DUMMYUNIONNAME4
     204#define DUMMYUNIONNAME5
     205#define DUMMYUNIONNAME6
     206#define DUMMYUNIONNAME7
     207#define DUMMYUNIONNAME8
     208#else /* !defined(NONAMELESSUNION) */
     209#define DUMMYUNIONNAME   u
     210#define DUMMYUNIONNAME1  u1
     211#define DUMMYUNIONNAME2  u2
     212#define DUMMYUNIONNAME3  u3
     213#define DUMMYUNIONNAME4  u4
     214#define DUMMYUNIONNAME5  u5
     215#define DUMMYUNIONNAME6  u6
     216#define DUMMYUNIONNAME7  u7
     217#define DUMMYUNIONNAME8  u8
     218#endif /* !defined(NONAMELESSUNION) */
    161219
    162220

  • trunk/include/win/winnt.h

    r4657 r4834  
    13361336        DWORD    LowPart;
    13371337        LONG     HighPart;
    1338     } s;
     1338    } DUMMYSTRUCTNAME;
    13391339    LONGLONG QuadPart;
    13401340} LARGE_INTEGER, *LPLARGE_INTEGER, *PLARGE_INTEGER;
    … …  
    13431343    struct {
    13441344        DWORD    LowPart;
    1345         LONG     HighPart;
    1346     } s;
    1347     LONGLONG QuadPart;
     1345        DWORD    HighPart;
     1346    } DUMMYSTRUCTNAME;
     1347    ULONGLONG QuadPart;
    13481348} ULARGE_INTEGER, *LPULARGE_INTEGER, *PULARGE_INTEGER;
    13491349#endif

  • trunk/include/win/wtypes.h

    r4414 r4834  
    153153#ifndef _tagCY_DEFINED
    154154#define _tagCY_DEFINED
    155 typedef union tagCY
    156 {
     155
     156typedef union tagCY {
    157157    struct {
    158158#ifdef BIG_ENDIAN
    159         long Hi;
    160         long Lo;
    161 #else
    162         unsigned long Lo;
    163         long Hi;
    164 #endif
    165     } u;
     159        LONG Hi;
     160        LONG Lo;
     161#else /* defined(BIG_ENDIAN) */
     162        ULONG Lo;
     163        LONG Hi;
     164#endif /* defined(BIG_ENDIAN) */
     165    } DUMMYSTRUCTNAME;
    166166    LONGLONG int64;
    167167} CY;
     168
    168169#endif /* _tagCY_DEFINED */
    169170
Note: See TracChangeset for help on using the changeset viewer.