Removed some unnecessary includes.

This commit is contained in:
Alexandre Julliard 2000-12-01 21:32:55 +00:00
parent 6170666f25
commit ef57e18f99
46 changed files with 9 additions and 56 deletions

View file

@ -24,7 +24,6 @@
#define PATH_MAX _MAX_PATH #define PATH_MAX _MAX_PATH
#endif #endif
#include "debugger.h" #include "debugger.h"
#include "neexe.h"
#include "file.h" #include "file.h"
typedef struct typedef struct

View file

@ -19,7 +19,6 @@
#include "commctrl.h" #include "commctrl.h"
#include "vfw.h" #include "vfw.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "services.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(animate); DEFAULT_DEBUG_CHANNEL(animate);

View file

@ -41,7 +41,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "class.h"
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/unicode.h" #include "wine/unicode.h"

View file

@ -21,9 +21,7 @@
#include "ldt.h" #include "ldt.h"
#include "heap.h" #include "heap.h"
#include "commdlg.h" #include "commdlg.h"
#include "dialog.h"
#include "dlgs.h" #include "dlgs.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "cderr.h" #include "cderr.h"

View file

@ -18,7 +18,6 @@
#include "ldt.h" #include "ldt.h"
#include "heap.h" #include "heap.h"
#include "commdlg.h" #include "commdlg.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "cderr.h" #include "cderr.h"

View file

@ -48,7 +48,6 @@
#include "cdlg.h" #include "cdlg.h"
#include "debugtools.h" #include "debugtools.h"
#include "cderr.h" #include "cderr.h"
#include "tweak.h"
#include "shellapi.h" #include "shellapi.h"
#include "shlguid.h" #include "shlguid.h"
#include "filedlgbrowser.h" #include "filedlgbrowser.h"

View file

@ -13,7 +13,6 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "commdlg.h" #include "commdlg.h"
#include "ldt.h" #include "ldt.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "cderr.h" #include "cderr.h"

View file

@ -19,7 +19,6 @@
#include "heap.h" #include "heap.h"
#include "commdlg.h" #include "commdlg.h"
#include "dlgs.h" #include "dlgs.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "cderr.h" #include "cderr.h"

View file

@ -19,7 +19,6 @@
#include "ldt.h" #include "ldt.h"
#include "commdlg.h" #include "commdlg.h"
#include "dlgs.h" #include "dlgs.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "cderr.h" #include "cderr.h"
#include "winspool.h" #include "winspool.h"

View file

@ -12,7 +12,6 @@
#include "crtdll.h" #include "crtdll.h"
#include "process.h" #include "process.h"
#include "options.h"
#include <stdlib.h> #include <stdlib.h>
#include <sys/times.h> #include <sys/times.h>

View file

@ -13,7 +13,6 @@
#include "heap.h" #include "heap.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "ole.h" #include "ole.h"

View file

@ -15,13 +15,11 @@
#include "winuser.h" #include "winuser.h"
#include "wine/windef16.h" #include "wine/windef16.h"
#include "heap.h" #include "heap.h"
#include "options.h"
#include "winver.h" #include "winver.h"
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"
#include "winerror.h" #include "winerror.h"
#include "debugtools.h" #include "debugtools.h"
#include "main.h"
DEFAULT_DEBUG_CHANNEL(ole); DEFAULT_DEBUG_CHANNEL(ole);

View file

@ -21,7 +21,6 @@
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "wine/obj_storage.h" #include "wine/obj_storage.h"
#include "heap.h" #include "heap.h"
#include "module.h"
#include "ldt.h" #include "ldt.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -13,7 +13,6 @@
#include "shlobj.h" #include "shlobj.h"
#include "shell32_main.h" #include "shell32_main.h"
#include "options.h"
#include "wine/undocshell.h" #include "wine/undocshell.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "shlwapi.h" #include "shlwapi.h"

View file

@ -14,9 +14,8 @@
#include "winerror.h" #include "winerror.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "neexe.h" #include "wine/winbase16.h"
#include "cursoricon.h" #include "cursoricon.h"
#include "module.h"
#include "heap.h" #include "heap.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -10,7 +10,6 @@
#include "debugtools.h" #include "debugtools.h"
#include "callback.h" #include "callback.h"
#include "builtin16.h" #include "builtin16.h"
#include "module.h"
#include "mouse.h" #include "mouse.h"
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"

View file

@ -12,11 +12,10 @@
#include <unistd.h> #include <unistd.h>
#include "winbase.h" #include "winbase.h"
#include "wine/winbase16.h"
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "neexe.h"
#include "module.h"
#include "winver.h" #include "winver.h"
#include "lzexpand.h" #include "lzexpand.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -13,7 +13,6 @@
#include "user.h" /* should be removed asap; used in MMDRV_(Get|Alloc|Free) */ #include "user.h" /* should be removed asap; used in MMDRV_(Get|Alloc|Free) */
#include "selectors.h" #include "selectors.h"
#include "winver.h" #include "winver.h"
#include "module.h"
#include "winemm.h" #include "winemm.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -27,7 +27,6 @@
#include "heap.h" #include "heap.h"
#include "winemm.h" #include "winemm.h"
#include "selectors.h" #include "selectors.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "ntddk.h" #include "ntddk.h"

View file

@ -9,7 +9,6 @@
#include "winnls.h" #include "winnls.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "win16drv.h" #include "win16drv.h"
#include "module.h"
#include "font.h" #include "font.h"
#include "heap.h" #include "heap.h"
#include "gdi.h" #include "gdi.h"
@ -190,7 +189,7 @@ BOOL WIN16DRV_EnumDeviceFonts( HDC hdc, LPLOGFONT16 plf,
WEPFC wepfc; WEPFC wepfc;
DC *dc; DC *dc;
/* EnumDFontCallback is GDI.158 */ /* EnumDFontCallback is GDI.158 */
FARPROC16 pfnCallback = NE_GetEntryPoint( GetModuleHandle16("GDI"), 158 ); FARPROC16 pfnCallback = GetProcAddress16( GetModuleHandle16("GDI"), (LPCSTR)158 );
if (!(dc = DC_GetDCPtr( hdc ))) return 0; if (!(dc = DC_GetDCPtr( hdc ))) return 0;
physDev = (WIN16DRV_PDEVICE *)dc->physDev; physDev = (WIN16DRV_PDEVICE *)dc->physDev;

View file

@ -11,7 +11,6 @@
#include "builtin16.h" #include "builtin16.h"
#include "heap.h" #include "heap.h"
#include "module.h" #include "module.h"
#include "neexe.h"
#include "stackframe.h" #include "stackframe.h"
#include "selectors.h" #include "selectors.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -22,7 +22,6 @@
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winerror.h" #include "winerror.h"
#include "module.h" #include "module.h"
#include "neexe.h"
#include "task.h" #include "task.h"
#include "selectors.h" #include "selectors.h"
#include "file.h" #include "file.h"

View file

@ -18,7 +18,6 @@
#include "snoop.h" #include "snoop.h"
#include "process.h" #include "process.h"
#include "neexe.h"
#include "heap.h" #include "heap.h"
#include "module.h" #include "module.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -13,7 +13,6 @@
#include "global.h" #include "global.h"
#include "process.h" #include "process.h"
#include "module.h" #include "module.h"
#include "neexe.h"
#include "heap.h" #include "heap.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "elfdll.h" #include "elfdll.h"

View file

@ -14,7 +14,6 @@
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winerror.h" #include "winerror.h"
#include "heap.h" #include "heap.h"
#include "neexe.h"
#include "process.h" #include "process.h"
#include "selectors.h" #include "selectors.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -18,7 +18,6 @@
#include "global.h" #include "global.h"
#include "ldt.h" #include "ldt.h"
#include "module.h" #include "module.h"
#include "neexe.h"
#include "callback.h" #include "callback.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -31,7 +31,6 @@
#endif #endif
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winerror.h" #include "winerror.h"
#include "neexe.h"
#include "process.h" #include "process.h"
#include "snoop.h" #include "snoop.h"
#include "server.h" #include "server.h"

View file

@ -22,7 +22,6 @@
#include "task.h" #include "task.h"
#include "process.h" #include "process.h"
#include "stackframe.h" #include "stackframe.h"
#include "neexe.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(resource); DEFAULT_DEBUG_CHANNEL(resource);

View file

@ -21,7 +21,6 @@
#include "heap.h" #include "heap.h"
#include "callback.h" #include "callback.h"
#include "cursoricon.h" #include "cursoricon.h"
#include "neexe.h"
#include "task.h" #include "task.h"
#include "process.h" #include "process.h"
#include "module.h" #include "module.h"

View file

@ -18,7 +18,6 @@
#include "instance.h" #include "instance.h"
#include "miscemu.h" #include "miscemu.h"
#include "module.h" #include "module.h"
#include "neexe.h"
#include "process.h" #include "process.h"
#include "queue.h" #include "queue.h"
#include "selectors.h" #include "selectors.h"
@ -274,8 +273,8 @@ BOOL TASK_Create( NE_MODULE *pModule, UINT16 cmdShow, TEB *teb, LPCSTR cmdline,
pTask->pdb.int20 = 0x20cd; pTask->pdb.int20 = 0x20cd;
pTask->pdb.dispatcher[0] = 0x9a; /* ljmp */ pTask->pdb.dispatcher[0] = 0x9a; /* ljmp */
PUT_DWORD(&pTask->pdb.dispatcher[1], (DWORD)NE_GetEntryPoint( PUT_DWORD(&pTask->pdb.dispatcher[1], (DWORD)GetProcAddress16( GetModuleHandle16("KERNEL"),
GetModuleHandle16("KERNEL"), 102 )); /* KERNEL.102 is DOS3Call() */ "DOS3Call" ));
pTask->pdb.savedint22 = INT_GetPMHandler( 0x22 ); pTask->pdb.savedint22 = INT_GetPMHandler( 0x22 );
pTask->pdb.savedint23 = INT_GetPMHandler( 0x23 ); pTask->pdb.savedint23 = INT_GetPMHandler( 0x23 );
pTask->pdb.savedint24 = INT_GetPMHandler( 0x24 ); pTask->pdb.savedint24 = INT_GetPMHandler( 0x24 );

View file

@ -18,7 +18,6 @@
#include "process.h" #include "process.h"
#include "options.h" #include "options.h"
#include "debugtools.h" #include "debugtools.h"
#include "neexe.h"
#include "winerror.h" #include "winerror.h"
DEFAULT_DEBUG_CHANNEL(ver); DEFAULT_DEBUG_CHANNEL(ver);

View file

@ -785,8 +785,8 @@ void WINAPI INT_Int31Handler( CONTEXT86 *context )
break; break;
} }
if (entryPoint) if (entryPoint)
context->Eax = LOWORD(NE_GetEntryPoint( GetModuleHandle16( "KERNEL" ), context->Eax = LOWORD(GetProcAddress16( GetModuleHandle16( "KERNEL" ),
entryPoint )); (LPCSTR)(ULONG_PTR)entryPoint ));
} }
break; break;

View file

@ -17,7 +17,6 @@
#include "msdos.h" #include "msdos.h"
#include "miscemu.h" #include "miscemu.h"
#include "selectors.h" #include "selectors.h"
#include "neexe.h"
#include "task.h" #include "task.h"
#include "process.h" #include "process.h"
#include "file.h" #include "file.h"

View file

@ -22,7 +22,6 @@
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/library.h" #include "wine/library.h"
#include "global.h" #include "global.h"
#include "neexe.h"
#include "module.h" #include "module.h"
#include "heap.h" #include "heap.h"
#include "main.h" #include "main.h"

View file

@ -13,7 +13,6 @@
#include "winnt.h" #include "winnt.h"
#include "heap.h" #include "heap.h"
#include "snoop.h" #include "snoop.h"
#include "neexe.h"
#include "selectors.h" #include "selectors.h"
#include "stackframe.h" #include "stackframe.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -19,7 +19,6 @@
#include "drive.h" #include "drive.h"
#include "main.h" #include "main.h"
#include "module.h" #include "module.h"
#include "neexe.h"
#include "file.h" #include "file.h"
#include "global.h" #include "global.h"
#include "heap.h" #include "heap.h"

View file

@ -6,7 +6,6 @@
/* #define VERBOSE */ /* #define VERBOSE */
#include "neexe.h"
#include "cvinclude.h" #include "cvinclude.h"
typedef enum { CV_NONE, CV_DOS, CV_NT, CV_DBG } CVHeaderType; typedef enum { CV_NONE, CV_DOS, CV_NT, CV_DBG } CVHeaderType;

View file

@ -21,7 +21,6 @@
#include <fcntl.h> #include <fcntl.h>
#include "fnt2bdf.h" #include "fnt2bdf.h"
#include "neexe.h"
#include "module.h" #include "module.h"
#define FILE_ERROR 0 #define FILE_ERROR 0

View file

@ -15,7 +15,6 @@
#include "wine/exception.h" #include "wine/exception.h"
#include "builtin16.h" #include "builtin16.h"
#include "module.h" #include "module.h"
#include "neexe.h"
#include "stackframe.h" #include "stackframe.h"
#include "build.h" #include "build.h"

View file

@ -26,7 +26,6 @@
#include "region.h" #include "region.h"
#include "heap.h" #include "heap.h"
#include "local.h" #include "local.h"
#include "module.h"
#include "user.h" #include "user.h"
#include "debugtools.h" #include "debugtools.h"
#include "windef.h" #include "windef.h"
@ -90,7 +89,7 @@ DCE *DCE_AllocDCE( HWND hWnd, DCE_TYPE type )
/* store DCE handle in DC hook data field */ /* store DCE handle in DC hook data field */
hookProc = (FARPROC16)NE_GetEntryPoint( GetModuleHandle16("USER"), 362 ); hookProc = GetProcAddress16( GetModuleHandle16("USER"), (LPCSTR)362 );
SetDCHook( dce->hDC, hookProc, (DWORD)dce ); SetDCHook( dce->hDC, hookProc, (DWORD)dce );
dce->hwndCurrent = hWnd; dce->hwndCurrent = hWnd;

View file

@ -15,7 +15,6 @@
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "ldt.h" #include "ldt.h"
#include "module.h"
#include "mmddk.h" #include "mmddk.h"
#include "debugtools.h" #include "debugtools.h"

View file

@ -29,7 +29,6 @@
#include "mouse.h" #include "mouse.h"
#include "message.h" #include "message.h"
#include "queue.h" #include "queue.h"
#include "module.h"
#include "debugtools.h" #include "debugtools.h"
#include "winerror.h" #include "winerror.h"
#include "task.h" #include "task.h"
@ -296,7 +295,7 @@ void WINAPI WIN16_mouse_event( CONTEXT86 *context )
FARPROC16 WINAPI GetMouseEventProc16(void) FARPROC16 WINAPI GetMouseEventProc16(void)
{ {
HMODULE16 hmodule = GetModuleHandle16("USER"); HMODULE16 hmodule = GetModuleHandle16("USER");
return NE_GetEntryPoint( hmodule, NE_GetOrdinal( hmodule, "mouse_event" )); return GetProcAddress16( hmodule, "mouse_event" );
} }

View file

@ -11,7 +11,6 @@
#include "winerror.h" #include "winerror.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "module.h"
#include "queue.h" #include "queue.h"
#include "task.h" #include "task.h"
#include "win.h" #include "win.h"

View file

@ -13,7 +13,6 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "win.h" #include "win.h"
#include "module.h"
#include "options.h" #include "options.h"
#include "debugtools.h" #include "debugtools.h"
#include "spy.h" #include "spy.h"

View file

@ -22,7 +22,6 @@
#include "hook.h" #include "hook.h"
#include "toolhelp.h" #include "toolhelp.h"
#include "message.h" #include "message.h"
#include "module.h"
#include "miscemu.h" #include "miscemu.h"
#include "sysmetrics.h" #include "sysmetrics.h"
#include "callback.h" #include "callback.h"

View file

@ -12,7 +12,6 @@
#include "winerror.h" #include "winerror.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "heap.h" #include "heap.h"
#include "module.h"
#include "user.h" #include "user.h"
#include "region.h" #include "region.h"
#include "win.h" #include "win.h"