Author: akhaldi
Date: Sun Sep 17 12:33:57 2017
New Revision: 75869
URL: http://svn.reactos.org/svn/reactos?rev=75869&view=rev
Log:
[FUSION] Sync with Wine Staging 2.16. CORE-13762
da03b46 fusion: Use standard wine_dbgstr_longlong.
Modified:
trunk/reactos/dll/win32/fusion/asmname.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/fusion/asmname.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c?rev=75869&r1=75868&r2=75869&view=diff
==============================================================================
--- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Sun Sep 17
12:33:57 2017
@@ -345,9 +345,9 @@
DWORD cbReserved,
LPVOID *ppReserved)
{
- TRACE("(%p, %s, %p, %p, %s, %x%08x, %p, %d, %p)\n", iface,
+ TRACE("(%p, %s, %p, %p, %s, %s, %p, %d, %p)\n", iface,
debugstr_guid(refIID), pUnkReserved1, pUnkReserved2,
- debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved,
+ debugstr_w(szReserved), wine_dbgstr_longlong(llReserved),
pvReserved, cbReserved, ppReserved);
return E_NOTIMPL;
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=75869&r1=75868&r2=75869&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 12:33:57 2017
@@ -67,7 +67,7 @@
reactos/dll/win32/dciman32 # Synced to WineStaging-2.9
reactos/dll/win32/faultrep # Synced to WineStaging-2.9
reactos/dll/win32/fontsub # Synced to WineStaging-2.9
-reactos/dll/win32/fusion # Synced to WineStaging-2.9
+reactos/dll/win32/fusion # Synced to WineStaging-2.16
reactos/dll/win32/gdiplus # Synced to WineStaging-2.9
reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9
reactos/dll/win32/hlink # Synced to WineStaging-2.9
