From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/dxcore/dxcore.c | 10 ++++++++-- dlls/dxcore/tests/dxcore.c | 14 ++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/dlls/dxcore/dxcore.c b/dlls/dxcore/dxcore.c index e32b79ec2bb..def592480b4 100644 --- a/dlls/dxcore/dxcore.c +++ b/dlls/dxcore/dxcore.c @@ -169,8 +169,14 @@ static HRESULT STDMETHODCALLTYPE dxcore_adapter_GetProperty(IDXCoreAdapter *ifac static HRESULT STDMETHODCALLTYPE dxcore_adapter_GetPropertySize(IDXCoreAdapter *iface, DXCoreAdapterProperty property, size_t *buffer_size) { - FIXME("iface %p, property %u, buffer_size %p stub!\n", iface, property, buffer_size); - return E_NOTIMPL; + struct dxcore_adapter *adapter = impl_from_IDXCoreAdapter(iface); + + TRACE("iface %p, property %u, buffer_size %p.\n", iface, property, buffer_size); + + if (!buffer_size) + return E_POINTER; + + return dxcore_adapter_get_property_size(adapter, property, buffer_size); }
static BOOL STDMETHODCALLTYPE dxcore_adapter_IsQueryStateSupported(IDXCoreAdapter *iface, DXCoreAdapterState property) diff --git a/dlls/dxcore/tests/dxcore.c b/dlls/dxcore/tests/dxcore.c index 1f5d8c318bd..bd87d5084f4 100644 --- a/dlls/dxcore/tests/dxcore.c +++ b/dlls/dxcore/tests/dxcore.c @@ -183,12 +183,11 @@ static void test_GetProperty(void) ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);
hr = IDXCoreAdapter_GetPropertySize(adapter, InstanceLuid, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr);
hr = IDXCoreAdapter_GetPropertySize(adapter, InstanceLuid, &size); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - ok(size == sizeof(*luid), "Got size %Iu.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size == sizeof(*luid), "Got size %Iu.\n", size);
hr = IDXCoreAdapter_GetProperty(adapter, InstanceLuid, sizeof(luid[0]), luid); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -205,12 +204,11 @@ static void test_GetProperty(void) ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr);
hr = IDXCoreAdapter_GetPropertySize(adapter, HardwareID, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr);
hr = IDXCoreAdapter_GetPropertySize(adapter, HardwareID, &size); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - ok(size == sizeof(*hwid), "Got size %Iu.\n", size); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size == sizeof(*hwid), "Got size %Iu.\n", size);
memset(hwid, 0, sizeof(hwid)); hr = IDXCoreAdapter_GetProperty(adapter, HardwareID, sizeof(hwid[0]), hwid);