Skip to content

W
wine-cw
Commit 36963b6d authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

oleaut32: Get rid of the DECIMAL access macros.

parent 641623ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 62 deletions
dlls/oleaut32/variant.c
View file @ 36963b6d
...@@ -30,9 +30,6 @@ ...@@ -30,9 +30,6 @@
#include <stdarg.h> #include <stdarg.h>
#define COBJMACROS #define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
...@@ -428,13 +425,13 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, ...@@ -428,13 +425,13 @@ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags,
{ {
case VT_EMPTY: case VT_EMPTY:
case VT_BOOL: case VT_BOOL:
DEC_SIGNSCALE(&V_DECIMAL(pd)) = SIGNSCALE(DECIMAL_POS,0); V_DECIMAL(pd).sign = DECIMAL_POS;
DEC_HI32(&V_DECIMAL(pd)) = 0; V_DECIMAL(pd).scale = 0;
DEC_MID32(&V_DECIMAL(pd)) = 0; V_DECIMAL(pd).Hi32 = 0;
/* VarDecFromBool() coerces to -1/0, ChangeTypeEx() coerces to 1/0. /* VarDecFromBool() coerces to -1/0, ChangeTypeEx() coerces to 1/0.
* VT_NULL and VT_EMPTY always give a 0 value. * VT_NULL and VT_EMPTY always give a 0 value.
*/ */
DEC_LO32(&V_DECIMAL(pd)) = vtFrom == VT_BOOL && V_BOOL(ps) ? 1 : 0; V_DECIMAL(pd).Lo64 = vtFrom == VT_BOOL && V_BOOL(ps) ? 1 : 0;
return S_OK; return S_OK;
case VT_I1: return VarDecFromI1(V_I1(ps), &V_DECIMAL(pd)); case VT_I1: return VarDecFromI1(V_I1(ps), &V_DECIMAL(pd));
case VT_I2: return VarDecFromI2(V_I2(ps), &V_DECIMAL(pd)); case VT_I2: return VarDecFromI2(V_I2(ps), &V_DECIMAL(pd));
...@@ -903,7 +900,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc) ...@@ -903,7 +900,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, const VARIANTARG* pvargSrc)
} }
else if (V_VT(pSrc) == (VT_DECIMAL|VT_BYREF)) else if (V_VT(pSrc) == (VT_DECIMAL|VT_BYREF))
{ {
memcpy(&DEC_SCALE(&V_DECIMAL(pvargDest)), &DEC_SCALE(V_DECIMALREF(pSrc)), memcpy(&V_DECIMAL(pvargDest).scale, &V_DECIMALREF(pSrc)->scale,
sizeof(DECIMAL) - sizeof(USHORT)); sizeof(DECIMAL) - sizeof(USHORT));
} }
else else
...@@ -2159,9 +2156,10 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, ...@@ -2159,9 +2156,10 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
else if ((dwVtBits & VTBIT_DECIMAL) == VTBIT_DECIMAL) else if ((dwVtBits & VTBIT_DECIMAL) == VTBIT_DECIMAL)
{ {
V_VT(pVarDst) = VT_DECIMAL; V_VT(pVarDst) = VT_DECIMAL;
DEC_SIGNSCALE(&V_DECIMAL(pVarDst)) = SIGNSCALE(DECIMAL_POS,0); V_DECIMAL(pVarDst).sign = DECIMAL_POS;
DEC_HI32(&V_DECIMAL(pVarDst)) = 0; V_DECIMAL(pVarDst).scale = 0;
DEC_LO64(&V_DECIMAL(pVarDst)) = ul64; V_DECIMAL(pVarDst).Hi32 = 0;
V_DECIMAL(pVarDst).Lo64 = ul64;
return S_OK; return S_OK;
} }
else if (dwVtBits & VTBIT_R4 && ((ul64 <= I4_MAX)||(l64 >= I4_MIN))) else if (dwVtBits & VTBIT_R4 && ((ul64 <= I4_MAX)||(l64 >= I4_MIN)))
...@@ -2344,9 +2342,10 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, ...@@ -2344,9 +2342,10 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
{ {
/* Decimal is only output choice left - fast path */ /* Decimal is only output choice left - fast path */
V_VT(pVarDst) = VT_DECIMAL; V_VT(pVarDst) = VT_DECIMAL;
DEC_SIGNSCALE(&V_DECIMAL(pVarDst)) = SIGNSCALE(DECIMAL_NEG,0); V_DECIMAL(pVarDst).sign = DECIMAL_NEG;
DEC_HI32(&V_DECIMAL(pVarDst)) = 0; V_DECIMAL(pVarDst).scale = 0;
DEC_LO64(&V_DECIMAL(pVarDst)) = -ul64; V_DECIMAL(pVarDst).Hi32 = 0;
V_DECIMAL(pVarDst).Lo64 = -ul64;
return S_OK; return S_OK;
} }
} }
...@@ -2406,9 +2405,10 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, ...@@ -2406,9 +2405,10 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
{ {
/* Decimal is only output choice left - fast path */ /* Decimal is only output choice left - fast path */
V_VT(pVarDst) = VT_DECIMAL; V_VT(pVarDst) = VT_DECIMAL;
DEC_SIGNSCALE(&V_DECIMAL(pVarDst)) = SIGNSCALE(DECIMAL_POS,0); V_DECIMAL(pVarDst).sign = DECIMAL_POS;
DEC_HI32(&V_DECIMAL(pVarDst)) = 0; V_DECIMAL(pVarDst).scale = 0;
DEC_LO64(&V_DECIMAL(pVarDst)) = ul64; V_DECIMAL(pVarDst).Hi32 = 0;
V_DECIMAL(pVarDst).Lo64 = ul64;
return S_OK; return S_OK;
} }
} }
...@@ -2514,30 +2514,30 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, ...@@ -2514,30 +2514,30 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
DECIMAL* pDec = &V_DECIMAL(pVarDst); DECIMAL* pDec = &V_DECIMAL(pVarDst);
DECIMAL_SETZERO(*pDec); DECIMAL_SETZERO(*pDec);
DEC_LO32(pDec) = 0; pDec->Lo32 = 0;
if (pNumprs->dwOutFlags & NUMPRS_NEG) if (pNumprs->dwOutFlags & NUMPRS_NEG)
DEC_SIGN(pDec) = DECIMAL_NEG; pDec->sign = DECIMAL_NEG;
else else
DEC_SIGN(pDec) = DECIMAL_POS; pDec->sign = DECIMAL_POS;
/* Factor the significant digits */ /* Factor the significant digits */
for (i = 0; i < pNumprs->cDig; i++) for (i = 0; i < pNumprs->cDig; i++)
{ {
tmp = (ULONG64)DEC_LO32(pDec) * 10 + rgbDig[i]; tmp = (ULONG64)pDec->Lo32 * 10 + rgbDig[i];
carry = (ULONG)(tmp >> 32); carry = (ULONG)(tmp >> 32);
DEC_LO32(pDec) = (ULONG)(tmp & UI4_MAX); pDec->Lo32 = (ULONG)tmp;
tmp = (ULONG64)DEC_MID32(pDec) * 10 + carry; tmp = (ULONG64)pDec->Mid32 * 10 + carry;
carry = (ULONG)(tmp >> 32); carry = (ULONG)(tmp >> 32);
DEC_MID32(pDec) = (ULONG)(tmp & UI4_MAX); pDec->Mid32 = (ULONG)tmp;
tmp = (ULONG64)DEC_HI32(pDec) * 10 + carry; tmp = (ULONG64)pDec->Hi32 * 10 + carry;
DEC_HI32(pDec) = (ULONG)(tmp & UI4_MAX); pDec->Hi32 = (ULONG)tmp;
if (tmp >> 32 & UI4_MAX) if (tmp >> 32)
{ {
VarNumFromParseNum_DecOverflow: VarNumFromParseNum_DecOverflow:
TRACE("Overflow\n"); TRACE("Overflow\n");
DEC_LO32(pDec) = DEC_MID32(pDec) = DEC_HI32(pDec) = UI4_MAX; pDec->Lo32 = pDec->Mid32 = pDec->Hi32 = UI4_MAX;
return DISP_E_OVERFLOW; return DISP_E_OVERFLOW;
} }
} }
...@@ -2545,20 +2545,20 @@ VarNumFromParseNum_DecOverflow: ...@@ -2545,20 +2545,20 @@ VarNumFromParseNum_DecOverflow:
/* Account for the scale of the number */ /* Account for the scale of the number */
while (multiplier10 > 0) while (multiplier10 > 0)
{ {
tmp = (ULONG64)DEC_LO32(pDec) * 10; tmp = (ULONG64)pDec->Lo32 * 10;
carry = (ULONG)(tmp >> 32); carry = (ULONG)(tmp >> 32);
DEC_LO32(pDec) = (ULONG)(tmp & UI4_MAX); pDec->Lo32 = (ULONG)tmp;
tmp = (ULONG64)DEC_MID32(pDec) * 10 + carry; tmp = (ULONG64)pDec->Mid32 * 10 + carry;
carry = (ULONG)(tmp >> 32); carry = (ULONG)(tmp >> 32);
DEC_MID32(pDec) = (ULONG)(tmp & UI4_MAX); pDec->Mid32 = (ULONG)tmp;
tmp = (ULONG64)DEC_HI32(pDec) * 10 + carry; tmp = (ULONG64)pDec->Hi32 * 10 + carry;
DEC_HI32(pDec) = (ULONG)(tmp & UI4_MAX); pDec->Hi32 = (ULONG)tmp;
if (tmp >> 32 & UI4_MAX) if (tmp >> 32)
goto VarNumFromParseNum_DecOverflow; goto VarNumFromParseNum_DecOverflow;
multiplier10--; multiplier10--;
} }
DEC_SCALE(pDec) = divisor10; pDec->scale = divisor10;
V_VT(pVarDst) = VT_DECIMAL; V_VT(pVarDst) = VT_DECIMAL;
return S_OK; return S_OK;
...@@ -3077,8 +3077,7 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result) ...@@ -3077,8 +3077,7 @@ HRESULT WINAPI VarAnd(LPVARIANT left, LPVARIANT right, LPVARIANT result)
resvt = VT_NULL; resvt = VT_NULL;
break; break;
case VT_DECIMAL: case VT_DECIMAL:
if (DEC_HI32(&V_DECIMAL(right)) || if (V_DECIMAL(right).Hi32 || V_DECIMAL(right).Lo64)
DEC_LO64(&V_DECIMAL(right)))
resvt = VT_NULL; resvt = VT_NULL;
break; break;
case VT_BSTR: case VT_BSTR:
...@@ -4113,7 +4112,7 @@ HRESULT WINAPI VarOr(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut) ...@@ -4113,7 +4112,7 @@ HRESULT WINAPI VarOr(LPVARIANT pVarLeft, LPVARIANT pVarRight, LPVARIANT pVarOut)
hRet = S_OK; hRet = S_OK;
goto VarOr_Exit; goto VarOr_Exit;
case VT_DECIMAL: case VT_DECIMAL:
if (DEC_HI32(&V_DECIMAL(pVarLeft)) || DEC_LO64(&V_DECIMAL(pVarLeft))) if (V_DECIMAL(pVarLeft).Hi32 || V_DECIMAL(pVarLeft).Lo64)
goto VarOr_AsEmpty; goto VarOr_AsEmpty;
hRet = S_OK; hRet = S_OK;
goto VarOr_Exit; goto VarOr_Exit;
...@@ -4386,7 +4385,7 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut) ...@@ -4386,7 +4385,7 @@ HRESULT WINAPI VarAbs(LPVARIANT pVarIn, LPVARIANT pVarOut)
hRet = VarCyAbs(V_CY(pVarIn), & V_CY(pVarOut)); hRet = VarCyAbs(V_CY(pVarIn), & V_CY(pVarOut));
break; break;
case VT_DECIMAL: case VT_DECIMAL:
DEC_SIGN(&V_DECIMAL(pVarOut)) &= ~DECIMAL_NEG; V_DECIMAL(pVarOut).sign &= ~DECIMAL_NEG;
break; break;
case VT_UI1: case VT_UI1:
case VT_UI2: case VT_UI2:
...@@ -5872,7 +5871,7 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result) ...@@ -5872,7 +5871,7 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result)
case VT_DATE: if (!V_DATE(right)) resvt = VT_NULL; break; case VT_DATE: if (!V_DATE(right)) resvt = VT_NULL; break;
case VT_CY: if (!V_CY(right).int64) resvt = VT_NULL; break; case VT_CY: if (!V_CY(right).int64) resvt = VT_NULL; break;
case VT_DECIMAL: case VT_DECIMAL:
if (!(DEC_HI32(&V_DECIMAL(right)) || DEC_LO64(&V_DECIMAL(right)))) if (!V_DECIMAL(right).Hi32 || V_DECIMAL(right).Lo64)
resvt = VT_NULL; resvt = VT_NULL;
break; break;
case VT_BSTR: case VT_BSTR:
...@@ -5922,7 +5921,7 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result) ...@@ -5922,7 +5921,7 @@ HRESULT WINAPI VarImp(LPVARIANT left, LPVARIANT right, LPVARIANT result)
case VT_R8: if (V_R8(left) == -1.0) resvt = VT_NULL; break; case VT_R8: if (V_R8(left) == -1.0) resvt = VT_NULL; break;
case VT_CY: if (V_CY(left).int64 == -1) resvt = VT_NULL; break; case VT_CY: if (V_CY(left).int64 == -1) resvt = VT_NULL; break;
case VT_DECIMAL: case VT_DECIMAL:
if (DEC_HI32(&V_DECIMAL(left)) == 0xffffffff) if (V_DECIMAL(left).Hi32 == 0xffffffff)
resvt = VT_NULL; resvt = VT_NULL;
break; break;
case VT_BSTR: case VT_BSTR:
......
dlls/oleaut32/variant.h
View file @ 36963b6d
...@@ -74,26 +74,6 @@ ...@@ -74,26 +74,6 @@
/* Value of sign for a positive decimal number */ /* Value of sign for a positive decimal number */
#define DECIMAL_POS 0 #define DECIMAL_POS 0
/* Native headers don't change the union ordering for DECIMAL sign/scale (duh).
* This means that the signscale member is only useful for setting both members to 0.
* SIGNSCALE creates endian-correct values so that we can properly set both at once
* to values other than 0.
*/
#ifdef WORDS_BIGENDIAN
#define SIGNSCALE(sign,scale) (((scale) << 8) | sign)
#else
#define SIGNSCALE(sign,scale) (((sign) << 8) | scale)
#endif
/* Macros for getting at a DECIMAL's parts */
#define DEC_SIGN(d) ((d)->u.s.sign)
#define DEC_SCALE(d) ((d)->u.s.scale)
#define DEC_SIGNSCALE(d) ((d)->u.signscale)
#define DEC_HI32(d) ((d)->Hi32)
#define DEC_MID32(d) ((d)->u1.s1.Mid32)
#define DEC_LO32(d) ((d)->u1.s1.Lo32)
#define DEC_LO64(d) ((d)->u1.Lo64)
#define DEC_MAX_SCALE 28 /* Maximum scale for a decimal */ #define DEC_MAX_SCALE 28 /* Maximum scale for a decimal */
/* Internal flags for low level conversion functions */ /* Internal flags for low level conversion functions */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment