commit 7b57b24fdaf80b78dfec87cd86ad934946089f66
author Ulrich Weigand <weigand@informatik.uni-erlangen.de> Thu Dec 10 10:47:26 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Dec 10 10:47:26 1998 +0000
tree 23dc38289dcd331550762f1b3ce5be21db6b74f4
parent f6c4828c13c4204b6dd2b12253d112d78ff7ac04

Adapted to CreateSystemTimer interface change.

graphics/dispdib.c

diff --git a/graphics/dispdib.c b/graphics/dispdib.c
index e4df068..8432e9f 100644
--- a/graphics/dispdib.c
+++ b/graphics/dispdib.c
@@ -66,7 +66,7 @@
         memcpy(surf,lpBits,Width);
     }
 
-    VGA_Poll();
+    VGA_Poll(0);
 }
 
 /*********************************************************************

graphics/vga.c

diff --git a/graphics/vga.c b/graphics/vga.c
index be4730d..3f9480e 100644
--- a/graphics/vga.c
+++ b/graphics/vga.c
@@ -50,7 +50,7 @@
         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 @@
     lpddsurf->lpvtbl->fnUnlock(lpddsurf,sdesc.y.lpSurface);
 }
 
-void VGA_Poll(void)
+void VGA_Poll( WORD timer )
 {
     char *dat;
     unsigned Pitch,Height,Width;

include/miscemu.h

diff --git a/include/miscemu.h b/include/miscemu.h
index 90ef0bd..9b2598b 100644
--- a/include/miscemu.h
+++ b/include/miscemu.h
@@ -19,7 +19,7 @@
 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);

include/vga.h

diff --git a/include/vga.h b/include/vga.h
index 4cc3eef..62e9aeb 100644
--- a/include/vga.h
+++ b/include/vga.h
@@ -17,7 +17,7 @@
 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);
 

loader/dos/module.c

diff --git a/loader/dos/module.c b/loader/dos/module.c
index 78206ca..3d44412 100644
--- a/loader/dos/module.c
+++ b/loader/dos/module.c
@@ -384,7 +384,7 @@
   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;
 }

miscemu/instr.c

diff --git a/miscemu/instr.c b/miscemu/instr.c
index 029d1de..8539d07 100644
--- a/miscemu/instr.c
+++ b/miscemu/instr.c
@@ -64,7 +64,7 @@
     {
         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;
     }

msdos/dosmem.c

diff --git a/msdos/dosmem.c b/msdos/dosmem.c
index a9fa088..fc91bac 100644
--- a/msdos/dosmem.c
+++ b/msdos/dosmem.c
@@ -363,7 +363,7 @@
  *
  * Increment the BIOS tick counter. Called by timer signal handler.
  */
-void DOSMEM_Tick(void)
+void DOSMEM_Tick( WORD timer )
 {
     if (pBiosData) pBiosData->Ticks++;
 }