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

ddraw: Use a correct resource type and a valid format.

This commit is contained in:
Roderick Colenbrander 2008-03-21 14:53:54 +01:00 committed by Alexandre Julliard
parent 51a8162330
commit 41310080a5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/ddraw/direct3d.c
View File

@ -1131,6 +1131,7 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface,
ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D7, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D7, iface);
HRESULT hr; HRESULT hr;
int i; int i;
WINED3DDISPLAYMODE d3ddm;
/* Order matters. Specifically, BattleZone II (full version) expects the /* Order matters. Specifically, BattleZone II (full version) expects the
* 16-bit depth formats to be listed before the 24 and 32 ones. */ * 16-bit depth formats to be listed before the 24 and 32 ones. */
@ -1145,6 +1146,11 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface,
TRACE("(%p)->(%s,%p,%p): Relay\n", iface, debugstr_guid(refiidDevice), Callback, Context); TRACE("(%p)->(%s,%p,%p): Relay\n", iface, debugstr_guid(refiidDevice), Callback, Context);
if(IWineD3D_GetAdapterDisplayMode(This->wineD3D, WINED3DADAPTER_DEFAULT, &d3ddm ) != WINED3D_OK) {
ERR("Unable to retrieve a default display mode for quering the z-buffer formats!\n");
return DDERR_INVALIDPARAMS;
}
if(!Callback) if(!Callback)
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
@ -1154,9 +1160,9 @@ IDirect3DImpl_7_EnumZBufferFormats(IDirect3D7 *iface,
hr = IWineD3D_CheckDeviceFormat(This->wineD3D, hr = IWineD3D_CheckDeviceFormat(This->wineD3D,
0 /* Adapter */, 0 /* Adapter */,
0 /* DeviceType */, 0 /* DeviceType */,
0 /* AdapterFormat */, d3ddm.Format /* AdapterFormat */,
WINED3DUSAGE_DEPTHSTENCIL /* Usage */, WINED3DUSAGE_DEPTHSTENCIL /* Usage */,
0 /* ResourceType */, WINED3DRTYPE_SURFACE /* ResourceType */,
FormatList[i]); FormatList[i]);
if(hr == D3D_OK) if(hr == D3D_OK)
{ {