Ros-diffs

ros-diffs@reactos.org

81390 discussions

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

07 Nov '15

Author: akhaldi Date: Sat Nov 7 12:22:52 2015 New Revision: 69831 URL: http://svn.reactos.org/svn/reactos?rev=69831&view=rev Log: [RTL] Improve the FILE header section. Brought to you by Adam Stachowicz. CORE-10114 Modified: trunk/reactos/lib/rtl/amd64/debug_asm.S trunk/reactos/lib/rtl/amd64/slist.S trunk/reactos/lib/rtl/arm/debug_asm.S trunk/reactos/lib/rtl/arm/except.c trunk/reactos/lib/rtl/byteswap.c trunk/reactos/lib/rtl/heapuser.c trunk/reactos/lib/rtl/i386/debug_asm.S trunk/reactos/lib/rtl/i386/except.c trunk/reactos/lib/rtl/i386/except_asm.s trunk/reactos/lib/rtl/i386/res_asm.s trunk/reactos/lib/rtl/i386/rtlmem.s trunk/reactos/lib/rtl/i386/thread.c trunk/reactos/lib/rtl/powerpc/except.c trunk/reactos/lib/rtl/powerpc/rtlswap.s trunk/reactos/lib/rtl/powerpc/thread.c Modified: trunk/reactos/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/debug_asm.S?… ============================================================================== --- trunk/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: Debug Routines - * FILE: lib/rtl/i386/debug.S + * FILE: lib/rtl/amd64/debug_asm.S * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ Modified: trunk/reactos/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/slist.S?rev=… ============================================================================== --- trunk/reactos/lib/rtl/amd64/slist.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/slist.S [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/rtl/amd64/interlck.S + * FILE: lib/rtl/amd64/slist.S * PURPOSE: Rtl Interlocked Functions for amd64 * PROGRAMMERS: Timo Kreuzer */ Modified: trunk/reactos/lib/rtl/arm/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/arm/debug_asm.S?re… ============================================================================== --- trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/arm/debug_asm.S [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: rtl/arm/debug_asm.S + * FILE: lib/rtl/arm/debug_asm.S * PURPOSE: Cross-privilege Debugging and Exception Support for ARM * PROGRAMMERS: ReactOS Portable Systems Group */ Modified: trunk/reactos/lib/rtl/arm/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/arm/except.c?rev=6… ============================================================================== --- trunk/reactos/lib/rtl/arm/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/arm/except.c [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: User-mode exception support for IA-32 - * FILE: lib/rtl/arm/exception.c + * FILE: lib/rtl/arm/except.c * PROGRAMERS: */ Modified: trunk/reactos/lib/rtl/byteswap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/byteswap.c?rev=698… ============================================================================== --- trunk/reactos/lib/rtl/byteswap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/byteswap.c [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c + * FILE: lib/rtl/byteswap.c * PURPOSE: Memory functions * PROGRAMMER: David Welch (welch(a)mcmail.com) */ Modified: trunk/reactos/lib/rtl/heapuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapuser.c?rev=698… ============================================================================== --- trunk/reactos/lib/rtl/heapuser.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapuser.c [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/rtl/heap.c + * FILE: lib/rtl/heapuser.c * PURPOSE: RTL Heap backend allocator (user mode only functions) * PROGRAMMERS: Copyright 2010 Aleksey Bragin */ Modified: trunk/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/debug_asm.S?r… ============================================================================== --- trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/debug_asm.S [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: Debug Routines - * FILE: lib/rtl/i386/debug.S + * FILE: lib/rtl/i386/debug_asm.S * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/lib/rtl/i386/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except.c [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: User-mode exception support for IA-32 - * FILE: lib/rtl/i386/exception.c + * FILE: lib/rtl/i386/except.c * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) * Casper S. Hornstrup (chorns(a)users.sourceforge.net) */ Modified: trunk/reactos/lib/rtl/i386/except_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except_asm.s?… ============================================================================== --- trunk/reactos/lib/rtl/i386/except_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/except_asm.s [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Runtime Library (RTL) - * FILE: lib/rtl/i386/except_asm.S + * FILE: lib/rtl/i386/except_asm.s * PURPOSE: User-mode exception support for IA-32 * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Stefan Ginsberg (stefan.ginsberg(a)reactos.org) Modified: trunk/reactos/lib/rtl/i386/res_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/res_asm.s?rev… ============================================================================== --- trunk/reactos/lib/rtl/i386/res_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/res_asm.s [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GNU GPL - See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: - * FILE: lib/rtl/i386/res_asm.S + * FILE: lib/rtl/i386/res_asm.s * PROGRAMER: */ Modified: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlmem.s [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/rtlmem.s [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: GNU GPL - See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: Memory functions - * FILE: lib/rtl/i386/rtlswap.S + * FILE: lib/rtl/i386/rtlmem.s * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/lib/rtl/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/thread.c?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/thread.c [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Rtl user thread functions - * FILE: lib/rtl/thread.c + * FILE: lib/rtl/i386/thread.c * PROGRAMERS: * Alex Ionescu (alex(a)relsoft.net) * Eric Kohl Modified: trunk/reactos/lib/rtl/powerpc/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/except.c?r… ============================================================================== --- trunk/reactos/lib/rtl/powerpc/except.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/powerpc/except.c [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -1,7 +1,7 @@ /* COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Runtime Library * PURPOSE: User-Mode Exception Support - * FILE: lib/rtl/exception.c + * FILE: lib/rtl/powerpc/except.c * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch <welch(a)cwcom.net> * Skywing <skywing(a)valhallalegends.com> Modified: trunk/reactos/lib/rtl/powerpc/rtlswap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/rtlswap.s?… ============================================================================== --- trunk/reactos/lib/rtl/powerpc/rtlswap.s [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/powerpc/rtlswap.s [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: Byte swap functions - * FILE: lib/rtl/i386/rtlswap.S + * FILE: lib/rtl/powerpc/rtlswap.s * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) */ Modified: trunk/reactos/lib/rtl/powerpc/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/powerpc/thread.c?r… ============================================================================== --- trunk/reactos/lib/rtl/powerpc/thread.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/powerpc/thread.c [iso-8859-1] Sat Nov 7 12:22:52 2015 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Rtl user thread functions - * FILE: lib/rtl/thread.c + * FILE: lib/rtl/powerpc/thread.c * PROGRAMERS: * Alex Ionescu (alex(a)relsoft.net) * Eric Kohl

1 0

[spetreolle] 69830: [COM_APITEST] Use explicit W calls. All the code is unicode-based.
by spetreolle＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: spetreolle Date: Sat Nov 7 11:59:23 2015 New Revision: 69830 URL: http://svn.reactos.org/svn/reactos?rev=69830&view=rev Log: [COM_APITEST] Use explicit W calls. All the code is unicode-based. Modified: trunk/rostests/apitests/com/com_apitest.c trunk/rostests/apitests/com/com_apitest.h Modified: trunk/rostests/apitests/com/com_apitest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.c [iso-8859-1] Sat Nov 7 11:59:23 2015 @@ -443,7 +443,7 @@ HKEY hKeyClasses; LONG result; - result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Classes\\CLSID", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); + result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Classes\\CLSID", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyClasses); ok(result == NO_ERROR, "Failed to open classes key, error %lu\n", result); if (!myskip(result == NO_ERROR, "No classes key\n")) { @@ -464,20 +464,20 @@ if (myskip(NT_SUCCESS(status), "No guid string\n")) continue; - result = RegOpenKeyEx(hKeyClasses, clsid.Buffer, 0, KEY_ENUMERATE_SUB_KEYS, &hKey); + result = RegOpenKeyExW(hKeyClasses, clsid.Buffer, 0, KEY_ENUMERATE_SUB_KEYS, &hKey); ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); RtlFreeUnicodeString(&clsid); if (myskip(result == NO_ERROR, "No key\n")) continue; - result = RegOpenKeyEx(hKey, L"InProcServer32", 0, KEY_QUERY_VALUE, &hKeyServer); + result = RegOpenKeyExW(hKey, L"InProcServer32", 0, KEY_QUERY_VALUE, &hKeyServer); ok(result == NO_ERROR, "Failed to open key for %s, error %lu\n", class->name, result); RegCloseKey(hKey); if (myskip(result == NO_ERROR, "No key\n")) continue; dataSize = sizeof(data); - result = RegQueryValueEx(hKeyServer, NULL, NULL, &type, (PBYTE)data, &dataSize); + result = RegQueryValueExW(hKeyServer, NULL, NULL, &type, (PBYTE)data, &dataSize); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); if (!myskip(result == NO_ERROR, "No module name\n")) { @@ -492,7 +492,7 @@ } dataSize = sizeof(data); - result = RegQueryValueEx(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)data, &dataSize); + result = RegQueryValueExW(hKeyServer, L"ThreadingModel", NULL, &type, (PBYTE)data, &dataSize); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", class->name, result); if (!myskip(result == NO_ERROR, "No ThreadingModel\n")) { @@ -523,7 +523,7 @@ PCCLASS_AND_INTERFACES class; HRESULT (__stdcall *DllGetClassObject)(REFCLSID, REFIID, PVOID *); - DllGetClassObject = (PVOID)GetProcAddress(GetModuleHandle(ModuleName), "DllGetClassObject"); + DllGetClassObject = (PVOID)GetProcAddress(GetModuleHandleW(ModuleName), "DllGetClassObject"); ok(DllGetClassObject != NULL, "DllGetClassObject not found in %ls, error %lu\n", ModuleName, GetLastError()); if (myskip(DllGetClassObject != NULL, "No DllGetClassObject\n")) return; @@ -580,7 +580,7 @@ HKEY hKeyInterface; LONG result; - result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"Software\\Classes\\Interface", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyInterface); + result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Classes\\Interface", 0, KEY_ENUMERATE_SUB_KEYS, &hKeyInterface); ok(result == NO_ERROR, "Failed to open interface key, error %lu\n", result); if (!myskip(result == NO_ERROR, "No interface key\n")) { @@ -601,7 +601,7 @@ if (myskip(NT_SUCCESS(status), "No guid string\n")) continue; - result = RegOpenKeyEx(hKeyInterface, iid.Buffer, 0, KEY_QUERY_VALUE, &hKey); + result = RegOpenKeyExW(hKeyInterface, iid.Buffer, 0, KEY_QUERY_VALUE, &hKey); if (iface->noreg) { ok(result == ERROR_FILE_NOT_FOUND, "RegOpenKeyEx returned %lu for %s\n", result, iface->name); @@ -616,7 +616,7 @@ continue; dataSize = sizeof(data); - result = RegQueryValueEx(hKey, NULL, NULL, &type, (PBYTE)data, &dataSize); + result = RegQueryValueExW(hKey, NULL, NULL, &type, (PBYTE)data, &dataSize); ok(result == NO_ERROR, "Failed to query value for %s, error %lu\n", iface->name, result); if (!myskip(result == NO_ERROR, "No module name\n")) { Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Sat Nov 7 11:59:23 2015 @@ -17,7 +17,6 @@ #define COBJMACROS #define WIN32_NO_STATUS -#define UNICODE #include <wine/test.h> #include <objbase.h> #include <objsafe.h>

1 0

[tfaber] 69829: [WS2_32] - Fill the protocol info buffer in WSAEnumProtocolsA/W. Should fix some ws2_32_winetest:sock crashes and flakiness.
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 11:54:17 2015 New Revision: 69829 URL: http://svn.reactos.org/svn/reactos?rev=69829&view=rev Log: [WS2_32] - Fill the protocol info buffer in WSAEnumProtocolsA/W. Should fix some ws2_32_winetest:sock crashes and flakiness. Modified: trunk/reactos/dll/win32/ws2_32/misc/stubs.c 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] Sat Nov 7 11:54:17 2015 @@ -497,6 +497,11 @@ { UNIMPLEMENTED + if (lpProtocolBuffer) + { + RtlZeroMemory(lpProtocolBuffer, *lpdwBufferLength); + } + *lpdwBufferLength = sizeof(WSAPROTOCOL_INFOA); WSASetLastError(WSASYSCALLFAILURE); return SOCKET_ERROR; } @@ -513,6 +518,11 @@ { UNIMPLEMENTED + if (lpProtocolBuffer) + { + RtlZeroMemory(lpProtocolBuffer, *lpdwBufferLength); + } + *lpdwBufferLength = sizeof(WSAPROTOCOL_INFOW); WSASetLastError(WSASYSCALLFAILURE); return SOCKET_ERROR; }

1 0

[tfaber] 69828: [MSAFD] - Add support for SO_PROTOCOL_INFOW. Patch by Peter Hater. CORE-10440
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 10:48:38 2015 New Revision: 69828 URL: http://svn.reactos.org/svn/reactos?rev=69828&view=rev Log: [MSAFD] - Add support for SO_PROTOCOL_INFOW. Patch by Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sat Nov 7 10:48:38 2015 @@ -19,7 +19,6 @@ HANDLE GlobalHeap; WSPUPCALLTABLE Upcalls; -DWORD CatalogEntryId; /* CatalogEntryId for upcalls */ LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest; PSOCKET_INFORMATION SocketListHead = NULL; CRITICAL_SECTION SocketListLock; @@ -116,7 +115,6 @@ Socket->SharedData.SizeOfRemoteAddress = HelperData->MaxWSAddressLength; Socket->SharedData.UseDelayedAcceptance = HelperData->UseDelayedAcceptance; Socket->SharedData.CreateFlags = dwFlags; - Socket->SharedData.CatalogEntryId = lpProtocolInfo->dwCatalogEntryId; Socket->SharedData.ServiceFlags1 = lpProtocolInfo->dwServiceFlags1; Socket->SharedData.ProviderFlags = lpProtocolInfo->dwProviderFlags; Socket->SharedData.GroupID = g; @@ -124,6 +122,7 @@ Socket->SharedData.UseSAN = FALSE; Socket->SharedData.NonBlocking = FALSE; /* Sockets start blocking */ Socket->SanData = NULL; + RtlCopyMemory(&Socket->ProtocolInfo, lpProtocolInfo, sizeof(Socket->ProtocolInfo)); /* Ask alex about this */ if( Socket->SharedData.SocketType == SOCK_DGRAM || @@ -290,7 +289,7 @@ CreateContext(Socket); /* Notify Winsock */ - Upcalls.lpWPUModifyIFSHandle(CatalogEntryId, (SOCKET)Sock, lpErrno); + Upcalls.lpWPUModifyIFSHandle(Socket->ProtocolInfo.dwCatalogEntryId, (SOCKET)Sock, lpErrno); /* Return Socket Handle */ TRACE("Success %x\n", Sock); @@ -1058,7 +1057,6 @@ PSOCKADDR RemoteAddress = NULL; GROUP GroupID = 0; ULONG CallBack; - WSAPROTOCOL_INFOW ProtocolInfo; SOCKET AcceptSocket; PSOCKET_INFORMATION AcceptSocketInfo; UCHAR ReceiveBuffer[0x1A]; @@ -1332,14 +1330,10 @@ } /* Create a new Socket */ - ProtocolInfo.dwCatalogEntryId = Socket->SharedData.CatalogEntryId; - ProtocolInfo.dwServiceFlags1 = Socket->SharedData.ServiceFlags1; - ProtocolInfo.dwProviderFlags = Socket->SharedData.ProviderFlags; - AcceptSocket = WSPSocket (Socket->SharedData.AddressFamily, Socket->SharedData.SocketType, Socket->SharedData.Protocol, - &ProtocolInfo, + &Socket->ProtocolInfo, GroupID, Socket->SharedData.CreateFlags, lpErrno); @@ -2182,11 +2176,14 @@ Buffer = &Socket->SharedData.RecvTimeout; BufferSize = sizeof(DWORD); break; + case SO_PROTOCOL_INFOW: + Buffer = &Socket->ProtocolInfo; + BufferSize = sizeof(Socket->ProtocolInfo); + break; case SO_GROUP_ID: case SO_GROUP_PRIORITY: case SO_MAX_MSG_SIZE: - case SO_PROTOCOL_INFO: default: DbgPrint("MSAFD: Get unknown optname %x\n", OptionName); @@ -2412,8 +2409,6 @@ lpProcTable->lpWSPStringToAddress = WSPStringToAddress; lpWSPData->wVersion = MAKEWORD(2, 2); lpWSPData->wHighVersion = MAKEWORD(2, 2); - /* Save CatalogEntryId for all upcalls */ - CatalogEntryId = lpProtocolInfo->dwCatalogEntryId; } TRACE("Status (%d).\n", Status); Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Sat Nov 7 10:48:38 2015 @@ -72,7 +72,6 @@ BOOLEAN UseSAN:1; }; // Flags DWORD CreateFlags; - DWORD CatalogEntryId; DWORD ServiceFlags1; DWORD ProviderFlags; GROUP GroupID; @@ -106,6 +105,7 @@ BOOL TrySAN; SOCKADDR WSLocalAddress; SOCKADDR WSRemoteAddress; + WSAPROTOCOL_INFOW ProtocolInfo; struct _SOCKET_INFORMATION *NextSocket; } SOCKET_INFORMATION, *PSOCKET_INFORMATION;

1 0

[spetreolle] 69827: [GDIHV] Don't define UNICODE in source.
by spetreolle＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: spetreolle Date: Sat Nov 7 10:41:56 2015 New Revision: 69827 URL: http://svn.reactos.org/svn/reactos?rev=69827&view=rev Log: [GDIHV] Don't define UNICODE in source. Modified: trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt trunk/rosapps/applications/devutils/gdihv/gdihv.c trunk/rosapps/applications/devutils/gdihv/gdihv.h Modified: trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdih… ============================================================================== --- trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdihv/CMakeLists.txt [iso-8859-1] Sat Nov 7 10:41:56 2015 @@ -7,6 +7,6 @@ proclist.c) add_executable(gdihv ${SOURCE}) -set_module_type(gdihv win32cui) +set_module_type(gdihv win32cui UNICODE) add_importlibs(gdihv user32 comctl32 psapi msvcrt kernel32) add_cd_file(TARGET gdihv DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/devutils/gdihv/gdihv.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdih… ============================================================================== --- trunk/rosapps/applications/devutils/gdihv/gdihv.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdihv/gdihv.c [iso-8859-1] Sat Nov 7 10:41:56 2015 @@ -34,9 +34,9 @@ return pPeb->GdiSharedHandleTable; } -int WINAPI WinMain (HINSTANCE hThisInstance, +int WINAPI _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, - LPSTR lpszArgument, + LPTSTR lpszArgument, int nStyle) { Modified: trunk/rosapps/applications/devutils/gdihv/gdihv.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdih… ============================================================================== --- trunk/rosapps/applications/devutils/gdihv/gdihv.h [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/gdihv/gdihv.h [iso-8859-1] Sat Nov 7 10:41:56 2015 @@ -1,8 +1,7 @@ #ifndef _GDIHV_H #define _GDIHV_H -#define UNICODE - +#include <tchar.h> #define WIN32_NO_STATUS #include <windows.h> #include <commctrl.h>

1 0

[tfaber] 69826: [WS2_32] - Handle SO_PROTOCOL_INFOA in getsockopt based on ws2_32_new. CORE-10440
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 09:38:13 2015 New Revision: 69826 URL: http://svn.reactos.org/svn/reactos?rev=69826&view=rev Log: [WS2_32] - Handle SO_PROTOCOL_INFOA in getsockopt based on ws2_32_new. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt trunk/reactos/dll/win32/ws2_32/include/ws2_32.h trunk/reactos/dll/win32/ws2_32/misc/stubs.c Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/CMakeLists.txt [iso-8859-1] Sat Nov 7 09:38:13 2015 @@ -25,7 +25,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) set_module_type(ws2_32 win32dll UNICODE) -target_link_libraries(ws2_32 wine) +target_link_libraries(ws2_32 wine ${PSEH_LIB}) add_delay_importlibs(ws2_32 user32) add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 include/ws2_32.h SOURCE) 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] Sat Nov 7 09:38:13 2015 @@ -16,10 +16,12 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <winuser.h> #include <ws2spi.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> +#include <pseh/pseh2.h> #include <wsahelp.h> 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] Sat Nov 7 09:38:13 2015 @@ -96,6 +96,32 @@ return Error; } +INT +WSAAPI +MapUnicodeProtocolInfoToAnsi(IN LPWSAPROTOCOL_INFOW UnicodeInfo, + OUT LPWSAPROTOCOL_INFOA AnsiInfo) +{ + INT ReturnValue; + + /* Copy all the data that doesn't need converting */ + RtlCopyMemory(AnsiInfo, + UnicodeInfo, + FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol)); + + /* Now convert the protocol string */ + ReturnValue = WideCharToMultiByte(CP_ACP, + 0, + UnicodeInfo->szProtocol, + -1, + AnsiInfo->szProtocol, + sizeof(AnsiInfo->szProtocol), + NULL, + NULL); + if (!ReturnValue) return WSASYSCALLFAILURE; + + /* Return success */ + return ERROR_SUCCESS; +} /* * @implemented @@ -111,6 +137,9 @@ PCATALOG_ENTRY Provider; INT Errno; int Error; + WSAPROTOCOL_INFOW ProtocolInfo; + PCHAR OldOptVal = NULL; + INT OldOptLen = 0; if (!WSAINITIALIZED) { @@ -123,6 +152,47 @@ { WSASetLastError(WSAENOTSOCK); return SOCKET_ERROR; + } + + /* Check if ANSI data was requested */ + if ((level == SOL_SOCKET) && (optname == SO_PROTOCOL_INFOA)) + { + /* Validate size and pointers */ + Errno = NO_ERROR; + _SEH2_TRY + { + if (!(optval) || + !(optlen) || + (*optlen < sizeof(WSAPROTOCOL_INFOA))) + { + /* Set return size and error code */ + *optlen = sizeof(WSAPROTOCOL_INFOA); + Errno = WSAEFAULT; + _SEH2_LEAVE; + } + + /* It worked. Save the values */ + OldOptLen = *optlen; + OldOptVal = optval; + + /* Hack them so WSP will know how to deal with it */ + *optlen = sizeof(WSAPROTOCOL_INFOW); + optval = (PCHAR)&ProtocolInfo; + optname = SO_PROTOCOL_INFOW; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Errno = WSAEFAULT; + } + _SEH2_END; + + /* Did we encounter invalid parameters? */ + if (Errno != NO_ERROR) + { + /* Fail */ + Error = SOCKET_ERROR; + goto Exit; + } } Error = Provider->ProcTable.lpWSPGetSockOpt(s, @@ -132,6 +202,28 @@ optlen, &Errno); + /* Did we use the A->W hack? */ + if (Error == ERROR_SUCCESS && OldOptVal) + { + /* We did, so we have to convert the unicode info to ansi */ + Errno = MapUnicodeProtocolInfoToAnsi(&ProtocolInfo, + (LPWSAPROTOCOL_INFOA) + OldOptVal); + + /* Return the length */ + _SEH2_TRY + { + *optlen = OldOptLen; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Errno = WSAEFAULT; + Error = SOCKET_ERROR; + } + _SEH2_END; + } + +Exit: DereferenceProviderByPointer(Provider); if (Error == SOCKET_ERROR)

1 0

[akhaldi] 69825: [FREELDR] We don't need the hotpatch flag in MSVC builds for this module. CORE-10477
by akhaldi＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: akhaldi Date: Sat Nov 7 09:03:26 2015 New Revision: 69825 URL: http://svn.reactos.org/svn/reactos?rev=69825&view=rev Log: [FREELDR] We don't need the hotpatch flag in MSVC builds for this module. CORE-10477 Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Nov 7 09:03:26 2015 @@ -3,6 +3,11 @@ # FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822 set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") +endif() + +if(MSVC) + # We don't need it here + replace_compile_flags("/hotpatch" " ") endif() spec2def(freeldr.sys freeldr.spec)

1 0

[tfaber] 69824: [WS2_32_NEW] - Treat SO_OPENTYPE's value as a DWORD. Based on a patch by Peter Hater. CORE-10440
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 08:49:15 2015 New Revision: 69824 URL: http://svn.reactos.org/svn/reactos?rev=69824&view=rev Log: [WS2_32_NEW] - Treat SO_OPENTYPE's value as a DWORD. Based on a patch by Peter Hater. CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sat Nov 7 08:49:15 2015 @@ -275,7 +275,7 @@ Status = ERROR_SUCCESS; _SEH2_TRY { - if (!(optlen) || (*optlen < sizeof(INT))) + if (!(optlen) || (*optlen < sizeof(DWORD))) { /* Fail */ Status = SOCKET_ERROR; @@ -284,8 +284,8 @@ } /* Set the open type */ - *optval = (CHAR)Thread->OpenType; - *optlen = sizeof(INT); + *(DWORD*)optval = Thread->OpenType; + *optlen = sizeof(DWORD); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -419,7 +419,7 @@ if (level == SOL_SOCKET && optname == SO_OPENTYPE) { /* Validate size */ - if (optlen < sizeof(INT)) + if (optlen < sizeof(DWORD)) { /* Fail */ SetLastError(WSAEFAULT); @@ -430,7 +430,7 @@ Status = ERROR_SUCCESS; _SEH2_TRY { - Thread->OpenType = *optval; + Thread->OpenType = *(DWORD*)optval; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[tfaber] 69823: [WS2_32_NEW] - Add missing SEH in getsockopt/setsockopt CORE-10440
by tfaber＠svn.reactos.org 07 Nov '15

07 Nov '15

Author: tfaber Date: Sat Nov 7 08:30:00 2015 New Revision: 69823 URL: http://svn.reactos.org/svn/reactos?rev=69823&view=rev Log: [WS2_32_NEW] - Add missing SEH in getsockopt/setsockopt CORE-10440 Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Sat Nov 7 08:30:00 2015 @@ -51,7 +51,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32_new.def) set_module_type(ws2_32_new win32dll) +target_link_libraries(ws2_32_new ${PSEH_LIB}) add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32_new inc/ws2_32.h SOURCE) -target_link_libraries(ws2_32_new wine) add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Sat Nov 7 08:30:00 2015 @@ -28,6 +28,7 @@ #include <winuser.h> #include <ws2spi.h> #include <ndk/rtlfuncs.h> +#include <pseh/pseh2.h> /* Winsock Helper Header */ #include <ws2help.h> Modified: trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/sockctrl.c [iso-8859-1] Sat Nov 7 08:30:00 2015 @@ -272,17 +272,29 @@ if ((level == SOL_SOCKET) && (optname == SO_OPENTYPE)) { /* Validate size */ - if (!(optlen) || (*optlen < sizeof(INT))) - { - /* Fail */ + Status = ERROR_SUCCESS; + _SEH2_TRY + { + if (!(optlen) || (*optlen < sizeof(INT))) + { + /* Fail */ + Status = SOCKET_ERROR; + SetLastError(WSAEFAULT); + _SEH2_LEAVE; + } + + /* Set the open type */ + *optval = (CHAR)Thread->OpenType; + *optlen = sizeof(INT); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = SOCKET_ERROR; SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - - /* Set the open type */ - *optval = (CHAR)Thread->OpenType; - *optlen = sizeof(INT); - return ERROR_SUCCESS; + } + _SEH2_END; + + return Status; } /* Get the Socket Context */ @@ -292,27 +304,42 @@ if ((level == SOL_SOCKET) && (optname == SO_PROTOCOL_INFOA)) { /* Validate size and pointers */ - if(!(optval) || - !(optlen) || - (*optlen < sizeof(WSAPROTOCOL_INFOA))) + ErrorCode = NO_ERROR; + _SEH2_TRY { - /* Set return size */ - *optlen = sizeof(WSAPROTOCOL_INFOA); - + if (!(optval) || + !(optlen) || + (*optlen < sizeof(WSAPROTOCOL_INFOA))) + { + /* Set return size and error code */ + *optlen = sizeof(WSAPROTOCOL_INFOA); + ErrorCode = WSAEFAULT; + _SEH2_LEAVE; + } + + /* It worked. Save the values */ + OldOptLen = *optlen; + OldOptVal = optval; + + /* Hack them so WSP will know how to deal with it */ + *optlen = sizeof(WSAPROTOCOL_INFOW); + optval = (PCHAR)&ProtocolInfo; + optname = SO_PROTOCOL_INFOW; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ErrorCode = WSAEFAULT; + } + _SEH2_END; + + /* Did we encounter invalid parameters? */ + if (ErrorCode != NO_ERROR) + { /* Dereference the socket and fail */ WsSockDereference(Socket); - SetLastError(WSAEFAULT); + SetLastError(ErrorCode); return SOCKET_ERROR; } - - /* It worked. Save the values */ - OldOptLen = *optlen; - OldOptVal = optval; - - /* Hack them so WSP will know how to deal with it */ - *optlen = sizeof(WSAPROTOCOL_INFOW); - optval = (PCHAR)&ProtocolInfo; - optname = SO_PROTOCOL_INFOW; } /* Make the call */ @@ -338,7 +365,15 @@ OldOptVal); /* Return the length */ - *optlen = OldOptLen; + _SEH2_TRY + { + *optlen = OldOptLen; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ErrorCode = WSAEFAULT; + } + _SEH2_END; /* Return success if this worked */ if (ErrorCode == ERROR_SUCCESS) return Status; @@ -392,8 +427,19 @@ } /* Set the open type */ - Thread->OpenType = *optval; - return ERROR_SUCCESS; + Status = ERROR_SUCCESS; + _SEH2_TRY + { + Thread->OpenType = *optval; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = SOCKET_ERROR; + SetLastError(WSAEFAULT); + } + _SEH2_END; + + return Status; } /* Get the Socket Context */

1 0

[hbelusca] 69822: [NTVDM]: Improve the console resize algorithm.
by hbelusca＠svn.reactos.org 06 Nov '15

06 Nov '15

Author: hbelusca Date: Fri Nov 6 23:59:42 2015 New Revision: 69822 URL: http://svn.reactos.org/svn/reactos?rev=69822&view=rev Log: [NTVDM]: Improve the console resize algorithm. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Fri Nov 6 23:59:42 2015 @@ -460,6 +460,93 @@ VgaUpdateTextCursor(); } +static VOID ResizeTextConsole(PCOORD Resolution, PSMALL_RECT WindowSize OPTIONAL) +{ + BOOL Success; + SMALL_RECT ConRect; + SHORT oldWidth, oldHeight; + + /* + * Use this trick to effectively resize the console buffer and window, + * because: + * - SetConsoleScreenBufferSize fails if the new console screen buffer size + * is smaller than the current console window size, and: + * - SetConsoleWindowInfo fails if the new console window size is larger + * than the current console screen buffer size. + */ + + + /* Retrieve the latest console information */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); + + oldWidth = ConsoleInfo.srWindow.Right - ConsoleInfo.srWindow.Left + 1; + oldHeight = ConsoleInfo.srWindow.Bottom - ConsoleInfo.srWindow.Top + 1; + + /* + * If the current console window is too large to hold the full contents + * of the new screen buffer, resize it first. + */ + if (oldWidth > Resolution->X || oldHeight > Resolution->Y) + { + // + // NOTE: This is not a problem if we move the window back to (0,0) + // because when we resize the screen buffer, the window will move back + // to where the cursor is. Or, if the screen buffer is not resized, + // when we readjust again the window, we will move back to a correct + // position. This is what we wanted after all... + // + + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + min(oldWidth , Resolution->X) - 1; + ConRect.Bottom = ConRect.Top + min(oldHeight, Resolution->Y) - 1; + + Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + if (!Success) DPRINT1("(resize) SetConsoleWindowInfo(1) failed with error %d\n", GetLastError()); + } + + /* Resize the screen buffer if needed */ + if (Resolution->X != ConsoleInfo.dwSize.X || Resolution->Y != ConsoleInfo.dwSize.Y) + { + /* + * SetConsoleScreenBufferSize automatically takes into account the current + * cursor position when it computes starting which row it should copy text + * when resizing the sceenbuffer, and scrolls the console window such that + * the cursor is placed in it again. We therefore do not need to care about + * the cursor position and do the maths ourselves. + */ + Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + if (!Success) DPRINT1("(resize) SetConsoleScreenBufferSize failed with error %d\n", GetLastError()); + + /* + * Setting a new screen buffer size can change other information, + * so update the saved console information. + */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); + } + + if (!WindowSize) + { + ConRect.Left = 0; + ConRect.Right = ConRect.Left + Resolution->X - 1; + ConRect.Bottom = max(ConsoleInfo.dwCursorPosition.Y, Resolution->Y - 1); + ConRect.Top = ConRect.Bottom - Resolution->Y + 1; + + // NOTE: We may take ConsoleInfo.dwMaximumWindowSize into account + } + else + { + ConRect.Left = ConRect.Top = 0; + ConRect.Right = ConRect.Left + WindowSize->Right - WindowSize->Left; + ConRect.Bottom = ConRect.Top + WindowSize->Bottom - WindowSize->Top ; + } + + Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); + if (!Success) DPRINT1("(resize) SetConsoleWindowInfo(2) failed with error %d\n", GetLastError()); + + /* Update the saved console information */ + GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); +} + static BOOL VgaAttachToConsoleInternal(PCOORD Resolution) { BOOL Success; @@ -484,7 +571,7 @@ * Windows 2k3 winsrv.dll calls NtVdmControl(VdmQueryVdmProcess == 14, &ConsoleHandle); * in the two following APIs: * SrvRegisterConsoleVDM (corresponding Win32 API: RegisterConsoleVDM) - * SrvVDMConsoleOperation (corresponding Win32 API: ??) + * SrvVDMConsoleOperation (corresponding Win32 API: VDMConsoleOperation) * to check whether the current process is a VDM process, and fails otherwise * with the error 0xC0000022 (STATUS_ACCESS_DENIED). * @@ -520,28 +607,8 @@ ASSERT(CharBuff); #endif - /* Retrieve the latest console information */ - GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); - /* Resize the console */ - ConRect.Left = 0; - ConRect.Right = ConRect.Left + Resolution->X - 1; - ConRect.Bottom = max(ConsoleInfo.dwCursorPosition.Y, Resolution->Y - 1); - ConRect.Top = ConRect.Bottom - Resolution->Y + 1; - /* - * Use this trick to effectively resize the console buffer and window, - * because: - * - SetConsoleScreenBufferSize fails if the new console screen buffer size - * is smaller than the current console window size, and: - * - SetConsoleWindowInfo fails if the new console window size is larger - * than the current console screen buffer size. - */ - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); - DPRINT1("(attach) SetConsoleScreenBufferSize(1) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); - DPRINT1("(attach) SetConsoleWindowInfo %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); - DPRINT1("(attach) SetConsoleScreenBufferSize(2) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + ResizeTextConsole(Resolution, NULL); /* Update the saved console information */ GetConsoleScreenBufferInfo(TextConsoleBuffer, &ConsoleInfo); @@ -1095,7 +1162,7 @@ * we get the default palette and our external behaviour is * just like Windows' one), but it should success on ReactOS * (so that we get console palette changes even for text-mode - * screen-buffers, which is a new feature on ReactOS). + * screen buffers, which is a new feature on ReactOS). */ SetConsolePalette(TextConsoleBuffer, TextPaletteHandle, @@ -1542,7 +1609,7 @@ Position.X = (SHORT)(Location % ScanlineSize); Position.Y = (SHORT)(Location / ScanlineSize); - DPRINT("VgaUpdateTextCursor: X = %d ; Y = %d\n", Position.X, Position.Y); + DPRINT("VgaUpdateTextCursor: (X = %d ; Y = %d)\n", Position.X, Position.Y); /* Update the physical cursor */ SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo); @@ -2338,7 +2405,42 @@ VOID ScreenEventHandler(PWINDOW_BUFFER_SIZE_RECORD ScreenEvent) { - DPRINT1("Screen events not handled\n"); + /* + * This function monitors and allows console resizings only if they are triggered by us. + * User-driven resizings via the console properties, or programmatical console resizings + * made by explicit calls to SetConsoleScreenBufferSize by external applications, are forbidden. + * In that case only a console window resize is done in case the size is reduced. + * This protection is enabled in CONSRV side when NTVDM registers as a VDM to CONSRV, + * but we also implement it there in case we are running in STANDALONE mode without + * CONSRV registration. + * + * The only potential problem we have is that, when this handler is called, + * the console is already resized. In case this corresponds to a forbidden resize, + * we resize the console back to its original size from inside the handler. + * This will trigger a recursive call to the handler, that should be detected. + */ + + if (CurrResolution.X == ScreenEvent->dwSize.X && + CurrResolution.Y == ScreenEvent->dwSize.Y) + { + /* Allowed resize, we are OK */ + return; + } + + DPRINT1("ScreenEventHandler - Detected forbidden resize! Reset console screenbuffer size back to (X = %d ; Y = %d)\n", CurrResolution.X, CurrResolution.Y); + + // FIXME: If we're detaching, then stop monitoring for changes!! + + /* Restore the original console size */ + ResizeTextConsole(&CurrResolution, NULL); + + /* Force refresh of all the screen */ + NeedsUpdate = TRUE; + UpdateRectangle.Left = 0; + UpdateRectangle.Top = 0; + UpdateRectangle.Right = CurrResolution.X; + UpdateRectangle.Bottom = CurrResolution.Y; + VgaRefreshDisplay(); } BOOL VgaAttachToConsole(VOID) @@ -2384,10 +2486,6 @@ VOID VgaDetachFromConsole(VOID) { - BOOL Success; - - SMALL_RECT ConRect; - VgaDetachFromConsoleInternal(); /* Save the screen state */ @@ -2401,16 +2499,7 @@ ConsoleFramebuffer = NULL; /* Restore the original console size */ - ConRect.Left = ConRect.Top = 0; - ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; - ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; - /* See the following trick explanation in VgaAttachToConsoleInternal */ - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - DPRINT1("(detach) SetConsoleScreenBufferSize(1) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleWindowInfo(TextConsoleBuffer, TRUE, &ConRect); - DPRINT1("(detach) SetConsoleWindowInfo %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); - Success = SetConsoleScreenBufferSize(TextConsoleBuffer, OrgConsoleBufferInfo.dwSize); - DPRINT1("(detach) SetConsoleScreenBufferSize(2) %s with error %d\n", Success ? "succeeded" : "failed", GetLastError()); + ResizeTextConsole(&OrgConsoleBufferInfo.dwSize, &OrgConsoleBufferInfo.srWindow); /* Restore the original cursor shape */ SetConsoleCursorInfo(TextConsoleBuffer, &OrgConsoleCursorInfo);

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