Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 66251: [ROSTESTS] Create rostests module group. You can now compile rostests with "ninja rostests". Dedicated to Colin.
by tkreuzer＠svn.reactos.org 13 Feb '15

13 Feb '15

Author: tkreuzer Date: Fri Feb 13 20:20:52 2015 New Revision: 66251 URL: http://svn.reactos.org/svn/reactos?rev=66251&view=rev Log: [ROSTESTS] Create rostests module group. You can now compile rostests with "ninja rostests". Dedicated to Colin. Modified: trunk/rostests/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=66251&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Fri Feb 13 20:20:52 2015 @@ -1,3 +1,5 @@ + +start_module_group(rostests) add_subdirectory(apitests) #add_subdirectory(dibtests) @@ -9,3 +11,5 @@ add_subdirectory(tests) #add_subdirectory(win32) add_subdirectory(winetests) + +end_module_group()

1 0

[tkreuzer] 66250: [CMAKE] Add support for "module groups". These are meta targets that automatically include all targets using set_module_type() that are included between start_module_group(name) a...
by tkreuzer＠svn.reactos.org 13 Feb '15

13 Feb '15

Author: tkreuzer Date: Fri Feb 13 20:19:51 2015 New Revision: 66250 URL: http://svn.reactos.org/svn/reactos?rev=66250&view=rev Log: [CMAKE] Add support for "module groups". These are meta targets that automatically include all targets using set_module_type() that are included between start_module_group(name) and end_module_group(). Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Feb 13 20:19:51 2015 @@ -550,9 +550,14 @@ message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}") endif() + # Add the module to the module group list, if it is defined + if(DEFINED CURRENT_MODULE_GROUP) + set_property(GLOBAL APPEND PROPERTY ${CURRENT_MODULE_GROUP}_MODULE_LIST "${MODULE}") + endif() + # Set subsystem. Also take this as an occasion # to error out if someone gave a non existing type - if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) + if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) set(__subsystem native) elseif(${TYPE} STREQUAL win32cui) @@ -662,6 +667,21 @@ # do compiler specific stuff set_module_type_toolchain(${MODULE} ${TYPE}) +endfunction() + +function(start_module_group __name) + if(DEFINED CURRENT_MODULE_GROUP) + message(FATAL_ERROR "CURRENT_MODULE_GROUP is already set ('${CURRENT_MODULE_GROUP}')") + endif() + set(CURRENT_MODULE_GROUP rostests PARENT_SCOPE) +endfunction() + +function(end_module_group) + get_property(__modulelist GLOBAL PROPERTY ${CURRENT_MODULE_GROUP}_MODULE_LIST) + add_custom_target(${CURRENT_MODULE_GROUP}) + foreach(__module ${__modulelist}) + add_dependencies(${CURRENT_MODULE_GROUP} ${__module}) + endforeach() endfunction() function(preprocess_file __in __out)

1 0

[hbelusca] 66249: [CONSRV]: Remove unused commented DtbgIsDesktopVisible.
by hbelusca＠svn.reactos.org 13 Feb '15

13 Feb '15

Author: hbelusca Date: Fri Feb 13 16:19:14 2015 New Revision: 66249 URL: http://svn.reactos.org/svn/reactos?rev=66249&view=rev Log: [CONSRV]: Remove unused commented DtbgIsDesktopVisible. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Fri Feb 13 16:19:14 2015 @@ -818,11 +818,6 @@ TuiSetMenuClose, }; -// static BOOL -// DtbgIsDesktopVisible(VOID) -// { - // return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); -// } static BOOLEAN IsConsoleMode(VOID) { Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c [iso-8859-1] Fri Feb 13 16:19:14 2015 @@ -813,11 +813,6 @@ TuiSetMenuClose, }; -// static BOOL -// DtbgIsDesktopVisible(VOID) -// { - // return !((BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_ISCONSOLEMODE)); -// } static BOOLEAN IsConsoleMode(VOID) {

1 0

[hbelusca] 66248: [BASESRV]: Only SHUTDOWN_NORETRY can be set via Get/SetProcessShutdownParameters APIs.
by hbelusca＠svn.reactos.org 13 Feb '15

13 Feb '15

Author: hbelusca Date: Fri Feb 13 16:16:28 2015 New Revision: 66248 URL: http://svn.reactos.org/svn/reactos?rev=66248&view=rev Log: [BASESRV]: Only SHUTDOWN_NORETRY can be set via Get/SetProcessShutdownParameters APIs. Modified: trunk/reactos/subsystems/win/basesrv/proc.c Modified: trunk/reactos/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/pro… ============================================================================== --- trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/proc.c [iso-8859-1] Fri Feb 13 16:16:28 2015 @@ -288,7 +288,8 @@ ASSERT(CsrThread); ShutdownParametersRequest->ShutdownLevel = CsrThread->Process->ShutdownLevel; - ShutdownParametersRequest->ShutdownFlags = CsrThread->Process->ShutdownFlags; + /* Only SHUTDOWN_NORETRY flag is valid for this API. The other private flags are for CSRSRV/WINSRV only. */ + ShutdownParametersRequest->ShutdownFlags = CsrThread->Process->ShutdownFlags & SHUTDOWN_NORETRY; return STATUS_SUCCESS; } @@ -299,7 +300,15 @@ PCSR_THREAD CsrThread = CsrGetClientThread(); ASSERT(CsrThread); + /* Only SHUTDOWN_NORETRY flag is valid for this API. The other private flags are for CSRSRV/WINSRV only. */ + if (ShutdownParametersRequest->ShutdownFlags & ~SHUTDOWN_NORETRY) + { + /* If there were other flags specified, fail the call */ + return STATUS_INVALID_PARAMETER; + } + CsrThread->Process->ShutdownLevel = ShutdownParametersRequest->ShutdownLevel; + /* Notice that all the possible other private flags are reinitialized here */ CsrThread->Process->ShutdownFlags = ShutdownParametersRequest->ShutdownFlags; return STATUS_SUCCESS;

1 0

[janderwald] 66247: [IPHLPAPI] - hackplement GetExtendedTcpTable class TCP_TABLE_OWNER_PID_ALL - fixes XAMPP control panel startup
by janderwald＠svn.reactos.org 13 Feb '15

13 Feb '15

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; }

1 0

[janderwald] 66246: [PSDK] - add MIB_TCPROW_OWNER_PID, MIB_TCPTABLE_OWNER_PID types
by janderwald＠svn.reactos.org 13 Feb '15

13 Feb '15

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__ */

1 0

[jimtabor] 66245: [NtUser] - Fix wine msg:test_SendMessageTimeout. Do not allow the message to pass on after a timeout.
by jimtabor＠svn.reactos.org 13 Feb '15

13 Feb '15

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)) ; }

1 0

[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 13 Feb '15

13 Feb '15

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:

1 0

[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 13 Feb '15

13 Feb '15

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

1 0

[tfaber] 66242: [GDI32_APITEST] - Fix stack buffer overflow in InitPerBitDepth ROSTESTS-147 #resolve
by tfaber＠svn.reactos.org 13 Feb '15

13 Feb '15

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;

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