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>

d3d9: Do not touch output parameter when d3d9_GetAdapterIdentifier() fails.
133d0668 · Józef Kucia · Alexandre Julliard · 0035b110 · 133d0668
Commit 133d0668 authored Dec 03, 2018 by Józef Kucia Committed by Alexandre Julliard Dec 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

directx.c dlls/d3d9/directx.c +10 -9

No files found.
--- 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;
 }