[D3DRM] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70810

diff --git a/reactos/dll/directx/wine/d3drm/texture.c b/reactos/dll/directx/wine/d3drm/texture.c
index 7ba596e..c55a5d8 100644 (file)
--- a/reactos/dll/directx/wine/d3drm/texture.c
+++ b/reactos/dll/directx/wine/d3drm/texture.c
@@ -670,21 +670,26 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface,
 
     TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
 
 
     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))
             || IsEqualGUID(riid, &IID_IUnknown))

+    {
+        *out = &texture->IDirect3DRMTexture3_iface;
+    }
+    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2))

     {
         *out = &texture->IDirect3DRMTexture2_iface;
     }
     {
         *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;
     }
     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);
     }
 
     IUnknown_AddRef((IUnknown *)*out);

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 1382ed2..ebbefd8 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -25,7 +25,7 @@ reactos/dll/directx/wine/amstream       # Synced to WineStaging-1.7.55
 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/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
 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