From d3e22d9d55a4397096c92ab340e41bc494a1e7cb Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Thu, 10 Feb 2000 19:03:02 +0000 Subject: [PATCH] Removed #include of wingdi.h and windef.h from winuser.h (and resolved the resulting compilation failures). --- controls/button.c | 2 ++ controls/combo.c | 3 ++- controls/desktop.c | 1 + controls/icontitle.c | 2 ++ controls/listbox.c | 7 +++++-- controls/menu.c | 4 +++- controls/scroll.c | 2 ++ controls/static.c | 2 ++ controls/uitools.c | 2 ++ dlls/comctl32/monthcal.c | 5 ++++- dlls/comctl32/toolbar.c | 2 ++ dlls/comctl32/updown.c | 5 ++++- dlls/commdlg/colordlg.c | 5 ++++- dlls/commdlg/filedlg.c | 5 ++++- dlls/commdlg/filedlgbrowser.c | 2 ++ dlls/commdlg/finddlg32.c | 2 ++ dlls/commdlg/fontdlg.c | 5 ++++- dlls/commdlg/printdlg.c | 5 ++++- dlls/crtdll/crtdll_main.c | 5 ++++- dlls/dsound/dsound_main.c | 4 +++- dlls/imm32/imm.c | 2 ++ dlls/mouse/mouse_main.c | 2 ++ dlls/msacm32/driver.c | 2 ++ dlls/msacm32/internal.c | 2 ++ dlls/msvideo/msvideo_main.c | 2 ++ dlls/ntdll/rtl.c | 2 ++ dlls/ntdll/sec.c | 1 + dlls/ole32/clipboard.c | 2 ++ dlls/ole32/ole2.c | 3 +++ dlls/ole32/ole2stubs.c | 2 ++ dlls/oleaut32/ole2disp.c | 2 ++ dlls/oleaut32/oleaut.c | 2 ++ dlls/shell32/iconcache.c | 4 ++++ dlls/shell32/shell.c | 2 ++ dlls/shell32/shell32_main.c | 8 +++++--- dlls/shell32/shpolicy.c | 2 ++ dlls/winmm/joystick.c | 5 ++++- dlls/winmm/mci.c | 5 ++++- dlls/winmm/mcianim/mcianim.c | 2 ++ dlls/winmm/mciavi/mciavi.c | 2 ++ dlls/winmm/mcicda/mcicda.c | 3 +++ dlls/winmm/mciseq/mcimidi.c | 2 ++ dlls/winmm/mciwave/mciwave.c | 2 ++ dlls/winmm/midimap/midimap.c | 2 ++ dlls/winmm/time.c | 2 ++ dlls/winmm/wavemap/wavemap.c | 2 ++ dlls/winmm/wineoss/audio.c | 5 ++++- dlls/winmm/wineoss/midi.c | 2 ++ dlls/winmm/wineoss/oss.c | 2 ++ files/directory.c | 7 +++++-- files/dos_fs.c | 1 + files/profile.c | 5 ++++- graphics/painting.c | 2 ++ graphics/psdrv/escape.c | 2 ++ graphics/x11drv/bitmap.c | 2 ++ graphics/x11drv/xfont.c | 2 ++ if1632/snoop.c | 3 +++ include/callback.h | 1 + include/commctrl.h | 1 + include/commdlg.h | 1 + include/docobj.h | 2 ++ include/prsht.h | 2 ++ include/queue.h | 1 + include/struct32.h | 2 ++ include/win.h | 2 ++ include/windows.h | 2 +- include/wine/obj_extracticon.h | 2 ++ include/wine/obj_shellbrowser.h | 2 ++ include/wine/obj_shellview.h | 2 ++ include/winuser.h | 2 -- libtest/hello4.c | 2 ++ loader/dos/dosvm.c | 2 ++ loader/main.c | 4 +++- loader/module.c | 6 ++++-- loader/ne/convert.c | 4 +++- loader/resource.c | 1 + memory/atom.c | 4 +++- memory/environ.c | 2 ++ memory/instr.c | 15 ++++++++------- memory/string.c | 6 ++++-- misc/comm.c | 5 ++++- misc/ddeml.c | 2 ++ misc/lstr.c | 9 ++++++--- misc/main.c | 2 ++ misc/spy.c | 3 +++ misc/system.c | 2 ++ misc/tweak.c | 2 ++ misc/version.c | 3 +++ misc/wsprintf.c | 3 +++ msdos/int09.c | 2 ++ msdos/int16.c | 2 ++ msdos/int21.c | 2 ++ msdos/int33.c | 2 ++ msdos/vxd.c | 4 ++++ objects/clipping.c | 2 ++ objects/cursoricon.c | 2 ++ objects/dc.c | 2 ++ objects/gdiobj.c | 3 +++ objects/palette.c | 2 ++ objects/region.c | 6 ++++-- objects/text.c | 2 ++ ole/ole2nls.c | 12 +++++++----- relay32/builtin32.c | 3 +++ tools/bin2res.c | 2 ++ tools/fnt2bdf.c | 2 ++ tools/wrc/genres.c | 2 ++ tools/wrc/parser.y | 2 ++ win32/console.c | 3 +++ win32/device.c | 6 ++++-- win32/except.c | 3 +++ windows/caret.c | 2 ++ windows/class.c | 2 ++ windows/clipboard.c | 2 ++ windows/dce.c | 2 ++ windows/defdlg.c | 2 ++ windows/defwnd.c | 2 ++ windows/dialog.c | 5 ++++- windows/dinput.c | 2 ++ windows/driver.c | 2 ++ windows/focus.c | 2 ++ windows/hook.c | 2 ++ windows/input.c | 13 ++++++++----- windows/keyboard.c | 2 ++ windows/mdi.c | 5 ++++- windows/msgbox.c | 2 ++ windows/multimon.c | 2 ++ windows/nonclient.c | 2 ++ windows/painting.c | 8 +++++--- windows/property.c | 2 ++ windows/queue.c | 2 ++ windows/rect.c | 2 ++ windows/scroll.c | 2 ++ windows/syscolor.c | 2 ++ windows/sysmetrics.c | 2 ++ windows/timer.c | 2 ++ windows/user.c | 2 ++ windows/win.c | 19 +++++-------------- windows/winhelp.c | 2 ++ windows/winpos.c | 2 ++ windows/winproc.c | 3 ++- windows/x11drv/clipboard.c | 13 ++++++++----- windows/x11drv/keyboard.c | 2 ++ windows/x11drv/wnd.c | 2 ++ 143 files changed, 372 insertions(+), 81 deletions(-) diff --git a/controls/button.c b/controls/button.c index fb958e56796..d51d190295c 100644 --- a/controls/button.c +++ b/controls/button.c @@ -8,6 +8,8 @@ #include #include "win.h" #include "button.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "tweak.h" diff --git a/controls/combo.c b/controls/combo.c index 8ff63334d1c..0940de2c866 100644 --- a/controls/combo.c +++ b/controls/combo.c @@ -9,8 +9,9 @@ #include #include "winbase.h" -#include "winuser.h" +#include "windef.h" #include "wingdi.h" +#include "winuser.h" #include "wine/winuser16.h" #include "win.h" #include "spy.h" diff --git a/controls/desktop.c b/controls/desktop.c index c170f2cd0e1..78e2abe78b3 100644 --- a/controls/desktop.c +++ b/controls/desktop.c @@ -10,6 +10,7 @@ #include "desktop.h" #include "windef.h" +#include "wingdi.h" #include "heap.h" #include "monitor.h" #include "win.h" diff --git a/controls/icontitle.c b/controls/icontitle.c index 006ffc64185..9e657b7f1bf 100644 --- a/controls/icontitle.c +++ b/controls/icontitle.c @@ -7,6 +7,8 @@ #include #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winuser16.h" #include "win.h" diff --git a/controls/listbox.c b/controls/listbox.c index bebcb00d319..3a1ea7b1469 100644 --- a/controls/listbox.c +++ b/controls/listbox.c @@ -6,6 +6,9 @@ #include #include +#include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "wine/winbase16.h" #include "winuser.h" @@ -18,8 +21,8 @@ #include "debugtools.h" #include "tweak.h" -DEFAULT_DEBUG_CHANNEL(listbox) -DECLARE_DEBUG_CHANNEL(combo) +DEFAULT_DEBUG_CHANNEL(listbox); +DECLARE_DEBUG_CHANNEL(combo); /* Unimplemented yet: * - LBS_NOSEL diff --git a/controls/menu.c b/controls/menu.c index a2f5abaeaf0..a277ecbe19a 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -17,9 +17,11 @@ #include #include -#include "win.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" +#include "win.h" #include "task.h" #include "heap.h" #include "menu.h" diff --git a/controls/scroll.c b/controls/scroll.c index 901873f7a08..6748222247a 100644 --- a/controls/scroll.c +++ b/controls/scroll.c @@ -5,6 +5,8 @@ * Copyright 1994, 1996 Alexandre Julliard */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "scroll.h" #include "heap.h" diff --git a/controls/static.c b/controls/static.c index f67467ce5ea..48b19e5a3bb 100644 --- a/controls/static.c +++ b/controls/static.c @@ -5,6 +5,8 @@ * */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "win.h" #include "cursoricon.h" diff --git a/controls/uitools.c b/controls/uitools.c index 30870a02067..82ca1d375c6 100644 --- a/controls/uitools.c +++ b/controls/uitools.c @@ -5,6 +5,8 @@ * Copyright 1997 Bertho A. Stultiens */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winuser.h" #include "debugtools.h" diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index cca471667d4..95e71eecece 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -17,8 +17,11 @@ */ #include +#include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wingdi.h" #include "win.h" @@ -28,7 +31,7 @@ #include "monthcal.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(monthcal) +DEFAULT_DEBUG_CHANNEL(monthcal); /* take #days/month from ole/parsedt.c; * we want full month-names, and abbreviated weekdays, so these are diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b3fd83f3a03..c8e5112a191 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -27,6 +27,8 @@ #include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wingdi.h" #include "commctrl.h" diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index f9ca6f8db5b..112df8398ef 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -29,15 +29,18 @@ #include #include +#include +#include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "commctrl.h" #include "winnls.h" #include "updown.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(updown) +DEFAULT_DEBUG_CHANNEL(updown); /* Control configuration constants */ diff --git a/dlls/commdlg/colordlg.c b/dlls/commdlg/colordlg.c index 5d3836a2611..3cc2c394ec3 100644 --- a/dlls/commdlg/colordlg.c +++ b/dlls/commdlg/colordlg.c @@ -7,8 +7,11 @@ #include #include +#include #include +#include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "ldt.h" @@ -21,7 +24,7 @@ #include "winproc.h" #include "cderr.h" -DEFAULT_DEBUG_CHANNEL(commdlg) +DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c index dda1deb9296..83cafa12410 100644 --- a/dlls/commdlg/filedlg.c +++ b/dlls/commdlg/filedlg.c @@ -6,8 +6,11 @@ */ #include #include +#include #include +#include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "ldt.h" @@ -22,7 +25,7 @@ #include "cderr.h" #include "tweak.h" -DEFAULT_DEBUG_CHANNEL(commdlg) +DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index f57f8c6b23d..11222fb5f41 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -7,6 +7,8 @@ #include #include "unknwn.h" #include "filedlgbrowser.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "heap.h" #include "wine/obj_dataobject.h" diff --git a/dlls/commdlg/finddlg32.c b/dlls/commdlg/finddlg32.c index 1c0b7838e86..8b051238343 100644 --- a/dlls/commdlg/finddlg32.c +++ b/dlls/commdlg/finddlg32.c @@ -6,6 +6,8 @@ */ #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "commdlg.h" #include "cderr.h" diff --git a/dlls/commdlg/fontdlg.c b/dlls/commdlg/fontdlg.c index 56a9143a539..9635568a411 100644 --- a/dlls/commdlg/fontdlg.c +++ b/dlls/commdlg/fontdlg.c @@ -7,8 +7,11 @@ #include #include +#include #include +#include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "ldt.h" @@ -22,7 +25,7 @@ #include "winproc.h" #include "cderr.h" -DEFAULT_DEBUG_CHANNEL(commdlg) +DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c index e27f54381de..ce3b1664a3d 100644 --- a/dlls/commdlg/printdlg.c +++ b/dlls/commdlg/printdlg.c @@ -8,8 +8,11 @@ #include #include +#include #include +#include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "ldt.h" @@ -23,7 +26,7 @@ #include "winspool.h" #include "winerror.h" -DEFAULT_DEBUG_CHANNEL(commdlg) +DEFAULT_DEBUG_CHANNEL(commdlg); #include "cdlg.h" diff --git a/dlls/crtdll/crtdll_main.c b/dlls/crtdll/crtdll_main.c index d62e8b1428d..048797e9256 100644 --- a/dlls/crtdll/crtdll_main.c +++ b/dlls/crtdll/crtdll_main.c @@ -32,6 +32,7 @@ AJ 990101: #include #include #include +#include #include #include #include @@ -41,6 +42,8 @@ AJ 990101: #include #include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "ntddk.h" @@ -53,7 +56,7 @@ AJ 990101: #include "options.h" #include "winnls.h" -DEFAULT_DEBUG_CHANNEL(crtdll) +DEFAULT_DEBUG_CHANNEL(crtdll); /* windows.h RAND_MAX is smaller than normal RAND_MAX */ #define CRTDLL_RAND_MAX 0x7fff diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 04abf351614..37857032bb6 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -62,6 +62,8 @@ #include #include /* Insomnia - pow() function */ #include "dsound.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "wine/obj_base.h" @@ -236,7 +238,7 @@ static void _dump_DSBCAPS(DWORD xmask) { for (i=0;i #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "driver.h" diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index 6c97caa1698..38a831980b2 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -5,6 +5,8 @@ #include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wingdi.h" #include "vfw.h" diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index c95eb1fa07d..8f2450c43aa 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -11,6 +11,8 @@ #include #include "heap.h" #include "debugtools.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "stackframe.h" diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index fa8fc6a9c16..fc1dba8b9d4 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -11,6 +11,7 @@ #include #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winestring.h" #include "file.h" diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index fd7f6b987fc..7a6ce76d633 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -44,6 +44,8 @@ */ #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winbase.h" #include "winerror.h" diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 5cdde94f284..c0cf1f63e5e 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -8,8 +8,11 @@ #include #include +#include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "ole2.h" diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index c9be60d8581..03ed997e4fb 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -5,6 +5,8 @@ */ #include "ole2.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "debugtools.h" diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c index 130536c73f2..54b0e00fa9e 100644 --- a/dlls/oleaut32/ole2disp.c +++ b/dlls/oleaut32/ole2disp.c @@ -4,6 +4,8 @@ * Copyright 1995 Martin von Loewis */ #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "oleauto.h" diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index a073663c340..f3d95ee83dd 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -3,6 +3,8 @@ * */ #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "winversion.h" diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index d93e8e9bb76..4b92cd49d74 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -3,7 +3,11 @@ * */ #include +#include +#include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wingdi.h" #include "wine/winuser16.h" diff --git a/dlls/shell32/shell.c b/dlls/shell32/shell.c index ed5e84fe433..2edf2527493 100644 --- a/dlls/shell32/shell.c +++ b/dlls/shell32/shell.c @@ -8,6 +8,8 @@ #include #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "wine/winbase16.h" #include "wine/shell16.h" diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 44025386149..cc8acd52df3 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -6,7 +6,10 @@ */ #include #include +#include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winerror.h" #include "heap.h" @@ -27,8 +30,7 @@ #include "wine/undocshell.h" #include "shpolicy.h" -DEFAULT_DEBUG_CHANNEL(shell) -DECLARE_DEBUG_CHANNEL(exec) +DEFAULT_DEBUG_CHANNEL(shell); #define MORE_DEBUG 1 /************************************************************************* @@ -422,7 +424,7 @@ UINT WINAPI SHAppBarMessage(DWORD msg, PAPPBARDATA data) * */ DWORD WINAPI SHHelpShortcuts_RunDLL (DWORD dwArg1, DWORD dwArg2, DWORD dwArg3, DWORD dwArg4) -{ FIXME_(exec)("(%lx, %lx, %lx, %lx) empty stub!\n", +{ FIXME("(%lx, %lx, %lx, %lx) empty stub!\n", dwArg1, dwArg2, dwArg3, dwArg4); return 0; diff --git a/dlls/shell32/shpolicy.c b/dlls/shell32/shpolicy.c index f04c126c975..8f371d93b5c 100644 --- a/dlls/shell32/shpolicy.c +++ b/dlls/shell32/shpolicy.c @@ -16,6 +16,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "shpolicy.h" diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index dca7fce8261..e773639f0b4 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -23,6 +23,7 @@ #include "config.h" #include +#include #include #include #include @@ -34,12 +35,14 @@ #ifdef HAVE_SYS_ERRNO_H #include #endif +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winbase.h" #include "mmsystem.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(mmsys) +DEFAULT_DEBUG_CHANNEL(mmsys); #define MAXJOYSTICK (JOYSTICKID2 + 1) #define JOY_PERIOD_MIN (10) /* min Capture time period */ diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 289e602b6c6..6e941e678c1 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -7,9 +7,12 @@ */ #include +#include #include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "heap.h" #include "driver.h" @@ -20,7 +23,7 @@ #include "wine/winbase16.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(mci) +DEFAULT_DEBUG_CHANNEL(mci); static int MCI_InstalledCount; static LPSTR MCI_lpInstallNames = NULL; diff --git a/dlls/winmm/mcianim/mcianim.c b/dlls/winmm/mcianim/mcianim.c index a94e9791450..606f2855260 100644 --- a/dlls/winmm/mcianim/mcianim.c +++ b/dlls/winmm/mcianim/mcianim.c @@ -5,6 +5,8 @@ * Copyright 1994 Martin Ayotte */ +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "driver.h" #include "mmddk.h" diff --git a/dlls/winmm/mciavi/mciavi.c b/dlls/winmm/mciavi/mciavi.c index 6903a04863c..fdbeeaba4be 100644 --- a/dlls/winmm/mciavi/mciavi.c +++ b/dlls/winmm/mciavi/mciavi.c @@ -7,6 +7,8 @@ */ #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "mmddk.h" #include "user.h" diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c index 0401c8d4419..8dfa95b3f75 100644 --- a/dlls/winmm/mcicda/mcicda.c +++ b/dlls/winmm/mcicda/mcicda.c @@ -7,6 +7,9 @@ * Copyright 2000 Andreas Mohr */ +#include "config.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "driver.h" #include "mmddk.h" diff --git a/dlls/winmm/mciseq/mcimidi.c b/dlls/winmm/mciseq/mcimidi.c index 46cbea9a54a..94a46f93578 100644 --- a/dlls/winmm/mciseq/mcimidi.c +++ b/dlls/winmm/mciseq/mcimidi.c @@ -16,6 +16,8 @@ */ #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "mmddk.h" #include "driver.h" diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c index 6bd66e18d45..5a57e03f008 100644 --- a/dlls/winmm/mciwave/mciwave.c +++ b/dlls/winmm/mciwave/mciwave.c @@ -10,6 +10,8 @@ * - record/play should and must be done asynchronous */ +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "driver.h" #include "mmddk.h" diff --git a/dlls/winmm/midimap/midimap.c b/dlls/winmm/midimap/midimap.c index 97df8ab062b..ec51e7ab887 100644 --- a/dlls/winmm/midimap/midimap.c +++ b/dlls/winmm/midimap/midimap.c @@ -5,6 +5,8 @@ * Copyright 1999 Eric Pouech */ +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "driver.h" #include "mmddk.h" diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index c0361239332..c37637bb231 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -8,6 +8,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winemm.h" #include "services.h" diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c index 24e8d8105a5..fd038e716eb 100644 --- a/dlls/winmm/wavemap/wavemap.c +++ b/dlls/winmm/wavemap/wavemap.c @@ -11,6 +11,8 @@ * + use asynchronous ACM conversion */ +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "driver.h" #include "mmddk.h" diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 14506f1135a..07f7bc720fb 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -16,11 +16,14 @@ #include "config.h" #include +#include #include #include #include #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "driver.h" #include "mmddk.h" @@ -29,7 +32,7 @@ #include "ldt.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(wave) +DEFAULT_DEBUG_CHANNEL(wave); /* Allow 1% deviation for sample rates (some ES137x cards) */ #define NEAR_MATCH(rate1,rate2) (((100*((int)(rate1)-(int)(rate2)))/(rate1))==0) diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 73cd463dab1..555eb31ca2f 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -18,6 +18,8 @@ #include #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "mmddk.h" #include "oss.h" diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index 1e7c421309b..395941c970f 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -5,6 +5,8 @@ * Copyright 1999 Eric Pouech */ +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "driver.h" #include "mmddk.h" diff --git a/files/directory.c b/files/directory.c index 7018d52d4c8..8ef48c71592 100644 --- a/files/directory.c +++ b/files/directory.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -20,6 +21,8 @@ #include "winbase.h" #include "wine/winbase16.h" #include "wine/winestring.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winerror.h" #include "process.h" @@ -30,8 +33,8 @@ #include "options.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(dosfs) -DECLARE_DEBUG_CHANNEL(file) +DEFAULT_DEBUG_CHANNEL(dosfs); +DECLARE_DEBUG_CHANNEL(file); static DOS_FULL_NAME DIR_Windows; static DOS_FULL_NAME DIR_System; diff --git a/files/dos_fs.c b/files/dos_fs.c index 64fbdb4e9ba..2395e57eaf6 100644 --- a/files/dos_fs.c +++ b/files/dos_fs.c @@ -22,6 +22,7 @@ #include #include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winbase16.h" #include "winerror.h" diff --git a/files/profile.c b/files/profile.c index 3b229ecff56..4d16416b83f 100644 --- a/files/profile.c +++ b/files/profile.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -16,6 +17,8 @@ #include "winbase.h" #include "winerror.h" #include "wine/winbase16.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winnls.h" #include "file.h" @@ -24,7 +27,7 @@ #include "xmalloc.h" #include "options.h" -DEFAULT_DEBUG_CHANNEL(profile) +DEFAULT_DEBUG_CHANNEL(profile); typedef struct tagPROFILEKEY { diff --git a/graphics/painting.c b/graphics/painting.c index 049583ee587..e8aad379c64 100644 --- a/graphics/painting.c +++ b/graphics/painting.c @@ -16,6 +16,8 @@ #include "path.h" #include "debugtools.h" #include "winerror.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winuser16.h" diff --git a/graphics/psdrv/escape.c b/graphics/psdrv/escape.c index ca38b45d500..829b27f622f 100644 --- a/graphics/psdrv/escape.c +++ b/graphics/psdrv/escape.c @@ -3,6 +3,8 @@ * * Copyright 1998 Huw D M Davies */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "psdrv.h" #include "debugtools.h" diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c index 27f987e2ad5..97ce45eaecd 100644 --- a/graphics/x11drv/bitmap.c +++ b/graphics/x11drv/bitmap.c @@ -24,6 +24,8 @@ #include "xmalloc.h" #include "local.h" #include "x11drv.h" +#include "wingdi.h" +#include "windef.h" #include "wine/winuser16.h" DEFAULT_DEBUG_CHANNEL(x11drv) diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c index d5d625674ed..6989bb60c39 100644 --- a/graphics/x11drv/xfont.c +++ b/graphics/x11drv/xfont.c @@ -25,6 +25,8 @@ #include #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "heap.h" #include "options.h" diff --git a/if1632/snoop.c b/if1632/snoop.c index 797e42bc307..ac2233495be 100644 --- a/if1632/snoop.c +++ b/if1632/snoop.c @@ -6,7 +6,10 @@ #include #include +#include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winnt.h" #include "heap.h" diff --git a/include/callback.h b/include/callback.h index cdba5b4d3fe..31a22f6e07d 100644 --- a/include/callback.h +++ b/include/callback.h @@ -9,6 +9,7 @@ #include "windef.h" #include "winnt.h" +#include "wingdi.h" #include "wine/winuser16.h" extern int (*IF1632_CallLargeStack)( int (*func)(void), void *arg ); diff --git a/include/commctrl.h b/include/commctrl.h index d35fc6cbb80..68d14100b90 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -7,6 +7,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "imagelist.h" #include "prsht.h" diff --git a/include/commdlg.h b/include/commdlg.h index 2f805d88a98..251e481e772 100644 --- a/include/commdlg.h +++ b/include/commdlg.h @@ -10,6 +10,7 @@ extern "C" { #endif #include "windef.h" /* needed for CHOOSEFONT structure */ +#include "wingdi.h" #include "winuser.h" #include "pshpack1.h" diff --git a/include/docobj.h b/include/docobj.h index 6f60e62ad91..afa4be1215d 100644 --- a/include/docobj.h +++ b/include/docobj.h @@ -2,6 +2,8 @@ #define __WINE_DOCOBJ_H #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "ole2.h" #include "wine/obj_oleaut.h" diff --git a/include/prsht.h b/include/prsht.h index cd65082dbb7..02151fe32cc 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -1,6 +1,8 @@ #ifndef __WINE_PRSHT_H #define __WINE_PRSHT_H +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #ifdef __cplusplus diff --git a/include/queue.h b/include/queue.h index 3448c82dd86..e12c5726fb3 100644 --- a/include/queue.h +++ b/include/queue.h @@ -8,6 +8,7 @@ #define __WINE_QUEUE_H #include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "thread.h" diff --git a/include/struct32.h b/include/struct32.h index 758f8d7d8e3..6910c546d4c 100644 --- a/include/struct32.h +++ b/include/struct32.h @@ -3,6 +3,8 @@ #define __WINE_STRUCT32_H #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "queue.h" diff --git a/include/win.h b/include/win.h index 1198ddb0755..65f4108b008 100644 --- a/include/win.h +++ b/include/win.h @@ -7,6 +7,8 @@ #ifndef __WINE_WIN_H #define __WINE_WIN_H +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "queue.h" #include "class.h" diff --git a/include/windows.h b/include/windows.h index 956058d0e7b..79ff5377958 100644 --- a/include/windows.h +++ b/include/windows.h @@ -5,10 +5,10 @@ extern "C" { #endif +#include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "windef.h" #include "shell.h" #include "winreg.h" #include "winnetwk.h" diff --git a/include/wine/obj_extracticon.h b/include/wine/obj_extracticon.h index d353abce590..818f2855124 100644 --- a/include/wine/obj_extracticon.h +++ b/include/wine/obj_extracticon.h @@ -6,6 +6,8 @@ #define __WINE_WINE_OBJ_EXTRACTICON_H #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/obj_base.h" diff --git a/include/wine/obj_shellbrowser.h b/include/wine/obj_shellbrowser.h index 15daf20cf5a..6b1a9ae59dd 100644 --- a/include/wine/obj_shellbrowser.h +++ b/include/wine/obj_shellbrowser.h @@ -6,6 +6,8 @@ #define __WINE_WINE_OBJ_SHELLBROWSER_H #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/obj_base.h" #include "wine/obj_inplace.h" /* IOleWindow */ diff --git a/include/wine/obj_shellview.h b/include/wine/obj_shellview.h index 63a3f0d9355..7c2878b220c 100644 --- a/include/wine/obj_shellview.h +++ b/include/wine/obj_shellview.h @@ -6,6 +6,8 @@ #define __WINE_WINE_OBJ_SHELLVIEW_H #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/obj_base.h" #include "wine/obj_inplace.h" diff --git a/include/winuser.h b/include/winuser.h index 8ce44e5dff4..c6da254d8ec 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4,8 +4,6 @@ #ifndef RC_INVOKED #include #endif -#include "windef.h" -#include "wingdi.h" #ifdef __cplusplus extern "C" { diff --git a/libtest/hello4.c b/libtest/hello4.c index 259d4554a39..08e5ff7ea87 100644 --- a/libtest/hello4.c +++ b/libtest/hello4.c @@ -2,6 +2,8 @@ #include /* Win32 counterpart for CalcChildScroll16 is not implemented */ /* even in MS Visual C++ */ +#include "windef.h" +#include "wingdi.h" #include void Write (HDC dc, int x, int y, char *s) diff --git a/loader/dos/dosvm.c b/loader/dos/dosvm.c index d9aa9188cef..9b3eca01a88 100644 --- a/loader/dos/dosvm.c +++ b/loader/dos/dosvm.c @@ -21,6 +21,8 @@ #include "wine/winbase16.h" #include "wine/exception.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winnt.h" #include "msdos.h" diff --git a/loader/main.c b/loader/main.c index f146cc37586..b2457f3a632 100644 --- a/loader/main.c +++ b/loader/main.c @@ -2,6 +2,7 @@ * Main initialization code */ +#include #include #include #include @@ -9,7 +10,8 @@ #include #include #include -#include +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "bitmap.h" diff --git a/loader/module.c b/loader/module.c index afafa284813..53ea615822b 100644 --- a/loader/module.c +++ b/loader/module.c @@ -7,12 +7,14 @@ #include #include #include +#include #include #include #include -#include "wine/winuser16.h" -#include "wine/winbase16.h" #include "windef.h" +#include "wingdi.h" +#include "wine/winbase16.h" +#include "wine/winuser16.h" #include "winerror.h" #include "file.h" #include "global.h" diff --git a/loader/ne/convert.c b/loader/ne/convert.c index 00cbb222783..5a7314534f4 100644 --- a/loader/ne/convert.c +++ b/loader/ne/convert.c @@ -5,11 +5,13 @@ */ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "module.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(resource) +DEFAULT_DEBUG_CHANNEL(resource); /********************************************************************** * ConvertDialog32To16 (KERNEL.615) diff --git a/loader/resource.c b/loader/resource.c index 300c53bf872..bfe3ca1f4de 100644 --- a/loader/resource.c +++ b/loader/resource.c @@ -14,6 +14,7 @@ #include #include "winbase.h" #include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" diff --git a/memory/atom.c b/memory/atom.c index 7ac967af321..11d7b018c40 100644 --- a/memory/atom.c +++ b/memory/atom.c @@ -16,9 +16,11 @@ #include #include +#include "windef.h" +#include "wingdi.h" +#include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "winuser.h" #include "global.h" #include "instance.h" #include "ldt.h" diff --git a/memory/environ.c b/memory/environ.c index 0e49e6ad5e3..c6033d58e98 100644 --- a/memory/environ.c +++ b/memory/environ.c @@ -6,6 +6,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winestring.h" #include "process.h" diff --git a/memory/instr.c b/memory/instr.c index e87f54e8481..a4a454736c3 100644 --- a/memory/instr.c +++ b/memory/instr.c @@ -4,6 +4,8 @@ * Copyright 1995 Alexandre Julliard */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "ldt.h" #include "global.h" @@ -13,8 +15,8 @@ #include "selectors.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(int) -DECLARE_DEBUG_CHANNEL(io) +DEFAULT_DEBUG_CHANNEL(int); +DECLARE_DEBUG_CHANNEL(io); #ifdef __i386__ @@ -472,9 +474,8 @@ BOOL INSTR_EmulateInstruction( CONTEXT86 *context ) case 0x22: /* mov eax, crX */ switch (instr[2]) { case 0xc0: - fprintf(stderr,"mov eax,cr0 at 0x%08lx, EAX=0x%08lx\n", - EIP_reg(context),EAX_reg(context) - ); + ERR("mov eax,cr0 at 0x%08lx, EAX=0x%08lx\n", + EIP_reg(context),EAX_reg(context) ); EIP_reg(context) += prefixlen+3; return TRUE; default: @@ -495,12 +496,12 @@ BOOL INSTR_EmulateInstruction( CONTEXT86 *context ) * bit 7: PGE Enable global pages * bit 8: PCE Enable performance counters at IPL3 */ - fprintf(stderr,"mov cr4,eax at 0x%08lx\n",EIP_reg(context)); + ERR("mov cr4,eax at 0x%08lx\n",EIP_reg(context)); EAX_reg(context) = 0; EIP_reg(context) += prefixlen+3; return TRUE; case 0xc0: /* mov cr0, eax */ - fprintf(stderr,"mov cr0,eax at 0x%08lx\n",EIP_reg(context)); + ERR("mov cr0,eax at 0x%08lx\n",EIP_reg(context)); EAX_reg(context) = 0x10; /* FIXME: set more bits ? */ EIP_reg(context) += prefixlen+3; return TRUE; diff --git a/memory/string.c b/memory/string.c index 1b91d637167..c28849b045c 100644 --- a/memory/string.c +++ b/memory/string.c @@ -8,10 +8,12 @@ #include #include +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "winbase.h" -#include "winuser.h" #include "wine/keyboard16.h" #include "wine/exception.h" #include "winerror.h" diff --git a/misc/comm.c b/misc/comm.c index 4cee53494a4..5e569644a2f 100644 --- a/misc/comm.c +++ b/misc/comm.c @@ -35,6 +35,7 @@ #include "config.h" #include +#include #include #include #include @@ -50,6 +51,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "comm.h" #ifdef HAVE_SYS_MODEM_H @@ -69,7 +72,7 @@ #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(comm) +DEFAULT_DEBUG_CHANNEL(comm); #ifndef TIOCINQ #define TIOCINQ FIONREAD diff --git a/misc/ddeml.c b/misc/ddeml.c index 7e635dc1008..41bd899a317 100644 --- a/misc/ddeml.c +++ b/misc/ddeml.c @@ -11,6 +11,8 @@ #include #include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "ddeml.h" #include "winerror.h" diff --git a/misc/lstr.c b/misc/lstr.c index 1637fc4e4a2..389b1f1dee1 100644 --- a/misc/lstr.c +++ b/misc/lstr.c @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -21,10 +22,12 @@ # define iswlower(c) islower(c) #endif /* HAVE_WCTYPE_H */ +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "winbase.h" -#include "winuser.h" #include "winnls.h" #include "task.h" #include "heap.h" @@ -33,7 +36,7 @@ #include "module.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(resource) +DEFAULT_DEBUG_CHANNEL(resource); extern const WORD OLE2NLS_CT_CType3_LUT[]; /* FIXME: does not belong here */ diff --git a/misc/main.c b/misc/main.c index a0254a77379..22645cb025e 100644 --- a/misc/main.c +++ b/misc/main.c @@ -41,6 +41,8 @@ #include "keyboard.h" #include "gdi.h" #include "user.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "tweak.h" diff --git a/misc/spy.c b/misc/spy.c index 0033ece5e0f..6caaf7e0e75 100644 --- a/misc/spy.c +++ b/misc/spy.c @@ -7,6 +7,9 @@ #include #include +#include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "wine/winbase16.h" #include "win.h" diff --git a/misc/system.c b/misc/system.c index 93026714daa..dbb71a0b608 100644 --- a/misc/system.c +++ b/misc/system.c @@ -4,6 +4,8 @@ * Copyright 1996 Alexandre Julliard */ +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "services.h" diff --git a/misc/tweak.c b/misc/tweak.c index 4c30596d4be..f6f299a39c0 100644 --- a/misc/tweak.c +++ b/misc/tweak.c @@ -29,6 +29,8 @@ *****************************************************************************/ #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "tweak.h" #include "options.h" diff --git a/misc/version.c b/misc/version.c index 993f8f7d5ee..1d9d80ed125 100644 --- a/misc/version.c +++ b/misc/version.c @@ -9,7 +9,10 @@ #include #include +#include +#include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winbase16.h" #include "process.h" diff --git a/misc/wsprintf.c b/misc/wsprintf.c index 9c4830519d3..07fbae84cea 100644 --- a/misc/wsprintf.c +++ b/misc/wsprintf.c @@ -6,7 +6,10 @@ #include #include +#include #include "wine/winbase16.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "ldt.h" #include "stackframe.h" diff --git a/msdos/int09.c b/msdos/int09.c index 0199b8fafeb..34e440d57cd 100644 --- a/msdos/int09.c +++ b/msdos/int09.c @@ -4,6 +4,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "miscemu.h" #include "input.h" diff --git a/msdos/int16.c b/msdos/int16.c index 6287073af5b..8b7a3406551 100644 --- a/msdos/int16.c +++ b/msdos/int16.c @@ -11,6 +11,8 @@ #include "console.h" #include "wincon.h" #include "debugtools.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "miscemu.h" diff --git a/msdos/int21.c b/msdos/int21.c index 4186a8c4b47..e6833cf8754 100644 --- a/msdos/int21.c +++ b/msdos/int21.c @@ -20,6 +20,8 @@ #include #include "windef.h" #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" /* SW_NORMAL */ #include "wine/winbase16.h" #include "winerror.h" diff --git a/msdos/int33.c b/msdos/int33.c index e78f78b66bf..6c6dbf0bdfa 100644 --- a/msdos/int33.c +++ b/msdos/int33.c @@ -3,6 +3,8 @@ */ #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "miscemu.h" #include "dosexe.h" diff --git a/msdos/vxd.c b/msdos/vxd.c index 3121fd2aee1..203d75f8187 100644 --- a/msdos/vxd.c +++ b/msdos/vxd.c @@ -6,7 +6,11 @@ #include #include +#include +#include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" diff --git a/objects/clipping.c b/objects/clipping.c index e9f560569cb..d25599b2786 100644 --- a/objects/clipping.c +++ b/objects/clipping.c @@ -8,6 +8,8 @@ #include "dc.h" #include "region.h" #include "debugtools.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" DEFAULT_DEBUG_CHANNEL(clipping) diff --git a/objects/cursoricon.c b/objects/cursoricon.c index a2051b3ca68..6d64d18d823 100644 --- a/objects/cursoricon.c +++ b/objects/cursoricon.c @@ -32,6 +32,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "heap.h" diff --git a/objects/dc.c b/objects/dc.c index e9b962bbb87..d99d4ad3e4f 100644 --- a/objects/dc.c +++ b/objects/dc.c @@ -21,6 +21,8 @@ #include "font.h" #include "callback.h" #include "winerror.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" DEFAULT_DEBUG_CHANNEL(dc) diff --git a/objects/gdiobj.c b/objects/gdiobj.c index 16357ea0a0d..c9af679e9bf 100644 --- a/objects/gdiobj.c +++ b/objects/gdiobj.c @@ -13,6 +13,7 @@ #endif /* !defined(X_DISPLAY_MISSING */ #include +#include #include "bitmap.h" #include "brush.h" @@ -26,6 +27,8 @@ #include "debugtools.h" #include "gdi.h" #include "tweak.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" DEFAULT_DEBUG_CHANNEL(gdi) diff --git a/objects/palette.c b/objects/palette.c index 0217c944c19..13404465334 100644 --- a/objects/palette.c +++ b/objects/palette.c @@ -12,6 +12,8 @@ #include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "gdi.h" #include "color.h" diff --git a/objects/region.c b/objects/region.c index 298782016e8..3e1c38268bf 100644 --- a/objects/region.c +++ b/objects/region.c @@ -83,13 +83,15 @@ SOFTWARE. #include #include -#include "region.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "debugtools.h" +#include "region.h" #include "heap.h" #include "dc.h" -DEFAULT_DEBUG_CHANNEL(region) +DEFAULT_DEBUG_CHANNEL(region); typedef void (*voidProcp)(); diff --git a/objects/text.c b/objects/text.c index 76c82d6d0ed..d72842d171e 100644 --- a/objects/text.c +++ b/objects/text.c @@ -7,6 +7,8 @@ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winbase.h" #include "winuser.h" diff --git a/ole/ole2nls.c b/ole/ole2nls.c index 8cf76ac09d5..8bfec88fbfa 100644 --- a/ole/ole2nls.c +++ b/ole/ole2nls.c @@ -7,8 +7,11 @@ */ #include +#include #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "heap.h" #include "options.h" @@ -20,10 +23,9 @@ #include "crtdll.h" #include "main.h" -DEFAULT_DEBUG_CHANNEL(ole) -DECLARE_DEBUG_CHANNEL(file) -DECLARE_DEBUG_CHANNEL(string) -DECLARE_DEBUG_CHANNEL(win32) +DEFAULT_DEBUG_CHANNEL(ole); +DECLARE_DEBUG_CHANNEL(string); +DECLARE_DEBUG_CHANNEL(win32); struct NLS_langlocale { const int lang; @@ -3418,7 +3420,7 @@ INT WINAPI GetNumberFormatW(LCID locale, DWORD dwflags, LPCWSTR lpvalue, const NUMBERFMTW * lpFormat, LPWSTR lpNumberStr, int cchNumber) { - FIXME_(file)("%s: stub, no reformating done\n",debugstr_w(lpvalue)); + FIXME("%s: stub, no reformating done\n",debugstr_w(lpvalue)); lstrcpynW( lpNumberStr, lpvalue, cchNumber ); return cchNumber? lstrlenW( lpNumberStr ) : 0; diff --git a/relay32/builtin32.c b/relay32/builtin32.c index ea8c4203406..71ed8c9865f 100644 --- a/relay32/builtin32.c +++ b/relay32/builtin32.c @@ -6,7 +6,10 @@ #include #include +#include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "builtin32.h" #include "peexe.h" diff --git a/tools/bin2res.c b/tools/bin2res.c index b121da01f2d..0218f24e4d2 100644 --- a/tools/bin2res.c +++ b/tools/bin2res.c @@ -26,6 +26,8 @@ #ifdef HAVE_SYS_MMAN_H # include #endif +#include "windef.h" +#include "wingdi.h" #include "winuser.h" extern char* g_lpstrFileName; diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c index 0f1691994d5..c38fbd68442 100644 --- a/tools/fnt2bdf.c +++ b/tools/fnt2bdf.c @@ -19,6 +19,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "fnt2bdf.h" #include "neexe.h" diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 80ca457a621..0d527a3a65c 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -18,6 +18,8 @@ #include "wrc.h" #include "genres.h" #include "utils.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #define SetResSize(res, tag) *(DWORD *)&((res)->data[(tag)]) = \ diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 29e31f63451..fb0de3fde14 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -106,6 +106,8 @@ #include "dumpres.h" #include "preproc.h" #include "parser.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #ifdef __BORLANDC__ diff --git a/win32/console.c b/win32/console.c index 0b34e298fb0..b62a16c47aa 100644 --- a/win32/console.c +++ b/win32/console.c @@ -22,6 +22,7 @@ #include "config.h" #include +#include #include #include #include @@ -37,6 +38,8 @@ #include #include "winbase.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "wine/keyboard16.h" #include "thread.h" diff --git a/win32/device.c b/win32/device.c index c9e753e79fb..7e2cd850203 100644 --- a/win32/device.c +++ b/win32/device.c @@ -22,6 +22,8 @@ #include #include #include +#include "windef.h" +#include "wingdi.h" #include "winbase.h" #include "winuser.h" #include "winreg.h" @@ -39,7 +41,7 @@ #include "debugtools.h" #include "global.h" -DEFAULT_DEBUG_CHANNEL(win32) +DEFAULT_DEBUG_CHANNEL(win32); static BOOL DeviceIo_VTDAPI(DWORD dwIoControlCode, @@ -1195,7 +1197,7 @@ static BOOL DeviceIo_MONODEBG(DWORD dwIoControlCode, *(LPDWORD)lpvOutBuffer = 0x20004; /* WC SecretOps */ break; case 9: /* debug output */ - fprintf(stderr,"MONODEBG: %s\n",debugstr_a(lpvInBuffer)); + ERR("MONODEBG: %s\n",debugstr_a(lpvInBuffer)); break; default: FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", diff --git a/win32/except.c b/win32/except.c index 75cb02efe9a..e1ed667d142 100644 --- a/win32/except.c +++ b/win32/except.c @@ -23,6 +23,9 @@ */ #include +#include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "winerror.h" #include "ntddk.h" diff --git a/windows/caret.c b/windows/caret.c index 33bb33052aa..353430637a3 100644 --- a/windows/caret.c +++ b/windows/caret.c @@ -5,6 +5,8 @@ * Copyright 1996 Frans van Dorsselaer */ +#include "windef.h" +#include "wingdi.h" #include "wine/wingdi16.h" #include "wine/winuser16.h" #include "module.h" diff --git a/windows/class.c b/windows/class.c index c94e4e4df18..ce46c955c45 100644 --- a/windows/class.c +++ b/windows/class.c @@ -24,6 +24,8 @@ #include "winproc.h" #include "debugtools.h" #include "winerror.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" DEFAULT_DEBUG_CHANNEL(class) diff --git a/windows/clipboard.c b/windows/clipboard.c index 69d3b094bae..91540afd34d 100644 --- a/windows/clipboard.c +++ b/windows/clipboard.c @@ -23,6 +23,8 @@ #include #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winuser16.h" #include "wine/winbase16.h" diff --git a/windows/dce.c b/windows/dce.c index 88fa67be2ca..112a320439f 100644 --- a/windows/dce.c +++ b/windows/dce.c @@ -29,6 +29,8 @@ #include "local.h" #include "module.h" #include "debugtools.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" diff --git a/windows/defdlg.c b/windows/defdlg.c index 133dd095d45..c35bf2ce2b0 100644 --- a/windows/defdlg.c +++ b/windows/defdlg.c @@ -5,6 +5,8 @@ * */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "dialog.h" #include "win.h" diff --git a/windows/defwnd.c b/windows/defwnd.c index 13d8c2da6f2..97d535183c9 100644 --- a/windows/defwnd.c +++ b/windows/defwnd.c @@ -17,6 +17,8 @@ #include "spy.h" #include "tweak.h" #include "cache.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" DEFAULT_DEBUG_CHANNEL(win) diff --git a/windows/dialog.c b/windows/dialog.c index 3d9b73d83b6..6daab680d62 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -8,7 +8,10 @@ #include #include #include +#include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "windowsx.h" #include "wine/winuser16.h" @@ -23,7 +26,7 @@ #include "message.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(dialog) +DEFAULT_DEBUG_CHANNEL(dialog); /* Dialog control information */ diff --git a/windows/dinput.c b/windows/dinput.c index 696e533fee9..d6e9a75a248 100644 --- a/windows/dinput.c +++ b/windows/dinput.c @@ -48,6 +48,8 @@ #include "sysmetrics.h" #include "winbase.h" #include "winerror.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" DEFAULT_DEBUG_CHANNEL(dinput) diff --git a/windows/driver.c b/windows/driver.c index aee0e9d98e3..0899be7365f 100644 --- a/windows/driver.c +++ b/windows/driver.c @@ -10,6 +10,8 @@ #include #include "heap.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "driver.h" #include "ldt.h" diff --git a/windows/focus.c b/windows/focus.c index db8cd3c975a..dc79a533b2d 100644 --- a/windows/focus.c +++ b/windows/focus.c @@ -7,6 +7,8 @@ * */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "win.h" #include "winpos.h" diff --git a/windows/hook.c b/windows/hook.c index 4ede6fa545f..ad8c72873ad 100644 --- a/windows/hook.c +++ b/windows/hook.c @@ -14,6 +14,8 @@ * handle in the low 16 bits and of a HOOK_MAGIC value in the high 16 bits. */ +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winuser16.h" #include "wine/winbase16.h" diff --git a/windows/input.c b/windows/input.c index 37cf1da958b..1e67fccc043 100644 --- a/windows/input.c +++ b/windows/input.c @@ -11,9 +11,12 @@ #include #include +#include #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" @@ -30,11 +33,11 @@ #include "winerror.h" #include "task.h" -DECLARE_DEBUG_CHANNEL(accel) -DECLARE_DEBUG_CHANNEL(event) -DECLARE_DEBUG_CHANNEL(key) -DECLARE_DEBUG_CHANNEL(keyboard) -DECLARE_DEBUG_CHANNEL(win) +DECLARE_DEBUG_CHANNEL(accel); +DECLARE_DEBUG_CHANNEL(event); +DECLARE_DEBUG_CHANNEL(key); +DECLARE_DEBUG_CHANNEL(keyboard); +DECLARE_DEBUG_CHANNEL(win); static BOOL InputEnabled = TRUE; BOOL SwappedButtons = FALSE; diff --git a/windows/keyboard.c b/windows/keyboard.c index ee6b2ade5a7..2c9ce44c48c 100644 --- a/windows/keyboard.c +++ b/windows/keyboard.c @@ -13,6 +13,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "wine/keyboard16.h" #include "win.h" diff --git a/windows/mdi.c b/windows/mdi.c index 09ad8d11c22..1a81e6d6eb6 100644 --- a/windows/mdi.c +++ b/windows/mdi.c @@ -13,8 +13,11 @@ */ #include +#include #include #include +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "win.h" #include "heap.h" @@ -27,7 +30,7 @@ #include "tweak.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(mdi) +DEFAULT_DEBUG_CHANNEL(mdi); #define MDIF_NEEDUPDATE 0x0001 diff --git a/windows/msgbox.c b/windows/msgbox.c index 4750b2078bc..62495c2b686 100644 --- a/windows/msgbox.c +++ b/windows/msgbox.c @@ -6,6 +6,8 @@ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "dlgs.h" diff --git a/windows/multimon.c b/windows/multimon.c index e8b407a6939..1b9617a91b7 100644 --- a/windows/multimon.c +++ b/windows/multimon.c @@ -5,6 +5,8 @@ */ #include "monitor.h" +#include "windef.h" +#include "wingdi.h" #include "winbase.h" #include "winuser.h" diff --git a/windows/nonclient.c b/windows/nonclient.c index b3416c17200..639479046f0 100644 --- a/windows/nonclient.c +++ b/windows/nonclient.c @@ -5,6 +5,8 @@ * */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "version.h" #include "win.h" diff --git a/windows/painting.c b/windows/painting.c index 677eaa96033..00ea6c582b1 100644 --- a/windows/painting.c +++ b/windows/painting.c @@ -5,17 +5,19 @@ * 1999 Alex Korobka */ +#include "windef.h" +#include "wingdi.h" +#include "wine/winuser16.h" #include "region.h" #include "win.h" #include "queue.h" #include "dce.h" #include "heap.h" #include "debugtools.h" -#include "wine/winuser16.h" #include "cache.h" -DEFAULT_DEBUG_CHANNEL(win) -DECLARE_DEBUG_CHANNEL(nonclient) +DEFAULT_DEBUG_CHANNEL(win); +DECLARE_DEBUG_CHANNEL(nonclient); /* client rect in window coordinates */ diff --git a/windows/property.c b/windows/property.c index 630379328c3..bc9ba410ab3 100644 --- a/windows/property.c +++ b/windows/property.c @@ -6,6 +6,8 @@ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "win.h" #include "heap.h" diff --git a/windows/queue.c b/windows/queue.c index 3b88261e8b2..cacdeb1e002 100644 --- a/windows/queue.c +++ b/windows/queue.c @@ -6,6 +6,8 @@ #include #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "miscemu.h" diff --git a/windows/rect.c b/windows/rect.c index 9bca84e5e94..02ab99cdb6f 100644 --- a/windows/rect.c +++ b/windows/rect.c @@ -5,6 +5,8 @@ * */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winuser.h" diff --git a/windows/scroll.c b/windows/scroll.c index 86868bb05f7..a0952901714 100644 --- a/windows/scroll.c +++ b/windows/scroll.c @@ -9,6 +9,8 @@ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winuser.h" #include "dc.h" diff --git a/windows/syscolor.c b/windows/syscolor.c index 1dddaceaa38..6448e29bab3 100644 --- a/windows/syscolor.c +++ b/windows/syscolor.c @@ -10,6 +10,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "sysmetrics.h" diff --git a/windows/sysmetrics.c b/windows/sysmetrics.c index 97ddf77352f..0f4a0fd4e86 100644 --- a/windows/sysmetrics.c +++ b/windows/sysmetrics.c @@ -7,6 +7,8 @@ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winbase.h" #include "winuser.h" diff --git a/windows/timer.c b/windows/timer.c index b46be521caa..b724780caa6 100644 --- a/windows/timer.c +++ b/windows/timer.c @@ -4,6 +4,8 @@ * Copyright 1993 Alexandre Julliard */ +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "winuser.h" #include "queue.h" diff --git a/windows/user.c b/windows/user.c index 68f380efea9..549c02252b3 100644 --- a/windows/user.c +++ b/windows/user.c @@ -7,6 +7,8 @@ #include #include "wine/winbase16.h" +#include "windef.h" +#include "wingdi.h" #include "winuser.h" #include "heap.h" #include "user.h" diff --git a/windows/win.c b/windows/win.c index be2f0c05d82..bb266b2bb52 100644 --- a/windows/win.c +++ b/windows/win.c @@ -6,6 +6,8 @@ #include #include +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "options.h" @@ -1040,9 +1042,7 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, if (!(classAtom = GlobalFindAtomA( className ))) { - fprintf( stderr, "CreateWindowEx16: bad class name " ); - if (!HIWORD(className)) fprintf( stderr, "%04x\n", LOWORD(className) ); - else fprintf( stderr, "'%s'\n", className ); + ERR( "bad class name %s\n", debugres_a(className) ); return 0; } @@ -1096,9 +1096,7 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, if (!(classAtom = GlobalFindAtomA( className ))) { - fprintf( stderr, "CreateWindowEx32A: bad class name " ); - if (!HIWORD(className)) fprintf( stderr, "%04x\n", LOWORD(className) ); - else fprintf( stderr, "'%s'\n", className ); + ERR( "bad class name %s\n", debugres_a(className) ); return 0; } @@ -1150,14 +1148,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, if (!(classAtom = GlobalFindAtomW( className ))) { - if (HIWORD(className)) - { - LPSTR cn = HEAP_strdupWtoA( GetProcessHeap(), 0, className ); - WARN("Bad class name '%s'\n",cn); - HeapFree( GetProcessHeap(), 0, cn ); - } - else - WARN("Bad class name %p\n", className ); + ERR( "bad class name %s\n", debugres_w(className) ); return 0; } diff --git a/windows/winhelp.c b/windows/winhelp.c index 6ce4b54318d..8f897cb6cf4 100644 --- a/windows/winhelp.c +++ b/windows/winhelp.c @@ -7,6 +7,8 @@ #include #include #include "debugtools.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "wine/winbase16.h" #include "winversion.h" diff --git a/windows/winpos.c b/windows/winpos.c index 1c6fb94195b..ba42028bac4 100644 --- a/windows/winpos.c +++ b/windows/winpos.c @@ -6,6 +6,8 @@ */ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "heap.h" #include "module.h" diff --git a/windows/winproc.c b/windows/winproc.c index 9188dfe29b5..0c8f4fac917 100644 --- a/windows/winproc.c +++ b/windows/winproc.c @@ -6,9 +6,10 @@ */ #include +#include "windef.h" +#include "wingdi.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "winuser.h" #include "stackframe.h" #include "builtin16.h" #include "heap.h" diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c index ba98d173407..2eeb43d51ef 100644 --- a/windows/x11drv/clipboard.c +++ b/windows/x11drv/clipboard.c @@ -52,11 +52,14 @@ #include #include #include +#include #include #include #include "ts_xlib.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "clipboard.h" #include "message.h" @@ -68,7 +71,7 @@ #include "options.h" #include "debugtools.h" -DEFAULT_DEBUG_CHANNEL(clipboard) +DEFAULT_DEBUG_CHANNEL(clipboard); /* Selection masks */ @@ -255,10 +258,10 @@ BOOL X11DRV_CLIPBOARD_LaunchServer() /* Build the debug class mask to pass to the server, by inheriting * the settings for the clipboard debug channel. */ - dbgClasses |= __GET_DEBUGGING(__DBCL_FIXME, dbch_clipboard) ? 1 : 0; - dbgClasses |= __GET_DEBUGGING(__DBCL_ERR, dbch_clipboard) ? 2 : 0; - dbgClasses |= __GET_DEBUGGING(__DBCL_WARN, dbch_clipboard) ? 4 : 0; - dbgClasses |= __GET_DEBUGGING(__DBCL_TRACE, dbch_clipboard) ? 8 : 0; + dbgClasses |= FIXME_ON(clipboard) ? 1 : 0; + dbgClasses |= ERR_ON(clipboard) ? 2 : 0; + dbgClasses |= WARN_ON(clipboard) ? 4 : 0; + dbgClasses |= TRACE_ON(clipboard) ? 8 : 0; sprintf(dbgClassMask, "%d", dbgClasses); /* Get the clear selection preference */ diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c index 23b528e4d9b..2febf0a9447 100644 --- a/windows/x11drv/keyboard.c +++ b/windows/x11drv/keyboard.c @@ -21,6 +21,8 @@ #include "ts_xresource.h" #include "ts_xutil.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" #include "dinput.h" #include "debugtools.h" diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c index ccd9882cc70..14ca4125ba9 100644 --- a/windows/x11drv/wnd.c +++ b/windows/x11drv/wnd.c @@ -28,6 +28,8 @@ #include "windef.h" #include "class.h" #include "x11drv.h" +#include "windef.h" +#include "wingdi.h" #include "wine/winuser16.h" DEFAULT_DEBUG_CHANNEL(win)