New debug scheme with explicit debug channels declaration.

console/generic.c

@@ -16,6 +16,8 @@
 #include "config.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(console)
+
 static void GENERIC_MoveLine(char row1, char row2, char col1, char col2);
 static void GENERIC_ClearLine(char row, char col1, char col2, int bgcolor,
    int attribute);

console/ncurses.c

@@ -24,6 +24,8 @@
 #include "debug.h"
 #include "options.h"
 
+DEFAULT_DEBUG_CHANNEL(console)
+
 #undef ERR /* Use ncurses's err() */
 #ifdef HAVE_NCURSES_H
 # include <ncurses.h>

console/xterm.c

@@ -21,6 +21,8 @@
 #include "options.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(console)
+
 char console_xterm_prog[80];
 
 static BOOL wine_create_console(FILE **master, FILE **slave, int *pid);

controls/combo.c

@@ -20,6 +20,8 @@
 #include "debug.h"
 #include "tweak.h"
 
+DEFAULT_DEBUG_CHANNEL(combo)
+
   /* bits in the dwKeyData */
 #define KEYDATA_ALT             0x2000
 #define KEYDATA_PREVSTATE       0x4000

controls/edit.c

@@ -22,6 +22,10 @@
 #include "callback.h"
 #include "tweak.h"
 
+DECLARE_DEBUG_CHANNEL(combo)
+DECLARE_DEBUG_CHANNEL(edit)
+DECLARE_DEBUG_CHANNEL(relay)
+
 #define BUFLIMIT_MULTI		65534	/* maximum buffer size (not including '\0')
 					   FIXME: BTW, new specs say 65535 (do you dare ???) */
 #define BUFLIMIT_SINGLE		32766	/* maximum buffer size (not including '\0') */

controls/listbox.c

@@ -17,6 +17,9 @@
 #include "debug.h"
 #include "tweak.h"
 
+DECLARE_DEBUG_CHANNEL(combo)
+DECLARE_DEBUG_CHANNEL(listbox)
+
 /* Unimplemented yet:
  * - LBS_NOSEL
  * - LBS_USETABSTOPS

controls/menu.c

@@ -32,6 +32,8 @@
 
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(menu)
+
 
 /* internal popup menu window messages */
 

controls/scroll.c

@@ -12,6 +12,8 @@
 #include "win.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(scroll)
+
 
 static HBITMAP hUpArrow = 0;
 static HBITMAP hDnArrow = 0;

controls/static.c

@@ -14,6 +14,8 @@
 #include "debug.h"
 #include "tweak.h"
 
+DEFAULT_DEBUG_CHANNEL(static)
+
 static void STATIC_PaintTextfn( WND *wndPtr, HDC hdc );
 static void STATIC_PaintRectfn( WND *wndPtr, HDC hdc );
 static void STATIC_PaintIconfn( WND *wndPtr, HDC hdc );

controls/uitools.c

@@ -8,6 +8,8 @@
 #include "wine/winuser16.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(graphics)
+
 static const WORD wPattern_AA55[8] = { 0xaaaa, 0x5555, 0xaaaa, 0x5555,
                                        0xaaaa, 0x5555, 0xaaaa, 0x5555 };
 

dlls/advapi32/crypt.c

@@ -6,6 +6,8 @@
 #include "wincrypt.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(advapi)
+
 /******************************************************************************
  * CryptAcquireContextA
  * Acquire a crypto provider context handle.

dlls/advapi32/eventlog.c

@@ -11,6 +11,8 @@
 
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(advapi)
+
 /******************************************************************************
  * BackupEventLog32A [ADVAPI32.15]
  */

dlls/advapi32/security.c

@@ -11,6 +11,9 @@
 #include "ntddk.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(advapi)
+DECLARE_DEBUG_CHANNEL(security)
+
 #define CallWin32ToNt(func) \
 	{ NTSTATUS ret; \
 	  ret = (func); \

dlls/advapi32/service.c

@@ -11,6 +11,8 @@
 #include "heap.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(advapi)
+
 /* FIXME: Where do these belong? */
 typedef DWORD	SERVICE_STATUS_HANDLE;
 typedef VOID (WINAPI *LPHANDLER_FUNCTION)( DWORD dwControl);

dlls/avifil32/avifile.c

@@ -14,6 +14,10 @@
 #include "debugstr.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(avifile)
+DECLARE_DEBUG_CHANNEL(msvideo)
+DECLARE_DEBUG_CHANNEL(relay)
+
 typedef struct IAVIStreamImpl {
 	/* IUnknown stuff */
 	ICOM_VTABLE(IAVIStream)*	lpvtbl;

dlls/comctl32/animate.c

@@ -19,6 +19,8 @@
 #include "animate.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(animate)
+
 #define ANIMATE_GetInfoPtr(hwnd) ((ANIMATE_INFO *)GetWindowLongA (hwnd, 0))
 
 

dlls/comctl32/comboex.c

@@ -21,6 +21,8 @@
 #include "comboex.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(comboex)
+
 #define ID_CB_EDIT    1001
 
 #define COMBOEX_GetInfoPtr(wndPtr) ((COMBOEX_INFO *)GetWindowLongA (hwnd, 0))

dlls/comctl32/comctl32undoc.c

@@ -22,6 +22,8 @@
 #include "heap.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(commctrl)
+
 
 extern HANDLE COMCTL32_hHeap; /* handle to the private heap */
 

dlls/comctl32/commctrl.c

@@ -33,6 +33,8 @@
 #include "debug.h"
 #include "winerror.h"
 
+DEFAULT_DEBUG_CHANNEL(commctrl)
+
 
 HANDLE COMCTL32_hHeap = (HANDLE)NULL;
 DWORD    COMCTL32_dwProcessesAttached = 0;

dlls/comctl32/datetime.c

@@ -19,6 +19,8 @@
 #include "datetime.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(datetime)
+
 
 #define DATETIME_GetInfoPtr(hwnd) ((DATETIME_INFO *)GetWindowLongA (hwnd, 0))
 

dlls/comctl32/draglist.c

@@ -15,6 +15,8 @@
 #include "commctrl.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(commctrl)
+
 
 BOOL WINAPI MakeDragList (HWND hwndLB)
 {

dlls/comctl32/flatsb.c

@@ -20,6 +20,9 @@
 #include "flatsb.h" 
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(commctrl)
+DECLARE_DEBUG_CHANNEL(datetime)
+
 
 #define FlatSB_GetInfoPtr(hwnd) ((FLATSB_INFO*)GetWindowLongA (hwnd, 0))
 

dlls/comctl32/header.c

@@ -26,6 +26,8 @@
 #include "header.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(header)
+
 
 #define __HDM_LAYOUT_HACK__
 

dlls/comctl32/hotkey.c

@@ -18,6 +18,8 @@
 #include "hotkey.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(hotkey)
+
 
 #define HOTKEY_GetInfoPtr(hwnd) ((HOTKEY_INFO *)GetWindowLongA (hwnd, 0))
 

dlls/comctl32/imagelist.c

@@ -36,6 +36,8 @@
 #include "commctrl.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(imagelist)
+
 
 #define _MAX(a,b) (((a)>(b))?(a):(b))
 #define _MIN(a,b) (((a)>(b))?(b):(a))

dlls/comctl32/ipaddress.c

@@ -29,6 +29,8 @@
 #include "heap.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(ipaddress)
+
 
 #define IPADDRESS_GetInfoPtr(hwnd) ((IPADDRESS_INFO *)GetWindowLongA (hwnd, 0))
 

dlls/comctl32/listview.c

@@ -53,6 +53,8 @@
 #include "listview.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(listview)
+
 /*
  * constants 
  */

dlls/comctl32/monthcal.c

@@ -19,6 +19,8 @@
 #include "monthcal.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(monthcal)
+
 
 #define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongA (hwnd, 0))
 

dlls/comctl32/nativefont.c

@@ -18,6 +18,8 @@
 #include "nativefont.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(nativefont)
+
 
 #define NATIVEFONT_GetInfoPtr(hwnd) ((NATIVEFONT_INFO *)GetWindowLongA (hwnd, 0))
 

dlls/comctl32/pager.c

@@ -18,6 +18,8 @@
 #include "pager.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(pager)
+
 
 #define PAGER_GetInfoPtr(hwnd) ((PAGER_INFO *)GetWindowLongA(hwnd, 0))
 

dlls/comctl32/progress.c

@@ -11,6 +11,8 @@
 #include "progress.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(progress)
+
 
 /* Control configuration constants */
 

dlls/comctl32/propsheet.c

@@ -14,6 +14,8 @@
 #include "propsheet.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(propsheet)
+
 
 LRESULT WINAPI
 PROPSHEET_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);

dlls/comctl32/rebar.c

@@ -26,6 +26,8 @@
 #include "sysmetrics.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(rebar)
+
 
 /* fDraw flags */
 #define DRAW_GRIPPER    1

dlls/comctl32/status.c

@@ -10,6 +10,8 @@
 #include "status.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(statusbar)
+
 /*
  * Run tests using Waite Group Windows95 API Bible Vol. 1&2
  * The second cdrom contains executables drawstat.exe,gettext.exe,

dlls/comctl32/tab.c

@@ -18,6 +18,8 @@
 #include "tab.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(tab)
+
 /******************************************************************************
  * Positioning constants
  */

dlls/comctl32/toolbar.c

@@ -35,6 +35,8 @@
 #include "toolbar.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(toolbar)
+
 /* #define __NEW_WRAP_CODE__ */
 
 #define SEPARATOR_WIDTH    8

dlls/comctl32/tooltips.c

@@ -21,6 +21,8 @@
 #include "tooltips.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(tooltips)
+
 #define ID_TIMERSHOW   1    /* show delay timer */
 #define ID_TIMERPOP    2    /* auto pop timer */
 #define ID_TIMERLEAVE  3    /* tool leave timer */

dlls/comctl32/trackbar.c

@@ -29,6 +29,8 @@
 #include "trackbar.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(trackbar)
+
 
 #define TRACKBAR_GetInfoPtr(wndPtr) ((TRACKBAR_INFO *)GetWindowLongA (hwnd,0))
 

dlls/comctl32/treeview.c

@@ -46,6 +46,8 @@
 #include "treeview.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(treeview)
+
 /* ffs should be in <string.h>. */
 
 /* Defines, since they do not need to return previous state, and nr

dlls/comctl32/updown.c

@@ -38,6 +38,8 @@
 #include "updown.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(updown)
+
 /* Control configuration constants */
 
 #define INITIAL_DELAY    500 /* initial timer until auto-increment kicks in */

dlls/commdlg/colordlg.c

@@ -22,6 +22,8 @@
 #include "winproc.h"
 #include "cderr.h"
 
+DEFAULT_DEBUG_CHANNEL(commdlg)
+
 /***********************************************************************
  *           ChooseColor   (COMMDLG.5)
  */

dlls/commdlg/filedlg.c

@@ -24,6 +24,8 @@
 #include "winproc.h"
 #include "cderr.h"
 
+DEFAULT_DEBUG_CHANNEL(commdlg)
+
 static HICON16 hFolder = 0;
 static HICON16 hFolder2 = 0;
 static HICON16 hFloppy = 0;

dlls/commdlg/finddlg.c

@@ -21,6 +21,8 @@
 #include "debug.h"
 #include "winproc.h"
 
+DEFAULT_DEBUG_CHANNEL(commdlg)
+
 
 /***********************************************************************
  *           FindText16   (COMMDLG.11)

dlls/commdlg/fontdlg.c

@@ -24,6 +24,8 @@
 #include "winproc.h"
 #include "cderr.h"
 
+DEFAULT_DEBUG_CHANNEL(commdlg)
+
 static HBITMAP16 hBitmapTT = 0; 
 
 

dlls/commdlg/generic.c

@@ -17,6 +17,8 @@
 #include "debug.h"
 #include "winproc.h"
 
+DEFAULT_DEBUG_CHANNEL(commdlg)
+
 
 #define COMDLG32_LAST_ERROR_NOT_ALLOCATED 0xF684F684
 static DWORD		COMDLG32_TlsIndex  = COMDLG32_LAST_ERROR_NOT_ALLOCATED;

dlls/commdlg/printdlg.c

@@ -23,6 +23,8 @@
 #include "winproc.h"
 #include "cderr.h"
 
+DEFAULT_DEBUG_CHANNEL(commdlg)
+
 /***********************************************************************
  *           PrintDlg16   (COMMDLG.20)
  */

dlls/imagehlp/access.c

@@ -12,6 +12,8 @@
 #include "debug.h"
 #include "imagehlp.h"
 
+DEFAULT_DEBUG_CHANNEL(imagehlp)
+
 /***********************************************************************
  *           Data
  */

dlls/imagehlp/debug.c

@@ -10,6 +10,8 @@
 #include "debug.h"
 #include "imagehlp.h"
 
+DEFAULT_DEBUG_CHANNEL(imagehlp)
+
 /***********************************************************************
  *           FindDebugInfoFile32 (IMAGEHLP.5)
  */

dlls/imagehlp/imagehlp_main.c

@@ -10,6 +10,8 @@
 #include "windef.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(imagehlp)
+
 /**********************************************************************/
 
 HANDLE IMAGEHLP_hHeap = (HANDLE) NULL;

dlls/imagehlp/integrity.c

@@ -10,6 +10,8 @@
 #include "imagehlp.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(imagehlp)
+
 /***********************************************************************
  *           ImageAddCertificate32 (IMAGEHLP.10)
  */

dlls/imagehlp/modify.c

@@ -10,6 +10,8 @@
 #include "debug.h"
 #include "imagehlp.h"
 
+DEFAULT_DEBUG_CHANNEL(imagehlp)
+
 /***********************************************************************
  *           BindImage32 (IMAGEHLP.1)
  */

dlls/imagehlp/symbol.c

@@ -10,6 +10,8 @@
 #include "debug.h"
 #include "imagehlp.h"
 
+DEFAULT_DEBUG_CHANNEL(imagehlp)
+
 /***********************************************************************
  *           SymCleanup32 (IMAGEHLP.37)
  */

dlls/msacm/msacm_main.c

@@ -9,6 +9,8 @@
 #include "msacm.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(msacm)
+
 /***********************************************************************
  *           ACMGETVERSION (MSACM.7)
  */

dlls/msacm32/driver.c

@@ -16,6 +16,8 @@
 #include "msacmdrv.h"
 #include "winreg.h"
 
+DEFAULT_DEBUG_CHANNEL(msacm)
+
 /***********************************************************************
  *           acmDriverAddA (MSACM32.2)
  */

dlls/msacm32/filter.c

@@ -11,6 +11,8 @@
 #include "msacmdrv.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(msacm)
+
 /***********************************************************************
  *           acmFilterChooseA (MSACM32.13)
  */

dlls/msacm32/format.c

@@ -12,6 +12,8 @@
 #include "msacm.h"
 #include "msacmdrv.h"
 
+DEFAULT_DEBUG_CHANNEL(msacm)
+
 /***********************************************************************
  *           acmFormatChooseA (MSACM32.23)
  */

dlls/msacm32/msacm32_main.c

@@ -12,6 +12,8 @@
 #include "msacmdrv.h"
 #include "winversion.h"
 
+DEFAULT_DEBUG_CHANNEL(msacm)
+
 /**********************************************************************/
 
 static DWORD MSACM_dwProcessesAttached = 0;

dlls/msacm32/stream.c

@@ -12,6 +12,8 @@
 #include "msacm.h"
 #include "msacmdrv.h"
 
+DEFAULT_DEBUG_CHANNEL(msacm)
+
 /***********************************************************************
  *           acmStreamClose (MSACM32.37)
  */

dlls/ntdll/file.c

@@ -4,6 +4,8 @@
 
 #include "ntddk.h"
 
+DEFAULT_DEBUG_CHANNEL(ntdll)
+
 /**************************************************************************
  *                 NtOpenFile				[NTDLL.127]
  * FUNCTION: Opens a file

dlls/ntdll/nt.c

@@ -15,6 +15,8 @@
 
 #include "ntddk.h"
 
+DEFAULT_DEBUG_CHANNEL(ntdll)
+
 /* move to winbase.h */
 typedef VOID (CALLBACK *PTIMERAPCROUTINE)(LPVOID lpArgToCompletionRoutine,DWORD dwTimerLowValue,DWORD dwTimerHighValue);   
 

dlls/ntdll/om.c

@@ -8,6 +8,8 @@
 
 #include "ntddk.h"
 
+DEFAULT_DEBUG_CHANNEL(ntdll)
+
 /* move to somewhere */
 typedef void * POBJDIR_INFORMATION;
 

dlls/ntdll/reg.c

@@ -7,6 +7,8 @@
 
 #include "ntddk.h"
 
+DEFAULT_DEBUG_CHANNEL(ntdll)
+
 
 /******************************************************************************
  * NtCreateKey [NTDLL]

dlls/ntdll/rtl.c

@@ -18,6 +18,8 @@
 #include "ntddk.h"
 #include "winreg.h"
 
+DEFAULT_DEBUG_CHANNEL(ntdll)
+
 
 /*
  *	resource functions

dlls/ntdll/rtlstr.c

@@ -18,6 +18,8 @@
 #include "debug.h"
 
 #include "ntddk.h"
+
+DEFAULT_DEBUG_CHANNEL(ntdll)
 /*
  *	STRING FUNCTIONS
  */

dlls/ntdll/sec.c

@@ -25,6 +25,8 @@
 #include "ntddk.h"
 #include "winreg.h"
 
+DEFAULT_DEBUG_CHANNEL(ntdll)
+
 /*
  *	SID FUNCTIONS
  */

dlls/ntdll/sync.c

@@ -10,6 +10,8 @@
 
 #include "ntddk.h"
 
+DEFAULT_DEBUG_CHANNEL(ntdll)
+
 /*
  *	Semaphore
  */

dlls/ntdll/time.c

@@ -8,11 +8,12 @@
  * 
  */
 
-#include <ntddk.h>
-
 #include <string.h>
-#include <debug.h>
-#include <file.h>
+#include "ntddk.h"
+#include "debug.h"
+#include "file.h"
+
+DEFAULT_DEBUG_CHANNEL(ntdll)
 
 #define TICKSPERSEC        10000000
 #define TICKSPERMSEC       10000

dlls/psapi/psapi_main.c

@@ -10,6 +10,8 @@
 #include "debug.h"
 #include "psapi.h"
 
+DEFAULT_DEBUG_CHANNEL(psapi)
+
 #include <string.h>
 
 /***********************************************************************

dlls/rasapi32/rasapi.c

@@ -8,6 +8,8 @@
 #include "ras.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(ras)
+
 /**************************************************************************
  *                 RasEnumConnections32A			[RASAPI32.544]
  */

dlls/shell32/brsfolder.c

@@ -23,6 +23,8 @@
 #include "pidl.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 #define		IDD_TREEVIEW 99
 
 static HWND		hwndTreeView;

dlls/shell32/classes.c

@@ -13,6 +13,8 @@
 #include "shlobj.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 BOOL HCR_MapTypeToValue ( LPCSTR szExtension, LPSTR szFileType, DWORD len)
 {	HKEY	hkey;
 

dlls/shell32/contmenu.c

@@ -16,6 +16,8 @@
 
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 /**************************************************************************
 *  IContextMenu Implementation
 */

dlls/shell32/dataobject.c

@@ -13,6 +13,8 @@
 #include "shell32_main.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 UINT cfShellIDList=0;
 UINT cfFileGroupDesc=0;
 UINT cfFileContents=0;

dlls/shell32/enumidlist.c

@@ -15,6 +15,8 @@
 #include "shlguid.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 typedef struct tagENUMLIST
 {
 	struct tagENUMLIST	*pNext;

dlls/shell32/folders.c

@@ -16,6 +16,8 @@
 #include "pidl.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 
 /***********************************************************************
 *   IExtractIconA implementation

dlls/shell32/iconcache.c

@@ -17,6 +17,8 @@
 #include "pidl.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 #pragma pack(1)
 
 typedef struct

dlls/shell32/pidl.c

@@ -24,6 +24,9 @@
 
 #include "pidl.h"
 
+DECLARE_DEBUG_CHANNEL(pidl)
+DECLARE_DEBUG_CHANNEL(shell)
+
 void pdump (LPCITEMIDLIST pidl)
 {	DWORD type;
 	CHAR * szData;

dlls/shell32/regstream.c

@@ -14,6 +14,8 @@
 #include "pidl.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 typedef struct 
 {	ICOM_VTABLE(IStream)* lpvtbl;
 	DWORD		ref;

dlls/shell32/shell32_main.c

@@ -27,6 +27,9 @@
 
 #include "shlguid.h"
 
+DECLARE_DEBUG_CHANNEL(exec)
+DECLARE_DEBUG_CHANNEL(shell)
+
 /*************************************************************************
  * CommandLineToArgvW			[SHELL32.7]
  */

dlls/shell32/shelllink.c

@@ -19,6 +19,8 @@
 #include "shell32_main.h"
 #include "shlguid.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 /* link file formats */
 
 #pragma (1);

dlls/shell32/shellole.c

@@ -25,6 +25,8 @@
 
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 /*************************************************************************
  *
  */

dlls/shell32/shellord.c

@@ -16,6 +16,8 @@
 #include "shlobj.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 /*************************************************************************
  * SHChangeNotifyRegister			[SHELL32.2]
  *

dlls/shell32/shellpath.c

@@ -13,6 +13,8 @@
 #include "shlobj.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 /*************************************************************************
  * PathIsRoot [SHELL32.29]
  */

dlls/shell32/shlfolder.c

@@ -21,6 +21,8 @@
 #include "wine/obj_shellfolder.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 /***************************************************************************
  * IDropTarget interface definition for the ShellFolder
  */

dlls/shell32/shlmenu.c

@@ -14,6 +14,8 @@
 
 #include "pidl.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 BOOL WINAPI FileMenu_DeleteAllItems (HMENU hMenu);
 
 /*************************************************************************

dlls/shell32/shlview.c

@@ -29,6 +29,8 @@
 #include "pidl.h"
 #include "shell32_main.h"
 
+DEFAULT_DEBUG_CHANNEL(shell)
+
 typedef struct 
 {	ICOM_VTABLE(IShellView)* lpvtbl;
 	DWORD		ref;

dlls/tapi32/assisted.c

@@ -9,6 +9,8 @@
 #include "tapi.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(tapi)
+
 DWORD WINAPI tapiGetLocationInfo(LPSTR lpszCountryCode, LPSTR lpszCityCode)
 {
     char temp[30];

dlls/tapi32/line.c

@@ -12,6 +12,9 @@
 #include "tapi.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(comm)
+DECLARE_DEBUG_CHANNEL(tapi)
+
 DWORD WINAPI lineAccept(HCALL hCall, LPCSTR lpsUserUserInfo, DWORD dwSize)
 {
     FIXME(tapi, "(%04x, %s, %ld): stub.\n", hCall, lpsUserUserInfo, dwSize);

dlls/tapi32/phone.c

@@ -9,6 +9,8 @@
 #include "tapi.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(tapi)
+
 static LPPHONE PHONE_Alloc(void)
 {
     return 0;

dlls/ver/ver16.c

@@ -10,6 +10,8 @@
 #include "ver.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(ver)
+
 
 /*************************************************************************
  * GetFileResourceSize16                     [VER.2]

dlls/version/info.c

@@ -17,6 +17,8 @@
 #include "ver.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(ver)
+
 
 /******************************************************************************
  *

dlls/version/install.c

@@ -18,6 +18,8 @@
 #include "xmalloc.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(ver)
+
 
 /******************************************************************************
  *

dlls/version/resource.c

@@ -19,6 +19,8 @@
 #include "peexe.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(ver)
+
 
 /***********************************************************************
  *           read_xx_header         [internal]

dlls/winaspi/winaspi16.c

@@ -17,6 +17,8 @@
 #include "selectors.h"
 #include "miscemu.h"
 
+DEFAULT_DEBUG_CHANNEL(aspi)
+
 
 /* FIXME!
  * 1) Residual byte length reporting not handled

dlls/wnaspi32/winaspi32.c

@@ -15,6 +15,8 @@
 #include "heap.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(aspi)
+
 
 /* FIXME!
  * 1) Residual byte length reporting not handled

files/directory.c

@@ -25,6 +25,9 @@
 #include "options.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(dosfs)
+DECLARE_DEBUG_CHANNEL(file)
+
 static DOS_FULL_NAME DIR_Windows;
 static DOS_FULL_NAME DIR_System;
 

files/dos_fs.c

@@ -33,6 +33,9 @@
 #include "options.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(dosfs)
+DECLARE_DEBUG_CHANNEL(file)
+
 /* Define the VFAT ioctl to get both short and long file names */
 /* FIXME: is it possible to get this to work on other systems? */
 #ifdef linux

files/drive.c

@@ -44,6 +44,9 @@
 #include "task.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(dosfs)
+DECLARE_DEBUG_CHANNEL(file)
+
 typedef struct
 {
     char     *root;      /* root dir in Unix format without trailing / */

files/file.c

@@ -46,6 +46,8 @@
 #include "server/request.h"
 #include "server.h"
 
+DEFAULT_DEBUG_CHANNEL(file)
+
 #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
 #define MAP_ANON MAP_ANONYMOUS
 #endif

files/profile.c

@@ -19,6 +19,8 @@
 #include "debug.h"
 #include "options.h"
 
+DEFAULT_DEBUG_CHANNEL(profile)
+
 typedef struct tagPROFILEKEY
 {
     char                  *name;