From 4a078c837650beb53c6bcdadebe3fdc4facbf85a Mon Sep 17 00:00:00 2001
From: Lionel Ulmer <lionel.ulmer@free.fr>
Date: Sun, 9 Nov 2003 01:21:25 +0000
Subject: [PATCH] Fix some stupid bug with missing braces.

---
 dlls/ddraw/d3ddevice/mesa.c | 12 ++++++++----
 dlls/ddraw/d3dmaterial.c    | 20 +++++++++-----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index 2d9a0ae5016..12539ad43f4 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -765,17 +765,20 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
     
     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 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
 	       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 @@ GL_IDirect3DDeviceImpl_3_2T_SetLightState(LPDIRECT3DDEVICE3 iface,
 		rs = D3DRENDERSTATE_COLORVERTEX;
 		break;
 	    default:
-		break;
+		ERR("Unknown D3DLIGHTSTATETYPE %d.\n", dwLightStateType);
+		return DDERR_INVALIDPARAMS;
 	}
 
 	IDirect3DDevice7_SetRenderState(ICOM_INTERFACE(This, IDirect3DDevice7),
diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c
index ab9eaa13dff..6d3031a6216 100644
--- a/dlls/ddraw/d3dmaterial.c
+++ b/dlls/ddraw/d3dmaterial.c
@@ -309,17 +309,15 @@ static void activate(IDirect3DMaterialImpl* This) {
 		 (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__)