Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 69801: [WS2_32] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114
by akhaldi＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: akhaldi Date: Tue Nov 3 21:16:02 2015 New Revision: 69801 URL: http://svn.reactos.org/svn/reactos?rev=69801&view=rev Log: [WS2_32] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/dll/win32/ws2_32/include/catalog.h trunk/reactos/dll/win32/ws2_32/include/debug.h trunk/reactos/dll/win32/ws2_32/include/handle.h trunk/reactos/dll/win32/ws2_32/include/upcall.h trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/bsd.c trunk/reactos/dll/win32/ws2_32/misc/catalog.c trunk/reactos/dll/win32/ws2_32/misc/dllmain.c trunk/reactos/dll/win32/ws2_32/misc/event.c trunk/reactos/dll/win32/ws2_32/misc/handle.c trunk/reactos/dll/win32/ws2_32/misc/ns.c trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c trunk/reactos/dll/win32/ws2_32/misc/stubs.c trunk/reactos/dll/win32/ws2_32/misc/upcall.c Modified: trunk/reactos/dll/win32/ws2_32/include/catalog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/catalog.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/catalog.h [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/catalog.h + * FILE: dll/win32/ws2_32/include/catalog.h * PURPOSE: Service Provider Catalog definitions */ Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/debug.h + * FILE: dll/win32/ws2_32/include/debug.h * PURPOSE: Debugging support macros * DEFINES: DBG - Enable debug output * NASSERT - Disable assertions Modified: trunk/reactos/dll/win32/ws2_32/include/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/h… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/handle.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/handle.h [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/handle.h + * FILE: dll/win32/ws2_32/include/handle.h * PURPOSE: Provider handle definitions */ Modified: trunk/reactos/dll/win32/ws2_32/include/upcall.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/u… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/upcall.h [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/upcall.h + * FILE: dll/win32/ws2_32/include/upcall.h * PURPOSE: Upcall function defintions */ Modified: trunk/reactos/dll/win32/ws2_32/include/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/ws2_32.h [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: include/ws2_32.h + * FILE: dll/win32/ws2_32/include/ws2_32.h * PURPOSE: WinSock 2 DLL header */ Modified: trunk/reactos/dll/win32/ws2_32/misc/bsd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/bsd.… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/bsd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/bsd.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/bsd.c + * FILE: dll/win32/ws2_32/misc/bsd.c * PURPOSE: Legacy BSD sockets APIs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/cata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/catalog.c + * FILE: dll/win32/ws2_32/misc/catalog.c * PURPOSE: Service Provider Catalog * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/dllmain.c + * FILE: dll/win32/ws2_32/misc/dllmain.c * PURPOSE: DLL entry point * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/even… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/event.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/event.c + * FILE: dll/win32/ws2_32/misc/event.c * PURPOSE: Event handling * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/hand… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/handle.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/handle.c + * FILE: dll/win32/ws2_32/misc/handle.c * PURPOSE: Provider handle management * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/ns.c + * FILE: dll/win32/ws2_32/misc/ns.c * PURPOSE: Namespace APIs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/sndr… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/sndrcv.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/sndrcv.c + * FILE: dll/win32/ws2_32/misc/sndrcv.c * PURPOSE: Send/receive functions * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/stubs.c + * FILE: dll/win32/ws2_32/misc/stubs.c * PURPOSE: Stubs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: Modified: trunk/reactos/dll/win32/ws2_32/misc/upcall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/upca… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/upcall.c [iso-8859-1] Tue Nov 3 21:16:02 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS WinSock 2 DLL - * FILE: misc/upcall.c + * FILE: dll/win32/ws2_32/misc/upcall.c * PURPOSE: Upcall functions * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS:

1 0

[akhaldi] 69800: [WS2_32_NEW] Properly set the sin_zero field. Revealed by ws2_32_apitest:addrinfo, fixed by Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: akhaldi Date: Tue Nov 3 21:14:54 2015 New Revision: 69800 URL: http://svn.reactos.org/svn/reactos?rev=69800&view=rev Log: [WS2_32_NEW] Properly set the sin_zero field. Revealed by ws2_32_apitest:addrinfo, fixed by Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/a… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Tue Nov 3 21:14:54 2015 @@ -132,7 +132,8 @@ SockAddress->sin_family = AF_INET; SockAddress->sin_port = Port; SockAddress->sin_addr.s_addr = Address; - + ZeroMemory(SockAddress->sin_zero, sizeof(SockAddress->sin_zero)); + /* Fill out the addrinfo */ AddrInfo->ai_family = PF_INET; AddrInfo->ai_socktype = SocketType;

1 0

[akhaldi] 69799: [USER32_APITEST] Fix a typo.
by akhaldi＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: akhaldi Date: Tue Nov 3 21:14:15 2015 New Revision: 69799 URL: http://svn.reactos.org/svn/reactos?rev=69799&view=rev Log: [USER32_APITEST] Fix a typo. Modified: trunk/rostests/apitests/user32/DeferWindowPos.c trunk/rostests/apitests/user32/SendMessageTimeout.c trunk/rostests/apitests/user32/SetActiveWindow.c trunk/rostests/apitests/user32/SetParent.c trunk/rostests/apitests/user32/SystemParametersInfo.c trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/helper.h Modified: trunk/rostests/apitests/user32/DeferWindowPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/DeferWind… ============================================================================== --- trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/DeferWindowPos.c [iso-8859-1] Tue Nov 3 21:14:15 2015 @@ -42,11 +42,11 @@ { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECORD_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -59,7 +59,7 @@ { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } Modified: trunk/rostests/apitests/user32/SendMessageTimeout.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SendMessa… ============================================================================== --- trunk/rostests/apitests/user32/SendMessageTimeout.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SendMessageTimeout.c [iso-8859-1] Tue Nov 3 21:14:15 2015 @@ -62,15 +62,15 @@ if (hWnd == hWndThread1) { - RECOND_MESSAGE(1, message, SENT, wParam, lParam); + RECORD_MESSAGE(1, message, SENT, wParam, lParam); } else if (hWnd == hWndThread2) { - RECOND_MESSAGE(2, message, SENT, wParam, lParam); + RECORD_MESSAGE(2, message, SENT, wParam, lParam); } else { - RECOND_MESSAGE(3, message, SENT, wParam, lParam); + RECORD_MESSAGE(3, message, SENT, wParam, lParam); } switch (message) @@ -115,7 +115,7 @@ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(1, msg.message, POST, 0, 0); + RECORD_MESSAGE(1, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -126,7 +126,7 @@ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(1, msg.message, POST, 0, 0); + RECORD_MESSAGE(1, msg.message, POST, 0, 0); DispatchMessageA(&msg); } } @@ -135,7 +135,7 @@ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(1, msg.message, POST, 0, 0); + RECORD_MESSAGE(1, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -158,7 +158,7 @@ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(2, msg.message, POST, 0, 0); + RECORD_MESSAGE(2, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -169,7 +169,7 @@ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(2, msg.message, POST, 0, 0); + RECORD_MESSAGE(2, msg.message, POST, 0, 0); DispatchMessageA(&msg); } @@ -177,7 +177,7 @@ while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(2, msg.message, POST, 0, 0); + RECORD_MESSAGE(2, msg.message, POST, 0, 0); DispatchMessageA(&msg); } Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Tue Nov 3 21:14:15 2015 @@ -49,11 +49,11 @@ { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECORD_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -66,7 +66,7 @@ { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } Modified: trunk/rostests/apitests/user32/SetParent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetParent… ============================================================================== --- trunk/rostests/apitests/user32/SetParent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetParent.c [iso-8859-1] Tue Nov 3 21:14:15 2015 @@ -77,7 +77,7 @@ if (message > WM_USER || IsDWmMsg(message) || IseKeyMsg(message)) return DefWindowProcW(hWnd, message, wParam, lParam); - RECOND_MESSAGE(iwnd, message, SENT, wParam, lParam); + RECORD_MESSAGE(iwnd, message, SENT, wParam, lParam); switch(message) { @@ -150,7 +150,7 @@ { int iwnd = get_iwnd(msg.hwnd, FALSE); if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + RECORD_MESSAGE(iwnd, msg.message, POST, 0, 0); DispatchMessageA( &msg ); } trace("\n"); @@ -181,7 +181,7 @@ { int iwnd = get_iwnd(msg.hwnd, FALSE); if(!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST, 0, 0); + RECORD_MESSAGE(iwnd, msg.message, POST, 0, 0); DispatchMessageA( &msg ); } trace("\n"); Modified: trunk/rostests/apitests/user32/SystemParametersInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SystemPar… ============================================================================== --- trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SystemParametersInfo.c [iso-8859-1] Tue Nov 3 21:14:15 2015 @@ -39,11 +39,11 @@ { WINDOWPOS* pwp = (WINDOWPOS*)lParam; ok(wParam==0,"expected wParam=0\n"); - RECOND_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + RECORD_MESSAGE(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); break; } default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -56,7 +56,7 @@ { int iwnd = get_iwnd(msg.hwnd); if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); DispatchMessageA( &msg ); } } Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Tue Nov 3 21:14:15 2015 @@ -50,7 +50,7 @@ ok(0, "Got unexpected WM_SYSTIMER in the winproc. wParam=%d\n", wParam); break; default: - RECOND_MESSAGE(iwnd, message, SENT, 0,0); + RECORD_MESSAGE(iwnd, message, SENT, 0,0); } return DefWindowProc(hWnd, message, wParam, lParam); } @@ -58,7 +58,7 @@ static LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) { LRESULT ret; - RECOND_MESSAGE(0, WH_MOUSE_LL, HOOK, wParam, 0); + RECORD_MESSAGE(0, WH_MOUSE_LL, HOOK, wParam, 0); ret = CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); if(ignore_mousell) return TRUE; @@ -69,7 +69,7 @@ { MOUSEHOOKSTRUCT *hs = (MOUSEHOOKSTRUCT*) lParam; LRESULT ret; - RECOND_MESSAGE(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); + RECORD_MESSAGE(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); ret = CallNextHookEx(hMouseHook, nCode, wParam, lParam); if(ignore_mouse) return TRUE; @@ -87,12 +87,12 @@ { if(msg.message == WM_SYSTIMER) { - RECOND_MESSAGE(iwnd, msg.message, POST,msg.wParam,0); + RECORD_MESSAGE(iwnd, msg.message, POST,msg.wParam,0); if(ignore_timer) continue; } else if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) - RECOND_MESSAGE(iwnd, msg.message, POST,0,0); + RECORD_MESSAGE(iwnd, msg.message, POST,0,0); } DispatchMessageA( &msg ); } Modified: trunk/rostests/apitests/user32/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.h?… ============================================================================== --- trunk/rostests/apitests/user32/helper.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.h [iso-8859-1] Tue Nov 3 21:14:15 2015 @@ -55,7 +55,7 @@ #define COMPARE_CACHE(msg_chain) compare_cache(&default_cache, __FILE__, __LINE__, msg_chain) #define TRACE_CACHE() trace_cache(&default_cache, __FILE__, __LINE__) #define EMPTY_CACHE() empty_message_cache(&default_cache); -#define RECOND_MESSAGE(...) record_message(&default_cache, ##__VA_ARGS__); +#define RECORD_MESSAGE(...) record_message(&default_cache, ##__VA_ARGS__); #define COMPARE_CACHE_(cache, msg_chain) compare_cache(cache, __FILE__, __LINE__, msg_chain) #define TRACE_CACHE_(cache) trace_cache(cache, __FILE__, __LINE__)

1 0

[tfaber] 69798: [WIN32K] - Free sent messages to the right lookaside list CORE-9210
by tfaber＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: tfaber Date: Tue Nov 3 21:04:19 2015 New Revision: 69798 URL: http://svn.reactos.org/svn/reactos?rev=69798&view=rev Log: [WIN32K] - Free sent messages to the right lookaside list CORE-9210 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] Tue Nov 3 21:04:19 2015 @@ -790,7 +790,7 @@ /* Remove it from the list */ RemoveEntryList(&Message->ListEntry); - ExFreeToPagedLookasideList(pgMessageLookasideList, Message); + ExFreeToPagedLookasideList(pgSendMsgLookasideList, Message); SendMsgCount--; }

1 0

[tfaber] 69797: [USER32_APITEST] - Add a test for sending recursive inter-thread messages CORE-9210
by tfaber＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: tfaber Date: Tue Nov 3 20:40:19 2015 New Revision: 69797 URL: http://svn.reactos.org/svn/reactos?rev=69797&view=rev Log: [USER32_APITEST] - Add a test for sending recursive inter-thread messages CORE-9210 Modified: trunk/rostests/apitests/user32/SendMessageTimeout.c Modified: trunk/rostests/apitests/user32/SendMessageTimeout.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SendMessa… ============================================================================== --- trunk/rostests/apitests/user32/SendMessageTimeout.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SendMessageTimeout.c [iso-8859-1] Tue Nov 3 20:40:19 2015 @@ -7,10 +7,20 @@ #include <apitest.h> #include <winuser.h> +#include "helper.h" + +static DWORD dwThread1; +static DWORD dwThread2; +static HANDLE hThread1; +static HANDLE hThread2; +static HWND hWndThread1; +static HWND hWndThread2; static void -TestSendMessageTimeout(HWND hWnd, UINT Msg) +TestSendMessageTimeout( + _In_ HWND hWnd, + _In_ UINT Msg) { LRESULT ret; DWORD_PTR result; @@ -30,6 +40,190 @@ ret = SendMessageTimeoutA(hWnd, Msg, 0, 0, SMTO_NORMAL, 0, &result); ok(ret == 0, "ret = %Id\n", ret); ok(result == 0, "result = %Iu\n", result); +} + +#define WM_SENDTOOTHERTHREAD (WM_USER + 14) + +#define KILL_THREAD1_FLAG 0x40000000 +#define KILL_THREAD2_FLAG 0x20000000 +#define KILL_THREAD_FLAGS (KILL_THREAD1_FLAG | KILL_THREAD2_FLAG) + +static +LRESULT +CALLBACK +WndProc( + _In_ HWND hWnd, + _In_ UINT message, + _In_ WPARAM wParam, + _In_ LPARAM lParam) +{ + if (IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProcW(hWnd, message, wParam, lParam); + + if (hWnd == hWndThread1) + { + RECOND_MESSAGE(1, message, SENT, wParam, lParam); + } + else if (hWnd == hWndThread2) + { + RECOND_MESSAGE(2, message, SENT, wParam, lParam); + } + else + { + RECOND_MESSAGE(3, message, SENT, wParam, lParam); + } + + switch (message) + { + case WM_SENDTOOTHERTHREAD: + if (GetCurrentThreadId() == dwThread1) + { + if ((wParam & KILL_THREAD2_FLAG) && + (wParam & ~KILL_THREAD_FLAGS) > 10) + { + TerminateThread(hThread2, 123); + } + if ((wParam & KILL_THREAD1_FLAG) && + (wParam & ~KILL_THREAD_FLAGS) > 10) + { + TerminateThread(hThread1, 456); + } + ok(lParam == dwThread2, "lParam = %Iu, expected %lu\n", lParam, dwThread2); + return SendMessage(hWndThread2, WM_SENDTOOTHERTHREAD, wParam + 1, GetCurrentThreadId()); + } + else + { + ok(lParam == dwThread1, "lParam = %Iu, expected %lu\n", lParam, dwThread1); + return SendMessage(hWndThread1, WM_SENDTOOTHERTHREAD, wParam + 1, GetCurrentThreadId()); + } + } + + return DefWindowProcW(hWnd, message, wParam, lParam); +} + +static +DWORD +WINAPI +Thread1( + _Inout_opt_ PVOID Parameter) +{ + MSG msg; + + hWndThread1 = CreateWindowExW(0, L"SendTest", NULL, 0, 10, 10, 20, 20, NULL, NULL, 0, NULL); + ok(hWndThread1 != NULL, "CreateWindow failed\n"); + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(1, msg.message, POST, 0, 0); + DispatchMessageA(&msg); + } + + ResumeThread(hThread2); + + while (MsgWaitForMultipleObjectsEx(1, &hThread2, FALSE, QS_ALLEVENTS, MWMO_ALERTABLE) != WAIT_OBJECT_0) + { + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(1, msg.message, POST, 0, 0); + DispatchMessageA(&msg); + } + } + + DestroyWindow(hWndThread1); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(1, msg.message, POST, 0, 0); + DispatchMessageA(&msg); + } + + return 6; +} + +static +DWORD +WINAPI +Thread2( + _Inout_opt_ PVOID Parameter) +{ + MSG msg; + LRESULT ret; + WPARAM wParam; + + hWndThread2 = CreateWindowExW(0, L"SendTest", NULL, 0, 10, 10, 20, 20, NULL, NULL, 0, NULL); + ok(hWndThread2 != NULL, "CreateWindow failed\n"); + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(2, msg.message, POST, 0, 0); + DispatchMessageA(&msg); + } + + wParam = (WPARAM)Parameter; + ret = SendMessage(hWndThread1, WM_SENDTOOTHERTHREAD, wParam, dwThread2); + ok(ret == 0, "ret = %lu\n", ret); + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(2, msg.message, POST, 0, 0); + DispatchMessageA(&msg); + } + + DestroyWindow(hWndThread2); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + if (!(msg.message > WM_USER || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + RECOND_MESSAGE(2, msg.message, POST, 0, 0); + DispatchMessageA(&msg); + } + + return 7; +} + +static +void +TestRecursiveInterThreadMessages( + _In_ BOOL KillThread1, + _In_ BOOL KillThread2) +{ + PVOID Parameter; + HANDLE Handles[2]; + BOOL Ret; + DWORD ExitCode; + + Parameter = (PVOID)((KillThread1 ? KILL_THREAD1_FLAG : 0) | + (KillThread2 ? KILL_THREAD2_FLAG : 0)); + hThread1 = CreateThread(NULL, 0, Thread1, Parameter, CREATE_SUSPENDED, &dwThread1); + hThread2 = CreateThread(NULL, 0, Thread2, Parameter, CREATE_SUSPENDED, &dwThread2); + + ResumeThread(hThread1); + + Handles[0] = hThread1; + Handles[1] = hThread2; + WaitForMultipleObjects(2, Handles, TRUE, INFINITE); + + Ret = GetExitCodeThread(hThread1, &ExitCode); + ok(Ret == TRUE, "GetExitCodeThread failed with %lu\n", GetLastError()); + if (KillThread1) + ok(ExitCode == 456, "Thread1 exit code is %lu\n", ExitCode); + else + ok(ExitCode == 6, "Thread1 exit code is %lu\n", ExitCode); + + Ret = GetExitCodeThread(hThread2, &ExitCode); + ok(Ret == TRUE, "GetExitCodeThread failed with %lu\n", GetLastError()); + if (KillThread2) + ok(ExitCode == 123, "Thread2 exit code is %lu\n", ExitCode); + else + ok(ExitCode == 7, "Thread2 exit code is %lu\n", ExitCode); + + CloseHandle(hThread2); + CloseHandle(hThread1); + + //TRACE_CACHE(); } START_TEST(SendMessageTimeout) @@ -37,4 +231,11 @@ TestSendMessageTimeout(NULL, WM_USER); TestSendMessageTimeout(NULL, WM_PAINT); TestSendMessageTimeout(NULL, WM_GETICON); -} + + RegisterSimpleClass(WndProc, L"SendTest"); + + TestRecursiveInterThreadMessages(FALSE, FALSE); + TestRecursiveInterThreadMessages(FALSE, TRUE); + TestRecursiveInterThreadMessages(TRUE, FALSE); + TestRecursiveInterThreadMessages(TRUE, TRUE); +}

1 0

[jimtabor] 69796: - Missing from patch 11. This should fix it.
by jimtabor＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: jimtabor Date: Tue Nov 3 19:22:00 2015 New Revision: 69796 URL: http://svn.reactos.org/svn/reactos?rev=69796&view=rev Log: - Missing from patch 11. This should fix it. Modified: trunk/reactos/win32ss/user/user32/windows/message.c Modified: trunk/reactos/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/message.c [iso-8859-1] Tue Nov 3 19:22:00 2015 @@ -2320,6 +2320,7 @@ { MSG UMMsg, KMMsg; LRESULT Result; + BOOL Ret; PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); @@ -2365,13 +2366,17 @@ return FALSE; } - Result = NtUserMessageCall( Wnd, - KMMsg.message, - KMMsg.wParam, - KMMsg.lParam, - (ULONG_PTR)&Result, - FNID_SENDMESSAGE, - FALSE); + Ret = NtUserMessageCall( Wnd, + KMMsg.message, + KMMsg.wParam, + KMMsg.lParam, + (ULONG_PTR)&Result, + FNID_SENDMESSAGE, + FALSE); + if (!Ret) + { + ERR("SendMessageW Error\n"); + } MsgiUMToKMCleanup(&UMMsg, &KMMsg); @@ -2387,6 +2392,7 @@ { MSG AnsiMsg, UcMsg, KMMsg; LRESULT Result; + BOOL Ret; PWND Window; PTHREADINFO ti = GetW32ThreadInfo(); @@ -2438,13 +2444,17 @@ return FALSE; } - Result = NtUserMessageCall( Wnd, - KMMsg.message, - KMMsg.wParam, - KMMsg.lParam, - (ULONG_PTR)&Result, - FNID_SENDMESSAGE, - TRUE); + Ret = NtUserMessageCall( Wnd, + KMMsg.message, + KMMsg.wParam, + KMMsg.lParam, + (ULONG_PTR)&Result, + FNID_SENDMESSAGE, + TRUE); + if (!Ret) + { + ERR("SendMessageA Error\n"); + } MsgiUMToKMCleanup(&UcMsg, &KMMsg); MsgiAnsiToUnicodeReply(&UcMsg, &AnsiMsg, &Result); @@ -2886,10 +2896,15 @@ KMMsg.lParam = (LPARAM) ((char *) CallbackArgs + sizeof(WINDOWPROC_CALLBACK_ARGUMENTS)); switch(KMMsg.message) { + case WM_CREATE: + { + TRACE("WM_CREATE CB %p lParam %p\n",CallbackArgs, KMMsg.lParam); + break; + } case WM_SYSTIMER: { - ERR("WM_SYSTIMER %p\n",KMMsg.hwnd); - break; + TRACE("WM_SYSTIMER %p\n",KMMsg.hwnd); + break; } case WM_SIZING: {

1 0

[rnaumann] 69795: [SHORTCUTS] -show the proper icon for the explorer. spotted by Jared Smudde CORE-9240
by rnaumann＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: rnaumann Date: Tue Nov 3 17:47:25 2015 New Revision: 69795 URL: http://svn.reactos.org/svn/reactos?rev=69795&view=rev Log: [SHORTCUTS] -show the proper icon for the explorer. spotted by Jared Smudde CORE-9240 Modified: trunk/reactos/media/inf/shortcuts.inf Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Tue Nov 3 17:47:25 2015 @@ -18,7 +18,7 @@ %SystemRoot%\system32\rapps.exe, %RAPPS_TITLE_SHORT%, %RAPPS_DESC%, 0 [ProgramShortcuts] -%SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 0 +%SystemRoot%\explorer.exe, %EXPLORER_TITLE%, %EXPLORER_DESC%, 1 %SystemRoot%\system32\rapps.exe, %RAPPS_TITLE%, %RAPPS_DESC%, 0 [AdminToolsShortcuts]

1 0

[spetreolle] 69794: [USBUHCI] Too much DPRINT1 is too much. No code changes.
by spetreolle＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: spetreolle Date: Tue Nov 3 15:45:50 2015 New Revision: 69794 URL: http://svn.reactos.org/svn/reactos?rev=69794&view=rev Log: [USBUHCI] Too much DPRINT1 is too much. No code changes. Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Tue Nov 3 15:45:50 2015 @@ -166,7 +166,7 @@ NTSTATUS Status; ULONG BytesRead; - DPRINT1("CUSBHardwareDevice::Initialize\n"); + DPRINT("CUSBHardwareDevice::Initialize\n"); // // Create DMAMemoryManager for use with QueueHeads and Transfer Descriptors. @@ -252,7 +252,7 @@ DEVICE_DESCRIPTION DeviceDescription; NTSTATUS Status; - DPRINT1("CUSBHardwareDevice::PnpStart\n"); + DPRINT("CUSBHardwareDevice::PnpStart\n"); for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) { // @@ -296,7 +296,7 @@ // Store Resource base // m_Base = (PULONG)ResourceDescriptor->u.Port.Start.LowPart; //FIXME - DPRINT1("UHCI Base %p Length %x\n", m_Base, ResourceDescriptor->u.Port.Length); + DPRINT("UHCI Base %p Length %x\n", m_Base, ResourceDescriptor->u.Port.Length); break; } } @@ -380,7 +380,7 @@ // // Start the controller // - DPRINT1("Starting Controller\n"); + DPRINT("Starting Controller\n"); Status = StartController(); @@ -469,7 +469,7 @@ // // debug info // - DPRINT1("[USBUHCI] USBCMD: %x USBSTS %x\n", ReadRegister16(UHCI_USBCMD), ReadRegister16(UHCI_USBSTS)); + DPRINT("[USBUHCI] USBCMD: %x USBSTS %x\n", ReadRegister16(UHCI_USBCMD), ReadRegister16(UHCI_USBSTS)); // // Set the run bit in the command register @@ -487,7 +487,7 @@ // get controller status // Status = ReadRegister16(UHCI_USBSTS); - DPRINT1("[USBUHCI] Status %x\n", Status); + DPRINT("[USBUHCI] Status %x\n", Status); if (!(Status & UHCI_USBSTS_HCHALT)) { @@ -498,7 +498,7 @@ } } - DPRINT1("[USBUHCI] USBCMD: %x USBSTS %x\n", ReadRegister16(UHCI_USBCMD), ReadRegister16(UHCI_USBSTS)); + DPRINT("[USBUHCI] USBCMD: %x USBSTS %x\n", ReadRegister16(UHCI_USBCMD), ReadRegister16(UHCI_USBSTS)); if ((Status & UHCI_USBSTS_HCHALT)) @@ -529,13 +529,13 @@ WriteRegister16(UHCI_PORTSC1 + Index * 2, Status & ~(UHCI_PORTSC_STATCHA | UHCI_PORTSC_SUSPEND)); } - DPRINT1("[USBUHCI] Controller Started\n"); - DPRINT1("[USBUHCI] Controller Status %x\n", ReadRegister16(UHCI_USBSTS)); - DPRINT1("[USBUHCI] Controller Cmd Status %x\n", ReadRegister16(UHCI_USBCMD)); - DPRINT1("[USBUHCI] Controller Interrupt Status %x\n", ReadRegister16(UHCI_USBINTR)); - DPRINT1("[USBUHCI] Controller Frame %x\n", ReadRegister16(UHCI_FRNUM)); - DPRINT1("[USBUHCI] Controller Port Status 0 %x\n", ReadRegister16(UHCI_PORTSC1)); - DPRINT1("[USBUHCI] Controller Port Status 1 %x\n", ReadRegister16(UHCI_PORTSC1 + 2)); + DPRINT("[USBUHCI] Controller Started\n"); + DPRINT("[USBUHCI] Controller Status %x\n", ReadRegister16(UHCI_USBSTS)); + DPRINT("[USBUHCI] Controller Cmd Status %x\n", ReadRegister16(UHCI_USBCMD)); + DPRINT("[USBUHCI] Controller Interrupt Status %x\n", ReadRegister16(UHCI_USBINTR)); + DPRINT("[USBUHCI] Controller Frame %x\n", ReadRegister16(UHCI_FRNUM)); + DPRINT("[USBUHCI] Controller Port Status 0 %x\n", ReadRegister16(UHCI_PORTSC1)); + DPRINT("[USBUHCI] Controller Port Status 1 %x\n", ReadRegister16(UHCI_PORTSC1 + 2)); // queue timer @@ -570,7 +570,7 @@ // delay is 10 ms // Timeout.QuadPart = 10; - DPRINT1("Waiting %lu milliseconds for global reset\n", Timeout.LowPart); + DPRINT("Waiting %lu milliseconds for global reset\n", Timeout.LowPart); // // convert to 100 ns units (absolute) @@ -604,7 +604,7 @@ USHORT Value; PHYSICAL_ADDRESS Address; - DPRINT1("[USBUHCI] InitializeController\n"); + DPRINT("[USBUHCI] InitializeController\n"); // // now disable all interrupts @@ -632,15 +632,15 @@ // Value = 0; BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, PCI_LEGSUP, sizeof(USHORT)); - DPRINT1("[USBUHCI] LEGSUP %x\n", Value); + DPRINT("[USBUHCI] LEGSUP %x\n", Value); Value = PCI_LEGSUP_USBPIRQDEN; BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, PCI_LEGSUP, sizeof(USHORT)); - DPRINT1("[USBUHCI] Acquired ownership\n"); + DPRINT("[USBUHCI] Acquired ownership\n"); Value = 0; BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, 0x60, sizeof(UCHAR)); - DPRINT1("[USBUHCI] SBRN %x\n", Value); + DPRINT("[USBUHCI] SBRN %x\n", Value); // // perform global reset @@ -724,7 +724,7 @@ } } - DPRINT1("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", + DPRINT("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", 0, m_QueueHead[0], m_QueueHead[0]->LinkPhysical, @@ -732,7 +732,7 @@ m_QueueHead[0]->PhysicalAddress, m_QueueHead[0]->Request, m_QueueHead[0]->NextElementDescriptor); - DPRINT1("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", + DPRINT("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", 1, m_QueueHead[1], m_QueueHead[1]->LinkPhysical, @@ -741,7 +741,7 @@ m_QueueHead[1]->Request, m_QueueHead[1]->NextElementDescriptor); - DPRINT1("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", + DPRINT("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", 2, m_QueueHead[2], m_QueueHead[2]->LinkPhysical, @@ -749,7 +749,7 @@ m_QueueHead[2]->PhysicalAddress, m_QueueHead[2]->Request, m_QueueHead[2]->NextElementDescriptor); - DPRINT1("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", + DPRINT("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", 3, m_QueueHead[3], m_QueueHead[3]->LinkPhysical, @@ -757,7 +757,7 @@ m_QueueHead[3]->PhysicalAddress, m_QueueHead[3]->Request, m_QueueHead[3]->NextElementDescriptor); - DPRINT1("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", + DPRINT("Index %d QueueHead %p LinkPhysical %x ElementPhysical %x PhysicalAddress %x Request %p NextElementDescriptor %p\n", 4, m_QueueHead[4], m_QueueHead[4]->LinkPhysical, @@ -831,7 +831,7 @@ // WriteRegister16(UHCI_USBINTR, UHCI_USBINTR_CRC | UHCI_USBINTR_IOC| UHCI_USBINTR_SHORT); - DPRINT1("[USBUHCI] Controller initialized\n"); + DPRINT("[USBUHCI] Controller initialized\n"); return STATUS_SUCCESS; } @@ -857,7 +857,7 @@ // wait for the controller to stop while((ReadRegister16(UHCI_USBSTS) & UHCI_USBSTS_HCHALT) == 0) { - DPRINT1("[UHCI] Waiting for the controller to halt\n"); + DPRINT("[UHCI] Waiting for the controller to halt\n"); KeStallExecutionProcessor(10); } @@ -902,7 +902,7 @@ ULONG Index; LARGE_INTEGER Timeout; - DPRINT1("[UHCI] ResetPort Id %lu\n", PortIndex); + DPRINT("[UHCI] ResetPort Id %lu\n", PortIndex); // // sanity check @@ -935,7 +935,7 @@ // delay is 20 ms for port reset // Timeout.QuadPart = 20; - DPRINT1("Waiting %lu milliseconds for port reset\n", Timeout.LowPart); + DPRINT("Waiting %lu milliseconds for port reset\n", Timeout.LowPart); // // convert to 100 ns units (absolute) @@ -1012,7 +1012,7 @@ } m_PortResetChange |= (1 << PortIndex); - DPRINT1("[USBUhci] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); + DPRINT("[USBUHCI] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); // // is there a callback @@ -1158,7 +1158,7 @@ { ULONG PortRegister; - DPRINT1("[UHCI] SetPortFeature PortId %x Feature %x\n", PortId, Feature); + DPRINT("[UHCI] SetPortFeature PortId %x Feature %x\n", PortId, Feature); // // sanity check @@ -1268,7 +1268,7 @@ // error interrupt // Acknowledge |= UHCI_USBSTS_ERRINT; - DPRINT1("[UHCI] Error interrupt\n"); + DPRINT("[UHCI] Error interrupt\n"); } if (Status & UHCI_USBSTS_RESDET) @@ -1276,7 +1276,7 @@ // // resume detected // - DPRINT1("[UHCI] Resume detected\n"); + DPRINT("[UHCI] Resume detected\n"); Acknowledge |= UHCI_USBSTS_RESDET; } @@ -1285,7 +1285,7 @@ // // host system error // - DPRINT1("[UHCI] Host System Error\n"); + DPRINT("[UHCI] Host System Error\n"); Acknowledge |= UHCI_USBSTS_HOSTERR; } @@ -1294,7 +1294,7 @@ // // processing error // - DPRINT1("[UHCI] Process Error\n"); + DPRINT("[UHCI] Process Error\n"); Acknowledge |= UHCI_USBSTS_HCPRERR; } @@ -1303,7 +1303,7 @@ // // controller halted // - DPRINT1("[UHCI] Host controller halted\n"); + DPRINT("[UHCI] Host controller halted\n"); // // disable interrupts @@ -1346,7 +1346,7 @@ VOID CUSBHardwareDevice::WriteRegister16( - ULONG Register, + ULONG Register, USHORT Value) { WRITE_PORT_USHORT((PUSHORT)((ULONG)m_Base + Register), Value);

1 0

[jimtabor] 69793: [Win32SS] - Simplify and restructure thread send messages, use look aside list, message signals and global message link for sorting trouble messages. - See CORE-9210 for more info...
by jimtabor＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: jimtabor Date: Tue Nov 3 15:18:51 2015 New Revision: 69793 URL: http://svn.reactos.org/svn/reactos?rev=69793&view=rev Log: [Win32SS] - Simplify and restructure thread send messages, use look aside list, message signals and global message link for sorting trouble messages. - See CORE-9210 for more information. Related to and fixed CORE-9718 and CORE-9975. Could have fixed CORE-9695. Modified: trunk/reactos/win32ss/user/ntuser/callback.c trunk/reactos/win32ss/user/ntuser/focus.c trunk/reactos/win32ss/user/ntuser/main.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/ntuser/win32.h 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] Tue Nov 3 15:18:51 2015 @@ -51,12 +51,18 @@ PINT_CALLBACK_HEADER Mem; PTHREADINFO W32Thread; - ASSERT(Data); - - Mem = ((PINT_CALLBACK_HEADER)Data - 1); - W32Thread = PsGetCurrentThreadWin32Thread(); ASSERT(W32Thread); + + if (W32Thread->TIF_flags & TIF_INCLEANUP) + { + ERR("CbFM Thread is already in cleanup\n"); + return; + } + + ASSERT(Data); + + Mem = ((PINT_CALLBACK_HEADER)Data - 1); /* Remove the memory block from the thread's callback list */ RemoveEntryList(&Mem->ListEntry); @@ -340,8 +346,9 @@ &ResultLength); if (!NT_SUCCESS(Status)) { + ERR("Error Callback to User space Status %lx\n",Status); UserEnterCo(); - return -1; + return 0; } _SEH2_TRY Modified: trunk/reactos/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Tue Nov 3 15:18:51 2015 @@ -340,7 +340,13 @@ WARN("ASYNC SAW: Found one in the Sent Msg Queue! %p Activate/Deactivate %d\n", Message->Msg.hwnd, !!wParam); RemoveEntryList(&Message->ListEntry); // Purge the entry. ClearMsgBitsMask(pti, Message->QS_Flags); - ExFreePoolWithTag(Message, TAG_USRMSG); + InsertTailList(&usmList, &Message->ListEntry); + /* Notify the sender. */ + if (Message->pkCompletionEvent != NULL) + { + KeSetEvent(Message->pkCompletionEvent, IO_NO_INCREMENT, FALSE); + } + FreeUserMessage(Message); } } } @@ -929,7 +935,7 @@ { if (Window->head.pti->MessageQueue != ThreadQueue) { - ERR("Window Thread dos not match Current!\n"); + ERR("Window Thread does not match Current!\n"); return NULL; } } Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Tue Nov 3 15:18:51 2015 @@ -488,8 +488,6 @@ InitializeListHead(&ptiCurrent->W32CallbackListHead); InitializeListHead(&ptiCurrent->PostedMessagesListHead); InitializeListHead(&ptiCurrent->SentMessagesListHead); - InitializeListHead(&ptiCurrent->DispatchingMessagesHead); - InitializeListHead(&ptiCurrent->LocalDispatchingMessagesHead); InitializeListHead(&ptiCurrent->PtiLink); for (i = 0; i < NB_HOOKS; i++) { @@ -776,6 +774,12 @@ psle = PopEntryList(&ptiCurrent->ReferencesList); } + } + + if (ptiCurrent->cEnterCount) + { + KeSetKernelStackSwapEnable(TRUE); + ptiCurrent->cEnterCount = 0; } /* Find the THREADINFO in the PROCESSINFO's list */ 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] Tue Nov 3 15:18:51 2015 @@ -1278,7 +1278,7 @@ LPARAM lParam ) { ULONG_PTR Result = 0; - if(co_IntSendMessageTimeout(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) + if (co_IntSendMessageTimeout(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result)) { return (LRESULT)Result; } @@ -1399,7 +1399,7 @@ wParam, lParamPacked, lParamBufferSize ); - if(uResult) + if (uResult) { *uResult = Result; } @@ -1697,7 +1697,7 @@ RETURN(TRUE); } - if(!(Message = ExAllocatePoolWithTag(NonPagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) + if(!(Message = AllocateUserMessage(FALSE))) { ERR("MsqSendMessage(): Not enough memory to allocate a message"); RETURN( FALSE); @@ -1707,19 +1707,18 @@ Message->Msg.message = Msg; Message->Msg.wParam = wParam; Message->Msg.lParam = lParamPacked; - Message->CompletionEvent = NULL; - Message->Result = 0; + Message->pkCompletionEvent = NULL; // No event needed. Message->lResult = 0; Message->QS_Flags = 0; Message->ptiReceiver = ptiSendTo; Message->ptiSender = NULL; // mjmartin, you are right! This is null. Message->ptiCallBackSender = Win32Thread; - InitializeListHead(&Message->DispatchingListEntry); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = MSQ_NORMAL; Message->HasPackedLParam = (lParamBufferSize > 0); Message->QS_Flags = QS_SENDMESSAGE; + Message->flags = SMF_RECEIVERFREE; if (Msg & 0x80000000) // Higher priority event message! InsertHeadList(&ptiSendTo->SentMessagesListHead, &Message->ListEntry); @@ -2723,14 +2722,15 @@ break; case FNID_SENDMESSAGE: { - Ret = co_IntDoSendMessage(hWnd, Msg, wParam, lParam, 0); + lResult = co_IntDoSendMessage(hWnd, Msg, wParam, lParam, 0); + Ret = TRUE; if (ResultInfo) { _SEH2_TRY { ProbeForWrite((PVOID)ResultInfo, sizeof(ULONG_PTR), 1); - RtlCopyMemory((PVOID)ResultInfo, &Ret, sizeof(ULONG_PTR)); + RtlCopyMemory((PVOID)ResultInfo, &lResult, sizeof(ULONG_PTR)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { 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] Tue Nov 3 15:18:51 2015 @@ -14,10 +14,12 @@ /* GLOBALS *******************************************************************/ static PPAGED_LOOKASIDE_LIST pgMessageLookasideList; +static PPAGED_LOOKASIDE_LIST pgSendMsgLookasideList; +INT SendMsgCount = 0; PUSER_MESSAGE_QUEUE gpqCursor; ULONG_PTR gdwMouseMoveExtraInfo = 0; DWORD gdwMouseMoveTimeStamp = 0; - +LIST_ENTRY usmList; /* FUNCTIONS *****************************************************************/ @@ -26,6 +28,7 @@ NTAPI MsqInitializeImpl(VOID) { + // Setup Post Messages pgMessageLookasideList = ExAllocatePoolWithTag(NonPagedPool, sizeof(PAGED_LOOKASIDE_LIST), TAG_USRMSG); if (!pgMessageLookasideList) return STATUS_NO_MEMORY; @@ -36,6 +39,19 @@ sizeof(USER_MESSAGE), TAG_USRMSG, 256); + // Setup Send Messages + pgSendMsgLookasideList = ExAllocatePoolWithTag(NonPagedPool, sizeof(PAGED_LOOKASIDE_LIST), TAG_USRMSG); + if (!pgSendMsgLookasideList) + return STATUS_NO_MEMORY; + ExInitializePagedLookasideList(pgSendMsgLookasideList, + NULL, + NULL, + 0, + sizeof(USER_SENT_MESSAGE), + TAG_USRMSG, + 16); + + InitializeListHead(&usmList); return(STATUS_SUCCESS); } @@ -743,6 +759,115 @@ ExFreeToPagedLookasideList(pgMessageLookasideList, Message); } +PUSER_SENT_MESSAGE FASTCALL +AllocateUserMessage(BOOL KEvent) +{ + PUSER_SENT_MESSAGE Message; + + if(!(Message = ExAllocateFromPagedLookasideList(pgSendMsgLookasideList))) + { + ERR("AllocateUserMessage(): Not enough memory to allocate a message"); + return NULL; + } + RtlZeroMemory(Message, sizeof(USER_SENT_MESSAGE)); + + if (KEvent) + { + Message->pkCompletionEvent = &Message->CompletionEvent;; + + KeInitializeEvent(Message->pkCompletionEvent, NotificationEvent, FALSE); + } + SendMsgCount++; + //ERR("AUM pti %p msg %p\n",PsGetCurrentThreadWin32Thread(),Message); + return Message; +} + +VOID FASTCALL +FreeUserMessage(PUSER_SENT_MESSAGE Message) +{ + Message->pkCompletionEvent = NULL; + + /* Remove it from the list */ + RemoveEntryList(&Message->ListEntry); + + ExFreeToPagedLookasideList(pgMessageLookasideList, Message); + SendMsgCount--; +} + +VOID APIENTRY +MsqRemoveWindowMessagesFromQueue(PWND Window) +{ + PTHREADINFO pti; + PUSER_SENT_MESSAGE SentMessage; + PUSER_MESSAGE PostedMessage; + PLIST_ENTRY CurrentEntry, ListHead; + + ASSERT(Window); + + pti = Window->head.pti; + + /* remove the posted messages for this window */ + CurrentEntry = pti->PostedMessagesListHead.Flink; + ListHead = &pti->PostedMessagesListHead; + while (CurrentEntry != ListHead) + { + PostedMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, 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); + CurrentEntry = pti->PostedMessagesListHead.Flink; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } + } + + /* remove the sent messages for this window */ + CurrentEntry = pti->SentMessagesListHead.Flink; + ListHead = &pti->SentMessagesListHead; + while (CurrentEntry != ListHead) + { + SentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + + if(SentMessage->Msg.hwnd == Window->head.h) + { + TRACE("Remove Window Messages From Sent Queue\n"); + + ClearMsgBitsMask(pti, SentMessage->QS_Flags); + + /* wake the sender's thread */ + if (SentMessage->pkCompletionEvent != NULL) + { + KeSetEvent(SentMessage->pkCompletionEvent, IO_NO_INCREMENT, FALSE); + } + + if (SentMessage->HasPackedLParam) + { + if (SentMessage->Msg.lParam) + ExFreePool((PVOID)SentMessage->Msg.lParam); + } + + /* free the message */ + FreeUserMessage(SentMessage); + + CurrentEntry = pti->SentMessagesListHead.Flink; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } + } +} + BOOLEAN FASTCALL co_MsqDispatchOneSentMessage( _In_ PTHREADINFO pti) @@ -762,6 +887,9 @@ /* remove it from the list of pending messages */ Entry = RemoveHeadList(&pti->SentMessagesListHead); Message = CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry); + + // Signal this message is being processed. + Message->flags |= SMF_RECEIVERBUSY|SMF_RECEIVEDMESSAGE; SaveMsg = pti->pusmCurrent; pti->pusmCurrent = Message; @@ -773,15 +901,14 @@ pti->pcti->CTI_flags |= CTI_INSENDMESSAGE; // Let the user know... } - /* insert it to the list of messages that are currently dispatched by this - message queue */ - InsertTailList(&pti->LocalDispatchingMessagesHead, &Message->ListEntry); + /* Now insert it to the global list of messages that can be removed Justin Case there's Trouble */ + InsertTailList(&usmList, &Message->ListEntry); ClearMsgBitsMask(pti, Message->QS_Flags); if (Message->HookMessage == MSQ_ISHOOK) { // Direct Hook Call processor - Result = co_CallHook( Message->Msg.message, // HookId + Result = co_CallHook( Message->Msg.message, // HookId (INT)(INT_PTR)Message->Msg.hwnd, // Code Message->Msg.wParam, Message->Msg.lParam); @@ -810,7 +937,9 @@ /* The message has not been processed yet, reinsert it. */ RemoveEntryList(&Message->ListEntry); InsertTailList(&Message->ptiCallBackSender->SentMessagesListHead, &Message->ListEntry); - TRACE("Callback Message not processed yet. Requeuing the message\n"); + // List is occupied need to set the bit. + MsqWakeQueue(Message->ptiCallBackSender, QS_SENDMESSAGE, TRUE); + ERR("Callback Message not processed yet. Requeuing the message\n"); //// <---- Need to see if this happens. Ret = FALSE; goto Exit; } @@ -823,10 +952,6 @@ Message->Msg.lParam); } - /* remove the message from the local dispatching list, because it doesn't need - to be cleaned up on thread termination anymore */ - RemoveEntryList(&Message->ListEntry); - /* If the message is a callback, insert it in the callback senders MessageQueue */ if (Message->CompletionCallback) { @@ -836,6 +961,7 @@ Message->QS_Flags |= QS_SMRESULT; /* insert it in the callers message queue */ + RemoveEntryList(&Message->ListEntry); InsertTailList(&Message->ptiCallBackSender->SentMessagesListHead, &Message->ListEntry); MsqWakeQueue(Message->ptiCallBackSender, QS_SENDMESSAGE, TRUE); } @@ -843,29 +969,14 @@ goto Exit; } - /* remove the message from the dispatching list if needed, so lock the sender's message queue */ - if (Message->ptiSender && !(Message->ptiSender->TIF_flags & TIF_INCLEANUP)) - { - if (!IsListEmpty(&Message->DispatchingListEntry)) - { - /* only remove it from the dispatching list if not already removed by a timeout */ - RemoveEntryList(&Message->DispatchingListEntry); - InitializeListHead(&Message->DispatchingListEntry); - } - } - - /* still keep the sender's message queue locked, so the sender can't exit the - MsqSendMessage() function (if timed out) */ + // Retrieve the result from callback. if (Message->QS_Flags & QS_SMRESULT) { Result = Message->lResult; } /* Let the sender know the result. */ - if (Message->Result != NULL) - { - *Message->Result = Result; - } + Message->lResult = Result; if (Message->HasPackedLParam) { @@ -873,14 +984,22 @@ ExFreePool((PVOID)Message->Msg.lParam); } + // Clear busy signal. + Message->flags &= ~SMF_RECEIVERBUSY; + /* Notify the sender. */ - if (Message->CompletionEvent != NULL) - { - KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); + if (Message->pkCompletionEvent != NULL) + { + KeSetEvent(Message->pkCompletionEvent, IO_NO_INCREMENT, FALSE); } /* free the message */ - ExFreePoolWithTag(Message, TAG_USRMSG); + if (Message->flags & SMF_RECEIVERFREE) + { + TRACE("Receiver Freeing Message %p\n",Message); + FreeUserMessage(Message); + } + Ret = TRUE; Exit: /* do not hangup on the user if this is reentering */ @@ -888,89 +1007,6 @@ pti->pusmCurrent = SaveMsg; return Ret; -} - -VOID APIENTRY -MsqRemoveWindowMessagesFromQueue(PWND Window) -{ - PTHREADINFO pti; - PUSER_SENT_MESSAGE SentMessage; - PUSER_MESSAGE PostedMessage; - PLIST_ENTRY CurrentEntry, ListHead; - - ASSERT(Window); - - pti = Window->head.pti; - - /* remove the posted messages for this window */ - CurrentEntry = pti->PostedMessagesListHead.Flink; - ListHead = &pti->PostedMessagesListHead; - while (CurrentEntry != ListHead) - { - PostedMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, - 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); - CurrentEntry = pti->PostedMessagesListHead.Flink; - } - else - { - CurrentEntry = CurrentEntry->Flink; - } - } - - /* remove the sent messages for this window */ - CurrentEntry = pti->SentMessagesListHead.Flink; - ListHead = &pti->SentMessagesListHead; - while (CurrentEntry != ListHead) - { - 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"); - - RemoveEntryList(&SentMessage->ListEntry); - ClearMsgBitsMask(pti, SentMessage->QS_Flags); - - /* Only if the message has a sender was the queue referenced */ - if ((SentMessage->ptiSender) && - (!IsListEmpty(&SentMessage->DispatchingListEntry))) - { - RemoveEntryList(&SentMessage->DispatchingListEntry); - InitializeListHead(&SentMessage->DispatchingListEntry); - } - - /* wake the sender's thread */ - if (SentMessage->CompletionEvent != NULL) - { - KeSetEvent(SentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); - } - - if (SentMessage->HasPackedLParam) - { - if (SentMessage->Msg.lParam) - ExFreePool((PVOID)SentMessage->Msg.lParam); - } - - /* free the message */ - ExFreePoolWithTag(SentMessage, TAG_USRMSG); - - CurrentEntry = pti->SentMessagesListHead.Flink; - } - else - { - CurrentEntry = CurrentEntry->Flink; - } - } } BOOL FASTCALL @@ -988,9 +1024,9 @@ PTHREADINFO ptiSender; PUSER_SENT_MESSAGE Message; - if(!(Message = ExAllocatePoolWithTag(NonPagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) - { - ERR("MsqSendMessage(): Not enough memory to allocate a message"); + if(!(Message = AllocateUserMessage(FALSE))) + { + ERR("MsqSendMessageAsync(): Not enough memory to allocate a message"); return FALSE; } @@ -1000,18 +1036,15 @@ Message->Msg.message = Msg; Message->Msg.wParam = wParam; Message->Msg.lParam = lParam; - Message->CompletionEvent = NULL; - Message->Result = 0; - Message->lResult = 0; + Message->pkCompletionEvent = NULL; // No event needed. Message->ptiReceiver = ptiReceiver; - Message->ptiSender = NULL; Message->ptiCallBackSender = ptiSender; - InitializeListHead(&Message->DispatchingListEntry); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = HookMessage; Message->HasPackedLParam = HasPackedLParam; Message->QS_Flags = QS_SENDMESSAGE; + Message->flags = SMF_RECEIVERFREE; InsertTailList(&ptiReceiver->SentMessagesListHead, &Message->ListEntry); MsqWakeQueue(ptiReceiver, QS_SENDMESSAGE, TRUE); @@ -1031,12 +1064,12 @@ ULONG_PTR *uResult) { PTHREADINFO pti; - PUSER_SENT_MESSAGE Message; - KEVENT CompletionEvent; + PUSER_SENT_MESSAGE SaveMsg, Message; NTSTATUS WaitStatus; LARGE_INTEGER Timeout; PLIST_ENTRY Entry; PWND pWnd; + BOOLEAN SwapStateEnabled; LRESULT Result = 0; //// Result could be trashed. //// pti = PsGetCurrentThreadWin32Thread(); @@ -1105,57 +1138,57 @@ } } - if(!(Message = ExAllocatePoolWithTag(PagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) + if(!(Message = AllocateUserMessage(TRUE))) { ERR("MsqSendMessage(): Not enough memory to allocate a message\n"); + if (uResult) *uResult = -1; return STATUS_INSUFFICIENT_RESOURCES; } - - KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); Timeout.QuadPart = Int32x32To64(-10000,uTimeout); // Pass SMTO test with a TO of 0x80000000. TRACE("Timeout val %lld\n",Timeout.QuadPart) - - /* FIXME: Increase reference counter of sender's message queue here */ Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; Message->Msg.wParam = wParam; Message->Msg.lParam = lParam; - Message->CompletionEvent = &CompletionEvent; - Message->Result = &Result; - Message->lResult = 0; - Message->QS_Flags = 0; Message->ptiReceiver = ptirec; Message->ptiSender = pti; - Message->ptiCallBackSender = NULL; - Message->CompletionCallback = NULL; - Message->CompletionCallbackContext = 0; Message->HookMessage = HookMessage; - Message->HasPackedLParam = FALSE; - - /* Add it to the list of pending messages */ - InsertTailList(&pti->DispatchingMessagesHead, &Message->DispatchingListEntry); + Message->QS_Flags = QS_SENDMESSAGE; + + SaveMsg = pti->pusmSent; + pti->pusmSent = Message; /* Queue it in the destination's message queue */ InsertTailList(&ptirec->SentMessagesListHead, &Message->ListEntry); - Message->QS_Flags = QS_SENDMESSAGE; MsqWakeQueue(ptirec, QS_SENDMESSAGE, TRUE); - /* We can't access the Message anymore since it could have already been deleted! */ + // First time in, turn off swapping of the stack. + if (pti->cEnterCount == 0) + { + SwapStateEnabled = KeSetKernelStackSwapEnable(FALSE); + } + pti->cEnterCount++; if (Block) { PVOID WaitObjects[2]; - WaitObjects[0] = &CompletionEvent; // Wait 0 - WaitObjects[1] = ptirec->pEThread; // Wait 1 + WaitObjects[0] = Message->pkCompletionEvent; // Wait 0 + WaitObjects[1] = ptirec->pEThread; // Wait 1 UserLeaveCo(); - WaitStatus = KeWaitForMultipleObjects(2, WaitObjects, WaitAny, UserRequest, - UserMode, FALSE, (uTimeout ? &Timeout : NULL), NULL); + WaitStatus = KeWaitForMultipleObjects( 2, + WaitObjects, + WaitAny, + UserRequest, + UserMode, + FALSE, + (uTimeout ? &Timeout : NULL), + NULL ); UserEnterCo(); @@ -1168,39 +1201,24 @@ { if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry) == Message) { - /* We can access Message here, it's secure because the message queue is locked - and the message is still hasn't been dispatched */ - Message->CompletionEvent = NULL; - Message->Result = NULL; + Message->pkCompletionEvent = NULL; RemoveEntryList(&Message->ListEntry); - RemoveEntryList(&Message->DispatchingListEntry); ClearMsgBitsMask(ptirec, Message->QS_Flags); - ExFreePoolWithTag(Message, TAG_USRMSG); + InsertTailList(&usmList, &Message->ListEntry); break; } Entry = Entry->Flink; } - TRACE("MsqSendMessage (blocked) timed out 1 Status %lx\n", WaitStatus); + ERR("MsqSendMessage (blocked) timed out 1 Status %lx\n", WaitStatus); } // Receiving thread passed on and left us hanging with issues still pending. else if (WaitStatus == STATUS_WAIT_1) { ERR("Bk Receiving Thread woken up dead!\n"); - Entry = pti->DispatchingMessagesHead.Flink; - while (Entry != &pti->DispatchingMessagesHead) - { - if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) == Message) - { - Message->CompletionEvent = NULL; - Message->Result = NULL; - RemoveEntryList(&Message->DispatchingListEntry); - InitializeListHead(&Message->DispatchingListEntry); - break; - } - Entry = Entry->Flink; - } + Message->flags |= SMF_RECEIVERDIED; } + while (co_MsqDispatchOneSentMessage(pti)) ; } @@ -1208,16 +1226,22 @@ { PVOID WaitObjects[3]; - WaitObjects[0] = &CompletionEvent; // Wait 0 - WaitObjects[1] = pti->pEventQueueServer; // Wait 1 - WaitObjects[2] = ptirec->pEThread; // Wait 2 + WaitObjects[0] = Message->pkCompletionEvent; // Wait 0 + WaitObjects[1] = pti->pEventQueueServer; // Wait 1 + WaitObjects[2] = ptirec->pEThread; // Wait 2 do { UserLeaveCo(); - WaitStatus = KeWaitForMultipleObjects(3, WaitObjects, WaitAny, UserRequest, - UserMode, FALSE, (uTimeout ? &Timeout : NULL), NULL); + WaitStatus = KeWaitForMultipleObjects( 3, + WaitObjects, + WaitAny, + UserRequest, + UserMode, + FALSE, + (uTimeout ? &Timeout : NULL), + NULL); UserEnterCo(); @@ -1230,41 +1254,23 @@ { if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, ListEntry) == Message) { - /* We can access Message here, it's secure because the message queue is locked - and the message is still hasn't been dispatched */ - Message->CompletionEvent = NULL; - Message->Result = NULL; + Message->pkCompletionEvent = NULL; RemoveEntryList(&Message->ListEntry); - RemoveEntryList(&Message->DispatchingListEntry); - InitializeListHead(&Message->DispatchingListEntry); ClearMsgBitsMask(ptirec, Message->QS_Flags); - ExFreePoolWithTag(Message, TAG_USRMSG); + InsertTailList(&usmList, &Message->ListEntry); break; } Entry = Entry->Flink; } - TRACE("MsqSendMessage timed out 2 Status %lx\n", WaitStatus); - + ERR("MsqSendMessage timed out 2 Status %lx\n", WaitStatus); break; } // Receiving thread passed on and left us hanging with issues still pending. else if (WaitStatus == STATUS_WAIT_2) { ERR("NB Receiving Thread woken up dead!\n"); - Entry = pti->DispatchingMessagesHead.Flink; - while (Entry != &pti->DispatchingMessagesHead) - { - if (CONTAINING_RECORD(Entry, USER_SENT_MESSAGE, DispatchingListEntry) == Message) - { - Message->CompletionEvent = NULL; - Message->Result = NULL; - RemoveEntryList(&Message->DispatchingListEntry); - InitializeListHead(&Message->DispatchingListEntry); - break; - } - Entry = Entry->Flink; - } + Message->flags |= SMF_RECEIVERDIED; break; } @@ -1275,19 +1281,52 @@ } while (WaitStatus == STATUS_WAIT_1); } + // Count is nil, restore swapping of the stack. + if (--pti->cEnterCount == 0 ) + { + KeSetKernelStackSwapEnable(SwapStateEnabled); + } + + // Handle User APC if (WaitStatus == STATUS_USER_APC) { // The current thread is dying! TRACE("User APC\n"); + + // The Message will be on the Trouble list until Thread cleanup. + Message->flags |= SMF_SENDERDIED; + co_IntDeliverUserAPC(); ERR("User APC Returned\n"); // Should not see this message. } + // Force this thread to wake up for the next go around. + KeSetEvent(pti->pEventQueueServer, IO_NO_INCREMENT, FALSE); + + Result = Message->lResult; + + // Determine whether this message is being processed or not. + if ((Message->flags & (SMF_RECEIVERBUSY|SMF_RECEIVEDMESSAGE)) != SMF_RECEIVEDMESSAGE) + { + Message->flags |= SMF_RECEIVERFREE; + } + + if (!(Message->flags & SMF_RECEIVERFREE)) + { + TRACE("Sender Freeing Message %p ptirec %p bit %d list empty %d\n",Message,ptirec,!!(ptirec->pcti->fsChangeBits & QS_SENDMESSAGE),IsListEmpty(&ptirec->SentMessagesListHead)); + // Make it to this point, the message was received. + FreeUserMessage(Message); + } + + pti->pusmSent = SaveMsg; + + TRACE("MSM Allocation Count %d Status %lx Result %d\n",SendMsgCount,WaitStatus,Result); + if (WaitStatus != STATUS_TIMEOUT) { if (uResult) { - *uResult = (STATUS_WAIT_0 == WaitStatus ? Result : -1); + *uResult = (STATUS_WAIT_0 == WaitStatus ? Result : 0); } } @@ -2104,6 +2143,23 @@ PUSER_MESSAGE CurrentMessage; PUSER_SENT_MESSAGE CurrentSentMessage; + TRACE("MsqCleanupThreadMsgs %p\n",pti); + + // Clear it all out. + if (pti->pcti) + { + pti->pcti->fsWakeBits = 0; + pti->pcti->fsChangeBits = 0; + } + + pti->nCntsQBits[QSRosKey] = 0; + pti->nCntsQBits[QSRosMouseMove] = 0; + pti->nCntsQBits[QSRosMouseButton] = 0; + pti->nCntsQBits[QSRosPostMessage] = 0; + pti->nCntsQBits[QSRosSendMessage] = 0; + pti->nCntsQBits[QSRosHotKey] = 0; + pti->nCntsQBits[QSRosEvent] = 0; + /* cleanup posted messages */ while (!IsListEmpty(&pti->PostedMessagesListHead)) { @@ -2122,22 +2178,15 @@ /* remove the messages that have not yet been dispatched */ while (!IsListEmpty(&pti->SentMessagesListHead)) { - CurrentEntry = RemoveHeadList(&pti->SentMessagesListHead); + CurrentEntry = pti->SentMessagesListHead.Flink; 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 */ - if ((CurrentSentMessage->ptiSender) && - (!IsListEmpty(&CurrentSentMessage->DispatchingListEntry))) + ERR("Thread Cleanup Sent Messages\n"); + + /* wake the sender's thread */ + if (CurrentSentMessage->pkCompletionEvent != NULL) { - RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); - InitializeListHead(&CurrentSentMessage->DispatchingListEntry); - } - - /* wake the sender's thread */ - if (CurrentSentMessage->CompletionEvent != NULL) - { - KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); + KeSetEvent(CurrentSentMessage->pkCompletionEvent, IO_NO_INCREMENT, FALSE); } if (CurrentSentMessage->HasPackedLParam) @@ -2147,71 +2196,49 @@ } /* free the message */ - ExFreePool(CurrentSentMessage); - } - - /* notify senders of dispatching messages. This needs to be cleaned up if e.g. - ExitThread() was called in a SendMessage() umode callback */ - while (!IsListEmpty(&pti->LocalDispatchingMessagesHead)) - { - CurrentEntry = RemoveHeadList(&pti->LocalDispatchingMessagesHead); - CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); - - /* remove the message from the dispatching list */ - if (!IsListEmpty(&CurrentSentMessage->DispatchingListEntry)) + FreeUserMessage(CurrentSentMessage); + } + + // Process Trouble Message List + if (!IsListEmpty(&usmList)) + { + CurrentEntry = usmList.Flink; + while (CurrentEntry != &usmList) { - RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); - InitializeListHead(&CurrentSentMessage->DispatchingListEntry); - } - - TRACE("Notify the sender, the thread has been terminated while dispatching a message!\n"); - - /* wake the sender's thread */ - if (CurrentSentMessage->CompletionEvent != NULL) - { - KeSetEvent(CurrentSentMessage->CompletionEvent, IO_NO_INCREMENT, FALSE); - } - - if (CurrentSentMessage->HasPackedLParam) - { - if (CurrentSentMessage->Msg.lParam) + CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + CurrentEntry = CurrentEntry->Flink; + + TRACE("Found troubled messages on the list\n"); + + if ( pti == CurrentSentMessage->ptiReceiver ) { - _PRAGMA_WARNING_SUPPRESS(__WARNING_USING_UNINIT_VAR); - ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); + if (CurrentSentMessage->HasPackedLParam) + { + if (CurrentSentMessage->Msg.lParam) + ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); + } + + /* free the message */ + FreeUserMessage(CurrentSentMessage); + } + else if ( pti == CurrentSentMessage->ptiSender || + pti == CurrentSentMessage->ptiCallBackSender ) + { + if (!(CurrentSentMessage->flags & SMF_RECEIVERFREE)) + { + + if (CurrentSentMessage->HasPackedLParam) + { + if (CurrentSentMessage->Msg.lParam) + ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); + } + + /* free the message */ + FreeUserMessage(CurrentSentMessage); + } } } - - /* free the message */ - ExFreePool(CurrentSentMessage); - } - - /* tell other threads not to bother returning any info to us */ - while (! IsListEmpty(&pti->DispatchingMessagesHead)) - { - CurrentEntry = RemoveHeadList(&pti->DispatchingMessagesHead); - CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, DispatchingListEntry); - InitializeListHead(&CurrentSentMessage->DispatchingListEntry); - CurrentSentMessage->CompletionEvent = NULL; - CurrentSentMessage->Result = NULL; - - /* do NOT dereference our message queue as it might get attempted to be - locked later */ - } - - // Clear it all out. - if (pti->pcti) - { - pti->pcti->fsWakeBits = 0; - pti->pcti->fsChangeBits = 0; - } - - pti->nCntsQBits[QSRosKey] = 0; - pti->nCntsQBits[QSRosMouseMove] = 0; - pti->nCntsQBits[QSRosMouseButton] = 0; - pti->nCntsQBits[QSRosPostMessage] = 0; - pti->nCntsQBits[QSRosSendMessage] = 0; - pti->nCntsQBits[QSRosHotKey] = 0; - pti->nCntsQBits[QSRosEvent] = 0; + } } VOID FASTCALL @@ -2364,7 +2391,7 @@ if (Message->QS_Flags & QS_SMRESULT) return FALSE; - // SendMessageXxx || Callback msg and not a notify msg + // SendMessageXxx || Callback msg and not a notify msg if (Message->ptiSender || Message->CompletionCallback) { Message->lResult = lResult; 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] Tue Nov 3 15:18:51 2015 @@ -22,19 +22,24 @@ LIST_ENTRY ListEntry; MSG Msg; DWORD QS_Flags; // Original QS bits used to create this message. - PKEVENT CompletionEvent; - LRESULT* Result; + PKEVENT pkCompletionEvent; LRESULT lResult; + DWORD flags; PTHREADINFO ptiSender; PTHREADINFO ptiReceiver; SENDASYNCPROC CompletionCallback; PTHREADINFO ptiCallBackSender; ULONG_PTR CompletionCallbackContext; - /* entry in the dispatching list of the sender's message queue */ - LIST_ENTRY DispatchingListEntry; INT HookMessage; BOOL HasPackedLParam; + KEVENT CompletionEvent; } USER_SENT_MESSAGE, *PUSER_SENT_MESSAGE; + +#define SMF_RECEIVERDIED 0x00000002 +#define SMF_SENDERDIED 0x00000004 +#define SMF_RECEIVERFREE 0x00000008 +#define SMF_RECEIVEDMESSAGE 0x00000010 +#define SMF_RECEIVERBUSY 0x00004000 typedef struct _USER_MESSAGE_QUEUE { @@ -116,6 +121,8 @@ }; #define POSTEVENT_NWE 14 + +extern LIST_ENTRY usmList; BOOL FASTCALL MsqIsHung(PTHREADINFO pti); VOID CALLBACK HungAppSysTimerProc(HWND,UINT,UINT_PTR,DWORD); @@ -252,6 +259,9 @@ BOOL FASTCALL IntCallMsgFilter(LPMSG,INT); WPARAM FASTCALL MsqGetDownKeyState(PUSER_MESSAGE_QUEUE); BOOL FASTCALL IsThreadSuspended(PTHREADINFO); +PUSER_SENT_MESSAGE FASTCALL AllocateUserMessage(BOOL); +VOID FASTCALL FreeUserMessage(PUSER_SENT_MESSAGE); + int UserShowCursor(BOOL bShow); PCURICON_OBJECT Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Tue Nov 3 15:18:51 2015 @@ -93,8 +93,7 @@ struct _CLIENTINFO * pClientInfo; FLONG TIF_flags; PUNICODE_STRING pstrAppName; - /* Messages that are currently dispatched to other threads */ - LIST_ENTRY DispatchingMessagesHead; // psmsSent + struct _USER_SENT_MESSAGE *pusmSent; struct _USER_SENT_MESSAGE *pusmCurrent; /* Queue of messages sent to the queue. */ LIST_ENTRY SentMessagesListHead; // psmsReceiveList @@ -127,6 +126,7 @@ INT iCursorLevel; POINT ptLast; + INT cEnterCount; /* Queue of messages posted to the queue. */ LIST_ENTRY PostedMessagesListHead; // mlPost WORD fsChangeBitsRemoved; @@ -146,8 +146,6 @@ // Accounting of queue bit sets, the rest are flags. QS_TIMER QS_PAINT counts are handled in thread information. DWORD nCntsQBits[QSIDCOUNTS]; // QS_KEY QS_MOUSEMOVE QS_MOUSEBUTTON QS_POSTMESSAGE QS_SENDMESSAGE QS_HOTKEY - /* Messages that are currently dispatched by this message queue, required for cleanup */ - LIST_ENTRY LocalDispatchingMessagesHead; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; SINGLE_LIST_ENTRY ReferencesList;

1 0

[tfaber] 69792: [BROWSEUI] - IEnumString::Next's pceltFetched parameter is not optional, so provide it. Fixes exception when using Emerge Desktop
by tfaber＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: tfaber Date: Tue Nov 3 12:31:09 2015 New Revision: 69792 URL: http://svn.reactos.org/svn/reactos?rev=69792&view=rev Log: [BROWSEUI] - IEnumString::Next's pceltFetched parameter is not optional, so provide it. Fixes exception when using Emerge Desktop Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CAutoCo… ============================================================================== --- trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] Tue Nov 3 12:31:09 2015 @@ -262,6 +262,7 @@ RECT r; BOOL control, filled, displayall = FALSE; int cpt, height, sel; + ULONG fetched; if (!pThis->enabled) { @@ -429,7 +430,7 @@ for(cpt = 0;;) { - hr = pThis->enumstr->Next(1, &strs, NULL); + hr = pThis->enumstr->Next(1, &strs, &fetched); if (hr != S_OK) break;

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