propsys/tests: Use standard wine_dbgstr_longlong.
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
87b72098c3
commit
b2f266906b
|
@ -763,16 +763,6 @@ static void test_PropVariantCompare(void)
|
|||
SysFreeString(str_b.u.bstrVal);
|
||||
}
|
||||
|
||||
static inline const char* debugstr_longlong(ULONGLONG ll)
|
||||
{
|
||||
static char string[17];
|
||||
if (sizeof(ll) > sizeof(unsigned long) && ll >> 32)
|
||||
sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll);
|
||||
else
|
||||
sprintf(string, "%lx", (unsigned long)ll);
|
||||
return string;
|
||||
}
|
||||
|
||||
static void test_intconversions(void)
|
||||
{
|
||||
PROPVARIANT propvar;
|
||||
|
@ -796,7 +786,7 @@ static void test_intconversions(void)
|
|||
|
||||
hr = PropVariantToInt64(&propvar, &llval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval));
|
||||
ok(llval == (ULONGLONG)1 << 63, "got wrong value %s\n", wine_dbgstr_longlong(llval));
|
||||
|
||||
hr = PropVariantToUInt64(&propvar, &ullval);
|
||||
ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
|
||||
|
@ -818,11 +808,11 @@ static void test_intconversions(void)
|
|||
|
||||
hr = PropVariantToInt64(&propvar, &llval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(llval == 5, "got wrong value %s\n", debugstr_longlong(llval));
|
||||
ok(llval == 5, "got wrong value %s\n", wine_dbgstr_longlong(llval));
|
||||
|
||||
hr = PropVariantToUInt64(&propvar, &ullval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(ullval == 5, "got wrong value %s\n", debugstr_longlong(ullval));
|
||||
ok(ullval == 5, "got wrong value %s\n", wine_dbgstr_longlong(ullval));
|
||||
|
||||
hr = PropVariantToInt32(&propvar, &lval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
|
@ -845,7 +835,7 @@ static void test_intconversions(void)
|
|||
|
||||
hr = PropVariantToInt64(&propvar, &llval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(llval == -5, "got wrong value %s\n", debugstr_longlong(llval));
|
||||
ok(llval == -5, "got wrong value %s\n", wine_dbgstr_longlong(llval));
|
||||
|
||||
hr = PropVariantToUInt64(&propvar, &ullval);
|
||||
ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
|
||||
|
@ -869,28 +859,28 @@ static void test_intconversions(void)
|
|||
|
||||
hr = PropVariantToInt64(&propvar, &llval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(llval == 6, "got wrong value %s\n", debugstr_longlong(llval));
|
||||
ok(llval == 6, "got wrong value %s\n", wine_dbgstr_longlong(llval));
|
||||
|
||||
propvar.vt = VT_I4;
|
||||
propvar.u.lVal = -6;
|
||||
|
||||
hr = PropVariantToInt64(&propvar, &llval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(llval == -6, "got wrong value %s\n", debugstr_longlong(llval));
|
||||
ok(llval == -6, "got wrong value %s\n", wine_dbgstr_longlong(llval));
|
||||
|
||||
propvar.vt = VT_UI2;
|
||||
propvar.u.uiVal = 7;
|
||||
|
||||
hr = PropVariantToInt64(&propvar, &llval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(llval == 7, "got wrong value %s\n", debugstr_longlong(llval));
|
||||
ok(llval == 7, "got wrong value %s\n", wine_dbgstr_longlong(llval));
|
||||
|
||||
propvar.vt = VT_I2;
|
||||
propvar.u.iVal = -7;
|
||||
|
||||
hr = PropVariantToInt64(&propvar, &llval);
|
||||
ok(hr == S_OK, "hr=%x\n", hr);
|
||||
ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval));
|
||||
ok(llval == -7, "got wrong value %s\n", wine_dbgstr_longlong(llval));
|
||||
}
|
||||
|
||||
static void test_PropVariantChangeType_LPWSTR(void)
|
||||
|
|
Loading…
Reference in New Issue