diff --git a/dlls/shell32/contmenu.c b/dlls/shell32/contmenu.c index 9712c0698ce..ed3b7bcf8d4 100644 --- a/dlls/shell32/contmenu.c +++ b/dlls/shell32/contmenu.c @@ -9,7 +9,7 @@ #include "debug.h" #include "pidl.h" -#include "objbase.h" +#include "wine/obj_base.h" #include "if_macros.h" #include "shlguid.h" #include "shell32_main.h" diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 24927fef55b..64b58ca66d8 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -7,7 +7,7 @@ #include #include #include "debug.h" -#include "objbase.h" +#include "wine/obj_base.h" #include "winerror.h" #include "pidl.h" diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index f556c96d8b6..efab1d38942 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -7,7 +7,7 @@ #include #include #include "debug.h" -#include "objbase.h" +#include "wine/obj_base.h" #include "winerror.h" #include "pidl.h" #include "shell32_main.h" diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index b77cc664f47..961dddf9340 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -9,7 +9,6 @@ #include "debug.h" #include "winerror.h" -#include "objbase.h" #include "wine/obj_base.h" #include "wine/obj_storage.h" diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 8a77bfa2177..345f06c9b31 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -10,7 +10,7 @@ #include #include "winreg.h" #include "winerror.h" -#include "objbase.h" +#include "wine/obj_base.h" #include "winversion.h" #include "shlguid.h" diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 97c5b508eff..bd9dc6e6127 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -17,7 +17,7 @@ #include "shlguid.h" #include "shlobj.h" #include "servprov.h" -#include "objbase.h" +#include "wine/obj_base.h" #include "if_macros.h" #include "shell32_main.h" #include "shresdef.h" diff --git a/graphics/d3ddevices.c b/graphics/d3ddevices.c index c73700ee583..f3f5e43bf00 100644 --- a/graphics/d3ddevices.c +++ b/graphics/d3ddevices.c @@ -12,7 +12,6 @@ #include "ddraw.h" #include "d3d.h" #include "debug.h" -#include "objbase.h" #include "d3d_private.h" diff --git a/graphics/d3dexecutebuffer.c b/graphics/d3dexecutebuffer.c index 9a02ed9759e..787f7d61791 100644 --- a/graphics/d3dexecutebuffer.c +++ b/graphics/d3dexecutebuffer.c @@ -12,7 +12,6 @@ #include "ddraw.h" #include "d3d.h" #include "debug.h" -#include "objbase.h" #include "d3d_private.h" diff --git a/graphics/d3dlight.c b/graphics/d3dlight.c index ddf64aed813..e3099b82f85 100644 --- a/graphics/d3dlight.c +++ b/graphics/d3dlight.c @@ -12,7 +12,6 @@ #include "ddraw.h" #include "d3d.h" #include "debug.h" -#include "objbase.h" #include "d3d_private.h" diff --git a/graphics/d3dmaterial.c b/graphics/d3dmaterial.c index 0bb4f6e2029..b757fbad85f 100644 --- a/graphics/d3dmaterial.c +++ b/graphics/d3dmaterial.c @@ -11,7 +11,6 @@ #include "ddraw.h" #include "d3d.h" #include "debug.h" -#include "objbase.h" #include "d3d_private.h" diff --git a/graphics/d3dtexture.c b/graphics/d3dtexture.c index 6a41917bd4d..533bff51e23 100644 --- a/graphics/d3dtexture.c +++ b/graphics/d3dtexture.c @@ -12,7 +12,6 @@ #include "ddraw.h" #include "d3d.h" #include "debug.h" -#include "objbase.h" #include "d3d_private.h" diff --git a/graphics/d3dviewport.c b/graphics/d3dviewport.c index 07a8c5686e4..49c34ec2dbe 100644 --- a/graphics/d3dviewport.c +++ b/graphics/d3dviewport.c @@ -11,7 +11,6 @@ #include "ddraw.h" #include "d3d.h" #include "debug.h" -#include "objbase.h" #include "d3d_private.h" diff --git a/graphics/ddraw.c b/graphics/ddraw.c index 3f21ef48888..1fb88782fae 100644 --- a/graphics/ddraw.c +++ b/graphics/ddraw.c @@ -50,7 +50,6 @@ #include "winerror.h" #include "gdi.h" #include "heap.h" -#include "ldt.h" #include "dc.h" #include "win.h" #include "miscemu.h" @@ -60,7 +59,6 @@ #include "spy.h" #include "message.h" #include "options.h" -#include "objbase.h" #include "monitor.h" /* This for all the enumeration and creation of D3D-related objects */ diff --git a/loader/main.c b/loader/main.c index ddf03f110a6..173bd479a7e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -14,7 +14,6 @@ #include "bitmap.h" #include "comm.h" #include "neexe.h" -#include "win.h" #include "main.h" #include "menu.h" #include "message.h" diff --git a/memory/atom.c b/memory/atom.c index 28d4f4f1428..6c03de1d34c 100644 --- a/memory/atom.c +++ b/memory/atom.c @@ -17,6 +17,8 @@ #include #include "winuser.h" +#include "wine/winbase16.h" +#include "wine/winuser16.h" #include "instance.h" #include "ldt.h" #include "stackframe.h" diff --git a/misc/lstr.c b/misc/lstr.c index 69e403683d0..3d8980c45da 100644 --- a/misc/lstr.c +++ b/misc/lstr.c @@ -26,6 +26,7 @@ #include "winnls.h" #include "wine/winbase16.h" #include "winuser.h" +#include "wine/winuser16.h" #include "task.h" #include "heap.h" #include "ldt.h" diff --git a/msdos/dosconf.c b/msdos/dosconf.c index dd447ac4f49..97ddb56e332 100644 --- a/msdos/dosconf.c +++ b/msdos/dosconf.c @@ -10,7 +10,7 @@ #include #include #include -#include "windows.h" +#include "winbase.h" #include "msdos.h" #include "debug.h" #include "options.h" diff --git a/msdos/dosmem.c b/msdos/dosmem.c index e0a63a970f7..fea99ee5c4e 100644 --- a/msdos/dosmem.c +++ b/msdos/dosmem.c @@ -8,8 +8,8 @@ #include #include #include -#include "windows.h" #include "winbase.h" +#include "wine/winbase16.h" #include "global.h" #include "ldt.h" #include "miscemu.h" diff --git a/msdos/dpmi.c b/msdos/dpmi.c index 7ec8e2e70cd..2ace8b7ec29 100644 --- a/msdos/dpmi.c +++ b/msdos/dpmi.c @@ -6,23 +6,19 @@ #include #include -#include "windows.h" -#include "heap.h" -#include "global.h" +#include "wintypes.h" +#include "wine/winbase16.h" #include "ldt.h" +#include "global.h" #include "module.h" #include "miscemu.h" -#include "drive.h" #include "msdos.h" #include "task.h" -#include "dosexe.h" #include "toolhelp.h" -#include "debug.h" #include "selectors.h" -#include "thread.h" #include "process.h" -#include "stackframe.h" #include "callback.h" +#include "debug.h" #define DOS_GET_DRIVE(reg) ((reg) ? (reg) - 1 : DRIVE_GetCurrentDrive()) diff --git a/msdos/int16.c b/msdos/int16.c index 02ea9e8ffa7..aba0de1061d 100644 --- a/msdos/int16.c +++ b/msdos/int16.c @@ -7,14 +7,10 @@ #include #include "config.h" -#include "debug.h" - -#include "ldt.h" -#include "drive.h" -#include "msdos.h" -#include "miscemu.h" #include "module.h" #include "console.h" +#include "wincon.h" +#include "debug.h" /********************************************************************** * INT_Int16Handler diff --git a/msdos/int21.c b/msdos/int21.c index df36e8ce538..84219c9a4c0 100644 --- a/msdos/int21.c +++ b/msdos/int21.c @@ -16,7 +16,10 @@ #include #include #include -#include "windows.h" +#include "windef.h" +#include "winbase.h" +#include "winuser.h" /* SW_NORMAL */ +#include "wine/winbase16.h" #include "winerror.h" #include "drive.h" #include "file.h" diff --git a/msdos/int2a.c b/msdos/int2a.c index 1924a351068..8f3d6ad9485 100644 --- a/msdos/int2a.c +++ b/msdos/int2a.c @@ -5,7 +5,6 @@ #include #include "msdos.h" #include "miscemu.h" -/* #define DEBUG_INT */ #include "debug.h" /********************************************************************** diff --git a/msdos/interrupts.c b/msdos/interrupts.c index e1bf56b5204..740e0095baf 100644 --- a/msdos/interrupts.c +++ b/msdos/interrupts.c @@ -5,13 +5,9 @@ */ #include - -#include "windows.h" -#include "drive.h" +#include "wintypes.h" #include "miscemu.h" #include "msdos.h" -#include "module.h" -#include "stackframe.h" #include "debug.h" static FARPROC16 INT_Vectors[256]; diff --git a/msdos/ioports.c b/msdos/ioports.c index 88e14e08217..f9f4801fec4 100644 --- a/msdos/ioports.c +++ b/msdos/ioports.c @@ -16,7 +16,7 @@ #include #include #include -#include "windows.h" +#include "wintypes.h" #include "vga.h" #include "dosexe.h" #include "options.h" diff --git a/msdos/vxd.c b/msdos/vxd.c index 10c569b0694..db81220e135 100644 --- a/msdos/vxd.c +++ b/msdos/vxd.c @@ -6,12 +6,13 @@ #include #include -#include "windows.h" #include "winbase.h" +#include "winuser.h" +#include "wine/winbase16.h" +#include "wine/winuser16.h" #include "msdos.h" #include "miscemu.h" #include "selectors.h" -#include "module.h" #include "neexe.h" #include "task.h" #include "process.h" diff --git a/msdos/xms.c b/msdos/xms.c index c5d462fdb06..8e7cbde63eb 100644 --- a/msdos/xms.c +++ b/msdos/xms.c @@ -8,7 +8,7 @@ #include #include -#include "windows.h" +#include "winbase.h" #include "global.h" #include "module.h" #include "miscemu.h" diff --git a/ole/storage.c b/ole/storage.c index ce177ed3558..7c306e5df8f 100644 --- a/ole/storage.c +++ b/ole/storage.c @@ -10,8 +10,10 @@ #include #include #include -#include "windows.h" +#include "windef.h" #include "winerror.h" +#include "wine/winestring.h" +#include "wine/winbase16.h" #include "file.h" #include "ole.h" #include "wine/obj_base.h" diff --git a/ole/typelib.c b/ole/typelib.c index d0f18e12f88..674215a976e 100644 --- a/ole/typelib.c +++ b/ole/typelib.c @@ -8,8 +8,8 @@ #include #include #include "wintypes.h" +#include "wine/winbase16.h" #include "heap.h" -#include "windows.h" #include "winreg.h" #include "winerror.h" #include "oleauto.h" diff --git a/programs/avitools/icinfo.c b/programs/avitools/icinfo.c index e3c12913b30..a536f67754d 100644 --- a/programs/avitools/icinfo.c +++ b/programs/avitools/icinfo.c @@ -2,6 +2,7 @@ #include #include "wintypes.h" #include "windows.h" +#include "driver.h" #include "mmsystem.h" #include "vfw.h" diff --git a/relay32/relay386.c b/relay32/relay386.c index a2c8ef4c69d..5f740a6f423 100644 --- a/relay32/relay386.c +++ b/relay32/relay386.c @@ -8,7 +8,6 @@ #include #include #include "winnt.h" -#include "windows.h" #include "builtin32.h" #include "selectors.h" #include "debugstr.h" @@ -136,6 +135,9 @@ int RELAY_CallFrom32( int ret_addr, ... ) case 15: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5], args[6],args[7],args[8],args[9],args[10],args[11], args[12],args[13],args[14]); break; + case 16: ret = cfunc(args[0],args[1],args[2],args[3],args[4],args[5], + args[6],args[7],args[8],args[9],args[10],args[11], + args[12],args[13],args[14],args[15]); break; default: ERR(relay, "Unsupported nb args %d\n", nb_args ); @@ -176,6 +178,9 @@ int RELAY_CallFrom32( int ret_addr, ... ) case 15: ret = func(args[0],args[1],args[2],args[3],args[4],args[5], args[6],args[7],args[8],args[9],args[10],args[11], args[12],args[13],args[14]); break; + case 16: ret = func(args[0],args[1],args[2],args[3],args[4],args[5], + args[6],args[7],args[8],args[9],args[10],args[11], + args[12],args[13],args[14],args[15]); break; default: ERR(relay, "Unsupported nb args %d\n",nb_args ); assert(FALSE); diff --git a/tools/build.c b/tools/build.c index 8bf5ada09ac..94903c01234 100644 --- a/tools/build.c +++ b/tools/build.c @@ -12,7 +12,7 @@ #include #include -#include "windows.h" +#include "winbase.h" #include "winnt.h" #include "module.h" #include "neexe.h" diff --git a/windows/clipboard.c b/windows/clipboard.c index bcc4f154e69..d6753b5cccb 100644 --- a/windows/clipboard.c +++ b/windows/clipboard.c @@ -13,6 +13,7 @@ #include #include #include "winuser.h" +#include "wine/winuser16.h" #include "heap.h" #include "task.h" #include "message.h" diff --git a/windows/input.c b/windows/input.c index 082820408f2..f1660f50af6 100644 --- a/windows/input.c +++ b/windows/input.c @@ -17,6 +17,7 @@ #include "winuser.h" #include "wine/winbase16.h" #include "wine/winuser16.h" +#include "wine/keyboard16.h" #include "win.h" #include "gdi.h" #include "heap.h"