From 253f3bf5bef884729d850e0d719ee1e496b965a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20Villac=C3=ADs=20Lasso?= <a_villacis@palosanto.com>
Date: Thu, 22 Sep 2005 10:35:16 +0000
Subject: [PATCH] Modify VarDiv() and VarSub() to use the existing VarDecSub()
 and VarDecDiv() for DECIMAL.

---
 dlls/oleaut32/variant.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index 775ad7b674e..9305d3f98e8 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -3124,6 +3124,10 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result)
 	found = TRUE;
 	resvt = VT_R8;
     }
+    if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_DECIMAL))) {
+	found = TRUE;
+	resvt = VT_DECIMAL;
+    }
     if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|(1<<VT_INT)|(1<<VT_UINT)))) {
 	found = TRUE;
 	resvt = VT_I4;
@@ -3149,6 +3153,10 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result)
 	V_R8(result) = V_R8(&lv) / V_R8(&rv);
 	rc = S_OK;
 	break;
+    case VT_DECIMAL:
+	rc = VarDecDiv(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result)));
+	V_VT(result) = resvt;
+	break;
     case VT_I4:
 	if (V_I4(&rv) == 0) return DISP_E_DIVBYZERO;
 	V_VT(result) = resvt;
@@ -3193,6 +3201,10 @@ HRESULT WINAPI VarSub(LPVARIANT left, LPVARIANT right, LPVARIANT result)
 	found = TRUE;
 	resvt = VT_R8;
     }
+    if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_DECIMAL))) {
+	found = TRUE;
+	resvt = VT_DECIMAL;
+    }
     if (!found && (((1<<lvt) | (1<<rvt)) & (VTBIT_I1|VTBIT_I2|VTBIT_UI1|VTBIT_UI2|VTBIT_I4|VTBIT_UI4|(1<<VT_INT)|(1<<VT_UINT)))) {
 	found = TRUE;
 	resvt = VT_I4;
@@ -3217,6 +3229,10 @@ HRESULT WINAPI VarSub(LPVARIANT left, LPVARIANT right, LPVARIANT result)
 	V_R8(result) = V_R8(&lv) - V_R8(&rv);
 	rc = S_OK;
 	break;
+    case VT_DECIMAL:
+	rc = VarDecSub(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result)));
+	V_VT(result) = resvt;
+	break;
     case VT_I4:
 	V_VT(result) = resvt;
 	V_I4(result) = V_I4(&lv) - V_I4(&rv);