- start of support for device locking / unlocking via glReadPixels /

dlls/ddraw/d3dviewport.c

@@ -438,7 +438,7 @@ GL_IDirect3DViewportImpl_3_Clear2(LPDIRECT3DVIEWPORT3 iface,
 		     ((dwColor >>  8) & 0xFF) / 255.0,
 		     ((dwColor >>  0) & 0xFF) / 255.0,
 		     ((dwColor >> 24) & 0xFF) / 255.0);
-	TRACE("Color value (ARGB) : %08lx", dwColor);
+	TRACE("Color value (ARGB) : %08lx\n", dwColor);
     }
     
     glClear(bitfield);

dlls/ddraw/ddraw_private.h

@@ -368,4 +368,28 @@ extern void DDRAW_dump_cooperativelevel(DWORD cooplevel);
 extern void DDRAW_dump_lockflag(DWORD lockflag);
 extern void DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *in);
 extern void DDRAW_dump_DDCAPS(const DDCAPS *lpcaps);
+
+/* Used for generic dumping */
+typedef struct
+{
+    DWORD val;
+    const char* name;
+} flag_info;
+
+#define FE(x) { x, #x }
+
+typedef struct
+{
+    DWORD val;
+    const char* name;
+    void (*func)(const void *);
+    ptrdiff_t offset;
+} member_info;
+
+#define DDRAW_dump_flags(flags,names,num_names) DDRAW_dump_flags_(flags, names, num_names, 1)
+#define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) }
+
+extern void DDRAW_dump_flags_(DWORD flags, const flag_info* names, size_t num_names, int newline);
+extern void DDRAW_dump_members(DWORD flags, const void* data, const member_info* mems, size_t num_mems);
+
 #endif /* __WINE_DLLS_DDRAW_DDRAW_PRIVATE_H */

dlls/ddraw/helper.c

@@ -39,29 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
 /******************************************************************************
  *		debug output functions
  */
-typedef struct
-{
-    DWORD val;
-    const char* name;
-} flag_info;
-
-#define FE(x) { x, #x }
-
-typedef struct
-{
-    DWORD val;
-    const char* name;
-    void (*func)(const void *);
-    ptrdiff_t offset;
-} member_info;
-
-#define ME(x,f,e) { x, #x, (void (*)(const void *))(f), offsetof(STRUCT, e) }
-
-#define DDRAW_dump_flags(flags,names,num_names) \
-     DDRAW_dump_flags_(flags, names, num_names, 1)
-
-static void DDRAW_dump_flags_(DWORD flags, const flag_info* names,
-			     size_t num_names, int newline)
+void DDRAW_dump_flags_(DWORD flags, const flag_info* names,
+		       size_t num_names, int newline)
 {
     unsigned int	i;
 
@@ -74,8 +53,8 @@ static void DDRAW_dump_flags_(DWORD flags, const flag_info* names,
         DPRINTF("\n");
 }
 
-static void DDRAW_dump_members(DWORD flags, const void* data,
-			       const member_info* mems, size_t num_mems)
+void DDRAW_dump_members(DWORD flags, const void* data,
+			const member_info* mems, size_t num_mems)
 {
     unsigned int i;