=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails.
Alexandre Julliard
julliard at winehq.org
Mon Dec 3 15:28:54 CST 2018
Module: wine
Branch: master
Commit: 7aa4d276810c9ca05c8cd605152e7c6194f5a78a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa4d276810c9ca05c8cd605152e7c6194f5a78a
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Mon Dec 3 14:41:07 2018 +0100
d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d8/directx.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index 385c70d..d978827 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -132,15 +132,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter,
adapter_id.device_name = NULL; /* d3d9 only */
adapter_id.device_name_size = 0; /* d3d9 only */
- hr = wined3d_get_adapter_identifier(d3d8->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(d3d8->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;
}
More information about the wine-cvs
mailing list