Removed #include of wingdi.h and windef.h from winuser.h (and resolved
the resulting compilation failures).
diff --git a/controls/button.c b/controls/button.c
index fb958e5..d51d190 100644
--- a/controls/button.c
+++ b/controls/button.c
@@ -8,6 +8,8 @@
#include <string.h>
#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 8ff6333..0940de2 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -9,8 +9,9 @@
#include <string.h>
#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 c170f2c..78e2abe 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 006ffc6..9e657b7 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -7,6 +7,8 @@
#include <stdio.h>
#include <string.h>
#include <unistd.h>
+#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 bebcb00..3a1ea7b 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -6,6 +6,9 @@
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
+#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 a2f5aba..a277ecb 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -17,9 +17,11 @@
#include <stdlib.h>
#include <string.h>
-#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 901873f..6748222 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 f67467c..48b19e5 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 30870a0..82ca1d3 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 cca4716..95e71ee 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -17,8 +17,11 @@
*/
#include <math.h>
+#include <stdio.h>
#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 b3fd83f..c8e5112 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -27,6 +27,8 @@
#include <string.h>
#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 f9ca6f8..112df83 100644
--- a/dlls/comctl32/updown.c
+++ b/dlls/comctl32/updown.c
@@ -29,15 +29,18 @@
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+#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 5d3836a..3cc2c39 100644
--- a/dlls/commdlg/colordlg.c
+++ b/dlls/commdlg/colordlg.c
@@ -7,8 +7,11 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
+#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 dda1deb..83cafa1 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -6,8 +6,11 @@
*/
#include <ctype.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
+#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 f57f8c6..11222fb 100644
--- a/dlls/commdlg/filedlgbrowser.c
+++ b/dlls/commdlg/filedlgbrowser.c
@@ -7,6 +7,8 @@
#include <stdio.h>
#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 1c0b783..8b05123 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 56a9143..9635568 100644
--- a/dlls/commdlg/fontdlg.c
+++ b/dlls/commdlg/fontdlg.c
@@ -7,8 +7,11 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
+#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 e27f543..ce3b166 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -8,8 +8,11 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
+#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 d62e8b1..048797e 100644
--- a/dlls/crtdll/crtdll_main.c
+++ b/dlls/crtdll/crtdll_main.c
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
+#include <stdio.h>
#include <sys/stat.h>
#include <sys/times.h>
#include <unistd.h>
@@ -41,6 +42,8 @@
#include <fcntl.h>
#include <setjmp.h>
#include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "ntddk.h"
@@ -53,7 +56,7 @@
#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 04abf35..3785703 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -62,6 +62,8 @@
#include <string.h>
#include <math.h> /* 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 @@
for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++)
if (flags[i].mask & xmask)
- fprintf(stderr,"%s ",flags[i].name);
+ DPRINTF("%s ",flags[i].name);
}
/*******************************************************************************
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index d84f68b..95aa4c4 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -5,6 +5,8 @@
*/
#include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
#include "winuser.h"
#include "winerror.h"
#include "windef.h"
diff --git a/dlls/mouse/mouse_main.c b/dlls/mouse/mouse_main.c
index 71edd1f..440af17b 100644
--- a/dlls/mouse/mouse_main.c
+++ b/dlls/mouse/mouse_main.c
@@ -13,6 +13,8 @@
#include "module.h"
#include "mouse.h"
#include "monitor.h"
+#include "windef.h"
+#include "wingdi.h"
#include "winuser.h"
#include "win.h"
#include "wine/winbase16.h"
diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
index e22be5e..9e96684 100644
--- a/dlls/msacm32/driver.c
+++ b/dlls/msacm32/driver.c
@@ -10,6 +10,8 @@
#include "winbase.h"
#include "winerror.h"
#include "windef.h"
+#include "windef.h"
+#include "wingdi.h"
#include "winuser.h"
#include "debugtools.h"
#include "driver.h"
diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c
index c179f3b..c1db520 100644
--- a/dlls/msacm32/internal.c
+++ b/dlls/msacm32/internal.c
@@ -10,6 +10,8 @@
#include <string.h>
#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 6c97caa..38a8319 100644
--- a/dlls/msvideo/msvideo_main.c
+++ b/dlls/msvideo/msvideo_main.c
@@ -5,6 +5,8 @@
#include <string.h>
#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 c95eb1f..8f2450c 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -11,6 +11,8 @@
#include <string.h>
#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 fa8fc6a..fc1dba8 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -11,6 +11,7 @@
#include <math.h>
#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 fd7f6b9..7a6ce76 100644
--- a/dlls/ole32/clipboard.c
+++ b/dlls/ole32/clipboard.c
@@ -44,6 +44,8 @@
*/
#include <assert.h>
+#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 5cdde94..c0cf1f6 100644
--- a/dlls/ole32/ole2.c
+++ b/dlls/ole32/ole2.c
@@ -8,8 +8,11 @@
#include <assert.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
+#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 c9be60d..03ed997 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 130536c..54b0e00 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/dlls/oleaut32/ole2disp.c
@@ -4,6 +4,8 @@
* Copyright 1995 Martin von Loewis
*/
#include <string.h>
+#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 a073663..f3d95ee 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -3,6 +3,8 @@
*
*/
#include <string.h>
+#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 d93e8e9..4b92cd4 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -3,7 +3,11 @@
*
*/
#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
#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 ed5e84f..2edf252 100644
--- a/dlls/shell32/shell.c
+++ b/dlls/shell32/shell.c
@@ -8,6 +8,8 @@
#include <string.h>
#include <unistd.h>
#include <ctype.h>
+#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 4402538..cc8acd5 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -6,7 +6,10 @@
*/
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+#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 @@
*
*/
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 f04c126..8f371d9 100644
--- a/dlls/shell32/shpolicy.c
+++ b/dlls/shell32/shpolicy.c
@@ -16,6 +16,8 @@
#include <stdlib.h>
#include <string.h>
+#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 dca7fce..e773639 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -23,6 +23,7 @@
#include "config.h"
#include <unistd.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
@@ -34,12 +35,14 @@
#ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
#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 289e602..6e941e6 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -7,9 +7,12 @@
*/
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#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 a94e979..606f285 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 6903a04..fdbeeab 100644
--- a/dlls/winmm/mciavi/mciavi.c
+++ b/dlls/winmm/mciavi/mciavi.c
@@ -7,6 +7,8 @@
*/
#include <string.h>
+#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 0401c8d..8dfa95b 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 46cbea9..94a46f9 100644
--- a/dlls/winmm/mciseq/mcimidi.c
+++ b/dlls/winmm/mciseq/mcimidi.c
@@ -16,6 +16,8 @@
*/
#include <stdlib.h>
+#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 6bd66e1..5a57e03 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 97df8ab..ec51e7a 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 c036123..c37637b 100644
--- a/dlls/winmm/time.c
+++ b/dlls/winmm/time.c
@@ -8,6 +8,8 @@
#include <time.h>
#include <sys/time.h>
+#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 24e8d81..fd038e7 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 14506f1..07f7bc7 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -16,11 +16,14 @@
#include "config.h"
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
+#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 73cd463..555eb31 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -18,6 +18,8 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/ioctl.h>
+#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 1e7c421..395941c 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 7018d52..8ef48c7 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -8,6 +8,7 @@
#include <ctype.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -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 64fbdb4..2395e57 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -22,6 +22,7 @@
#include <unistd.h>
#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 3b229ec..4d16416 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -8,6 +8,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <pwd.h>
@@ -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 049583e..e8aad37 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 ca38b45..829b27f 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 27f987e..97ce45e 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 d5d6256..6989bb6 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -25,6 +25,8 @@
#include <fcntl.h>
#include <math.h>
#include <assert.h>
+#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 797e42b..ac22334 100644
--- a/if1632/snoop.c
+++ b/if1632/snoop.c
@@ -6,7 +6,10 @@
#include <assert.h>
#include <string.h>
+#include <stdio.h>
#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 cdba5b4..31a22f6 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 d35fc6c..68d1410 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 2f805d8..251e481 100644
--- a/include/commdlg.h
+++ b/include/commdlg.h
@@ -10,6 +10,7 @@
#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 6f60e62..afa4be1 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 cd65082..02151fe 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 3448c82..e12c572 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 758f8d7..6910c54 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 1198ddb..65f4108 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 956058d..79ff537 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 d353abc..818f285 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 15daf20..6b1a9ae 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 63a3f0d..7c2878b 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 8ce44e5..c6da254 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4,8 +4,6 @@
#ifndef RC_INVOKED
#include <stdarg.h>
#endif
-#include "windef.h"
-#include "wingdi.h"
#ifdef __cplusplus
extern "C" {
diff --git a/libtest/hello4.c b/libtest/hello4.c
index 259d455..08e5ff7 100644
--- a/libtest/hello4.c
+++ b/libtest/hello4.c
@@ -2,6 +2,8 @@
#include <windows.h>
/* Win32 counterpart for CalcChildScroll16 is not implemented */
/* even in MS Visual C++ */
+#include "windef.h"
+#include "wingdi.h"
#include <wine/winuser16.h>
void Write (HDC dc, int x, int y, char *s)
diff --git a/loader/dos/dosvm.c b/loader/dos/dosvm.c
index d9aa918..9b3eca0 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 f146cc3..b2457f3 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -2,6 +2,7 @@
* Main initialization code
*/
+#include <assert.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -9,7 +10,8 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <assert.h>
+#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 afafa28..53ea615 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -7,12 +7,14 @@
#include <assert.h>
#include <fcntl.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
-#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 00cbb22..5a73145 100644
--- a/loader/ne/convert.c
+++ b/loader/ne/convert.c
@@ -5,11 +5,13 @@
*/
#include <string.h>
+#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 300c53b..bfe3ca1 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -14,6 +14,7 @@
#include <unistd.h>
#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 7ac967a..11d7b01 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -16,9 +16,11 @@
#include <string.h>
#include <ctype.h>
+#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 0e49e6a..c6033d5 100644
--- a/memory/environ.c
+++ b/memory/environ.c
@@ -6,6 +6,8 @@
#include <stdlib.h>
#include <string.h>
+#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 e87f54e..a4a4547 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 @@
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 @@
* 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 1b91d63..c28849b 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -8,10 +8,12 @@
#include <ctype.h>
#include <string.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 "wine/keyboard16.h"
#include "wine/exception.h"
#include "winerror.h"
diff --git a/misc/comm.c b/misc/comm.c
index 4cee534..5e56964 100644
--- a/misc/comm.c
+++ b/misc/comm.c
@@ -35,6 +35,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdio.h>
#include <termios.h>
#include <fcntl.h>
#include <string.h>
@@ -50,6 +51,8 @@
#include <sys/ioctl.h>
#include <unistd.h>
+#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 7e635dc..41bd899 100644
--- a/misc/ddeml.c
+++ b/misc/ddeml.c
@@ -11,6 +11,8 @@
#include <stdlib.h>
#include <string.h>
#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 1637fc4..389b1f1 100644
--- a/misc/lstr.c
+++ b/misc/lstr.c
@@ -9,6 +9,7 @@
#include <stdarg.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -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 a0254a7..22645cb 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 0033ece..6caaf7e 100644
--- a/misc/spy.c
+++ b/misc/spy.c
@@ -7,6 +7,9 @@
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+#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 9302671..dbb71a0 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 4c30596..f6f299a 100644
--- a/misc/tweak.c
+++ b/misc/tweak.c
@@ -29,6 +29,8 @@
*****************************************************************************/
#include <string.h>
+#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 993f8f7..1d9d80e 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -9,7 +9,10 @@
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
+#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 9c48305..07fbae8 100644
--- a/misc/wsprintf.c
+++ b/misc/wsprintf.c
@@ -6,7 +6,10 @@
#include <stdarg.h>
#include <string.h>
+#include <stdio.h>
#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 0199b8f..34e440d 100644
--- a/msdos/int09.c
+++ b/msdos/int09.c
@@ -4,6 +4,8 @@
#include <stdlib.h>
#include <string.h>
+#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 6287073..8b7a340 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 4186a8c..e6833cf 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -20,6 +20,8 @@
#include <ctype.h>
#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 e78f78b..6c6dbf0 100644
--- a/msdos/int33.c
+++ b/msdos/int33.c
@@ -3,6 +3,8 @@
*/
#include <stdlib.h>
+#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 3121fd2..203d75f 100644
--- a/msdos/vxd.c
+++ b/msdos/vxd.c
@@ -6,7 +6,11 @@
#include <fcntl.h>
#include <memory.h>
+#include <sys/types.h>
+#include <unistd.h>
#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 e9f5605..d25599b 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 a2051b3..6d64d18 100644
--- a/objects/cursoricon.c
+++ b/objects/cursoricon.c
@@ -32,6 +32,8 @@
#include <string.h>
#include <stdlib.h>
+#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 e9b962b..d99d4ad 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 16357ea..c9af679 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -13,6 +13,7 @@
#endif /* !defined(X_DISPLAY_MISSING */
#include <stdlib.h>
+#include <stdio.h>
#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 0217c94..1340446 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -12,6 +12,8 @@
#include <string.h>
#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 2987820..3e1c382 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -83,13 +83,15 @@
#include <stdlib.h>
#include <string.h>
-#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 76c82d6..d72842d 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -7,6 +7,8 @@
#include <string.h>
+#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 8cf76ac..8bfec88 100644
--- a/ole/ole2nls.c
+++ b/ole/ole2nls.c
@@ -7,8 +7,11 @@
*/
#include <string.h>
+#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
+#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 @@
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 ea8c420..71ed8c9 100644
--- a/relay32/builtin32.c
+++ b/relay32/builtin32.c
@@ -6,7 +6,10 @@
#include <assert.h>
#include <string.h>
+#include <stdio.h>
#include <ctype.h>
+#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 b121da0..0218f24 100644
--- a/tools/bin2res.c
+++ b/tools/bin2res.c
@@ -26,6 +26,8 @@
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
#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 0f16919..c38fbd6 100644
--- a/tools/fnt2bdf.c
+++ b/tools/fnt2bdf.c
@@ -19,6 +19,8 @@
#include <unistd.h>
#include <fcntl.h>
+#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 80ca457..0d527a3 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 29e31f6..fb0de3f 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 0b34e29..b62a16c 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -22,6 +22,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdio.h>
#include <unistd.h>
#include <termios.h>
#include <string.h>
@@ -37,6 +38,8 @@
#include <assert.h>
#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 c9e753e..7e2cd85 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -22,6 +22,8 @@
#include <string.h>
#include <stdarg.h>
#include <time.h>
+#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 @@
*(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 75cb02e..e1ed667 100644
--- a/win32/except.c
+++ b/win32/except.c
@@ -23,6 +23,9 @@
*/
#include <assert.h>
+#include <stdio.h>
+#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 33bb330..3534306 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 c94e4e4..ce46c95 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 69d3b09..91540af 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -23,6 +23,8 @@
#include <fcntl.h>
#include <unistd.h>
#include <string.h>
+#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 88fa67b..112a320 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 133dd09..c35bf2c 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 13d8c2d..97d5351 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 3d9b73d..6daab68 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -8,7 +8,10 @@
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
+#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 696e533..d6e9a75 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 aee0e9d..0899be7 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -10,6 +10,8 @@
#include <string.h>
#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 db8cd3c..dc79a53 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 4ede6fa..ad8c728 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 37cf1da..1e67fccc 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -11,9 +11,12 @@
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
#include <ctype.h>
#include <assert.h>
+#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 ee6b2ad..2c9ce44 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -13,6 +13,8 @@
#include <string.h>
#include <ctype.h>
+#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 09ad8d1..1a81e6d 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -13,8 +13,11 @@
*/
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <math.h>
+#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 4750b20..62495c2 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -6,6 +6,8 @@
#include <string.h>
+#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 e8b407a..1b9617a 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 b3416c1..6394790 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 677eaa9..00ea6c5 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 6303793..bc9ba41 100644
--- a/windows/property.c
+++ b/windows/property.c
@@ -6,6 +6,8 @@
#include <string.h>
+#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 3b88261..cacdeb1 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -6,6 +6,8 @@
#include <string.h>
#include <signal.h>
#include <assert.h>
+#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 9bca84e..02ab99c 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 86868bb..a095290 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -9,6 +9,8 @@
#include <stdlib.h>
+#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 1dddace..6448e29 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -10,6 +10,8 @@
#include <stdio.h>
#include <stdlib.h>
+#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 97ddf77..0f4a0fd 100644
--- a/windows/sysmetrics.c
+++ b/windows/sysmetrics.c
@@ -7,6 +7,8 @@
#include <stdio.h>
+#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 b46be52..b724780 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 68f380e..549c022 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -7,6 +7,8 @@
#include <stdlib.h>
#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 be2f0c0..bb266b2 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -6,6 +6,8 @@
#include <stdlib.h>
#include <string.h>
+#include "windef.h"
+#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "options.h"
@@ -1040,9 +1042,7 @@
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 @@
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 @@
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 6ce4b54..8f897cb 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -7,6 +7,8 @@
#include <string.h>
#include <unistd.h>
#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 1c6fb94..ba42028 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -6,6 +6,8 @@
*/
#include <string.h>
+#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 9188dfe..0c8f4fa 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -6,9 +6,10 @@
*/
#include <string.h>
+#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 ba98d17..2eeb43d 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -52,11 +52,14 @@
#include <errno.h>
#include <X11/Xatom.h>
#include <string.h>
+#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#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 @@
/* 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 23b528e..2febf0a 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 ccd9882..14ca412 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)
