Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- 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

Browse source 
- Give more space to user32.dll by changing preferred loading base

svn path=/trunk/; revision=22634
This commit is contained in:
Aleksey Bragin 2006-06-26 13:16:43 +00:00
parent 9cc30a5902
commit baaaee3af6
52 changed files with 98 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/baseaddress.rbuild
View file

@ -119,7 +119,7 @@
<property name="BASEADDRESS_OLE32" value="0x77a50000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" />
<property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />
<property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <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_GDI32" value="0x77f10000" />
<property name="BASEADDRESS_DNSAPI" value="0x77f30000" /> <property name="BASEADDRESS_DNSAPI" value="0x77f30000" />
<property name="BASEADDRESS_MSVCRT" value="0x78000000" /> <property name="BASEADDRESS_MSVCRT" value="0x78000000" />

3
reactos/dll/win32/user32/controls/button.c
View file

@ -63,9 +63,10 @@
* - Button_SetImageList * - Button_SetImageList
* - Button_SetTextMargin * - Button_SetTextMargin
*/ */
#define NDEBUG // turn off TRACEs
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* GetWindowLong offsets for window extra information */ /* GetWindowLong offsets for window extra information */
#define STATE_GWL_OFFSET 0 #define STATE_GWL_OFFSET 0
#define HFONT_GWL_OFFSET (sizeof(LONG)) #define HFONT_GWL_OFFSET (sizeof(LONG))

3
reactos/dll/win32/user32/controls/combo.c
View file

@ -33,9 +33,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(combo); WINE_DEFAULT_DEBUG_CHANNEL(combo);
/* bits in the dwKeyData */ /* bits in the dwKeyData */

4
reactos/dll/win32/user32/controls/edit.c
View file

@ -43,8 +43,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(edit); WINE_DEFAULT_DEBUG_CHANNEL(edit);
WINE_DECLARE_DEBUG_CHANNEL(combo); WINE_DECLARE_DEBUG_CHANNEL(combo);

2
reactos/dll/win32/user32/controls/icontitle.c
View file

@ -20,6 +20,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
#ifdef __REACTOS__ #ifdef __REACTOS__
#define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) #define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom))))
#define ICONTITLE_CLASS_ATOM MAKEINTATOMW(32772) #define ICONTITLE_CLASS_ATOM MAKEINTATOMW(32772)

4
reactos/dll/win32/user32/controls/listbox.c
View file

@ -19,8 +19,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* Start of hack section -------------------------------- */ /* Start of hack section -------------------------------- */

2
reactos/dll/win32/user32/controls/regcontrol.c
View file

@ -11,6 +11,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
static void RegisterBuiltinClass(const struct builtin_class_descr *Descr) static void RegisterBuiltinClass(const struct builtin_class_descr *Descr)
{ {
WNDCLASSEXW wc; WNDCLASSEXW wc;

4
reactos/dll/win32/user32/controls/scrollbar.c
View file

@ -31,8 +31,8 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* GLOBAL VARIABLES ***********************************************************/ /* GLOBAL VARIABLES ***********************************************************/

2
reactos/dll/win32/user32/controls/static.c
View file

@ -44,6 +44,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(static); WINE_DEFAULT_DEBUG_CHANNEL(static);
static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style );

1
reactos/dll/win32/user32/include/user32.h
View file

@ -32,7 +32,6 @@
#include <win32k/callback.h> #include <win32k/callback.h>
/* WINE Headers */ /* WINE Headers */
#include <wine/debug.h>
#include <wine/unicode.h> #include <wine/unicode.h>
/* Internal User32 Headers */ /* Internal User32 Headers */

4
reactos/dll/win32/user32/misc/dde.c
View file

@ -24,8 +24,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ddeml); WINE_DEFAULT_DEBUG_CHANNEL(ddeml);

4
reactos/dll/win32/user32/misc/ddeclient.c
View file

@ -24,8 +24,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ddeml); WINE_DEFAULT_DEBUG_CHANNEL(ddeml);

4
reactos/dll/win32/user32/misc/ddeserver.c
View file

@ -24,8 +24,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(ddeml); WINE_DEFAULT_DEBUG_CHANNEL(ddeml);

2
reactos/dll/win32/user32/misc/desktop.c
View file

@ -11,6 +11,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
#define DESKTOP_CLASS_ATOM MAKEINTATOMA(32769) /* Desktop */ #define DESKTOP_CLASS_ATOM MAKEINTATOMA(32769) /* Desktop */
static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam );

4
reactos/dll/win32/user32/misc/display.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
#define SIZEOF_DEVMODEA_300 124 #define SIZEOF_DEVMODEA_300 124
#define SIZEOF_DEVMODEA_400 148 #define SIZEOF_DEVMODEA_400 148

4
reactos/dll/win32/user32/misc/dllmain.c
View file

@ -1,6 +1,6 @@
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
static ULONG User32TlsIndex; static ULONG User32TlsIndex;
HINSTANCE User32Instance; HINSTANCE User32Instance;

2
reactos/dll/win32/user32/misc/exit.c
View file

@ -9,6 +9,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* /*
* Sequence of events: * Sequence of events:
* *

4
reactos/dll/win32/user32/misc/exticon.c
View file

@ -23,8 +23,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* Start of Hack section */ /* Start of Hack section */

2
reactos/dll/win32/user32/misc/misc.c
View file

@ -30,6 +30,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
/* /*

4
reactos/dll/win32/user32/misc/object.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

2
reactos/dll/win32/user32/misc/resources.c
View file

@ -1,5 +1,7 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
does not seem to work properly for stack address space. */ does not seem to work properly for stack address space. */
/* kill `left-hand operand of comma expression has no effect' warning */ /* kill `left-hand operand of comma expression has no effect' warning */

2
reactos/dll/win32/user32/misc/strpool.c
View file

@ -2,6 +2,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
typedef struct tagHEAP_STRING_POOLA typedef struct tagHEAP_STRING_POOLA
{ {
char* data; char* data;

4
reactos/dll/win32/user32/misc/stubs.c
View file

@ -11,8 +11,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* /*
* @unimplemented * @unimplemented

1
reactos/dll/win32/user32/misc/timer.c
View file

@ -30,6 +30,7 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

2
reactos/dll/win32/user32/misc/winhelp.c
View file

@ -30,6 +30,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* WinHelp internal structure */ /* WinHelp internal structure */
typedef struct typedef struct
{ {

2
reactos/dll/win32/user32/misc/winsta.c
View file

@ -11,6 +11,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* /*
* @implemented * @implemented
*/ */

3
reactos/dll/win32/user32/misc/wsprintf.c
View file

@ -32,6 +32,9 @@
*/ */
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(string); WINE_DEFAULT_DEBUG_CHANNEL(string);

2
reactos/dll/win32/user32/windows/accel.c
View file

@ -31,6 +31,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* this is the 8 byte accel struct used in Win32 resources (internal only) */ /* this is the 8 byte accel struct used in Win32 resources (internal only) */
typedef struct typedef struct
{ {

2
reactos/dll/win32/user32/windows/bitmap.c
View file

@ -30,6 +30,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
#include "pshpack1.h" #include "pshpack1.h"
typedef struct { typedef struct {

1
reactos/dll/win32/user32/windows/caret.c
View file

@ -30,6 +30,7 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo) void DrawCaret(HWND hWnd, PTHRDCARETINFO CaretInfo)

2
reactos/dll/win32/user32/windows/class.c
View file

@ -11,6 +11,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
extern BOOL ControlsInitialized; extern BOOL ControlsInitialized;
/* /*

3
reactos/dll/win32/user32/windows/clipboard.c
View file

@ -29,9 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

4
reactos/dll/win32/user32/windows/cursor.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
#undef CopyCursor #undef CopyCursor

2
reactos/dll/win32/user32/windows/dc.c
View file

@ -30,6 +30,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
/* /*

4
reactos/dll/win32/user32/windows/defwnd.c
View file

@ -12,8 +12,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
#ifndef WM_SETVISIBLE #ifndef WM_SETVISIBLE
#define WM_SETVISIBLE 9 #define WM_SETVISIBLE 9

4
reactos/dll/win32/user32/windows/dialog.c
View file

@ -32,8 +32,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* MACROS/DEFINITIONS ********************************************************/ /* MACROS/DEFINITIONS ********************************************************/

4
reactos/dll/win32/user32/windows/draw.c
View file

@ -29,8 +29,8 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
#include <user32.h> #include <user32.h>
//#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/

4
reactos/dll/win32/user32/windows/font.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

4
reactos/dll/win32/user32/windows/hook.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

4
reactos/dll/win32/user32/windows/icon.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/

4
reactos/dll/win32/user32/windows/input.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/

4
reactos/dll/win32/user32/windows/mdi.c
View file

@ -81,8 +81,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(mdi); WINE_DEFAULT_DEBUG_CHANNEL(mdi);

4
reactos/dll/win32/user32/windows/menu.c
View file

@ -34,8 +34,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* internal popup menu window messages */ /* internal popup menu window messages */
#define MM_SETMENUHANDLE (WM_USER + 0) #define MM_SETMENUHANDLE (WM_USER + 0)

4
reactos/dll/win32/user32/windows/message.c
View file

@ -9,8 +9,8 @@
*/ */
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* DDE message exchange /* DDE message exchange
* *

4
reactos/dll/win32/user32/windows/messagebox.c
View file

@ -32,8 +32,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
/* DEFINES *******************************************************************/ /* DEFINES *******************************************************************/

4
reactos/dll/win32/user32/windows/nonclient.c
View file

@ -23,8 +23,8 @@
/* INCLUDES *******************************************************************/ /* INCLUDES *******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
#define HAS_DLGFRAME(Style, ExStyle) \ #define HAS_DLGFRAME(Style, ExStyle) \
(((ExStyle) & WS_EX_DLGMODALFRAME) || \ (((ExStyle) & WS_EX_DLGMODALFRAME) || \

4
reactos/dll/win32/user32/windows/paint.c
View file

@ -29,8 +29,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
static HBRUSH FrameBrushes[13]; static HBRUSH FrameBrushes[13];
static HBITMAP hHatch; static HBITMAP hHatch;

2
reactos/dll/win32/user32/windows/prop.c
View file

@ -30,6 +30,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
typedef struct _PROPLISTITEM typedef struct _PROPLISTITEM
{ {
ATOM Atom; ATOM Atom;

2
reactos/dll/win32/user32/windows/rect.c
View file

@ -30,6 +30,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
/* /*

2
reactos/dll/win32/user32/windows/text.c
View file

@ -30,6 +30,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
static WORD static WORD

4
reactos/dll/win32/user32/windows/window.c
View file

@ -12,8 +12,8 @@
/* INCLUDES ******************************************************************/ /* INCLUDES ******************************************************************/
#include <user32.h> #include <user32.h>
#define NDEBUG
#include <debug.h> #include <wine/debug.h>
BOOL ControlsInitialized = FALSE; BOOL ControlsInitialized = FALSE;

2
reactos/dll/win32/user32/windows/winpos.c
View file

@ -13,6 +13,8 @@
#include <user32.h> #include <user32.h>
#include <wine/debug.h>
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
UINT STDCALL UINT STDCALL