Changelog:
- fix some stupid bug with missing braces
(I really must do too much Python to write code like that :-) )
Lionel
--
Lionel Ulmer - http://www.bbrox.org/
--- dlls/ddraw_CVS/d3ddevice/mesa.c Wed Oct 29 22:43:00 2003
+++ dlls/ddraw/d3ddevice/mesa.c Sat Nov 8 23:48:27 2003
@@ -765,17 +765,20 @@
TRACE("(%p/%p)->(%08x,%08lx)\n", This, iface, dwLightStateType, dwLightState);
- if (!dwLightStateType && (dwLightStateType > D3DLIGHTSTATE_COLORVERTEX))
+ if (!dwLightStateType && (dwLightStateType > D3DLIGHTSTATE_COLORVERTEX)) {
TRACE("Unexpected Light State Type\n");
return DDERR_INVALIDPARAMS;
+ }
if (dwLightStateType == D3DLIGHTSTATE_MATERIAL /* 1 */) {
IDirect3DMaterialImpl *mat = (IDirect3DMaterialImpl *) dwLightState;
if (mat != NULL) {
+ TRACE(" activating material %p.\n", mat);
mat->activate(mat);
} else {
ERR(" D3DLIGHTSTATE_MATERIAL called with NULL material !!!\n");
+ return DDERR_INVALIDPARAMS;
}
} else if (dwLightStateType == D3DLIGHTSTATE_COLORMODEL /* 3 */) {
switch (dwLightState) {
@@ -784,15 +787,15 @@
break;
case D3DCOLOR_RGB:
/* We are already in this mode */
+ TRACE("Setting color model to RGB (no-op).\n");
break;
default:
ERR("Unknown color model!\n");
- break;
+ return DDERR_INVALIDPARAMS;
}
} else {
D3DRENDERSTATETYPE rs;
switch (dwLightStateType) {
-
case D3DLIGHTSTATE_AMBIENT: /* 2 */
rs = D3DRENDERSTATE_AMBIENT;
break;
@@ -812,7 +815,8 @@
rs = D3DRENDERSTATE_COLORVERTEX;
break;
default:
- break;
+ ERR("Unknown D3DLIGHTSTATETYPE %d.\n", dwLightStateType);
+ return DDERR_INVALIDPARAMS;
}
IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7),
--- dlls/ddraw_CVS/d3dmaterial.c Sat Sep 6 14:09:45 2003
+++ dlls/ddraw/d3dmaterial.c Sat Nov 8 23:41:25 2003
@@ -309,17 +309,15 @@
(float *) &(This->mat.u3.emissive));
LEAVE_GL();
- if (TRACE_ON(ddraw)) {
- DPRINTF(" - size : %ld\n", This->mat.dwSize);
- DPRINTF(" - diffuse : "); dump_D3DCOLORVALUE(&(This->mat.u.diffuse)); DPRINTF("\n");
- DPRINTF(" - ambient : "); dump_D3DCOLORVALUE(&(This->mat.u1.ambient)); DPRINTF("\n");
- DPRINTF(" - specular: "); dump_D3DCOLORVALUE(&(This->mat.u2.specular)); DPRINTF("\n");
- DPRINTF(" - emissive: "); dump_D3DCOLORVALUE(&(This->mat.u3.emissive)); DPRINTF("\n");
- DPRINTF(" - power : %f\n", This->mat.u4.power);
- DPRINTF(" - texture handle : %08lx\n", (DWORD)This->mat.hTexture);
- }
-
- return ;
+ if (TRACE_ON(ddraw)) {
+ DPRINTF(" - size : %ld\n", This->mat.dwSize);
+ DPRINTF(" - diffuse : "); dump_D3DCOLORVALUE(&(This->mat.u.diffuse)); DPRINTF("\n");
+ DPRINTF(" - ambient : "); dump_D3DCOLORVALUE(&(This->mat.u1.ambient)); DPRINTF("\n");
+ DPRINTF(" - specular: "); dump_D3DCOLORVALUE(&(This->mat.u2.specular)); DPRINTF("\n");
+ DPRINTF(" - emissive: "); dump_D3DCOLORVALUE(&(This->mat.u3.emissive)); DPRINTF("\n");
+ DPRINTF(" - power : %f\n", This->mat.u4.power);
+ DPRINTF(" - texture handle : %08lx\n", (DWORD)This->mat.hTexture);
+ }
}
#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
