Some more recursive include fixes/optimizations.

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

include/mmsystem.h

@@ -5,6 +5,8 @@
 #ifndef __WINE_MMSYSTEM_H
 #define __WINE_MMSYSTEM_H
 
+#include "wintypes.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif 

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

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

multimedia/audio.c

@@ -20,11 +20,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #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

multimedia/dplay.c

@@ -5,14 +5,12 @@
  * <presently under construction - contact hunnise@nortelnetworks.com>
  *
  */
-#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;

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"
 

multimedia/init.c

@@ -9,9 +9,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "windows.h"
+#include "winbase.h"
 #include "multimedia.h"
-#include "mmsystem.h"
 #include "xmalloc.h"
 #include "debug.h"
 

multimedia/joystick.c

@@ -19,10 +19,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
-#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;
 }
 

multimedia/mcianim.c

@@ -10,13 +10,12 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#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
 

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"

multimedia/mcimidi.c

@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#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 {

multimedia/mcistring.c

@@ -18,13 +18,11 @@
 #include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#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"

multimedia/mciwave.c

@@ -20,13 +20,11 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #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)
 

multimedia/midi.c

@@ -14,27 +14,22 @@
  * 98/11 splitted in midi.c and mcimidi.c
  */
 
+#include "config.h"
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#include <sys/errno.h>
-#endif
 #include <sys/ioctl.h>
 #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;

multimedia/mixer.c

@@ -8,7 +8,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "windows.h"
+#include "wintypes.h"
 #include "user.h"
 #include "driver.h"
 #include "multimedia.h"

multimedia/mmaux.c

@@ -10,8 +10,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "windows.h"
-#include "user.h"
+#include "wintypes.h"
 #include "driver.h"
 #include "multimedia.h"
 #include "debug.h"

multimedia/mmio.c

@@ -10,10 +10,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#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"

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"

multimedia/time.c

@@ -9,17 +9,13 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#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;

objects/cursoricon.c

@@ -31,9 +31,8 @@
 
 #include <string.h>
 #include <stdlib.h>
+#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"

objects/enhmetafile.c

@@ -5,9 +5,9 @@
 
 #include <string.h>
 #include <assert.h>
-#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"

objects/linedda.c

@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
+#include "wingdi.h"
 
 
 /**********************************************************************

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"

objects/text.c

@@ -6,7 +6,9 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "wine/winuser16.h"
 #include "dc.h"
 #include "gdi.h"
 #include "heap.h"

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"
 

windows/clipboard.c

@@ -12,12 +12,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
-#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"

windows/dialog.c

@@ -9,7 +9,9 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include "windows.h"
+#include "winuser.h"
+#include "wine/winuser16.h"
+#include "wine/winbase16.h"
 #include "dialog.h"
 #include "drive.h"
 #include "heap.h"

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 <string.h>

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"

windows/input.c

@@ -14,7 +14,9 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "windows.h"
+#include "winuser.h"
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "win.h"
 #include "gdi.h"
 #include "heap.h"

windows/keyboard.c

@@ -14,7 +14,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "windows.h"
+#include "winuser.h"
+#include "wine/keyboard16.h"
 #include "win.h"
 #include "gdi.h"
 #include "heap.h"

windows/mdi.c

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include "windows.h"
+#include "winuser.h"
 #include "win.h"
 #include "heap.h"
 #include "nonclient.h"

windows/mouse.c

@@ -6,7 +6,7 @@
  */
 
 #include <assert.h>
-#include "windows.h"
+#include "winuser.h"
 #include "gdi.h"
 #include "mouse.h"
 #include "debug.h"

windows/multimon.c

@@ -4,8 +4,9 @@
  * Copyright 1998 Turchanov Sergey
  */
 
+#include "winbase.h"
+#include "winuser.h"
 #include "monitor.h"
-#include "windows.h"
 
 /**********************************************************************/
 

windows/rect.c

@@ -5,7 +5,8 @@
  *
  */
 
-#include "windows.h"
+#include "winuser.h"
+#include "wine/winuser16.h"
 
 
 /***********************************************************************

windows/scroll.c

@@ -8,7 +8,7 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
+#include "winuser.h"
 #include "class.h"
 #include "dc.h"
 #include "win.h"

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"

windows/user.c

@@ -6,7 +6,8 @@
  */
 
 #include <stdlib.h>
-#include "windows.h"
+#include "wine/winbase16.h"
+#include "winuser.h"
 #include "heap.h"
 #include "gdi.h"
 #include "user.h"

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"