static FAST_MUTEX Mutex;
static RTL_BITMAP WindowLessTimersBitMap;
static PVOID WindowLessTimersBitMapBuffer;
-static ULONG HintIndex = 0;
+static ULONG HintIndex = 1;
ERESOURCE TimerLock;
RemoveEntryList(&pTmr->ptmrList);
if ((pTmr->pWnd == NULL) && (!(pTmr->flags & TMRF_SYSTEM)))
{
- DPRINT("Clearing Bit %d)\n", pTmr->nID);
+ UINT_PTR IDEvent;
+
+ IDEvent = NUM_WINDOW_LESS_TIMERS - pTmr->nID;
IntLockWindowlessTimerBitmap();
- RtlClearBit(&WindowLessTimersBitMap, pTmr->nID);
+ RtlClearBit(&WindowLessTimersBitMap, IDEvent);
IntUnlockWindowlessTimerBitmap();
}
UserDereferenceObject(pTmr);
PTIMER
FASTCALL
-FindTimer(PWINDOW_OBJECT Window,
+FindTimer(PWND Window,
UINT_PTR nID,
UINT flags)
{
break;
pLE = pTmr->ptmrList.Flink;
- pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);
+ pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);
} while (pTmr != FirstpTmr);
TimerLeave();
BOOL
FASTCALL
ValidateTimerCallback(PTHREADINFO pti,
- PWINDOW_OBJECT Window,
- WPARAM wParam,
LPARAM lParam)
{
PLIST_ENTRY pLE;
+ BOOL Ret = FALSE;
PTIMER pTmr = FirstpTmr;
if (!pTmr) return FALSE;
do
{
if ( (lParam == (LPARAM)pTmr->pfn) &&
- (pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) &&
+ !(pTmr->flags & (TMRF_SYSTEM|TMRF_RIT)) &&
(pTmr->pti->ppi == pti->ppi) )
+ {
+ Ret = TRUE;
break;
-
+ }
pLE = pTmr->ptmrList.Flink;
pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);
} while (pTmr != FirstpTmr);
TimerLeave();
- if (!pTmr) return FALSE;
-
- return TRUE;
+ return Ret;
}
UINT_PTR FASTCALL
-IntSetTimer( PWINDOW_OBJECT Window,
+IntSetTimer( PWND Window,
UINT_PTR IDEvent,
UINT Elapse,
TIMERPROC TimerFunc,
INT Type)
{
PTIMER pTmr;
- UINT Ret= IDEvent;
+ UINT Ret = IDEvent;
LARGE_INTEGER DueTime;
DueTime.QuadPart = (LONGLONG)(-5000000);
Elapse = 10;
}
+ /* Passing an IDEvent of 0 and the SetTimer returns 1.
+ It will create the timer with an ID of 0 */
if ((Window) && (IDEvent == 0))
- IDEvent = 1;
+ Ret = 1;
pTmr = FindTimer(Window, IDEvent, Type);
IntUnlockWindowlessTimerBitmap();
DPRINT1("Unable to find a free window-less timer id\n");
SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES);
+ ASSERT(FALSE);
return 0;
}
+ IDEvent = NUM_WINDOW_LESS_TIMERS - IDEvent;
Ret = IDEvent;
- //HintIndex = IDEvent + 1;
+
IntUnlockWindowlessTimerBitmap();
}
if (!pTmr) return 0;
if (Window && (Type & TMRF_TIFROMWND))
- pTmr->pti = Window->pti->pEThread->Tcb.Win32Thread;
+ pTmr->pti = Window->head.pti->pEThread->Tcb.Win32Thread;
else
{
if (Type & TMRF_RIT)
pTmr->cmsRate = Elapse;
pTmr->pfn = TimerFunc;
pTmr->nID = IDEvent;
- pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode.
+ pTmr->flags = Type|TMRF_INIT;
}
else
{
UINT_PTR
FASTCALL
-SystemTimerSet( PWINDOW_OBJECT Window,
+SystemTimerSet( PWND Window,
UINT_PTR nIDEvent,
UINT uElapse,
TIMERPROC lpTimerFunc)
{
- if (Window && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess())
+ if (Window && Window->head.pti->pEThread->ThreadsProcess != PsGetCurrentProcess())
{
SetLastWin32Error(ERROR_ACCESS_DENIED);
+ DPRINT("SysemTimerSet: Access Denied!\n");
return 0;
}
return IntSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM);
BOOL
FASTCALL
-PostTimerMessages(PWINDOW_OBJECT Window)
+PostTimerMessages(PWND Window)
{
PLIST_ENTRY pLE;
PUSER_MESSAGE_QUEUE ThreadQueue;
(pTmr->pti == pti) &&
((pTmr->pWnd == Window) || (Window == NULL)) )
{
- Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->hSelf : 0;
+ Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->head.h : 0;
Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER;
Msg.wParam = (WPARAM) pTmr->nID;
Msg.lParam = (LPARAM) pTmr->pfn;
}
BOOL FASTCALL
-DestroyTimersForWindow(PTHREADINFO pti, PWINDOW_OBJECT Window)
+DestroyTimersForWindow(PTHREADINFO pti, PWND Window)
{
PLIST_ENTRY pLE;
PTIMER pTmr = FirstpTmr;
}
BOOL FASTCALL
-IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer)
+IntKillTimer(PWND Window, UINT_PTR IDEvent, BOOL SystemTimer)
{
PTIMER pTmr = NULL;
DPRINT("IntKillTimer Window %x id %p systemtimer %s\n",
Window, IDEvent, SystemTimer ? "TRUE" : "FALSE");
- if ((Window) && (IDEvent == 0))
- IDEvent = 1;
-
pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0);
if (pTmr)
return pTmr ? TRUE : FALSE;
}
-NTSTATUS FASTCALL
+INIT_FUNCTION
+NTSTATUS
+NTAPI
InitTimerImpl(VOID)
{
ULONG BitmapBytes;
ExInitializeFastMutex(&Mutex);
BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8;
- WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(PagedPool, BitmapBytes, TAG_TIMERBMP);
+ WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(NonPagedPool, BitmapBytes, TAG_TIMERBMP);
if (WindowLessTimersBitMapBuffer == NULL)
{
return STATUS_UNSUCCESSFUL;
TIMERPROC lpTimerFunc
)
{
- PWINDOW_OBJECT Window;
+ PWND Window;
DECLARE_RETURN(UINT_PTR);
DPRINT("Enter NtUserSetTimer\n");
UINT_PTR uIDEvent
)
{
- PWINDOW_OBJECT Window;
+ PWND Window;
DECLARE_RETURN(BOOL);
DPRINT("Enter NtUserKillTimer\n");
DPRINT("Enter NtUserSetSystemTimer\n");
- // This is wrong, lpTimerFunc is NULL!
- RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM));
+ RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM));
CLEANUP:
DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_);