Commit 7b57b24f authored by Ulrich Weigand's avatar Ulrich Weigand Committed by Alexandre Julliard

Adapted to CreateSystemTimer interface change.

parent f6c4828c
......@@ -66,7 +66,7 @@ static void DISPDIB_Show(LPBITMAPINFOHEADER lpbi,LPSTR lpBits,WORD uFlags)
memcpy(surf,lpBits,Width);
}
VGA_Poll();
VGA_Poll(0);
}
/*********************************************************************
......
......@@ -50,7 +50,7 @@ int VGA_SetMode(unsigned Xres,unsigned Yres,unsigned Depth)
vga_refresh=0;
InitializeCriticalSection(&vga_crit);
/* poll every 20ms (50fps should provide adequate responsiveness) */
poll_timer = CreateSystemTimer( 20, (FARPROC16)VGA_Poll );
poll_timer = CreateSystemTimer( 20, VGA_Poll );
}
return 0;
}
......@@ -120,7 +120,7 @@ void VGA_Unlock(void)
lpddsurf->lpvtbl->fnUnlock(lpddsurf,sdesc.y.lpSurface);
}
void VGA_Poll(void)
void VGA_Poll( WORD timer )
{
char *dat;
unsigned Pitch,Height,Width;
......
......@@ -19,7 +19,7 @@ extern DWORD DOSMEM_ErrorCall;
extern DWORD DOSMEM_ErrorBuffer;
extern BOOL32 DOSMEM_Init(HMODULE16 hModule);
extern void DOSMEM_Tick(void);
extern void DOSMEM_Tick(WORD timer);
extern WORD DOSMEM_AllocSelector(WORD);
extern char * DOSMEM_MemoryBase(HMODULE16 hModule);
extern LPVOID DOSMEM_GetBlock(HMODULE16 hModule, UINT32 size, UINT16* p);
......
......@@ -17,7 +17,7 @@ void VGA_SetPalette(PALETTEENTRY*pal,int start,int len);
void VGA_SetQuadPalette(RGBQUAD*color,int start,int len);
LPSTR VGA_Lock(unsigned*Pitch,unsigned*Height,unsigned*Width,unsigned*Depth);
void VGA_Unlock(void);
void VGA_Poll(void);
void VGA_Poll(WORD timer);
void VGA_ioport_out(WORD port, BYTE val);
BYTE VGA_ioport_in(WORD port);
......
......@@ -384,7 +384,7 @@ int MZ_InitTask( LPDOSTASK lpDosTask )
exit(1);
}
/* start simulated system 55Hz timer */
lpDosTask->system_timer = CreateSystemTimer( 55, (FARPROC16)MZ_Tick );
lpDosTask->system_timer = CreateSystemTimer( 55, MZ_Tick );
TRACE(module,"created 55Hz timer tick, handle=%d\n",lpDosTask->system_timer);
return lpDosTask->hModule;
}
......
......@@ -64,7 +64,7 @@ static BOOL32 INSTR_ReplaceSelector( SIGCONTEXT *context, WORD *sel )
{
static WORD sys_timer = 0;
if (!sys_timer)
sys_timer = CreateSystemTimer( 55, (FARPROC16)DOSMEM_Tick );
sys_timer = CreateSystemTimer( 55, DOSMEM_Tick );
*sel = DOSMEM_BiosSeg;
return TRUE;
}
......
......@@ -363,7 +363,7 @@ BOOL32 DOSMEM_Init(HMODULE16 hModule)
*
* Increment the BIOS tick counter. Called by timer signal handler.
*/
void DOSMEM_Tick(void)
void DOSMEM_Tick( WORD timer )
{
if (pBiosData) pBiosData->Ticks++;
}
......
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