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

ddraw: Don't return an error when setting a 0 material handle in d3d_device3_SetLightState().

Browse source
This commit is contained in:
Henri Verbeet 2014-04-29 10:41:06 +02:00 committed by Alexandre Julliard
parent 77da84b06a
commit 56d7e3b9a7
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/ddraw/device.c
View file

@ -2945,16 +2945,19 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface,
wined3d_mutex_lock();
if (state == D3DLIGHTSTATE_MATERIAL)
{
struct d3d_material *m = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_MATERIAL);
if (!m)
if (value)
{
WARN("Invalid material handle.\n");
wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS;
}
struct d3d_material *m;
TRACE(" activating material %p.\n", m);
material_activate(m);
if (!(m = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_MATERIAL)))
{
WARN("Invalid material handle.\n");
wined3d_mutex_unlock();
return DDERR_INVALIDPARAMS;
}
material_activate(m);
}
device->material = value;
}