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

ddraw: Enumerate wined3d interfaces with DirectDrawEnumerateEx.

This commit is contained in:
Erich Hoover 2012-09-17 14:18:39 -06:00 committed by Alexandre Julliard
parent 83b02573cc
commit b0cefe897c
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/ddraw/main.c
View File

@ -374,6 +374,8 @@ HRESULT WINAPI DirectDrawEnumerateA(LPDDENUMCALLBACKA callback, void *context)
***********************************************************************/ ***********************************************************************/
HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags) HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *context, DWORD flags)
{ {
struct wined3d *wined3d;
TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags); TRACE("callback %p, context %p, flags %#x.\n", callback, context, flags);
if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES | if (flags & ~(DDENUM_ATTACHEDSECONDARYDEVICES |
@ -384,23 +386,50 @@ HRESULT WINAPI DirectDrawEnumerateExA(LPDDENUMCALLBACKEXA callback, void *contex
if (flags) if (flags)
FIXME("flags 0x%08x not handled\n", flags); FIXME("flags 0x%08x not handled\n", flags);
TRACE("Enumerating default DirectDraw HAL interface\n"); TRACE("Enumerating ddraw interfaces\n");
wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS);
/* We only have one driver by now */
__TRY __TRY
{ {
/* QuickTime expects the description "DirectDraw HAL" */
static CHAR driver_desc[] = "DirectDraw HAL", static CHAR driver_desc[] = "DirectDraw HAL",
driver_name[] = "display"; driver_name[] = "display";
struct wined3d_adapter_identifier adapter_id;
HRESULT hr = S_OK;
UINT adapter = 0;
BOOL cont_enum;
/* QuickTime expects the description "DirectDraw HAL" */ /* The Battle.net System Checker expects both a NULL device and a GUID-based device */
callback(NULL, driver_desc, driver_name, context, 0); TRACE("Default interface: DirectDraw HAL\n");
cont_enum = callback(NULL, driver_desc, driver_name, context, 0);
for (adapter = 0; SUCCEEDED(hr) && cont_enum; adapter++)
{
char DriverName[512] = "";
/* The Battle.net System Checker expects the GetAdapterIdentifier DeviceName to match the
* Driver Name, so obtain the DeviceName and GUID from D3D. */
memset(&adapter_id, 0x0, sizeof(adapter_id));
adapter_id.device_name = DriverName;
adapter_id.device_name_size = sizeof(DriverName);
wined3d_mutex_lock();
hr = wined3d_get_adapter_identifier(wined3d, adapter, 0x0, &adapter_id);
wined3d_mutex_unlock();
if (SUCCEEDED(hr))
{
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, context, 0);
}
}
} }
__EXCEPT_PAGE_FAULT __EXCEPT_PAGE_FAULT
{ {
wined3d_decref(wined3d);
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
} }
__ENDTRY; __ENDTRY;
wined3d_decref(wined3d);
TRACE("End of enumeration\n"); TRACE("End of enumeration\n");
return DD_OK; return DD_OK;
} }