From: Alistair Leslie-Hughes leslie_alistair@hotmail.com
--- dlls/krnl386.exe16/dosexe.h | 60 ++++++------ dlls/krnl386.exe16/kernel16_private.h | 128 +++++++++++++------------- dlls/krnl386.exe16/thunk.c | 2 +- dlls/krnl386.exe16/vxd.c | 2 +- 4 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index 1e4d15c75e5..f2064c2b758 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -38,8 +38,8 @@ typedef void (*DOSRELAY)(CONTEXT*,void*); typedef void (WINAPI *INTPROC)(CONTEXT*);
-extern WORD DOSVM_psp DECLSPEC_HIDDEN; /* psp of current DOS task */ -extern WORD int16_sel DECLSPEC_HIDDEN; +extern WORD DOSVM_psp; /* psp of current DOS task */ +extern WORD int16_sel;
#define ADD_LOWORD(dw,val) ((dw) = ((dw) & 0xffff0000) | LOWORD((DWORD)(dw)+(val)))
@@ -195,53 +195,53 @@ typedef struct #include <poppack.h>
/* dosvm.c */ -extern void DOSVM_Exit( WORD retval ) DECLSPEC_HIDDEN; +extern void DOSVM_Exit( WORD retval );
/* dosmem.c */ -extern BIOSDATA *DOSVM_BiosData( void ) DECLSPEC_HIDDEN; -extern void DOSVM_start_bios_timer(void) DECLSPEC_HIDDEN; +extern BIOSDATA *DOSVM_BiosData( void ); +extern void DOSVM_start_bios_timer(void);
/* fpu.c */ -extern void WINAPI DOSVM_Int34Handler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int35Handler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int36Handler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int37Handler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int38Handler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int39Handler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int3aHandler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int3bHandler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int3cHandler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int3dHandler(CONTEXT*) DECLSPEC_HIDDEN; -extern void WINAPI DOSVM_Int3eHandler(CONTEXT*) DECLSPEC_HIDDEN; +extern void WINAPI DOSVM_Int34Handler(CONTEXT*); +extern void WINAPI DOSVM_Int35Handler(CONTEXT*); +extern void WINAPI DOSVM_Int36Handler(CONTEXT*); +extern void WINAPI DOSVM_Int37Handler(CONTEXT*); +extern void WINAPI DOSVM_Int38Handler(CONTEXT*); +extern void WINAPI DOSVM_Int39Handler(CONTEXT*); +extern void WINAPI DOSVM_Int3aHandler(CONTEXT*); +extern void WINAPI DOSVM_Int3bHandler(CONTEXT*); +extern void WINAPI DOSVM_Int3cHandler(CONTEXT*); +extern void WINAPI DOSVM_Int3dHandler(CONTEXT*); +extern void WINAPI DOSVM_Int3eHandler(CONTEXT*);
/* int15.c */ -extern void WINAPI DOSVM_Int15Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void WINAPI DOSVM_Int15Handler(CONTEXT*);
/* int21.c */ -extern void WINAPI DOSVM_Int21Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void WINAPI DOSVM_Int21Handler(CONTEXT*);
/* int25.c */ -BOOL DOSVM_RawRead( BYTE, DWORD, DWORD, BYTE *, BOOL ) DECLSPEC_HIDDEN; -void WINAPI DOSVM_Int25Handler( CONTEXT * ) DECLSPEC_HIDDEN; +BOOL DOSVM_RawRead( BYTE, DWORD, DWORD, BYTE *, BOOL ); +void WINAPI DOSVM_Int25Handler( CONTEXT * );
/* int26.c */ -BOOL DOSVM_RawWrite( BYTE, DWORD, DWORD, BYTE *, BOOL ) DECLSPEC_HIDDEN; -void WINAPI DOSVM_Int26Handler( CONTEXT * ) DECLSPEC_HIDDEN; +BOOL DOSVM_RawWrite( BYTE, DWORD, DWORD, BYTE *, BOOL ); +void WINAPI DOSVM_Int26Handler( CONTEXT * );
/* int2f.c */ -extern void WINAPI DOSVM_Int2fHandler(CONTEXT*) DECLSPEC_HIDDEN; +extern void WINAPI DOSVM_Int2fHandler(CONTEXT*);
/* int31.c */ -extern void WINAPI DOSVM_Int31Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void WINAPI DOSVM_Int31Handler(CONTEXT*);
/* interrupts.c */ -extern void WINAPI __wine_call_int_handler16( BYTE, CONTEXT * ) DECLSPEC_HIDDEN; -extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; -extern FARPROC16 DOSVM_GetPMHandler16( BYTE ) DECLSPEC_HIDDEN; -extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; +extern void WINAPI __wine_call_int_handler16( BYTE, CONTEXT * ); +extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ); +extern FARPROC16 DOSVM_GetPMHandler16( BYTE ); +extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 );
/* ioports.c */ -extern DWORD DOSVM_inport( int port, int size ) DECLSPEC_HIDDEN; -extern void DOSVM_outport( int port, int size, DWORD value ) DECLSPEC_HIDDEN; +extern DWORD DOSVM_inport( int port, int size ); +extern void DOSVM_outport( int port, int size, DWORD value );
#endif /* __WINE_DOSEXE_H */ diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 7ce1921e40b..a70dfeeec9f 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -152,7 +152,7 @@ typedef struct _THHOOK extern LONG __wine_call_from_16(void); extern void __wine_call_from_16_regs(void);
-extern THHOOK *pThhook DECLSPEC_HIDDEN; +extern THHOOK *pThhook;
#include "poppack.h"
@@ -188,45 +188,45 @@ static inline void stack16_pop( int size ) }
/* dosmem.c */ -extern BOOL DOSMEM_Init(void) DECLSPEC_HIDDEN; -extern BOOL DOSMEM_InitDosMemory(void) DECLSPEC_HIDDEN; -extern LPVOID DOSMEM_MapRealToLinear(DWORD) DECLSPEC_HIDDEN; /* real-mode to linear */ -extern LPVOID DOSMEM_MapDosToLinear(UINT) DECLSPEC_HIDDEN; /* linear DOS to Wine */ -extern UINT DOSMEM_MapLinearToDos(LPVOID) DECLSPEC_HIDDEN; /* linear Wine to DOS */ -extern BOOL DOSMEM_MapDosLayout(void) DECLSPEC_HIDDEN; -extern LPVOID DOSMEM_AllocBlock(UINT size, WORD* p) DECLSPEC_HIDDEN; -extern BOOL DOSMEM_FreeBlock(void* ptr) DECLSPEC_HIDDEN; -extern UINT DOSMEM_ResizeBlock(void* ptr, UINT size, BOOL exact) DECLSPEC_HIDDEN; -extern UINT DOSMEM_Available(void) DECLSPEC_HIDDEN; +extern BOOL DOSMEM_Init(void); +extern BOOL DOSMEM_InitDosMemory(void); +extern LPVOID DOSMEM_MapRealToLinear(DWORD); /* real-mode to linear */ +extern LPVOID DOSMEM_MapDosToLinear(UINT); /* linear DOS to Wine */ +extern UINT DOSMEM_MapLinearToDos(LPVOID); /* linear Wine to DOS */ +extern BOOL DOSMEM_MapDosLayout(void); +extern LPVOID DOSMEM_AllocBlock(UINT size, WORD* p); +extern BOOL DOSMEM_FreeBlock(void* ptr); +extern UINT DOSMEM_ResizeBlock(void* ptr, UINT size, BOOL exact); +extern UINT DOSMEM_Available(void);
/* global16.c */ extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, - HGLOBAL16 hOwner, unsigned char selflags ) DECLSPEC_HIDDEN; -extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ) DECLSPEC_HIDDEN; -extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ) DECLSPEC_HIDDEN; -extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags ) DECLSPEC_HIDDEN; + HGLOBAL16 hOwner, unsigned char selflags ); +extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle ); +extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size ); +extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
/* instr.c */ -extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; -extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ) DECLSPEC_HIDDEN; +extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ); +extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs );
/* ne_module.c */ -extern NE_MODULE *NE_GetPtr( HMODULE16 hModule ) DECLSPEC_HIDDEN; -extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name ) DECLSPEC_HIDDEN; -extern FARPROC16 WINAPI NE_GetEntryPoint( HMODULE16 hModule, WORD ordinal ) DECLSPEC_HIDDEN; -extern FARPROC16 NE_GetEntryPointEx( HMODULE16 hModule, WORD ordinal, BOOL16 snoop ) DECLSPEC_HIDDEN; -extern BOOL16 NE_SetEntryPoint( HMODULE16 hModule, WORD ordinal, WORD offset ) DECLSPEC_HIDDEN; -extern DWORD NE_StartTask(void) DECLSPEC_HIDDEN; +extern NE_MODULE *NE_GetPtr( HMODULE16 hModule ); +extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name ); +extern FARPROC16 WINAPI NE_GetEntryPoint( HMODULE16 hModule, WORD ordinal ); +extern FARPROC16 NE_GetEntryPointEx( HMODULE16 hModule, WORD ordinal, BOOL16 snoop ); +extern BOOL16 NE_SetEntryPoint( HMODULE16 hModule, WORD ordinal, WORD offset ); +extern DWORD NE_StartTask(void);
/* ne_segment.c */ -extern BOOL NE_LoadSegment( NE_MODULE *pModule, WORD segnum ) DECLSPEC_HIDDEN; -extern BOOL NE_LoadAllSegments( NE_MODULE *pModule ) DECLSPEC_HIDDEN; -extern BOOL NE_CreateSegment( NE_MODULE *pModule, int segnum ) DECLSPEC_HIDDEN; -extern BOOL NE_CreateAllSegments( NE_MODULE *pModule ) DECLSPEC_HIDDEN; -extern HINSTANCE16 NE_GetInstance( NE_MODULE *pModule ) DECLSPEC_HIDDEN; -extern void NE_InitializeDLLs( HMODULE16 hModule ) DECLSPEC_HIDDEN; -extern void NE_DllProcessAttach( HMODULE16 hModule ) DECLSPEC_HIDDEN; -extern void NE_CallUserSignalProc( HMODULE16 hModule, UINT16 code ) DECLSPEC_HIDDEN; +extern BOOL NE_LoadSegment( NE_MODULE *pModule, WORD segnum ); +extern BOOL NE_LoadAllSegments( NE_MODULE *pModule ); +extern BOOL NE_CreateSegment( NE_MODULE *pModule, int segnum ); +extern BOOL NE_CreateAllSegments( NE_MODULE *pModule ); +extern HINSTANCE16 NE_GetInstance( NE_MODULE *pModule ); +extern void NE_InitializeDLLs( HMODULE16 hModule ); +extern void NE_DllProcessAttach( HMODULE16 hModule ); +extern void NE_CallUserSignalProc( HMODULE16 hModule, UINT16 code );
/* selector.c */ #define LDT_SIZE 8192 @@ -236,7 +236,7 @@ struct ldt_copy unsigned int limit[LDT_SIZE]; unsigned char flags[LDT_SIZE]; }; -extern const struct ldt_copy *ldt_copy DECLSPEC_HIDDEN; +extern const struct ldt_copy *ldt_copy;
#define LDT_FLAGS_DATA 0x13 /* Data segment */ #define LDT_FLAGS_CODE 0x1b /* Code segment */ @@ -246,15 +246,15 @@ static inline void *ldt_get_base( WORD sel ) { return ldt_copy->base[sel >> 3]; static inline unsigned int ldt_get_limit( WORD sel ) { return ldt_copy->limit[sel >> 3]; } static inline unsigned char ldt_get_flags( WORD sel ) { return ldt_copy->flags[sel >> 3]; }
-extern void init_selectors(void) DECLSPEC_HIDDEN; -extern BOOL ldt_is_system( WORD sel ) DECLSPEC_HIDDEN; -extern BOOL ldt_is_valid( WORD sel ) DECLSPEC_HIDDEN; -extern void *ldt_get_ptr( WORD sel, DWORD offset ) DECLSPEC_HIDDEN; -extern BOOL ldt_get_entry( WORD sel, LDT_ENTRY *entry ) DECLSPEC_HIDDEN; -extern void ldt_set_entry( WORD sel, LDT_ENTRY entry ) DECLSPEC_HIDDEN; -extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags ) DECLSPEC_HIDDEN; -extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size ) DECLSPEC_HIDDEN; -extern void SELECTOR_FreeBlock( WORD sel ) DECLSPEC_HIDDEN; +extern void init_selectors(void); +extern BOOL ldt_is_system( WORD sel ); +extern BOOL ldt_is_valid( WORD sel ); +extern void *ldt_get_ptr( WORD sel, DWORD offset ); +extern BOOL ldt_get_entry( WORD sel, LDT_ENTRY *entry ); +extern void ldt_set_entry( WORD sel, LDT_ENTRY entry ); +extern WORD SELECTOR_AllocBlock( const void *base, DWORD size, unsigned char flags ); +extern WORD SELECTOR_ReallocBlock( WORD sel, const void *base, DWORD size ); +extern void SELECTOR_FreeBlock( WORD sel ); #define IS_SELECTOR_32BIT(sel) \ (ldt_is_system(sel) || (ldt_copy->flags[LOWORD(sel) >> 3] & LDT_FLAGS_32BIT))
@@ -264,36 +264,36 @@ static inline WORD get_fs(void) { WORD res; __asm__( "movw %%fs,%0" : "=r" (res) static inline WORD get_gs(void) { WORD res; __asm__( "movw %%gs,%0" : "=r" (res) ); return res; }
/* relay16.c */ -extern int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *context ) DECLSPEC_HIDDEN; -extern void RELAY16_InitDebugLists(void) DECLSPEC_HIDDEN; +extern int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *context ); +extern void RELAY16_InitDebugLists(void);
/* snoop16.c */ -extern void SNOOP16_RegisterDLL(HMODULE16,LPCSTR) DECLSPEC_HIDDEN; -extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16) DECLSPEC_HIDDEN; -extern BOOL SNOOP16_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname) DECLSPEC_HIDDEN; +extern void SNOOP16_RegisterDLL(HMODULE16,LPCSTR); +extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16); +extern BOOL SNOOP16_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname);
/* syslevel.c */ -extern VOID SYSLEVEL_CheckNotLevel( INT level ) DECLSPEC_HIDDEN; +extern VOID SYSLEVEL_CheckNotLevel( INT level );
/* task.c */ -extern void TASK_CreateMainTask(void) DECLSPEC_HIDDEN; +extern void TASK_CreateMainTask(void); extern HTASK16 TASK_SpawnTask( NE_MODULE *pModule, WORD cmdShow, - LPCSTR cmdline, BYTE len, HANDLE *hThread ) DECLSPEC_HIDDEN; -extern void TASK_ExitTask(void) DECLSPEC_HIDDEN; -extern HTASK16 TASK_GetTaskFromThread( DWORD thread ) DECLSPEC_HIDDEN; -extern TDB *TASK_GetCurrent(void) DECLSPEC_HIDDEN; -extern void TASK_InstallTHHook( THHOOK *pNewThook ) DECLSPEC_HIDDEN; - -extern BOOL WOWTHUNK_Init(void) DECLSPEC_HIDDEN; - -extern WORD DOSMEM_0000H DECLSPEC_HIDDEN; -extern WORD DOSMEM_BiosDataSeg DECLSPEC_HIDDEN; -extern WORD DOSMEM_BiosSysSeg DECLSPEC_HIDDEN; -extern DWORD CallTo16_DataSelector DECLSPEC_HIDDEN; -extern DWORD CallTo16_TebSelector DECLSPEC_HIDDEN; - -extern WORD cbclient_selector DECLSPEC_HIDDEN; -extern WORD cbclientex_selector DECLSPEC_HIDDEN; + LPCSTR cmdline, BYTE len, HANDLE *hThread ); +extern void TASK_ExitTask(void); +extern HTASK16 TASK_GetTaskFromThread( DWORD thread ); +extern TDB *TASK_GetCurrent(void); +extern void TASK_InstallTHHook( THHOOK *pNewThook ); + +extern BOOL WOWTHUNK_Init(void); + +extern WORD DOSMEM_0000H; +extern WORD DOSMEM_BiosDataSeg; +extern WORD DOSMEM_BiosSysSeg; +extern DWORD CallTo16_DataSelector; +extern DWORD CallTo16_TebSelector; + +extern WORD cbclient_selector; +extern WORD cbclientex_selector;
struct tagSYSLEVEL;
diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 27fc14b5810..696f3e89aa1 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -2234,7 +2234,7 @@ LPVOID WINAPI GetPK16SysVar(void) /********************************************************************** * CommonUnimpStub (KERNEL32.17) */ -int WINAPI DECLSPEC_HIDDEN __regs_CommonUnimpStub( const char *name, int type ) +int WINAPI __regs_CommonUnimpStub( const char *name, int type ) { FIXME("generic stub %s\n", debugstr_a(name));
diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 9ac1ea0bbb5..599ebb32edb 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -233,7 +233,7 @@ done: * VxDCall7 (KERNEL32.8) * VxDCall8 (KERNEL32.9) */ -void WINAPI DECLSPEC_HIDDEN __regs_VxDCall( CONTEXT *context ) +void WINAPI __regs_VxDCall( CONTEXT *context ) { unsigned int i; VxDCallProc proc = NULL;