[ros-diffs] [fireball] 22634: - Change user32 to Wine-compatible debug-print messages system. TRACE/FIXME/ERR and DPRINT/DPRINT1 are supported now in every file, however they are turned on in a different way: you have to place "#define YDEBUG" before #include <wine/debug.h> in order to get debug messages coming from this file - Give more space to user32.dll by changing preferred loading base

Author: fireball
Date: Mon Jun 26 17:16:43 2006
New Revision: 22634
URL: http://svn.reactos.org/svn/reactos?rev=22634&view=rev
Log:
- Change user32 to Wine-compatible debug-print messages system. TRACE/FIXME/ERR and
DPRINT/DPRINT1 are supported now in every file, however they are turned on in a different
way: you have to place "#define YDEBUG" before #include <wine/debug.h> in
order to get debug messages coming from this file
- Give more space to user32.dll by changing preferred loading base
Modified:
    trunk/reactos/baseaddress.rbuild
    trunk/reactos/dll/win32/user32/controls/button.c
    trunk/reactos/dll/win32/user32/controls/combo.c
    trunk/reactos/dll/win32/user32/controls/edit.c
    trunk/reactos/dll/win32/user32/controls/icontitle.c
    trunk/reactos/dll/win32/user32/controls/listbox.c
    trunk/reactos/dll/win32/user32/controls/regcontrol.c
    trunk/reactos/dll/win32/user32/controls/scrollbar.c
    trunk/reactos/dll/win32/user32/controls/static.c
    trunk/reactos/dll/win32/user32/include/user32.h
    trunk/reactos/dll/win32/user32/misc/dde.c
    trunk/reactos/dll/win32/user32/misc/ddeclient.c
    trunk/reactos/dll/win32/user32/misc/ddeserver.c
    trunk/reactos/dll/win32/user32/misc/desktop.c
    trunk/reactos/dll/win32/user32/misc/display.c
    trunk/reactos/dll/win32/user32/misc/dllmain.c
    trunk/reactos/dll/win32/user32/misc/exit.c
    trunk/reactos/dll/win32/user32/misc/exticon.c
    trunk/reactos/dll/win32/user32/misc/misc.c
    trunk/reactos/dll/win32/user32/misc/object.c
    trunk/reactos/dll/win32/user32/misc/resources.c
    trunk/reactos/dll/win32/user32/misc/strpool.c
    trunk/reactos/dll/win32/user32/misc/stubs.c
    trunk/reactos/dll/win32/user32/misc/timer.c
    trunk/reactos/dll/win32/user32/misc/winhelp.c
    trunk/reactos/dll/win32/user32/misc/winsta.c
    trunk/reactos/dll/win32/user32/misc/wsprintf.c
    trunk/reactos/dll/win32/user32/windows/accel.c
    trunk/reactos/dll/win32/user32/windows/bitmap.c
    trunk/reactos/dll/win32/user32/windows/caret.c
    trunk/reactos/dll/win32/user32/windows/class.c
    trunk/reactos/dll/win32/user32/windows/clipboard.c
    trunk/reactos/dll/win32/user32/windows/cursor.c
    trunk/reactos/dll/win32/user32/windows/dc.c
    trunk/reactos/dll/win32/user32/windows/defwnd.c
    trunk/reactos/dll/win32/user32/windows/dialog.c
    trunk/reactos/dll/win32/user32/windows/draw.c
    trunk/reactos/dll/win32/user32/windows/font.c
    trunk/reactos/dll/win32/user32/windows/hook.c
    trunk/reactos/dll/win32/user32/windows/icon.c
    trunk/reactos/dll/win32/user32/windows/input.c
    trunk/reactos/dll/win32/user32/windows/mdi.c
    trunk/reactos/dll/win32/user32/windows/menu.c
    trunk/reactos/dll/win32/user32/windows/message.c
    trunk/reactos/dll/win32/user32/windows/messagebox.c
    trunk/reactos/dll/win32/user32/windows/nonclient.c
    trunk/reactos/dll/win32/user32/windows/paint.c
    trunk/reactos/dll/win32/user32/windows/prop.c
    trunk/reactos/dll/win32/user32/windows/rect.c
    trunk/reactos/dll/win32/user32/windows/text.c
    trunk/reactos/dll/win32/user32/windows/window.c
    trunk/reactos/dll/win32/user32/windows/winpos.c
Modified: trunk/reactos/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=226…
==============================================================================
--- trunk/reactos/baseaddress.rbuild (original)
+++ trunk/reactos/baseaddress.rbuild Mon Jun 26 17:16:43 2006
@@ -119,7 +119,7 @@
   <property name="BASEADDRESS_OLE32" value="0x77a50000" />
   <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />
   <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
-  <property name="BASEADDRESS_USER32" value="0x77e50000" />
+  <property name="BASEADDRESS_USER32" value="0x77e40000" />
   <property name="BASEADDRESS_GDI32" value="0x77f10000" />
   <property name="BASEADDRESS_DNSAPI" value="0x77f30000" />
   <property name="BASEADDRESS_MSVCRT" value="0x78000000" />
Modified: trunk/reactos/dll/win32/user32/controls/button.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/button.c (original)
+++ trunk/reactos/dll/win32/user32/controls/button.c Mon Jun 26 17:16:43 2006
@@ -63,8 +63,9 @@
  *  - Button_SetImageList
  *  - Button_SetTextMargin
  */
-#define NDEBUG // turn off TRACEs
 #include <user32.h>
+
+#include <wine/debug.h>
 /* GetWindowLong offsets for window extra information */
 #define STATE_GWL_OFFSET  0
Modified: trunk/reactos/dll/win32/user32/controls/combo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/combo.c (original)
+++ trunk/reactos/dll/win32/user32/controls/combo.c Mon Jun 26 17:16:43 2006
@@ -33,9 +33,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
-
+
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(combo);
   /* bits in the dwKeyData */
Modified: trunk/reactos/dll/win32/user32/controls/edit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/edit.c (original)
+++ trunk/reactos/dll/win32/user32/controls/edit.c Mon Jun 26 17:16:43 2006
@@ -43,8 +43,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(edit);
 WINE_DECLARE_DEBUG_CHANNEL(combo);
Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/icontitle.c (original)
+++ trunk/reactos/dll/win32/user32/controls/icontitle.c Mon Jun 26 17:16:43 2006
@@ -19,6 +19,8 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
 #ifdef __REACTOS__
 #define MAKEINTATOMW(atom)  ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
Modified: trunk/reactos/dll/win32/user32/controls/listbox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/listbox.c (original)
+++ trunk/reactos/dll/win32/user32/controls/listbox.c Mon Jun 26 17:16:43 2006
@@ -19,8 +19,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* Start of hack section -------------------------------- */
Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/regcontrol.c (original)
+++ trunk/reactos/dll/win32/user32/controls/regcontrol.c Mon Jun 26 17:16:43 2006
@@ -10,6 +10,8 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
 static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
 {
Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/scrollbar.c (original)
+++ trunk/reactos/dll/win32/user32/controls/scrollbar.c Mon Jun 26 17:16:43 2006
@@ -31,8 +31,8 @@
 /* INCLUDES *******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* GLOBAL VARIABLES ***********************************************************/
Modified: trunk/reactos/dll/win32/user32/controls/static.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/…
==============================================================================
--- trunk/reactos/dll/win32/user32/controls/static.c (original)
+++ trunk/reactos/dll/win32/user32/controls/static.c Mon Jun 26 17:16:43 2006
@@ -43,6 +43,8 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(static);
Modified: trunk/reactos/dll/win32/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32.h (original)
+++ trunk/reactos/dll/win32/user32/include/user32.h Mon Jun 26 17:16:43 2006
@@ -32,7 +32,6 @@
 #include <win32k/callback.h>
 /* WINE Headers */
-#include <wine/debug.h>
 #include <wine/unicode.h>
 /* Internal User32 Headers */
Modified: trunk/reactos/dll/win32/user32/misc/dde.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/dde.c (original)
+++ trunk/reactos/dll/win32/user32/misc/dde.c Mon Jun 26 17:16:43 2006
@@ -24,8 +24,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
Modified: trunk/reactos/dll/win32/user32/misc/ddeclient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddec…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/ddeclient.c (original)
+++ trunk/reactos/dll/win32/user32/misc/ddeclient.c Mon Jun 26 17:16:43 2006
@@ -24,8 +24,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
Modified: trunk/reactos/dll/win32/user32/misc/ddeserver.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/ddes…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/ddeserver.c (original)
+++ trunk/reactos/dll/win32/user32/misc/ddeserver.c Mon Jun 26 17:16:43 2006
@@ -24,8 +24,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
Modified: trunk/reactos/dll/win32/user32/misc/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/desktop.c (original)
+++ trunk/reactos/dll/win32/user32/misc/desktop.c Mon Jun 26 17:16:43 2006
@@ -10,6 +10,8 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
 #define DESKTOP_CLASS_ATOM   MAKEINTATOMA(32769)  /* Desktop */
 static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM
lParam );
Modified: trunk/reactos/dll/win32/user32/misc/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/disp…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/display.c (original)
+++ trunk/reactos/dll/win32/user32/misc/display.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 #define SIZEOF_DEVMODEA_300 124
 #define SIZEOF_DEVMODEA_400 148
Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/dllmain.c (original)
+++ trunk/reactos/dll/win32/user32/misc/dllmain.c Mon Jun 26 17:16:43 2006
@@ -1,6 +1,6 @@
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 static ULONG User32TlsIndex;
 HINSTANCE User32Instance;
Modified: trunk/reactos/dll/win32/user32/misc/exit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exit…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/exit.c (original)
+++ trunk/reactos/dll/win32/user32/misc/exit.c Mon Jun 26 17:16:43 2006
@@ -8,6 +8,8 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
 /*
  * Sequence of events:
Modified: trunk/reactos/dll/win32/user32/misc/exticon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exti…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/exticon.c (original)
+++ trunk/reactos/dll/win32/user32/misc/exticon.c Mon Jun 26 17:16:43 2006
@@ -23,8 +23,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* Start of Hack section */
Modified: trunk/reactos/dll/win32/user32/misc/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/misc.c (original)
+++ trunk/reactos/dll/win32/user32/misc/misc.c Mon Jun 26 17:16:43 2006
@@ -29,6 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/misc/object.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/obje…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/object.c (original)
+++ trunk/reactos/dll/win32/user32/misc/object.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/misc/resources.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/resources.c (original)
+++ trunk/reactos/dll/win32/user32/misc/resources.c Mon Jun 26 17:16:43 2006
@@ -1,4 +1,6 @@
 #include <user32.h>
+
+#include <wine/debug.h>
 /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
           does not seem to work properly for stack address space. */
Modified: trunk/reactos/dll/win32/user32/misc/strpool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/strp…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/strpool.c (original)
+++ trunk/reactos/dll/win32/user32/misc/strpool.c Mon Jun 26 17:16:43 2006
@@ -1,6 +1,8 @@
 // strpool.c
 #include <user32.h>
+
+#include <wine/debug.h>
 typedef struct tagHEAP_STRING_POOLA
 {
Modified: trunk/reactos/dll/win32/user32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/user32/misc/stubs.c Mon Jun 26 17:16:43 2006
@@ -11,8 +11,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /*
  * @unimplemented
Modified: trunk/reactos/dll/win32/user32/misc/timer.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/time…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/timer.c (original)
+++ trunk/reactos/dll/win32/user32/misc/timer.c Mon Jun 26 17:16:43 2006
@@ -30,6 +30,7 @@
 #include <user32.h>
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/misc/winhelp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/winh…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/winhelp.c (original)
+++ trunk/reactos/dll/win32/user32/misc/winhelp.c Mon Jun 26 17:16:43 2006
@@ -29,6 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
+
+#include <wine/debug.h>
 /* WinHelp internal structure */
 typedef struct
Modified: trunk/reactos/dll/win32/user32/misc/winsta.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wins…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/winsta.c (original)
+++ trunk/reactos/dll/win32/user32/misc/winsta.c Mon Jun 26 17:16:43 2006
@@ -10,6 +10,8 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
 /*
  * @implemented
Modified: trunk/reactos/dll/win32/user32/misc/wsprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/wspr…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/wsprintf.c (original)
+++ trunk/reactos/dll/win32/user32/misc/wsprintf.c Mon Jun 26 17:16:43 2006
@@ -32,6 +32,9 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(string);
Modified: trunk/reactos/dll/win32/user32/windows/accel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/a…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/accel.c (original)
+++ trunk/reactos/dll/win32/user32/windows/accel.c Mon Jun 26 17:16:43 2006
@@ -30,6 +30,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
+
+#include <wine/debug.h>
 /* this is the 8 byte accel struct used in Win32 resources (internal only) */
 typedef struct
Modified: trunk/reactos/dll/win32/user32/windows/bitmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/b…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/bitmap.c (original)
+++ trunk/reactos/dll/win32/user32/windows/bitmap.c Mon Jun 26 17:16:43 2006
@@ -29,6 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
+
+#include <wine/debug.h>
 #include "pshpack1.h"
Modified: trunk/reactos/dll/win32/user32/windows/caret.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/caret.c (original)
+++ trunk/reactos/dll/win32/user32/windows/caret.c Mon Jun 26 17:16:43 2006
@@ -30,6 +30,7 @@
 #include <user32.h>
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
 void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo)
Modified: trunk/reactos/dll/win32/user32/windows/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/class.c (original)
+++ trunk/reactos/dll/win32/user32/windows/class.c Mon Jun 26 17:16:43 2006
@@ -10,6 +10,8 @@
  */
 #include <user32.h>
+
+#include <wine/debug.h>
 extern BOOL ControlsInitialized;
Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/clipboard.c (original)
+++ trunk/reactos/dll/win32/user32/windows/clipboard.c Mon Jun 26 17:16:43 2006
@@ -29,9 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
-
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/cursor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/cursor.c (original)
+++ trunk/reactos/dll/win32/user32/windows/cursor.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 #undef CopyCursor
Modified: trunk/reactos/dll/win32/user32/windows/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dc.c (original)
+++ trunk/reactos/dll/win32/user32/windows/dc.c Mon Jun 26 17:16:43 2006
@@ -29,6 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/defwnd.c (original)
+++ trunk/reactos/dll/win32/user32/windows/defwnd.c Mon Jun 26 17:16:43 2006
@@ -12,8 +12,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 #ifndef WM_SETVISIBLE
 #define WM_SETVISIBLE 9
Modified: trunk/reactos/dll/win32/user32/windows/dialog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dialog.c (original)
+++ trunk/reactos/dll/win32/user32/windows/dialog.c Mon Jun 26 17:16:43 2006
@@ -32,8 +32,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* MACROS/DEFINITIONS ********************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/draw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/draw.c (original)
+++ trunk/reactos/dll/win32/user32/windows/draw.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES *******************************************************************/
 #include <user32.h>
-//#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* GLOBALS *******************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/f…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/font.c (original)
+++ trunk/reactos/dll/win32/user32/windows/font.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/hook.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/hook.c (original)
+++ trunk/reactos/dll/win32/user32/windows/hook.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/icon.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/icon.c (original)
+++ trunk/reactos/dll/win32/user32/windows/icon.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/input.c (original)
+++ trunk/reactos/dll/win32/user32/windows/input.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* GLOBALS *******************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/mdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/mdi.c (original)
+++ trunk/reactos/dll/win32/user32/windows/mdi.c Mon Jun 26 17:16:43 2006
@@ -81,8 +81,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(mdi);
Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c Mon Jun 26 17:16:43 2006
@@ -34,8 +34,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* internal popup menu window messages */
 #define MM_SETMENUHANDLE (WM_USER + 0)
Modified: trunk/reactos/dll/win32/user32/windows/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/message.c (original)
+++ trunk/reactos/dll/win32/user32/windows/message.c Mon Jun 26 17:16:43 2006
@@ -9,8 +9,8 @@
  */
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* DDE message exchange
  *
Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/messagebox.c (original)
+++ trunk/reactos/dll/win32/user32/windows/messagebox.c Mon Jun 26 17:16:43 2006
@@ -32,8 +32,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 /* DEFINES *******************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/nonclient.c (original)
+++ trunk/reactos/dll/win32/user32/windows/nonclient.c Mon Jun 26 17:16:43 2006
@@ -23,8 +23,8 @@
 /* INCLUDES *******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 #define HAS_DLGFRAME(Style, ExStyle) \
             (((ExStyle) & WS_EX_DLGMODALFRAME) || \
Modified: trunk/reactos/dll/win32/user32/windows/paint.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/paint.c (original)
+++ trunk/reactos/dll/win32/user32/windows/paint.c Mon Jun 26 17:16:43 2006
@@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 static HBRUSH FrameBrushes[13];
 static HBITMAP hHatch;
Modified: trunk/reactos/dll/win32/user32/windows/prop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/prop.c (original)
+++ trunk/reactos/dll/win32/user32/windows/prop.c Mon Jun 26 17:16:43 2006
@@ -30,6 +30,8 @@
 #include <user32.h>
+#include <wine/debug.h>
+
 typedef struct _PROPLISTITEM
 {
   ATOM Atom;
Modified: trunk/reactos/dll/win32/user32/windows/rect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/r…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/rect.c (original)
+++ trunk/reactos/dll/win32/user32/windows/rect.c Mon Jun 26 17:16:43 2006
@@ -29,6 +29,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/
Modified: trunk/reactos/dll/win32/user32/windows/text.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/t…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/text.c (original)
+++ trunk/reactos/dll/win32/user32/windows/text.c Mon Jun 26 17:16:43 2006
@@ -30,6 +30,8 @@
 #include <user32.h>
+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/
 static WORD
Modified: trunk/reactos/dll/win32/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/window.c (original)
+++ trunk/reactos/dll/win32/user32/windows/window.c Mon Jun 26 17:16:43 2006
@@ -12,8 +12,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>
 BOOL ControlsInitialized = FALSE;
Modified: trunk/reactos/dll/win32/user32/windows/winpos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/winpos.c (original)
+++ trunk/reactos/dll/win32/user32/windows/winpos.c Mon Jun 26 17:16:43 2006
@@ -12,6 +12,8 @@
 /* INCLUDES ******************************************************************/
 #include <user32.h>
+
+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/