From 0777353232fd2d7b6e03fadd1c3eaedd5b808ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sat, 24 Nov 2007 15:31:50 +0000 Subject: [PATCH] Remove YDEBUG define support, replaced by DEBUGCHANNEL environment variable Syntax: set DEBUGCHANNEL = [[fixme|err|warn|trace]+|-{channel}|all]* svn path=/trunk/; revision=30722 --- reactos/base/system/winlogon/sas.c | 1 - reactos/base/system/winlogon/screensaver.c | 1 - reactos/base/system/winlogon/setup.c | 1 - reactos/base/system/winlogon/winlogon.c | 1 - reactos/base/system/winlogon/wlx.c | 1 - reactos/dll/win32/kernel32/file/lock.c | 1 - reactos/dll/win32/msgina/gui.c | 1 - reactos/dll/win32/msgina/msgina.c | 1 - reactos/dll/win32/msgina/tui.c | 1 - reactos/dll/win32/newdev/newdev.c | 1 - reactos/dll/win32/shell32/drive.c | 1 - reactos/dll/win32/shell32/fprop.c | 1 - reactos/dll/win32/shell32/recyclebin.c | 1 - reactos/dll/win32/shell32/she_ocmenu.c | 1 - reactos/dll/win32/shell32/shv_bg_cmenu.c | 1 - reactos/dll/win32/shell32/shv_item_cmenu.c | 1 - reactos/dll/win32/shell32/shv_item_new.c | 1 - reactos/dll/win32/shell32/startmenu.c | 1 - reactos/dll/win32/user32/windows/spy.c | 1 - reactos/include/reactos/wine/debug.h | 4 ---- 20 files changed, 23 deletions(-) diff --git a/reactos/base/system/winlogon/sas.c b/reactos/base/system/winlogon/sas.c index 32049c38ea1..8a4b414831c 100644 --- a/reactos/base/system/winlogon/sas.c +++ b/reactos/base/system/winlogon/sas.c @@ -13,7 +13,6 @@ #include "winlogon.h" -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(winlogon); diff --git a/reactos/base/system/winlogon/screensaver.c b/reactos/base/system/winlogon/screensaver.c index 8dc3c061c47..43737dbdb01 100644 --- a/reactos/base/system/winlogon/screensaver.c +++ b/reactos/base/system/winlogon/screensaver.c @@ -10,7 +10,6 @@ #include "winlogon.h" -#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(winlogon); diff --git a/reactos/base/system/winlogon/setup.c b/reactos/base/system/winlogon/setup.c index 03a89a1bd42..8ec5d5b7df6 100644 --- a/reactos/base/system/winlogon/setup.c +++ b/reactos/base/system/winlogon/setup.c @@ -10,7 +10,6 @@ #include "winlogon.h" -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(winlogon); diff --git a/reactos/base/system/winlogon/winlogon.c b/reactos/base/system/winlogon/winlogon.c index 231250a74e9..f9aebff2a5e 100644 --- a/reactos/base/system/winlogon/winlogon.c +++ b/reactos/base/system/winlogon/winlogon.c @@ -12,7 +12,6 @@ #include "winlogon.h" -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(winlogon); diff --git a/reactos/base/system/winlogon/wlx.c b/reactos/base/system/winlogon/wlx.c index 38545d84959..86065decc8f 100644 --- a/reactos/base/system/winlogon/wlx.c +++ b/reactos/base/system/winlogon/wlx.c @@ -12,7 +12,6 @@ #include "winlogon.h" -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(winlogon); diff --git a/reactos/dll/win32/kernel32/file/lock.c b/reactos/dll/win32/kernel32/file/lock.c index f6fa2308bdf..8dc5f72c23c 100644 --- a/reactos/dll/win32/kernel32/file/lock.c +++ b/reactos/dll/win32/kernel32/file/lock.c @@ -15,7 +15,6 @@ #include -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(kernel32); diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c index 0e73a1812a2..31fa46d7647 100644 --- a/reactos/dll/win32/msgina/gui.c +++ b/reactos/dll/win32/msgina/gui.c @@ -7,7 +7,6 @@ #include "msgina.h" -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(msgina); diff --git a/reactos/dll/win32/msgina/msgina.c b/reactos/dll/win32/msgina/msgina.c index fa0ee3106da..c3de530092a 100644 --- a/reactos/dll/win32/msgina/msgina.c +++ b/reactos/dll/win32/msgina/msgina.c @@ -26,7 +26,6 @@ #include "msgina.h" -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(msgina); diff --git a/reactos/dll/win32/msgina/tui.c b/reactos/dll/win32/msgina/tui.c index e66b57575ee..2a88388cf52 100644 --- a/reactos/dll/win32/msgina/tui.c +++ b/reactos/dll/win32/msgina/tui.c @@ -7,7 +7,6 @@ #include "msgina.h" -#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(msgina); diff --git a/reactos/dll/win32/newdev/newdev.c b/reactos/dll/win32/newdev/newdev.c index 9b157fdbad5..bde466706f2 100644 --- a/reactos/dll/win32/newdev/newdev.c +++ b/reactos/dll/win32/newdev/newdev.c @@ -19,7 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -//#define YDEBUG #include "newdev_private.h" WINE_DEFAULT_DEBUG_CHANNEL(newdev); diff --git a/reactos/dll/win32/shell32/drive.c b/reactos/dll/win32/shell32/drive.c index bb300cbd33d..1fd5c52358d 100644 --- a/reactos/dll/win32/shell32/drive.c +++ b/reactos/dll/win32/shell32/drive.c @@ -20,7 +20,6 @@ #include "config.h" #include "wine/port.h" -//#define YDEBUG #define LARGEINT_PROTOS #define LargeIntegerDivide RtlLargeIntegerDivide #define ExtendedIntegerMultiply RtlExtendedIntegerMultiply diff --git a/reactos/dll/win32/shell32/fprop.c b/reactos/dll/win32/shell32/fprop.c index 367a1fd1238..c8f016e13a3 100644 --- a/reactos/dll/win32/shell32/fprop.c +++ b/reactos/dll/win32/shell32/fprop.c @@ -20,7 +20,6 @@ #define COBJMACROS #define NONAMELESSUNION -//#define YDEBUG #include "config.h" #include "wine/port.h" diff --git a/reactos/dll/win32/shell32/recyclebin.c b/reactos/dll/win32/shell32/recyclebin.c index 52770f6aef9..4964baf8547 100644 --- a/reactos/dll/win32/shell32/recyclebin.c +++ b/reactos/dll/win32/shell32/recyclebin.c @@ -19,7 +19,6 @@ */ #include "config.h" -//#define YDEBUG #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/reactos/dll/win32/shell32/she_ocmenu.c b/reactos/dll/win32/shell32/she_ocmenu.c index a0eef271513..ca5167f7e36 100644 --- a/reactos/dll/win32/shell32/she_ocmenu.c +++ b/reactos/dll/win32/shell32/she_ocmenu.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG #include "winerror.h" #include "wine/debug.h" diff --git a/reactos/dll/win32/shell32/shv_bg_cmenu.c b/reactos/dll/win32/shell32/shv_bg_cmenu.c index e20940b1c92..a6881fff31c 100644 --- a/reactos/dll/win32/shell32/shv_bg_cmenu.c +++ b/reactos/dll/win32/shell32/shv_bg_cmenu.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG #include "wine/debug.h" #include "windef.h" diff --git a/reactos/dll/win32/shell32/shv_item_cmenu.c b/reactos/dll/win32/shell32/shv_item_cmenu.c index 8447871cf3e..a6790662967 100644 --- a/reactos/dll/win32/shell32/shv_item_cmenu.c +++ b/reactos/dll/win32/shell32/shv_item_cmenu.c @@ -23,7 +23,6 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG #include "winerror.h" #include "wine/debug.h" diff --git a/reactos/dll/win32/shell32/shv_item_new.c b/reactos/dll/win32/shell32/shv_item_new.c index 289aa272950..baac562daad 100644 --- a/reactos/dll/win32/shell32/shv_item_new.c +++ b/reactos/dll/win32/shell32/shv_item_new.c @@ -11,7 +11,6 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT -//#define YDEBUG #include "wine/debug.h" #include "windef.h" diff --git a/reactos/dll/win32/shell32/startmenu.c b/reactos/dll/win32/shell32/startmenu.c index 8e0976e6ebd..ce56362243b 100644 --- a/reactos/dll/win32/shell32/startmenu.c +++ b/reactos/dll/win32/shell32/startmenu.c @@ -20,7 +20,6 @@ #define COBJMACROS -//#define YDEBUG #include "wine/debug.h" #include "windef.h" diff --git a/reactos/dll/win32/user32/windows/spy.c b/reactos/dll/win32/user32/windows/spy.c index 3c24d5683e3..f4d14e4766f 100644 --- a/reactos/dll/win32/user32/windows/spy.c +++ b/reactos/dll/win32/user32/windows/spy.c @@ -24,7 +24,6 @@ #include #include -//#define YDEBUG #include WINE_DEFAULT_DEBUG_CHANNEL(message); diff --git a/reactos/include/reactos/wine/debug.h b/reactos/include/reactos/wine/debug.h index 49a6b18a8dc..fe35611a5f1 100644 --- a/reactos/include/reactos/wine/debug.h +++ b/reactos/include/reactos/wine/debug.h @@ -49,11 +49,7 @@ enum __wine_debug_class __WINE_DBCL_TRACE = 3, /* 0x8 */ /* lazy init flag */ -#ifdef YDEBUG - __WINE_DBCL_INIT = 0xf -#else __WINE_DBCL_INIT = 0x7 -#endif }; struct __wine_debug_channel