system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 08:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d8: Do not touch output parameters when d3d8_GetAdapterIdentifier() fails.

Browse source 
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>
This commit is contained in:
Józef Kucia 2018-12-03 14:41:07 +01:00 committed by Alexandre Julliard
parent 6dddb88ebe
commit 7aa4d27681
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/d3d8/directx.c
View file

@ -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;
}