From 40d213a297031f9ad546781f33665fea88a2338e Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Wed, 18 Mar 2015 19:05:17 +0100 Subject: [PATCH] krnl386.exe16: Mark internal symbols with hidden visibility. --- dlls/krnl386.exe16/dosexe.h | 178 +++++++++++++------------- dlls/krnl386.exe16/kernel16_private.h | 107 ++++++++-------- dlls/krnl386.exe16/vga.h | 62 ++++----- dlls/krnl386.exe16/wowthunk.c | 2 - 4 files changed, 174 insertions(+), 175 deletions(-) diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h index f9df17232be..9bb67c15cb2 100644 --- a/dlls/krnl386.exe16/dosexe.h +++ b/dlls/krnl386.exe16/dosexe.h @@ -40,7 +40,7 @@ typedef struct { ULONG_PTR arg; } DOS_SPC; -extern pid_t dosvm_pid; +extern pid_t dosvm_pid DECLSPEC_HIDDEN; /* amount of space reserved for relay stack */ #define DOSVM_RELAY_DATA_SIZE 4096 @@ -74,9 +74,9 @@ typedef void (WINAPI *INTPROC)(CONTEXT*); #define DOS_PRIORITY_MOUSE 5 /* IRQ12 */ #define DOS_PRIORITY_SERIAL 10 /* IRQ4 */ -extern WORD DOSVM_psp; /* psp of current DOS task */ -extern WORD DOSVM_retval; /* return value of previous DOS task */ -extern struct DPMI_segments *DOSVM_dpmi_segments; +extern WORD DOSVM_psp DECLSPEC_HIDDEN; /* psp of current DOS task */ +extern WORD DOSVM_retval DECLSPEC_HIDDEN; /* return value of previous DOS task */ +extern struct DPMI_segments *DOSVM_dpmi_segments DECLSPEC_HIDDEN; #if defined(linux) && defined(__i386__) && defined(HAVE_SYS_VM86_H) # define MZ_SUPPORTED @@ -334,137 +334,137 @@ typedef struct } WINEDEV; /* dosexe.c */ -extern BOOL MZ_Exec( CONTEXT *context, LPCSTR filename, BYTE func, LPVOID paramblk ); -extern void MZ_Exit( CONTEXT *context, BOOL cs_psp, WORD retval ); -extern BOOL MZ_Current( void ); -extern void MZ_AllocDPMITask( void ); -extern void MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg ); -extern BOOL DOSVM_IsWin16(void); -extern void DOSVM_Exit( WORD retval ); +extern BOOL MZ_Exec( CONTEXT *context, LPCSTR filename, BYTE func, LPVOID paramblk ) DECLSPEC_HIDDEN; +extern void MZ_Exit( CONTEXT *context, BOOL cs_psp, WORD retval ) DECLSPEC_HIDDEN; +extern BOOL MZ_Current( void ) DECLSPEC_HIDDEN; +extern void MZ_AllocDPMITask( void ) DECLSPEC_HIDDEN; +extern void MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg ) DECLSPEC_HIDDEN; +extern BOOL DOSVM_IsWin16(void) DECLSPEC_HIDDEN; +extern void DOSVM_Exit( WORD retval ) DECLSPEC_HIDDEN; /* dosvm.c */ -extern void DOSVM_SendQueuedEvents( CONTEXT * ); -extern void WINAPI DOSVM_AcknowledgeIRQ( CONTEXT * ); -extern INT DOSVM_Enter( CONTEXT *context ); -extern void DOSVM_Wait( CONTEXT * ); -extern DWORD DOSVM_Loop( HANDLE hThread ); -extern void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data ); -extern void DOSVM_PIC_ioport_out( WORD port, BYTE val ); -extern void DOSVM_SetTimer( UINT ticks ); -extern LPVOID DOSVM_AllocDataUMB(DWORD, WORD *, WORD *); -extern void DOSVM_InitSegments(void); +extern void DOSVM_SendQueuedEvents( CONTEXT * ) DECLSPEC_HIDDEN; +extern void WINAPI DOSVM_AcknowledgeIRQ( CONTEXT * ) DECLSPEC_HIDDEN; +extern INT DOSVM_Enter( CONTEXT *context ) DECLSPEC_HIDDEN; +extern void DOSVM_Wait( CONTEXT * ) DECLSPEC_HIDDEN; +extern DWORD DOSVM_Loop( HANDLE hThread ) DECLSPEC_HIDDEN; +extern void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data ) DECLSPEC_HIDDEN; +extern void DOSVM_PIC_ioport_out( WORD port, BYTE val ) DECLSPEC_HIDDEN; +extern void DOSVM_SetTimer( UINT ticks ) DECLSPEC_HIDDEN; +extern LPVOID DOSVM_AllocDataUMB(DWORD, WORD *, WORD *) DECLSPEC_HIDDEN; +extern void DOSVM_InitSegments(void) DECLSPEC_HIDDEN; /* devices.c */ -extern void DOSDEV_InstallDOSDevices(void); +extern void DOSDEV_InstallDOSDevices(void) DECLSPEC_HIDDEN; extern void DOSDEV_SetupDevice(const WINEDEV * devinfo, - WORD seg, WORD off_dev, WORD off_thunk); -extern void DOSDEV_SetSharingRetry(WORD delay, WORD count); -extern SEGPTR DOSDEV_GetLOL(BOOL v86); + WORD seg, WORD off_dev, WORD off_thunk) DECLSPEC_HIDDEN; +extern void DOSDEV_SetSharingRetry(WORD delay, WORD count) DECLSPEC_HIDDEN; +extern SEGPTR DOSDEV_GetLOL(BOOL v86) DECLSPEC_HIDDEN; /* dma.c */ -extern int DMA_Transfer(int channel,int reqlength,void* buffer); -extern void DMA_ioport_out( WORD port, BYTE val ); -extern BYTE DMA_ioport_in( WORD port ); +extern int DMA_Transfer(int channel,int reqlength,void* buffer) DECLSPEC_HIDDEN; +extern void DMA_ioport_out( WORD port, BYTE val ) DECLSPEC_HIDDEN; +extern BYTE DMA_ioport_in( WORD port ) DECLSPEC_HIDDEN; /* dosaspi.c */ -extern void DOSVM_ASPIHandler(CONTEXT*); +extern void DOSVM_ASPIHandler(CONTEXT*) DECLSPEC_HIDDEN; /* dosmem.c */ -extern BIOSDATA *DOSVM_BiosData( void ); -extern void DOSVM_start_bios_timer(void); +extern BIOSDATA *DOSVM_BiosData( void ) DECLSPEC_HIDDEN; +extern void DOSVM_start_bios_timer(void) DECLSPEC_HIDDEN; /* fpu.c */ -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*); +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; /* int09.c */ -extern void WINAPI DOSVM_Int09Handler(CONTEXT*); -extern void DOSVM_Int09SendScan(BYTE scan,BYTE ascii); -extern BYTE DOSVM_Int09ReadScan(BYTE*ascii); +extern void WINAPI DOSVM_Int09Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void DOSVM_Int09SendScan(BYTE scan,BYTE ascii) DECLSPEC_HIDDEN; +extern BYTE DOSVM_Int09ReadScan(BYTE*ascii) DECLSPEC_HIDDEN; /* int10.c */ -extern void WINAPI DOSVM_Int10Handler(CONTEXT*); -extern void DOSVM_PutChar(BYTE ascii); +extern void WINAPI DOSVM_Int10Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void DOSVM_PutChar(BYTE ascii) DECLSPEC_HIDDEN; /* int13.c */ -extern void WINAPI DOSVM_Int13Handler(CONTEXT*); +extern void WINAPI DOSVM_Int13Handler(CONTEXT*) DECLSPEC_HIDDEN; /* int15.c */ -extern void WINAPI DOSVM_Int15Handler(CONTEXT*); +extern void WINAPI DOSVM_Int15Handler(CONTEXT*) DECLSPEC_HIDDEN; /* int16.c */ -extern void WINAPI DOSVM_Int16Handler(CONTEXT*); -extern BOOL DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT * ); -extern BOOL DOSVM_Int16AddChar(BYTE ascii, BYTE scan); +extern void WINAPI DOSVM_Int16Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern BOOL DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT * ) DECLSPEC_HIDDEN; +extern BOOL DOSVM_Int16AddChar(BYTE ascii, BYTE scan) DECLSPEC_HIDDEN; /* int21.c */ -extern void WINAPI DOSVM_Int21Handler(CONTEXT*); +extern void WINAPI DOSVM_Int21Handler(CONTEXT*) DECLSPEC_HIDDEN; /* int25.c */ -BOOL DOSVM_RawRead( BYTE, DWORD, DWORD, BYTE *, BOOL ); -void WINAPI DOSVM_Int25Handler( CONTEXT * ); +BOOL DOSVM_RawRead( BYTE, DWORD, DWORD, BYTE *, BOOL ) DECLSPEC_HIDDEN; +void WINAPI DOSVM_Int25Handler( CONTEXT * ) DECLSPEC_HIDDEN; /* int26.c */ -BOOL DOSVM_RawWrite( BYTE, DWORD, DWORD, BYTE *, BOOL ); -void WINAPI DOSVM_Int26Handler( CONTEXT * ); +BOOL DOSVM_RawWrite( BYTE, DWORD, DWORD, BYTE *, BOOL ) DECLSPEC_HIDDEN; +void WINAPI DOSVM_Int26Handler( CONTEXT * ) DECLSPEC_HIDDEN; /* int2f.c */ -extern void WINAPI DOSVM_Int2fHandler(CONTEXT*); -extern void MSCDEX_InstallCDROM(void); +extern void WINAPI DOSVM_Int2fHandler(CONTEXT*) DECLSPEC_HIDDEN; +extern void MSCDEX_InstallCDROM(void) DECLSPEC_HIDDEN; /* int31.c */ -extern void WINAPI DOSVM_Int31Handler(CONTEXT*); -extern void WINAPI DOSVM_RawModeSwitchHandler(CONTEXT*); -extern BOOL DOSVM_IsDos32(void); -extern FARPROC16 DPMI_AllocInternalRMCB(RMCBPROC); -extern int DPMI_CallRMProc(CONTEXT*,LPWORD,int,int); -extern BOOL DOSVM_CheckWrappers(CONTEXT*); +extern void WINAPI DOSVM_Int31Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void WINAPI DOSVM_RawModeSwitchHandler(CONTEXT*) DECLSPEC_HIDDEN; +extern BOOL DOSVM_IsDos32(void) DECLSPEC_HIDDEN; +extern FARPROC16 DPMI_AllocInternalRMCB(RMCBPROC) DECLSPEC_HIDDEN; +extern int DPMI_CallRMProc(CONTEXT*,LPWORD,int,int) DECLSPEC_HIDDEN; +extern BOOL DOSVM_CheckWrappers(CONTEXT*) DECLSPEC_HIDDEN; /* int33.c */ -extern void WINAPI DOSVM_Int33Handler(CONTEXT*); -extern void DOSVM_Int33Message(UINT,WPARAM,LPARAM); -extern void DOSVM_Int33Console(MOUSE_EVENT_RECORD*); +extern void WINAPI DOSVM_Int33Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void DOSVM_Int33Message(UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; +extern void DOSVM_Int33Console(MOUSE_EVENT_RECORD*) DECLSPEC_HIDDEN; /* int67.c */ -extern void WINAPI DOSVM_Int67Handler(CONTEXT*); -extern void EMS_Ioctl_Handler(CONTEXT*); +extern void WINAPI DOSVM_Int67Handler(CONTEXT*) DECLSPEC_HIDDEN; +extern void EMS_Ioctl_Handler(CONTEXT*) DECLSPEC_HIDDEN; /* interrupts.c */ -extern void __wine_call_int_handler( CONTEXT *, BYTE ); -extern void DOSVM_CallBuiltinHandler( CONTEXT *, BYTE ); -extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ); -extern BOOL DOSVM_EmulateInterruptRM( CONTEXT *, BYTE ); -extern FARPROC16 DOSVM_GetPMHandler16( BYTE ); -extern FARPROC48 DOSVM_GetPMHandler48( BYTE ); -extern FARPROC16 DOSVM_GetRMHandler( BYTE ); -extern void DOSVM_HardwareInterruptPM( CONTEXT *, BYTE ); -extern void DOSVM_HardwareInterruptRM( CONTEXT *, BYTE ); -extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ); -extern void DOSVM_SetPMHandler48( BYTE, FARPROC48 ); -extern void DOSVM_SetRMHandler( BYTE, FARPROC16 ); +extern void __wine_call_int_handler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; +extern void DOSVM_CallBuiltinHandler( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; +extern BOOL DOSVM_EmulateInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; +extern BOOL DOSVM_EmulateInterruptRM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; +extern FARPROC16 DOSVM_GetPMHandler16( BYTE ) DECLSPEC_HIDDEN; +extern FARPROC48 DOSVM_GetPMHandler48( BYTE ) DECLSPEC_HIDDEN; +extern FARPROC16 DOSVM_GetRMHandler( BYTE ) DECLSPEC_HIDDEN; +extern void DOSVM_HardwareInterruptPM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; +extern void DOSVM_HardwareInterruptRM( CONTEXT *, BYTE ) DECLSPEC_HIDDEN; +extern void DOSVM_SetPMHandler16( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; +extern void DOSVM_SetPMHandler48( BYTE, FARPROC48 ) DECLSPEC_HIDDEN; +extern void DOSVM_SetRMHandler( BYTE, FARPROC16 ) DECLSPEC_HIDDEN; /* ioports.c */ -extern DWORD DOSVM_inport( int port, int size ); -extern void DOSVM_outport( int port, int size, DWORD value ); +extern DWORD DOSVM_inport( int port, int size ) DECLSPEC_HIDDEN; +extern void DOSVM_outport( int port, int size, DWORD value ) DECLSPEC_HIDDEN; /* relay.c */ -void DOSVM_RelayHandler( CONTEXT * ); -void DOSVM_BuildCallFrame( CONTEXT *, DOSRELAY, LPVOID ); +void DOSVM_RelayHandler( CONTEXT * ) DECLSPEC_HIDDEN; +void DOSVM_BuildCallFrame( CONTEXT *, DOSRELAY, LPVOID ) DECLSPEC_HIDDEN; /* soundblaster.c */ -extern void SB_ioport_out( WORD port, BYTE val ); -extern BYTE SB_ioport_in( WORD port ); +extern void SB_ioport_out( WORD port, BYTE val ) DECLSPEC_HIDDEN; +extern BYTE SB_ioport_in( WORD port ) DECLSPEC_HIDDEN; /* timer.c */ -extern void WINAPI DOSVM_Int08Handler(CONTEXT*); +extern void WINAPI DOSVM_Int08Handler(CONTEXT*) DECLSPEC_HIDDEN; #endif /* __WINE_DOSEXE_H */ diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h index 9fc9e5b25e7..183c872192f 100644 --- a/dlls/krnl386.exe16/kernel16_private.h +++ b/dlls/krnl386.exe16/kernel16_private.h @@ -150,7 +150,7 @@ typedef struct _THHOOK extern LONG __wine_call_from_16(void); extern void __wine_call_from_16_regs(void); -extern THHOOK *pThhook; +extern THHOOK *pThhook DECLSPEC_HIDDEN; #include "poppack.h" @@ -189,82 +189,83 @@ static inline void stack16_pop( int size ) } /* dosmem.c */ -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); +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; /* global16.c */ extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size, - 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 ); + 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; /* instr.c */ -extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ); -extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ); +extern DWORD __wine_emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; +extern LONG CALLBACK INSTR_vectored_handler( EXCEPTION_POINTERS *ptrs ) DECLSPEC_HIDDEN; /* ne_module.c */ -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); +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; /* ne_segment.c */ -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 ); +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; /* selector.c */ -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 ); +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; #define IS_SELECTOR_32BIT(sel) \ (wine_ldt_is_system(sel) || (wine_ldt_copy.flags[LOWORD(sel) >> 3] & WINE_LDT_FLAGS_32BIT)) /* relay16.c */ -extern int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *context ); +extern int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT *context ) DECLSPEC_HIDDEN; +extern void RELAY16_InitDebugLists(void) DECLSPEC_HIDDEN; /* snoop16.c */ -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); +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; /* syslevel.c */ -extern VOID SYSLEVEL_CheckNotLevel( INT level ); +extern VOID SYSLEVEL_CheckNotLevel( INT level ) DECLSPEC_HIDDEN; /* task.c */ -extern void TASK_CreateMainTask(void); +extern void TASK_CreateMainTask(void) DECLSPEC_HIDDEN; extern HTASK16 TASK_SpawnTask( NE_MODULE *pModule, WORD cmdShow, - 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 ); + 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); +extern BOOL WOWTHUNK_Init(void) DECLSPEC_HIDDEN; -extern WORD DOSMEM_0000H; -extern WORD DOSMEM_BiosDataSeg; -extern WORD DOSMEM_BiosSysSeg; -extern DWORD CallTo16_DataSelector; -extern DWORD CallTo16_TebSelector; -extern SEGPTR CALL32_CBClient_RetAddr; -extern SEGPTR CALL32_CBClientEx_RetAddr; +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 SEGPTR CALL32_CBClient_RetAddr DECLSPEC_HIDDEN; +extern SEGPTR CALL32_CBClientEx_RetAddr DECLSPEC_HIDDEN; struct tagSYSLEVEL; diff --git a/dlls/krnl386.exe16/vga.h b/dlls/krnl386.exe16/vga.h index b4976f6e71b..03ec11ca220 100644 --- a/dlls/krnl386.exe16/vga.h +++ b/dlls/krnl386.exe16/vga.h @@ -48,50 +48,50 @@ typedef struct { BOOL Supported; } VGA_MODE; -extern const VGA_MODE VGA_modelist[]; +extern const VGA_MODE VGA_modelist[] DECLSPEC_HIDDEN; /* all vga modes */ -const VGA_MODE *VGA_GetModeInfo(WORD mode); -BOOL VGA_SetMode(WORD mode); +const VGA_MODE *VGA_GetModeInfo(WORD mode) DECLSPEC_HIDDEN; +BOOL VGA_SetMode(WORD mode) DECLSPEC_HIDDEN; /* graphics mode */ -BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth); -void VGA_SetPalette(PALETTEENTRY*pal,int start,int len); -void VGA_SetColor16(int reg,int color); -char VGA_GetColor16(int reg); -void VGA_Set16Palette(char *Table); -void VGA_Get16Palette(char *Table); -void VGA_SetWindowStart(int start); -int VGA_GetWindowStart(void); -void VGA_ShowMouse(BOOL show); -void VGA_UpdatePalette(void); -void VGA_SetPaletteIndex(unsigned index); -void VGA_SetBright(BOOL bright); -void VGA_WritePixel(unsigned color, unsigned page, unsigned col, unsigned row); +BOOL VGA_GetMode(unsigned *Height, unsigned *Width, unsigned *Depth) DECLSPEC_HIDDEN; +void VGA_SetPalette(PALETTEENTRY*pal,int start,int len) DECLSPEC_HIDDEN; +void VGA_SetColor16(int reg,int color) DECLSPEC_HIDDEN; +char VGA_GetColor16(int reg) DECLSPEC_HIDDEN; +void VGA_Set16Palette(char *Table) DECLSPEC_HIDDEN; +void VGA_Get16Palette(char *Table) DECLSPEC_HIDDEN; +void VGA_SetWindowStart(int start) DECLSPEC_HIDDEN; +int VGA_GetWindowStart(void) DECLSPEC_HIDDEN; +void VGA_ShowMouse(BOOL show) DECLSPEC_HIDDEN; +void VGA_UpdatePalette(void) DECLSPEC_HIDDEN; +void VGA_SetPaletteIndex(unsigned index) DECLSPEC_HIDDEN; +void VGA_SetBright(BOOL bright) DECLSPEC_HIDDEN; +void VGA_WritePixel(unsigned color, unsigned page, unsigned col, unsigned row) DECLSPEC_HIDDEN; /* text mode */ -void VGA_InitAlphaMode(unsigned*Xres,unsigned*Yres); -void VGA_SetAlphaMode(unsigned Xres,unsigned Yres); -BOOL VGA_GetAlphaMode(unsigned*Xres,unsigned*Yres); -void VGA_SetCursorShape(unsigned char start_options,unsigned char end); -void VGA_SetCursorPos(unsigned X,unsigned Y); -void VGA_GetCursorPos(unsigned*X,unsigned*Y); -void VGA_WriteChars(unsigned X,unsigned Y,unsigned ch,int attr,int count); -void VGA_PutChar(BYTE ascii); +void VGA_InitAlphaMode(unsigned*Xres,unsigned*Yres) DECLSPEC_HIDDEN; +void VGA_SetAlphaMode(unsigned Xres,unsigned Yres) DECLSPEC_HIDDEN; +BOOL VGA_GetAlphaMode(unsigned*Xres,unsigned*Yres) DECLSPEC_HIDDEN; +void VGA_SetCursorShape(unsigned char start_options,unsigned char end) DECLSPEC_HIDDEN; +void VGA_SetCursorPos(unsigned X,unsigned Y) DECLSPEC_HIDDEN; +void VGA_GetCursorPos(unsigned*X,unsigned*Y) DECLSPEC_HIDDEN; +void VGA_WriteChars(unsigned X,unsigned Y,unsigned ch,int attr,int count) DECLSPEC_HIDDEN; +void VGA_PutChar(BYTE ascii) DECLSPEC_HIDDEN; void VGA_ClearText(unsigned row1, unsigned col1, unsigned row2, unsigned col2, - BYTE attr); + BYTE attr) DECLSPEC_HIDDEN; void VGA_ScrollUpText(unsigned row1, unsigned col1, unsigned row2, unsigned col2, - unsigned lines, BYTE attr); + unsigned lines, BYTE attr) DECLSPEC_HIDDEN; void VGA_ScrollDownText(unsigned row1, unsigned col1, unsigned row2, unsigned col2, - unsigned lines, BYTE attr); -void VGA_GetCharacterAtCursor(BYTE *ascii, BYTE *attr); + unsigned lines, BYTE attr) DECLSPEC_HIDDEN; +void VGA_GetCharacterAtCursor(BYTE *ascii, BYTE *attr) DECLSPEC_HIDDEN; /* control */ -void VGA_ioport_out(WORD port, BYTE val); -BYTE VGA_ioport_in(WORD port); -void VGA_Clean(void); +void VGA_ioport_out(WORD port, BYTE val) DECLSPEC_HIDDEN; +BYTE VGA_ioport_in(WORD port) DECLSPEC_HIDDEN; +void VGA_Clean(void) DECLSPEC_HIDDEN; #endif /* __WINE_VGA_H */ diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 1f352bdbb71..fa49a246ab8 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -52,8 +52,6 @@ extern void DPMI_PendingEventCheck_Return(void); extern BYTE __wine_call16_start[]; extern BYTE __wine_call16_end[]; -extern void RELAY16_InitDebugLists(void); - static SEGPTR call16_ret_addr; /* segptr to __wine_call_to_16_ret routine */ static WORD dpmi_checker_selector;