Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DXDIAGN] Sync with Wine Staging 1.7.47. CORE-9924

Browse source 
svn path=/trunk/; revision=68522
This commit is contained in:
Amine Khaldi 2015-07-21 23:25:41 +00:00
parent bb3a434883
commit a035ca3f75
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/directx/wine/dxdiagn/dxdiag_main.c
View file

@ -54,6 +54,12 @@ static HRESULT WINAPI DXDiagCF_QueryInterface(IClassFactory *iface, REFIID riid,
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;

5
reactos/dll/directx/wine/dxdiagn/provider.c
View file

@ -904,6 +904,7 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node
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;
@ -1049,6 +1050,10 @@ static HRESULT fill_display_information_d3d(IDxDiagContainerImpl_Container *node
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;
}
hr = S_OK;

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

@ -36,7 +36,7 @@ reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.47
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