Skip to content

W
wine-winehq
Commit 58cd87ab authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

winedos: Internal functions don't need to be WINAPI.

parent 2b07ae5e
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 73 deletions
dlls/winedos/dosaspi.c
View file @ 58cd87ab
......@@ -190,11 +190,11 @@ static void WINAPI ASPI_DOS_func(CONTEXT86 *context)
/**********************************************************************
* ASPIHandler (WINEDOS.@)
* ASPIHandler
*
* returns the address of a real mode callback to ASPI_DOS_func()
*/
void WINAPI DOSVM_ASPIHandler( CONTEXT86 *context )
void DOSVM_ASPIHandler( CONTEXT86 *context )
{
FARPROC16 *p = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx);
TRACE("DOS ASPI opening\n");
......
dlls/winedos/dosexe.h
View file @ 58cd87ab
......@@ -345,24 +345,23 @@ typedef struct
} WINEDEV;
/* module.c */
extern void WINAPI MZ_LoadImage( LPCSTR filename, HANDLE hFile );
extern BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk );
extern void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval );
extern BOOL WINAPI MZ_Current( void );
extern void WINAPI MZ_AllocDPMITask( void );
extern void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg );
extern BOOL MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk );
extern void MZ_Exit( CONTEXT86 *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 );
/* dosvm.c */
extern void DOSVM_SendQueuedEvents( CONTEXT86 * );
extern void WINAPI DOSVM_AcknowledgeIRQ( CONTEXT86 * );
extern INT WINAPI DOSVM_Enter( CONTEXT86 *context );
extern void WINAPI DOSVM_Wait( CONTEXT86 * );
extern DWORD WINAPI DOSVM_Loop( HANDLE hThread );
extern void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data );
extern void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val );
extern void WINAPI DOSVM_SetTimer( UINT ticks );
extern INT DOSVM_Enter( CONTEXT86 *context );
extern void DOSVM_Wait( CONTEXT86 * );
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 );
/* devices.c */
extern void DOSDEV_InstallDOSDevices(void);
......@@ -377,7 +376,7 @@ extern void DMA_ioport_out( WORD port, BYTE val );
extern BYTE DMA_ioport_in( WORD port );
/* dosaspi.c */
extern void WINAPI DOSVM_ASPIHandler(CONTEXT86*);
extern void DOSVM_ASPIHandler(CONTEXT86*);
/* dosconf.c */
extern DOSCONF *DOSCONF_GetConfig( void );
......@@ -411,12 +410,12 @@ extern LPVOID DOSVM_AllocDataUMB(DWORD, WORD *, WORD *);
/* int09.c */
extern void WINAPI DOSVM_Int09Handler(CONTEXT86*);
extern void WINAPI DOSVM_Int09SendScan(BYTE scan,BYTE ascii);
extern BYTE WINAPI DOSVM_Int09ReadScan(BYTE*ascii);
extern void DOSVM_Int09SendScan(BYTE scan,BYTE ascii);
extern BYTE DOSVM_Int09ReadScan(BYTE*ascii);
/* int10.c */
extern void WINAPI DOSVM_Int10Handler(CONTEXT86*);
extern void WINAPI DOSVM_PutChar(BYTE ascii);
extern void DOSVM_PutChar(BYTE ascii);
/* int13.c */
extern void WINAPI DOSVM_Int13Handler(CONTEXT86*);
......@@ -426,8 +425,8 @@ extern void WINAPI DOSVM_Int15Handler(CONTEXT86*);
/* int16.c */
extern void WINAPI DOSVM_Int16Handler(CONTEXT86*);
extern BOOL WINAPI DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT86 * );
extern int WINAPI DOSVM_Int16AddChar(BYTE ascii,BYTE scan);
extern BOOL DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT86 * );
extern int DOSVM_Int16AddChar(BYTE ascii,BYTE scan);
/* int21.c */
extern void WINAPI DOSVM_Int21Handler(CONTEXT86*);
......@@ -448,23 +447,23 @@ extern void MSCDEX_InstallCDROM(void);
extern void WINAPI DOSVM_Int31Handler(CONTEXT86*);
extern void WINAPI DOSVM_RawModeSwitchHandler(CONTEXT86*);
extern BOOL DOSVM_IsDos32(void);
extern FARPROC16 WINAPI DPMI_AllocInternalRMCB(RMCBPROC);
extern FARPROC16 DPMI_AllocInternalRMCB(RMCBPROC);
extern int DPMI_CallRMProc(CONTEXT86*,LPWORD,int,int);
extern BOOL DOSVM_CheckWrappers(CONTEXT86*);
/* int33.c */
extern void WINAPI DOSVM_Int33Handler(CONTEXT86*);
extern void WINAPI DOSVM_Int33Message(UINT,WPARAM,LPARAM);
extern void WINAPI DOSVM_Int33Console(MOUSE_EVENT_RECORD*);
extern void DOSVM_Int33Message(UINT,WPARAM,LPARAM);
extern void DOSVM_Int33Console(MOUSE_EVENT_RECORD*);
/* int67.c */
extern void WINAPI DOSVM_Int67Handler(CONTEXT86*);
extern void WINAPI EMS_Ioctl_Handler(CONTEXT86*);
extern void EMS_Ioctl_Handler(CONTEXT86*);
/* interrupts.c */
extern void WINAPI DOSVM_CallBuiltinHandler( CONTEXT86 *, BYTE );
extern BOOL WINAPI DOSVM_EmulateInterruptPM( CONTEXT86 *, BYTE );
extern BOOL WINAPI DOSVM_EmulateInterruptRM( CONTEXT86 *, BYTE );
extern BOOL DOSVM_EmulateInterruptRM( CONTEXT86 *, BYTE );
extern FARPROC16 DOSVM_GetPMHandler16( BYTE );
extern FARPROC48 DOSVM_GetPMHandler48( BYTE );
extern FARPROC16 DOSVM_GetRMHandler( BYTE );
......@@ -491,6 +490,6 @@ extern char IO_pp_init(void);
extern void WINAPI DOSVM_Int08Handler(CONTEXT86*);
/* xms.c */
extern void WINAPI XMS_Handler(CONTEXT86*);
extern void XMS_Handler(CONTEXT86*);
#endif /* __WINE_DOSEXE_H */
dlls/winedos/dosvm.c
View file @ 58cd87ab
......@@ -251,7 +251,7 @@ void DOSVM_SendQueuedEvents( CONTEXT86 *context )
/***********************************************************************
* QueueEvent (WINEDOS.@)
*/
void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data)
void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data)
{
LPDOSEVENT event, cur, prev;
BOOL old_pending;
......@@ -385,7 +385,7 @@ static void DOSVM_ProcessMessage(MSG *msg)
* interrupts and waits until some asynchronous event has been
* processed.
*/
void WINAPI DOSVM_Wait( CONTEXT86 *waitctx )
void DOSVM_Wait( CONTEXT86 *waitctx )
{
if (DOSVM_HasPendingEvents())
{
......@@ -461,7 +461,7 @@ void WINAPI DOSVM_Wait( CONTEXT86 *waitctx )
}
DWORD WINAPI DOSVM_Loop( HANDLE hThread )
DWORD DOSVM_Loop( HANDLE hThread )
{
HANDLE objs[2];
int count = 0;
......@@ -569,7 +569,7 @@ static LONG WINAPI exception_handler(EXCEPTION_POINTERS *eptr)
return EXCEPTION_CONTINUE_SEARCH;
}
INT WINAPI DOSVM_Enter( CONTEXT86 *context )
INT DOSVM_Enter( CONTEXT86 *context )
{
INT ret = 0;
if (!ISV86(context))
......@@ -592,7 +592,7 @@ INT WINAPI DOSVM_Enter( CONTEXT86 *context )
/***********************************************************************
* OutPIC (WINEDOS.@)
*/
void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val)
void DOSVM_PIC_ioport_out( WORD port, BYTE val)
{
if (port != 0x20)
{
......@@ -644,7 +644,7 @@ void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val)
/***********************************************************************
* Enter (WINEDOS.@)
*/
INT WINAPI DOSVM_Enter( CONTEXT86 *context )
INT DOSVM_Enter( CONTEXT86 *context )
{
SetLastError( ERROR_NOT_SUPPORTED );
return -1;
......@@ -653,17 +653,17 @@ INT WINAPI DOSVM_Enter( CONTEXT86 *context )
/***********************************************************************
* Wait (WINEDOS.@)
*/
void WINAPI DOSVM_Wait( CONTEXT86 *waitctx ) { }
void DOSVM_Wait( CONTEXT86 *waitctx ) { }
/***********************************************************************
* OutPIC (WINEDOS.@)
*/
void WINAPI DOSVM_PIC_ioport_out( WORD port, BYTE val) {}
void DOSVM_PIC_ioport_out( WORD port, BYTE val) {}
/***********************************************************************
* QueueEvent (WINEDOS.@)
*/
void WINAPI DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data)
void DOSVM_QueueEvent( INT irq, INT priority, DOSRELAY relay, LPVOID data)
{
if (irq<0) {
/* callback event, perform it with dummy context */
......
dlls/winedos/int09.c
View file @ 58cd87ab
......@@ -224,7 +224,7 @@ static void KbdRelay( CONTEXT86 *context, void *data )
}
}
void WINAPI DOSVM_Int09SendScan( BYTE scan, BYTE ascii )
void DOSVM_Int09SendScan( BYTE scan, BYTE ascii )
{
if (kbdinfo.queuelen == QUEUELEN) {
ERR("keyboard queue overflow\n");
......@@ -237,10 +237,7 @@ void WINAPI DOSVM_Int09SendScan( BYTE scan, BYTE ascii )
DOSVM_QueueEvent(1,DOS_PRIORITY_KEYBOARD,KbdRelay,NULL);
}
/**********************************************************************
* KbdReadScan (WINEDOS.@)
*/
BYTE WINAPI DOSVM_Int09ReadScan( BYTE*ascii )
BYTE DOSVM_Int09ReadScan( BYTE*ascii )
{
if (ascii) *ascii = kbdinfo.ascii[0];
return kbdinfo.queue[0];
......
dlls/winedos/int10.c
View file @ 58cd87ab
......@@ -1447,7 +1447,7 @@ void WINAPI DOSVM_Int10Handler( CONTEXT86 *context )
* Write single character to VGA console at the current
* cursor position and updates the BIOS cursor position.
*/
void WINAPI DOSVM_PutChar( BYTE ascii )
void DOSVM_PutChar( BYTE ascii )
{
BIOSDATA *data = DOSVM_BiosData();
unsigned xpos, ypos;
......
dlls/winedos/int16.c
View file @ 58cd87ab
......@@ -160,7 +160,7 @@ void WINAPI DOSVM_Int16Handler( CONTEXT86 *context )
* Return value will always be TRUE and returned keystroke will be
* removed from buffer.
*/
int WINAPI DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT86 *waitctx)
int DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT86 *waitctx)
{
BIOSDATA *data = DOSVM_BiosData();
WORD CurOfs = data->NextKbdCharPtr;
......@@ -195,7 +195,7 @@ int WINAPI DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT86 *waitctx)
return TRUE;
}
int WINAPI DOSVM_Int16AddChar(BYTE ascii,BYTE scan)
int DOSVM_Int16AddChar(BYTE ascii,BYTE scan)
{
BIOSDATA *data = DOSVM_BiosData();
WORD CurOfs = data->FirstKbdCharPtr;
......
dlls/winedos/int21.c
View file @ 58cd87ab
......@@ -272,13 +272,12 @@ struct magic_device
};
static void INT21_IoctlScsiMgrHandler( CONTEXT86 * );
static void INT21_IoctlEMSHandler( CONTEXT86 * );
static void INT21_IoctlHPScanHandler( CONTEXT86 * );
static struct magic_device magic_devices[] =
{
{ {'s','c','s','i','m','g','r','$',0}, NULL, { { 0, 0 } }, INT21_IoctlScsiMgrHandler },
{ {'e','m','m','x','x','x','x','0',0}, NULL, { { 0, 0 } }, INT21_IoctlEMSHandler },
{ {'e','m','m','x','x','x','x','0',0}, NULL, { { 0, 0 } }, EMS_Ioctl_Handler },
{ {'h','p','s','c','a','n',0}, NULL, { { 0, 0 } }, INT21_IoctlHPScanHandler },
};
......@@ -2692,17 +2691,6 @@ static void INT21_IoctlScsiMgrHandler( CONTEXT86 *context )
/***********************************************************************
* INT21_IoctlEMSHandler
*
* IOCTL handler for the EMXXXX0 device.
*/
static void INT21_IoctlEMSHandler( CONTEXT86 *context )
{
EMS_Ioctl_Handler(context);
}
/***********************************************************************
* INT21_IoctlHPScanHandler
*
* IOCTL handler for the HPSCAN device.
......
dlls/winedos/int31.c
View file @ 58cd87ab
......@@ -675,7 +675,7 @@ static RMCB *DPMI_AllocRMCB( void )
}
FARPROC16 WINAPI DPMI_AllocInternalRMCB( RMCBPROC proc )
FARPROC16 DPMI_AllocInternalRMCB( RMCBPROC proc )
{
RMCB *NewRMCB = DPMI_AllocRMCB();
......
dlls/winedos/int33.c
View file @ 58cd87ab
......@@ -285,7 +285,7 @@ static void QueueMouseRelay(DWORD mx, DWORD my, WORD mask)
}
}
void WINAPI DOSVM_Int33Message(UINT message,WPARAM wParam,LPARAM lParam)
void DOSVM_Int33Message(UINT message,WPARAM wParam,LPARAM lParam)
{
WORD mask = 0;
unsigned Height, Width, SX=1, SY=1;
......@@ -329,7 +329,7 @@ void WINAPI DOSVM_Int33Message(UINT message,WPARAM wParam,LPARAM lParam)
mask);
}
void WINAPI DOSVM_Int33Console(MOUSE_EVENT_RECORD *record)
void DOSVM_Int33Console(MOUSE_EVENT_RECORD *record)
{
unsigned Height, Width;
WORD mask = 0;
......
dlls/winedos/int67.c
View file @ 58cd87ab
......@@ -461,7 +461,7 @@ void WINAPI DOSVM_Int67Handler( CONTEXT86 *context )
*
* Handler for interrupt 21h IOCTL routine for device "EMMXXXX0".
*/
void WINAPI EMS_Ioctl_Handler( CONTEXT86 *context )
void EMS_Ioctl_Handler( CONTEXT86 *context )
{
assert(AH_reg(context) == 0x44);
......
dlls/winedos/interrupts.c
View file @ 58cd87ab
......@@ -445,7 +445,7 @@ void DOSVM_HardwareInterruptPM( CONTEXT86 *context, BYTE intnum )
* Returns FALSE if this interrupt was caused by return
* from real mode wrapper.
*/
BOOL WINAPI DOSVM_EmulateInterruptRM( CONTEXT86 *context, BYTE intnum )
BOOL DOSVM_EmulateInterruptRM( CONTEXT86 *context, BYTE intnum )
{
TRACE_(relay)("Call DOS int 0x%02x ret=%04x:%08x\n"
" eax=%08x ebx=%08x ecx=%08x edx=%08x\n"
......
dlls/winedos/module.c
View file @ 58cd87ab
......@@ -449,7 +449,7 @@ void WINAPI wine_load_dos_exe( LPCSTR filename, LPCSTR cmdline )
*
* this may only be called from existing DOS processes
*/
BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk )
BOOL MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk )
{
DWORD binType;
STARTUPINFOA st;
......@@ -598,7 +598,7 @@ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID para
/***********************************************************************
* MZ_AllocDPMITask
*/
void WINAPI MZ_AllocDPMITask( void )
void MZ_AllocDPMITask( void )
{
MZ_InitMemory();
MZ_InitTask();
......@@ -607,7 +607,7 @@ void WINAPI MZ_AllocDPMITask( void )
/***********************************************************************
* MZ_RunInThread
*/
void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
void MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
{
if (loop_thread) {
DOS_SPC spc;
......@@ -710,7 +710,7 @@ static void MZ_Launch( LPCSTR cmdtail, int length )
/***********************************************************************
* MZ_Exit
*/
void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
void MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
{
if (DOSVM_psp) {
WORD psp_seg = cs_psp ? context->SegCs : DOSVM_psp;
......@@ -750,7 +750,7 @@ void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
/***********************************************************************
* MZ_Current
*/
BOOL WINAPI MZ_Current( void )
BOOL MZ_Current( void )
{
return (dosvm_pid != 0); /* FIXME: do a better check */
}
......@@ -769,7 +769,7 @@ void WINAPI wine_load_dos_exe( LPCSTR filename, LPCSTR cmdline )
/***********************************************************************
* MZ_Exec
*/
BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk )
BOOL MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID paramblk )
{
/* can't happen */
SetLastError(ERROR_BAD_FORMAT);
......@@ -779,7 +779,7 @@ BOOL WINAPI MZ_Exec( CONTEXT86 *context, LPCSTR filename, BYTE func, LPVOID para
/***********************************************************************
* MZ_AllocDPMITask
*/
void WINAPI MZ_AllocDPMITask( void )
void MZ_AllocDPMITask( void )
{
FIXME("Actual real-mode calls not supported on this platform!\n");
}
......@@ -787,7 +787,7 @@ void WINAPI MZ_AllocDPMITask( void )
/***********************************************************************
* MZ_RunInThread
*/
void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
void MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
{
proc(arg);
}
......@@ -795,7 +795,7 @@ void WINAPI MZ_RunInThread( PAPCFUNC proc, ULONG_PTR arg )
/***********************************************************************
* MZ_Exit
*/
void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
void MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
{
DOSVM_Exit( retval );
}
......@@ -803,7 +803,7 @@ void WINAPI MZ_Exit( CONTEXT86 *context, BOOL cs_psp, WORD retval )
/***********************************************************************
* MZ_Current
*/
BOOL WINAPI MZ_Current( void )
BOOL MZ_Current( void )
{
return FALSE;
}
......
dlls/winedos/timer.c
View file @ 58cd87ab
......@@ -144,7 +144,7 @@ static void WINAPI TIMER_DoSetTimer( ULONG_PTR arg )
/***********************************************************************
* DOSVM_SetTimer
*/
void WINAPI DOSVM_SetTimer( UINT ticks )
void DOSVM_SetTimer( UINT ticks )
{
/* PIT interprets zero as a maximum length delay. */
if (ticks == 0)
......
dlls/winedos/xms.c
View file @ 58cd87ab
......@@ -60,7 +60,7 @@ static BYTE * XMS_Offset( MOVEOFS *ofs )
* XMS_Handler
*/
void WINAPI XMS_Handler( CONTEXT86 *context )
void XMS_Handler( CONTEXT86 *context )
{
switch(AH_reg(context))
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment