Module: wine Branch: master Commit: 0c15360a3e7222c94bb310f36de3adb5568895e0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c15360a3e7222c94bb310f3...
Author: Marcus Meissner marcus@jet.franken.de Date: Sun Sep 10 11:09:26 2006 +0200
Removes all unnecessary WINE_DEFAULT_DEBUG_CHANNEL and respective wine/debug.h includes.
---
dlls/cabinet/fci.c | 2 -- dlls/gdi/bidi.c | 2 +- dlls/gdi/enhmfdrv/bitblt.c | 2 -- dlls/gphoto2.ds/ui.c | 2 -- dlls/imagehlp/imagehlp_main.c | 2 -- dlls/kernel/atom.c | 4 ---- dlls/kernel/kernel16.c | 3 --- dlls/mscms/icc.c | 3 --- dlls/msi/tokenize.c | 3 --- dlls/msvcrt/ctype.c | 3 --- dlls/netapi32/browsr.c | 3 --- dlls/netapi32/nbnamecache.c | 3 --- dlls/ntdll/wcstring.c | 4 ---- dlls/rsaenh/implglue.c | 3 --- dlls/user/driver.c | 4 +--- dlls/user/lstr.c | 4 ---- dlls/uxtheme/stylemap.c | 4 ---- dlls/wineps.drv/encode.c | 3 --- dlls/winex11.drv/clipping.c | 3 --- dlls/winex11.drv/codepage.c | 3 --- dlls/winspool.drv/wspool.c | 2 -- dlls/wsock32/protocol.c | 3 --- 22 files changed, 2 insertions(+), 63 deletions(-)
diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 87e76d5..a43c681 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -64,8 +64,6 @@ #define fci_set_error(A,B,C) do { \ if (B) SetLastError(B); } while(0)
-WINE_DEFAULT_DEBUG_CHANNEL(cabinet); - typedef struct { cab_UBYTE signature[4]; /* !CAB for unfinished cabinets else MSCF */ cab_ULONG reserved1; diff --git a/dlls/gdi/bidi.c b/dlls/gdi/bidi.c index 80b930a..8109cf4 100644 --- a/dlls/gdi/bidi.c +++ b/dlls/gdi/bidi.c @@ -55,11 +55,11 @@ BOOL BIDI_Reorder( UINT *lpOrder /* [out] Logical -> Visual order map */ ) { -#ifdef HAVE_ICU TRACE("%s, %d, 0x%08lx lpOutString=%p, lpOrder=%p\n", debugstr_wn(lpString, uCount), uCount, dwFlags, lpOutString, lpOrder);
+#ifdef HAVE_ICU if ((dwFlags & GCP_REORDER) != 0) { UBiDi *bidi; UErrorCode err=0; diff --git a/dlls/gdi/enhmfdrv/bitblt.c b/dlls/gdi/enhmfdrv/bitblt.c index 8abe5a6..3c7e97c 100644 --- a/dlls/gdi/enhmfdrv/bitblt.c +++ b/dlls/gdi/enhmfdrv/bitblt.c @@ -28,8 +28,6 @@ #include "gdi.h" #include "enhmetafiledrv.h" #include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); - BOOL EMFDRV_PatBlt( PHYSDEV dev, INT left, INT top, INT width, INT height, DWORD rop ) { diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 88fa8fa..d6a488f 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -38,8 +38,6 @@ #include "gphoto2_i.h" #include "wine/debug.h" #include "resource.h"
-WINE_DEFAULT_DEBUG_CHANNEL(twain); - static HBITMAP static_bitmap;
static INT_PTR CALLBACK ConnectingProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) diff --git a/dlls/imagehlp/imagehlp_main.c b/dlls/imagehlp/imagehlp_main.c index d8707e5..42a1a41 100644 --- a/dlls/imagehlp/imagehlp_main.c +++ b/dlls/imagehlp/imagehlp_main.c @@ -26,8 +26,6 @@ #include "imagehlp.h" #include "winerror.h" #include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(imagehlp); - /**********************************************************************/ HANDLE IMAGEHLP_hHeap = NULL;
diff --git a/dlls/kernel/atom.c b/dlls/kernel/atom.c index 96c0bc4..f444ae0 100644 --- a/dlls/kernel/atom.c +++ b/dlls/kernel/atom.c @@ -38,10 +38,6 @@ #include "excpt.h" #include "wine/unicode.h" #include "kernel_private.h"
-#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atom); - #define MAX_ATOM_LEN 255
/****************************************************************** diff --git a/dlls/kernel/kernel16.c b/dlls/kernel/kernel16.c index b7b03d4..50b11a0 100644 --- a/dlls/kernel/kernel16.c +++ b/dlls/kernel/kernel16.c @@ -28,9 +28,6 @@ #include "wownt32.h" #include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(kernel);
/************************************************************************** * DllEntryPoint (KERNEL.669) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 70f8190..715a8ed 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -19,7 +19,6 @@ */
#include "config.h" -#include "wine/debug.h"
#include <stdarg.h>
@@ -34,8 +33,6 @@ #include "icm.h"
#include "mscms_priv.h"
-WINE_DEFAULT_DEBUG_CHANNEL(mscms); - #ifdef HAVE_LCMS
static inline void MSCMS_adjust_endianess32( ULONG *ptr ) diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index cf0fd63..18bb341 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -22,13 +22,10 @@ #include <stdlib.h>
#include "windef.h" #include "winbase.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "query.h" #include "sql.tab.h"
-WINE_DEFAULT_DEBUG_CHANNEL(msi); - /* ** All the keywords of the SQL language are stored as in a hash ** table composed of instances of the following structure. diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c index 9c23810..7b8c1fa 100644 --- a/dlls/msvcrt/ctype.c +++ b/dlls/msvcrt/ctype.c @@ -20,9 +20,6 @@
#include "msvcrt.h" #include "winnls.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
/* Some abbreviations to make the following table readable */ #define _C_ MSVCRT__CONTROL diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c index 4d33b6a..8b0a5ed 100644 --- a/dlls/netapi32/browsr.c +++ b/dlls/netapi32/browsr.c @@ -26,9 +26,6 @@ #include "winerror.h" #include "lmcons.h" #include "lmbrowsr.h" #include "lmshare.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
/************************************************************ * I_BrowserSetNetlogonState (NETAPI32.@) diff --git a/dlls/netapi32/nbnamecache.c b/dlls/netapi32/nbnamecache.c index 3868196..176105a 100644 --- a/dlls/netapi32/nbnamecache.c +++ b/dlls/netapi32/nbnamecache.c @@ -21,12 +21,9 @@
#include "config.h" #include "wine/port.h" -#include "wine/debug.h"
#include "nbnamecache.h"
-WINE_DEFAULT_DEBUG_CHANNEL(netbios); - typedef struct _NBNameCacheNode { DWORD expireTime; diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 6891258..23fc5e8 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -32,10 +32,6 @@ #include <stdio.h> #include "windef.h" #include "winternl.h" #include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -
/********************************************************************* * _wcsicmp (NTDLL.@) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 761eced..44c50f2 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -24,7 +24,6 @@ #include "config.h"
#include "wine/port.h" #include "wine/library.h" -#include "wine/debug.h"
#include "windef.h" #include "wincrypt.h" @@ -33,8 +32,6 @@ #include "implglue.h"
#include <stdio.h>
-WINE_DEFAULT_DEBUG_CHANNEL(crypt); - /* Function prototypes copied from dlls/advapi32/crypt_md4.c */ VOID WINAPI MD4Init( MD4_CTX *ctx ); VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len ); diff --git a/dlls/user/driver.c b/dlls/user/driver.c index 15f2e92..e9ffe5a 100644 --- a/dlls/user/driver.c +++ b/dlls/user/driver.c @@ -23,11 +23,9 @@ #include <stdio.h> #include "windef.h" #include "winbase.h" #include "winuser.h" - -#include "user_private.h" #include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(user); +#include "user_private.h"
static const USER_DRIVER null_driver, lazy_load_driver;
diff --git a/dlls/user/lstr.c b/dlls/user/lstr.c index 95d1922..dacca84 100644 --- a/dlls/user/lstr.c +++ b/dlls/user/lstr.c @@ -38,10 +38,6 @@ #include "wine/exception.h" #include "wine/unicode.h" #include "excpt.h"
-#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(resource); -
/*********************************************************************** * CharNextA (USER32.@) diff --git a/dlls/uxtheme/stylemap.c b/dlls/uxtheme/stylemap.c index 4be9819..a310d40 100644 --- a/dlls/uxtheme/stylemap.c +++ b/dlls/uxtheme/stylemap.c @@ -29,10 +29,6 @@ #include "tmschema.h"
#define TMT_ENUM 200
-#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); - typedef struct _MSSTYLES_PROPERTY_MAP { WORD dwPrimitiveType; WORD dwPropertyID; diff --git a/dlls/wineps.drv/encode.c b/dlls/wineps.drv/encode.c index 5fb129a..ede5cbd 100644 --- a/dlls/wineps.drv/encode.c +++ b/dlls/wineps.drv/encode.c @@ -22,9 +22,6 @@ #include <stdio.h> #include <string.h>
#include "psdrv.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf) { diff --git a/dlls/winex11.drv/clipping.c b/dlls/winex11.drv/clipping.c index 11e03f3..d26db99 100644 --- a/dlls/winex11.drv/clipping.c +++ b/dlls/winex11.drv/clipping.c @@ -23,9 +23,6 @@ #include "config.h" #include <stdio.h>
#include "x11drv.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
/*********************************************************************** * X11DRV_GetRegionData diff --git a/dlls/winex11.drv/codepage.c b/dlls/winex11.drv/codepage.c index 697b648..7611735 100644 --- a/dlls/winex11.drv/codepage.c +++ b/dlls/winex11.drv/codepage.c @@ -27,9 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" #include "x11font.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(text);
/*********************************************************************** * IsLegalDBCSChar for cp932/936/949/950/euc diff --git a/dlls/winspool.drv/wspool.c b/dlls/winspool.drv/wspool.c index ba7d1ff..27c39e6 100644 --- a/dlls/winspool.drv/wspool.c +++ b/dlls/winspool.drv/wspool.c @@ -28,9 +28,7 @@ #include "winbase.h" #include "wingdi.h" #include "winspool.h" #include "wspool.h" -#include "wine/debug.h"
-WINE_DEFAULT_DEBUG_CHANNEL(winspool); HINSTANCE WINSPOOL_hInstance = NULL;
/****************************************************************************** diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c index 0b22cc1..cd2cf71 100644 --- a/dlls/wsock32/protocol.c +++ b/dlls/wsock32/protocol.c @@ -38,9 +38,6 @@ #include "winbase.h" #include "winsock2.h"
#include "wine/unicode.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(winsock);
/***************************************************************************** * inet_network [WSOCK32.1100]