[ros-diffs] [akhaldi] 70810: [D3DRM] Sync with Wine Staging 1.9.4. CORE-10912

Author: akhaldi
Date: Mon Feb 29 00:01:53 2016
New Revision: 70810

URL: http://svn.reactos.org/svn/reactos?rev=70810&view=rev
Log:
[D3DRM] Sync with Wine Staging 1.9.4. CORE-10912

Modified:
    trunk/reactos/dll/directx/wine/d3drm/texture.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/d3drm/texture.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3drm/tex…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3drm/texture.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3drm/texture.c	[iso-8859-1] Mon Feb 29 00:01:53 2016
@@ -670,21 +670,26 @@
 
     TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
 
-    if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2)
-            || IsEqualGUID(riid, &IID_IDirect3DRMTexture)
+    if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)
+            || IsEqualGUID(riid, &IID_IDirect3DRMVisual)
+            || IsEqualGUID(riid, &IID_IDirect3DRMObject)
             || IsEqualGUID(riid, &IID_IUnknown))
+    {
+        *out = &texture->IDirect3DRMTexture3_iface;
+    }
+    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2))
     {
         *out = &texture->IDirect3DRMTexture2_iface;
     }
-    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3))
+    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture))
     {
-        *out = &texture->IDirect3DRMTexture3_iface;
+        *out = &texture->IDirect3DRMTexture_iface;
     }
     else
     {
         *out = NULL;
-        WARN("%s not implemented, returning E_NOINTERFACE.\n",
debugstr_guid(riid));
-        return E_NOINTERFACE;
+        WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n",
debugstr_guid(riid));
+        return CLASS_E_CLASSNOTAVAILABLE;
     }
 
     IUnknown_AddRef((IUnknown *)*out);

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] Mon Feb 29 00:01:53 2016
@@ -25,7 +25,7 @@
 reactos/dll/directx/wine/d3d8           # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/d3d9           # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to WineStaging-1.7.55
-reactos/dll/directx/wine/d3drm          # Synced to WineStaging-1.7.55
+reactos/dll/directx/wine/d3drm          # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/d3dxof         # Synced to WineStaging-1.7.55
 reactos/dll/directx/wine/ddraw          # Synced to WineStaging-1.9.4