From a836674b958b56a70d997c1d3b43c0fc4bfcf486 Mon Sep 17 00:00:00 2001
From: Martin Fuchs <fuchs.martin@gmail.com>
Date: Sun, 29 Feb 2004 13:23:45 +0000
Subject: [PATCH] added VARAINT union members llVal and ullVal

svn path=/trunk/; revision=8476
---
 reactos/lib/oleaut32/ros-mingw-fixes.h | 5 -----
 reactos/lib/oleaut32/safearray.c       | 5 -----
 reactos/lib/oleaut32/variant.c         | 6 +++---
 reactos/lib/oleaut32/vartype.c         | 4 +++-
 reactos/w32api/include/oaidl.h         | 4 ++++
 reactos/w32api/include/oleauto.h       | 4 ++--
 6 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 reactos/lib/oleaut32/ros-mingw-fixes.h

diff --git a/reactos/lib/oleaut32/ros-mingw-fixes.h b/reactos/lib/oleaut32/ros-mingw-fixes.h
deleted file mode 100644
index 68cfdcd40ed..00000000000
--- a/reactos/lib/oleaut32/ros-mingw-fixes.h
+++ /dev/null
@@ -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)
-
diff --git a/reactos/lib/oleaut32/safearray.c b/reactos/lib/oleaut32/safearray.c
index 7d841bb0c84..c0ebe274ff4 100644
--- a/reactos/lib/oleaut32/safearray.c
+++ b/reactos/lib/oleaut32/safearray.c
@@ -46,11 +46,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
-#ifdef __REACTOS__ /*FIXME*/
-#include "ros-mingw-fixes.h"
-#endif
-
-
 /************************************************************************
  * SafeArray {OLEAUT32}
  *
diff --git a/reactos/lib/oleaut32/variant.c b/reactos/lib/oleaut32/variant.c
index ef432d6748b..ab475a0fd1f 100644
--- a/reactos/lib/oleaut32/variant.c
+++ b/reactos/lib/oleaut32/variant.c
@@ -44,7 +44,9 @@
 
 
 #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
 
 
@@ -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_UI2:      return VarDecFromUI2(V_UI2(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_UI8:      return VarDecFromUI8(V_UI8(ps), &V_DECIMAL(pd));
-#endif
     case VT_R4:       return VarDecFromR4(V_R4(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));
diff --git a/reactos/lib/oleaut32/vartype.c b/reactos/lib/oleaut32/vartype.c
index 299f5c57351..6d0c9757650 100644
--- a/reactos/lib/oleaut32/vartype.c
+++ b/reactos/lib/oleaut32/vartype.c
@@ -31,7 +31,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 
 #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
 
 
diff --git a/reactos/w32api/include/oaidl.h b/reactos/w32api/include/oaidl.h
index 0f19f085bb0..d35b061df36 100644
--- a/reactos/w32api/include/oaidl.h
+++ b/reactos/w32api/include/oaidl.h
@@ -197,6 +197,7 @@ typedef struct tagVARIANT {
 	WORD wReserved3;
 	_ANONYMOUS_UNION union {
 		long lVal;
+		LONGLONG llVal;
 		unsigned char bVal;
 		short iVal;
 		float fltVal;
@@ -228,6 +229,7 @@ typedef struct tagVARIANT {
 		CHAR cVal;
 		USHORT uiVal;
 		ULONG ulVal;
+		ULONGLONG ullVal;
 		INT intVal;
 		UINT uintVal;
 		DECIMAL *pdecVal;
@@ -256,6 +258,7 @@ typedef struct _wireVARIANT {
 	USHORT wReserved3;
 	_ANONYMOUS_UNION union {
 		LONG lVal;
+		LONGLONG llVal;
 		BYTE bVal;
 		SHORT iVal;
 		FLOAT fltVal;
@@ -286,6 +289,7 @@ typedef struct _wireVARIANT {
 		CHAR cVal;
 		USHORT uiVal;
 		ULONG ulVal;
+		ULONGLONG ullVal;
 		INT intVal;
 		UINT uintVal;
 		DECIMAL decVal;
diff --git a/reactos/w32api/include/oleauto.h b/reactos/w32api/include/oleauto.h
index 0b87e3201bc..93ff6450ba5 100644
--- a/reactos/w32api/include/oleauto.h
+++ b/reactos/w32api/include/oleauto.h
@@ -48,8 +48,8 @@
 #define V_UI4(X) V_UNION(X,ulVal)
 #define V_I4REF(X) V_UNION(X,plVal)
 #define V_UI4REF(X) V_UNION(X,pulVal)
-#define V_I8(X) V_UNION(X,hVal)
-#define V_UI8(X) V_UNION(X,uhVal)
+#define V_I8(X) V_UNION(X,llVal)
+#define V_UI8(X) V_UNION(X,ullVal)
 #define V_I8REF(X) V_UNION(X,phVal)
 #define V_UI8REF(X) V_UNION(X,puhVal)
 #define V_R4(X) V_UNION(X,fltVal)