From 61afa33b03ad30e95abca4faf7587246ec136446 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Feb 1999 10:16:00 +0000 Subject: [PATCH] Some more recursive include fixes/optimizations. --- include/menu.h | 2 ++ include/mmsystem.h | 2 ++ include/sysmetrics.h | 2 +- include/vfw.h | 4 ++-- multimedia/audio.c | 2 -- multimedia/dplay.c | 6 ++---- multimedia/dsound.c | 2 +- multimedia/init.c | 3 +-- multimedia/joystick.c | 11 ++++------- multimedia/mcianim.c | 5 ++--- multimedia/mcicda.c | 3 +-- multimedia/mcimidi.c | 3 +-- multimedia/mcistring.c | 4 +--- multimedia/mciwave.c | 4 +--- multimedia/midi.c | 9 ++------- multimedia/mixer.c | 2 +- multimedia/mmaux.c | 3 +-- multimedia/mmio.c | 5 ++--- multimedia/mmsystem.c | 1 - multimedia/time.c | 12 ++++-------- objects/cursoricon.c | 4 +--- objects/enhmetafile.c | 4 ++-- objects/linedda.c | 2 +- objects/metafile.c | 1 - objects/text.c | 4 +++- windows/caret.c | 3 ++- windows/clipboard.c | 6 ++---- windows/dialog.c | 4 +++- windows/driver.c | 2 +- windows/hook.c | 4 +++- windows/input.c | 4 +++- windows/keyboard.c | 3 ++- windows/mdi.c | 2 +- windows/mouse.c | 2 +- windows/multimon.c | 3 ++- windows/rect.c | 3 ++- windows/scroll.c | 2 +- windows/timer.c | 2 +- windows/user.c | 3 ++- windows/winproc.c | 3 ++- 40 files changed, 66 insertions(+), 80 deletions(-) diff --git a/include/menu.h b/include/menu.h index 99c153faba2..e7fdc61dede 100644 --- a/include/menu.h +++ b/include/menu.h @@ -5,6 +5,8 @@ #ifndef __WINE_MENU_H #define __WINE_MENU_H +#include "win.h" + #define MAGIC_REDUCE 3 #define MAGIC_RESTORE 2 #define MAGIC_CLOSE 5 diff --git a/include/mmsystem.h b/include/mmsystem.h index a86b5ff6474..471aa526f41 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -5,6 +5,8 @@ #ifndef __WINE_MMSYSTEM_H #define __WINE_MMSYSTEM_H +#include "wintypes.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/include/sysmetrics.h b/include/sysmetrics.h index 24d7307ca29..e6265fa3f67 100644 --- a/include/sysmetrics.h +++ b/include/sysmetrics.h @@ -7,7 +7,7 @@ #ifndef __WINE_SYSMETRICS_H #define __WINE_SYSMETRICS_H -#include "wingdi.h" +#include "wintypes.h" /* Constant system metrics */ #if 0 #ifdef WIN_95_LOOK diff --git a/include/vfw.h b/include/vfw.h index 1bad21570d6..2ceb2e3d07e 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -2,9 +2,9 @@ #define __WINE_VFW_H #include "wintypes.h" +#include "mmsystem.h" #include "wingdi.h" -#include "driver.h" -#include "objbase.h" +#include "wine/obj_base.h" #define VFWAPI WINAPI #define VFWAPIV WINAPIV diff --git a/multimedia/audio.c b/multimedia/audio.c index 2f5f9e6b8f1..994d2f5481a 100644 --- a/multimedia/audio.c +++ b/multimedia/audio.c @@ -20,11 +20,9 @@ #include #include #include "wine/winuser16.h" -#include "user.h" #include "driver.h" #include "multimedia.h" #include "heap.h" -#include "ldt.h" #include "debug.h" #ifdef HAVE_OSS diff --git a/multimedia/dplay.c b/multimedia/dplay.c index f92bcf55a84..ad14fab2236 100644 --- a/multimedia/dplay.c +++ b/multimedia/dplay.c @@ -5,14 +5,12 @@ * * */ -#include "heap.h" #include "winerror.h" -#include "debug.h" #include "winnt.h" #include "winreg.h" #include "dplay.h" - -#include "thread.h" +#include "heap.h" +#include "debug.h" struct IDirectPlayLobby { LPDIRECTPLAYLOBBY_VTABLE lpVtbl; diff --git a/multimedia/dsound.c b/multimedia/dsound.c index b0becda2638..f3148d66398 100644 --- a/multimedia/dsound.c +++ b/multimedia/dsound.c @@ -64,7 +64,7 @@ #include "dsound.h" #include "winerror.h" #include "multimedia.h" -#include "objbase.h" +#include "wine/obj_base.h" #include "thread.h" #include "debug.h" diff --git a/multimedia/init.c b/multimedia/init.c index ddff74ce5ef..02541826e64 100644 --- a/multimedia/init.c +++ b/multimedia/init.c @@ -9,9 +9,8 @@ #include #include #include -#include "windows.h" +#include "winbase.h" #include "multimedia.h" -#include "mmsystem.h" #include "xmalloc.h" #include "debug.h" diff --git a/multimedia/joystick.c b/multimedia/joystick.c index e7493dd6033..fb6c758d15f 100644 --- a/multimedia/joystick.c +++ b/multimedia/joystick.c @@ -19,10 +19,7 @@ #include #include #include -#include "windows.h" -#include "ldt.h" -#include "user.h" -#include "driver.h" +#include "winuser.h" #include "mmsystem.h" #include "debug.h" @@ -164,7 +161,7 @@ MMRESULT32 WINAPI joyGetDevCaps32A(UINT32 wID, LPJOYCAPS32A lpCaps,UINT32 wSize) lpCaps->wMid = jc16.wMid; lpCaps->wPid = jc16.wPid; - lstrcpy32A(lpCaps->szPname,jc16.szPname); + strcpy(lpCaps->szPname,jc16.szPname); lpCaps->wXmin = jc16.wXmin; lpCaps->wXmax = jc16.wXmax; lpCaps->wYmin = jc16.wYmin; @@ -185,8 +182,8 @@ MMRESULT32 WINAPI joyGetDevCaps32A(UINT32 wID, LPJOYCAPS32A lpCaps,UINT32 wSize) lpCaps->wMaxAxes = jc16.wMaxAxes; lpCaps->wNumAxes = jc16.wNumAxes; lpCaps->wMaxButtons = jc16.wMaxButtons; - lstrcpy32A(lpCaps->szRegKey,jc16.szRegKey); - lstrcpy32A(lpCaps->szOEMVxD,jc16.szOEMVxD); + strcpy(lpCaps->szRegKey,jc16.szRegKey); + strcpy(lpCaps->szOEMVxD,jc16.szOEMVxD); return ret; } diff --git a/multimedia/mcianim.c b/multimedia/mcianim.c index 16cf0ab85ca..d0421c81cf5 100644 --- a/multimedia/mcianim.c +++ b/multimedia/mcianim.c @@ -10,13 +10,12 @@ #include #include #include -#include "windows.h" +#include "wintypes.h" #include "wine/winuser16.h" -#include "user.h" #include "driver.h" #include "mmsystem.h" -#include "debug.h" #include "multimedia.h" +#include "debug.h" #define MAX_ANIMDRV 2 diff --git a/multimedia/mcicda.c b/multimedia/mcicda.c index 884b9830570..37eccb42b7f 100644 --- a/multimedia/mcicda.c +++ b/multimedia/mcicda.c @@ -6,8 +6,7 @@ * Copyright 1998-99 Eric Pouech */ -#include "windows.h" -#include "user.h" +#include "winuser.h" #include "driver.h" #include "multimedia.h" #include "debug.h" diff --git a/multimedia/mcimidi.c b/multimedia/mcimidi.c index 292ff93a9da..46909a9499e 100644 --- a/multimedia/mcimidi.c +++ b/multimedia/mcimidi.c @@ -21,6 +21,7 @@ #include #include #include +#include "callback.h" #include "wine/winuser16.h" #include "ldt.h" #include "multimedia.h" @@ -28,8 +29,6 @@ #include "driver.h" #include "xmalloc.h" #include "debug.h" -#include "callback.h" -#include "options.h" #include "heap.h" typedef struct { diff --git a/multimedia/mcistring.c b/multimedia/mcistring.c index 8b82b684034..7fcdbf92cfc 100644 --- a/multimedia/mcistring.c +++ b/multimedia/mcistring.c @@ -18,13 +18,11 @@ #include #include #include -#include "windows.h" +#include "multimedia.h" #include "heap.h" #include "ldt.h" #include "user.h" #include "driver.h" -#include "mmsystem.h" -#include "multimedia.h" #include "callback.h" #include "debug.h" #include "xmalloc.h" diff --git a/multimedia/mciwave.c b/multimedia/mciwave.c index f48fe12549c..2e282ce16a5 100644 --- a/multimedia/mciwave.c +++ b/multimedia/mciwave.c @@ -20,13 +20,11 @@ #include #include #include "wine/winuser16.h" -#include "user.h" #include "driver.h" +#include "multimedia.h" #include "mmsystem.h" #include "heap.h" -#include "ldt.h" #include "debug.h" -#include "multimedia.h" #define MAX_MCIWAVEDRV (1) diff --git a/multimedia/midi.c b/multimedia/midi.c index b899ab846d5..8a7846f1925 100644 --- a/multimedia/midi.c +++ b/multimedia/midi.c @@ -14,27 +14,22 @@ * 98/11 splitted in midi.c and mcimidi.c */ +#include "config.h" #include #include #include #include #include #include -#if defined(__FreeBSD__) || defined(__OpenBSD__) -#include -#endif #include #include "wine/winuser16.h" -#include "ldt.h" #include "multimedia.h" -#include "user.h" #include "driver.h" #include "xmalloc.h" #include "debug.h" -#include "callback.h" -#include "options.h" #include "heap.h" + typedef struct { #ifndef HAVE_OSS int unixdev; diff --git a/multimedia/mixer.c b/multimedia/mixer.c index 72bded31f4e..d0458e34f32 100644 --- a/multimedia/mixer.c +++ b/multimedia/mixer.c @@ -8,7 +8,7 @@ #include #include #include -#include "windows.h" +#include "wintypes.h" #include "user.h" #include "driver.h" #include "multimedia.h" diff --git a/multimedia/mmaux.c b/multimedia/mmaux.c index 193330666aa..3deac1cd251 100644 --- a/multimedia/mmaux.c +++ b/multimedia/mmaux.c @@ -10,8 +10,7 @@ #include #include #include -#include "windows.h" -#include "user.h" +#include "wintypes.h" #include "driver.h" #include "multimedia.h" #include "debug.h" diff --git a/multimedia/mmio.c b/multimedia/mmio.c index e352e9d9c29..57bcbc2ed30 100644 --- a/multimedia/mmio.c +++ b/multimedia/mmio.c @@ -10,10 +10,9 @@ #include #include #include -#include "windows.h" -#include "win.h" +#include "wintypes.h" +#include "wine/winbase16.h" #include "heap.h" -#include "user.h" #include "file.h" #include "mmsystem.h" #include "debug.h" diff --git a/multimedia/mmsystem.c b/multimedia/mmsystem.c index 26b57bfff8a..00a27646e8f 100644 --- a/multimedia/mmsystem.c +++ b/multimedia/mmsystem.c @@ -25,7 +25,6 @@ #include "windef.h" #include "wine/winbase16.h" #include "wine/winuser16.h" -#include "win.h" #include "heap.h" #include "ldt.h" #include "user.h" diff --git a/multimedia/time.c b/multimedia/time.c index fe1f8baec08..dab91b11809 100644 --- a/multimedia/time.c +++ b/multimedia/time.c @@ -9,17 +9,13 @@ #include #include #include -#include "windows.h" -#include "win.h" -#include "ldt.h" -#include "module.h" +#include "wintypes.h" +#include "wine/winbase16.h" /* GetTaskDS */ #include "callback.h" -#include "user.h" -#include "driver.h" #include "mmsystem.h" -#include "debug.h" #include "xmalloc.h" #include "options.h" +#include "debug.h" #define USE_FAKE_MM_TIMERS @@ -207,7 +203,7 @@ static WORD timeSetEventInternal(UINT32 wDelay,UINT32 wResol, lpNewTimer->isWin32 = isWin32; lpNewTimer->hInstance = GetTaskDS(); TRACE(mmtime, "hInstance=%04X !\n", lpNewTimer->hInstance); - TRACE(mmtime, "lpFunc=%p !\n", isWin32 ? lpFunc : PTR_SEG_TO_LIN(lpFunc)); + TRACE(mmtime, "lpFunc=0x%08lx !\n", (DWORD)lpFunc ); lpNewTimer->dwUser = dwUser; lpNewTimer->wFlags = wFlags; return lpNewTimer->wTimerID; diff --git a/objects/cursoricon.c b/objects/cursoricon.c index 314400437ea..96e62f32adc 100644 --- a/objects/cursoricon.c +++ b/objects/cursoricon.c @@ -31,9 +31,8 @@ #include #include +#include "wine/winbase16.h" #include "heap.h" -#include "windows.h" -#include "peexe.h" #include "color.h" #include "bitmap.h" #include "cursoricon.h" @@ -42,7 +41,6 @@ #include "sysmetrics.h" #include "global.h" #include "module.h" -#include "win.h" #include "debug.h" #include "task.h" #include "user.h" diff --git a/objects/enhmetafile.c b/objects/enhmetafile.c index 676fb9b1068..dcf42c55414 100644 --- a/objects/enhmetafile.c +++ b/objects/enhmetafile.c @@ -5,9 +5,9 @@ #include #include -#include "windows.h" -#include "gdi.h" #include "winbase.h" +#include "wine/winestring.h" +#include "gdi.h" #include "winnt.h" #include "debug.h" #include "winerror.h" diff --git a/objects/linedda.c b/objects/linedda.c index 7297860366d..eb76e45b09c 100644 --- a/objects/linedda.c +++ b/objects/linedda.c @@ -5,7 +5,7 @@ */ #include -#include "windows.h" +#include "wingdi.h" /********************************************************************** diff --git a/objects/metafile.c b/objects/metafile.c index 1da0384dada..27f7b2b3f7c 100644 --- a/objects/metafile.c +++ b/objects/metafile.c @@ -12,7 +12,6 @@ #include "metafiledrv.h" #include "metafile.h" #include "bitmap.h" -#include "file.h" #include "heap.h" #include "toolhelp.h" #include "debug.h" diff --git a/objects/text.c b/objects/text.c index a10ea74c26f..5597cb92ea2 100644 --- a/objects/text.c +++ b/objects/text.c @@ -6,7 +6,9 @@ */ #include -#include "windows.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/winuser16.h" #include "dc.h" #include "gdi.h" #include "heap.h" diff --git a/windows/caret.c b/windows/caret.c index 49026e3b10a..a5f61cae364 100644 --- a/windows/caret.c +++ b/windows/caret.c @@ -5,7 +5,8 @@ * Copyright 1996 Frans van Dorsselaer */ -#include "windows.h" +#include "winuser.h" +#include "wine/winuser16.h" #include "module.h" #include "debug.h" diff --git a/windows/clipboard.c b/windows/clipboard.c index 5f273764525..bcc4f154e69 100644 --- a/windows/clipboard.c +++ b/windows/clipboard.c @@ -12,12 +12,10 @@ #include #include #include -#include "windows.h" -#include "win.h" +#include "winuser.h" #include "heap.h" -#include "message.h" -#include "queue.h" #include "task.h" +#include "message.h" #include "clipboard.h" #include "xmalloc.h" #include "debug.h" diff --git a/windows/dialog.c b/windows/dialog.c index 19f347829af..8752738e6dc 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -9,7 +9,9 @@ #include #include #include -#include "windows.h" +#include "winuser.h" +#include "wine/winuser16.h" +#include "wine/winbase16.h" #include "dialog.h" #include "drive.h" #include "heap.h" diff --git a/windows/driver.c b/windows/driver.c index e0f12066ecf..d375f076559 100644 --- a/windows/driver.c +++ b/windows/driver.c @@ -10,9 +10,9 @@ #include "wine/winuser16.h" #include "heap.h" -#include "win.h" #include "callback.h" #include "driver.h" +#include "ldt.h" #include "module.h" #include "debug.h" #include diff --git a/windows/hook.c b/windows/hook.c index c4336cc03b7..c03a40d55bf 100644 --- a/windows/hook.c +++ b/windows/hook.c @@ -14,7 +14,9 @@ * handle in the low 16 bits and of a HOOK_MAGIC value in the high 16 bits. */ -#include "windows.h" +#include "winuser.h" +#include "wine/winuser16.h" +#include "wine/winbase16.h" #include "hook.h" #include "queue.h" #include "task.h" diff --git a/windows/input.c b/windows/input.c index c68008b2f8e..082820408f2 100644 --- a/windows/input.c +++ b/windows/input.c @@ -14,7 +14,9 @@ #include #include -#include "windows.h" +#include "winuser.h" +#include "wine/winbase16.h" +#include "wine/winuser16.h" #include "win.h" #include "gdi.h" #include "heap.h" diff --git a/windows/keyboard.c b/windows/keyboard.c index d52e02ffab4..7b500edb25a 100644 --- a/windows/keyboard.c +++ b/windows/keyboard.c @@ -14,7 +14,8 @@ #include #include #include -#include "windows.h" +#include "winuser.h" +#include "wine/keyboard16.h" #include "win.h" #include "gdi.h" #include "heap.h" diff --git a/windows/mdi.c b/windows/mdi.c index 250255acc54..5204be05658 100644 --- a/windows/mdi.c +++ b/windows/mdi.c @@ -15,7 +15,7 @@ #include #include #include -#include "windows.h" +#include "winuser.h" #include "win.h" #include "heap.h" #include "nonclient.h" diff --git a/windows/mouse.c b/windows/mouse.c index c1c8f77c794..aa641b01068 100644 --- a/windows/mouse.c +++ b/windows/mouse.c @@ -6,7 +6,7 @@ */ #include -#include "windows.h" +#include "winuser.h" #include "gdi.h" #include "mouse.h" #include "debug.h" diff --git a/windows/multimon.c b/windows/multimon.c index 6938c25adad..a85d8f432ff 100644 --- a/windows/multimon.c +++ b/windows/multimon.c @@ -4,8 +4,9 @@ * Copyright 1998 Turchanov Sergey */ +#include "winbase.h" +#include "winuser.h" #include "monitor.h" -#include "windows.h" /**********************************************************************/ diff --git a/windows/rect.c b/windows/rect.c index 8914c88035f..4c0043b570c 100644 --- a/windows/rect.c +++ b/windows/rect.c @@ -5,7 +5,8 @@ * */ -#include "windows.h" +#include "winuser.h" +#include "wine/winuser16.h" /*********************************************************************** diff --git a/windows/scroll.c b/windows/scroll.c index 46ec2563574..c20c485f846 100644 --- a/windows/scroll.c +++ b/windows/scroll.c @@ -8,7 +8,7 @@ */ #include -#include "windows.h" +#include "winuser.h" #include "class.h" #include "dc.h" #include "win.h" diff --git a/windows/timer.c b/windows/timer.c index 93b8f41d569..c09c434f60c 100644 --- a/windows/timer.c +++ b/windows/timer.c @@ -4,7 +4,7 @@ * Copyright 1993 Alexandre Julliard */ -#include "windows.h" +#include "winuser.h" #include "queue.h" #include "task.h" #include "winproc.h" diff --git a/windows/user.c b/windows/user.c index 2e3571202c9..489e62617c9 100644 --- a/windows/user.c +++ b/windows/user.c @@ -6,7 +6,8 @@ */ #include -#include "windows.h" +#include "wine/winbase16.h" +#include "winuser.h" #include "heap.h" #include "gdi.h" #include "user.h" diff --git a/windows/winproc.c b/windows/winproc.c index 396c9c18e0f..3cbb3803197 100644 --- a/windows/winproc.c +++ b/windows/winproc.c @@ -5,7 +5,8 @@ * Copyright 1996 Alexandre Julliard */ -#include "windows.h" +#include "wine/winbase16.h" +#include "winuser.h" #include "callback.h" #include "heap.h" #include "selectors.h"