Added some TRACEs to the ddraw code.

dlls/ddraw/d3d_private.h

@@ -570,7 +570,7 @@ extern int d3d_OpenGL(LPD3DENUMDEVICESCALLBACK cb, LPVOID context) ;
 extern int is_OpenGL(REFCLSID rguid, IDirectDrawSurfaceImpl* surface, IDirect3DDevice2Impl** device, IDirect3D2Impl* d3d);
 
 
-extern void _dump_renderstate(D3DRENDERSTATETYPE type, DWORD value);
+extern const char *_get_renderstate(D3DRENDERSTATETYPE type);
 
 #define dump_mat(mat) \
     TRACE("%f %f %f %f\n", (mat)->_11, (mat)->_12, (mat)->_13, (mat)->_14); \

dlls/ddraw/d3dcommon.c

@@ -29,9 +29,9 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 
-void _dump_renderstate(D3DRENDERSTATETYPE type, DWORD value) {
-  char *states[] = {
-    NULL,
+const char *_get_renderstate(D3DRENDERSTATETYPE type) {
+  static const char * const states[] = {
+    "ERR",
     "D3DRENDERSTATE_TEXTUREHANDLE",
     "D3DRENDERSTATE_ANTIALIAS",
     "D3DRENDERSTATE_TEXTUREADDRESS",
@@ -117,5 +117,6 @@ void _dump_renderstate(D3DRENDERSTATETYPE type, DWORD value) {
     "D3DRENDERSTATE_STIPPLEPATTERN30",
     "D3DRENDERSTATE_STIPPLEPATTERN31"
   };
-  DPRINTF(" %s = 0x%08lx\n", states[type], value);
+  if (type >= (sizeof(states) / sizeof(states[0]))) return "ERR";
+  return states[type];
 }

dlls/ddraw/dsurface/main.c

@@ -924,9 +924,9 @@ Main_DirectDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect,
     /* First, copy the Surface description */
     DD_STRUCT_COPY_BYSIZE(pDDSD,&(This->surface_desc));
 
-    TRACE("locked surface: height=%ld, width=%ld, pitch=%ld\n",
-	  pDDSD->dwHeight,pDDSD->dwWidth,pDDSD->u1.lPitch);
-
+    TRACE("locked surface returning description : \n");
+    if (TRACE_ON(ddraw)) DDRAW_dump_surface_desc(pDDSD);
+    
     /* If asked only for a part, change the surface pointer.
      * (Not documented.) */
     if (prect != NULL) {

dlls/ddraw/mesa.c

@@ -37,7 +37,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
 {
 
   if (TRACE_ON(ddraw))
-    _dump_renderstate(dwRenderStateType, dwRenderState);
+    TRACE("%s = %08lx\n", _get_renderstate(dwRenderStateType), dwRenderState);
 
   /* First, all the stipple patterns */
   if ((dwRenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00) &&
@@ -269,7 +269,7 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType,
       break;
 
     default:
-      ERR("Unhandled dwRenderStateType %d!\n",dwRenderStateType);
+      ERR("Unhandled dwRenderStateType %s !\n", _get_renderstate(dwRenderStateType));
       break;
     }