ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Make DirectDrawEnumerateEx report the driver description.

This commit is contained in:
Erich E. Hoover 2014-01-08 15:02:47 -07:00 committed by Alexandre Julliard
parent 639f9335c2
commit eba5132bfa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/ddraw/main.c
View File

@ -62,7 +62,6 @@ static HRESULT CALLBACK enum_callback(GUID *guid, char *description, char *drive
static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback, static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMCALLBACKEXA callback,
void *context) void *context)
{ {
static CHAR driver_desc[] = "DirectDraw HAL";
struct wined3d_adapter_identifier adapter_id; struct wined3d_adapter_identifier adapter_id;
BOOL cont_enum = TRUE; BOOL cont_enum = TRUE;
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -70,21 +69,23 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC
for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++) for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++)
{ {
char DriverName[512] = ""; char DriverName[512] = "", DriverDescription[512] = "";
/* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the /* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the
* Driver Name, so obtain the DeviceName and GUID from D3D. */ * Driver Name, so obtain the DeviceName and GUID from D3D. */
memset(&adapter_id, 0x0, sizeof(adapter_id)); memset(&adapter_id, 0x0, sizeof(adapter_id));
adapter_id.device_name = DriverName; adapter_id.device_name = DriverName;
adapter_id.device_name_size = sizeof(DriverName); adapter_id.device_name_size = sizeof(DriverName);
adapter_id.description = DriverDescription;
adapter_id.description_size = sizeof(DriverDescription);
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id); hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier));
cont_enum = callback(&adapter_id.device_identifier, driver_desc, adapter_id.device_name, cont_enum = callback(&adapter_id.device_identifier, adapter_id.description,
context, 0); adapter_id.device_name, context, 0);
} }
} }
} }