diff --git a/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c b/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c index 874a784e14a..79bc45a8d4f 100644 --- a/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c +++ b/reactos/dll/directx/wine/dxdiagn/dxdiag_main.c @@ -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; diff --git a/reactos/dll/directx/wine/dxdiagn/provider.c b/reactos/dll/directx/wine/dxdiagn/provider.c index deac71b06bf..6d2067f5b6c 100644 --- a/reactos/dll/directx/wine/dxdiagn/provider.c +++ b/reactos/dll/directx/wine/dxdiagn/provider.c @@ -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; diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 2caf1551ede..21f7763ccfd 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -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