Bläddra i källkod

* fixes #23025, 64-bit issue with timer functions, patch by Luiz Americo

git-svn-id: trunk@22526 -
marco 13 år sedan
förälder
incheckning
ee51ccced6
2 ändrade filer med 3 tillägg och 3 borttagningar
  1. 1 1
      rtl/win/wininc/base.inc
  2. 2 2
      rtl/win/wininc/func.inc

+ 1 - 1
rtl/win/wininc/base.inc

@@ -599,7 +599,7 @@
 
      SENDASYNCPROC = procedure (_para1:HWND; _para2:UINT; _para3:DWORD; _para4:LRESULT);stdcall;
 
-     TIMERPROC = procedure (_para1:HWND; _para2:UINT; _para3:UINT; _para4:DWORD);stdcall;
+     TIMERPROC = procedure (hWnd: HWND; uMsg: UINT; idEvent: UINT_PTR; dwTime: DWORD); stdcall;
 
      GRAYSTRINGPROC = FARPROC;
 

+ 2 - 2
rtl/win/wininc/func.inc

@@ -500,8 +500,8 @@ function GetCapture:HWND; external 'user32' name 'GetCapture';
 function SetCapture(hWnd:HWND):HWND; external 'user32' name 'SetCapture';
 function ReleaseCapture:WINBOOL; external 'user32' name 'ReleaseCapture';
 function MsgWaitForMultipleObjects(nCount:DWORD; pHandles:LPHANDLE; fWaitAll:WINBOOL; dwMilliseconds:DWORD; dwWakeMask:DWORD):DWORD; external 'user32' name 'MsgWaitForMultipleObjects';
-function SetTimer(hWnd:HWND; nIDEvent:UINT; uElapse:UINT; lpTimerFunc:TIMERPROC):UINT; external 'user32' name 'SetTimer';
-function KillTimer(hWnd:HWND; uIDEvent:UINT):WINBOOL; external 'user32' name 'KillTimer';
+function SetTimer(hWnd:HWND; nIDEvent:UINT_PTR; uElapse:UINT; lpTimerFunc:TIMERPROC):UINT_PTR; external 'user32' name 'SetTimer';
+function KillTimer(hWnd:HWND; uIDEvent:UINT_PTR):WINBOOL; external 'user32' name 'KillTimer';
 function IsWindowUnicode(hWnd:HWND):WINBOOL; external 'user32' name 'IsWindowUnicode';
 function EnableWindow(hWnd:HWND; bEnable:WINBOOL):WINBOOL; external 'user32' name 'EnableWindow';
 function IsWindowEnabled(hWnd:HWND):WINBOOL; external 'user32' name 'IsWindowEnabled';