Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 66311: [USER32_WINETEST] - Re-enable test_shell_window ROSTESTS-23
by tfaber＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: tfaber Date: Mon Feb 16 07:37:19 2015 New Revision: 66311 URL: http://svn.reactos.org/svn/reactos?rev=66311&view=rev Log: [USER32_WINETEST] - Re-enable test_shell_window ROSTESTS-23 Modified: trunk/rostests/winetests/user32/win.c Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re… ============================================================================== --- trunk/rostests/winetests/user32/win.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/win.c [iso-8859-1] Mon Feb 16 07:37:19 2015 @@ -7798,10 +7798,7 @@ test_layered_window(); test_SetForegroundWindow(hwndMain); - if(!winetest_interactive) - skip("bug ROSTESTS-23: skipping test_shell_window, it crashes ros/win7 explorer\n"); - else - test_shell_window(); + test_shell_window(); test_handles( hwndMain ); test_winregion(); test_map_points();

1 0

[jimtabor] 66310: [Win32ss] - Fix wine msg:test_winevents. - Fix global hooks while sending to same process different thread. Yes, interesting. - Fix event hooks, use posting (faster) instead of se...
by jimtabor＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jimtabor Date: Mon Feb 16 03:32:46 2015 New Revision: 66310 URL: http://svn.reactos.org/svn/reactos?rev=66310&view=rev Log: [Win32ss] - Fix wine msg:test_winevents. - Fix global hooks while sending to same process different thread. Yes, interesting. - Fix event hooks, use posting (faster) instead of sending. This fixed a problem while sending to the same thread. Modified: trunk/reactos/win32ss/include/callback.h trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/callback.h trunk/reactos/win32ss/user/ntuser/event.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/user32/windows/hook.c Modified: trunk/reactos/win32ss/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/callback.h… ============================================================================== --- trunk/reactos/win32ss/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/callback.h [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -79,6 +79,8 @@ DWORD dwEventThread; DWORD dwmsEventTime; WINEVENTPROC Proc; + INT Mod; + ULONG_PTR offPfn; } EVENTPROC_CALLBACK_ARGUMENTS, *PEVENTPROC_CALLBACK_ARGUMENTS; typedef struct _LOADMENU_CALLBACK_ARGUMENTS Modified: trunk/reactos/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.c [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -805,7 +805,9 @@ LONG idChild, DWORD dwEventThread, DWORD dwmsEventTime, - WINEVENTPROC Proc) + WINEVENTPROC Proc, + INT Mod, + ULONG_PTR offPfn) { LRESULT Result = 0; NTSTATUS Status; @@ -830,6 +832,8 @@ Common->dwEventThread = dwEventThread; Common->dwmsEventTime = dwmsEventTime; Common->Proc = Proc; + Common->Mod = Mod; + Common->offPfn = offPfn; ResultPointer = NULL; ResultLength = sizeof(LRESULT); Modified: trunk/reactos/win32ss/user/ntuser/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callba… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callback.h [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -42,7 +42,9 @@ LONG idChild, DWORD dwEventThread, DWORD dwmsEventTime, - WINEVENTPROC Proc); + WINEVENTPROC Proc, + INT Mod, + ULONG_PTR offPfn); VOID FASTCALL IntCleanupThreadCallbacks(PTHREADINFO W32Thread); Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -14,6 +14,7 @@ PEVENTHOOK pEH; LONG idObject; LONG idChild; + LONG idThread; } EVENTPACK, *PEVENTPACK; static PEVENTTABLE GlobalEvents = NULL; @@ -98,11 +99,11 @@ DWORD event, HWND hwnd, LONG idObject, - LONG idChild) -{ - NTSTATUS Status; + LONG idChild, + LONG idThread) +{ PEVENTPACK pEP; - ULONG_PTR uResult = 0; + MSG Msg; pEP = ExAllocatePoolWithTag(NonPagedPool, sizeof(EVENTPACK), TAG_HOOK); if (!pEP) return 0; @@ -110,23 +111,16 @@ pEP->pEH = pEH; pEP->idObject = idObject; pEP->idChild = idChild; - - /* FIXME: Should get timeout from - * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( pEH->head.pti, - hwnd, - event, - 0, - (LPARAM)pEP, - 300, - TRUE, - MSQ_ISEVENT, - &uResult); - if (!NT_SUCCESS(Status)) - { - ExFreePoolWithTag(pEP, TAG_HOOK); - } - return NT_SUCCESS(Status) ? uResult : 0; + pEP->idThread = idThread; + + Msg.message = event; + Msg.hwnd = hwnd; + Msg.wParam = 0; + Msg.lParam = POSTEVENT_NWE; + Msg.time = 0; + + MsqPostMessage(pEH->head.pti, &Msg, FALSE, QS_EVENT, POSTEVENT_NWE, (LONG_PTR)pEP); + return 0; } BOOLEAN @@ -155,7 +149,7 @@ LRESULT APIENTRY co_EVENT_CallEvents( DWORD event, - HWND hwnd, + HWND hwnd, UINT_PTR idObject, LONG_PTR idChild) { @@ -164,15 +158,17 @@ PEVENTPACK pEP = (PEVENTPACK)idChild; pEH = pEP->pEH; - + TRACE("Dispatch Event 0x%x, idObject %d hwnd %p\n", event, idObject, hwnd); Result = co_IntCallEventProc( UserHMGetHandle(pEH), event, hwnd, pEP->idObject, pEP->idChild, - PtrToUint(NtCurrentTeb()->ClientId.UniqueThread), + pEP->idThread, (DWORD)EngGetTickCount(), - pEH->Proc); + pEH->Proc, + pEH->ihmod, + pEH->offPfn); ExFreePoolWithTag(pEP, TAG_HOOK); return Result; @@ -211,29 +207,19 @@ if (!pEH) break; UserReferenceObject(pEH); // Must be inside the event window. - if ( (pEH->eventMin <= Event) && (pEH->eventMax >= Event)) + if ( Event >= pEH->eventMin && Event <= pEH->eventMax ) { // if all process || all thread || other thread same process // if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) - if ( (!pEH->idProcess || pEH->idProcess == PtrToUint(pti->pEThread->Cid.UniqueProcess)) && - (!(pEH->Flags & WINEVENT_SKIPOWNPROCESS) || pEH->head.pti->ppi != pti->ppi) && - (!pEH->idThread || pEH->idThread == PtrToUint(pti->pEThread->Cid.UniqueThread)) && - (!(pEH->Flags & WINEVENT_SKIPOWNTHREAD) || pEH->head.pti != pti) && - pEH->head.pti->rpdesk == ptiCurrent->rpdesk ) // Same as hooks. + if (!( (pEH->idProcess && pEH->idProcess != PtrToUint(pti->pEThread->Cid.UniqueProcess)) || + (pEH->Flags & WINEVENT_SKIPOWNPROCESS && pEH->head.pti->ppi == pti->ppi) || + (pEH->idThread && pEH->idThread != PtrToUint(pti->pEThread->Cid.UniqueThread)) || + (pEH->Flags & WINEVENT_SKIPOWNTHREAD && pEH->head.pti == pti) || + pEH->head.pti->rpdesk != ptiCurrent->rpdesk ) ) // Same as hooks. { - // Send message to the thread if pEH is not current. - if (pEH->head.pti != ptiCurrent) + if (pEH->Flags & WINEVENT_INCONTEXT) { - ERR("Global Event 0x%x, idObject %d\n", Event, idObject); - IntCallLowLevelEvent( pEH, - Event, - pWnd ? UserHMGetHandle(pWnd) : NULL, - idObject, - idChild); - } - else - { - ERR("Local Event 0x%x, idObject %d\n", Event, idObject); + TRACE("In Event 0x%x, idObject %d hwnd %p\n", Event, idObject, pWnd ? UserHMGetHandle(pWnd) : NULL); co_IntCallEventProc( UserHMGetHandle(pEH), Event, pWnd ? UserHMGetHandle(pWnd) : NULL, @@ -241,7 +227,19 @@ idChild, PtrToUint(NtCurrentTeb()->ClientId.UniqueThread), (DWORD)EngGetTickCount(), - pEH->Proc); + pEH->Proc, + pEH->ihmod, + pEH->offPfn); + } + else + { + TRACE("Out Event 0x%x, idObject %d hwnd %p\n", Event, idObject, pWnd ? UserHMGetHandle(pWnd) : NULL); + IntCallLowLevelEvent( pEH, + Event, + pWnd ? UserHMGetHandle(pWnd) : NULL, + idObject, + idChild, + PtrToUint(NtCurrentTeb()->ClientId.UniqueThread)); } } } @@ -329,10 +327,25 @@ goto SetEventExit; } - if ((dwflags & WINEVENT_INCONTEXT) && !hmodWinEventProc) - { - EngSetLastError(ERROR_HOOK_NEEDS_HMOD); - goto SetEventExit; + if (dwflags & WINEVENT_INCONTEXT) + { + if (!hmodWinEventProc) + { + ERR("Hook needs a module\n"); + EngSetLastError(ERROR_HOOK_NEEDS_HMOD); + goto SetEventExit; + } + if (puString == NULL) + { + ERR("Dll not found\n"); + EngSetLastError(ERROR_DLL_NOT_FOUND); + goto SetEventExit; + } + } + else + { + TRACE("Out of Context\n"); + hmodWinEventProc = 0; } if (idThread) @@ -371,14 +384,18 @@ If WINEVENT_OUTOFCONTEXT just use proc.. Do this instead.... */ - if (NULL != hmodWinEventProc) + if (hmodWinEventProc != NULL) { pEH->offPfn = (ULONG_PTR)((char *)lpfnWinEventProc - (char *)hmodWinEventProc); pEH->ihmod = (INT)hmodWinEventProc; pEH->Proc = lpfnWinEventProc; } else + { pEH->Proc = lpfnWinEventProc; + pEH->offPfn = 0; + pEH->ihmod = (INT)hmodWinEventProc; + } UserDereferenceObject(pEH); Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -1251,6 +1251,23 @@ TRACE("\nGlobal Hook posting to another Thread! %d\n",HookId ); Result = co_IntCallLowLevelHook(Hook, Code, wParam, lParam); } + else if (ptiHook->ppi == pti->ppi) + { + TRACE("\nGlobal Hook calling to another Thread! %d\n",HookId ); + ObReferenceObject(ptiHook->pEThread); + IntReferenceThreadInfo(ptiHook); + Result = co_IntCallHookProc( HookId, + Code, + wParam, + lParam, + Hook->Proc, + Hook->ihmod, + Hook->offPfn, + Hook->Ansi, + &Hook->ModuleName); + IntDereferenceThreadInfo(ptiHook); + ObDereferenceObject(ptiHook->pEThread); + } } else { /* Make the direct call. */ Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -652,6 +652,20 @@ return 0; } +static LRESULT handle_internal_events( PTHREADINFO pti, PWND pWnd, LONG_PTR ExtraInfo, PMSG pMsg) +{ + LRESULT Result = 0; + + switch(pMsg->lParam) + { + case POSTEVENT_NWE: + { + co_EVENT_CallEvents( pMsg->message, pMsg->hwnd, pMsg->wParam, ExtraInfo); + } + } + return Result; +} + LRESULT FASTCALL IntDispatchMessage(PMSG pMsg) { @@ -845,7 +859,7 @@ ExtraInfo, Msg )) { - return TRUE; + return TRUE; } /* Only check for quit messages if not posted messages pending. */ @@ -878,6 +892,24 @@ Msg)) { return TRUE; + } + + /* Now check for System Event messages. */ + { + LONG_PTR eExtraInfo; + MSG eMsg; + if (MsqPeekMessage( pti, + TRUE, + Window, + 0, + 0, + QS_EVENT, + &eExtraInfo, + &eMsg )) + { + handle_internal_events( pti, Window, eExtraInfo, &eMsg); + continue; + } } /* Check for sent messages again. */ Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -800,13 +800,6 @@ Message->Msg.wParam, Message->Msg.lParam); } - else if (Message->HookMessage == MSQ_ISEVENT) - { // Direct Event Call processor - Result = co_EVENT_CallEvents( Message->Msg.message, - Message->Msg.hwnd, - Message->Msg.wParam, - Message->Msg.lParam); - } else if(Message->HookMessage == MSQ_INJECTMODULE) { Result = IntLoadHookModule(Message->Msg.message, @@ -2076,6 +2069,13 @@ { CurrentEntry = RemoveHeadList(&pti->PostedMessagesListHead); CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); + if (CurrentMessage->dwQEvent) + { + if (CurrentMessage->dwQEvent == POSTEVENT_NWE) + { + ExFreePoolWithTag( (PVOID)CurrentMessage->ExtraInfo, TAG_HOOK); + } + } MsqDestroyMessage(CurrentMessage); } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -3,8 +3,7 @@ #define MSQ_HUNG 5000 #define MSQ_NORMAL 0 #define MSQ_ISHOOK 1 -#define MSQ_ISEVENT 2 -#define MSQ_INJECTMODULE 3 +#define MSQ_INJECTMODULE 2 typedef struct _USER_MESSAGE { @@ -115,6 +114,8 @@ WM_ASYNC_SETACTIVEWINDOW, WM_ASYNC_DESTROYWINDOW }; + +#define POSTEVENT_NWE 14 BOOL FASTCALL MsqIsHung(PTHREADINFO pti); VOID CALLBACK HungAppSysTimerProc(HWND,UINT,UINT_PTR,DWORD); Modified: trunk/reactos/win32ss/user/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/hook.c [iso-8859-1] Mon Feb 16 03:32:46 2015 @@ -357,6 +357,9 @@ { WCHAR ModuleName[MAX_PATH]; UNICODE_STRING USModuleName; + PUNICODE_STRING pusmodName; + + RtlInitUnicodeString(&USModuleName, NULL); if ((hmodWinEventProc != NULL) && (dwFlags & WINEVENT_INCONTEXT)) { @@ -365,16 +368,17 @@ return NULL; } RtlInitUnicodeString(&USModuleName, ModuleName); + pusmodName = &USModuleName; } else { - RtlInitUnicodeString(&USModuleName, NULL); + pusmodName = NULL; } return NtUserSetWinEventHook(eventMin, eventMax, hmodWinEventProc, - &USModuleName, + pusmodName, pfnWinEventProc, idProcess, idThread, @@ -779,16 +783,53 @@ User32CallEventProcFromKernel(PVOID Arguments, ULONG ArgumentLength) { PEVENTPROC_CALLBACK_ARGUMENTS Common; + WINEVENTPROC Proc; + WCHAR module[MAX_PATH]; + DWORD len; + HMODULE mod = NULL; + BOOL Loaded = FALSE; Common = (PEVENTPROC_CALLBACK_ARGUMENTS) Arguments; - Common->Proc(Common->hook, - Common->event, - Common->hwnd, - Common->idObject, - Common->idChild, - Common->dwEventThread, - Common->dwmsEventTime); + Proc = Common->Proc; + + if (Common->offPfn && Common->Mod) + { // Validate the module again. + if (!(len = GetModuleFileNameW((HINSTANCE)Common->Mod, module, MAX_PATH)) || len >= MAX_PATH) + { + ERR("Error check for module!\n"); + Common->Mod = 0; + } + + if (Common->Mod && !(mod = GetModuleHandleW(module))) + { + TRACE("Reloading Event Module.\n"); + if (!(mod = LoadLibraryExW(module, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) + { + ERR("Failed to load Event Module.\n"); + } + else + { + Loaded = TRUE; // Free it only when loaded. + } + } + + if (mod) + { + TRACE("Loading Event Module. %S\n",module); + Proc = (WINEVENTPROC)((char *)mod + Common->offPfn); + } + } + + Proc(Common->hook, + Common->event, + Common->hwnd, + Common->idObject, + Common->idChild, + Common->dwEventThread, + Common->dwmsEventTime); + + if (Loaded) FreeLibrary(mod); return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS); }

1 0

[jimtabor] 66309: [NtUser] - This fixes use after free linking in the message system. See CORE-9173. Dedicated to Thomas Faber.
by jimtabor＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: jimtabor Date: Mon Feb 16 03:16:01 2015 New Revision: 66309 URL: http://svn.reactos.org/svn/reactos?rev=66309&view=rev Log: [NtUser] - This fixes use after free linking in the message system. See CORE-9173. Dedicated to Thomas Faber. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Feb 16 03:16:01 2015 @@ -789,8 +789,7 @@ /* insert it to the list of messages that are currently dispatched by this message queue */ - InsertTailList(&pti->LocalDispatchingMessagesHead, - &Message->ListEntry); + InsertTailList(&pti->LocalDispatchingMessagesHead, &Message->ListEntry); ClearMsgBitsMask(pti, Message->QS_Flags); @@ -866,7 +865,7 @@ } /* remove the message from the dispatching list if needed, so lock the sender's message queue */ - if (Message->ptiSender) + if (Message->ptiSender && !(Message->ptiSender->TIF_flags & TIF_INCLEANUP)) { if (Message->DispatchingListEntry.Flink != NULL) { @@ -953,8 +952,8 @@ ListHead = &pti->SentMessagesListHead; while (CurrentEntry != ListHead) { - SentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, - ListEntry); + SentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + if(SentMessage->Msg.hwnd == Window->head.h) { TRACE("Notify the sender and remove a message from the queue that had not been dispatched\n"); @@ -1187,6 +1186,7 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->ListEntry); + RemoveEntryList(&Message->DispatchingListEntry); ClearMsgBitsMask(ptirec, Message->QS_Flags); ExFreePoolWithTag(Message, TAG_USRMSG); break; @@ -1194,30 +1194,8 @@ Entry = Entry->Flink; } - /* Remove from the local dispatching list so the other thread knows, - it can't pass a result and it must not set the completion event anymore */ - Entry = pti->DispatchingMessagesHead.Flink; - while (Entry != &pti->DispatchingMessagesHead) - { - if ((PUSER_SENT_MESSAGE) CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) - == Message) - { - /* We can access Message here, it's secure because the sender's message is locked - and the message has definitely not yet been destroyed, otherwise it would - have been removed from this list by the dispatching routine right after - dispatching the message */ - Message->CompletionEvent = NULL; - Message->Result = NULL; - RemoveEntryList(&Message->DispatchingListEntry); - Message->DispatchingListEntry.Flink = NULL; - break; - } - Entry = Entry->Flink; - } - TRACE("MsqSendMessage (blocked) timed out 1 Status %p\n",WaitStatus); - - } + } // Receiving thread passed on and left us hanging with issues still pending. if ( WaitStatus == STATUS_WAIT_1 ) { @@ -1272,29 +1250,9 @@ Message->CompletionEvent = NULL; Message->Result = NULL; RemoveEntryList(&Message->ListEntry); + RemoveEntryList(&Message->DispatchingListEntry); ClearMsgBitsMask(ptirec, Message->QS_Flags); ExFreePoolWithTag(Message, TAG_USRMSG); - break; - } - Entry = Entry->Flink; - } - - /* Remove from the local dispatching list so the other thread knows, - it can't pass a result and it must not set the completion event anymore */ - Entry = pti->DispatchingMessagesHead.Flink; - while (Entry != &pti->DispatchingMessagesHead) - { - if ((PUSER_SENT_MESSAGE) CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) - == Message) - { - /* We can access Message here, it's secure because the sender's message is locked - and the message has definitely not yet been destroyed, otherwise it would - have been removed from this list by the dispatching routine right after - dispatching the message */ - Message->CompletionEvent = NULL; - Message->Result = NULL; - RemoveEntryList(&Message->DispatchingListEntry); - Message->DispatchingListEntry.Flink = NULL; break; } Entry = Entry->Flink; @@ -1375,12 +1333,7 @@ MessageQueue = pti->MessageQueue; - if (dwQEvent) - { - ERR("Post Msg; System Qeued Event Message!\n"); - InsertHeadList(&pti->PostedMessagesListHead, &Message->ListEntry); - } - else if (!HardwareMessage) + if (!HardwareMessage) { InsertTailList(&pti->PostedMessagesListHead, &Message->ListEntry); } @@ -2122,8 +2075,7 @@ while (!IsListEmpty(&pti->PostedMessagesListHead)) { CurrentEntry = RemoveHeadList(&pti->PostedMessagesListHead); - CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, - ListEntry); + CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); MsqDestroyMessage(CurrentMessage); } @@ -2131,8 +2083,7 @@ while (!IsListEmpty(&pti->SentMessagesListHead)) { CurrentEntry = RemoveHeadList(&pti->SentMessagesListHead); - CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, - ListEntry); + CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); TRACE("Notify the sender and remove a message from the queue that had not been dispatched\n"); /* Only if the message has a sender was the message in the DispatchingList */ @@ -2163,8 +2114,7 @@ while (!IsListEmpty(&pti->LocalDispatchingMessagesHead)) { CurrentEntry = RemoveHeadList(&pti->LocalDispatchingMessagesHead); - CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, - ListEntry); + CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); /* remove the message from the dispatching list */ if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) @@ -2194,8 +2144,7 @@ while (! IsListEmpty(&pti->DispatchingMessagesHead)) { CurrentEntry = RemoveHeadList(&pti->DispatchingMessagesHead); - CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, - DispatchingListEntry); + CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, DispatchingListEntry); CurrentSentMessage->CompletionEvent = NULL; CurrentSentMessage->Result = NULL;

1 0

[hbelusca] 66308: [KERNEL32][NTUSER]: Shut up some dprints. CORE-9186
by hbelusca＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: hbelusca Date: Sun Feb 15 23:55:52 2015 New Revision: 66308 URL: http://svn.reactos.org/svn/reactos?rev=66308&view=rev Log: [KERNEL32][NTUSER]: Shut up some dprints. CORE-9186 Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/dll/win32/kernel32/client/console/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/init.c [iso-8859-1] Sun Feb 15 23:55:52 2015 @@ -111,7 +111,7 @@ ParseShellInfo(LPCWSTR lpszShellInfo, LPCWSTR lpszKeyword) { - DPRINT1("ParseShellInfo is UNIMPLEMENTED\n"); + DPRINT("ParseShellInfo is UNIMPLEMENTED\n"); return 0; } Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Sun Feb 15 23:55:52 2015 @@ -585,7 +585,8 @@ ULONG dwUnknown, ULONG CreateFlags) { - STUB; + // STUB; + TRACE("NtUserNotifyProcessCreate is UNIMPLEMENTED\n"); return FALSE; } Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sun Feb 15 23:55:52 2015 @@ -400,7 +400,7 @@ /* Minimal setup of the connect info structure */ UserCon->ulVersion = USER_VERSION; - ERR("HACK: Hackish NtUserProcessConnect call!!\n"); + TRACE("HACK: Hackish NtUserProcessConnect call!!\n"); /* Connect to win32k */ Status = NtUserProcessConnect(NtCurrentProcess(), UserCon, @@ -423,10 +423,10 @@ // FIXME: Yet another hack... This call should normally not be done here, but // instead in ClientThreadSetup, and in User32CallClientThreadSetupFromKernel as well. - ERR("HACK: Using Init-ClientThreadSetupHelper hack!!\n"); + TRACE("HACK: Using Init-ClientThreadSetupHelper hack!!\n"); if (!ClientThreadSetupHelper(FALSE)) { - ERR("Init-ClientThreadSetupHelper hack failed!\n"); + TRACE("Init-ClientThreadSetupHelper hack failed!\n"); return FALSE; }

1 0

[ekohl] 66307: [NTOSKRNL] NtQueryInformationFile: Implement FileAccessInformation and FileAlignmentInformation cases according to 'File System Internals' page 485.
by ekohl＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: ekohl Date: Sun Feb 15 23:06:30 2015 New Revision: 66307 URL: http://svn.reactos.org/svn/reactos?rev=66307&view=rev Log: [NTOSKRNL] NtQueryInformationFile: Implement FileAccessInformation and FileAlignmentInformation cases according to 'File System Internals' page 485. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sun Feb 15 23:06:30 2015 @@ -1863,6 +1863,9 @@ PVOID NormalContext; KIRQL OldIrql; IO_STATUS_BLOCK KernelIosb; + BOOLEAN CallDriver = TRUE; + PFILE_ACCESS_INFORMATION AccessBuffer; + PFILE_ALIGNMENT_INFORMATION AlignmentBuffer; PAGED_CODE(); IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); @@ -2043,8 +2046,34 @@ /* Update operation counts */ IopUpdateOperationCount(IopOtherTransfer); + /* Fill in file information before calling the driver. + See 'File System Internals' page 485.*/ + if (FileInformationClass == FileAccessInformation) + { + AccessBuffer = Irp->AssociatedIrp.SystemBuffer; + AccessBuffer->AccessFlags = HandleInformation.GrantedAccess; + Irp->IoStatus.Information = sizeof(FILE_ACCESS_INFORMATION); + CallDriver = FALSE; + } + else if (FileInformationClass == FileAlignmentInformation) + { + AlignmentBuffer = Irp->AssociatedIrp.SystemBuffer; + AlignmentBuffer->AlignmentRequirement = DeviceObject->AlignmentRequirement; + Irp->IoStatus.Information = sizeof(FILE_ALIGNMENT_INFORMATION); + CallDriver = FALSE; + } + /* Call the Driver */ - Status = IoCallDriver(DeviceObject, Irp); + if (CallDriver) + { + Status = IoCallDriver(DeviceObject, Irp); + } + else + { + Status = STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_SUCCESS; + } + if (Status == STATUS_PENDING) { /* Check if this was async I/O */

1 0

[hbelusca] 66306: [WINSRV] - Part 2/2 of SrvLogon (see r66303): load the per-user shutdown timeouts. - Retrieve those per-user shutdown timeouts from the registry when the user logs on, adapted fro...
by hbelusca＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: hbelusca Date: Sun Feb 15 22:57:40 2015 New Revision: 66306 URL: http://svn.reactos.org/svn/reactos?rev=66306&view=rev Log: [WINSRV] - Part 2/2 of SrvLogon (see r66303): load the per-user shutdown timeouts. - Retrieve those per-user shutdown timeouts from the registry when the user logs on, adapted from Alex' shutdown patch plus existing code. - Commit the main part of shutdown code (finally!), still unfinished yet: * Need to switch to the desktop where the hanging GUI app's window is present, * Need to deal with apps from other users * What about SYSTEM processes? * What about console processes? - Reuse the old timeout code. - Fix the sending of WM_QUERYENDSESSION and WM_ENDSESSION messages (this is done by win32k directly; for that winsrv needs just to send one WM_CLIENTSHUTDOWN message with the correct wParam parameter). Part 13/X CORE-8322 #comment Big commit in revision 66306! Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c trunk/reactos/win32ss/user/winsrv/winsrv.h Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Sun Feb 15 22:57:40 2015 @@ -18,7 +18,6 @@ #define COM_NO_WINDOWS_H #include <winnls.h> -#include <winreg.h> #include <wincon.h> #define NTOS_MODE_USER Modified: trunk/reactos/win32ss/user/winsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/init.c… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/init.c [iso-8859-1] Sun Feb 15 22:57:40 2015 @@ -13,6 +13,157 @@ #define NDEBUG #include <debug.h> + +/* GLOBALS ********************************************************************/ + +#define DEFAULT_AUTO_END_TASKS FALSE +#define DEFAULT_HUNG_APP_TIMEOUT 5000 +#define DEFAULT_WAIT_TO_KILL_APP_TIMEOUT 20000 +#define DEFAULT_PROCESS_TERMINATE_TIMEOUT 90000 + +SHUTDOWN_SETTINGS ShutdownSettings = +{ + DEFAULT_AUTO_END_TASKS, + DEFAULT_HUNG_APP_TIMEOUT, + DEFAULT_WAIT_TO_KILL_APP_TIMEOUT, + DEFAULT_WAIT_TO_KILL_APP_TIMEOUT, + DEFAULT_PROCESS_TERMINATE_TIMEOUT +}; + +/* FUNCTIONS ******************************************************************/ + +static ULONG +GetRegIntFromID(IN HANDLE KeyHandle, + IN PWCHAR ValueName, + IN ULONG DefaultValue) +{ + UNICODE_STRING ValueString; + ULONG Length; + UCHAR Buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 32 * sizeof(WCHAR)]; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PVOID)Buffer; + NTSTATUS Status; + ULONG Value; + + /* Open the key */ + RtlInitUnicodeString(&ValueString, ValueName); + Status = NtQueryValueKey(KeyHandle, + &ValueString, + KeyValuePartialInformation, + PartialInfo, + sizeof(Buffer), + &Length); + if (NT_SUCCESS(Status)) + { + if (PartialInfo->Type == REG_SZ) + { + /* Convert to integer */ + RtlInitUnicodeString(&ValueString, (PWCHAR)PartialInfo->Data); + Status = RtlUnicodeStringToInteger(&ValueString, 10, &Value); + } + else if (PartialInfo->Type == REG_DWORD) + { + /* Directly retrieve the data */ + Value = *(PULONG)PartialInfo->Data; + Status = STATUS_SUCCESS; + } + else + { + DPRINT1("Unexpected registry type %d for setting %S\n", PartialInfo->Type, ValueName); + Status = STATUS_UNSUCCESSFUL; + } + } + + if (!NT_SUCCESS(Status)) + { + /* Use default value instead */ + Value = DefaultValue; + } + + /* Return the value */ + return Value; +} + +VOID FASTCALL +GetTimeouts(IN PSHUTDOWN_SETTINGS ShutdownSettings) +{ + NTSTATUS Status; + UNICODE_STRING RegistryString; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE CurrentUserKeyHandle; + HANDLE KeyHandle; + + /* Initialize with defaults first */ + ShutdownSettings->AutoEndTasks = DEFAULT_AUTO_END_TASKS; + ShutdownSettings->HungAppTimeout = DEFAULT_HUNG_APP_TIMEOUT; + ShutdownSettings->WaitToKillAppTimeout = DEFAULT_WAIT_TO_KILL_APP_TIMEOUT; + ShutdownSettings->WaitToKillServiceTimeout = ShutdownSettings->WaitToKillAppTimeout; + ShutdownSettings->ProcessTerminateTimeout = DEFAULT_PROCESS_TERMINATE_TIMEOUT; + + /* Open the per-user desktop key */ + Status = RtlOpenCurrentUser(MAXIMUM_ALLOWED, &CurrentUserKeyHandle); + if (NT_SUCCESS(Status)) + { + RtlInitUnicodeString(&RegistryString, + L"Control Panel\\Desktop"); + InitializeObjectAttributes(&ObjectAttributes, + &RegistryString, + OBJ_CASE_INSENSITIVE, + CurrentUserKeyHandle, + NULL); + Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Read timeouts */ + ShutdownSettings->HungAppTimeout = GetRegIntFromID(KeyHandle, + L"HungAppTimeout", + DEFAULT_HUNG_APP_TIMEOUT); + ShutdownSettings->WaitToKillAppTimeout = GetRegIntFromID(KeyHandle, + L"WaitToKillAppTimeout", + DEFAULT_WAIT_TO_KILL_APP_TIMEOUT); + ShutdownSettings->AutoEndTasks = GetRegIntFromID(KeyHandle, + L"AutoEndTasks", + DEFAULT_AUTO_END_TASKS); + /* Done */ + NtClose(KeyHandle); + } + + /* Done */ + NtClose(CurrentUserKeyHandle); + } + + /* Now open the control key */ + RtlInitUnicodeString(&RegistryString, + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control"); + InitializeObjectAttributes(&ObjectAttributes, + &RegistryString, + OBJ_CASE_INSENSITIVE, + NULL, NULL); + Status = NtOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Read the services timeout */ + ShutdownSettings->WaitToKillServiceTimeout = GetRegIntFromID(KeyHandle, + L"WaitToKillServiceTimeout", + ShutdownSettings->WaitToKillAppTimeout); + + /* + * Retrieve the process terminate timeout. + * See ftp://ftp.microsoft.com/MISC1/BUSSYS/WINNT/KB/Q234/6/06.TXT + * and https://web.archive.org/web/20050216235758/http://support.microsoft.com/kb/… + * for more details. + * + * NOTE: Unused at the moment... + */ + ShutdownSettings->ProcessTerminateTimeout = GetRegIntFromID(KeyHandle, + L"ProcessTerminateTimeout", + DEFAULT_PROCESS_TERMINATE_TIMEOUT); + if (ShutdownSettings->ProcessTerminateTimeout < DEFAULT_HUNG_APP_TIMEOUT) + ShutdownSettings->ProcessTerminateTimeout = DEFAULT_HUNG_APP_TIMEOUT; + + /* Done */ + NtClose(KeyHandle); + } +} /* ENTRY-POINT ****************************************************************/ Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Sun Feb 15 22:57:40 2015 @@ -135,6 +135,23 @@ { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; +} + +CSR_API(SrvLogon) +{ + PUSER_LOGON LogonRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.LogonRequest; + + DPRINT1("We are logged %s\n", LogonRequest->IsLogon ? "on" : "off"); + + /* Impersonate the caller in order to retrieve settings in its context */ + if (!CsrImpersonateClient(NULL)) + return STATUS_UNSUCCESSFUL; + + GetTimeouts(&ShutdownSettings); + + /* We are done */ + CsrRevertToSelf(); + return STATUS_SUCCESS; } NTSTATUS Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Sun Feb 15 22:57:40 2015 @@ -4,19 +4,14 @@ * FILE: win32ss/user/winsrv/usersrv/shutdown.c * PURPOSE: Logout/shutdown * PROGRAMMERS: - * - * NOTE: The shutdown code must be rewritten completely. (hbelusca) */ /* INCLUDES *******************************************************************/ #include "usersrv.h" -#include <stdlib.h> -#include <winreg.h> #include <winlogon.h> #include <commctrl.h> -#include <sddl.h> #include "resource.h" @@ -25,27 +20,25 @@ /* GLOBALS ********************************************************************/ -typedef struct tagSHUTDOWN_SETTINGS -{ - BOOL AutoEndTasks; - DWORD HungAppTimeout; - DWORD WaitToKillAppTimeout; -} SHUTDOWN_SETTINGS, *PSHUTDOWN_SETTINGS; - -SHUTDOWN_SETTINGS ShutdownSettings = {0}; - -#define DEFAULT_AUTO_END_TASKS FALSE -#define DEFAULT_HUNG_APP_TIMEOUT 5000 -#define DEFAULT_WAIT_TO_KILL_APP_TIMEOUT 20000 +// Those flags (that are used for CsrProcess->ShutdownFlags) are named +// in accordance to the only public one: SHUTDOWN_NORETRY used for the +// SetProcessShutdownParameters API. +#if !defined(SHUTDOWN_SYSTEMCONTEXT) && !defined(SHUTDOWN_OTHERCONTEXT) +#define SHUTDOWN_SYSTEMCONTEXT CsrShutdownSystem +#define SHUTDOWN_OTHERCONTEXT CsrShutdownOther +#endif + +// The DPRINTs that need to really be removed as soon as everything works. +#define MY_DPRINT DPRINT1 +#define MY_DPRINT2 DPRINT typedef struct tagNOTIFY_CONTEXT { - DWORD ProcessId; UINT Msg; WPARAM wParam; LPARAM lParam; - HDESK Desktop; - HDESK OldDesktop; + // HDESK Desktop; + // HDESK OldDesktop; DWORD StartTime; DWORD QueryResult; HWND Dlg; @@ -54,7 +47,6 @@ HANDLE UIThread; HWND WndClient; PSHUTDOWN_SETTINGS ShutdownSettings; - LPTHREAD_START_ROUTINE SendMessageProc; } NOTIFY_CONTEXT, *PNOTIFY_CONTEXT; #define QUERY_RESULT_ABORT 0 @@ -74,17 +66,29 @@ DWORD Timeout; } MESSAGE_CONTEXT, *PMESSAGE_CONTEXT; -typedef struct tagPROCESS_ENUM_CONTEXT -{ - UINT ProcessCount; - PCSR_PROCESS *ProcessData; - TOKEN_ORIGIN TokenOrigin; - DWORD ShellProcess; - DWORD CsrssProcess; -} PROCESS_ENUM_CONTEXT, *PPROCESS_ENUM_CONTEXT; - /* FUNCTIONS ******************************************************************/ + +static HMODULE hComCtl32Lib = NULL; + +static VOID +CallInitCommonControls(VOID) +{ + static BOOL Initialized = FALSE; + INITCOMMONCONTROLS_PROC InitProc; + + if (Initialized) return; + + hComCtl32Lib = LoadLibraryW(L"COMCTL32.DLL"); + if (hComCtl32Lib == NULL) return; + + InitProc = (INITCOMMONCONTROLS_PROC)GetProcAddress(hComCtl32Lib, "InitCommonControls"); + if (InitProc == NULL) return; + + (*InitProc)(); + + Initialized = TRUE; +} static VOID FASTCALL UpdateProgressBar(HWND ProgressBar, PNOTIFY_CONTEXT NotifyContext) @@ -113,18 +117,18 @@ switch(Msg) { case WM_INITDIALOG: - NotifyContext = (PNOTIFY_CONTEXT) lParam; + NotifyContext = (PNOTIFY_CONTEXT)lParam; NotifyContext->EndNowResult = QUERY_RESULT_ABORT; - SetWindowLongPtrW(Dlg, DWLP_USER, (LONG_PTR) lParam); + SetWindowLongPtrW(Dlg, DWLP_USER, (LONG_PTR)lParam); TitleLength = SendMessageW(NotifyContext->WndClient, WM_GETTEXTLENGTH, 0, 0) + GetWindowTextLengthW(Dlg); Title = HeapAlloc(UserServerHeap, 0, (TitleLength + 1) * sizeof(WCHAR)); - if (NULL != Title) + if (Title) { Len = GetWindowTextW(Dlg, Title, TitleLength + 1); SendMessageW(NotifyContext->WndClient, WM_GETTEXT, - TitleLength + 1 - Len, (LPARAM) (Title + Len)); + TitleLength + 1 - Len, (LPARAM)(Title + Len)); SetWindowTextW(Dlg, Title); HeapFree(UserServerHeap, 0, Title); } @@ -137,7 +141,7 @@ break; case WM_TIMER: - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); + NotifyContext = (PNOTIFY_CONTEXT)GetWindowLongPtrW(Dlg, DWLP_USER); ProgressBar = GetDlgItem(Dlg, IDC_PROGRESS); UpdateProgressBar(ProgressBar, NotifyContext); Result = TRUE; @@ -146,8 +150,9 @@ case WM_COMMAND: if (BN_CLICKED == HIWORD(wParam) && IDC_END_NOW == LOWORD(wParam)) { - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); + NotifyContext = (PNOTIFY_CONTEXT)GetWindowLongPtrW(Dlg, DWLP_USER); NotifyContext->EndNowResult = QUERY_RESULT_FORCE; + MY_DPRINT("Closing progress dlg by hand\n"); SendMessageW(Dlg, WM_CLOSE, 0, 0); Result = TRUE; } @@ -158,12 +163,14 @@ break; case WM_CLOSE: + MY_DPRINT("WM_CLOSE\n"); DestroyWindow(Dlg); Result = TRUE; break; case WM_DESTROY: - NotifyContext = (PNOTIFY_CONTEXT) GetWindowLongPtrW(Dlg, DWLP_USER); + MY_DPRINT("WM_DESTROY\n"); + NotifyContext = (PNOTIFY_CONTEXT)GetWindowLongPtrW(Dlg, DWLP_USER); NotifyContext->Dlg = NULL; KillTimer(Dlg, 0); PostQuitMessage(NotifyContext->EndNowResult); @@ -178,48 +185,26 @@ return Result; } -HMODULE hComCtl32Lib = NULL; - -static VOID -CallInitCommonControls(VOID) -{ - static BOOL Initialized = FALSE; - INITCOMMONCONTROLS_PROC InitProc; - - if (Initialized) return; - - hComCtl32Lib = LoadLibraryW(L"COMCTL32.DLL"); - if (hComCtl32Lib == NULL) return; - - InitProc = (INITCOMMONCONTROLS_PROC)GetProcAddress(hComCtl32Lib, "InitCommonControls"); - if (InitProc == NULL) return; - - (*InitProc)(); - - Initialized = TRUE; -} - static DWORD WINAPI EndNowThreadProc(LPVOID Parameter) { - PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT) Parameter; + PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT)Parameter; MSG Msg; - SetThreadDesktop(NotifyContext->Desktop); - SwitchDesktop(NotifyContext->Desktop); + // SetThreadDesktop(NotifyContext->Desktop); + // SwitchDesktop(NotifyContext->Desktop); CallInitCommonControls(); NotifyContext->Dlg = CreateDialogParam(UserServerDllInstance, MAKEINTRESOURCE(IDD_END_NOW), NULL, - EndNowDlgProc, (LPARAM) NotifyContext); - if (NULL == NotifyContext->Dlg) - { + EndNowDlgProc, (LPARAM)NotifyContext); + if (NotifyContext->Dlg == NULL) return 0; - } + ShowWindow(NotifyContext->Dlg, SW_SHOWNORMAL); while (GetMessageW(&Msg, NULL, 0, 0)) { - if (! IsDialogMessage(NotifyContext->Dlg, &Msg)) + if (!IsDialogMessage(NotifyContext->Dlg, &Msg)) { TranslateMessage(&Msg); DispatchMessageW(&Msg); @@ -230,70 +215,73 @@ } static DWORD WINAPI -SendQueryEndSession(LPVOID Parameter) -{ - PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; +SendClientShutdown(LPVOID Parameter) +{ + PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT)Parameter; DWORD_PTR Result; - if (SendMessageTimeoutW(Context->Wnd, WM_QUERYENDSESSION, Context->wParam, - Context->lParam, SMTO_NORMAL, Context->Timeout, - &Result)) - { - return Result ? QUERY_RESULT_CONTINUE : QUERY_RESULT_ABORT; - } - - return 0 == GetLastError() ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR; -} - -static DWORD WINAPI -SendEndSession(LPVOID Parameter) -{ - PMESSAGE_CONTEXT Context = (PMESSAGE_CONTEXT) Parameter; - DWORD_PTR Result; - - if (Context->wParam) - { - if (SendMessageTimeoutW(Context->Wnd, WM_ENDSESSION, Context->wParam, - Context->lParam, SMTO_NORMAL, Context->Timeout, - &Result)) - { - return QUERY_RESULT_CONTINUE; - } - return 0 == GetLastError() ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR; - } - else - { - SendMessage(Context->Wnd, WM_ENDSESSION, Context->wParam, - Context->lParam); + /* If the shutdown is aborted, just notify the process, there is no need to wait */ + if ((Context->wParam & (MCS_QUERYENDSESSION | MCS_ENDSESSION)) == 0) + { + MY_DPRINT("Called WM_CLIENTSHUTDOWN with wParam == 0 ...\n"); + SendNotifyMessageW(Context->Wnd, WM_CLIENTSHUTDOWN, + Context->wParam, Context->lParam); return QUERY_RESULT_CONTINUE; } -} - -static BOOL CALLBACK -NotifyTopLevelEnum(HWND Wnd, LPARAM lParam) -{ - PNOTIFY_CONTEXT NotifyContext = (PNOTIFY_CONTEXT) lParam; + + if (SendMessageTimeoutW(Context->Wnd, WM_CLIENTSHUTDOWN, + Context->wParam, Context->lParam, + SMTO_NORMAL, Context->Timeout, &Result)) + { + DWORD Ret; + + if (Context->wParam & MCS_QUERYENDSESSION) + { + /* WM_QUERYENDSESSION case */ + switch (Result) + { + case MCSR_DONOTSHUTDOWN: + Ret = QUERY_RESULT_ABORT; + break; + + case MCSR_GOODFORSHUTDOWN: + case MCSR_SHUTDOWNFINISHED: + default: + Ret = QUERY_RESULT_CONTINUE; + } + } + else + { + /* WM_ENDSESSION case */ + Ret = QUERY_RESULT_CONTINUE; + } + + MY_DPRINT("SendClientShutdown -- Return == %s\n", + Ret == QUERY_RESULT_CONTINUE ? "Continue" : "Abort"); + return Ret; + } + + MY_DPRINT("SendClientShutdown -- Error == %s\n", + GetLastError() == 0 ? "Timeout" : "error"); + + return (GetLastError() == 0 ? QUERY_RESULT_TIMEOUT : QUERY_RESULT_ERROR); +} + +static BOOL +NotifyTopLevelWindow(HWND Wnd, PNOTIFY_CONTEXT NotifyContext) +{ MESSAGE_CONTEXT MessageContext; DWORD Now, Passed; DWORD Timeout, WaitStatus; - DWORD ProcessId; HANDLE MessageThread; HANDLE Threads[2]; - if (0 == GetWindowThreadProcessId(Wnd, &ProcessId)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - - if (ProcessId != NotifyContext->ProcessId) - goto Quit; + SetForegroundWindow(Wnd); Now = GetTickCount(); - if (0 == NotifyContext->StartTime) - { + if (NotifyContext->StartTime == 0) NotifyContext->StartTime = Now; - } + /* * Note: Passed is computed correctly even when GetTickCount() * wraps due to unsigned arithmetic. @@ -304,16 +292,16 @@ MessageContext.wParam = NotifyContext->wParam; MessageContext.lParam = NotifyContext->lParam; MessageContext.Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; - if (! NotifyContext->ShutdownSettings->AutoEndTasks) + if (!NotifyContext->ShutdownSettings->AutoEndTasks) { MessageContext.Timeout += NotifyContext->ShutdownSettings->WaitToKillAppTimeout; } if (Passed < MessageContext.Timeout) { MessageContext.Timeout -= Passed; - MessageThread = CreateThread(NULL, 0, NotifyContext->SendMessageProc, - (LPVOID) &MessageContext, 0, NULL); - if (NULL == MessageThread) + MessageThread = CreateThread(NULL, 0, SendClientShutdown, + (LPVOID)&MessageContext, 0, NULL); + if (MessageThread == NULL) { NotifyContext->QueryResult = QUERY_RESULT_ERROR; return FALSE; @@ -331,30 +319,30 @@ if (WAIT_TIMEOUT == WaitStatus) { NotifyContext->WndClient = Wnd; - if (NULL == NotifyContext->UIThread && NotifyContext->ShowUI) + if (NotifyContext->UIThread == NULL && NotifyContext->ShowUI) { NotifyContext->UIThread = CreateThread(NULL, 0, EndNowThreadProc, - (LPVOID) NotifyContext, + (LPVOID)NotifyContext, 0, NULL); } Threads[0] = MessageThread; Threads[1] = NotifyContext->UIThread; - WaitStatus = WaitForMultipleObjectsEx(NULL == NotifyContext->UIThread ? + WaitStatus = WaitForMultipleObjectsEx(NotifyContext->UIThread == NULL ? 1 : 2, Threads, FALSE, INFINITE, FALSE); - if (WAIT_OBJECT_0 == WaitStatus) - { - if (! GetExitCodeThread(MessageThread, &NotifyContext->QueryResult)) + if (WaitStatus == WAIT_OBJECT_0) + { + if (!GetExitCodeThread(MessageThread, &NotifyContext->QueryResult)) { NotifyContext->QueryResult = QUERY_RESULT_ERROR; } } - else if (WAIT_OBJECT_0 + 1 == WaitStatus) - { - if (! GetExitCodeThread(NotifyContext->UIThread, - &NotifyContext->QueryResult)) + else if (WaitStatus == WAIT_OBJECT_0 + 1) + { + if (!GetExitCodeThread(NotifyContext->UIThread, + &NotifyContext->QueryResult)) { NotifyContext->QueryResult = QUERY_RESULT_ERROR; } @@ -363,15 +351,15 @@ { NotifyContext->QueryResult = QUERY_RESULT_ERROR; } - if (WAIT_OBJECT_0 != WaitStatus) + if (WaitStatus != WAIT_OBJECT_0) { TerminateThread(MessageThread, QUERY_RESULT_TIMEOUT); } } - else if (WAIT_OBJECT_0 == WaitStatus) - { - if (! GetExitCodeThread(MessageThread, - &NotifyContext->QueryResult)) + else if (WaitStatus == WAIT_OBJECT_0) + { + if (!GetExitCodeThread(MessageThread, + &NotifyContext->QueryResult)) { NotifyContext->QueryResult = QUERY_RESULT_ERROR; } @@ -387,59 +375,16 @@ NotifyContext->QueryResult = QUERY_RESULT_TIMEOUT; } -Quit: - DPRINT1("NotifyContext->QueryResult == %d\n", NotifyContext->QueryResult); + MY_DPRINT("NotifyContext->QueryResult == %d\n", NotifyContext->QueryResult); return (NotifyContext->QueryResult == QUERY_RESULT_CONTINUE); } -static BOOL CALLBACK -NotifyDesktopEnum(LPWSTR DesktopName, LPARAM lParam) -{ - PNOTIFY_CONTEXT Context = (PNOTIFY_CONTEXT) lParam; - - Context->Desktop = OpenDesktopW(DesktopName, 0, FALSE, - DESKTOP_ENUMERATE | DESKTOP_SWITCHDESKTOP); - if (NULL == Context->Desktop) - { - DPRINT1("OpenDesktop failed with error %d\n", GetLastError()); - Context->QueryResult = QUERY_RESULT_ERROR; - return FALSE; - } - - Context->OldDesktop = GetThreadDesktop(GetCurrentThreadId()); - SwitchDesktop(Context->Desktop); - - EnumDesktopWindows(Context->Desktop, NotifyTopLevelEnum, lParam); - - SwitchDesktop(Context->OldDesktop); - - CloseDesktop(Context->Desktop); - - return QUERY_RESULT_CONTINUE == Context->QueryResult; -} - -static BOOL FASTCALL -NotifyTopLevelWindows(PNOTIFY_CONTEXT Context) -{ - HWINSTA WindowStation; - - WindowStation = GetProcessWindowStation(); - if (NULL == WindowStation) - { - DPRINT1("GetProcessWindowStation failed with error %d\n", GetLastError()); - return TRUE; - } - - EnumDesktopsW(WindowStation, NotifyDesktopEnum, (LPARAM) Context); - - return TRUE; -} - -static BOOL -DtbgIsDesktopVisible(VOID) -{ - return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); -} +static BOOLEAN +IsConsoleMode(VOID) +{ + return (BOOLEAN)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE); +} + /* TODO: Find an other way to do it. */ #if 0 @@ -452,11 +397,10 @@ if (ProcessData->CtrlDispatcher) { - Thread = CreateRemoteThread(ProcessData->ProcessHandle, NULL, 0, (LPTHREAD_START_ROUTINE) ProcessData->CtrlDispatcher, UlongToPtr(Event), 0, NULL); - if (NULL == Thread) + if (Thread == NULL) { DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError()); return; @@ -468,296 +412,221 @@ #endif /************************************************/ -BOOL FASTCALL -NotifyAndTerminateProcess(PCSR_PROCESS ProcessData, - PSHUTDOWN_SETTINGS ShutdownSettings, - UINT Flags) -{ - NOTIFY_CONTEXT Context; - HANDLE Process; + +static BOOL CALLBACK +FindTopLevelWnd(IN HWND hWnd, + IN LPARAM lParam) +{ + if (GetWindow(hWnd, GW_OWNER) == NULL) + { + *(HWND*)lParam = hWnd; + return FALSE; + } + return TRUE; +} + +static VOID +ThreadShutdownNotify(IN PCSR_THREAD CsrThread, + IN ULONG Flags, + IN ULONG Flags2, + IN PNOTIFY_CONTEXT Context) +{ + HWND TopWnd = NULL; + + EnumThreadWindows(HandleToUlong(CsrThread->ClientId.UniqueThread), + FindTopLevelWnd, (LPARAM)&TopWnd); + if (TopWnd) + { + HWND hWndOwner; + + /*** FOR TESTING PURPOSES ONLY!! ***/ + HWND tmpWnd; + tmpWnd = TopWnd; + /***********************************/ + + while ((hWndOwner = GetWindow(TopWnd, GW_OWNER)) != NULL) + { + MY_DPRINT("GetWindow(TopWnd, GW_OWNER) not returned NULL...\n"); + TopWnd = hWndOwner; + } + if (TopWnd != tmpWnd) MY_DPRINT("(TopWnd = %x) != (tmpWnd = %x)\n", TopWnd, tmpWnd); + } + if (TopWnd == NULL) + return; + + Context->wParam = Flags2; + Context->lParam = (0 != (Flags & EWX_CALLER_WINLOGON_LOGOFF) ? + ENDSESSION_LOGOFF : 0); + + Context->StartTime = 0; + Context->UIThread = NULL; + Context->ShowUI = !IsConsoleMode() && (Flags2 & (MCS_QUERYENDSESSION | MCS_ENDSESSION)); + Context->Dlg = NULL; + +#if 0 // Obviously, switching desktops like that from within WINSRV doesn't work... + { + BOOL Success; + Context->OldDesktop = GetThreadDesktop(GetCurrentThreadId()); + // Context->Desktop = GetThreadDesktop(HandleToUlong(CsrThread->ClientId.UniqueThread)); + Context->Desktop = GetThreadDesktop(GetWindowThreadProcessId(TopWnd, NULL)); + MY_DPRINT("Last error = %d\n", GetLastError()); + MY_DPRINT("Before switching to desktop 0x%x\n", Context->Desktop); + Success = SwitchDesktop(Context->Desktop); + MY_DPRINT("After switching to desktop (Success = %s ; last error = %d); going to notify top-level...\n", + Success ? "TRUE" : "FALSE", GetLastError()); + } +#endif + + NotifyTopLevelWindow(TopWnd, Context); + +/******************************************************************************/ +#if 1 + if (Context->UIThread) + { + MY_DPRINT("Context->UIThread != NULL\n"); + if (Context->Dlg) + { + MY_DPRINT("Sending WM_CLOSE because Dlg is != NULL\n"); + SendMessageW(Context->Dlg, WM_CLOSE, 0, 0); + } + else + { + MY_DPRINT("Terminating UIThread thread with QUERY_RESULT_ERROR\n"); + TerminateThread(Context->UIThread, QUERY_RESULT_ERROR); + } + CloseHandle(Context->UIThread); + /**/Context->UIThread = NULL;/**/ + /**/Context->Dlg = NULL;/**/ + } +#endif +/******************************************************************************/ + +#if 0 + MY_DPRINT("Switch back to old desktop 0x%x\n", Context->OldDesktop); + SwitchDesktop(Context->OldDesktop); + MY_DPRINT("Switched back ok\n"); +#endif +} + +static BOOL +NotifyProcessForShutdown(PCSR_PROCESS CsrProcess, + PSHUTDOWN_SETTINGS ShutdownSettings, + UINT Flags) +{ DWORD QueryResult = QUERY_RESULT_CONTINUE; - Context.QueryResult = QUERY_RESULT_CONTINUE; - - if (0 == (Flags & EWX_FORCE)) - { - // TODO: Find an other way whether or not the process has a console. + /* In case we make a forced shutdown, just kill the process */ + if (Flags & EWX_FORCE) + return TRUE; + + // TODO: Find an other way whether or not the process has a console. #if 0 - if (NULL != ProcessData->Console) - { - ConioConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, ProcessData, - ShutdownSettings->WaitToKillAppTimeout); - } - else + if (CsrProcess->Console) + { + ConioConsoleCtrlEventTimeout(CTRL_LOGOFF_EVENT, CsrProcess, + ShutdownSettings->WaitToKillAppTimeout); + } + else #endif - { - Context.ProcessId = (DWORD_PTR) ProcessData->ClientId.UniqueProcess; - Context.wParam = 0; - Context.lParam = (0 != (Flags & EWX_CALLER_WINLOGON_LOGOFF) ? - ENDSESSION_LOGOFF : 0); - Context.StartTime = 0; - Context.UIThread = NULL; - Context.ShowUI = DtbgIsDesktopVisible(); - Context.Dlg = NULL; - Context.ShutdownSettings = ShutdownSettings; - Context.SendMessageProc = SendQueryEndSession; - - NotifyTopLevelWindows(&Context); - - Context.wParam = (QUERY_RESULT_ABORT != Context.QueryResult); - Context.lParam = (0 != (Flags & EWX_CALLER_WINLOGON_LOGOFF) ? - ENDSESSION_LOGOFF : 0); - Context.SendMessageProc = SendEndSession; - Context.ShowUI = DtbgIsDesktopVisible() && - (QUERY_RESULT_ABORT != Context.QueryResult); - QueryResult = Context.QueryResult; + { + PCSR_PROCESS Process; + PCSR_THREAD Thread; + PLIST_ENTRY NextEntry; + + NOTIFY_CONTEXT Context; + Context.ShutdownSettings = ShutdownSettings; + + /* Lock the process */ + CsrLockProcessByClientId(CsrProcess->ClientId.UniqueProcess, &Process); + + /* Send first the QUERYENDSESSION messages to all the threads of the process */ + MY_DPRINT2("Sending the QUERYENDSESSION messages...\n"); + + NextEntry = CsrProcess->ThreadList.Flink; + while (NextEntry != &CsrProcess->ThreadList) + { + /* Get the current thread entry */ + Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + + /* If the thread is being terminated, just skip it */ + if (Thread->Flags & CsrThreadTerminated) continue; + + /* Reference the thread and temporarily unlock the process */ + CsrReferenceThread(Thread); + CsrUnlockProcess(Process); + Context.QueryResult = QUERY_RESULT_CONTINUE; - - NotifyTopLevelWindows(&Context); - - if (NULL != Context.UIThread) - { - if (NULL != Context.Dlg) - { - SendMessageW(Context.Dlg, WM_CLOSE, 0, 0); - } - else - { - TerminateThread(Context.UIThread, QUERY_RESULT_ERROR); - } - CloseHandle(Context.UIThread); - } - } - - if (QUERY_RESULT_ABORT == QueryResult) - { - return FALSE; - } - } - - /* Terminate this process */ - Process = OpenProcess(PROCESS_TERMINATE, FALSE, - (DWORD_PTR) ProcessData->ClientId.UniqueProcess); - if (NULL == Process) - { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, - GetLastError()); - return TRUE; - } - TerminateProcess(Process, 0); - CloseHandle(Process); - - return TRUE; -} + ThreadShutdownNotify(Thread, Flags, + MCS_QUERYENDSESSION, + &Context); + + /* Lock the process again and dereference the thread */ + CsrLockProcessByClientId(CsrProcess->ClientId.UniqueProcess, &Process); + CsrDereferenceThread(Thread); + + // FIXME: Analyze Context.QueryResult !! + /**/if (Context.QueryResult == QUERY_RESULT_ABORT) goto Quit;/**/ + } + + QueryResult = Context.QueryResult; + MY_DPRINT2("QueryResult = %s\n", + QueryResult == QUERY_RESULT_ABORT ? "Abort" : "Continue"); + + /* Now send the ENDSESSION messages to the threads */ + MY_DPRINT2("Now sending the ENDSESSION messages...\n"); + + NextEntry = CsrProcess->ThreadList.Flink; + while (NextEntry != &CsrProcess->ThreadList) + { + /* Get the current thread entry */ + Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + + /* If the thread is being terminated, just skip it */ + if (Thread->Flags & CsrThreadTerminated) continue; + + /* Reference the thread and temporarily unlock the process */ + CsrReferenceThread(Thread); + CsrUnlockProcess(Process); + + Context.QueryResult = QUERY_RESULT_CONTINUE; + ThreadShutdownNotify(Thread, Flags, + (QUERY_RESULT_ABORT != QueryResult) ? MCS_ENDSESSION : 0, + &Context); + + /* Lock the process again and dereference the thread */ + CsrLockProcessByClientId(CsrProcess->ClientId.UniqueProcess, &Process); + CsrDereferenceThread(Thread); + } + +Quit: + /* Unlock the process */ + CsrUnlockProcess(Process); #if 0 -static NTSTATUS WINAPI -ExitReactosProcessEnum(PCSR_PROCESS ProcessData, PVOID Data) -{ - HANDLE Process; - HANDLE Token; - TOKEN_ORIGIN Origin; - DWORD ReturnLength; - PPROCESS_ENUM_CONTEXT Context = (PPROCESS_ENUM_CONTEXT) Data; - PCSR_PROCESS *NewData; - - /* Do not kill winlogon or csrss */ - if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->CsrssProcess || - ProcessData->ClientId.UniqueProcess == LogonProcessId) - { - return STATUS_SUCCESS; - } - - /* Get the login session of this process */ - Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, - (DWORD_PTR) ProcessData->ClientId.UniqueProcess); - if (NULL == Process) - { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, - GetLastError()); - return STATUS_UNSUCCESSFUL; - } - - if (! OpenProcessToken(Process, TOKEN_QUERY, &Token)) - { - DPRINT1("Unable to open token for process %d, error %d\n", - ProcessData->ClientId.UniqueProcess, GetLastError()); - CloseHandle(Process); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(Process); - - if (! GetTokenInformation(Token, TokenOrigin, &Origin, - sizeof(TOKEN_ORIGIN), &ReturnLength)) - { - DPRINT1("GetTokenInformation failed for process %d with error %d\n", - ProcessData->ClientId.UniqueProcess, GetLastError()); - CloseHandle(Token); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(Token); - - /* This process will be killed if it's in the correct logon session */ - if (RtlEqualLuid(&(Context->TokenOrigin.OriginatingLogonSession), - &(Origin.OriginatingLogonSession))) - { - /* Kill the shell process last */ - if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->ShellProcess) - { - ProcessData->ShutdownLevel = 0; - } - NewData = HeapAlloc(UserServerHeap, 0, (Context->ProcessCount + 1) - * sizeof(PCSR_PROCESS)); - if (NULL == NewData) - { - return STATUS_NO_MEMORY; - } - if (0 != Context->ProcessCount) - { - memcpy(NewData, Context->ProcessData, - Context->ProcessCount * sizeof(PCSR_PROCESS)); - HeapFree(UserServerHeap, 0, Context->ProcessData); - } - Context->ProcessData = NewData; - Context->ProcessData[Context->ProcessCount] = ProcessData; - Context->ProcessCount++; - } - - return STATUS_SUCCESS; -} + if (Context.UIThread) + { + if (Context.Dlg) + { + SendMessageW(Context.Dlg, WM_CLOSE, 0, 0); + } + else + { + TerminateThread(Context.UIThread, QUERY_RESULT_ERROR); + } + CloseHandle(Context.UIThread); + } #endif - -#if 0 -static DWORD FASTCALL -GetShutdownSettings(HKEY DesktopKey, LPCWSTR ValueName, DWORD DefaultValue) -{ - BYTE ValueBuffer[16]; - LONG ErrCode; - DWORD Type; - DWORD ValueSize; - UNICODE_STRING StringValue; - ULONG Value; - - ValueSize = sizeof(ValueBuffer); - ErrCode = RegQueryValueExW(DesktopKey, ValueName, NULL, &Type, ValueBuffer, - &ValueSize); - if (ERROR_SUCCESS != ErrCode) - { - DPRINT("GetShutdownSettings for %S failed with error code %ld\n", - ValueName, ErrCode); - return DefaultValue; - } - - if (REG_SZ == Type) - { - RtlInitUnicodeString(&StringValue, (LPCWSTR) ValueBuffer); - if (! NT_SUCCESS(RtlUnicodeStringToInteger(&StringValue, 10, &Value))) - { - DPRINT1("Unable to convert value %S for setting %S\n", - StringValue.Buffer, ValueName); - return DefaultValue; - } - return (DWORD) Value; - } - else if (REG_DWORD == Type) - { - return *((DWORD *) ValueBuffer); - } - - DPRINT1("Unexpected registry type %d for setting %S\n", Type, ValueName); - return DefaultValue; -} - -static VOID FASTCALL -LoadShutdownSettings(PSID Sid, PSHUTDOWN_SETTINGS ShutdownSettings) -{ - static WCHAR Subkey[] = L"\\Control Panel\\Desktop"; - LPWSTR StringSid; - WCHAR InitialKeyName[128]; - LPWSTR KeyName; - HKEY DesktopKey; - LONG ErrCode; - - ShutdownSettings->AutoEndTasks = DEFAULT_AUTO_END_TASKS; - ShutdownSettings->HungAppTimeout = DEFAULT_HUNG_APP_TIMEOUT; - ShutdownSettings->WaitToKillAppTimeout = DEFAULT_WAIT_TO_KILL_APP_TIMEOUT; - - if (! ConvertSidToStringSidW(Sid, &StringSid)) - { - DPRINT1("ConvertSidToStringSid failed with error %d, using default shutdown settings\n", - GetLastError()); - return; - } - if (wcslen(StringSid) + wcslen(Subkey) + 1 <= - sizeof(InitialKeyName) / sizeof(WCHAR)) - { - KeyName = InitialKeyName; - } - else - { - KeyName = HeapAlloc(UserServerHeap, 0, - (wcslen(StringSid) + wcslen(Subkey) + 1) * - sizeof(WCHAR)); - if (NULL == KeyName) - { - DPRINT1("Failed to allocate memory, using default shutdown settings\n"); - LocalFree(StringSid); - return; - } - } - wcscat(wcscpy(KeyName, StringSid), Subkey); - LocalFree(StringSid); - - ErrCode = RegOpenKeyExW(HKEY_USERS, KeyName, 0, KEY_QUERY_VALUE, &DesktopKey); - if (KeyName != InitialKeyName) - { - HeapFree(UserServerHeap, 0, KeyName); - } - if (ERROR_SUCCESS != ErrCode) - { - DPRINT1("RegOpenKeyEx failed with error %ld, using default shutdown settings\n", ErrCode); - return; - } - - ShutdownSettings->AutoEndTasks = (BOOL) GetShutdownSettings(DesktopKey, L"AutoEndTasks", - (DWORD) DEFAULT_AUTO_END_TASKS); - ShutdownSettings->HungAppTimeout = GetShutdownSettings(DesktopKey, - L"HungAppTimeout", - DEFAULT_HUNG_APP_TIMEOUT); - ShutdownSettings->WaitToKillAppTimeout = GetShutdownSettings(DesktopKey, - L"WaitToKillAppTimeout", - DEFAULT_WAIT_TO_KILL_APP_TIMEOUT); - - RegCloseKey(DesktopKey); -} - -NTSTATUS FASTCALL -InternalExitReactos(DWORD ProcessId, DWORD ThreadId, UINT Flags) -{ - // PROCESS_ENUM_CONTEXT Context; - HWND ShellWnd; - char FixedUserInfo[64]; - TOKEN_USER *UserInfo; - SHUTDOWN_SETTINGS ShutdownSettings; - - LoadShutdownSettings(UserInfo->User.Sid, &ShutdownSettings); - - // Context.CsrssProcess = GetCurrentProcessId(); - // ShellWnd = GetShellWindow(); - // if (NULL == ShellWnd) - // { - // DPRINT("No shell present\n"); - // Context.ShellProcess = 0; - // } - // else if (0 == GetWindowThreadProcessId(ShellWnd, &Context.ShellProcess)) - // { - // DPRINT1("Can't get process id of shell window\n"); - // Context.ShellProcess = 0; - // } - - return STATUS_SUCCESS; -} -#endif + } + + /* Kill the process unless we abort shutdown */ + return (QueryResult != QUERY_RESULT_ABORT); +} static NTSTATUS FASTCALL UserExitReactos(PCSR_THREAD CsrThread, UINT Flags) @@ -893,7 +762,7 @@ * Check for process validity */ - /* Do not kill WinLogon or CSRSS */ + /* Do not kill Winlogon or CSRSS */ if (CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() || CsrProcess->ClientId.UniqueProcess == UlongToHandle(LogonProcessId)) { @@ -909,14 +778,25 @@ else DPRINT1("Killing process with ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); -#if 0 - if (!NotifyAndTerminateProcess(CsrProcess, &ShutdownSettings, Flags)) - { + if (CsrProcess->ShutdownFlags & SHUTDOWN_OTHERCONTEXT) + DPRINT1("This process has SHUTDOWN_OTHERCONTEXT\n"); + + if (CsrProcess->ShutdownFlags & SHUTDOWN_SYSTEMCONTEXT) + DPRINT1("This process has SHUTDOWN_SYSTEMCONTEXT\n"); + + /* Notify the process for shutdown if needed */ + if (!NotifyProcessForShutdown(CsrProcess, &ShutdownSettings, Flags)) + { + /* Abort shutdown */ return CsrShutdownCancelled; } -#endif - - return CsrShutdownNonCsrProcess; + + /* Terminate this process */ + NtTerminateProcess(CsrProcess->ProcessHandle, 0); + + /* We are done */ + CsrDereferenceProcess(CsrProcess); + return CsrShutdownCsrProcess; } @@ -965,16 +845,10 @@ return STATUS_SUCCESS; } -CSR_API(SrvLogon) +CSR_API(SrvRecordShutdownReason) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvRecordShutdownReason) -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/winsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/winsrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/winsrv.h [iso-8859-1] Sun Feb 15 22:57:40 2015 @@ -20,6 +20,7 @@ #include <windef.h> #include <winbase.h> #include <wingdi.h> +#include <winreg.h> #include <winuser.h> #include <imm.h> @@ -42,4 +43,18 @@ /* CSRSS Header */ #include <csr/csrsrv.h> +typedef struct tagSHUTDOWN_SETTINGS +{ + BOOL AutoEndTasks; + ULONG HungAppTimeout; + ULONG WaitToKillAppTimeout; + ULONG WaitToKillServiceTimeout; + ULONG ProcessTerminateTimeout; +} SHUTDOWN_SETTINGS, *PSHUTDOWN_SETTINGS; + +extern SHUTDOWN_SETTINGS ShutdownSettings; + +VOID FASTCALL +GetTimeouts(IN PSHUTDOWN_SETTINGS ShutdownSettings); + #endif /* __WINSRV_H__ */

1 0

[hbelusca] 66305: [NTOS]: Less "magic" indices.
by hbelusca＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: hbelusca Date: Sun Feb 15 22:29:50 2015 New Revision: 66305 URL: http://svn.reactos.org/svn/reactos?rev=66305&view=rev Log: [NTOS]: Less "magic" indices. Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sun Feb 15 22:29:50 2015 @@ -803,8 +803,8 @@ Thread->ServiceTable = KeServiceDescriptorTable; /* Setup APC Fields */ - InitializeListHead(&Thread->ApcState.ApcListHead[0]); - InitializeListHead(&Thread->ApcState.ApcListHead[1]); + InitializeListHead(&Thread->ApcState.ApcListHead[KernelMode]); + InitializeListHead(&Thread->ApcState.ApcListHead[UserMode]); Thread->ApcState.Process = Process; Thread->ApcStatePointer[OriginalApcEnvironment] = &Thread->ApcState; Thread->ApcStatePointer[AttachedApcEnvironment] = &Thread->SavedApcState;

1 0

[tfaber] 66304: [NTOS] - In ExpReleaseOrWaitForKeyedEvent, always restore previous values for ETHREAD::KeyedWaitValue and ETHREAD::KeyedWaitChain, as these fields have alternative meanings outside ...
by tfaber＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: tfaber Date: Sun Feb 15 22:20:34 2015 New Revision: 66304 URL: http://svn.reactos.org/svn/reactos?rev=66304&view=rev Log: [NTOS] - In ExpReleaseOrWaitForKeyedEvent, always restore previous values for ETHREAD::KeyedWaitValue and ETHREAD::KeyedWaitChain, as these fields have alternative meanings outside of keyed events - Add missing list walk in ExpReleaseOrWaitForKeyedEvent - In Nt(WaitFor|Release)KeyedEvent, refuse keys that are not two-byte aligned as shown by Wine tests - Don't forget to set KTHREAD::Process on thread creation Fixes hang when running ntdll_winetest:om as well as failing tests. ROSTESTS-118 #resolve Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/rostests/winetests/ntdll/om.c Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Sun Feb 15 22:20:34 2015 @@ -132,6 +132,7 @@ PLIST_ENTRY ListEntry, WaitListHead1, WaitListHead2; NTSTATUS Status; ULONG_PTR HashIndex; + PVOID PreviousKeyedWaitValue; /* Get the current process */ CurrentProcess = KeGetCurrentProcess(); @@ -167,6 +168,7 @@ be signaled by this thread or, when the wait is aborted due to thread termination, then it first needs to acquire the list lock. */ Thread = CONTAINING_RECORD(ListEntry, ETHREAD, KeyedWaitChain); + ListEntry = ListEntry->Flink; /* Check if this thread is a correct waiter */ if ((Thread->Tcb.Process == CurrentProcess) && @@ -179,7 +181,10 @@ InitializeListHead(&Thread->KeyedWaitChain); /* Wake the thread */ - KeReleaseSemaphore(&Thread->KeyedWaitSemaphore, 0, 1, FALSE); + KeReleaseSemaphore(&Thread->KeyedWaitSemaphore, + IO_NO_INCREMENT, + 1, + FALSE); Thread = NULL; /* Unlock the list. After this it is not safe to access Thread */ @@ -193,7 +198,8 @@ /* Get the current thread */ CurrentThread = PsGetCurrentThread(); - /* Set the wait key */ + /* Set the wait key and remember the old value */ + PreviousKeyedWaitValue = CurrentThread->KeyedWaitValue; CurrentThread->KeyedWaitValue = KeyedWaitValue; /* Initialize the wait semaphore */ @@ -221,16 +227,20 @@ ExAcquirePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); /* Check if the wait list entry is still in the list */ - if (CurrentThread->KeyedWaitChain.Flink != &CurrentThread->KeyedWaitChain) + if (!IsListEmpty(&CurrentThread->KeyedWaitChain)) { /* Remove the thread from the list */ RemoveEntryList(&CurrentThread->KeyedWaitChain); + InitializeListHead(&CurrentThread->KeyedWaitChain); } /* Unlock the list */ ExReleasePushLockExclusive(&KeyedEvent->HashTable[HashIndex].Lock); KeLeaveCriticalRegion(); } + + /* Restore the previous KeyedWaitValue, since this is a union member */ + CurrentThread->KeyedWaitValue = PreviousKeyedWaitValue; return Status; } @@ -412,6 +422,12 @@ NTSTATUS Status; LARGE_INTEGER TimeoutCopy; + /* Key must always be two-byte aligned */ + if ((ULONG_PTR)Key & 1) + { + return STATUS_INVALID_PARAMETER_1; + } + /* Check if the caller passed a timeout value and this is from user mode */ if ((Timeout != NULL) && (PreviousMode != KernelMode)) { @@ -472,6 +488,12 @@ NTSTATUS Status; LARGE_INTEGER TimeoutCopy; + /* Key must always be two-byte aligned */ + if ((ULONG_PTR)Key & 1) + { + return STATUS_INVALID_PARAMETER_1; + } + /* Check if the caller passed a timeout value and this is from user mode */ if ((Timeout != NULL) && (PreviousMode != KernelMode)) { Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sun Feb 15 22:20:34 2015 @@ -838,8 +838,9 @@ TimerWaitBlock->WaitListEntry.Flink = &Timer->Header.WaitListHead; TimerWaitBlock->WaitListEntry.Blink = &Timer->Header.WaitListHead; - /* Set the TEB */ + /* Set the TEB and process */ Thread->Teb = Teb; + Thread->Process = Process; /* Check if we have a kernel stack */ if (!KernelStack) Modified: trunk/rostests/winetests/ntdll/om.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/om.c?rev=… ============================================================================== --- trunk/rostests/winetests/ntdll/om.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/om.c [iso-8859-1] Sun Feb 15 22:20:34 2015 @@ -1080,8 +1080,5 @@ test_query_object(); test_type_mismatch(); test_event(); - if (winetest_interactive) - test_keyed_events(); - else - skip("Skipping test_keyed_events(). ROSTESTS-118.\n"); -} + test_keyed_events(); +}

1 0

[hbelusca] 66303: [USER32] Implement SrvLogon (client-side), called by the SetWindowStationUser API (called by winlogon) when a user logs-on (or off). See also http://www.openrce.org/reference_libr...
by hbelusca＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: hbelusca Date: Sun Feb 15 21:56:03 2015 New Revision: 66303 URL: http://svn.reactos.org/svn/reactos?rev=66303&view=rev Log: [USER32] Implement SrvLogon (client-side), called by the SetWindowStationUser API (called by winlogon) when a user logs-on (or off). See also http://www.openrce.org/reference_library/win32_call_chains/2003SP1/USER32/S… and http://www.openrce.org/reference_library/win32_call_chains/2003SP1/USER32/L… for details. Part 1/2 Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/misc/logon.c trunk/reactos/win32ss/user/user32/misc/winsta.c Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] Sun Feb 15 21:56:03 2015 @@ -60,6 +60,11 @@ BOOL Success; } USER_END_TASK, *PUSER_END_TASK; +typedef struct _USER_LOGON +{ + BOOL IsLogon; +} USER_LOGON, *PUSER_LOGON; + typedef struct _USER_GET_THREAD_CONSOLE_DESKTOP { ULONG_PTR ThreadId; @@ -90,6 +95,7 @@ { USER_EXIT_REACTOS ExitReactosRequest; USER_END_TASK EndTaskRequest; + USER_LOGON LogonRequest; USER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest; USER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; USER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Sun Feb 15 21:56:03 2015 @@ -113,6 +113,9 @@ VOID MenuTrackMouseMenuBar(HWND hWnd, ULONG Ht, POINT Pt); VOID MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar); +/* definitions for logon.c */ +VOID FASTCALL Logon(BOOL IsLogon); + /* misc definitions */ void mirror_rect( const RECT *window_rect, RECT *rect ); BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); Modified: trunk/reactos/win32ss/user/user32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/l… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/logon.c [iso-8859-1] Sun Feb 15 21:56:03 2015 @@ -74,6 +74,22 @@ } /* + * Helper function used by SetWindowStationUser (see winsta.c) + */ +VOID FASTCALL +Logon(BOOL IsLogon) +{ + USER_API_MESSAGE ApiMessage; + PUSER_LOGON LogonRequest = &ApiMessage.Data.LogonRequest; + + LogonRequest->IsLogon = IsLogon; + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpLogon), + sizeof(*LogonRequest)); +} + +/* * @implemented */ BOOL Modified: trunk/reactos/win32ss/user/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/w… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/winsta.c [iso-8859-1] Sun Feb 15 21:56:03 2015 @@ -371,7 +371,7 @@ /* - * @unimplemented + * @implemented */ BOOL WINAPI @@ -380,7 +380,21 @@ PSID psid, DWORD size) { - return NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); + BOOL Success; + + Success = NtUserSetWindowStationUser(hWindowStation, pluid, psid, size); + if (Success) + { + /* Signal log-on/off to WINSRV */ + + /* User is logging on if pluid != LuidNone, otherwise it is a log-off */ + LUID LuidNone = {0, 0}; + BOOL IsLogon = (pluid && !RtlEqualLuid(pluid, &LuidNone)); + + Logon(IsLogon); + } + + return Success; } /* EOF */

1 0

[tfaber] 66302: [ADVAPI32_WINETEST] - Skip over service timeout tests because they take too long. This is not a bug, the tests are completing successfully -- however they are designed to cause serv...
by tfaber＠svn.reactos.org 15 Feb '15

15 Feb '15

Author: tfaber Date: Sun Feb 15 18:20:59 2015 New Revision: 66302 URL: http://svn.reactos.org/svn/reactos?rev=66302&view=rev Log: [ADVAPI32_WINETEST] - Skip over service timeout tests because they take too long. This is not a bug, the tests are completing successfully -- however they are designed to cause service manager timeouts and take two minutes in doing so. Testbot time is too valuable to do this on every commit. ROSTESTS-151 Modified: trunk/rostests/winetests/advapi32/service.c Modified: trunk/rostests/winetests/advapi32/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/servic… ============================================================================== --- trunk/rostests/winetests/advapi32/service.c [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/service.c [iso-8859-1] Sun Feb 15 18:20:59 2015 @@ -2266,6 +2266,12 @@ goto cleanup; } + if (!winetest_interactive) + { + skip("ROSTESTS-151: Skipping service start timeout tests because they take too long. This is not a bug!\n"); + goto cleanup; + } + /* Again with a process that exits right away */ displayname = "Winetest Exit Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs