Ros-diffs November 2015

ros-diffs@reactos.org

14 participants
457 discussions

[fireball] 69804: [ARWINSS] - win32k: Properly check for the right USER version in NtUserInitialize. Now Arwinss doesn't stop loading so early in the boot process.
by fireball＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: fireball Date: Tue Nov 3 21:51:31 2015 New Revision: 69804 URL: http://svn.reactos.org/svn/reactos?rev=69804&view=rev Log: [ARWINSS] - win32k: Properly check for the right USER version in NtUserInitialize. Now Arwinss doesn't stop loading so early in the boot process. Modified: branches/arwinss/arwinss/server/main/init.c Modified: branches/arwinss/arwinss/server/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/main/ini… ============================================================================== --- branches/arwinss/arwinss/server/main/init.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/main/init.c [iso-8859-1] Tue Nov 3 21:51:31 2015 @@ -347,7 +347,7 @@ HANDLE hMediaRequestEvent) { /* Check the Windows version */ - if (dwWinVersion != 0) + if (dwWinVersion != USER_VERSION) { return STATUS_UNSUCCESSFUL; }

1 0

[akhaldi] 69803: [WS2_32_NEW] Return SOCKET_ERROR instead of ErrorCode. By Peter Hater. CORE-10440
by akhaldi＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: akhaldi Date: Tue Nov 3 21:50:20 2015 New Revision: 69803 URL: http://svn.reactos.org/svn/reactos?rev=69803&view=rev Log: [WS2_32_NEW] Return SOCKET_ERROR instead of ErrorCode. By Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/src/bhook.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/bhook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/b… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/bhook.c [iso-8859-1] Tue Nov 3 21:50:20 2015 @@ -50,7 +50,7 @@ { /* Fail */ SetLastError(ErrorCode); - return ErrorCode; + return SOCKET_ERROR; } /* Return success */

1 0

[fireball] 69802: [ARWINSS] - gdi32: Use FreeType inclusion macros.
by fireball＠svn.reactos.org 03 Nov '15

03 Nov '15

Author: fireball Date: Tue Nov 3 21:29:58 2015 New Revision: 69802 URL: http://svn.reactos.org/svn/reactos?rev=69802&view=rev Log: [ARWINSS] - gdi32: Use FreeType inclusion macros. Modified: branches/arwinss/arwinss/client/gdi32/freetype.c Modified: branches/arwinss/arwinss/client/gdi32/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/gdi32/fr… ============================================================================== --- branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/gdi32/freetype.c [iso-8859-1] Tue Nov 3 21:29:58 2015 @@ -98,47 +98,21 @@ #ifdef HAVE_FT2BUILD_H #include <ft2build.h> +#include FT_FREETYPE_H +#include FT_GLYPH_H +#include FT_TYPES_H +#include FT_TRUETYPE_TABLES_H +#include FT_SFNT_NAMES_H +#include FT_TRUETYPE_IDS_H +#include FT_OUTLINE_H +#include FT_TRIGONOMETRY_H +#include FT_MODULE_H +#include FT_WINFONTS_H +#ifdef FT_LCD_FILTER_H +#include FT_LCD_FILTER_H #endif -#ifdef HAVE_FREETYPE_FREETYPE_H -#include <freetype.h> -#endif -#ifdef HAVE_FREETYPE_FTGLYPH_H -#include <ftglyph.h> -#endif -#ifdef HAVE_FREETYPE_TTTABLES_H -#include <tttables.h> -#endif -#ifdef HAVE_FREETYPE_FTTYPES_H -#include <fttypes.h> -#endif -#ifdef HAVE_FREETYPE_FTSNAMES_H -#include <ftsnames.h> -#else -# ifdef HAVE_FREETYPE_FTNAMES_H -# include <ftnames.h> -# endif -#endif -#ifdef HAVE_FREETYPE_TTNAMEID_H -#include <ttnameid.h> -#endif -#ifdef HAVE_FREETYPE_FTOUTLN_H -#include <ftoutln.h> -#endif -#ifdef HAVE_FREETYPE_INTERNAL_SFNT_H -#include <internal/sfnt.h> -#endif -#ifdef HAVE_FREETYPE_FTTRIGON_H -#include <fttrigon.h> -#endif -#ifdef HAVE_FREETYPE_FTWINFNT_H -#include <ftwinfnt.h> -#endif -#ifdef HAVE_FREETYPE_FTMODAPI_H -#include <ftmodapi.h> -#endif -#ifdef HAVE_FREETYPE_FTLCDFIL_H -#include <ftlcdfil.h> -#endif +#endif /* HAVE_FT2BUILD_H */ + #ifndef HAVE_FT_TRUETYPEENGINETYPE typedef enum

1 0

[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

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 November 2015