Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 20:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

added VARAINT union members llVal and ullVal

Browse source 
svn path=/trunk/; revision=8476
This commit is contained in:
Martin Fuchs 2004-02-29 13:23:45 +00:00
parent 5666895041
commit a836674b95
6 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/lib/oleaut32/ros-mingw-fixes.h
View file

@ -1,5 +0,0 @@
/* problems with decVal member of VARIANT union in MinGW headers */
#undef V_DECIMAL
#define V_DECIMAL(X) (X->__VARIANT_NAME_1.decVal)

5
reactos/lib/oleaut32/safearray.c
View file

@ -46,11 +46,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(ole); WINE_DEFAULT_DEBUG_CHANNEL(ole);
#ifdef __REACTOS__ /*FIXME*/
#include "ros-mingw-fixes.h"
#endif
/************************************************************************ /************************************************************************
* SafeArray {OLEAUT32} * SafeArray {OLEAUT32}
* *

6
reactos/lib/oleaut32/variant.c
View file

@ -44,7 +44,9 @@
#ifdef __REACTOS__ /*FIXME*/ #ifdef __REACTOS__ /*FIXME*/
#include "ros-mingw-fixes.h" /* problems with decVal member of VARIANT union in MinGW headers */
#undef V_DECIMAL
#define V_DECIMAL(X) (X->__VARIANT_NAME_1.decVal)
#endif #endif
@ -541,10 +543,8 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
case VT_UI1: return VarDecFromUI1(V_UI1(ps), &V_DECIMAL(pd)); case VT_UI1: return VarDecFromUI1(V_UI1(ps), &V_DECIMAL(pd));
case VT_UI2: return VarDecFromUI2(V_UI2(ps), &V_DECIMAL(pd)); case VT_UI2: return VarDecFromUI2(V_UI2(ps), &V_DECIMAL(pd));
case VT_UI4: return VarDecFromUI4(V_UI4(ps), &V_DECIMAL(pd)); case VT_UI4: return VarDecFromUI4(V_UI4(ps), &V_DECIMAL(pd));
#ifndef __REACTOS__ /*FIXME: hVal missing in VARIANT union of MinGW header */
case VT_I8: return VarDecFromI8(V_I8(ps), &V_DECIMAL(pd)); case VT_I8: return VarDecFromI8(V_I8(ps), &V_DECIMAL(pd));
case VT_UI8: return VarDecFromUI8(V_UI8(ps), &V_DECIMAL(pd)); case VT_UI8: return VarDecFromUI8(V_UI8(ps), &V_DECIMAL(pd));
#endif
case VT_R4: return VarDecFromR4(V_R4(ps), &V_DECIMAL(pd)); case VT_R4: return VarDecFromR4(V_R4(ps), &V_DECIMAL(pd));
case VT_R8: return VarDecFromR8(V_R8(ps), &V_DECIMAL(pd)); case VT_R8: return VarDecFromR8(V_R8(ps), &V_DECIMAL(pd));
case VT_DATE: return VarDecFromDate(V_DATE(ps), &V_DECIMAL(pd)); case VT_DATE: return VarDecFromDate(V_DATE(ps), &V_DECIMAL(pd));

4
reactos/lib/oleaut32/vartype.c
View file

@ -31,7 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
#ifdef __REACTOS__ /*FIXME*/ #ifdef __REACTOS__ /*FIXME*/
#include "ros-mingw-fixes.h" /* problems with decVal member of VARIANT union in MinGW headers */
#undef V_DECIMAL
#define V_DECIMAL(X) (X->__VARIANT_NAME_1.decVal)
#endif #endif

4
reactos/w32api/include/oaidl.h
View file

@ -197,6 +197,7 @@ typedef struct tagVARIANT {
WORD wReserved3; WORD wReserved3;
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
long lVal; long lVal;
LONGLONG llVal;
unsigned char bVal; unsigned char bVal;
short iVal; short iVal;
float fltVal; float fltVal;
@ -228,6 +229,7 @@ typedef struct tagVARIANT {
CHAR cVal; CHAR cVal;
USHORT uiVal; USHORT uiVal;
ULONG ulVal; ULONG ulVal;
ULONGLONG ullVal;
INT intVal; INT intVal;
UINT uintVal; UINT uintVal;
DECIMAL *pdecVal; DECIMAL *pdecVal;
@ -256,6 +258,7 @@ typedef struct _wireVARIANT {
USHORT wReserved3; USHORT wReserved3;
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
LONG lVal; LONG lVal;
LONGLONG llVal;
BYTE bVal; BYTE bVal;
SHORT iVal; SHORT iVal;
FLOAT fltVal; FLOAT fltVal;
@ -286,6 +289,7 @@ typedef struct _wireVARIANT {
CHAR cVal; CHAR cVal;
USHORT uiVal; USHORT uiVal;
ULONG ulVal; ULONG ulVal;
ULONGLONG ullVal;
INT intVal; INT intVal;
UINT uintVal; UINT uintVal;
DECIMAL decVal; DECIMAL decVal;

4
reactos/w32api/include/oleauto.h
View file

@ -48,8 +48,8 @@
#define V_UI4(X) V_UNION(X,ulVal) #define V_UI4(X) V_UNION(X,ulVal)
#define V_I4REF(X) V_UNION(X,plVal) #define V_I4REF(X) V_UNION(X,plVal)
#define V_UI4REF(X) V_UNION(X,pulVal) #define V_UI4REF(X) V_UNION(X,pulVal)
#define V_I8(X) V_UNION(X,hVal) #define V_I8(X) V_UNION(X,llVal)
#define V_UI8(X) V_UNION(X,uhVal) #define V_UI8(X) V_UNION(X,ullVal)
#define V_I8REF(X) V_UNION(X,phVal) #define V_I8REF(X) V_UNION(X,phVal)
#define V_UI8REF(X) V_UNION(X,puhVal) #define V_UI8REF(X) V_UNION(X,puhVal)
#define V_R4(X) V_UNION(X,fltVal) #define V_R4(X) V_UNION(X,fltVal)