From: Nikolay Sivov nsivov@codeweavers.com
DXGI currently marks all adapters as 'hardware' too.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/dxcore/dxcore.c | 7 +++++++ dlls/dxcore/tests/dxcore.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/dxcore/dxcore.c b/dlls/dxcore/dxcore.c index f8a14a82998..7b753728dc4 100644 --- a/dlls/dxcore/dxcore.c +++ b/dlls/dxcore/dxcore.c @@ -107,12 +107,14 @@ static HRESULT dxcore_adapter_get_property_size(struct dxcore_adapter *adapter, { [InstanceLuid] = sizeof(LUID), [HardwareID] = sizeof(DXCoreHardwareID), + [IsHardware] = sizeof(BYTE), };
switch (property) { case InstanceLuid: case HardwareID: + case IsHardware: *size = property_sizes[property]; return S_OK; default: @@ -156,6 +158,11 @@ static HRESULT STDMETHODCALLTYPE dxcore_adapter_GetProperty(IDXCoreAdapter *ifac hardware_id->revision = adapter->identifier.revision; break; } + case IsHardware: + FIXME("Returning all adapters as Hardware.\n"); + + *(BYTE *)buffer = 1; + break; default: ; } diff --git a/dlls/dxcore/tests/dxcore.c b/dlls/dxcore/tests/dxcore.c index f4ac0cce62d..28f928f9a18 100644 --- a/dlls/dxcore/tests/dxcore.c +++ b/dlls/dxcore/tests/dxcore.c @@ -221,30 +221,23 @@ static void test_GetProperty(void) hr = IDXCoreAdapter_GetProperty(adapter, IsHardware, 0, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr); hr = IDXCoreAdapter_GetProperty(adapter, IsHardware, 0, &is_hardware); - todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr);
hr = IDXCoreAdapter_GetPropertySize(adapter, IsHardware, NULL); ok(hr == E_POINTER, "Unexpected hr %#lx.\n", hr);
hr = IDXCoreAdapter_GetPropertySize(adapter, IsHardware, &size); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(size == sizeof(is_hardware), "Unexpected property size.\n");
is_hardware = 3; hr = IDXCoreAdapter_GetProperty(adapter, IsHardware, sizeof(is_hardware), &is_hardware); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(is_hardware == 0 || is_hardware == 1, "Unexpected value %d.\n", is_hardware);
dummy = 0; hr = IDXCoreAdapter_GetProperty(adapter, IsHardware, sizeof(dummy), &dummy); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(dummy == is_hardware, "Unexpected value %#x.\n", dummy);
IDXCoreAdapter_Release(adapter);