[ros-diffs] [akhaldi] 68522: [DXDIAGN] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Tue Jul 21 23:25:41 2015
New Revision: 68522

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

Modified:
    trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c
    trunk/reactos/dll/directx/wine/dxdiagn/provider.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/d…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c	[iso-8859-1] Tue Jul 21 23:25:41
2015
@@ -54,6 +54,12 @@
     TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv);
   else if (IsEqualGUID(&IID_IClassFactory, riid))
     TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv);
+  else if (IsEqualGUID(&IID_IExternalConnection, riid) ||
+           IsEqualGUID(&IID_IMarshal, riid)) {
+    TRACE("(%p)->(%s) ignoring\n", iface, debugstr_guid(riid));
+    *ppv = NULL;
+    return E_NOINTERFACE;
+  }
   else {
     FIXME("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
     *ppv = NULL;

Modified: trunk/reactos/dll/directx/wine/dxdiagn/provider.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxdiagn/p…
==============================================================================
--- trunk/reactos/dll/directx/wine/dxdiagn/provider.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dxdiagn/provider.c	[iso-8859-1] Tue Jul 21 23:25:41
2015
@@ -904,6 +904,7 @@
         static const WCHAR b3DAccelerationExists[] =
{'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','x','i','s','t','s',0};
         static const WCHAR b3DAccelerationEnabled[] =
{'b','3','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
         static const WCHAR bDDAccelerationEnabled[] =
{'b','D','D','A','c','c','e','l','e','r','a','t','i','o','n','E','n','a','b','l','e','d',0};
+        static const WCHAR bNoHardware[] =
{'b','N','o','H','a','r','d','w','a','r','e',0};
 
         D3DADAPTER_IDENTIFIER9 adapter_info;
         D3DDISPLAYMODE adapter_mode;
@@ -1047,6 +1048,10 @@
             goto cleanup;
 
         hr = add_bool_property(display_adapter, bDDAccelerationEnabled, hardware_accel);
+        if (FAILED(hr))
+            goto cleanup;
+
+        hr = add_bool_property(display_adapter, bNoHardware, FALSE);
         if (FAILED(hr))
             goto cleanup;
     }

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Tue Jul 21 23:25:41 2015
@@ -36,7 +36,7 @@
 reactos/dll/directx/wine/dplay          # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/dplayx         # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.3.29
-reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.7.37
+reactos/dll/directx/wine/dxdiagn        # Synced to WineStaging-1.7.47
 reactos/dll/directx/wine/dxgi           # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/msdmo          # Synced to WineStaging-1.7.37
 reactos/dll/directx/wine/qedit          # Synced to WineStaging-1.7.37