[ros-diffs] [akhaldi] 68527: [QUARTZ_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Tue Jul 21 23:30:04 2015
New Revision: 68527

URL: http://svn.reactos.org/svn/reactos?rev=68527&view=rev
Log:
[QUARTZ_WINETEST] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/rostests/winetests/quartz/dsoundrender.c
    trunk/rostests/winetests/quartz/referenceclock.c

Modified: trunk/rostests/winetests/quartz/dsoundrender.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/dsoundre…
==============================================================================
--- trunk/rostests/winetests/quartz/dsoundrender.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/dsoundrender.c	[iso-8859-1] Tue Jul 21 23:30:04 2015
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
 #define COBJMACROS
 
 #include "wine/test.h"

Modified: trunk/rostests/winetests/quartz/referenceclock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/referenc…
==============================================================================
--- trunk/rostests/winetests/quartz/referenceclock.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/quartz/referenceclock.c	[iso-8859-1] Tue Jul 21 23:30:04
2015
@@ -28,21 +28,21 @@
 static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock
* pClock)
 {
     HRESULT hr;
-    void *pF;
+    IUnknown *pF;
 
-    hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF);
+    hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (void**)&pF);
     ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr);
     ok(pF != NULL, "pF is NULL\n");
-    if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF);
+    if (SUCCEEDED(hr)) IUnknown_Release(pF);
 
-    hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF);
+    hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (void**)&pF);
     ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n",
hr);
     ok(pF == NULL, "pF is not NULL\n");
 
-    hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF);
+    hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock,
(void**)&pF);
     ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr);
     ok(pF != NULL, "pF is NULL\n");
-    if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF);
+    if (SUCCEEDED(hr)) IUnknown_Release(pF);
 }
 
 /* The following method expects a reference clock that will keep ticking for