From 5666895041454ba19dc821136074835ee32c1c4c Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sun, 29 Feb 2004 12:53:39 +0000 Subject: [PATCH] move missing oleaut32 declarations from ros-mingw-fixes.h into W32API headers svn path=/trunk/; revision=8475 --- reactos/include/basetsd.h | 6 +- reactos/lib/oleaut32/ros-mingw-fixes.h | 312 ------------------------- reactos/lib/oleaut32/variant.h | 7 - reactos/w32api/include/oaidl.h | 15 ++ reactos/w32api/include/oleauto.h | 271 +++++++++++++++++++++ 5 files changed, 289 insertions(+), 322 deletions(-) diff --git a/reactos/include/basetsd.h b/reactos/include/basetsd.h index 8e85e9b984e..9a01081ef38 100644 --- a/reactos/include/basetsd.h +++ b/reactos/include/basetsd.h @@ -1,5 +1,5 @@ -#ifndef _BASETSD_H -#define _BASETSD_H +#ifndef _ROS_BASETSD_H +#define _ROS_BASETSD_H #if __GNUC__ >=3 #pragma GCC system_header #endif @@ -138,4 +138,4 @@ typedef unsigned __int64 UINT64, *PUINT64; #endif /* !__USE_W32API */ -#endif /* _BASETSD_H */ +#endif /* _ROS_BASETSD_H */ diff --git a/reactos/lib/oleaut32/ros-mingw-fixes.h b/reactos/lib/oleaut32/ros-mingw-fixes.h index 87fd141ff22..68cfdcd40ed 100644 --- a/reactos/lib/oleaut32/ros-mingw-fixes.h +++ b/reactos/lib/oleaut32/ros-mingw-fixes.h @@ -3,315 +3,3 @@ #undef V_DECIMAL #define V_DECIMAL(X) (X->__VARIANT_NAME_1.decVal) -HRESULT WINAPI VarI1FromR8(DOUBLE,signed char*); -HRESULT WINAPI VarI8FromR8(DOUBLE,LONG64*); -HRESULT WINAPI VarUI4FromR8(DOUBLE,ULONG*); -HRESULT WINAPI VarUI2FromR8(DOUBLE,USHORT*); -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn,LONG64*); -HRESULT WINAPI VarUI4FromCy(CY,ULONG*); -HRESULT WINAPI VarUI8FromR8(DOUBLE,ULONG64*); -HRESULT WINAPI VarDecFromI4(LONG,DECIMAL*); -HRESULT WINAPI VarDecFromUI4(ULONG,DECIMAL*); -HRESULT WINAPI VarDecNeg(const DECIMAL*,DECIMAL*); - -/* missing constants in MinGW headers */ -#ifndef VARCMP_LT -#define VARCMP_LT 0 -#define VARCMP_EQ 1 -#define VARCMP_GT 2 -#define VARCMP_NULL 3 -#endif - -#ifndef VAR_LOCALBOOL - -#define VAR_LOCALBOOL 0x10 - -#define LOCALE_USE_NLS 0x10000000 - -#define VARIANT_NOUSEROVERRIDE 0x04 -#define VARIANT_CALENDAR_HIJRI 0x08 -#define VARIANT_CALENDAR_THAI 0x20 -#define VARIANT_CALENDAR_GREGORIAN 0x40 -#define VARIANT_USE_NLS 0x80 - -#define VAR_CALENDAR_HIJRI ((DWORD)0x00000008) -#define VAR_CALENDAR_THAI ((DWORD)0x00000080) -#define VAR_CALENDAR_GREGORIAN ((DWORD)0x00000100) - -#endif - - -/* copied from wine/include/oleauto.h: */ -HRESULT WINAPI VarUI1FromI2(SHORT,BYTE*); -HRESULT WINAPI VarUI1FromI4(LONG,BYTE*); -HRESULT WINAPI VarUI1FromI8(LONG64,BYTE*); -HRESULT WINAPI VarUI1FromR4(FLOAT,BYTE*); -HRESULT WINAPI VarUI1FromR8(DOUBLE,BYTE*); -HRESULT WINAPI VarUI1FromDate(DATE,BYTE*); -HRESULT WINAPI VarUI1FromBool(VARIANT_BOOL,BYTE*); -HRESULT WINAPI VarUI1FromI1(signed char,BYTE*); -HRESULT WINAPI VarUI1FromUI2(USHORT,BYTE*); -HRESULT WINAPI VarUI1FromUI4(ULONG,BYTE*); -HRESULT WINAPI VarUI1FromUI8(ULONG64,BYTE*); -HRESULT WINAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); -HRESULT WINAPI VarUI1FromCy(CY,BYTE*); -HRESULT WINAPI VarUI1FromDec(DECIMAL*,BYTE*); -//HRESULT WINAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*); - -HRESULT WINAPI VarI2FromUI1(BYTE,SHORT*); -HRESULT WINAPI VarI2FromI4(LONG,SHORT*); -HRESULT WINAPI VarI2FromI8(LONG64,SHORT*); -HRESULT WINAPI VarI2FromR4(FLOAT,SHORT*); -HRESULT WINAPI VarI2FromR8(DOUBLE,SHORT*); -HRESULT WINAPI VarI2FromDate(DATE,SHORT*); -HRESULT WINAPI VarI2FromBool(VARIANT_BOOL,SHORT*); -HRESULT WINAPI VarI2FromI1(signed char,SHORT*); -HRESULT WINAPI VarI2FromUI2(USHORT,SHORT*); -HRESULT WINAPI VarI2FromUI4(ULONG,SHORT*); -HRESULT WINAPI VarI2FromUI8(ULONG64,SHORT*); -HRESULT WINAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); -HRESULT WINAPI VarI2FromCy(CY,SHORT*); -HRESULT WINAPI VarI2FromDec(DECIMAL*,SHORT*); -//HRESULT WINAPI VarI2FromDisp(IDispatch*,LCID,SHORT*); - -HRESULT WINAPI VarI4FromUI1(BYTE,LONG*); -HRESULT WINAPI VarI4FromI2(SHORT,LONG*); -HRESULT WINAPI VarI4FromI8(LONG64,LONG*); -HRESULT WINAPI VarI4FromR4(FLOAT,LONG*); -HRESULT WINAPI VarI4FromR8(DOUBLE,LONG*); -HRESULT WINAPI VarI4FromDate(DATE,LONG*); -HRESULT WINAPI VarI4FromBool(VARIANT_BOOL,LONG*); -HRESULT WINAPI VarI4FromI1(signed char,LONG*); -HRESULT WINAPI VarI4FromUI2(USHORT,LONG*); -HRESULT WINAPI VarI4FromUI4(ULONG,LONG*); -HRESULT WINAPI VarI4FromUI8(ULONG64,LONG*); -HRESULT WINAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); -HRESULT WINAPI VarI4FromCy(CY,LONG*); -HRESULT WINAPI VarI4FromDec(DECIMAL*,LONG*); -//HRESULT WINAPI VarI4FromDisp(IDispatch*,LCID,LONG*); - -HRESULT WINAPI VarI8FromUI1(BYTE,LONG64*); -HRESULT WINAPI VarI8FromI2(SHORT,LONG64*); -HRESULT WINAPI VarI8FromI4(LONG,LONG64*); -HRESULT WINAPI VarI8FromR4(FLOAT,LONG64*); -HRESULT WINAPI VarI8FromR8(DOUBLE,LONG64*); -HRESULT WINAPI VarI8FromDate(DATE,LONG64*); -HRESULT WINAPI VarI8FromStr(OLECHAR*,LCID,ULONG,LONG64*); -HRESULT WINAPI VarI8FromBool(VARIANT_BOOL,LONG64*); -HRESULT WINAPI VarI8FromI1(signed char,LONG64*); -HRESULT WINAPI VarI8FromUI2(USHORT,LONG64*); -HRESULT WINAPI VarI8FromUI4(ULONG,LONG64*); -HRESULT WINAPI VarI8FromUI8(ULONG64,LONG64*); -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn,LONG64*); -HRESULT WINAPI VarI8FromInt(INT intIn,LONG64*); -HRESULT WINAPI VarI8FromCy(CY,LONG64*); -//HRESULT WINAPI VarI8FromDisp(IDispatch*,LCID,LONG64*); - -HRESULT WINAPI VarR4FromUI1(BYTE,FLOAT*); -HRESULT WINAPI VarR4FromI2(SHORT,FLOAT*); -HRESULT WINAPI VarR4FromI4(LONG,FLOAT*); -HRESULT WINAPI VarR4FromI8(LONG64,FLOAT*); -HRESULT WINAPI VarR4FromR8(DOUBLE,FLOAT*); -HRESULT WINAPI VarR4FromDate(DATE,FLOAT*); -HRESULT WINAPI VarR4FromBool(VARIANT_BOOL,FLOAT*); -HRESULT WINAPI VarR4FromI1(signed char,FLOAT*); -HRESULT WINAPI VarR4FromUI2(USHORT,FLOAT*); -HRESULT WINAPI VarR4FromUI4(ULONG,FLOAT*); -HRESULT WINAPI VarR4FromUI8(ULONG64,FLOAT*); -HRESULT WINAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); -HRESULT WINAPI VarR4FromCy(CY,FLOAT*); -HRESULT WINAPI VarR4FromDec(DECIMAL*,FLOAT*); -//HRESULT WINAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*); - -HRESULT WINAPI VarR8FromUI1(BYTE,double*); -HRESULT WINAPI VarR8FromI2(SHORT,double*); -HRESULT WINAPI VarR8FromI4(LONG,double*); -HRESULT WINAPI VarR8FromI8(LONG64,double*); -HRESULT WINAPI VarR8FromR4(FLOAT,double*); -HRESULT WINAPI VarR8FromDate(DATE,double*); -HRESULT WINAPI VarR8FromBool(VARIANT_BOOL,double*); -HRESULT WINAPI VarR8FromI1(signed char,double*); -HRESULT WINAPI VarR8FromUI2(USHORT,double*); -HRESULT WINAPI VarR8FromUI4(ULONG,double*); -HRESULT WINAPI VarR8FromUI8(ULONG64,double*); -HRESULT WINAPI VarR8FromStr(OLECHAR*,LCID,ULONG,double*); -HRESULT WINAPI VarR8FromCy(CY,double*); -HRESULT WINAPI VarR8FromDec(DECIMAL*,double*); -//HRESULT WINAPI VarR8FromDisp(IDispatch*,LCID,double*); - -HRESULT WINAPI VarDateFromUI1(BYTE,DATE*); -HRESULT WINAPI VarDateFromI2(SHORT,DATE*); -HRESULT WINAPI VarDateFromI4(LONG,DATE*); -HRESULT WINAPI VarDateFromI8(LONG64,DATE*); -HRESULT WINAPI VarDateFromR4(FLOAT,DATE*); -HRESULT WINAPI VarDateFromR8(DOUBLE,DATE*); -HRESULT WINAPI VarDateFromStr(OLECHAR*,LCID,ULONG,DATE*); -HRESULT WINAPI VarDateFromI1(signed char,DATE*); -HRESULT WINAPI VarDateFromUI2(USHORT,DATE*); -HRESULT WINAPI VarDateFromUI4(ULONG,DATE*); -HRESULT WINAPI VarDateFromUI8(ULONG64,DATE*); -HRESULT WINAPI VarDateFromBool(VARIANT_BOOL,DATE*); -HRESULT WINAPI VarDateFromCy(CY,DATE*); -HRESULT WINAPI VarDateFromDec(DECIMAL*,DATE*); -//HRESULT WINAPI VarDateFromDisp(IDispatch*,LCID,DATE*); - -HRESULT WINAPI VarCyFromUI1(BYTE,CY*); -HRESULT WINAPI VarCyFromI2(SHORT sIn,CY*); -HRESULT WINAPI VarCyFromI4(LONG,CY*); -HRESULT WINAPI VarCyFromI8(LONG64,CY*); -HRESULT WINAPI VarCyFromR4(FLOAT,CY*); -HRESULT WINAPI VarCyFromR8(DOUBLE,CY*); -HRESULT WINAPI VarCyFromDate(DATE,CY*); -HRESULT WINAPI VarCyFromStr(OLECHAR*,LCID,ULONG,CY*); -HRESULT WINAPI VarCyFromBool(VARIANT_BOOL,CY*); -HRESULT WINAPI VarCyFromI1(signed char,CY*); -HRESULT WINAPI VarCyFromUI2(USHORT,CY*); -HRESULT WINAPI VarCyFromUI4(ULONG,CY*); -HRESULT WINAPI VarCyFromUI8(ULONG64,CY*); -HRESULT WINAPI VarCyFromDec(DECIMAL*,CY*); -HRESULT WINAPI VarCyFromStr(OLECHAR*,LCID,ULONG,CY*); -//HRESULT WINAPI VarCyFromDisp(IDispatch*,LCID,CY*); - -HRESULT WINAPI VarBstrFromUI1(BYTE,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromI2(SHORT,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromI4(LONG,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromI8(LONG64,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromR4(FLOAT,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromR8(DOUBLE,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromDate(DATE,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromBool(VARIANT_BOOL,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromI1(signed char,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromUI2(USHORT,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromUI8(ULONG64,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromUI4(ULONG,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromCy(CY,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromDec(DECIMAL*,LCID,ULONG,BSTR*); -//HRESULT WINAPI VarBstrFromDisp(IDispatch*,LCID,ULONG,BSTR*); - -HRESULT WINAPI VarBoolFromUI1(BYTE,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromI2(SHORT,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromI4(LONG,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromI8(LONG64,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromR4(FLOAT,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromR8(DOUBLE,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromDate(DATE,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromStr(OLECHAR*,LCID,ULONG,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromI1(signed char,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromUI8(ULONG64,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromCy(CY,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromDec(DECIMAL*,VARIANT_BOOL*); -//HRESULT WINAPI VarBoolFromDisp(IDispatch*,LCID,VARIANT_BOOL*); - -HRESULT WINAPI VarI1FromUI1(BYTE,signed char*); -HRESULT WINAPI VarI1FromI2(SHORT,signed char*); -HRESULT WINAPI VarI1FromI4(LONG,signed char*); -HRESULT WINAPI VarI1FromI8(LONG64,signed char*); -HRESULT WINAPI VarI1FromR4(FLOAT,signed char*); -HRESULT WINAPI VarI1FromR8(DOUBLE,signed char*); -HRESULT WINAPI VarI1FromDate(DATE,signed char*); -HRESULT WINAPI VarI1FromStr(OLECHAR*,LCID,ULONG,signed char*); -HRESULT WINAPI VarI1FromBool(VARIANT_BOOL,signed char*); -HRESULT WINAPI VarI1FromUI2(USHORT,signed char*); -HRESULT WINAPI VarI1FromUI4(ULONG,signed char*); -HRESULT WINAPI VarI1FromUI8(ULONG64,signed char*); -HRESULT WINAPI VarI1FromCy(CY,signed char*); -HRESULT WINAPI VarI1FromDec(DECIMAL*,signed char*); -HRESULT WINAPI VarI1FromDisp(IDispatch*,LCID,signed char*); - -HRESULT WINAPI VarUI2FromUI1(BYTE,USHORT*); -HRESULT WINAPI VarUI2FromI2(SHORT,USHORT*); -HRESULT WINAPI VarUI2FromI4(LONG,USHORT*); -HRESULT WINAPI VarUI2FromI8(LONG64,USHORT*); -HRESULT WINAPI VarUI2FromR4(FLOAT,USHORT*); -HRESULT WINAPI VarUI2FromR8(DOUBLE,USHORT*); -HRESULT WINAPI VarUI2FromDate(DATE,USHORT*); -HRESULT WINAPI VarUI2FromStr(OLECHAR*,LCID,ULONG,USHORT*); -HRESULT WINAPI VarUI2FromBool(VARIANT_BOOL,USHORT*); -HRESULT WINAPI VarUI2FromI1(signed char,USHORT*); -HRESULT WINAPI VarUI2FromUI4(ULONG,USHORT*); -HRESULT WINAPI VarUI2FromUI8(ULONG64,USHORT*); -HRESULT WINAPI VarUI2FromCy(CY,USHORT*); -HRESULT WINAPI VarUI2FromDec(DECIMAL*,USHORT*); -HRESULT WINAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*); - -HRESULT WINAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); -HRESULT WINAPI VarUI4FromUI1(BYTE,ULONG*); -HRESULT WINAPI VarUI4FromI2(SHORT,ULONG*); -HRESULT WINAPI VarUI4FromI4(LONG,ULONG*); -HRESULT WINAPI VarUI4FromI8(LONG64,ULONG*); -HRESULT WINAPI VarUI4FromR4(FLOAT,ULONG*); -HRESULT WINAPI VarUI4FromR8(DOUBLE,ULONG*); -HRESULT WINAPI VarUI4FromDate(DATE,ULONG*); -HRESULT WINAPI VarUI4FromBool(VARIANT_BOOL,ULONG*); -HRESULT WINAPI VarUI4FromI1(signed char,ULONG*); -HRESULT WINAPI VarUI4FromUI2(USHORT,ULONG*); -HRESULT WINAPI VarUI4FromUI8(ULONG64,ULONG*); -HRESULT WINAPI VarUI4FromCy(CY,ULONG*); -HRESULT WINAPI VarUI4FromDec(DECIMAL*,ULONG*); -HRESULT WINAPI VarUI4FromDisp(IDispatch*,LCID,ULONG*); - -HRESULT WINAPI VarUI8FromUI1(BYTE,ULONG64*); -HRESULT WINAPI VarUI8FromI2(SHORT,ULONG64*); -HRESULT WINAPI VarUI8FromI4(LONG,ULONG64*); -HRESULT WINAPI VarUI8FromI8(LONG64,ULONG64*); -HRESULT WINAPI VarUI8FromR4(FLOAT,ULONG64*); -HRESULT WINAPI VarUI8FromR8(DOUBLE,ULONG64*); -HRESULT WINAPI VarUI8FromDate(DATE,ULONG64*); -HRESULT WINAPI VarUI8FromStr(OLECHAR*,LCID,ULONG,ULONG64*); -HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); -HRESULT WINAPI VarUI8FromI1(signed char,ULONG64*); -HRESULT WINAPI VarUI8FromUI2(USHORT,ULONG64*); -HRESULT WINAPI VarUI8FromUI4(ULONG,ULONG64*); -HRESULT WINAPI VarUI8FromDec(DECIMAL*,ULONG64*); -HRESULT WINAPI VarUI8FromInt(INT,ULONG64*); -HRESULT WINAPI VarUI8FromCy(CY,ULONG64*); -//HRESULT WINAPI VarUI8FromDisp(IDispatch*,LCID,ULONG64*); - -HRESULT WINAPI VarDecFromUI1(BYTE,DECIMAL*); -HRESULT WINAPI VarDecFromI2(SHORT,DECIMAL*); -HRESULT WINAPI VarDecFromI4(LONG,DECIMAL*); -HRESULT WINAPI VarDecFromI8(LONG64,DECIMAL*); -HRESULT WINAPI VarDecFromR4(FLOAT,DECIMAL*); -HRESULT WINAPI VarDecFromR8(DOUBLE,DECIMAL*); -HRESULT WINAPI VarDecFromDate(DATE,DECIMAL*); -HRESULT WINAPI VarDecFromStr(OLECHAR*,LCID,ULONG,DECIMAL*); -HRESULT WINAPI VarDecFromBool(VARIANT_BOOL,DECIMAL*); -HRESULT WINAPI VarDecFromI1(signed char,DECIMAL*); -HRESULT WINAPI VarDecFromUI2(USHORT,DECIMAL*); -HRESULT WINAPI VarDecFromUI4(ULONG,DECIMAL*); -HRESULT WINAPI VarDecFromUI8(ULONG64,DECIMAL*); -HRESULT WINAPI VarDecFromCy(CY,DECIMAL*); -HRESULT WINAPI VarDecFromDisp(IDispatch*,LCID,DECIMAL*); - -//#define FADF_AUTO (0x1) -//#define FADF_STATIC (0x2) -//#define FADF_EMBEDDED (0x4) -//#define FADF_FIXEDSIZE (0x10) -#define FADF_RECORD (0x20) -#define FADF_HAVEIID (0x40) -#define FADF_HAVEVARTYPE (0x80) -//#define FADF_BSTR (0x100) -//#define FADF_UNKNOWN (0x200) -//#define FADF_DISPATCH (0x400) -//#define FADF_VARIANT (0x800) -//#define FADF_RESERVED (0xf008) -#define FADF_DATADELETED (0x1000) -#define FADF_CREATEVECTOR (0x2000) - -HRESULT WINAPI SafeArrayAllocDescriptorEx(VARTYPE,UINT,SAFEARRAY**); -SAFEARRAY* WINAPI SafeArrayCreateVector(VARTYPE,LONG,UINT); -HRESULT WINAPI SafeArrayGetVartype(SAFEARRAY*,VARTYPE*); -HRESULT WINAPI SafeArraySetRecordInfo(SAFEARRAY*,IRecordInfo*); -HRESULT WINAPI SafeArrayGetRecordInfo(SAFEARRAY*,IRecordInfo**); -HRESULT WINAPI SafeArraySetIID(SAFEARRAY*,REFGUID); -HRESULT WINAPI SafeArrayGetIID(SAFEARRAY*,GUID*); - -#define IDispatch_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDispatch_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDispatch_Release(p) (p)->lpVtbl->Release(p) -#define IDispatch_GetTypeInfoCount(p,a) (p)->lpVtbl->GetTypeInfoCount(p,a) -#define IDispatch_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) -#define IDispatch_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) -#define IDispatch_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) diff --git a/reactos/lib/oleaut32/variant.h b/reactos/lib/oleaut32/variant.h index 749cb3c479b..377939232ad 100644 --- a/reactos/lib/oleaut32/variant.h +++ b/reactos/lib/oleaut32/variant.h @@ -25,13 +25,6 @@ #include -#ifdef __REACTOS__ /* FIXME */ -#define __int64 long long -typedef __int64 LONG64; -typedef unsigned __int64 ULONG64; -#endif - - /* Get just the type from a variant pointer */ #define V_TYPE(v) (V_VT((v)) & VT_TYPEMASK) diff --git a/reactos/w32api/include/oaidl.h b/reactos/w32api/include/oaidl.h index 037022a54ac..0f19f085bb0 100644 --- a/reactos/w32api/include/oaidl.h +++ b/reactos/w32api/include/oaidl.h @@ -31,11 +31,16 @@ extern "C" { #define FADF_STATIC (2) #define FADF_EMBEDDED (4) #define FADF_FIXEDSIZE (16) +#define FADF_RECORD (32) +#define FADF_HAVEIID (64) +#define FADF_HAVEVARTYPE (128) #define FADF_BSTR (256) #define FADF_UNKNOWN (512) #define FADF_DISPATCH (1024) #define FADF_VARIANT (2048) #define FADF_RESERVED (0xf0e8) +#define FADF_DATADELETED (0x1000) +#define FADF_CREATEVECTOR (0x2000) #define PARAMFLAG_NONE (0) #define PARAMFLAG_FIN (1) #define PARAMFLAG_FOUT (2) @@ -470,6 +475,16 @@ DECLARE_INTERFACE_(IDispatch,IUnknown) }; #undef INTERFACE +#ifdef COBJMACROS +#define IDispatch_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDispatch_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDispatch_Release(p) (p)->lpVtbl->Release(p) +#define IDispatch_GetTypeInfoCount(p,a) (p)->lpVtbl->GetTypeInfoCount(p,a) +#define IDispatch_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) +#define IDispatch_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) +#define IDispatch_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) +#endif + #define INTERFACE IEnumVARIANT DECLARE_INTERFACE_(IEnumVARIANT,IUnknown) { diff --git a/reactos/w32api/include/oleauto.h b/reactos/w32api/include/oleauto.h index 3da356c4663..0b87e3201bc 100644 --- a/reactos/w32api/include/oleauto.h +++ b/reactos/w32api/include/oleauto.h @@ -97,6 +97,25 @@ #define V_UINT_PTRREF(X) V_UI4REF(X) #endif +#define VARCMP_LT 0 +#define VARCMP_EQ 1 +#define VARCMP_GT 2 +#define VARCMP_NULL 3 + +#define VAR_LOCALBOOL 0x10 + +#define LOCALE_USE_NLS 0x10000000 + +#define VARIANT_NOUSEROVERRIDE 0x04 +#define VARIANT_CALENDAR_HIJRI 0x08 +#define VARIANT_CALENDAR_THAI 0x20 +#define VARIANT_CALENDAR_GREGORIAN 0x40 +#define VARIANT_USE_NLS 0x80 + +#define VAR_CALENDAR_HIJRI 0x08 +#define VAR_CALENDAR_THAI 0x80 +#define VAR_CALENDAR_GREGORIAN 0x100 + #include typedef enum tagREGKIND { @@ -155,6 +174,12 @@ WINOLEAUTAPI SafeArrayPutElement(SAFEARRAY*,long*,void*); WINOLEAUTAPI SafeArrayCopy(SAFEARRAY*,SAFEARRAY**); WINOLEAUTAPI SafeArrayPtrOfIndex(SAFEARRAY*,long*,void**); WINOLEAUTAPI_(SAFEARRAY*) SafeArrayCreateVector(VARTYPE,LONG,UINT); +WINOLEAUTAPI SafeArrayAllocDescriptorEx(VARTYPE,UINT,SAFEARRAY**); +WINOLEAUTAPI SafeArrayGetVartype(SAFEARRAY*,VARTYPE*); +WINOLEAUTAPI SafeArraySetRecordInfo(SAFEARRAY*,IRecordInfo*); +WINOLEAUTAPI SafeArrayGetRecordInfo(SAFEARRAY*,IRecordInfo**); +WINOLEAUTAPI SafeArraySetIID(SAFEARRAY*,REFGUID); +WINOLEAUTAPI SafeArrayGetIID(SAFEARRAY*,GUID*); WINOLEAUTAPI_(void) VariantInit(VARIANTARG*); WINOLEAUTAPI VariantClear(VARIANTARG*); WINOLEAUTAPI VariantCopy(VARIANTARG*,VARIANTARG*); @@ -272,6 +297,252 @@ WINOLEAUTAPI VarAdd(LPVARIANT, LPVARIANT, LPVARIANT); WINOLEAUTAPI VarSub(LPVARIANT, LPVARIANT, LPVARIANT); WINOLEAUTAPI VarMul(LPVARIANT, LPVARIANT, LPVARIANT); WINOLEAUTAPI VarDiv(LPVARIANT, LPVARIANT, LPVARIANT); + +WINOLEAUTAPI VarUI1FromI2(SHORT,BYTE*); +WINOLEAUTAPI VarUI1FromI4(LONG,BYTE*); +WINOLEAUTAPI VarUI1FromI8(LONG64,BYTE*); +WINOLEAUTAPI VarUI1FromR4(FLOAT,BYTE*); +WINOLEAUTAPI VarUI1FromR8(DOUBLE,BYTE*); +WINOLEAUTAPI VarUI1FromDate(DATE,BYTE*); +WINOLEAUTAPI VarUI1FromBool(VARIANT_BOOL,BYTE*); +WINOLEAUTAPI VarUI1FromI1(signed char,BYTE*); +WINOLEAUTAPI VarUI1FromUI2(USHORT,BYTE*); +WINOLEAUTAPI VarUI1FromUI4(ULONG,BYTE*); +WINOLEAUTAPI VarUI1FromUI8(ULONG64,BYTE*); +WINOLEAUTAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); +WINOLEAUTAPI VarUI1FromCy(CY,BYTE*); +WINOLEAUTAPI VarUI1FromDec(DECIMAL*,BYTE*); +WINOLEAUTAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*); + +WINOLEAUTAPI VarI2FromUI1(BYTE,SHORT*); +WINOLEAUTAPI VarI2FromI4(LONG,SHORT*); +WINOLEAUTAPI VarI2FromI8(LONG64,SHORT*); +WINOLEAUTAPI VarI2FromR4(FLOAT,SHORT*); +WINOLEAUTAPI VarI2FromR8(DOUBLE,SHORT*); +WINOLEAUTAPI VarI2FromDate(DATE,SHORT*); +WINOLEAUTAPI VarI2FromBool(VARIANT_BOOL,SHORT*); +WINOLEAUTAPI VarI2FromI1(signed char,SHORT*); +WINOLEAUTAPI VarI2FromUI2(USHORT,SHORT*); +WINOLEAUTAPI VarI2FromUI4(ULONG,SHORT*); +WINOLEAUTAPI VarI2FromUI8(ULONG64,SHORT*); +WINOLEAUTAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); +WINOLEAUTAPI VarI2FromCy(CY,SHORT*); +WINOLEAUTAPI VarI2FromDec(DECIMAL*,SHORT*); +WINOLEAUTAPI VarI2FromDisp(IDispatch*,LCID,SHORT*); + +WINOLEAUTAPI VarI4FromUI1(BYTE,LONG*); +WINOLEAUTAPI VarI4FromI2(SHORT,LONG*); +WINOLEAUTAPI VarI4FromI8(LONG64,LONG*); +WINOLEAUTAPI VarI4FromR4(FLOAT,LONG*); +WINOLEAUTAPI VarI4FromR8(DOUBLE,LONG*); +WINOLEAUTAPI VarI4FromDate(DATE,LONG*); +WINOLEAUTAPI VarI4FromBool(VARIANT_BOOL,LONG*); +WINOLEAUTAPI VarI4FromI1(signed char,LONG*); +WINOLEAUTAPI VarI4FromUI2(USHORT,LONG*); +WINOLEAUTAPI VarI4FromUI4(ULONG,LONG*); +WINOLEAUTAPI VarI4FromUI8(ULONG64,LONG*); +WINOLEAUTAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); +WINOLEAUTAPI VarI4FromCy(CY,LONG*); +WINOLEAUTAPI VarI4FromDec(DECIMAL*,LONG*); +WINOLEAUTAPI VarI4FromDisp(IDispatch*,LCID,LONG*); + +WINOLEAUTAPI VarI8FromUI1(BYTE,LONG64*); +WINOLEAUTAPI VarI8FromI2(SHORT,LONG64*); +WINOLEAUTAPI VarI8FromI4(LONG,LONG64*); +WINOLEAUTAPI VarI8FromR4(FLOAT,LONG64*); +WINOLEAUTAPI VarI8FromR8(DOUBLE,LONG64*); +WINOLEAUTAPI VarI8FromDate(DATE,LONG64*); +WINOLEAUTAPI VarI8FromStr(OLECHAR*,LCID,ULONG,LONG64*); +WINOLEAUTAPI VarI8FromBool(VARIANT_BOOL,LONG64*); +WINOLEAUTAPI VarI8FromI1(signed char,LONG64*); +WINOLEAUTAPI VarI8FromUI2(USHORT,LONG64*); +WINOLEAUTAPI VarI8FromUI4(ULONG,LONG64*); +WINOLEAUTAPI VarI8FromUI8(ULONG64,LONG64*); +WINOLEAUTAPI VarI8FromDec(DECIMAL *pdecIn,LONG64*); +WINOLEAUTAPI VarI8FromInt(INT intIn,LONG64*); +WINOLEAUTAPI VarI8FromCy(CY,LONG64*); +WINOLEAUTAPI VarI8FromDisp(IDispatch*,LCID,LONG64*); + +WINOLEAUTAPI VarR4FromUI1(BYTE,FLOAT*); +WINOLEAUTAPI VarR4FromI2(SHORT,FLOAT*); +WINOLEAUTAPI VarR4FromI4(LONG,FLOAT*); +WINOLEAUTAPI VarR4FromI8(LONG64,FLOAT*); +WINOLEAUTAPI VarR4FromR8(DOUBLE,FLOAT*); +WINOLEAUTAPI VarR4FromDate(DATE,FLOAT*); +WINOLEAUTAPI VarR4FromBool(VARIANT_BOOL,FLOAT*); +WINOLEAUTAPI VarR4FromI1(signed char,FLOAT*); +WINOLEAUTAPI VarR4FromUI2(USHORT,FLOAT*); +WINOLEAUTAPI VarR4FromUI4(ULONG,FLOAT*); +WINOLEAUTAPI VarR4FromUI8(ULONG64,FLOAT*); +WINOLEAUTAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); +WINOLEAUTAPI VarR4FromCy(CY,FLOAT*); +WINOLEAUTAPI VarR4FromDec(DECIMAL*,FLOAT*); +WINOLEAUTAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*); + +WINOLEAUTAPI VarR8FromUI1(BYTE,double*); +WINOLEAUTAPI VarR8FromI2(SHORT,double*); +WINOLEAUTAPI VarR8FromI4(LONG,double*); +WINOLEAUTAPI VarR8FromI8(LONG64,double*); +WINOLEAUTAPI VarR8FromR4(FLOAT,double*); +WINOLEAUTAPI VarR8FromDate(DATE,double*); +WINOLEAUTAPI VarR8FromBool(VARIANT_BOOL,double*); +WINOLEAUTAPI VarR8FromI1(signed char,double*); +WINOLEAUTAPI VarR8FromUI2(USHORT,double*); +WINOLEAUTAPI VarR8FromUI4(ULONG,double*); +WINOLEAUTAPI VarR8FromUI8(ULONG64,double*); +WINOLEAUTAPI VarR8FromStr(OLECHAR*,LCID,ULONG,double*); +WINOLEAUTAPI VarR8FromCy(CY,double*); +WINOLEAUTAPI VarR8FromDec(DECIMAL*,double*); +WINOLEAUTAPI VarR8FromDisp(IDispatch*,LCID,double*); + +WINOLEAUTAPI VarDateFromUI1(BYTE,DATE*); +WINOLEAUTAPI VarDateFromI2(SHORT,DATE*); +WINOLEAUTAPI VarDateFromI4(LONG,DATE*); +WINOLEAUTAPI VarDateFromI8(LONG64,DATE*); +WINOLEAUTAPI VarDateFromR4(FLOAT,DATE*); +WINOLEAUTAPI VarDateFromR8(DOUBLE,DATE*); +WINOLEAUTAPI VarDateFromStr(OLECHAR*,LCID,ULONG,DATE*); +WINOLEAUTAPI VarDateFromI1(signed char,DATE*); +WINOLEAUTAPI VarDateFromUI2(USHORT,DATE*); +WINOLEAUTAPI VarDateFromUI4(ULONG,DATE*); +WINOLEAUTAPI VarDateFromUI8(ULONG64,DATE*); +WINOLEAUTAPI VarDateFromBool(VARIANT_BOOL,DATE*); +WINOLEAUTAPI VarDateFromCy(CY,DATE*); +WINOLEAUTAPI VarDateFromDec(DECIMAL*,DATE*); +WINOLEAUTAPI VarDateFromDisp(IDispatch*,LCID,DATE*); + +WINOLEAUTAPI VarCyFromUI1(BYTE,CY*); +WINOLEAUTAPI VarCyFromI2(SHORT sIn,CY*); +WINOLEAUTAPI VarCyFromI4(LONG,CY*); +WINOLEAUTAPI VarCyFromI8(LONG64,CY*); +WINOLEAUTAPI VarCyFromR4(FLOAT,CY*); +WINOLEAUTAPI VarCyFromR8(DOUBLE,CY*); +WINOLEAUTAPI VarCyFromDate(DATE,CY*); +WINOLEAUTAPI VarCyFromStr(OLECHAR*,LCID,ULONG,CY*); +WINOLEAUTAPI VarCyFromBool(VARIANT_BOOL,CY*); +WINOLEAUTAPI VarCyFromI1(signed char,CY*); +WINOLEAUTAPI VarCyFromUI2(USHORT,CY*); +WINOLEAUTAPI VarCyFromUI4(ULONG,CY*); +WINOLEAUTAPI VarCyFromUI8(ULONG64,CY*); +WINOLEAUTAPI VarCyFromDec(DECIMAL*,CY*); +WINOLEAUTAPI VarCyFromStr(OLECHAR*,LCID,ULONG,CY*); +WINOLEAUTAPI VarCyFromDisp(IDispatch*,LCID,CY*); + +WINOLEAUTAPI VarBstrFromUI1(BYTE,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromI2(SHORT,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromI4(LONG,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromI8(LONG64,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromR4(FLOAT,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromR8(DOUBLE,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromDate(DATE,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromBool(VARIANT_BOOL,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromI1(signed char,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromUI2(USHORT,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromUI8(ULONG64,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromUI4(ULONG,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromCy(CY,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromDec(DECIMAL*,LCID,ULONG,BSTR*); +WINOLEAUTAPI VarBstrFromDisp(IDispatch*,LCID,ULONG,BSTR*); + +WINOLEAUTAPI VarBoolFromUI1(BYTE,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromI2(SHORT,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromI4(LONG,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromI8(LONG64,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromR4(FLOAT,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromR8(DOUBLE,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromDate(DATE,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromStr(OLECHAR*,LCID,ULONG,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromI1(signed char,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromUI8(ULONG64,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromCy(CY,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromDec(DECIMAL*,VARIANT_BOOL*); +WINOLEAUTAPI VarBoolFromDisp(IDispatch*,LCID,VARIANT_BOOL*); + +WINOLEAUTAPI VarI1FromUI1(BYTE,signed char*); +WINOLEAUTAPI VarI1FromI2(SHORT,signed char*); +WINOLEAUTAPI VarI1FromI4(LONG,signed char*); +WINOLEAUTAPI VarI1FromI8(LONG64,signed char*); +WINOLEAUTAPI VarI1FromR4(FLOAT,signed char*); +WINOLEAUTAPI VarI1FromR8(DOUBLE,signed char*); +WINOLEAUTAPI VarI1FromDate(DATE,signed char*); +WINOLEAUTAPI VarI1FromStr(OLECHAR*,LCID,ULONG,signed char*); +WINOLEAUTAPI VarI1FromBool(VARIANT_BOOL,signed char*); +WINOLEAUTAPI VarI1FromUI2(USHORT,signed char*); +WINOLEAUTAPI VarI1FromUI4(ULONG,signed char*); +WINOLEAUTAPI VarI1FromUI8(ULONG64,signed char*); +WINOLEAUTAPI VarI1FromCy(CY,signed char*); +WINOLEAUTAPI VarI1FromDec(DECIMAL*,signed char*); +WINOLEAUTAPI VarI1FromDisp(IDispatch*,LCID,signed char*); + +WINOLEAUTAPI VarUI2FromUI1(BYTE,USHORT*); +WINOLEAUTAPI VarUI2FromI2(SHORT,USHORT*); +WINOLEAUTAPI VarUI2FromI4(LONG,USHORT*); +WINOLEAUTAPI VarUI2FromI8(LONG64,USHORT*); +WINOLEAUTAPI VarUI2FromR4(FLOAT,USHORT*); +WINOLEAUTAPI VarUI2FromR8(DOUBLE,USHORT*); +WINOLEAUTAPI VarUI2FromDate(DATE,USHORT*); +WINOLEAUTAPI VarUI2FromStr(OLECHAR*,LCID,ULONG,USHORT*); +WINOLEAUTAPI VarUI2FromBool(VARIANT_BOOL,USHORT*); +WINOLEAUTAPI VarUI2FromI1(signed char,USHORT*); +WINOLEAUTAPI VarUI2FromUI4(ULONG,USHORT*); +WINOLEAUTAPI VarUI2FromUI8(ULONG64,USHORT*); +WINOLEAUTAPI VarUI2FromCy(CY,USHORT*); +WINOLEAUTAPI VarUI2FromDec(DECIMAL*,USHORT*); +WINOLEAUTAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*); + +WINOLEAUTAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); +WINOLEAUTAPI VarUI4FromUI1(BYTE,ULONG*); +WINOLEAUTAPI VarUI4FromI2(SHORT,ULONG*); +WINOLEAUTAPI VarUI4FromI4(LONG,ULONG*); +WINOLEAUTAPI VarUI4FromI8(LONG64,ULONG*); +WINOLEAUTAPI VarUI4FromR4(FLOAT,ULONG*); +WINOLEAUTAPI VarUI4FromR8(DOUBLE,ULONG*); +WINOLEAUTAPI VarUI4FromDate(DATE,ULONG*); +WINOLEAUTAPI VarUI4FromBool(VARIANT_BOOL,ULONG*); +WINOLEAUTAPI VarUI4FromI1(signed char,ULONG*); +WINOLEAUTAPI VarUI4FromUI2(USHORT,ULONG*); +WINOLEAUTAPI VarUI4FromUI8(ULONG64,ULONG*); +WINOLEAUTAPI VarUI4FromCy(CY,ULONG*); +WINOLEAUTAPI VarUI4FromDec(DECIMAL*,ULONG*); +WINOLEAUTAPI VarUI4FromDisp(IDispatch*,LCID,ULONG*); + +WINOLEAUTAPI VarUI8FromUI1(BYTE,ULONG64*); +WINOLEAUTAPI VarUI8FromI2(SHORT,ULONG64*); +WINOLEAUTAPI VarUI8FromI4(LONG,ULONG64*); +WINOLEAUTAPI VarUI8FromI8(LONG64,ULONG64*); +WINOLEAUTAPI VarUI8FromR4(FLOAT,ULONG64*); +WINOLEAUTAPI VarUI8FromR8(DOUBLE,ULONG64*); +WINOLEAUTAPI VarUI8FromDate(DATE,ULONG64*); +WINOLEAUTAPI VarUI8FromStr(OLECHAR*,LCID,ULONG,ULONG64*); +WINOLEAUTAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); +WINOLEAUTAPI VarUI8FromI1(signed char,ULONG64*); +WINOLEAUTAPI VarUI8FromUI2(USHORT,ULONG64*); +WINOLEAUTAPI VarUI8FromUI4(ULONG,ULONG64*); +WINOLEAUTAPI VarUI8FromDec(DECIMAL*,ULONG64*); +WINOLEAUTAPI VarUI8FromInt(INT,ULONG64*); +WINOLEAUTAPI VarUI8FromCy(CY,ULONG64*); +WINOLEAUTAPI VarUI8FromDisp(IDispatch*,LCID,ULONG64*); + +WINOLEAUTAPI VarDecFromUI1(BYTE,DECIMAL*); +WINOLEAUTAPI VarDecFromI2(SHORT,DECIMAL*); +WINOLEAUTAPI VarDecFromI4(LONG,DECIMAL*); +WINOLEAUTAPI VarDecFromI8(LONG64,DECIMAL*); +WINOLEAUTAPI VarDecFromR4(FLOAT,DECIMAL*); +WINOLEAUTAPI VarDecFromR8(DOUBLE,DECIMAL*); +WINOLEAUTAPI VarDecFromDate(DATE,DECIMAL*); +WINOLEAUTAPI VarDecFromStr(OLECHAR*,LCID,ULONG,DECIMAL*); +WINOLEAUTAPI VarDecFromBool(VARIANT_BOOL,DECIMAL*); +WINOLEAUTAPI VarDecFromI1(signed char,DECIMAL*); +WINOLEAUTAPI VarDecFromUI2(USHORT,DECIMAL*); +WINOLEAUTAPI VarDecFromUI4(ULONG,DECIMAL*); +WINOLEAUTAPI VarDecFromUI8(ULONG64,DECIMAL*); +WINOLEAUTAPI VarDecFromCy(CY,DECIMAL*); +WINOLEAUTAPI VarDecFromDisp(IDispatch*,LCID,DECIMAL*); + +WINOLEAUTAPI VarDecNeg(const DECIMAL*,DECIMAL*); + #pragma pack(pop) #endif