Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-05 17:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PROPSYS_WINETEST] Sync with Wine Staging 2.16. CORE-13762

Browse source 
svn path=/trunk/; revision=75895
This commit is contained in:
Amine Khaldi 2017-09-17 22:57:07 +00:00
parent f20aa39c5f
commit ac45094d68
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rostests/winetests/propsys/CMakeLists.txt
View file

@ -1,5 +1,5 @@
add_definitions(-DUSE_WINE_TODOS) add_definitions(-DUSE_WINE_TODOS -DWINETEST_USE_DBGSTR_LONGLONG)
add_executable(propsys_winetest propstore.c propsys.c testlist.c) add_executable(propsys_winetest propstore.c propsys.c testlist.c)
set_module_type(propsys_winetest win32cui) set_module_type(propsys_winetest win32cui)
add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32) add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32)

26
rostests/winetests/propsys/propsys.c
View file

@ -770,16 +770,6 @@ static void test_PropVariantCompare(void)
SysFreeString(str_b.u.bstrVal); 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) static void test_intconversions(void)
{ {
PROPVARIANT propvar; PROPVARIANT propvar;
@ -803,7 +793,7 @@ static void test_intconversions(void)
hr = PropVariantToInt64(&propvar, &llval); hr = PropVariantToInt64(&propvar, &llval);
ok(hr == S_OK, "hr=%x\n", hr); 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); hr = PropVariantToUInt64(&propvar, &ullval);
ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
@ -825,11 +815,11 @@ static void test_intconversions(void)
hr = PropVariantToInt64(&propvar, &llval); hr = PropVariantToInt64(&propvar, &llval);
ok(hr == S_OK, "hr=%x\n", hr); 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); hr = PropVariantToUInt64(&propvar, &ullval);
ok(hr == S_OK, "hr=%x\n", hr); 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); hr = PropVariantToInt32(&propvar, &lval);
ok(hr == S_OK, "hr=%x\n", hr); ok(hr == S_OK, "hr=%x\n", hr);
@ -852,7 +842,7 @@ static void test_intconversions(void)
hr = PropVariantToInt64(&propvar, &llval); hr = PropVariantToInt64(&propvar, &llval);
ok(hr == S_OK, "hr=%x\n", hr); 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); hr = PropVariantToUInt64(&propvar, &ullval);
ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr); ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
@ -876,28 +866,28 @@ static void test_intconversions(void)
hr = PropVariantToInt64(&propvar, &llval); hr = PropVariantToInt64(&propvar, &llval);
ok(hr == S_OK, "hr=%x\n", hr); 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.vt = VT_I4;
propvar.u.lVal = -6; propvar.u.lVal = -6;
hr = PropVariantToInt64(&propvar, &llval); hr = PropVariantToInt64(&propvar, &llval);
ok(hr == S_OK, "hr=%x\n", hr); 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.vt = VT_UI2;
propvar.u.uiVal = 7; propvar.u.uiVal = 7;
hr = PropVariantToInt64(&propvar, &llval); hr = PropVariantToInt64(&propvar, &llval);
ok(hr == S_OK, "hr=%x\n", hr); 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.vt = VT_I2;
propvar.u.iVal = -7; propvar.u.iVal = -7;
hr = PropVariantToInt64(&propvar, &llval); hr = PropVariantToInt64(&propvar, &llval);
ok(hr == S_OK, "hr=%x\n", hr); 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) static void test_PropVariantChangeType_LPWSTR(void)