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

Author: akhaldi
Date: Sun Sep 17 22:57:07 2017
New Revision: 75895

URL: http://svn.reactos.org/svn/reactos?rev=75895&view=rev
Log:
[PROPSYS_WINETEST] Sync with Wine Staging 2.16. CORE-13762

Modified:
    trunk/rostests/winetests/propsys/CMakeLists.txt
    trunk/rostests/winetests/propsys/propsys.c

Modified: trunk/rostests/winetests/propsys/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/CMakeLis...
==============================================================================
--- trunk/rostests/winetests/propsys/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/propsys/CMakeLists.txt	[iso-8859-1] Sun Sep 17 22:57:07 2017
@@ -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)
 set_module_type(propsys_winetest win32cui)
 add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32)

Modified: trunk/rostests/winetests/propsys/propsys.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/propsys/propsys....
==============================================================================
--- trunk/rostests/winetests/propsys/propsys.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/propsys/propsys.c	[iso-8859-1] Sun Sep 17 22:57:07 2017
@@ -770,16 +770,6 @@
     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;
@@ -803,7 +793,7 @@

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);
@@ -825,11 +815,11 @@

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);
@@ -852,7 +842,7 @@

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);
@@ -876,28 +866,28 @@

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)