Removed debugstr.h.

dlls/avifil32/avifile.c

@@ -11,7 +11,6 @@
 #include "driver.h"
 #include "mmsystem.h"
 #include "winerror.h"
-#include "debugstr.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(avifile)

dlls/ntdll/misc.c

@@ -5,11 +5,10 @@
 
 #include "config.h"
 
-#include "debugstr.h"
 #include "debugtools.h"
 #include "ntdll_misc.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll)
+DEFAULT_DEBUG_CHANNEL(ntdll);
 
 void dump_ObjectAttributes (POBJECT_ATTRIBUTES oa)
 {

dlls/ntdll/nt.c

@@ -11,13 +11,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "debugstr.h"
 #include "debugtools.h"
 
 #include "ntddk.h"
 #include "ntdll_misc.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll)
+DEFAULT_DEBUG_CHANNEL(ntdll);
 
 /*
  *	Timer object

dlls/ntdll/sec.c

@@ -16,7 +16,6 @@
 #include "file.h"
 #include "heap.h"
 #include "winnls.h"
-#include "debugstr.h"
 #include "debugtools.h"
 #include "winerror.h"
 #include "stackframe.h"
@@ -24,7 +23,7 @@
 #include "ntddk.h"
 #include "winreg.h"
 
-DEFAULT_DEBUG_CHANNEL(ntdll)
+DEFAULT_DEBUG_CHANNEL(ntdll);
 
 #define NT_SUCCESS(status) (status == STATUS_SUCCESS)
 

dlls/ntdll/sync.c

@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "debugstr.h"
 #include "debugtools.h"
 
 #include "winerror.h"

if1632/snoop.c

@@ -14,10 +14,9 @@
 #include "stackframe.h"
 #include "builtin16.h"
 #include "snoop.h"
-#include "debugstr.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(snoop)
+DEFAULT_DEBUG_CHANNEL(snoop);
 
 #ifdef __i386__
 

include/debugstr.h

-#ifndef __WINE_DEBUGSTR_H
-#define __WINE_DEBUGSTR_H
-
-#include "windef.h"
-
-/* These function return a printable version of a string, including
-   quotes.  The string will be valid for some time, but not indefinitely
-   as strings are re-used.  */
-struct _GUID;
-
-extern LPSTR debugstr_an (LPCSTR s, int n);
-extern LPSTR debugstr_a (LPCSTR s);
-extern LPSTR debugstr_wn (LPCWSTR s, int n);
-extern LPSTR debugstr_w (LPCWSTR s);
-extern LPSTR debugres_a (LPCSTR res);
-extern LPSTR debugres_w (LPCWSTR res);
-extern LPSTR debugstr_guid( const struct _GUID *id );
-extern void debug_dumpstr (LPCSTR s);
-extern LPSTR debugstr_hex_dump (const void *ptr, int len);
-
-#ifdef __GNUC__
-extern int dbg_printf(const char *format, ...) __attribute__((format (printf,1,2)));
-#else
-extern int dbg_printf(const char *format, ...);
-#endif
-
-
-#endif /* __WINE_DEBUGSTR_H */

libtest/vartest.c

@@ -57,7 +57,7 @@
 #include <windef.h>
 
 #ifdef __unix__
-#include <debugstr.h>
+#include <debugtools.h>
 extern LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
 #endif
 

loader/resource.c

@@ -30,11 +30,10 @@
 #include "debugtools.h"
 #include "libres.h"
 #include "winerror.h"
-#include "debugstr.h"
 #include "winnls.h"
 
-DEFAULT_DEBUG_CHANNEL(resource)
-DECLARE_DEBUG_CHANNEL(accel)
+DEFAULT_DEBUG_CHANNEL(resource);
+DECLARE_DEBUG_CHANNEL(accel);
 
 extern WORD WINE_LanguageId;
 

objects/text.c

@@ -16,9 +16,8 @@
 #include "heap.h"
 #include "debugtools.h"
 #include "cache.h"
-#include "debugstr.h"
 
-DEFAULT_DEBUG_CHANNEL(text)
+DEFAULT_DEBUG_CHANNEL(text);
 
 #define TAB     9
 #define LF     10

relay32/relay386.c

@@ -12,11 +12,10 @@
 #include "selectors.h"
 #include "stackframe.h"
 #include "syslevel.h"
-#include "debugstr.h"
 #include "main.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(relay)
+DEFAULT_DEBUG_CHANNEL(relay);
 
 char **debug_relay_excludelist = NULL, **debug_relay_includelist = NULL;
 

relay32/snoop.c

@@ -17,10 +17,9 @@
 #include "peexe.h"
 #include "selectors.h"
 #include "stackframe.h"
-#include "debugstr.h"
 #include "debugtools.h"
 
-DEFAULT_DEBUG_CHANNEL(snoop)
+DEFAULT_DEBUG_CHANNEL(snoop);
 
 char **debug_snoop_excludelist = NULL, **debug_snoop_includelist = NULL;
 

relay32/utthunk.c

@@ -12,9 +12,8 @@
 #include "callback.h"
 #include "process.h"
 #include "debugtools.h"
-#include "debugstr.h"
 
-DEFAULT_DEBUG_CHANNEL(thunk)
+DEFAULT_DEBUG_CHANNEL(thunk);
 
 #include "pshpack1.h"
 

win32/newfns.c

@@ -14,10 +14,9 @@ at a later date. */
 #include "winerror.h"
 #include "heap.h"
 #include "debugtools.h"
-#include "debugstr.h"
 
-DEFAULT_DEBUG_CHANNEL(win32)
-DECLARE_DEBUG_CHANNEL(debug)
+DEFAULT_DEBUG_CHANNEL(win32);
+DECLARE_DEBUG_CHANNEL(debug);
 
 
 /****************************************************************************

windows/msgbox.c

@@ -12,7 +12,6 @@
 #include "heap.h"
 #include "ldt.h"
 #include "debugtools.h"
-#include "debugstr.h"
 #include "tweak.h"
 
 DEFAULT_DEBUG_CHANNEL(dialog)