From 44a182229be4a97ba6e59fe7d90516efc60efdbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Gouget?= Date: Tue, 19 Dec 2000 04:53:20 +0000 Subject: [PATCH] winuser.h now requires that we include winbase.h first. --- controls/icontitle.c | 2 ++ dlls/commdlg/filedlgbrowser.c | 1 + dlls/dsound/dsound_main.c | 1 + dlls/msvideo/drawdib.c | 2 +- dlls/ole32/clipboard.c | 2 +- dlls/ole32/ole2nls.c | 2 ++ dlls/oleaut32/ole2disp.c | 2 ++ dlls/oleaut32/oleaut.c | 2 ++ dlls/oleaut32/stubs.c | 1 + dlls/richedit/rtf.h | 1 + dlls/user/user_main.c | 1 + dlls/winmm/joystick/joystick.c | 2 ++ dlls/winmm/mcianim/mcianim.c | 1 + dlls/winmm/mciavi/mciavi.c | 2 ++ dlls/winmm/mcicda/mcicda.c | 2 ++ dlls/winmm/mciseq/mcimidi.c | 2 ++ dlls/winmm/mciwave/mciwave.c | 1 + dlls/winmm/midimap/midimap.c | 1 + dlls/winmm/time.c | 2 ++ dlls/winmm/wavemap/wavemap.c | 1 + dlls/winmm/wineoss/midi.c | 2 ++ dlls/winmm/wineoss/oss.c | 1 + include/win.h | 1 + include/winpos.h | 1 + misc/tweak.c | 2 ++ msdos/int09.c | 2 ++ msdos/int33.c | 2 ++ ole/ole2nls.c | 2 ++ tools/bin2res.c | 2 ++ tools/wrc/genres.c | 1 + tools/wrc/parser.y | 1 + windows/clipboard.c | 2 ++ windows/dialog.c | 2 ++ windows/hook.c | 1 + windows/input.c | 1 + windows/keyboard.c | 1 + windows/mdi.c | 2 ++ 37 files changed, 55 insertions(+), 2 deletions(-) diff --git a/controls/icontitle.c b/controls/icontitle.c index 85f9c5bc441..0f4e4e6a3d6 100644 --- a/controls/icontitle.c +++ b/controls/icontitle.c @@ -7,7 +7,9 @@ #include #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/winuser16.h" diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index b2357f1c417..f95b48031fb 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -7,6 +7,7 @@ #include #include "windef.h" +#include "winbase.h" #include "winnls.h" #include "wingdi.h" #include "winuser.h" diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 39b98c07ce5..7adf2242dc8 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -34,6 +34,7 @@ #include /* Insomnia - pow() function */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winerror.h" diff --git a/dlls/msvideo/drawdib.c b/dlls/msvideo/drawdib.c index a9e52750cd0..1f079616db0 100644 --- a/dlls/msvideo/drawdib.c +++ b/dlls/msvideo/drawdib.c @@ -7,9 +7,9 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winbase.h" #include "wine/winbase16.h" #include "debugtools.h" #include "vfw.h" diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 2b71cd6ffa8..a5068cef58e 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -47,9 +47,9 @@ #include #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winbase.h" #include "winerror.h" #include "winnls.h" #include "ole2.h" diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c index 6e8594f4b2c..8765cbc2ec8 100644 --- a/dlls/ole32/ole2nls.c +++ b/dlls/ole32/ole2nls.c @@ -10,7 +10,9 @@ #include #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/windef16.h" diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c index 755ba166dd8..a2afae6cc6f 100644 --- a/dlls/oleaut32/ole2disp.c +++ b/dlls/oleaut32/ole2disp.c @@ -4,7 +4,9 @@ * Copyright 1995 Martin von Loewis */ #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winerror.h" diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index b5b63bc1056..ddf6adac79f 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -3,7 +3,9 @@ * */ #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winerror.h" diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c index fc682c1bfbb..8bdc54ec006 100644 --- a/dlls/oleaut32/stubs.c +++ b/dlls/oleaut32/stubs.c @@ -7,6 +7,7 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "debugtools.h" diff --git a/dlls/richedit/rtf.h b/dlls/richedit/rtf.h index f12475fc6fc..0feb3d7e9e2 100644 --- a/dlls/richedit/rtf.h +++ b/dlls/richedit/rtf.h @@ -4,6 +4,7 @@ #include #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "richedit.h" diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c index af7b2a9ac27..5e8052bb88d 100644 --- a/dlls/user/user_main.c +++ b/dlls/user/user_main.c @@ -3,6 +3,7 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winreg.h" diff --git a/dlls/winmm/joystick/joystick.c b/dlls/winmm/joystick/joystick.c index 2eebf4432d6..fe48410dde4 100644 --- a/dlls/winmm/joystick/joystick.c +++ b/dlls/winmm/joystick/joystick.c @@ -36,7 +36,9 @@ #ifdef HAVE_SYS_ERRNO_H #include #endif + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/mcianim/mcianim.c b/dlls/winmm/mcianim/mcianim.c index 0dcbf8671ef..00b2094a66b 100644 --- a/dlls/winmm/mcianim/mcianim.c +++ b/dlls/winmm/mcianim/mcianim.c @@ -6,6 +6,7 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/mciavi/mciavi.c b/dlls/winmm/mciavi/mciavi.c index 9aade4f7957..5603da96238 100644 --- a/dlls/winmm/mciavi/mciavi.c +++ b/dlls/winmm/mciavi/mciavi.c @@ -7,7 +7,9 @@ */ #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c index 68ed6a0310f..c950c1d7445 100644 --- a/dlls/winmm/mcicda/mcicda.c +++ b/dlls/winmm/mcicda/mcicda.c @@ -9,7 +9,9 @@ #include "config.h" #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/mciseq/mcimidi.c b/dlls/winmm/mciseq/mcimidi.c index 633e6f2f711..d8182682961 100644 --- a/dlls/winmm/mciseq/mcimidi.c +++ b/dlls/winmm/mciseq/mcimidi.c @@ -17,7 +17,9 @@ #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c index 1fb3af0c520..2747e2e2e0e 100644 --- a/dlls/winmm/mciwave/mciwave.c +++ b/dlls/winmm/mciwave/mciwave.c @@ -9,6 +9,7 @@ #include "winerror.h" #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/midimap/midimap.c b/dlls/winmm/midimap/midimap.c index 18d1e141470..17cf7a19b79 100644 --- a/dlls/winmm/midimap/midimap.c +++ b/dlls/winmm/midimap/midimap.c @@ -6,6 +6,7 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 822b5f7f071..8f130d75cb7 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -8,7 +8,9 @@ #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "winemm.h" diff --git a/dlls/winmm/wavemap/wavemap.c b/dlls/winmm/wavemap/wavemap.c index 0e061b3a8aa..66f33e886d4 100644 --- a/dlls/winmm/wavemap/wavemap.c +++ b/dlls/winmm/wavemap/wavemap.c @@ -12,6 +12,7 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index fe1c9d8d2e6..09b0a75ef36 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -18,7 +18,9 @@ #include #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/dlls/winmm/wineoss/oss.c b/dlls/winmm/wineoss/oss.c index 225df59893b..8ba4d39b7d7 100644 --- a/dlls/winmm/wineoss/oss.c +++ b/dlls/winmm/wineoss/oss.c @@ -6,6 +6,7 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "mmddk.h" diff --git a/include/win.h b/include/win.h index f139ccce6ec..ea410271321 100644 --- a/include/win.h +++ b/include/win.h @@ -8,6 +8,7 @@ #define __WINE_WIN_H #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winproc.h" #include "winuser.h" diff --git a/include/winpos.h b/include/winpos.h index b6a9a211e86..ecadf6df441 100644 --- a/include/winpos.h +++ b/include/winpos.h @@ -8,6 +8,7 @@ #define __WINE_WINPOS_H #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" diff --git a/misc/tweak.c b/misc/tweak.c index b6bbfd98712..146233a92af 100644 --- a/misc/tweak.c +++ b/misc/tweak.c @@ -29,7 +29,9 @@ *****************************************************************************/ #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "tweak.h" diff --git a/msdos/int09.c b/msdos/int09.c index 6a527e3dccb..16ca67acbda 100644 --- a/msdos/int09.c +++ b/msdos/int09.c @@ -4,7 +4,9 @@ #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "miscemu.h" diff --git a/msdos/int33.c b/msdos/int33.c index a74bafe5aa5..90619a517de 100644 --- a/msdos/int33.c +++ b/msdos/int33.c @@ -3,7 +3,9 @@ */ #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "miscemu.h" diff --git a/ole/ole2nls.c b/ole/ole2nls.c index c7c2cd4db97..2365fd1ea8d 100644 --- a/ole/ole2nls.c +++ b/ole/ole2nls.c @@ -11,7 +11,9 @@ #include #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/unicode.h" diff --git a/tools/bin2res.c b/tools/bin2res.c index 998e7604bf5..b223b70078b 100644 --- a/tools/bin2res.c +++ b/tools/bin2res.c @@ -26,7 +26,9 @@ #ifdef HAVE_SYS_MMAN_H # include #endif + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 14541176cc6..541f305c6a4 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -22,6 +22,7 @@ #include "genres.h" #include "utils.h" #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 8f7161ff657..61861f1ade3 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -124,6 +124,7 @@ #include "preproc.h" #include "parser.h" #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" diff --git a/windows/clipboard.c b/windows/clipboard.c index 2da3a59e3b8..b9ec2f009d8 100644 --- a/windows/clipboard.c +++ b/windows/clipboard.c @@ -23,7 +23,9 @@ #include #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/winuser16.h" diff --git a/windows/dialog.c b/windows/dialog.c index b7a9d2e141b..6566b9b97b8 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -10,8 +10,10 @@ #include #include #include + #include "windef.h" #include "winnls.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "windowsx.h" diff --git a/windows/hook.c b/windows/hook.c index 68ca4c1b7f5..a2b7ca764b0 100644 --- a/windows/hook.c +++ b/windows/hook.c @@ -15,6 +15,7 @@ */ #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/winuser16.h" diff --git a/windows/input.c b/windows/input.c index e5877d968e7..6d408f0025d 100644 --- a/windows/input.c +++ b/windows/input.c @@ -17,6 +17,7 @@ #include "windef.h" #include "winnls.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/winbase16.h" diff --git a/windows/keyboard.c b/windows/keyboard.c index bcee740f607..c64ce30601f 100644 --- a/windows/keyboard.c +++ b/windows/keyboard.c @@ -14,6 +14,7 @@ #include #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/keyboard16.h" diff --git a/windows/mdi.c b/windows/mdi.c index ca96da60caf..bfb95c933df 100644 --- a/windows/mdi.c +++ b/windows/mdi.c @@ -70,7 +70,9 @@ #include #include #include + #include "windef.h" +#include "winbase.h" #include "wingdi.h" #include "winuser.h" #include "wine/unicode.h"