ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify VarDiv() and VarSub() to use the existing VarDecSub() and 

VarDecDiv() for DECIMAL.
This commit is contained in:
Alex Villacís Lasso 2005-09-22 10:35:16 +00:00 committed by Alexandre Julliard
parent 84663503ee
commit 253f3bf5be
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/oleaut32/variant.c
View File

@ -3124,6 +3124,10 @@ HRESULT WINAPI VarDiv(LPVARIANT left, LPVARIANT right, LPVARIANT result)
found = TRUE; found = TRUE;
resvt = VT_R8; 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)))) { 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; found = TRUE;
resvt = VT_I4; 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); V_R8(result) = V_R8(&lv) / V_R8(&rv);
rc = S_OK; rc = S_OK;
break; break;
case VT_DECIMAL:
rc = VarDecDiv(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result)));
V_VT(result) = resvt;
break;
case VT_I4: case VT_I4:
if (V_I4(&rv) == 0) return DISP_E_DIVBYZERO; if (V_I4(&rv) == 0) return DISP_E_DIVBYZERO;
V_VT(result) = resvt; V_VT(result) = resvt;
@ -3193,6 +3201,10 @@ HRESULT WINAPI VarSub(LPVARIANT left, LPVARIANT right, LPVARIANT result)
found = TRUE; found = TRUE;
resvt = VT_R8; 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)))) { 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; found = TRUE;
resvt = VT_I4; 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); V_R8(result) = V_R8(&lv) - V_R8(&rv);
rc = S_OK; rc = S_OK;
break; break;
case VT_DECIMAL:
rc = VarDecSub(&(V_DECIMAL(&lv)), &(V_DECIMAL(&rv)), &(V_DECIMAL(result)));
V_VT(result) = resvt;
break;
case VT_I4: case VT_I4:
V_VT(result) = resvt; V_VT(result) = resvt;
V_I4(result) = V_I4(&lv) - V_I4(&rv); V_I4(result) = V_I4(&lv) - V_I4(&rv);