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

ddraw: Handle refcount of lights when interacting with viewport.

Browse Source
This commit is contained in:
Christian Costa 2009-04-20 21:19:28 +02:00 committed by Alexandre Julliard
parent 8681d49030
commit ffb5f749d5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ddraw/viewport.c
View File

@ -751,6 +751,7 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface,
/* Add the light in the 'linked' chain */ /* Add the light in the 'linked' chain */
lpDirect3DLightImpl->next = This->lights; lpDirect3DLightImpl->next = This->lights;
This->lights = lpDirect3DLightImpl; This->lights = lpDirect3DLightImpl;
IDirect3DLight_AddRef(lpDirect3DLight);
/* Attach the light to the viewport */ /* Attach the light to the viewport */
lpDirect3DLightImpl->active_viewport = This; lpDirect3DLightImpl->active_viewport = This;
@ -796,6 +797,7 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface,
else prev_light->next = cur_light->next; else prev_light->next = cur_light->next;
/* Detach the light to the viewport */ /* Detach the light to the viewport */
cur_light->active_viewport = NULL; cur_light->active_viewport = NULL;
IDirect3DLight_Release( (IDirect3DLight *)cur_light );
This->num_lights--; This->num_lights--;
This->map_lights &= ~(1<<lpDirect3DLightImpl->dwLightIndex); This->map_lights &= ~(1<<lpDirect3DLightImpl->dwLightIndex);
LeaveCriticalSection(&ddraw_cs); LeaveCriticalSection(&ddraw_cs);
@ -871,6 +873,9 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface,
break; break;
} }
if (*lplpDirect3DLight)
IDirect3DLight_AddRef(*lplpDirect3DLight);
LeaveCriticalSection(&ddraw_cs); LeaveCriticalSection(&ddraw_cs);
return *lplpDirect3DLight ? D3D_OK : DDERR_INVALIDPARAMS; return *lplpDirect3DLight ? D3D_OK : DDERR_INVALIDPARAMS;