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

Do not return an error when setting a material to NULL.

Browse Source 
Fixed access to d3d private data.
This commit is contained in:
Christian Costa 2004-03-23 23:02:37 +00:00 committed by Alexandre Julliard
parent 4a8f7b23ad
commit a501ea73ea
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ddraw/d3ddevice/mesa.c
View File

@ -787,8 +787,7 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
TRACE(" activating material %p.\n", mat); TRACE(" activating material %p.\n", mat);
mat->activate(mat); mat->activate(mat);
} else { } else {
ERR(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n"); FIXME(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n");
return DDERR_INVALIDPARAMS;
} }
} else if (dwLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) { } else if (dwLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) {
switch (dwLightState) { switch (dwLightState) {

2
dlls/ddraw/d3dexecutebuffer.c
View File

@ -197,7 +197,7 @@ static void execute(IDirect3DExecuteBufferImpl *This,
if (mat != NULL) { if (mat != NULL) {
mat->activate(mat); mat->activate(mat);
} else { } else {
ERR(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n"); FIXME(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n");
} }
} }
else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) { else if (ci->u1.dlstLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) {

2
dlls/ddraw/d3dlight.c
View File

@ -194,7 +194,7 @@ GL_IDirect3DLightImpl_1_Release(LPDIRECT3DLIGHT iface)
TRACE("(%p/%p)->() decrementing from %lu.\n", This, iface, This->ref); TRACE("(%p/%p)->() decrementing from %lu.\n", This, iface, This->ref);
if (!--(This->ref)) { if (!--(This->ref)) {
((IDirect3DGLImpl *) This->d3d)->light_released(This->d3d, glThis->light_num); ((IDirect3DGLImpl *) This->d3d->d3d_private)->light_released(This->d3d, glThis->light_num);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
return 0; return 0;
} }

4
dlls/ddraw/direct3d/mesa.c
View File

@ -82,7 +82,7 @@ GL_IDirect3DImpl_3_2T_1T_CreateLight(LPDIRECT3D3 iface,
IUnknown* pUnkOuter) IUnknown* pUnkOuter)
{ {
ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface); ICOM_THIS_FROM(IDirectDrawImpl, IDirect3D3, iface);
IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This; IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This->d3d_private;
int fl; int fl;
IDirect3DLightImpl *d3dlimpl; IDirect3DLightImpl *d3dlimpl;
HRESULT ret_value; HRESULT ret_value;
@ -292,7 +292,7 @@ GL_IDirect3DImpl_7_3T_CreateVertexBuffer(LPDIRECT3D7 iface,
static void light_released(IDirectDrawImpl *This, GLenum light_num) static void light_released(IDirectDrawImpl *This, GLenum light_num)
{ {
IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This; IDirect3DGLImpl *glThis = (IDirect3DGLImpl *) This->d3d_private;
glThis->free_lights |= (light_num - GL_LIGHT0); glThis->free_lights |= (light_num - GL_LIGHT0);
} }