Changeset 17133


Ignore:
Timestamp:
Aug 23, 2001, 8:10:25 PM (24 years ago)
Author:
sandervl
Message:

updates

Location:
tags/trunk/include/win
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified tags/trunk/include/win/oleauto.h

    r17068 r17133  
    22#define __WINE_OLEAUTO_H
    33
     4#include "winbase.h"
    45#include "wtypes.h"
    56#include "wine/obj_base.h"
    … …  
    1112#endif
    1213
     14#ifdef __cplusplus
     15extern "C" {
     16#endif
     17
    1318struct tagSAFEARRAY;
    1419struct tagSAFEARRAYBOUND;
    1520struct tagVARIANT;
    16 
    17 #ifdef __cplusplus
    18 extern "C" {
    19 #endif
    20 
    2121
    2222/*
    … …  
    103103SafeArrayCopy(struct tagSAFEARRAY *psa, struct tagSAFEARRAY **ppsaOut);
    104104
    105 struct tagSAFEARRAY *WINAPI
     105struct tagSAFEARRAY * WINAPI
    106106SafeArrayCreateVector(VARTYPE vt, LONG lLbound, ULONG cElements);
    107107
    … …  
    112112/* These are macros that help accessing the VARIANT date type.
    113113 */
    114 #if defined(__cplusplus) && !defined(NONAMELESSUNION)
     114#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
     115#define V_UNION(A, B)   ((A)->n1.n2.n3.B)
     116#define V_VT(A)                 ((A)->n1.n2.vt)
     117#else
    115118#define V_UNION(A, B)   ((A)->B)
    116 #define V_VT(A)                 ((A)->vt)
    117 #else
    118 #define V_UNION(A, B)   ((A)->u.B)
    119119#define V_VT(A)                 ((A)->vt)
    120120#endif /* cplusplus */
    … …  
    224224HRESULT WINAPI VarUI1FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, BYTE* pbOut);
    225225HRESULT WINAPI VarUI1FromCy(CY cyIn, BYTE* pbOut);
    226 
    227 /*
    228 HRESULT WINAPI VarUI1FromDec32(DECIMAL*pdecIn, BYTE*pbOut);
    229 HRESULT WINAPI VarUI1FromDisp32(IDispatch* pdispIn, LCID lcid, BYTE* pbOut);
    230 */
     226HRESULT WINAPI VarUI1FromDec(DECIMAL* pdecIn, BYTE* pbOut);
     227HRESULT WINAPI VarUI1FromDisp(IDispatch* pdispIn, LCID lcid, BYTE* pbOut);
    231228
    232229HRESULT WINAPI VarI2FromUI1(BYTE bIn, short* psOut);
    … …  
    241238HRESULT WINAPI VarI2FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, short* psOut);
    242239HRESULT WINAPI VarI2FromCy(CY cyIn, short* psOut);
    243 /*
    244 HRESULT WINAPI VarI2FromDec32(DECIMAL*pdecIn, short*psOut);
    245 HRESULT WINAPI VarI2FromDisp32(IDispatch* pdispIn, LCID lcid, short* psOut);
    246 */
     240HRESULT WINAPI VarI2FromDec(DECIMAL* pdecIn, short* psOut);
     241HRESULT WINAPI VarI2FromDisp(IDispatch* pdispIn, LCID lcid, short* psOut);
    247242
    248243HRESULT WINAPI VarI4FromUI1(BYTE bIn, LONG* plOut);
    … …  
    257252HRESULT WINAPI VarI4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, LONG* plOut);
    258253HRESULT WINAPI VarI4FromCy(CY cyIn, LONG* plOut);
    259 /*
    260 HRESULT WINAPI VarI4FromDec32(DECIMAL*pdecIn, LONG*plOut);
    261 HRESULT WINAPI VarI4FromDisp32(IDispatch* pdispIn, LCID lcid, LONG* plOut);
    262 */
     254HRESULT WINAPI VarI4FromDec(DECIMAL* pdecIn, LONG* plOut);
     255HRESULT WINAPI VarI4FromDisp(IDispatch* pdispIn, LCID lcid, LONG* plOut);
    263256
    264257HRESULT WINAPI VarR4FromUI1(BYTE bIn, FLOAT* pfltOut);
    … …  
    273266HRESULT WINAPI VarR4FromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, FLOAT*pfltOut);
    274267HRESULT WINAPI VarR4FromCy(CY cyIn, FLOAT* pfltOut);
    275 /*
    276 HRESULT WINAPI VarR4FromDec32(DECIMAL*pdecIn, FLOAT*pfltOut);
    277 HRESULT WINAPI VarR4FromDisp32(IDispatch* pdispIn, LCID lcid, FLOAT* pfltOut);
    278 */
     268HRESULT WINAPI VarR4FromDec(DECIMAL* pdecIn, FLOAT* pfltOut);
     269HRESULT WINAPI VarR4FromDisp(IDispatch* pdispIn, LCID lcid, FLOAT* pfltOut);
    279270
    280271HRESULT WINAPI VarR8FromUI1(BYTE bIn, double* pdblOut);
    … …  
    289280HRESULT WINAPI VarR8FromStr(OLECHAR*strIn, LCID lcid, ULONG dwFlags, double*pdblOut);
    290281HRESULT WINAPI VarR8FromCy(CY cyIn, double* pdblOut);
    291 /*
    292 HRESULT WINAPI VarR8FromDec32(DECIMAL*pdecIn, double*pdblOut);
    293 HRESULT WINAPI VarR8FromDisp32(IDispatch* pdispIn, LCID lcid, double* pdblOut);
    294 */
     282HRESULT WINAPI VarR8FromDec(DECIMAL* pdecIn, double* pdblOut);
     283HRESULT WINAPI VarR8FromDisp(IDispatch* pdispIn, LCID lcid, double* pdblOut);
    295284
    296285HRESULT WINAPI VarDateFromUI1(BYTE bIn, DATE* pdateOut);
    … …  
    305294HRESULT WINAPI VarDateFromBool(VARIANT_BOOL boolIn, DATE* pdateOut);
    306295HRESULT WINAPI VarDateFromCy(CY cyIn, DATE* pdateOut);
    307 /*
    308 HRESULT WINAPI VarDateFromDec32(DECIMAL*pdecIn, DATE*pdateOut);
    309 HRESULT WINAPI VarDateFromDisp32(IDispatch* pdispIn, LCID lcid, DATE* pdateOut);
    310 */
     296HRESULT WINAPI VarDateFromDec(DECIMAL* pdecIn, DATE* pdateOut);
     297HRESULT WINAPI VarDateFromDisp(IDispatch* pdispIn, LCID lcid, DATE* pdateOut);
     298
    311299HRESULT WINAPI VarCyFromUI1(BYTE bIn, CY* pcyOut);
    312300HRESULT WINAPI VarCyFromI2(short sIn, CY* pcyOut);
    … …  
    317305HRESULT WINAPI VarCyFromStr(OLECHAR *strIn, LCID lcid, ULONG dwFlags, CY *pcyOut);
    318306HRESULT WINAPI VarCyFromBool(VARIANT_BOOL boolIn, CY* pcyOut);
    319 HRESULT WINAPI VarCyFromI1(CHAR cIn, CY*pcyOut);
     307HRESULT WINAPI VarCyFromI1(signed char cIn, CY*pcyOut);
    320308HRESULT WINAPI VarCyFromUI2(USHORT uiIn, CY*pcyOut);
    321309HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY*pcyOut);
    322 /*
    323 HRESULT WINAPI VarCyFromDec32(DECIMAL*pdecIn, CY*pcyOut);
    324 HRESULT WINAPI VarCyFromStr32(OLECHAR32* strIn, LCID lcid, ULONG dwFlags, CY* pcyOut);
    325 HRESULT WINAPI VarCyFromDisp32(IDispatch* pdispIn, LCID lcid, CY* pcyOut);
    326 */
     310HRESULT WINAPI VarCyFromDec(DECIMAL*pdecIn, CY*pcyOut);
     311HRESULT WINAPI VarCyFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, CY* pcyOut);
     312HRESULT WINAPI VarCyFromDisp(IDispatch* pdispIn, LCID lcid, CY* pcyOut);
    327313
    328314HRESULT WINAPI VarBstrFromUI1(BYTE bVal, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
    … …  
    331317HRESULT WINAPI VarBstrFromR4(FLOAT fltIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
    332318HRESULT WINAPI VarBstrFromR8(double dblIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
    333 HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut);
    334319HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
    335320HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL boolIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
    … …  
    338323HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR*pbstrOut);
    339324HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
    340 /*
    341 HRESULT WINAPI VarBstrFromDec32(DECIMAL*pdecIn, LCID lcid, ULONG dwFlags, BSTR32*pbstrOut);
    342 HRESULT WINAPI VarBstrFromDisp32(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR32* pbstrOut);
    343 */
     325HRESULT WINAPI VarBstrFromDec(DECIMAL* pdecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
     326HRESULT WINAPI VarBstrFromDisp(IDispatch* pdispIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut);
    344327
    345328HRESULT WINAPI VarBoolFromUI1(BYTE bIn, VARIANT_BOOL* pboolOut);
    … …  
    354337HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL*pboolOut);
    355338HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL* pboolOut);
    356 /*
    357 HRESULT WINAPI VarBoolFromDec32(DECIMAL*pdecIn, VARIANT_BOOL*pboolOut);
    358 HRESULT WINAPI VarBoolFromDisp32(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL* pboolOut);
    359 */
     339HRESULT WINAPI VarBoolFromDec(DECIMAL* pdecIn, VARIANT_BOOL* pboolOut);
     340HRESULT WINAPI VarBoolFromDisp(IDispatch* pdispIn, LCID lcid, VARIANT_BOOL* pboolOut);
    360341
    361342HRESULT WINAPI VarI1FromUI1(BYTE bIn, CHAR*pcOut);
    … …  
    370351HRESULT WINAPI VarI1FromUI4(ULONG ulIn, CHAR*pcOut);
    371352HRESULT WINAPI VarI1FromCy(CY cyIn, CHAR*pcOut);
    372 /*
    373 HRESULT WINAPI VarI1FromDec32(DECIMAL*pdecIn, CHAR*pcOut);
    374 HRESULT WINAPI VarI1FromDisp32(IDispatch*pdispIn, LCID lcid, CHAR*pcOut);
    375 */
     353HRESULT WINAPI VarI1FromDec(DECIMAL* pdecIn, CHAR* pcOut);
     354HRESULT WINAPI VarI1FromDisp(IDispatch* pdispIn, LCID lcid, CHAR* pcOut);
    376355
    377356HRESULT WINAPI VarUI2FromUI1(BYTE bIn, USHORT*puiOut);
    … …  
    386365HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT*puiOut);
    387366HRESULT WINAPI VarUI2FromCy(CY cyIn, USHORT*puiOut);
    388 /*
    389 HRESULT WINAPI VarUI2FromDec32(DECIMAL*pdecIn, USHORT*puiOut);
    390 HRESULT WINAPI VarUI2FromDisp32(IDispatch*pdispIn, LCID lcid, USHORT*puiOut);
    391 */
     367HRESULT WINAPI VarUI2FromDec(DECIMAL* pdecIn, USHORT* puiOut);
     368HRESULT WINAPI VarUI2FromDisp(IDispatch* pdispIn, LCID lcid, USHORT* puiOut);
    392369
    393370HRESULT WINAPI VarUI4FromStr(OLECHAR*strIn, LCID lcid, ULONG dwFlags, ULONG*pulOut);
    … …  
    402379HRESULT WINAPI VarUI4FromUI2(USHORT uiIn, ULONG*pulOut);
    403380HRESULT WINAPI VarUI4FromCy(CY cyIn, ULONG*pulOut);
    404 /*
    405 HRESULT WINAPI VarUI4FromDec32(DECIMAL*pdecIn, ULONG*pulOut);
    406 HRESULT WINAPI VarUI4FromDisp32(IDispatch*pdispIn, LCID lcid, ULONG*pulOut);
    407 
    408 HRESULT WINAPI VarDecFromUI132(BYTE bIn, DECIMAL*pdecOut);
    409 HRESULT WINAPI VarDecFromI232(short uiIn, DECIMAL*pdecOut);
    410 HRESULT WINAPI VarDecFromI432(LONG lIn, DECIMAL*pdecOut);
    411 HRESULT WINAPI VarDecFromR432(FLOAT fltIn, DECIMAL*pdecOut);
    412 HRESULT WINAPI VarDecFromR832(double dblIn, DECIMAL*pdecOut);
    413 HRESULT WINAPI VarDecFromDate32(DATE dateIn, DECIMAL*pdecOut);
    414 HRESULT WINAPI VarDecFromStr32(OLECHAR32*strIn, LCID lcid, ULONG dwFlags, DECIMAL*pdecOut);
    415 HRESULT WINAPI VarDecFromBool32(VARIANT_BOOL boolIn, DECIMAL*pdecOut);
    416 HRESULT WINAPI VarDecFromI132(CHAR cIn, DECIMAL*pdecOut);
    417 HRESULT WINAPI VarDecFromUI232(USHORT uiIn, DECIMAL*pdecOut);
    418 HRESULT WINAPI VarDecFromUI432(ULONG ulIn, DECIMAL*pdecOut);
    419 HRESULT WINAPI VarDecFromCy32(CY cyIn, DECIMAL*pdecOut);
    420 HRESULT WINAPI VarDecFromDisp32(IDispatch*pdispIn, LCID lcid, DECIMAL*pdecOut);
    421 */
     381HRESULT WINAPI VarUI4FromDec(DECIMAL* pdecIn, ULONG* pulOut);
     382HRESULT WINAPI VarUI4FromDisp(IDispatch* pdispIn, LCID lcid, ULONG* pulOut);
     383
     384HRESULT WINAPI VarDecFromUI1(BYTE bIn, DECIMAL*pdecOut);
     385HRESULT WINAPI VarDecFromI2(short uiIn, DECIMAL*pdecOut);
     386HRESULT WINAPI VarDecFromI4(LONG lIn, DECIMAL*pdecOut);
     387HRESULT WINAPI VarDecFromR4(FLOAT fltIn, DECIMAL*pdecOut);
     388HRESULT WINAPI VarDecFromR8(double dblIn, DECIMAL*pdecOut);
     389HRESULT WINAPI VarDecFromDate(DATE dateIn, DECIMAL*pdecOut);
     390HRESULT WINAPI VarDecFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DECIMAL* pdecOut);
     391HRESULT WINAPI VarDecFromBool(VARIANT_BOOL boolIn, DECIMAL* pdecOut);
     392HRESULT WINAPI VarDecFromI1(CHAR cIn, DECIMAL* pdecOut);
     393HRESULT WINAPI VarDecFromUI2(USHORT uiIn, DECIMAL* pdecOut);
     394HRESULT WINAPI VarDecFromUI4(ULONG ulIn, DECIMAL* pdecOut);
     395HRESULT WINAPI VarDecFromCy(CY cyIn, DECIMAL* pdecOut);
     396HRESULT WINAPI VarDecFromDisp(IDispatch* pdispIn, LCID lcid, DECIMAL* pdecOut);
    422397
    423398
    … …  
    430405#define VarI2FromInt            VarI2FromI4
    431406#define VarI2FromUint           VarI2FromUI4
    432 #define VarI4FromInt            VarI4FromI432
     407#define VarI4FromInt            VarI4FromI4
    433408#define VarI4FromUint           VarI4FromUI4
    434409#define VarR4FromInt            VarR4FromI4
    … …  
    449424#define VarUI2FromUint  VarUI2FromUI4
    450425#define VarUI4FromInt           VarUI4FromI4
    451 #define VarUI4FromUint  VarUI4FromUI432
    452 #define VarDecFromInt           VarDecFromI432
    453 #define VarDecFromUint  VarDecFromUI432
     426#define VarUI4FromUint  VarUI4FromUI4
     427#define VarDecFromInt           VarDecFromI4
     428#define VarDecFromUint  VarDecFromUI4
    454429#define VarIntFromUI1           VarI4FromUI1
    455430#define VarIntFromI2            VarI4FromI2
    456 #define VarIntFromI4            VarI4FromI432
     431#define VarIntFromI4            VarI4FromI4
    457432#define VarIntFromR4            VarI4FromR4
    458433#define VarIntFromR8            VarI4FromR8
    … …  
    460435#define VarIntFromCy            VarI4FromCy
    461436#define VarIntFromStr           VarI4FromStr
    462 #define VarIntFromDisp  VarI4FromDisp32
     437#define VarIntFromDisp  VarI4FromDisp
    463438#define VarIntFromBool  VarI4FromBool
    464439#define VarIntFromI1            VarI4FromI1
    465440#define VarIntFromUI2           VarI4FromUI2
    466441#define VarIntFromUI4           VarI4FromUI4
    467 #define VarIntFromDec           VarI4FromDec32
     442#define VarIntFromDec           VarI4FromDec
    468443#define VarIntFromUint  VarI4FromUI4
    469444#define VarUintFromUI1  VarUI4FromUI1
    … …  
    475450#define VarUintFromCy           VarUI4FromCy
    476451#define VarUintFromStr  VarUI4FromStr
    477 #define VarUintFromDisp VarUI4FromDisp32
     452#define VarUintFromDisp VarUI4FromDisp
    478453#define VarUintFromBool VarUI4FromBool
    479454#define VarUintFromI1           VarUI4FromI1
    480455#define VarUintFromUI2  VarUI4FromUI2
    481 #define VarUintFromUI4  VarUI4FromUI432
    482 #define VarUintFromDec  VarUI4FromDec32
     456#define VarUintFromUI4  VarUI4FromUI4
     457#define VarUintFromDec  VarUI4FromDec
    483458#define VarUintFromInt  VarUI4FromI4
    484459
    … …  
    545520} REGKIND;
    546521
     522typedef struct {
     523    SYSTEMTIME st;
     524    USHORT wDayOfYear;
     525} UDATE;
     526
     527typedef struct {
     528    INT   cDig;
     529    ULONG dwInFlags;
     530    ULONG dwOutFlags;
     531    INT   cchUsed;
     532    INT   nBaseShift;
     533    INT   nPwr10;
     534} NUMPARSE;
     535
     536#define NUMPRS_LEADING_WHITE    0x0001
     537#define NUMPRS_TRAILING_WHITE   0x0002
     538#define NUMPRS_LEADING_PLUS     0x0004
     539#define NUMPRS_TRAILING_PLUS    0x0008
     540#define NUMPRS_LEADING_MINUS    0x0010
     541#define NUMPRS_TRAILING_MINUS   0x0020
     542#define NUMPRS_HEX_OCT          0x0040
     543#define NUMPRS_PARENS           0x0080
     544#define NUMPRS_DECIMAL          0x0100
     545#define NUMPRS_THOUSANDS        0x0200
     546#define NUMPRS_CURRENCY         0x0400
     547#define NUMPRS_EXPONENT         0x0800
     548#define NUMPRS_USE_ALL          0x1000
     549#define NUMPRS_STD              0x1FFF
     550
     551#define NUMPRS_NEG              0x10000
     552#define NUMPRS_INEXACT          0x20000
     553
     554#define VTBIT_I1        (1 << VT_I1)
     555#define VTBIT_UI1       (1 << VT_UI1)
     556#define VTBIT_I2        (1 << VT_I2)
     557#define VTBIT_UI2       (1 << VT_UI2)
     558#define VTBIT_I4        (1 << VT_I4)
     559#define VTBIT_UI4       (1 << VT_UI4)
     560#define VTBIT_R4        (1 << VT_R4)
     561#define VTBIT_R8        (1 << VT_R8)
     562#define VTBIT_CY        (1 << VT_CY)
     563#define VTBIT_DECIMAL   (1 << VT_DECIMAL)
     564
     565HRESULT WINAPI VarParseNumFromStr(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*);
     566HRESULT WINAPI VarNumFromParseNum(NUMPARSE*,BYTE*,ULONG,VARIANT*);
    547567
    548568INT WINAPI DosDateTimeToVariantTime(USHORT,USHORT,DATE*);
     569INT WINAPI VariantTimeToDosDateTime(DATE, USHORT *, USHORT *);
     570
     571HRESULT WINAPI VariantTimeToSystemTime(double,LPSYSTEMTIME);
     572HRESULT WINAPI SystemTimeToVariantTime(LPSYSTEMTIME,double*);
     573
     574HRESULT WINAPI VarDateFromUdate(UDATE*,ULONG, DATE*);
     575HRESULT WINAPI VarUdateFromDate(DATE, ULONG, UDATE *);
    549576
    550577ULONG WINAPI LHashValOfNameSysA(SYSKIND syskind,LCID lcid,LPCSTR szName);

  • TabularUnified tags/trunk/include/win/wine/obj_oleaut.h

    r17068 r17133  
    115115 * DISP_E_ARRAYISLOCKED : The variant contains an array that is locked.
    116116 */
     117#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
     118#define __VARIANT_NAME_1 n1
     119#define __VARIANT_NAME_2 n2
     120#define __VARIANT_NAME_3 n3
     121#else
     122#define __tagVARIANT
     123#define __VARIANT_NAME_1
     124#define __VARIANT_NAME_2
     125#define __VARIANT_NAME_3
     126#endif
    117127
    118128typedef struct tagVARIANT VARIANT, *LPVARIANT;
    119129typedef struct tagVARIANT VARIANTARG, *LPVARIANTARG;
    120130
    121 struct tagVARIANT {
    122         VARTYPE vt;
    123         WORD wReserved1;
    124         WORD wReserved2;
    125         WORD wReserved3;
    126         union /* DUMMYUNIONNAME */
    127         {
    128         /* By value. */
    129                 CHAR cVal;
    130                 USHORT uiVal;
    131                 ULONG ulVal;
    132                 INT intVal;
    133                 UINT uintVal;
    134                 BYTE bVal;
    135                 short iVal;
    136                 long lVal;
    137                 float fltVal;
    138                 double dblVal;
    139                 VARIANT_BOOL boolVal;
    140                 SCODE scode;
    141                 DATE date;
    142                 BSTR bstrVal;
    143                 CY cyVal;
    144                 /* DECIMAL decVal; */
    145                 IUnknown* punkVal;
    146                 IDispatch* pdispVal;
    147                 SAFEARRAY* parray;
    148 
    149                 /* By reference */
    150                 CHAR* pcVal;
    151                 USHORT* puiVal;
    152                 ULONG* pulVal;
    153                 INT* pintVal;
    154                 UINT* puintVal;
    155                 BYTE* pbVal;
    156                 short* piVal;
    157                 long* plVal;
    158                 float* pfltVal;
    159                 double* pdblVal;
    160                 VARIANT_BOOL* pboolVal;
    161                 SCODE* pscode;
    162                 DATE* pdate;
    163                 BSTR* pbstrVal;
    164                 VARIANT* pvarVal;
    165                 PVOID byref;
    166                 CY* pcyVal;
    167           /* DECIMAL* pdecVal; */
    168                 IUnknown** ppunkVal;
    169                 IDispatch** ppdispVal;
    170                 SAFEARRAY** pparray;
    171         } DUMMYUNIONNAME;
     131struct tagVARIANT
     132{
     133    union
     134    {
     135        struct __tagVARIANT
     136        {
     137            VARTYPE vt;
     138            WORD wReserved1;
     139            WORD wReserved2;
     140            WORD wReserved3;
     141            union /* DUMMYUNIONNAME */
     142            {
     143                /* B    y value. */
     144                CHAR cVal;
     145                USHORT uiVal;
     146                ULONG ulVal;
     147                INT intVal;
     148                UINT uintVal;
     149                BYTE bVal;
     150                short iVal;
     151                long lVal;
     152                float fltVal;
     153                double dblVal;
     154                VARIANT_BOOL boolVal;
     155                SCODE scode;
     156                DATE date;
     157                BSTR bstrVal;
     158                CY cyVal;
     159                IUnknown* punkVal;
     160                IDispatch* pdispVal;
     161                SAFEARRAY* parray;
     162
     163                /* By reference */
     164                CHAR* pcVal;
     165                USHORT* puiVal;
     166                ULONG* pulVal;
     167                INT* pintVal;
     168                UINT* puintVal;
     169                BYTE* pbVal;
     170                short* piVal;
     171                long* plVal;
     172                float* pfltVal;
     173                double* pdblVal;
     174                VARIANT_BOOL* pboolVal;
     175                SCODE* pscode;
     176                DATE* pdate;
     177                BSTR* pbstrVal;
     178                VARIANT* pvarVal;
     179                PVOID byref;
     180                CY* pcyVal;
     181                DECIMAL* pdecVal;
     182                IUnknown** ppunkVal;
     183                IDispatch** ppdispVal;
     184                SAFEARRAY** pparray;
     185            } __VARIANT_NAME_3;
     186        } __VARIANT_NAME_2;
     187        DECIMAL decVal;
     188    } __VARIANT_NAME_1;
    172189};
    173190
    174              
     191
    175192typedef LONG DISPID;
    176193typedef DWORD HREFTYPE;
    … …  
    215232    DWORD dwHelpContext;
    216233    PVOID pvReserved;
    217 #ifdef __WIN32OS2__
    218234    HRESULT (* __stdcall pfnDeferredFillIn)(struct tagEXCEPINFO *);
    219 #else
    220     HRESULT __stdcall (*pfnDeferredFillIn)(struct tagEXCEPINFO *);
    221 #endif
    222235    SCODE scode;
    223236} EXCEPINFO, * LPEXCEPINFO;
Note: See TracChangeset for help on using the changeset viewer.