Skip to content

W
wine-cw
Commit ed9a3594 authored by Alex Villacís Lasso's avatar Alex Villacís Lasso Committed by Alexandre Julliard
Browse files
Options

When parsing an hex/oct integer value, copy value verbatim in VARIANT,

rather than a negated value. Add test case for this behavior.
parent e34aac50
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 21 deletions
dlls/oleaut32/tests/vartest.c
View file @ ed9a3594
...@@ -1092,8 +1092,9 @@ static const char *szFailOk = "Call failed, hres = %08lx\n"; ...@@ -1092,8 +1092,9 @@ static const char *szFailOk = "Call failed, hres = %08lx\n";
ok(V_I4(&vOut) == val, "Expected i4 = %ld, got %ld\n", (LONG)val, V_I4(&vOut)); } ok(V_I4(&vOut) == val, "Expected i4 = %ld, got %ld\n", (LONG)val, V_I4(&vOut)); }
#define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \ #define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \
ok(V_UI4(&vOut) == val, "Expected ui4 = %ld, got %ld\n", (ULONG)val, V_UI4(&vOut)); } ok(V_UI4(&vOut) == val, "Expected ui4 = %ld, got %ld\n", (ULONG)val, V_UI4(&vOut)); }
#define EXPECT_I8(val) EXPECT_OK { EXPECT_TYPE(VT_I8); \ #define EXPECT_I8(high,low) EXPECT_OK { EXPECT_TYPE(VT_I8); \
ok(V_I8(&vOut) == val, "Expected i8 = %lld, got %lld\n", (LONG64)val, V_I8(&vOut)); } ok(V_I8(&vOut) == ((((LONG64)(high))<<32)|(low)), "Expected i8 = %lx%08lx, got %lx%08lx\n", \
(LONG)(high), (LONG)(low), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut) ); }
#define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \ #define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \
ok(V_UI8(&vOut) == val, "Expected ui8 = %lld, got %lld\n", (ULONG64)val, V_UI8(&vOut)); } ok(V_UI8(&vOut) == val, "Expected ui8 = %lld, got %lld\n", (ULONG64)val, V_UI8(&vOut)); }
#define EXPECT_R4(val) EXPECT_OK { EXPECT_TYPE(VT_R4); \ #define EXPECT_R4(val) EXPECT_OK { EXPECT_TYPE(VT_R4); \
...@@ -1161,6 +1162,67 @@ static void test_VarNumFromParseNum(void) ...@@ -1161,6 +1162,67 @@ static void test_VarNumFromParseNum(void)
/* Assume the above pattern holds for remaining negative integers */ /* Assume the above pattern holds for remaining negative integers */
/* Test hexadecimal conversions */
SETRGB(0, 1); CONVERT(1,0,0,1,4,0, INTEGER_VTBITS); EXPECT_I1(0x01);
/* 0x7f */
SETRGB(0, 7); SETRGB(1, 0xf);
CONVERT(2,0,0,2,4,0, INTEGER_VTBITS); EXPECT_I1(0x7f);
/* 0x7fff */
SETRGB(0, 7); SETRGB(1, 0xf); SETRGB(2, 0xf); SETRGB(3, 0xf);
CONVERT(4,0,0,4,4,0, INTEGER_VTBITS); EXPECT_I2(0x7fff);
/* 0x7fffffff */
SETRGB(0, 7); SETRGB(1, 0xf); SETRGB(2, 0xf); SETRGB(3, 0xf);
SETRGB(4, 0xf); SETRGB(5, 0xf); SETRGB(6, 0xf); SETRGB(7, 0xf);
CONVERT(8,0,0,8,4,0, INTEGER_VTBITS); EXPECT_I4(0x7fffffffL);
/* 0x7fffffffffffffff (64 bits) */
SETRGB(0, 7); SETRGB(1, 0xf); SETRGB(2, 0xf); SETRGB(3, 0xf);
SETRGB(4, 0xf); SETRGB(5, 0xf); SETRGB(6, 0xf); SETRGB(7, 0xf);
SETRGB(8, 0xf); SETRGB(9, 0xf); SETRGB(10, 0xf); SETRGB(11, 0xf);
SETRGB(12, 0xf); SETRGB(13, 0xf); SETRGB(14, 0xf); SETRGB(15, 0xf);
CONVERT(16,0,0,16,4,0, INTEGER_VTBITS); EXPECT_I8(0x7fffffff,0xffffffff);
/* Assume the above pattern holds for numbers without hi-bit set, test (preservation of) hi-bit */
/* 0x82 */
SETRGB(0, 8); SETRGB(1, 2);
CONVERT(2,0,0,2,4,0, INTEGER_VTBITS);
EXPECT_I1((signed char)0x82);
/* 0x8002 */
SETRGB(0, 8); SETRGB(1, 0); SETRGB(2, 0); SETRGB(3, 2);
CONVERT(4,0,0,4,4,0, INTEGER_VTBITS);
EXPECT_I2((signed short)0x8002);
/* 0x80000002 */
SETRGB(0, 8); SETRGB(1, 0); SETRGB(2, 0); SETRGB(3, 0);
SETRGB(4, 0); SETRGB(5, 0); SETRGB(6, 0); SETRGB(7, 2);
CONVERT(8,0,0,8,4,0, INTEGER_VTBITS); EXPECT_I4(0x80000002L);
/* 0x8000000000000002 (64 bits) */
SETRGB(0, 8); SETRGB(1, 0); SETRGB(2, 0); SETRGB(3, 0);
SETRGB(4, 0); SETRGB(5, 0); SETRGB(6, 0); SETRGB(7, 0);
SETRGB(8, 0); SETRGB(9, 0); SETRGB(10, 0); SETRGB(11, 0);
SETRGB(12, 0); SETRGB(13, 0); SETRGB(14, 0); SETRGB(15, 2);
CONVERT(16,0,0,16,4,0, INTEGER_VTBITS); EXPECT_I8(0x80000000,0x00000002);
/* Test (preservation of) hi-bit with STRICT type requesting */
/* 0x82 */
SETRGB(0, 8); SETRGB(1, 2);
CONVERT(2,0,0,2,4,0, VTBIT_I1);
EXPECT_I1((signed char)0x82);
/* 0x8002 */
SETRGB(0, 8); SETRGB(1, 0); SETRGB(2, 0); SETRGB(3, 2);
CONVERT(4,0,0,4,4,0, VTBIT_I2);
EXPECT_I2((signed short)0x8002);
/* 0x80000002 */
SETRGB(0, 8); SETRGB(1, 0); SETRGB(2, 0); SETRGB(3, 0);
SETRGB(4, 0); SETRGB(5, 0); SETRGB(6, 0); SETRGB(7, 2);
CONVERT(8,0,0,8,4,0, VTBIT_I4); EXPECT_I4(0x80000002L);
/* 0x8000000000000002 (64 bits) */
SETRGB(0, 8); SETRGB(1, 0); SETRGB(2, 0); SETRGB(3, 0);
SETRGB(4, 0); SETRGB(5, 0); SETRGB(6, 0); SETRGB(7, 0);
SETRGB(8, 0); SETRGB(9, 0); SETRGB(10, 0); SETRGB(11, 0);
SETRGB(12, 0); SETRGB(13, 0); SETRGB(14, 0); SETRGB(15, 2);
CONVERT(16,0,0,16,4,0, VTBIT_I8); EXPECT_I8(0x80000000,0x00000002);
/* Assume the above pattern holds for numbers with hi-bit set */
/* Negative numbers overflow if we have only unsigned outputs */ /* Negative numbers overflow if we have only unsigned outputs */
/* -1 */ /* -1 */
SETRGB(0, 1); CONVERT(1,0,NUMPRS_NEG,1,0,0, VTBIT_UI1); EXPECT_OVERFLOW; SETRGB(0, 1); CONVERT(1,0,NUMPRS_NEG,1,0,0, VTBIT_UI1); EXPECT_OVERFLOW;
......
dlls/oleaut32/variant.c
View file @ ed9a3594
...@@ -1907,6 +1907,11 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, ...@@ -1907,6 +1907,11 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags,
/* VTBIT flags indicating a real number value */ /* VTBIT flags indicating a real number value */
#define REAL_VTBITS (VTBIT_R4|VTBIT_R8|VTBIT_CY) #define REAL_VTBITS (VTBIT_R4|VTBIT_R8|VTBIT_CY)
/* Helper macros to check whether bit pattern fits in VARIANT (x is a ULONG64 ) */
#define FITS_AS_I1(x) ((x) >> 8 == 0)
#define FITS_AS_I2(x) ((x) >> 16 == 0)
#define FITS_AS_I4(x) ((x) >> 32 == 0)
/********************************************************************** /**********************************************************************
* VarNumFromParseNum [OLEAUT32.47] * VarNumFromParseNum [OLEAUT32.47]
* *
...@@ -1977,52 +1982,43 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, ...@@ -1977,52 +1982,43 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig,
l64=-ul64; l64=-ul64;
/* Try signed and unsigned types in size order */ /* Try signed and unsigned types in size order */
if (dwVtBits & VTBIT_I1 && ((ul64 <= I1_MAX)||(l64 >= I1_MIN))) if (dwVtBits & VTBIT_I1 && FITS_AS_I1(ul64))
{ {
V_VT(pVarDst) = VT_I1; V_VT(pVarDst) = VT_I1;
if (ul64 <= I1_MAX) V_I1(pVarDst) = ul64;
V_I1(pVarDst) = ul64;
else
V_I1(pVarDst) = l64;
return S_OK; return S_OK;
} }
else if (dwVtBits & VTBIT_UI1 && ul64 <= UI1_MAX) else if (dwVtBits & VTBIT_UI1 && FITS_AS_I1(ul64))
{ {
V_VT(pVarDst) = VT_UI1; V_VT(pVarDst) = VT_UI1;
V_UI1(pVarDst) = ul64; V_UI1(pVarDst) = ul64;
return S_OK; return S_OK;
} }
else if (dwVtBits & VTBIT_I2 && ((ul64 <= I2_MAX)||(l64 >= I2_MIN))) else if (dwVtBits & VTBIT_I2 && FITS_AS_I2(ul64))
{ {
V_VT(pVarDst) = VT_I2; V_VT(pVarDst) = VT_I2;
if (ul64 <= I2_MAX) V_I2(pVarDst) = ul64;
V_I2(pVarDst) = ul64;
else
V_I2(pVarDst) = l64;
return S_OK; return S_OK;
} }
else if (dwVtBits & VTBIT_UI2 && ul64 <= UI2_MAX) else if (dwVtBits & VTBIT_UI2 && FITS_AS_I2(ul64))
{ {
V_VT(pVarDst) = VT_UI2; V_VT(pVarDst) = VT_UI2;
V_UI2(pVarDst) = ul64; V_UI2(pVarDst) = ul64;
return S_OK; return S_OK;
} }
else if (dwVtBits & VTBIT_I4 && ((ul64 <= I4_MAX)||(l64 >= I4_MIN))) else if (dwVtBits & VTBIT_I4 && FITS_AS_I4(ul64))
{ {
V_VT(pVarDst) = VT_I4; V_VT(pVarDst) = VT_I4;
if (ul64 <= I4_MAX) V_I4(pVarDst) = ul64;
V_I4(pVarDst) = ul64;
else
V_I4(pVarDst) = l64;
return S_OK; return S_OK;
} }
else if (dwVtBits & VTBIT_UI4 && ul64 <= UI4_MAX) else if (dwVtBits & VTBIT_UI4 && FITS_AS_I4(ul64))
{ {
V_VT(pVarDst) = VT_UI4; V_VT(pVarDst) = VT_UI4;
V_UI4(pVarDst) = ul64; V_UI4(pVarDst) = ul64;
return S_OK; return S_OK;
} }
else if (dwVtBits & VTBIT_I8 && ((ul64 <= I4_MAX)||(l64>=I4_MIN))) else if (dwVtBits & VTBIT_I8 && ((ul64 <= I8_MAX)||(l64>=I8_MIN)))
{ {
V_VT(pVarDst) = VT_I8; V_VT(pVarDst) = VT_I8;
V_I8(pVarDst) = ul64; V_I8(pVarDst) = ul64;
......
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