system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 23:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ddraw: Fix some material related bugs.

Browse source
This commit is contained in:
Stefan Dösinger 2006-06-29 14:20:39 +02:00 committed by Alexandre Julliard
parent 44ace22445
commit b0c7bee2ef
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/ddraw/device.c
View file

@ -1639,7 +1639,7 @@ IDirect3DDeviceImpl_3_GetCurrentViewport(IDirect3DDevice3 *iface,
*Direct3DViewport3 = ICOM_INTERFACE(This->current_viewport, IDirect3DViewport3);
/* AddRef the returned viewport */
IDirect3DViewport3_AddRef(*Direct3DViewport3);
if(*Direct3DViewport3) IDirect3DViewport3_AddRef(*Direct3DViewport3);
TRACE(" returning interface %p\n", *Direct3DViewport3);
@ -2279,7 +2279,23 @@ IDirect3DDeviceImpl_3_SetLightState(IDirect3DDevice3 *iface,
if (LightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */)
{
IDirect3DMaterialImpl *mat = (IDirect3DMaterialImpl *) Value;
IDirect3DMaterialImpl *mat;
if(Value == 0) mat = NULL;
else if(Value > This->numHandles)
{
ERR("Material handle out of range(%ld)\n", Value);
return DDERR_INVALIDPARAMS;
}
else if(This->Handles[Value - 1].type != DDrawHandle_Material)
{
ERR("Invalid handle %ld\n", Value);
return DDERR_INVALIDPARAMS;
}
else
{
mat = (IDirect3DMaterialImpl *) This->Handles[Value - 1].ptr;
}
if (mat != NULL)
{

1
dlls/ddraw/material.c
View file

@ -311,6 +311,7 @@ IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface,
IDirect3DDeviceImpl *device = ICOM_OBJECT(IDirect3DDeviceImpl, IDirect3DDevice3, lpDirect3DDevice3);
TRACE("(%p/%p)->(%p,%p)\n", This, iface, device, lpHandle);
This->active_device = device;
if(!This->Handle)
{
This->Handle = IDirect3DDeviceImpl_CreateHandle(device);

2
dlls/ddraw/viewport.c
View file

@ -310,7 +310,7 @@ IDirect3DViewportImpl_SetViewport(IDirect3DViewport3 *iface,
IDirect3DDevice3_GetCurrentViewport(ICOM_INTERFACE(This->active_device, IDirect3DDevice3), &current_viewport);
if (ICOM_OBJECT(IDirect3DViewportImpl, IDirect3DViewport3, current_viewport) == This)
This->activate(This);
IDirect3DViewport3_Release(current_viewport);
if(current_viewport) IDirect3DViewport3_Release(current_viewport);
}
return DD_OK;