Ros-dev May 2010

ros-dev@reactos.org

24 participants
25 discussions

Start a nNew thread

test

by Timo Kreuzer

test if the list works ;-)

14 years, 7 months

Re: [ros-dev] [ros-diffs] [mjmartin] 47226: [win32k] - Change the first parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more sense. Activate IntSetTimer, already done by James. - Add flag TMRF_DELETEPENDING. Destroy timers whe

by Javier Agustìn Fernàndez Arroyo

at last! All hail mjmartin! :-) On Mon, May 17, 2010 at 9:41 AM, Ged Murphy <gedmurphy(a)gmail.com> wrote: > Congrats, good stuff Michael :) > > -----Original Message----- > From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] > On Behalf Of mjmartin(a)svn.reactos.org > Sent: 15 May 2010 20:41 > To: ros-diffs(a)reactos.org > Subject: [ros-diffs] [mjmartin] 47226: [win32k] - Change the first > parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more > sense. Activate IntSetTimer, already done by James. - Add flag > TMRF_DELETEPENDING. Destroy timers when this flag is set > > Author: mjmartin > Date: Sat May 15 21:40:33 2010 > New Revision: 47226 > > URL: http://svn.reactos.org/svn/reactos?rev=47226&view=rev > Log: > [win32k] > - Change the first parameter type from HWND to PWINDOW_OBJECT for > IntKillTimer as it makes more sense. > Activate IntSetTimer, already done by James. > - Add flag TMRF_DELETEPENDING. Destroy timers when this flag is set in > ProcessTimers to allow any timers that have expired to have the > WM_SYSTIMER/WM_TIMER messages posted to message queue before being > destroyed. > - Fix error in FindTimer, it was always returning a Timer and it needed to > return NULL if the specified timer did not exist. > - Fix error in PostTimerMessages, need to handle cases where the Window > object is NULL which occurs when requesting messages for any window > belonging to the thread. > - In co_IntPeekMessage, simply call PostTimerMessages to have > WM_SYSTIMER/WM_TIMER messages posted for expired timers. Remove call to old > timer message handling. > - TODO: Code using the old timer implementation needs removed. > - Fixes bugs #2393, #3634, #2835. Commit dedicated to JT and Mr. Roboto. > > Modified: > trunk/reactos/subsystems/win32/win32k/include/timer.h > trunk/reactos/subsystems/win32/win32k/main/dllmain.c > trunk/reactos/subsystems/win32/win32k/ntuser/caret.c > trunk/reactos/subsystems/win32/win32k/ntuser/message.c > trunk/reactos/subsystems/win32/win32k/ntuser/timer.c > > Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Sat > May 15 21:40:33 2010 > @@ -23,12 +23,14 @@ > #define TMRF_ONESHOT 0x0010 > #define TMRF_WAITING 0x0020 > #define TMRF_TIFROMWND 0x0040 > +#define TMRF_DELETEPENDING 0x8000 > > extern PKTIMER MasterTimer; > > NTSTATUS FASTCALL InitTimerImpl(VOID); > -BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer); > -UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, > TIMERPROC TimerFunc, BOOL SystemTimer); > +BOOL FASTCALL DestroyTimersForThread(PTHREADINFO pti); > +BOOL FASTCALL IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL > SystemTimer); > +UINT_PTR FASTCALL IntSetTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, > UINT Elapse, TIMERPROC TimerFunc, INT Type); > PTIMER FASTCALL FindSystemTimer(PMSG); > BOOL FASTCALL > ValidateTimerCallback(PTHREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); > VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); > > Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat > May 15 21:40:33 2010 > @@ -290,6 +290,8 @@ > Win32Thread->TIF_flags |= TIF_INCLEANUP; > DceFreeThreadDCE(Win32Thread); > HOOK_DestroyThreadHooks(Thread); > + /* Cleanup timers */ > + DestroyTimersForThread(Win32Thread); > UnregisterThreadHotKeys(Thread); > /* what if this co_ func crash in umode? what will clean us up then? > */ > co_DestroyThreadWindows(Thread); > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Sat > May 15 21:40:33 2010 > @@ -189,7 +189,7 @@ > ThreadQueue->CaretInfo->Pos.x = X; > ThreadQueue->CaretInfo->Pos.y = Y; > co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, > IDCARETTIMER, 0); > - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, > IntGetCaretBlinkTime(), NULL, TRUE); > + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), > IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); > } > return TRUE; > } > @@ -302,7 +302,7 @@ > { > co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, > IDCARETTIMER, 0); > } > - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, > IntGetCaretBlinkTime(), NULL, TRUE); > + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), > IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); > } > > return TRUE; > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat > May 15 21:40:33 2010 > @@ -880,23 +880,8 @@ > goto MsgExit; > } > > - if (ThreadQueue->WakeMask & QS_TIMER) > - if (PostTimerMessages(Window)) // If there are timers ready, > - goto CheckMessages; // go back and process them. > - > - // LOL! Polling Timer Queue? How much time is spent doing this? > - /* Check for WM_(SYS)TIMER messages */ > - Present = MsqGetTimerMessage( ThreadQueue, > - Window, > - MsgFilterMin, > - MsgFilterMax, > - &Msg->Msg, > - RemoveMessages); > - if (Present) > - { > - Msg->FreeLParam = FALSE; > - goto MessageFound; > - } > + if (PostTimerMessages(Window)) > + goto CheckMessages; > > if(Present) > { > > Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… > > ============================================================================== > --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] > (original) > +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat > May 15 21:40:33 2010 > @@ -57,7 +57,7 @@ > { > Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, > sizeof(TIMER)); > if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); > - } > + } > return Ret; > } > > @@ -68,8 +68,8 @@ > { > if (pTmr) > { > - RemoveEntryList(&pTmr->ptmrList); > - UserDeleteObject( UserHMGetHandle(pTmr), otTimer); > + /* Set the flag, it will be removed when ready */ > + pTmr->flags |= TMRF_DELETEPENDING; > return TRUE; > } > return FALSE; > @@ -83,7 +83,7 @@ > BOOL Distroy) > { > PLIST_ENTRY pLE; > - PTIMER pTmr = FirstpTmr; > + PTIMER pTmr = FirstpTmr, RetTmr = NULL; > KeEnterCriticalRegion(); > do > { > @@ -96,8 +96,8 @@ > if (Distroy) > { > RemoveTimer(pTmr); > - pTmr = (PTIMER)1; // We are here to remove the timer. > } > + RetTmr = pTmr; > break; > } > > @@ -106,7 +106,7 @@ > } while (pTmr != FirstpTmr); > KeLeaveCriticalRegion(); > > - return pTmr; > + return RetTmr; > } > > PTIMER > @@ -162,15 +162,15 @@ > return TRUE; > } > > -// Rename it to IntSetTimer after move. > UINT_PTR FASTCALL > -InternalSetTimer( PWINDOW_OBJECT Window, > +IntSetTimer( PWINDOW_OBJECT Window, > UINT_PTR IDEvent, > UINT Elapse, > TIMERPROC TimerFunc, > INT Type) > { > PTIMER pTmr; > + UINT Ret= IDEvent; > LARGE_INTEGER DueTime; > DueTime.QuadPart = (LONGLONG)(-10000000); > > @@ -195,6 +195,24 @@ > { > DPRINT("Adjusting uElapse\n"); > Elapse = 10; > + } > + > + if ((Window == NULL) && (!(Type & TMRF_SYSTEM))) > + { > + IntLockWindowlessTimerBitmap(); > + IDEvent = RtlFindClearBitsAndSet(&WindowLessTimersBitMap, 1, > HintIndex); > + > + if (IDEvent == (UINT_PTR) -1) > + { > + IntUnlockWindowlessTimerBitmap(); > + DPRINT1("Unable to find a free window-less timer id\n"); > + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); > + return 0; > + } > + > + HintIndex = ++IDEvent; > + IntUnlockWindowlessTimerBitmap(); > + Ret = IDEvent; > } > > pTmr = FindTimer(Window, IDEvent, Type, FALSE); > @@ -215,18 +233,23 @@ > pTmr->pWnd = Window; > pTmr->cmsCountdown = Elapse; > pTmr->cmsRate = Elapse; > - pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. > pTmr->pfn = TimerFunc; > pTmr->nID = IDEvent; > - > - InsertTailList(&FirstpTmr->ptmrList, &pTmr->ptmrList); > + pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. > + } > + > + pTmr->cmsCountdown = Elapse; > + pTmr->cmsRate = Elapse; > + if (pTmr->flags & TMRF_DELETEPENDING) > + { > + pTmr->flags &= ~TMRF_DELETEPENDING; > } > > // Start the timer thread! > - KeSetTimer(MasterTimer, DueTime, NULL); > - > - if (!pTmr->nID) return 1; > - return pTmr->nID; > + if (pTmr == FirstpTmr) > + KeSetTimer(MasterTimer, DueTime, NULL); > + > + return Ret; > } > > // > @@ -248,7 +271,7 @@ > { > // Need to start gdi syncro timers then start timer with Hang App proc > // that calles Idle process so the screen savers will know to run...... > - InternalSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); > + IntSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); > } > > UINT_PTR > @@ -256,14 +279,14 @@ > SystemTimerSet( PWINDOW_OBJECT Window, > UINT_PTR nIDEvent, > UINT uElapse, > - TIMERPROC lpTimerFunc) > + TIMERPROC lpTimerFunc) > { > if (Window && Window->pti->pEThread->ThreadsProcess != > PsGetCurrentProcess()) > { > SetLastWin32Error(ERROR_ACCESS_DENIED); > return 0; > } > - return InternalSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, > TMRF_SYSTEM); > + return IntSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, > TMRF_SYSTEM); > } > > BOOL > @@ -279,28 +302,23 @@ > > if (!pTmr) return FALSE; > > - if (Window && ((ULONG_PTR)Window != 1)) > - { > - if (!Window->Wnd) return FALSE; > - } > - > pti = PsGetCurrentThreadWin32Thread(); > ThreadQueue = pti->MessageQueue; > > KeEnterCriticalRegion(); > + > do > { > if ( (pTmr->flags & TMRF_READY) && > (pTmr->pti == pti) && > - (pTmr->pWnd == Window)) > + ((pTmr->pWnd == Window) || (Window == NULL) ) ) > { > - ASSERT((ULONG_PTR)Window != 1); > - Msg.hwnd = Window->hSelf; > + Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->hSelf : 0; > Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : > WM_TIMER; > Msg.wParam = (WPARAM) pTmr->nID; > Msg.lParam = (LPARAM) pTmr->pfn; > - MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_POSTMESSAGE); > - > + > + MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_TIMER); > pTmr->flags &= ~TMRF_READY; > ThreadQueue->WakeMask = ~QS_TIMER; > Hit = TRUE; > @@ -309,6 +327,7 @@ > pLE = pTmr->ptmrList.Flink; > pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); > } while (pTmr != FirstpTmr); > + > KeLeaveCriticalRegion(); > > return Hit; > @@ -330,7 +349,7 @@ > KeQueryTickCount(&TickCount); > Time = MsqCalculateMessageTime(&TickCount); > > - DueTime.QuadPart = (LONGLONG)(-10000000); > + DueTime.QuadPart = (LONGLONG)(-1000000); > > do > { > @@ -341,8 +360,10 @@ > continue; > } > > - if (pTmr->flags & TMRF_INIT) > + if (pTmr->flags & TMRF_INIT) > + { > pTmr->flags &= ~TMRF_INIT; // Skip this run. > + } > else > { > if (pTmr->cmsCountdown < 0) > @@ -363,16 +384,35 @@ > // Set thread message queue for this timer. > if (pTmr->pti->MessageQueue) > { // Wakeup thread > - pTmr->pti->MessageQueue->WakeMask |= QS_TIMER; > - KeSetEvent(pTmr->pti->MessageQueue->NewMessages, > IO_NO_INCREMENT, FALSE); > + if (pTmr->pti->MessageQueue->WakeMask & QS_POSTMESSAGE) > + KeSetEvent(pTmr->pti->MessageQueue->NewMessages, > IO_NO_INCREMENT, FALSE); > } > } > } > - pTmr->cmsCountdown = pTmr->cmsRate; > + if (pTmr->flags & TMRF_DELETEPENDING) > + { > + DPRINT("Removing Timer %x from List\n", pTmr); > + > + /* FIXME: Fix this!!!! */ > +/* > + if (!pTmr->pWnd) > + { > + DPRINT1("Clearing Bits for WindowLess Timer\n"); > + IntLockWindowlessTimerBitmap(); > + RtlSetBits(&WindowLessTimersBitMap, pTmr->nID, 1); > + IntUnlockWindowlessTimerBitmap(); > + } > +*/ > + RemoveEntryList(&pTmr->ptmrList); > + UserDeleteObject( UserHMGetHandle(pTmr), otTimer); > + } > + else > + pTmr->cmsCountdown = pTmr->cmsRate; > } > else > pTmr->cmsCountdown -= Time - TimeLast; > } > + > pLE = pTmr->ptmrList.Flink; > pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); > } while (pTmr != FirstpTmr); > @@ -391,7 +431,7 @@ > // > // > UINT_PTR FASTCALL > -IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, > BOOL SystemTimer) > +InternalSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC > TimerFunc, BOOL SystemTimer) > { > PWINDOW_OBJECT Window; > UINT_PTR Ret = 0; > @@ -477,17 +517,66 @@ > return 0; > } > > - > +if (Ret == 0) ASSERT(FALSE); > return Ret; > } > > - > BOOL FASTCALL > -IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) > +DestroyTimersForThread(PTHREADINFO pti) > +{ > + PLIST_ENTRY pLE; > + PTIMER pTmr = FirstpTmr; > + BOOL TimersRemoved = FALSE; > + > + if (FirstpTmr == NULL) > + return FALSE; > + > + KeEnterCriticalRegion(); > + > + do > + { > + if ((pTmr) && (pTmr->pti == pti)) > + { > + pTmr->flags &= ~TMRF_READY; > + pTmr->flags |= TMRF_DELETEPENDING; > + TimersRemoved = TRUE; > + } > + pLE = pTmr->ptmrList.Flink; > + pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); > + } while (pTmr != FirstpTmr); > + > + KeLeaveCriticalRegion(); > + > + return TimersRemoved; > +} > + > + > +BOOL FASTCALL > +IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer) > +{ > + PTIMER pTmr = NULL; > + DPRINT("IntKillTimer Window %x id %p systemtimer %s\n", > + Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); > + > + if (IDEvent == 0) > + return FALSE; > + > + pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0, TRUE); > + return pTmr ? TRUE : FALSE; > +} > + > + > +// > +// > +// Old Kill Timer > +// > +// > +BOOL FASTCALL > +InternalKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) > { > PTHREADINFO pti; > PWINDOW_OBJECT Window = NULL; > - > + > DPRINT("IntKillTimer wnd %x id %p systemtimer %s\n", > Wnd, IDEvent, SystemTimer ? "TRUE" : "FALSE"); > > @@ -495,7 +584,7 @@ > if (Wnd) > { > Window = UserGetWindowObject(Wnd); > - > + > if (! MsqKillTimer(pti->MessageQueue, Wnd, > IDEvent, SystemTimer ? WM_SYSTIMER : > WM_TIMER)) > { > @@ -574,7 +663,7 @@ > DPRINT("Enter NtUserSetTimer\n"); > UserEnterExclusive(); > > - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, FALSE)); > + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, > lpTimerFunc, 0)); > > CLEANUP: > DPRINT("Leave NtUserSetTimer, ret=%i\n", _ret_); > @@ -591,12 +680,15 @@ > UINT_PTR uIDEvent > ) > { > + PWINDOW_OBJECT Window; > DECLARE_RETURN(BOOL); > > DPRINT("Enter NtUserKillTimer\n"); > UserEnterExclusive(); > > - RETURN(IntKillTimer(hWnd, uIDEvent, FALSE)); > + Window = UserGetWindowObject(hWnd); > + > + RETURN(IntKillTimer(Window, uIDEvent, FALSE)); > > CLEANUP: > DPRINT("Leave NtUserKillTimer, ret=%i\n", _ret_); > @@ -620,7 +712,7 @@ > UserEnterExclusive(); > > // This is wrong, lpTimerFunc is NULL! > - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, TRUE)); > + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, > lpTimerFunc, TMRF_SYSTEM)); > > CLEANUP: > DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_); > > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

14 years, 7 months

Concerning regedit r47251: inform the user that search is complete

by Gregor Schneider

Hi Michael, there is no need to hardcode the messagebox output language to english. In the resource files a string exists for what you're doing: IDS_FINISHEDFIND (probably already loaded into a string in the code somewhere). Thanks, Gregor

14 years, 7 months

by Ged Murphy

Congrats, good stuff Michael :) -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mjmartin(a)svn.reactos.org Sent: 15 May 2010 20:41 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mjmartin] 47226: [win32k] - Change the first parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more sense. Activate IntSetTimer, already done by James. - Add flag TMRF_DELETEPENDING. Destroy timers when this flag is set Author: mjmartin Date: Sat May 15 21:40:33 2010 New Revision: 47226 URL: http://svn.reactos.org/svn/reactos?rev=47226&view=rev Log: [win32k] - Change the first parameter type from HWND to PWINDOW_OBJECT for IntKillTimer as it makes more sense. Activate IntSetTimer, already done by James. - Add flag TMRF_DELETEPENDING. Destroy timers when this flag is set in ProcessTimers to allow any timers that have expired to have the WM_SYSTIMER/WM_TIMER messages posted to message queue before being destroyed. - Fix error in FindTimer, it was always returning a Timer and it needed to return NULL if the specified timer did not exist. - Fix error in PostTimerMessages, need to handle cases where the Window object is NULL which occurs when requesting messages for any window belonging to the thread. - In co_IntPeekMessage, simply call PostTimerMessages to have WM_SYSTIMER/WM_TIMER messages posted for expired timers. Remove call to old timer message handling. - TODO: Code using the old timer implementation needs removed. - Fixes bugs #2393, #3634, #2835. Commit dedicated to JT and Mr. Roboto. Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Sat May 15 21:40:33 2010 @@ -23,12 +23,14 @@ #define TMRF_ONESHOT 0x0010 #define TMRF_WAITING 0x0020 #define TMRF_TIFROMWND 0x0040 +#define TMRF_DELETEPENDING 0x8000 extern PKTIMER MasterTimer; NTSTATUS FASTCALL InitTimerImpl(VOID); -BOOL FASTCALL IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer); -UINT_PTR FASTCALL IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer); +BOOL FASTCALL DestroyTimersForThread(PTHREADINFO pti); +BOOL FASTCALL IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer); +UINT_PTR FASTCALL IntSetTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type); PTIMER FASTCALL FindSystemTimer(PMSG); BOOL FASTCALL ValidateTimerCallback(PTHREADINFO,PWINDOW_OBJECT,WPARAM,LPARAM); VOID CALLBACK SystemTimerProc(HWND,UINT,UINT_PTR,DWORD); Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -290,6 +290,8 @@ Win32Thread->TIF_flags |= TIF_INCLEANUP; DceFreeThreadDCE(Win32Thread); HOOK_DestroyThreadHooks(Thread); + /* Cleanup timers */ + DestroyTimersForThread(Win32Thread); UnregisterThreadHotKeys(Thread); /* what if this co_ func crash in umode? what will clean us up then? */ co_DestroyThreadWindows(Thread); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/caret.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -189,7 +189,7 @@ ThreadQueue->CaretInfo->Pos.x = X; ThreadQueue->CaretInfo->Pos.y = Y; co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); } return TRUE; } @@ -302,7 +302,7 @@ { co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); } - IntSetTimer(ThreadQueue->CaretInfo->hWnd, IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TRUE); + IntSetTimer(UserGetWindowObject(ThreadQueue->CaretInfo->hWnd), IDCARETTIMER, IntGetCaretBlinkTime(), NULL, TMRF_SYSTEM); } return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -880,23 +880,8 @@ goto MsgExit; } - if (ThreadQueue->WakeMask & QS_TIMER) - if (PostTimerMessages(Window)) // If there are timers ready, - goto CheckMessages; // go back and process them. - - // LOL! Polling Timer Queue? How much time is spent doing this? - /* Check for WM_(SYS)TIMER messages */ - Present = MsqGetTimerMessage( ThreadQueue, - Window, - MsgFilterMin, - MsgFilterMax, - &Msg->Msg, - RemoveMessages); - if (Present) - { - Msg->FreeLParam = FALSE; - goto MessageFound; - } + if (PostTimerMessages(Window)) + goto CheckMessages; if(Present) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Sat May 15 21:40:33 2010 @@ -57,7 +57,7 @@ { Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER)); if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList); - } + } return Ret; } @@ -68,8 +68,8 @@ { if (pTmr) { - RemoveEntryList(&pTmr->ptmrList); - UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + /* Set the flag, it will be removed when ready */ + pTmr->flags |= TMRF_DELETEPENDING; return TRUE; } return FALSE; @@ -83,7 +83,7 @@ BOOL Distroy) { PLIST_ENTRY pLE; - PTIMER pTmr = FirstpTmr; + PTIMER pTmr = FirstpTmr, RetTmr = NULL; KeEnterCriticalRegion(); do { @@ -96,8 +96,8 @@ if (Distroy) { RemoveTimer(pTmr); - pTmr = (PTIMER)1; // We are here to remove the timer. } + RetTmr = pTmr; break; } @@ -106,7 +106,7 @@ } while (pTmr != FirstpTmr); KeLeaveCriticalRegion(); - return pTmr; + return RetTmr; } PTIMER @@ -162,15 +162,15 @@ return TRUE; } -// Rename it to IntSetTimer after move. UINT_PTR FASTCALL -InternalSetTimer( PWINDOW_OBJECT Window, +IntSetTimer( PWINDOW_OBJECT Window, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, INT Type) { PTIMER pTmr; + UINT Ret= IDEvent; LARGE_INTEGER DueTime; DueTime.QuadPart = (LONGLONG)(-10000000); @@ -195,6 +195,24 @@ { DPRINT("Adjusting uElapse\n"); Elapse = 10; + } + + if ((Window == NULL) && (!(Type & TMRF_SYSTEM))) + { + IntLockWindowlessTimerBitmap(); + IDEvent = RtlFindClearBitsAndSet(&WindowLessTimersBitMap, 1, HintIndex); + + if (IDEvent == (UINT_PTR) -1) + { + IntUnlockWindowlessTimerBitmap(); + DPRINT1("Unable to find a free window-less timer id\n"); + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return 0; + } + + HintIndex = ++IDEvent; + IntUnlockWindowlessTimerBitmap(); + Ret = IDEvent; } pTmr = FindTimer(Window, IDEvent, Type, FALSE); @@ -215,18 +233,23 @@ pTmr->pWnd = Window; pTmr->cmsCountdown = Elapse; pTmr->cmsRate = Elapse; - pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. pTmr->pfn = TimerFunc; pTmr->nID = IDEvent; - - InsertTailList(&FirstpTmr->ptmrList, &pTmr->ptmrList); + pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode. + } + + pTmr->cmsCountdown = Elapse; + pTmr->cmsRate = Elapse; + if (pTmr->flags & TMRF_DELETEPENDING) + { + pTmr->flags &= ~TMRF_DELETEPENDING; } // Start the timer thread! - KeSetTimer(MasterTimer, DueTime, NULL); - - if (!pTmr->nID) return 1; - return pTmr->nID; + if (pTmr == FirstpTmr) + KeSetTimer(MasterTimer, DueTime, NULL); + + return Ret; } // @@ -248,7 +271,7 @@ { // Need to start gdi syncro timers then start timer with Hang App proc // that calles Idle process so the screen savers will know to run...... - InternalSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); + IntSetTimer(NULL, 0, 1000, SystemTimerProc, TMRF_RIT); } UINT_PTR @@ -256,14 +279,14 @@ SystemTimerSet( PWINDOW_OBJECT Window, UINT_PTR nIDEvent, UINT uElapse, - TIMERPROC lpTimerFunc) + TIMERPROC lpTimerFunc) { if (Window && Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { SetLastWin32Error(ERROR_ACCESS_DENIED); return 0; } - return InternalSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); + return IntSetTimer( Window, nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM); } BOOL @@ -279,28 +302,23 @@ if (!pTmr) return FALSE; - if (Window && ((ULONG_PTR)Window != 1)) - { - if (!Window->Wnd) return FALSE; - } - pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; KeEnterCriticalRegion(); + do { if ( (pTmr->flags & TMRF_READY) && (pTmr->pti == pti) && - (pTmr->pWnd == Window)) + ((pTmr->pWnd == Window) || (Window == NULL) ) ) { - ASSERT((ULONG_PTR)Window != 1); - Msg.hwnd = Window->hSelf; + Msg.hwnd = (pTmr->pWnd) ? pTmr->pWnd->hSelf : 0; Msg.message = (pTmr->flags & TMRF_SYSTEM) ? WM_SYSTIMER : WM_TIMER; Msg.wParam = (WPARAM) pTmr->nID; Msg.lParam = (LPARAM) pTmr->pfn; - MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_POSTMESSAGE); - + + MsqPostMessage(ThreadQueue, &Msg, FALSE, QS_TIMER); pTmr->flags &= ~TMRF_READY; ThreadQueue->WakeMask = ~QS_TIMER; Hit = TRUE; @@ -309,6 +327,7 @@ pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); + KeLeaveCriticalRegion(); return Hit; @@ -330,7 +349,7 @@ KeQueryTickCount(&TickCount); Time = MsqCalculateMessageTime(&TickCount); - DueTime.QuadPart = (LONGLONG)(-10000000); + DueTime.QuadPart = (LONGLONG)(-1000000); do { @@ -341,8 +360,10 @@ continue; } - if (pTmr->flags & TMRF_INIT) + if (pTmr->flags & TMRF_INIT) + { pTmr->flags &= ~TMRF_INIT; // Skip this run. + } else { if (pTmr->cmsCountdown < 0) @@ -363,16 +384,35 @@ // Set thread message queue for this timer. if (pTmr->pti->MessageQueue) { // Wakeup thread - pTmr->pti->MessageQueue->WakeMask |= QS_TIMER; - KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + if (pTmr->pti->MessageQueue->WakeMask & QS_POSTMESSAGE) + KeSetEvent(pTmr->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } } } - pTmr->cmsCountdown = pTmr->cmsRate; + if (pTmr->flags & TMRF_DELETEPENDING) + { + DPRINT("Removing Timer %x from List\n", pTmr); + + /* FIXME: Fix this!!!! */ +/* + if (!pTmr->pWnd) + { + DPRINT1("Clearing Bits for WindowLess Timer\n"); + IntLockWindowlessTimerBitmap(); + RtlSetBits(&WindowLessTimersBitMap, pTmr->nID, 1); + IntUnlockWindowlessTimerBitmap(); + } +*/ + RemoveEntryList(&pTmr->ptmrList); + UserDeleteObject( UserHMGetHandle(pTmr), otTimer); + } + else + pTmr->cmsCountdown = pTmr->cmsRate; } else pTmr->cmsCountdown -= Time - TimeLast; } + pLE = pTmr->ptmrList.Flink; pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); } while (pTmr != FirstpTmr); @@ -391,7 +431,7 @@ // // UINT_PTR FASTCALL -IntSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) +InternalSetTimer(HWND Wnd, UINT_PTR IDEvent, UINT Elapse, TIMERPROC TimerFunc, BOOL SystemTimer) { PWINDOW_OBJECT Window; UINT_PTR Ret = 0; @@ -477,17 +517,66 @@ return 0; } - +if (Ret == 0) ASSERT(FALSE); return Ret; } - BOOL FASTCALL -IntKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) +DestroyTimersForThread(PTHREADINFO pti) +{ + PLIST_ENTRY pLE; + PTIMER pTmr = FirstpTmr; + BOOL TimersRemoved = FALSE; + + if (FirstpTmr == NULL) + return FALSE; + + KeEnterCriticalRegion(); + + do + { + if ((pTmr) && (pTmr->pti == pti)) + { + pTmr->flags &= ~TMRF_READY; + pTmr->flags |= TMRF_DELETEPENDING; + TimersRemoved = TRUE; + } + pLE = pTmr->ptmrList.Flink; + pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList); + } while (pTmr != FirstpTmr); + + KeLeaveCriticalRegion(); + + return TimersRemoved; +} + + +BOOL FASTCALL +IntKillTimer(PWINDOW_OBJECT Window, UINT_PTR IDEvent, BOOL SystemTimer) +{ + PTIMER pTmr = NULL; + DPRINT("IntKillTimer Window %x id %p systemtimer %s\n", + Window, IDEvent, SystemTimer ? "TRUE" : "FALSE"); + + if (IDEvent == 0) + return FALSE; + + pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0, TRUE); + return pTmr ? TRUE : FALSE; +} + + +// +// +// Old Kill Timer +// +// +BOOL FASTCALL +InternalKillTimer(HWND Wnd, UINT_PTR IDEvent, BOOL SystemTimer) { PTHREADINFO pti; PWINDOW_OBJECT Window = NULL; - + DPRINT("IntKillTimer wnd %x id %p systemtimer %s\n", Wnd, IDEvent, SystemTimer ? "TRUE" : "FALSE"); @@ -495,7 +584,7 @@ if (Wnd) { Window = UserGetWindowObject(Wnd); - + if (! MsqKillTimer(pti->MessageQueue, Wnd, IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) { @@ -574,7 +663,7 @@ DPRINT("Enter NtUserSetTimer\n"); UserEnterExclusive(); - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, FALSE)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, 0)); CLEANUP: DPRINT("Leave NtUserSetTimer, ret=%i\n", _ret_); @@ -591,12 +680,15 @@ UINT_PTR uIDEvent ) { + PWINDOW_OBJECT Window; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserKillTimer\n"); UserEnterExclusive(); - RETURN(IntKillTimer(hWnd, uIDEvent, FALSE)); + Window = UserGetWindowObject(hWnd); + + RETURN(IntKillTimer(Window, uIDEvent, FALSE)); CLEANUP: DPRINT("Leave NtUserKillTimer, ret=%i\n", _ret_); @@ -620,7 +712,7 @@ UserEnterExclusive(); // This is wrong, lpTimerFunc is NULL! - RETURN(IntSetTimer(hWnd, nIDEvent, uElapse, lpTimerFunc, TRUE)); + RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_SYSTEM)); CLEANUP: DPRINT("Leave NtUserSetSystemTimer, ret=%i\n", _ret_);

14 years, 7 months

Re: [ros-dev] Terminal Server Clone

by Love Nystrom

"Jan Blomqvist Kinander" <jan.blomqvist(a)reactos.org> wrote: > Opening many sessions in windows is really bad idea ... for kernel stuff and another csrss, smss problems ... terminal server blue screen, black screen, printers, etc ... so i have an idea for a workaround ... > > Is open a session using createwinstation api ... in that session, create multiples desktops, using createdesktop api, in each desktop will be secure shell replacement, ejecuted using x user credentials (runas) ... the printing is gonna be universal virtual printers that receive the buffer from the win32, and send the emf or pdf to the client ... > Hi Jan & Gonzalo, I'm no expert in this particular area, but don't You think it would be more logical to give each remote a winstation, and not just a desktop on a shared winstation ? Best Regards // Love

14 years, 7 months

Open Source Terminal Server

by Jan Blomqvist Kinander

Hi Developers, I have been aproached by a certain Gonzalo from Colombia, he claims to be a developer who wants to make a Terminal Server Clone, I enclose the mail he sent me, please have a look at it and answer him. Yours Sincerely, Jaix Bly >>> Hey Jaix, i'm Gonzalo from Colombia (South America) tecnologia(a)slmsistemas.net I'm a coder, i develop more than 500 utils and apps for terminal server and citrix .... i have a product called Galeon that is a "clon" of terminal server with shell replacement, full duplex sound, universal printer driver, etc ... I want to develop a Open Source Terminal Server based in something like VNC and OpenVPN Opening many sessions in windows is really bad idea ... for kernel stuff and another csrss, smss problems ... terminal server blue screen, black screen, printers, etc ... so i have an idea for a workaround ... Is open a session using createwinstation api ... in that session, create multiples desktops, using createdesktop api, in each desktop will be secure shell replacement, ejecuted using x user credentials (runas) ... the printing is gonna be universal virtual printers that receive the buffer from the win32, and send the emf or pdf to the client ... Using Virtual Channels is a pain in the ass ... because they all travel using only one tcp socket ... (really bad idea) so, problems with video, audio, performance, etc ...i think we can use openvpn to connect to only one port (443 to ssl vpn) and after the vpn is connected, we can open many socket (each service) between the client and the server desktop ... so we can send printing, sound, video, etc ... I have many things already developed ... createwinstation, createdesktop, impersonate users, universal printer, openvpn implementation .. etc ... but i need help in other areas, like the video grabber in the desktop (maybe a modified vnc) i can make a printscreen of each desktop, and send the jpg ... and is working, but is a really bad idea ... This product can merge with ReactOS .. and be the ReactOS terminal server ... https://sourceforge.net/projects/oswts/ What do you think? Do you receive this mail? Thanks, Gonzalo. -- Cordialmente: Ing. Gonzalo Araujo C MCSE, MCSA, MCSD, ITIL, CISSP, C|EH, LPI Desarrollo SLM Sistemas Ltda desarrollo(a)slmsistemas.com tecnologia(a)slmsistemas.net http://www.slmsistemas.com Colombia - Guatemala - Chile - Venezuela <<<

14 years, 7 months

Partial build (newbie question)

by Mad Alchemist

Hello! I already have almost latest trunk build of ReactOS installed. Now I want to try modifying some sources, but recompiling whole system takes about 8 hours on my very slow PC. How can I recompile only modified part of the system? I am using RosBE for Linux version 1.5.

14 years, 7 months

Regression fixing

by Aleksey Bragin

Hello, as you all know we have quite a lot of regressions recently, and recently they only add up to one another causing annoyances of testers and developers. There is a strong need to change this situation as soon as possible, otherwise the project's future is undetermined. I want to propose a step-by-step approach. Our brave testing team has created a good overview of the most important regressions and bugs we have so far: http://www.reactos.org/wiki/Buglist . Now, very important(!): For the first step I would like ALL developers to drop their current ReactOS-related work, including all work in branches or wherever else and focus ONLY on fixing regressions from that list. The goal is to fix all confirmed regressions that have been introduced, starting from the most recent and going down to the most ancient. All possible ways to remove a regression could be used: starting from a proper fix and finishing with a total revert or commenting out even good code. Process coordination: feel free to commit proper fixes right away, however as for reverts, I, and/or comittee of our core devs, would like to have a final say on whether something should be reverted. I repeat, all other non-regression related commits to the official ReactOS SVN repository are forbidden, even to branches. The only exception may be developers whose access is restricted to branches only. Thank you for understanding, Aleksey Bragin.

14 years, 7 months

DecompressBitmap et alumni

by Love Nystrom

Gregor Schneider <grschneider(a)gmail.com> wrote: > Concerning using an internal format: let's assume we got three 8bpp > surfaces (source, destination, pattern), which are quite big pending > for a raster operation. You would convert these three to another > format like 32bpp, process them and convert back? No, of course not, Gregor, You're absolutely right about the 8bpp S/D/P situation. It would be a terrible idea to convert such a simple format to another for a tertiary rop. I think I was thinking about an internal graphic structure for the display context .. ;-) Accumulate all rops to an 32bit DIB internally, unless the physical device is low bpp. Come to think of it, almost anything but RLE is suitable internally, depending on the output color requirements. The graphics primitives for lines, ellipses, and so on can be small enough to separate a few specialized implementations for different bit depths. I guess that's what You do ? (I didn't look yet). Branching for different bit formats in the primitives would be a bad idea though.. Wouldn't You agree ? Best Regards // Love PS. I have a slice-line routine that's faster than an oiled lightning, and it's really small enough that it'd be worth replicating the code for different bit depths. Let me know if you're interested.

14 years, 7 months

DecompressBitmap / Decompress4bpp / Decompress8bpp

by Love Nystrom

Hi guys, Sorry for barging in on a discussion about code that's not on my desk, but looking at your code there is something I want to point out. Graphics code need to be *fast*, that's a primary consideration, so I'm taken aback when I look at your inner bit expansion loop. This is horrible from a standpoint of performance. > length = (*bits++) >> shift; > if (length) > { > c = *bits++; > while (length--) > { > if (x >= width) break; > temp = UncompressedBits + (((height - y) * Delta) + x); > x++; > *temp = c; > } > } You're recomputing the start of the bit-run for every pixel you emit, when you should move that calculation out of the inner loop to get high performance. Graphics code is not the arena where you can be lazy and hope that the optimizer will make your inefficient code faster. At the very least You ought to write it something like this: > length = (*bits++) >> shift; > if (length) > { > c = *bits++; > if (x + length > width) { > // RLE encoding error - Bit-run exceeds width > length = width - x; > } > temp = UncompressedBits + ((height - y) * Delta); > x += length; // precompute finishing x > while (length--) > { > *temp++ = c; > } > } As a sideline note I'd like to mention that it's standard practice in graphics libraries to use one unified bitmap format internally to make internal processing like alpha-blend or text rendering or whatever straight forward. The 32bit DIB format is quite suitable, even if it uses the most memory - Graphics never was cheap on memory. Just my penny to the pot Best Regards // Love

14 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev May 2010