- 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 svn path=/trunk/; revision=22634
2025-02-23 08:55:19 +00:00 · 2006-06-26 13:16:43 +00:00 · 2006-06-26 13:16:43 +00:00 · baaaee3af6
commit baaaee3af6
parent 9cc30a5902
52 changed files with 98 additions and 59 deletions
--- a/reactos/baseaddress.rbuild
+++ b/reactos/baseaddress.rbuild
@ -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" />
--- a/reactos/dll/win32/user32/controls/button.c
+++ b/reactos/dll/win32/user32/controls/button.c
@ -63,9 +63,10 @@
 *  - 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
 #define HFONT_GWL_OFFSET  (sizeof(LONG))
--- a/reactos/dll/win32/user32/controls/combo.c
+++ b/reactos/dll/win32/user32/controls/combo.c
@ -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 */
--- a/reactos/dll/win32/user32/controls/edit.c
+++ b/reactos/dll/win32/user32/controls/edit.c
@ -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);
--- a/reactos/dll/win32/user32/controls/icontitle.c
+++ b/reactos/dll/win32/user32/controls/icontitle.c
@ -20,6 +20,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 #ifdef __REACTOS__
 #define MAKEINTATOMW(atom)  ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
 #define ICONTITLE_CLASS_ATOM MAKEINTATOMW(32772)
--- a/reactos/dll/win32/user32/controls/listbox.c
+++ b/reactos/dll/win32/user32/controls/listbox.c
@ -19,8 +19,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* Start of hack section -------------------------------- */

--- a/reactos/dll/win32/user32/controls/regcontrol.c
+++ b/reactos/dll/win32/user32/controls/regcontrol.c
@ -11,6 +11,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
 {
   WNDCLASSEXW wc;
--- a/reactos/dll/win32/user32/controls/scrollbar.c
+++ b/reactos/dll/win32/user32/controls/scrollbar.c
@ -31,8 +31,8 @@
 /* INCLUDES *******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>


 /* GLOBAL VARIABLES ***********************************************************/
--- a/reactos/dll/win32/user32/controls/static.c
+++ b/reactos/dll/win32/user32/controls/static.c
@ -44,6 +44,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(static);

 static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style );
--- a/reactos/dll/win32/user32/include/user32.h
+++ b/reactos/dll/win32/user32/include/user32.h
@ -32,7 +32,6 @@
 #include <win32k/callback.h>

 /* WINE Headers */
-#include <wine/debug.h>
 #include <wine/unicode.h>

 /* Internal User32 Headers */
--- a/reactos/dll/win32/user32/misc/dde.c
+++ b/reactos/dll/win32/user32/misc/dde.c
@ -24,8 +24,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);

--- a/reactos/dll/win32/user32/misc/ddeclient.c
+++ b/reactos/dll/win32/user32/misc/ddeclient.c
@ -24,8 +24,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);

--- a/reactos/dll/win32/user32/misc/ddeserver.c
+++ b/reactos/dll/win32/user32/misc/ddeserver.c
@ -24,8 +24,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);

--- a/reactos/dll/win32/user32/misc/desktop.c
+++ b/reactos/dll/win32/user32/misc/desktop.c
@ -11,6 +11,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 );

--- a/reactos/dll/win32/user32/misc/display.c
+++ b/reactos/dll/win32/user32/misc/display.c
@ -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
--- a/reactos/dll/win32/user32/misc/dllmain.c
+++ b/reactos/dll/win32/user32/misc/dllmain.c
@ -1,6 +1,6 @@
 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 static ULONG User32TlsIndex;
 HINSTANCE User32Instance;
--- a/reactos/dll/win32/user32/misc/exit.c
+++ b/reactos/dll/win32/user32/misc/exit.c
@ -9,6 +9,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /*
 * Sequence of events:
 *
--- a/reactos/dll/win32/user32/misc/exticon.c
+++ b/reactos/dll/win32/user32/misc/exticon.c
@ -23,8 +23,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* Start of Hack section */

--- a/reactos/dll/win32/user32/misc/misc.c
+++ b/reactos/dll/win32/user32/misc/misc.c
@ -30,6 +30,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/

 /*
--- a/reactos/dll/win32/user32/misc/object.c
+++ b/reactos/dll/win32/user32/misc/object.c
@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/dll/win32/user32/misc/resources.c
+++ b/reactos/dll/win32/user32/misc/resources.c
@ -1,5 +1,7 @@
 #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. */
 /* kill `left-hand operand of comma expression has no effect' warning */
--- a/reactos/dll/win32/user32/misc/strpool.c
+++ b/reactos/dll/win32/user32/misc/strpool.c
@ -2,6 +2,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 typedef struct tagHEAP_STRING_POOLA
 {
 	char* data;
--- a/reactos/dll/win32/user32/misc/stubs.c
+++ b/reactos/dll/win32/user32/misc/stubs.c
@ -11,8 +11,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /*
 * @unimplemented
--- a/reactos/dll/win32/user32/misc/timer.c
+++ b/reactos/dll/win32/user32/misc/timer.c
@ -30,6 +30,7 @@

 #include <user32.h>

+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/


--- a/reactos/dll/win32/user32/misc/winhelp.c
+++ b/reactos/dll/win32/user32/misc/winhelp.c
@ -30,6 +30,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /* WinHelp internal structure */
 typedef struct
 {
--- a/reactos/dll/win32/user32/misc/winsta.c
+++ b/reactos/dll/win32/user32/misc/winsta.c
@ -11,6 +11,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/dll/win32/user32/misc/wsprintf.c
+++ b/reactos/dll/win32/user32/misc/wsprintf.c
@ -32,6 +32,9 @@
 */

 #include <user32.h>
+
+#include <wine/debug.h>
+
 WINE_DEFAULT_DEBUG_CHANNEL(string);


--- a/reactos/dll/win32/user32/windows/accel.c
+++ b/reactos/dll/win32/user32/windows/accel.c
@ -31,6 +31,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /* this is the 8 byte accel struct used in Win32 resources (internal only) */
 typedef struct
 {
--- a/reactos/dll/win32/user32/windows/bitmap.c
+++ b/reactos/dll/win32/user32/windows/bitmap.c
@ -30,6 +30,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 #include "pshpack1.h"

 typedef struct {
--- a/reactos/dll/win32/user32/windows/caret.c
+++ b/reactos/dll/win32/user32/windows/caret.c
@ -30,6 +30,7 @@

 #include <user32.h>

+#include <wine/debug.h>
 /* FUNCTIONS *****************************************************************/

 void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo)
--- a/reactos/dll/win32/user32/windows/class.c
+++ b/reactos/dll/win32/user32/windows/class.c
@ -11,6 +11,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 extern BOOL ControlsInitialized;

 /*
--- a/reactos/dll/win32/user32/windows/clipboard.c
+++ b/reactos/dll/win32/user32/windows/clipboard.c
@ -29,9 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>

+#include <wine/debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/dll/win32/user32/windows/cursor.c
+++ b/reactos/dll/win32/user32/windows/cursor.c
@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 #undef CopyCursor

--- a/reactos/dll/win32/user32/windows/dc.c
+++ b/reactos/dll/win32/user32/windows/dc.c
@ -30,6 +30,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/

 /*
--- a/reactos/dll/win32/user32/windows/defwnd.c
+++ b/reactos/dll/win32/user32/windows/defwnd.c
@ -12,8 +12,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 #ifndef WM_SETVISIBLE
 #define WM_SETVISIBLE 9
--- a/reactos/dll/win32/user32/windows/dialog.c
+++ b/reactos/dll/win32/user32/windows/dialog.c
@ -32,8 +32,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* MACROS/DEFINITIONS ********************************************************/

--- a/reactos/dll/win32/user32/windows/draw.c
+++ b/reactos/dll/win32/user32/windows/draw.c
@ -29,8 +29,8 @@
 /* INCLUDES *******************************************************************/

 #include <user32.h>
-//#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/dll/win32/user32/windows/font.c
+++ b/reactos/dll/win32/user32/windows/font.c
@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/dll/win32/user32/windows/hook.c
+++ b/reactos/dll/win32/user32/windows/hook.c
@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* FUNCTIONS *****************************************************************/

--- a/reactos/dll/win32/user32/windows/icon.c
+++ b/reactos/dll/win32/user32/windows/icon.c
@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>


 /* FUNCTIONS *****************************************************************/
--- a/reactos/dll/win32/user32/windows/input.c
+++ b/reactos/dll/win32/user32/windows/input.c
@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* GLOBALS *******************************************************************/

--- a/reactos/dll/win32/user32/windows/mdi.c
+++ b/reactos/dll/win32/user32/windows/mdi.c
@ -81,8 +81,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>


 WINE_DEFAULT_DEBUG_CHANNEL(mdi);
--- a/reactos/dll/win32/user32/windows/menu.c
+++ b/reactos/dll/win32/user32/windows/menu.c
@ -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)
--- a/reactos/dll/win32/user32/windows/message.c
+++ b/reactos/dll/win32/user32/windows/message.c
@ -9,8 +9,8 @@
 */

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* DDE message exchange
 *
--- a/reactos/dll/win32/user32/windows/messagebox.c
+++ b/reactos/dll/win32/user32/windows/messagebox.c
@ -32,8 +32,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 /* DEFINES *******************************************************************/

--- a/reactos/dll/win32/user32/windows/nonclient.c
+++ b/reactos/dll/win32/user32/windows/nonclient.c
@ -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) || \
--- a/reactos/dll/win32/user32/windows/paint.c
+++ b/reactos/dll/win32/user32/windows/paint.c
@ -29,8 +29,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 static HBRUSH FrameBrushes[13];
 static HBITMAP hHatch;
--- a/reactos/dll/win32/user32/windows/prop.c
+++ b/reactos/dll/win32/user32/windows/prop.c
@ -30,6 +30,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 typedef struct _PROPLISTITEM
 {
  ATOM Atom;
--- a/reactos/dll/win32/user32/windows/rect.c
+++ b/reactos/dll/win32/user32/windows/rect.c
@ -30,6 +30,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/

 /*
--- a/reactos/dll/win32/user32/windows/text.c
+++ b/reactos/dll/win32/user32/windows/text.c
@ -30,6 +30,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/

 static WORD
--- a/reactos/dll/win32/user32/windows/window.c
+++ b/reactos/dll/win32/user32/windows/window.c
@ -12,8 +12,8 @@
 /* INCLUDES ******************************************************************/

 #include <user32.h>
-#define NDEBUG
-#include <debug.h>
+
+#include <wine/debug.h>

 BOOL ControlsInitialized = FALSE;

--- a/reactos/dll/win32/user32/windows/winpos.c
+++ b/reactos/dll/win32/user32/windows/winpos.c
@ -13,6 +13,8 @@

 #include <user32.h>

+#include <wine/debug.h>
+
 /* FUNCTIONS *****************************************************************/

 UINT STDCALL