Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[janderwald] 66247: [IPHLPAPI] - hackplement GetExtendedTcpTable class TCP_TABLE_OWNER_PID_ALL - fixes XAMPP control panel startup

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 13 15:03:45 2015 New Revision: 66247 URL: http://svn.reactos.org/svn/reactos?rev=66247&view=rev Log: [IPHLPAPI] - hackplement GetExtendedTcpTable class TCP_TABLE_OWNER_PID_ALL - fixes XAMPP control panel startup Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Fri Feb 13 15:03:45 2015 @@ -781,11 +781,24 @@ * * NOTES */ + DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, ULONG ulAf, TCP_TABLE_CLASS TableClass, ULONG Reserved) { DWORD ret = NO_ERROR; - UNIMPLEMENTED; - return ret; + + if (TableClass == TCP_TABLE_OWNER_PID_ALL) { + if (*pdwSize == 0) { + *pdwSize = sizeof(MIB_TCPTABLE_OWNER_PID); + return ERROR_INSUFFICIENT_BUFFER; + } else { + ZeroMemory(pTcpTable, sizeof(MIB_TCPTABLE_OWNER_PID)); + return NO_ERROR; + } + } + + + UNIMPLEMENTED; + return ret; }

9 years, 10 months

[janderwald] 66246: [PSDK] - add MIB_TCPROW_OWNER_PID, MIB_TCPTABLE_OWNER_PID types

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Feb 13 14:58:05 2015 New Revision: 66246 URL: http://svn.reactos.org/svn/reactos?rev=66246&view=rev Log: [PSDK] - add MIB_TCPROW_OWNER_PID, MIB_TCPTABLE_OWNER_PID types Modified: trunk/reactos/include/psdk/iprtrmib.h Modified: trunk/reactos/include/psdk/iprtrmib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iprtrmib.h?re… ============================================================================== --- trunk/reactos/include/psdk/iprtrmib.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/iprtrmib.h [iso-8859-1] Fri Feb 13 14:58:05 2015 @@ -316,4 +316,19 @@ TCP_TABLE_OWNER_MODULE_ALL } TCP_TABLE_CLASS, *PTCP_TABLE_CLASS; +typedef struct _MIB_TCPROW_OWNER_PID { + DWORD dwState; + DWORD dwLocalAddr; + DWORD dwLocalPort; + DWORD dwRemoteAddr; + DWORD dwRemotePort; + DWORD dwOwningPid; +} MIB_TCPROW_OWNER_PID, *PMIB_TCPROW_OWNER_PID; + +typedef struct { + DWORD dwNumEntries; + MIB_TCPROW_OWNER_PID table[0]; +} MIB_TCPTABLE_OWNER_PID, *PMIB_TCPTABLE_OWNER_PID; + + #endif /* WINE_IPRTRMIB_H__ */

9 years, 10 months

[jimtabor] 66245: [NtUser] - Fix wine msg:test_SendMessageTimeout. Do not allow the message to pass on after a timeout.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Feb 13 13:45:11 2015 New Revision: 66245 URL: http://svn.reactos.org/svn/reactos?rev=66245&view=rev Log: [NtUser] - Fix wine msg:test_SendMessageTimeout. Do not allow the message to pass on after a timeout. 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] Fri Feb 13 13:45:11 2015 @@ -1172,7 +1172,7 @@ UserEnterCo(); - if (WaitStatus == STATUS_TIMEOUT || WaitStatus == STATUS_USER_APC) + if (WaitStatus == STATUS_TIMEOUT) { /* Look up if the message has not yet dispatched, if so make sure it can't pass a result and it must not set the completion event anymore */ @@ -1186,6 +1186,9 @@ and the message is still hasn't been dispatched */ Message->CompletionEvent = NULL; Message->Result = NULL; + RemoveEntryList(&Message->ListEntry); + ClearMsgBitsMask(ptirec, Message->QS_Flags); + ExFreePoolWithTag(Message, TAG_USRMSG); break; } Entry = Entry->Flink; @@ -1254,7 +1257,7 @@ UserEnterCo(); - if (WaitStatus == STATUS_TIMEOUT || WaitStatus == STATUS_USER_APC) + if (WaitStatus == STATUS_TIMEOUT) { /* Look up if the message has not yet been dispatched, if so make sure it can't pass a result and it must not set the completion event anymore */ @@ -1268,6 +1271,9 @@ and the message is still hasn't been dispatched */ Message->CompletionEvent = NULL; Message->Result = NULL; + RemoveEntryList(&Message->ListEntry); + ClearMsgBitsMask(ptirec, Message->QS_Flags); + ExFreePoolWithTag(Message, TAG_USRMSG); break; } Entry = Entry->Flink; @@ -1317,6 +1323,9 @@ Entry = Entry->Flink; } } + + if (WaitStatus == STATUS_USER_APC) break; + while (co_MsqDispatchOneSentMessage(pti)) ; }

9 years, 10 months

[jimtabor] 66244: [NtUser] - Use a real timer for caret. This should cleanup message testing from those random system timer messages. See CORE-7447.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Feb 13 13:39:57 2015 New Revision: 66244 URL: http://svn.reactos.org/svn/reactos?rev=66244&view=rev Log: [NtUser] - Use a real timer for caret. This should cleanup message testing from those random system timer messages. See CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/caret.c Modified: trunk/reactos/win32ss/user/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/caret.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/caret.c [iso-8859-1] Fri Feb 13 13:39:57 2015 @@ -16,6 +16,111 @@ /* FUNCTIONS *****************************************************************/ +VOID FASTCALL +co_IntDrawCaret(PWND pWnd, PTHRDCARETINFO CaretInfo) +{ + HDC hdc, hdcMem; + HBITMAP hbmOld; + BOOL bDone = FALSE; + + hdc = UserGetDCEx(pWnd, 0, DCX_USESTYLE | DCX_WINDOW); + if (!hdc) + { + ERR("GetDC failed\n"); + return; + } + + if (pWnd->hrgnUpdate) + { + NtGdiSaveDC(hdc); + } + + if(CaretInfo->Bitmap && NtGdiGetBitmapDimension(CaretInfo->Bitmap, &CaretInfo->Size)) + { + hdcMem = NtGdiCreateCompatibleDC(hdc); + if (hdcMem) + { + hbmOld = NtGdiSelectBitmap(hdcMem, CaretInfo->Bitmap); + bDone = NtGdiBitBlt(hdc, + CaretInfo->Pos.x, + CaretInfo->Pos.y, + CaretInfo->Size.cx, + CaretInfo->Size.cy, + hdcMem, + 0, + 0, + SRCINVERT, + 0, + 0); + NtGdiSelectBitmap(hdcMem, hbmOld); + GreDeleteObject(hdcMem); + } + } + + if (!bDone) + { + NtGdiPatBlt(hdc, + CaretInfo->Pos.x, + CaretInfo->Pos.y, + CaretInfo->Size.cx, + CaretInfo->Size.cy, + DSTINVERT); + } + + if (pWnd->hrgnUpdate) + { + NtGdiRestoreDC(hdc, -1); + } + + UserReleaseDC(pWnd, hdc, FALSE); +} + +VOID +CALLBACK +CaretSystemTimerProc(HWND hwnd, + UINT uMsg, + UINT_PTR idEvent, + DWORD dwTime) +{ + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE ThreadQueue; + PWND pWnd; + + pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; + + if (ThreadQueue->CaretInfo->hWnd != hwnd) + { + ERR("Not the same caret window!\n"); + return; + } + + if (hwnd) + { + pWnd = UserGetWindowObject(hwnd); + if (!pWnd) + { + ERR("Caret System Timer Proc has invalid window handle! %p Id: %u\n", hwnd, idEvent); + return; + } + } + else + { + TRACE( "Windowless Caret Timer Running!\n" ); + return; + } + + switch (idEvent) + { + case IDCARETTIMER: + { + ThreadQueue->CaretInfo->Showing = (ThreadQueue->CaretInfo->Showing ? 0 : 1); + co_IntDrawCaret(pWnd, ThreadQueue->CaretInfo); + } + } + return; +} + static BOOL FASTCALL co_IntHideCaret(PTHRDCARETINFO CaretInfo) @@ -24,8 +129,8 @@ if(CaretInfo->hWnd && CaretInfo->Visible && CaretInfo->Showing) { pWnd = UserGetWindowObject(CaretInfo->hWnd); - co_IntSendMessage(CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); CaretInfo->Showing = 0; + IntNotifyWinEvent(EVENT_OBJECT_HIDE, pWnd, OBJID_CARET, CHILDID_SELF, 0); return TRUE; } @@ -92,8 +197,8 @@ ThreadQueue->CaretInfo->Showing = 0; ThreadQueue->CaretInfo->Pos.x = X; ThreadQueue->CaretInfo->Pos.y = Y; - co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, NULL, TMRF_SYSTEM); + + IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM); IntNotifyWinEvent(EVENT_OBJECT_LOCATIONCHANGE, pWnd, OBJID_CARET, CHILDID_SELF, 0); } return TRUE; @@ -102,6 +207,78 @@ return FALSE; } +BOOL FASTCALL co_UserHideCaret(PWND Window OPTIONAL) +{ + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE ThreadQueue; + + if (Window) ASSERT_REFS_CO(Window); + + if(Window && Window->head.pti->pEThread != PsGetCurrentThread()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; + + if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + if(ThreadQueue->CaretInfo->Visible) + { + PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); + IntKillTimer(pwnd, IDCARETTIMER, TRUE); + + co_IntHideCaret(ThreadQueue->CaretInfo); + ThreadQueue->CaretInfo->Visible = 0; + ThreadQueue->CaretInfo->Showing = 0; + } + + return TRUE; +} + +BOOL FASTCALL co_UserShowCaret(PWND Window OPTIONAL) +{ + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE ThreadQueue; + PWND pWnd = NULL; + + if (Window) ASSERT_REFS_CO(Window); + + if(Window && Window->head.pti->pEThread != PsGetCurrentThread()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; + + if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + if (!ThreadQueue->CaretInfo->Visible) + { + ThreadQueue->CaretInfo->Visible = 1; + pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo->hWnd); + if (!ThreadQueue->CaretInfo->Showing && pWnd) + { + IntNotifyWinEvent(EVENT_OBJECT_SHOW, pWnd, OBJID_CARET, OBJID_CARET, 0); + } + IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM); + } + return TRUE; +} + +/* This can go away now! */ BOOL FASTCALL IntSwitchCaretShowing(PVOID Info) { @@ -120,102 +297,6 @@ return FALSE; } - -#if 0 // Unused -static -VOID FASTCALL -co_IntDrawCaret(HWND hWnd) -{ - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE ThreadQueue; - - pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; - - if(ThreadQueue->CaretInfo->hWnd && ThreadQueue->CaretInfo->Visible && - ThreadQueue->CaretInfo->Showing) - { - co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - ThreadQueue->CaretInfo->Showing = 1; - } -} -#endif - - - -BOOL FASTCALL co_UserHideCaret(PWND Window OPTIONAL) -{ - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE ThreadQueue; - - if (Window) ASSERT_REFS_CO(Window); - - if(Window && Window->head.pti->pEThread != PsGetCurrentThread()) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; - - if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - if(ThreadQueue->CaretInfo->Visible) - { - PWND pwnd = UserGetWindowObject(ThreadQueue->CaretInfo->hWnd); - IntKillTimer(pwnd, IDCARETTIMER, TRUE); - - co_IntHideCaret(ThreadQueue->CaretInfo); - ThreadQueue->CaretInfo->Visible = 0; - ThreadQueue->CaretInfo->Showing = 0; - } - - return TRUE; -} - - -BOOL FASTCALL co_UserShowCaret(PWND Window OPTIONAL) -{ - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE ThreadQueue; - PWND pWnd = NULL; - - if (Window) ASSERT_REFS_CO(Window); - - if(Window && Window->head.pti->pEThread != PsGetCurrentThread()) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; - - if(Window && ThreadQueue->CaretInfo->hWnd != Window->head.h) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return FALSE; - } - - if (!ThreadQueue->CaretInfo->Visible) - { - ThreadQueue->CaretInfo->Visible = 1; - pWnd = ValidateHwndNoErr(ThreadQueue->CaretInfo->hWnd); - if (!ThreadQueue->CaretInfo->Showing && pWnd) - { - co_IntSendMessage(ThreadQueue->CaretInfo->hWnd, WM_SYSTIMER, IDCARETTIMER, 0); - IntNotifyWinEvent(EVENT_OBJECT_SHOW, pWnd, OBJID_CARET, OBJID_CARET, 0); - } - IntSetTimer(pWnd, IDCARETTIMER, gpsi->dtCaretBlink, NULL, TMRF_SYSTEM); - } - return TRUE; -} - /* SYSCALLS *****************************************************************/ @@ -277,7 +358,11 @@ } ThreadQueue->CaretInfo->Visible = 0; ThreadQueue->CaretInfo->Showing = 0; + + IntSetTimer( Window, IDCARETTIMER, gpsi->dtCaretBlink, CaretSystemTimerProc, TMRF_SYSTEM ); + IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window, OBJID_CARET, CHILDID_SELF, 0); + RETURN(TRUE); CLEANUP:

9 years, 10 months

[tfaber] 66243: [WIN32K:NTUSER] - Assert sanity of object reference counts in UserReferenceObject, UserDereferenceObject and UserDeleteObject. If you hit a cLockObj < 0x10000 assertion failure, you...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 13 10:11:50 2015 New Revision: 66243 URL: http://svn.reactos.org/svn/reactos?rev=66243&view=rev Log: [WIN32K:NTUSER] - Assert sanity of object reference counts in UserReferenceObject, UserDereferenceObject and UserDeleteObject. If you hit a cLockObj < 0x10000 assertion failure, you found yourself a use after free (RtlFreeHeap will put a LIST_ENTRY in this location, so a freed item has a kernel pointer there). See CORE-8703 for an example. Modified: trunk/reactos/win32ss/user/ntuser/object.c Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Fri Feb 13 10:11:50 2015 @@ -586,9 +586,10 @@ FASTCALL UserDereferenceObject(PVOID Object) { - PHEAD ObjHead = (PHEAD)Object; + PHEAD ObjHead = Object; ASSERT(ObjHead->cLockObj >= 1); + ASSERT(ObjHead->cLockObj < 0x10000); if (--ObjHead->cLockObj == 0) { @@ -663,6 +664,7 @@ if (!body) return FALSE; ASSERT( ((PHEAD)body)->cLockObj >= 1); + ASSERT( ((PHEAD)body)->cLockObj < 0x10000); return UserFreeHandle(gHandleTable, h); } @@ -671,9 +673,11 @@ FASTCALL UserReferenceObject(PVOID obj) { - ASSERT(((PHEAD)obj)->cLockObj >= 0); - - ((PHEAD)obj)->cLockObj++; + PHEAD ObjHead = obj; + ASSERT(ObjHead->cLockObj >= 0); + ASSERT(ObjHead->cLockObj < 0x10000); + + ObjHead->cLockObj++; } PVOID

9 years, 10 months

[tfaber] 66242: [GDI32_APITEST] - Fix stack buffer overflow in InitPerBitDepth ROSTESTS-147 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 13 09:06:00 2015 New Revision: 66242 URL: http://svn.reactos.org/svn/reactos?rev=66242&view=rev Log: [GDI32_APITEST] - Fix stack buffer overflow in InitPerBitDepth ROSTESTS-147 #resolve Modified: trunk/rostests/apitests/gdi32/init.c Modified: trunk/rostests/apitests/gdi32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Fri Feb 13 09:06:00 2015 @@ -41,7 +41,7 @@ { struct { - BITMAPCOREHEADER bmiHeader; + BITMAPINFOHEADER bmiHeader; RGBQUAD bmiColors[256]; } bmiBuffer; LPBITMAPINFO pbmi = (LPBITMAPINFO)&bmiBuffer;

9 years, 10 months

[jimtabor] 66241: [NtUser] - This should fix dialog breakage due to r66237.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Feb 13 01:03:38 2015 New Revision: 66241 URL: http://svn.reactos.org/svn/reactos?rev=66241&view=rev Log: [NtUser] - This should fix dialog breakage due to r66237. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Fri Feb 13 01:03:38 2015 @@ -379,13 +379,13 @@ * be destroying. */ // Rule #1 - if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSrv32 exit and return focus to CMD. + if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSvr32 exit and return focus to CMD. (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) { co_WinPosActivateOtherWindow(Window); } - /* Fixes dialog test test_focus breakage due to r66237 and CMD properties closing and returning focus to CMD */ + /* Fixes CMD properties closing and returning focus to CMD */ if (ti->MessageQueue->spwndFocus == Window) { if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) @@ -559,6 +559,13 @@ if (Window->head.h == ThreadData->rpdesk->rpwinstaParent->ShellListView) ThreadData->rpdesk->rpwinstaParent->ShellListView = NULL; } + + /* Fixes dialog test_focus breakage due to r66237. */ + if (ThreadData->MessageQueue->spwndFocus == Window) + ThreadData->MessageQueue->spwndFocus = NULL; + + if (ThreadData->MessageQueue->spwndActive == Window) + ThreadData->MessageQueue->spwndActive = NULL; if (ThreadData->MessageQueue->spwndCapture == Window) {

9 years, 10 months

[hbelusca] 66240: [WINLOGON] - Implement KillComProcesses that just kills with force and without any notification back to winlogon, any remaining app that is still alive even if we asked before to ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 12 23:35:58 2015 New Revision: 66240 URL: http://svn.reactos.org/svn/reactos?rev=66240&view=rev Log: [WINLOGON] - Implement KillComProcesses that just kills with force and without any notification back to winlogon, any remaining app that is still alive even if we asked before to kill apps (it's just the aim of this function, not more). - Fix internal flags according to WinDbg sessions with Win2k3 + tracing checked build winlogon (testing logoff/shutdown/reboot from winlogon itself and when using the "shutdown" command). - FIXME: Manage EWX_FORCE flag in winlogon... [WINSRV] Fix a DPRINT. [WIN32K] - Introduce a NotifyLogon function to manage winlogon notifications (when we shutdown and "end" shutdown steps, or cancel it). - Fix some flags settings. Part 11/X CORE-8322 ------- This is a test: !error !rot13 !reebe !ebg13 !error !rot13 !reebe !ebg13 Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/include/reactos/winlogon.h trunk/reactos/win32ss/user/ntuser/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Thu Feb 12 23:35:58 2015 @@ -29,8 +29,12 @@ #define HK_CTRL_ALT_DEL 0 #define HK_CTRL_SHIFT_ESC 1 -#define EWX_ACTION_MASK 0xffffffeb -#define EWX_FLAGS_MASK 0x00000014 +// #define EWX_FLAGS_MASK 0x00000014 +// #define EWX_ACTION_MASK ~EWX_FLAGS_MASK + +// FIXME: At the moment we use this value (select the lowbyte flags and some highbytes ones). +// It should be set such that it makes winlogon accepting only valid flags. +#define EWX_ACTION_MASK 0x5C0F typedef struct tagLOGOFF_SHUTDOWN_DATA { @@ -510,8 +514,12 @@ return 0; } - uFlags = EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | - ((LSData->Flags & EWX_ACTION_MASK) == EWX_LOGOFF ? EWX_INTERNAL_FLAG_LOGOFF : 0); + // FIXME: To be really fixed: need to check what needs to be kept and what needs to be removed there. + // + // uFlags = EWX_INTERNAL_KILL_USER_APPS | (LSData->Flags & EWX_FLAGS_MASK) | + // ((LSData->Flags & EWX_ACTION_MASK) == EWX_LOGOFF ? EWX_CALLER_WINLOGON_LOGOFF : 0); + + uFlags = EWX_CALLER_WINLOGON | (LSData->Flags & 0x0F); ERR("In LogoffShutdownThread with uFlags == 0x%x; exit_in_progress == %s\n", uFlags, ExitReactOSInProgress ? "true" : "false"); @@ -526,15 +534,42 @@ return 0; } - /* FIXME: Call ExitWindowsEx() to terminate COM processes only at logoff! */ - ERR("Should terminate COM processes only at logoff!\n"); - if (LSData->Session->UserToken) RevertToSelf(); return 1; } +static +DWORD +WINAPI +KillComProcesses( + LPVOID Parameter) +{ + PLOGOFF_SHUTDOWN_DATA LSData = (PLOGOFF_SHUTDOWN_DATA)Parameter; + + ERR("In KillComProcesses\n"); + + if (LSData->Session->UserToken != NULL && + !ImpersonateLoggedOnUser(LSData->Session->UserToken)) + { + ERR("ImpersonateLoggedOnUser() failed with error %lu\n", GetLastError()); + return 0; + } + + /* Attempt to kill remaining processes. No notifications needed. */ + if (!ExitWindowsEx(EWX_CALLER_WINLOGON | EWX_NONOTIFY | EWX_FORCE | EWX_LOGOFF, 0)) + { + ERR("Unable to kill COM apps, error %lu\n", GetLastError()); + RevertToSelf(); + return 0; + } + + if (LSData->Session->UserToken) + RevertToSelf(); + + return 1; +} static NTSTATUS @@ -694,8 +729,38 @@ return Status; } + /* Run logoff thread */ hThread = CreateThread(psa, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); + + if (!hThread) + { + ERR("Unable to create logoff thread, error %lu\n", GetLastError()); + DestroyLogoffSecurityAttributes(psa); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + WaitForSingleObject(hThread, INFINITE); + if (!GetExitCodeThread(hThread, &exitCode)) + { + ERR("Unable to get exit code of logoff thread (error %lu)\n", GetLastError()); + CloseHandle(hThread); + DestroyLogoffSecurityAttributes(psa); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + CloseHandle(hThread); + if (exitCode == 0) + { + ERR("Logoff thread returned failure\n"); + DestroyLogoffSecurityAttributes(psa); + HeapFree(GetProcessHeap(), 0, LSData); + return STATUS_UNSUCCESSFUL; + } + + + /* Kill remaining COM apps. Only at logoff! */ + hThread = CreateThread(psa, 0, KillComProcesses, (LPVOID)LSData, 0, NULL); /* We're done with the SECURITY_DESCRIPTOR */ DestroyLogoffSecurityAttributes(psa); @@ -703,7 +768,7 @@ if (!hThread) { - ERR("Unable to create logoff thread, error %lu\n", GetLastError()); + ERR("Unable to create kill COM apps thread, error %lu\n", GetLastError()); HeapFree(GetProcessHeap(), 0, LSData); return STATUS_UNSUCCESSFUL; } @@ -711,16 +776,17 @@ HeapFree(GetProcessHeap(), 0, LSData); if (!GetExitCodeThread(hThread, &exitCode)) { - ERR("Unable to get exit code of logoff thread (error %lu)\n", GetLastError()); + ERR("Unable to get exit code of kill COM apps thread (error %lu)\n", GetLastError()); CloseHandle(hThread); return STATUS_UNSUCCESSFUL; } CloseHandle(hThread); if (exitCode == 0) { - ERR("Logoff thread returned failure\n"); + ERR("Kill COM apps thread returned failure\n"); return STATUS_UNSUCCESSFUL; } + UnloadUserProfile(Session->UserToken, Session->hProfileInfo); CloseHandle(Session->UserToken); @@ -804,6 +870,11 @@ else LSData->Flags = EWX_SHUTDOWN; LSData->Session = Session; + + // FIXME: We may need to specify this flag to really force application kill + // (we are shutting down ReactOS, not just logging off so no hangs, etc... + // should be allowed). + // LSData->Flags |= EWX_FORCE; /* Run shutdown thread */ hThread = CreateThread(NULL, 0, LogoffShutdownThread, (LPVOID)LSData, 0, NULL); @@ -1305,6 +1376,12 @@ } /* Check parameters */ + if (Action & EWX_FORCE) + { + // FIXME! + ERR("FIXME: EWX_FORCE present for Winlogon, what to do?\n"); + Action &= ~EWX_FORCE; + } switch (Action) { case EWX_LOGOFF: @@ -1342,7 +1419,7 @@ // if you try now a shut down, it won't work because winlogon thinks it is // still in the middle of a shutdown. // Maybe we also need to reset ExitReactOSInProgress somewhere else?? - if (ExitReactOSInProgress && (lParam & EWX_INTERNAL_FLAG) == 0) + if (ExitReactOSInProgress && (lParam & EWX_CALLER_WINLOGON) == 0) { break; } Modified: trunk/reactos/include/reactos/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winlogon.h… ============================================================================== --- trunk/reactos/include/reactos/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winlogon.h [iso-8859-1] Thu Feb 12 23:35:58 2015 @@ -2,17 +2,28 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: include/reactos/winlogon.h - * PURPOSE: Private interface between CSRSS and WinLogon + * PURPOSE: Private interface between Win32 and Winlogon * PROGRAMMER: Ge van Geldorp (gvg(a)reactos.com) */ #ifndef REACTOS_WINLOGON_H_INCLUDED #define REACTOS_WINLOGON_H_INCLUDED -#define EWX_INTERNAL_FLAG 0x10000 -#define EWX_INTERNAL_KILL_USER_APPS (EWX_INTERNAL_FLAG | 0x100) -#define EWX_INTERNAL_KILL_ALL_APPS (EWX_INTERNAL_FLAG | 0x200) -#define EWX_INTERNAL_FLAG_LOGOFF 0x1000 +#define EWX_SHUTDOWN_CANCELED 0x0080 + +#define EWX_CALLER_SYSTEM 0x0100 +#define EWX_CALLER_WINLOGON 0x0200 + +#define EWX_CALLER_WINLOGON_LOGOFF 0x1000 // WARNING!! Broken flag. + +// All the range 0x0400 to 0x1000 is reserved for Winlogon. + +// Flag 0x2000 appears to be a flag set when we call InitiateSystemShutdown* APIs (Winlogon shutdown APIs). + +// 0x4000 is also reserved. + +#define EWX_NOTIFY 0x8000 +#define EWX_NONOTIFY 0x10000 #endif /* REACTOS_WINLOGON_H_INCLUDED */ Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Thu Feb 12 23:35:58 2015 @@ -7,7 +7,12 @@ */ #include <win32k.h> +#include <winlogon.h> + DBG_DEFAULT_CHANNEL(UserShutdown); + +/* Our local copy of shutdown flags */ +static ULONG gdwShutdownFlags = 0; /* * Based on CSRSS and described in pages 1115 - 1118 "Windows Internals, Fifth Edition". @@ -150,6 +155,51 @@ return Result; } +BOOL +NotifyLogon(IN HWND hWndSta, + IN PLUID CallerLuid, + IN ULONG Flags, + IN NTSTATUS ShutdownStatus) +{ + // LUID SystemLuid = SYSTEM_LUID; + ULONG Notif, Param; + + ERR("NotifyLogon(0x%lx, 0x%lx)\n", Flags, ShutdownStatus); + + /* If no Winlogon notifications are needed, just return */ + if (Flags & EWX_NONOTIFY) + return FALSE; + + /* In case we cancelled the shutdown...*/ + if (Flags & EWX_SHUTDOWN_CANCELED) + { + /* ... send a LN_LOGOFF_CANCELED to Winlogon with the real cancel status... */ + Notif = LN_LOGOFF_CANCELED; + Param = ShutdownStatus; + } + else + { + /* ... otherwise it's a real logoff. Send the shutdown flags in that case. */ + Notif = LN_LOGOFF; + Param = Flags; + } + + // FIXME: At the moment, always send the notifications... In real world some checks are done. + // if (hwndSAS && ( (Flags & EWX_SHUTDOWN) || RtlEqualLuid(CallerLuid, &SystemLuid)) ) + if (hwndSAS) + { + ERR("\tSending %s message to Winlogon\n", Notif == LN_LOGOFF ? "LN_LOGOFF" : "LN_LOGOFF_CANCELED"); + UserPostMessage(hwndSAS, WM_LOGONNOTIFY, Notif, (LPARAM)Param); + return TRUE; + } + else + { + ERR("hwndSAS == NULL\n"); + } + + return FALSE; +} + NTSTATUS UserInitiateShutdown(IN PETHREAD Thread, IN OUT PULONG pFlags) @@ -157,7 +207,7 @@ NTSTATUS Status; ULONG Flags = *pFlags; LUID CallerLuid; - // LUID SystemLuid = SYSTEM_LUID; + LUID SystemLuid = SYSTEM_LUID; static PRIVILEGE_SET ShutdownPrivilege = { 1, PRIVILEGE_SET_ALL_NECESSARY, @@ -168,9 +218,6 @@ ERR("UserInitiateShutdown\n"); - if(hwndSAS == NULL) - return STATUS_NOT_FOUND; - /* Get the caller's LUID */ Status = GetProcessLuid(Thread, &CallerLuid); if (!NT_SUCCESS(Status)) @@ -179,8 +226,16 @@ return Status; } - // FIXME: Check if this is the System LUID, and adjust flags if needed. - // if (RtlEqualLuid(&CallerLuid, &SystemLuid)) { Flags = ...; } + /* + * Check if this is the System LUID, and adjust flags if needed. + * In particular, be sure there is no EWX_CALLER_SYSTEM flag + * spuriously set (could be the sign of malicous app!). + */ + if (RtlEqualLuid(&CallerLuid, &SystemLuid)) + Flags |= EWX_CALLER_SYSTEM; + else + Flags &= ~EWX_CALLER_SYSTEM; + *pFlags = Flags; /* Retrieve the Win32 process info */ @@ -191,7 +246,12 @@ /* If the caller is not Winlogon, do some security checks */ if (PsGetThreadProcessId(Thread) != gpidLogon) { - // FIXME: Play again with flags... + /* + * Here also, be sure there is no EWX_CALLER_WINLOGON flag + * spuriously set (could be the sign of malicous app!). + */ + Flags &= ~EWX_CALLER_WINLOGON; + *pFlags = Flags; /* Check whether the current process is attached to a window station */ @@ -224,24 +284,27 @@ } } - /* If the caller is not Winlogon, notify it to perform the real shutdown */ + /* If the caller is not Winlogon, possibly notify it to perform the real shutdown */ if (PsGetThreadProcessId(Thread) != gpidLogon) { // FIXME: HACK!! Do more checks!! ERR("UserInitiateShutdown -- Notify Winlogon for shutdown\n"); - UserPostMessage(hwndSAS, WM_LOGONNOTIFY, LN_LOGOFF, (LPARAM)Flags); + NotifyLogon(hwndSAS, &CallerLuid, Flags, STATUS_SUCCESS); return STATUS_PENDING; } // If we reach this point, that means it's Winlogon that triggered the shutdown. - ERR("UserInitiateShutdown -- Winlogon shuts down\n"); + ERR("UserInitiateShutdown -- Winlogon is doing a shutdown\n"); /* - * FIXME: - * Update and save the shutdown flags globally for renotifying Winlogon - * if needed, when calling EndShutdown. + * Update and save the shutdown flags globally for renotifying + * Winlogon if needed, when calling EndShutdown. */ + Flags |= EWX_CALLER_WINLOGON; // Winlogon is doing a shutdown, be sure the internal flag is set. *pFlags = Flags; + + /* Save the shutdown flags now */ + gdwShutdownFlags = Flags; return STATUS_SUCCESS; } @@ -250,9 +313,45 @@ UserEndShutdown(IN PETHREAD Thread, IN NTSTATUS ShutdownStatus) { + NTSTATUS Status; + ULONG Flags; + LUID CallerLuid; + ERR("UserEndShutdown\n"); + + /* + * FIXME: Some cleanup should be done when shutdown succeeds, + * and some reset should be done when shutdown is cancelled. + */ STUB; - return STATUS_NOT_IMPLEMENTED; + + Status = GetProcessLuid(Thread, &CallerLuid); + if (!NT_SUCCESS(Status)) + { + ERR("GetProcessLuid failed\n"); + return Status; + } + + /* Copy the global flags because we're going to modify them for our purposes */ + Flags = gdwShutdownFlags; + + if (NT_SUCCESS(ShutdownStatus)) + { + /* Just report success, and keep the shutdown flags as they are */ + ShutdownStatus = STATUS_SUCCESS; + } + else + { + /* Report the status to Winlogon and say that we cancel the shutdown */ + Flags |= EWX_SHUTDOWN_CANCELED; + // FIXME: Should we reset gdwShutdownFlags to 0 ?? + } + + ERR("UserEndShutdown -- Notify Winlogon for end of shutdown\n"); + NotifyLogon(hwndSAS, &CallerLuid, Flags, ShutdownStatus); + + /* Always return success */ + return STATUS_SUCCESS; } /* EOF */ 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] Thu Feb 12 23:35:58 2015 @@ -493,7 +493,7 @@ { Context.ProcessId = (DWORD_PTR) ProcessData->ClientId.UniqueProcess; Context.wParam = 0; - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? + Context.lParam = (0 != (Flags & EWX_CALLER_WINLOGON_LOGOFF) ? ENDSESSION_LOGOFF : 0); Context.StartTime = 0; Context.UIThread = NULL; @@ -505,7 +505,7 @@ NotifyTopLevelWindows(&Context); Context.wParam = (QUERY_RESULT_ABORT != Context.QueryResult); - Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? + Context.lParam = (0 != (Flags & EWX_CALLER_WINLOGON_LOGOFF) ? ENDSESSION_LOGOFF : 0); Context.SendMessageProc = SendEndSession; Context.ShowUI = DtbgIsDesktopVisible() && @@ -775,7 +775,7 @@ * Check for flags validity */ - if (Flags & EWX_INTERNAL_FLAG) + if (Flags & EWX_CALLER_WINLOGON) { /* Only Winlogon can call this */ if (ProcessId != LogonProcessId) @@ -904,7 +904,10 @@ return CsrShutdownNonCsrProcess; } - DPRINT1("Killing process with ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); + if (Flags & EWX_CALLER_SYSTEM) + DPRINT1("Killed by a SYSTEM process -- ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); + else + DPRINT1("Killing process with ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); #if 0 if (!NotifyAndTerminateProcess(CsrProcess, &ShutdownSettings, Flags))

9 years, 10 months

[jimtabor] 66239: [NtUser] - Fix dialog breakage due to r66237.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 12 23:10:10 2015 New Revision: 66239 URL: http://svn.reactos.org/svn/reactos?rev=66239&view=rev Log: [NtUser] - Fix dialog breakage due to r66237. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Feb 12 23:10:10 2015 @@ -379,17 +379,29 @@ * be destroying. */ // Rule #1 - if ( ti->MessageQueue->spwndActive == Window || + if ( ti->MessageQueue->spwndActive == Window || // Fixes CORE-106 RegSrv32 exit and return focus to CMD. (ti->MessageQueue->spwndActive == NULL && ti->MessageQueue == IntGetFocusMessageQueue()) ) { co_WinPosActivateOtherWindow(Window); } + /* Fixes dialog test test_focus breakage due to r66237 and CMD properties closing and returning focus to CMD */ + if (ti->MessageQueue->spwndFocus == Window) + { + if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) + { + co_UserSetFocus(Window->spwndParent); + } + else + { + co_UserSetFocus(NULL); + } + } + if (ti->MessageQueue->CaretInfo->hWnd == UserHMGetHandle(Window)) { co_IntDestroyCaret(ti); } - } /* @@ -2566,10 +2578,12 @@ co_IntShellHookNotify(HSHELL_WINDOWDESTROYED, (WPARAM) hWnd, 0); } + /* Hide the window */ if (Window->style & WS_VISIBLE) { if (Window->style & WS_CHILD) { + /* Only child windows receive WM_SHOWWINDOW in DestroyWindow() */ co_WinPosShowWindow(Window, SW_HIDE); } else @@ -3846,7 +3860,6 @@ END_CLEANUP; } - /* * @implemented */ @@ -3884,7 +3897,6 @@ UserLeave(); END_CLEANUP; } - /* * @implemented

9 years, 10 months

[jimtabor] 66238: [NtUser] - Fix wine msg.c:test_quit_message tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Feb 12 21:33:43 2015 New Revision: 66238 URL: http://svn.reactos.org/svn/reactos?rev=66238&view=rev Log: [NtUser] - Fix wine msg.c:test_quit_message tests. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c 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] Thu Feb 12 21:33:43 2015 @@ -848,8 +848,8 @@ return TRUE; } - /* Now look for a quit message. */ - if (pti->QuitPosted) + /* Only check for quit messages if not posted messages pending. */ + if (ProcessMask & QS_POSTMESSAGE && pti->QuitPosted) { /* According to the PSDK, WM_QUIT messages are always returned, regardless of the filter specified */ @@ -1222,14 +1222,7 @@ Message.lParam = lParam; } - if (WM_QUIT == Msg) - { - MsqPostQuitMessage(pti, wParam); - } - else - { - MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo); - } + MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0, ExtraInfo); } return TRUE; } 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] Thu Feb 12 21:33:43 2015 @@ -932,6 +932,11 @@ ListEntry); if (PostedMessage->Msg.hwnd == Window->head.h) { + if (PostedMessage->Msg.message == WM_QUIT && pti->QuitPosted == 0) + { + pti->QuitPosted = 1; + pti->exitCode = PostedMessage->Msg.wParam; + } RemoveEntryList(&PostedMessage->ListEntry); ClearMsgBitsMask(pti, PostedMessage->QS_Flags); MsqDestroyMessage(PostedMessage);

9 years, 10 months

← Newer
1
...
24
25
26
27
28
29
30
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015