Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:32:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=70810
This commit is contained in:
Amine Khaldi 2016-02-29 00:01:53 +00:00
parent 3268729a9f
commit 44d7b7156e
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/dll/directx/wine/d3drm/texture.c
View file

@ -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) if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)
|| IsEqualGUID(riid, &IID_IDirect3DRMTexture) || 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 else
{ {
*out = NULL; *out = NULL;
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid));
return E_NOINTERFACE; return CLASS_E_CLASSNOTAVAILABLE;
} }
IUnknown_AddRef((IUnknown *)*out); IUnknown_AddRef((IUnknown *)*out);

2
reactos/media/doc/README.WINE
View file

@ -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/d3d8 # Synced to WineStaging-1.9.4
reactos/dll/directx/wine/d3d9 # 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/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/d3dx9_24 => 43 # Synced to WineStaging-1.7.55
reactos/dll/directx/wine/d3dxof # 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/ddraw # Synced to WineStaging-1.9.4