Module: wine Branch: master Commit: 133d0668b69422b3f6964bddabba9476e7f8a585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=133d0668b69422b3f6964bdda...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Dec 3 14:41:09 2018 +0100
d3d9: Do not touch output parameter when d3d9_GetAdapterIdentifier() fails.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d9/directx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 4fbf5e9..3f9c188 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -137,15 +137,16 @@ static HRESULT WINAPI d3d9_GetAdapterIdentifier(IDirect3D9Ex *iface, UINT adapte adapter_id.device_name = identifier->DeviceName; adapter_id.device_name_size = sizeof(identifier->DeviceName);
- hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id); - - identifier->DriverVersion = adapter_id.driver_version; - identifier->VendorId = adapter_id.vendor_id; - identifier->DeviceId = adapter_id.device_id; - identifier->SubSysId = adapter_id.subsystem_id; - identifier->Revision = adapter_id.revision; - memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); - identifier->WHQLLevel = adapter_id.whql_level; + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(d3d9->wined3d, adapter, flags, &adapter_id))) + { + identifier->DriverVersion = adapter_id.driver_version; + identifier->VendorId = adapter_id.vendor_id; + identifier->DeviceId = adapter_id.device_id; + identifier->SubSysId = adapter_id.subsystem_id; + identifier->Revision = adapter_id.revision; + memcpy(&identifier->DeviceIdentifier, &adapter_id.device_identifier, sizeof(identifier->DeviceIdentifier)); + identifier->WHQLLevel = adapter_id.whql_level; + }
return hr; }