Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 66181: [WineTests|User32] - Sync Dialog to wine head.
by jimtabor＠svn.reactos.org 06 Feb '15

06 Feb '15

Author: jimtabor Date: Fri Feb 6 20:56:57 2015 New Revision: 66181 URL: http://svn.reactos.org/svn/reactos?rev=66181&view=rev Log: [WineTests|User32] - Sync Dialog to wine head. Modified: trunk/rostests/winetests/user32/dialog.c Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… ============================================================================== --- trunk/rostests/winetests/user32/dialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/dialog.c [iso-8859-1] Fri Feb 6 20:56:57 2015 @@ -1227,7 +1227,12 @@ static INT_PTR CALLBACK messageBoxFontDlgWinProc (HWND hDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam) { - return (uiMsg == WM_INITDIALOG); + if (uiMsg == WM_INITDIALOG) { + SetFocus(hDlg); + return 1; + } + + return 0; } static void test_MessageBoxFontTest(void) @@ -1337,6 +1342,12 @@ foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); ok (foundId == 1000, "First edit box should have gained focus on dialog creation. Expected: %d, Found: %ld\n", 1000, foundId); + SetFocus(GetNextDlgTabItem(hDlg, GetFocus(), FALSE)); + SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "First edit box should have regained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + SetFocus(GetNextDlgTabItem(hDlg, NULL, FALSE)); + /* de- then reactivate the dialog */ SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), 0); SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); @@ -1356,6 +1367,24 @@ foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); ok (foundId == 1001, "Second edit box should have gained focus after dialog reactivation. Expected: %d, Found: %ld\n", 1001, foundId); + + /* set focus to the dialog */ + SetFocus(hDlg); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1000, "First edit box should have gained focus on dialog focus. Expected: %d, Found: %ld\n", 1000, foundId); + + /* select second tabbable item */ + SetFocus(GetNextDlgTabItem(hDlg, GetNextDlgTabItem(hDlg, NULL, FALSE), FALSE)); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); + + /* send WM_ACTIVATE message to already active dialog */ + SendMessageA(hDlg, WM_ACTIVATE, MAKEWPARAM(WA_ACTIVE, 0), 0); + + foundId = GetWindowLongPtrA(GetFocus(), GWLP_ID); + ok (foundId == 1001, "Second edit box should have gained focus. Expected: %d, Found: %ld\n", 1001, foundId); /* disable the 2nd box */ EnableWindow(GetFocus(), FALSE);

1 0

[jgardou] 66180: [KMTEST/TCPIP] - Add tests checking for TDI_CONNECT behaviour.
by jgardou＠svn.reactos.org 06 Feb '15

06 Feb '15

Author: jgardou Date: Fri Feb 6 10:49:04 2015 New Revision: 66180 URL: http://svn.reactos.org/svn/reactos?rev=66180&view=rev Log: [KMTEST/TCPIP] - Add tests checking for TDI_CONNECT behaviour. Added: trunk/rostests/kmtests/tcpip/connect.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/tcpip/CMakeLists.txt trunk/rostests/kmtests/tcpip/TcpIp_drv.c trunk/rostests/kmtests/tcpip/TcpIp_user.c trunk/rostests/kmtests/tcpip/tcpip.h Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -117,7 +117,7 @@ add_executable(kmtest ${KMTEST_SOURCE}) set_module_type(kmtest win32cui) target_link_libraries(kmtest ${PSEH_LIB}) -add_importlibs(kmtest advapi32 msvcrt kernel32 ntdll) +add_importlibs(kmtest advapi32 ws2_32 msvcrt kernel32 ntdll) add_target_compile_definitions(kmtest KMT_USER_MODE) #add_pch(kmtest include/kmt_test.h) set_target_properties(kmtest PROPERTIES OUTPUT_NAME "kmtest_") Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -19,6 +19,7 @@ KMT_TESTFUNC Test_RtlUnicodeString; KMT_TESTFUNC Test_TcpIpIoctl; KMT_TESTFUNC Test_TcpIpTdi; +KMT_TESTFUNC Test_TcpIpConnect; /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = @@ -34,5 +35,6 @@ { "RtlSplayTree", Test_RtlSplayTree }, { "RtlUnicodeString", Test_RtlUnicodeString }, { "TcpIpTdi", Test_TcpIpTdi }, + { "TcpIpConnect", Test_TcpIpConnect }, { NULL, NULL }, }; Modified: trunk/rostests/kmtests/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/CMakeLists.… ============================================================================== --- trunk/rostests/kmtests/tcpip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/CMakeLists.txt [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -3,6 +3,7 @@ list(APPEND TCPIP_TEST_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c + connect.c tdi.c TcpIp_drv.c) Modified: trunk/rostests/kmtests/tcpip/TcpIp_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_drv.c… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/TcpIp_drv.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -9,6 +9,7 @@ #include "tcpip.h" extern KMT_MESSAGE_HANDLER TestTdi; +extern KMT_MESSAGE_HANDLER TestConnect; static struct { @@ -16,7 +17,8 @@ PKMT_MESSAGE_HANDLER Handler; } MessageHandlers[] = { - { IOCTL_TEST_TDI, TestTdi }, + { IOCTL_TEST_TDI, TestTdi }, + { IOCTL_TEST_CONNECT, TestConnect }, }; NTSTATUS Modified: trunk/rostests/kmtests/tcpip/TcpIp_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_user.… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/TcpIp_user.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -6,6 +6,7 @@ */ #include <kmt_test.h> +#include <winsock2.h> #include "tcpip.h" @@ -35,3 +36,72 @@ UnloadTcpIpTestDriver(); } + +static +DWORD +WINAPI +AcceptProc( + _In_ LPVOID Parameter) +{ + WORD WinsockVersion; + WSADATA WsaData; + int Error; + SOCKET ListenSocket, AcceptSocket; + struct sockaddr_in ListenAddress, AcceptAddress; + int AcceptAddressLength; + HANDLE ReadyToConnectEvent = (HANDLE)Parameter; + + /* Initialize winsock */ + WinsockVersion = MAKEWORD(2, 0); + Error = WSAStartup(WinsockVersion, &WsaData); + ok(Error == 0, ""); + + ListenSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok_bool_true(ListenSocket != INVALID_SOCKET, "socket failed"); + + ZeroMemory(&ListenAddress, sizeof(ListenAddress)); + ListenAddress.sin_addr.S_un.S_addr = inet_addr("127.0.0.1"); + ListenAddress.sin_port = htons(TEST_CONNECT_SERVER_PORT); + ListenAddress.sin_family = AF_INET; + + Error = bind(ListenSocket, (struct sockaddr*)&ListenAddress, sizeof(ListenAddress)); + ok(Error == 0, ""); + + Error = listen(ListenSocket, 1); + ok(Error == 0, ""); + + SetEvent(ReadyToConnectEvent); + + AcceptAddressLength = sizeof(AcceptAddress); + AcceptSocket = accept(ListenSocket, (struct sockaddr*)&AcceptAddress, &AcceptAddressLength); + ok(AcceptSocket != INVALID_SOCKET, "\n"); + ok_eq_long(AcceptAddressLength, sizeof(AcceptAddress)); + ok_eq_hex(AcceptAddress.sin_addr.S_un.S_addr, inet_addr("127.0.0.1")); + ok_eq_hex(AcceptAddress.sin_port, ntohs(TEST_CONNECT_CLIENT_PORT)); + + return 0; +} + +START_TEST(TcpIpConnect) +{ + HANDLE AcceptThread; + HANDLE ReadyToConnectEvent; + + ReadyToConnectEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ok(ReadyToConnectEvent != NULL, "\n"); + + AcceptThread = CreateThread(NULL, 0, AcceptProc, (PVOID)ReadyToConnectEvent, 0, NULL); + ok(AcceptThread != NULL, ""); + + WaitForSingleObject(ReadyToConnectEvent, INFINITE); + + LoadTcpIpTestDriver(); + + ok(KmtSendToDriver(IOCTL_TEST_CONNECT) == ERROR_SUCCESS, "\n"); + + WaitForSingleObject(AcceptThread, INFINITE); + + UnloadTcpIpTestDriver(); + + WSACleanup(); +} Added: trunk/rostests/kmtests/tcpip/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/connect.c?r… ============================================================================== --- trunk/rostests/kmtests/tcpip/connect.c (added) +++ trunk/rostests/kmtests/tcpip/connect.c [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -0,0 +1,272 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite for TCPIP.sys + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> +#include <tdikrnl.h> +#include <ndk/rtlfuncs.h> + +#include <sys/param.h> + +#include "tcpip.h" + +#define TAG_TEST 'tseT' + +#if BYTE_ORDER == LITTLE_ENDIAN +USHORT +htons(USHORT x) +{ + return ((x & 0x00FF) << 8) | ((x & 0xFF00) >> 8); +} +#else +#define htons(x) (x) +#endif + +static +NTSTATUS +NTAPI +IrpCompletionRoutine( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + + KeSetEvent((PKEVENT)Context, IO_NETWORK_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static +VOID +TestTcpConnect(void) +{ + PIRP Irp; + HANDLE AddressHandle, ConnectionHandle; + FILE_OBJECT* ConnectionFileObject; + DEVICE_OBJECT* DeviceObject; + UNICODE_STRING TcpDeviceName = RTL_CONSTANT_STRING(L"\\Device\\Tcp"); + NTSTATUS Status; + PFILE_FULL_EA_INFORMATION FileInfo; + TA_IP_ADDRESS* IpAddress; + TA_IP_ADDRESS ConnectAddress, ReturnAddress; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK StatusBlock; + ULONG FileInfoSize; + IN_ADDR InAddr; + LPCWSTR AddressTerminator; + CONNECTION_CONTEXT ConnectionContext = (CONNECTION_CONTEXT)0xC0CAC01A; + KEVENT Event; + TDI_CONNECTION_INFORMATION RequestInfo, ReturnInfo; + + /* Create a TCP address file */ + FileInfoSize = FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[TDI_TRANSPORT_ADDRESS_LENGTH]) + 1 + sizeof(TA_IP_ADDRESS); + FileInfo = ExAllocatePoolWithTag(NonPagedPool, + FileInfoSize, + TAG_TEST); + ok(FileInfo != NULL, ""); + RtlZeroMemory(FileInfo, FileInfoSize); + + FileInfo->EaNameLength = TDI_TRANSPORT_ADDRESS_LENGTH; + FileInfo->EaValueLength = sizeof(TA_IP_ADDRESS); + RtlCopyMemory(&FileInfo->EaName[0], TdiTransportAddress, TDI_TRANSPORT_ADDRESS_LENGTH); + + IpAddress = (PTA_IP_ADDRESS)(&FileInfo->EaName[TDI_TRANSPORT_ADDRESS_LENGTH + 1]); + IpAddress->TAAddressCount = 1; + IpAddress->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + IpAddress->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + IpAddress->Address[0].Address[0].sin_port = htons(TEST_CONNECT_CLIENT_PORT); + Status = RtlIpv4StringToAddressW(L"127.0.0.1", TRUE, &AddressTerminator, &InAddr); + ok_eq_hex(Status, STATUS_SUCCESS); + IpAddress->Address[0].Address[0].in_addr = InAddr.S_un.S_addr; + + InitializeObjectAttributes(&ObjectAttributes, + &TcpDeviceName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + Status = ZwCreateFile( + &AddressHandle, + GENERIC_READ | GENERIC_WRITE, + &ObjectAttributes, + &StatusBlock, + 0, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0L, + FileInfo, + FileInfoSize); + ok_eq_hex(Status, STATUS_SUCCESS); + + ExFreePoolWithTag(FileInfo, TAG_TEST); + + /* Create a TCP connection file */ + FileInfoSize = FIELD_OFFSET(FILE_FULL_EA_INFORMATION, EaName[TDI_CONNECTION_CONTEXT_LENGTH]) + 1 + sizeof(CONNECTION_CONTEXT); + FileInfo = ExAllocatePoolWithTag(NonPagedPool, + FileInfoSize, + TAG_TEST); + ok(FileInfo != NULL, ""); + RtlZeroMemory(FileInfo, FileInfoSize); + + FileInfo->EaNameLength = TDI_CONNECTION_CONTEXT_LENGTH; + FileInfo->EaValueLength = sizeof(CONNECTION_CONTEXT); + RtlCopyMemory(&FileInfo->EaName[0], TdiConnectionContext, TDI_CONNECTION_CONTEXT_LENGTH); + *((CONNECTION_CONTEXT*)&FileInfo->EaName[TDI_CONNECTION_CONTEXT_LENGTH + 1]) = ConnectionContext; + + Status = ZwCreateFile( + &ConnectionHandle, + GENERIC_READ | GENERIC_WRITE, + &ObjectAttributes, + &StatusBlock, + 0, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN_IF, + 0L, + FileInfo, + FileInfoSize); + ok_eq_hex(Status, STATUS_SUCCESS); + + ExFreePoolWithTag(FileInfo, TAG_TEST); + + /* Get the file and device object for the upcoming IRPs */ + Status = ObReferenceObjectByHandle( + ConnectionHandle, + GENERIC_READ, + *IoFileObjectType, + KernelMode, + (PVOID*)&ConnectionFileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + DeviceObject = IoGetRelatedDeviceObject(ConnectionFileObject); + ok(DeviceObject != NULL, "Device object is NULL!\n"); + + /* Associate the connection file and the address */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + ok(Irp != NULL, "IoAllocateIrp failed.\n"); + + TdiBuildAssociateAddress(Irp, DeviceObject, ConnectionFileObject, NULL, NULL, AddressHandle); + IoSetCompletionRoutine(Irp, IrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + trace("Associate address IRP is pending.\n"); + KeWaitForSingleObject( + &Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = Irp->IoStatus.Status; + } + ok_eq_hex(Status, STATUS_SUCCESS); + IoFreeIrp(Irp); + + + KeClearEvent(&Event); + + /* Build the connect IRP. */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + ok(Irp != NULL, "IoAllocateIrp failed.\n"); + + /* Prepare the request */ + RtlZeroMemory(&RequestInfo, sizeof(RequestInfo)); + RtlZeroMemory(&ConnectAddress, sizeof(ConnectAddress)); + RequestInfo.RemoteAddressLength = sizeof(TA_IP_ADDRESS); + RequestInfo.RemoteAddress = &ConnectAddress; + ConnectAddress.TAAddressCount = 1; + ConnectAddress.Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + ConnectAddress.Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + ConnectAddress.Address[0].Address[0].sin_port = htons(TEST_CONNECT_SERVER_PORT); + Status = RtlIpv4StringToAddressW(L"127.0.0.1", TRUE, &AddressTerminator, &InAddr); + ConnectAddress.Address[0].Address[0].in_addr = InAddr.S_un.S_addr; + + /* See what we will get in exchange */ + RtlZeroMemory(&ReturnInfo, sizeof(ReturnInfo)); + RtlZeroMemory(&ReturnAddress, sizeof(ReturnAddress)); + ReturnInfo.RemoteAddressLength = sizeof(TA_IP_ADDRESS); + ReturnInfo.RemoteAddress = &ReturnAddress; + + TdiBuildConnect(Irp, + DeviceObject, + ConnectionFileObject, + NULL, + NULL, + NULL, + &RequestInfo, + &ReturnInfo); + IoSetCompletionRoutine(Irp, IrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + trace("Connect IRP is pending.\n"); + KeWaitForSingleObject( + &Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = Irp->IoStatus.Status; + trace("Connect IRP completed.\n"); + } + ok_eq_hex(Status, STATUS_SUCCESS); + IoFreeIrp(Irp); + + /* The IRP doesn't touch the return info */ + ok_eq_long(ReturnInfo.RemoteAddressLength, sizeof(TA_IP_ADDRESS)); + ok_eq_pointer(ReturnInfo.RemoteAddress, &ReturnAddress); + ok_eq_long(ReturnInfo.OptionsLength, 0); + ok_eq_pointer(ReturnInfo.Options, NULL); + ok_eq_long(ReturnInfo.UserDataLength, 0); + ok_eq_pointer(ReturnInfo.UserData, NULL); + + ok_eq_long(ReturnAddress.TAAddressCount, 0); + ok_eq_hex(ReturnAddress.Address[0].AddressType, 0); + ok_eq_hex(ReturnAddress.Address[0].AddressLength, 0); + ok_eq_hex(ReturnAddress.Address[0].Address[0].sin_port, 0); + ok_eq_hex(ReturnAddress.Address[0].Address[0].in_addr, 0); + + ObDereferenceObject(ConnectionFileObject); + + ZwClose(ConnectionHandle); + ZwClose(AddressHandle); +} + +static KSTART_ROUTINE RunTest; +static +VOID +NTAPI +RunTest( + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(Context); + + TestTcpConnect(); +} + +KMT_MESSAGE_HANDLER TestConnect; +NTSTATUS +TestConnect( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_opt_ PVOID Buffer, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength +) +{ + PKTHREAD Thread; + + Thread = KmtStartThread(RunTest, NULL); + KmtFinishThread(Thread, NULL); + + return STATUS_SUCCESS; +} Propchange: trunk/rostests/kmtests/tcpip/connect.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/connect.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/kmtests/tcpip/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tcpip.h?rev… ============================================================================== --- trunk/rostests/kmtests/tcpip/tcpip.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/tcpip.h [iso-8859-1] Fri Feb 6 10:49:04 2015 @@ -1,2 +1,7 @@ #define IOCTL_TEST_TDI 1 +#define IOCTL_TEST_CONNECT 2 + +/* For the TDI_CONNECT test */ +#define TEST_CONNECT_SERVER_PORT 12345 +#define TEST_CONNECT_CLIENT_PORT 54321

1 0

[hbelusca] 66179: [FREELDR] - For now, only activate custom ReactOS boot on non-x86 builds. - Fix INI section item list initialization before using it! Fixes custom ReactOS boots (ie. remove an inv...
by hbelusca＠svn.reactos.org 06 Feb '15

06 Feb '15

Author: hbelusca Date: Fri Feb 6 01:21:45 2015 New Revision: 66179 URL: http://svn.reactos.org/svn/reactos?rev=66179&view=rev Log: [FREELDR] - For now, only activate custom ReactOS boot on non-x86 builds. - Fix INI section item list initialization before using it! Fixes custom ReactOS boots (ie. remove an invalid heap free). Now custom ReactOS boots work! Modified: trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] Fri Feb 6 01:21:45 2015 @@ -17,13 +17,13 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> + +/* GLOBALS ********************************************************************/ + #ifdef _M_IX86 - -/* INCLUDES *******************************************************************/ - -#include <freeldr.h> - -/* GLOBALS ********************************************************************/ const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive"; const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition."; @@ -31,6 +31,9 @@ const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18"; const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk."; const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init"; + +#endif // _M_IX86 + const CHAR ReactOSSystemPathPrompt[] = "Enter the path to your ReactOS system directory.\n\nExamples:\n\\REACTOS\n\\ROS"; const CHAR ReactOSOptionsPrompt[] = "Enter the options you want passed to the kernel.\n\nExamples:\n/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200\n/FASTDETECT /SOS /NOGUIBOOT\n/BASEVIDEO /MAXMEM=64\n/KERNEL=NTKRNLMP.EXE /HAL=HALMPS.DLL"; const CHAR CustomBootPrompt[] = "Press ENTER to boot your custom boot setup."; @@ -40,11 +43,13 @@ VOID OptionMenuCustomBoot(VOID) { PCSTR CustomBootMenuList[] = { +#ifdef _M_IX86 "Disk", "Partition", "Boot Sector File", - "ReactOS", - "Linux" + "Linux", +#endif + "ReactOS" }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -64,6 +69,7 @@ switch (SelectedMenuItem) { +#ifdef _M_IX86 case 0: // Disk OptionMenuCustomBootDisk(); break; @@ -73,14 +79,19 @@ case 2: // Boot Sector File OptionMenuCustomBootBootSectorFile(); break; - case 3: // ReactOS + case 3: // Linux + OptionMenuCustomBootLinux(); + break; + case 4: // ReactOS +#else + case 0: +#endif OptionMenuCustomBootReactOS(); break; - case 4: // Linux - OptionMenuCustomBootLinux(); - break; } } + +#ifdef _M_IX86 VOID OptionMenuCustomBootDisk(VOID) { @@ -226,69 +237,6 @@ OperatingSystem.OsLoadOptions = NULL; // LoadAndBootBootSector(&OperatingSystem, 0); - LoadOperatingSystem(&OperatingSystem); -} - -VOID OptionMenuCustomBootReactOS(VOID) -{ - ULONG_PTR SectionId; - CHAR SectionName[100]; - CHAR BootDriveString[20]; - CHAR BootPartitionString[20]; - CHAR ReactOSSystemPath[200]; - CHAR ReactOSARCPath[200]; - CHAR ReactOSOptions[200]; - TIMEINFO* TimeInfo; - OperatingSystemItem OperatingSystem; - - RtlZeroMemory(SectionName, sizeof(SectionName)); - RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); - RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); - RtlZeroMemory(ReactOSSystemPath, sizeof(ReactOSSystemPath)); - RtlZeroMemory(ReactOSOptions, sizeof(ReactOSOptions)); - - if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) - return; - - if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) - return; - - if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, 200)) - return; - - if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, 200)) - return; - - /* Generate a unique section name */ - TimeInfo = ArcGetTime(); - sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); - - /* Add the section */ - if (!IniAddSection(SectionName, &SectionId)) - return; - - /* Add the BootType */ - if (!IniAddSettingValueToSection(SectionId, "BootType", "Windows2003")) - return; - - /* Construct the ReactOS ARC system path */ - ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); - - /* Add the system path */ - if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) - return; - - /* Add the CommandLine */ - if (!IniAddSettingValueToSection(SectionId, "Options", ReactOSOptions)) - return; - - UiMessageBox(CustomBootPrompt); - - OperatingSystem.SystemPartition = SectionName; - OperatingSystem.LoadIdentifier = NULL; - OperatingSystem.OsLoadOptions = NULL; // ReactOSOptions - - // LoadAndBootWindows(&OperatingSystem, _WIN32_WINNT_WS03); LoadOperatingSystem(&OperatingSystem); } @@ -371,6 +319,71 @@ LoadOperatingSystem(&OperatingSystem); } +#endif // _M_IX86 + +VOID OptionMenuCustomBootReactOS(VOID) +{ + ULONG_PTR SectionId; + CHAR SectionName[100]; + CHAR BootDriveString[20]; + CHAR BootPartitionString[20]; + CHAR ReactOSSystemPath[200]; + CHAR ReactOSARCPath[200]; + CHAR ReactOSOptions[200]; + TIMEINFO* TimeInfo; + OperatingSystemItem OperatingSystem; + + RtlZeroMemory(SectionName, sizeof(SectionName)); + RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); + RtlZeroMemory(BootPartitionString, sizeof(BootPartitionString)); + RtlZeroMemory(ReactOSSystemPath, sizeof(ReactOSSystemPath)); + RtlZeroMemory(ReactOSOptions, sizeof(ReactOSOptions)); + + if (!UiEditBox(BootDrivePrompt, BootDriveString, 20)) + return; + + if (!UiEditBox(BootPartitionPrompt, BootPartitionString, 20)) + return; + + if (!UiEditBox(ReactOSSystemPathPrompt, ReactOSSystemPath, 200)) + return; + + if (!UiEditBox(ReactOSOptionsPrompt, ReactOSOptions, 200)) + return; + + /* Generate a unique section name */ + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); + + /* Add the section */ + if (!IniAddSection(SectionName, &SectionId)) + return; + + /* Add the BootType */ + if (!IniAddSettingValueToSection(SectionId, "BootType", "Windows2003")) + return; + + /* Construct the ReactOS ARC system path */ + ConstructArcPath(ReactOSARCPath, ReactOSSystemPath, DriveMapGetBiosDriveNumber(BootDriveString), atoi(BootPartitionString)); + + /* Add the system path */ + if (!IniAddSettingValueToSection(SectionId, "SystemPath", ReactOSARCPath)) + return; + + /* Add the CommandLine */ + if (!IniAddSettingValueToSection(SectionId, "Options", ReactOSOptions)) + return; + + UiMessageBox(CustomBootPrompt); + + OperatingSystem.SystemPartition = SectionName; + OperatingSystem.LoadIdentifier = NULL; + OperatingSystem.OsLoadOptions = NULL; // ReactOSOptions + + // LoadAndBootWindows(&OperatingSystem, _WIN32_WINNT_WS03); + LoadOperatingSystem(&OperatingSystem); +} + VOID OptionMenuReboot(VOID) { UiMessageBox("The system will now reboot."); @@ -378,5 +391,3 @@ DiskStopFloppyMotor(); Reboot(); } - -#endif // _M_IX86 Modified: trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/i… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/inifile/inifile.c [iso-8859-1] Fri Feb 6 01:21:45 2015 @@ -199,6 +199,7 @@ // Get the section name strcpy(Section->SectionName, SectionName); + InitializeListHead(&Section->SectionItemList); // Add it to the section list head IniFileSectionCount++;

1 0

[hbelusca] 66178: [SHELL32] - Fix registry value retrieval with RegGetValue (RRF_RT_REG_EXPAND_SZ has a non-obvious functioning: it should be used with NO_EXPAND flag. Otherwise use RRF_RT_REG_SZ t...
by hbelusca＠svn.reactos.org 06 Feb '15

06 Feb '15

Author: hbelusca Date: Fri Feb 6 00:07:23 2015 New Revision: 66178 URL: http://svn.reactos.org/svn/reactos?rev=66178&view=rev Log: [SHELL32] - Fix registry value retrieval with RegGetValue (RRF_RT_REG_EXPAND_SZ has a non-obvious functioning: it should be used with NO_EXPAND flag. Otherwise use RRF_RT_REG_SZ to retrieve REG_SZ values, or REG_EXPAND_SZ values with automatic expansion as expected). CORE-9001 #resolve #comment Fixed, thanks for reporting! - Fix whitespace. Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp Modified: trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefault… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefaultContextMenu.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -450,12 +450,12 @@ if (m_bGroupPolicyActive) { if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - pwszClsid, - RRF_RT_REG_SZ, - NULL, - NULL, - NULL) == ERROR_SUCCESS) + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + pwszClsid, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL) == ERROR_SUCCESS) { LoadDynamicContextMenuHandler(hKey, &clsid); } Modified: trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/drvdefext.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -366,12 +366,12 @@ DWORD cbBuf = sizeof(wszBuf); if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\CleanupPath", - NULL, - RRF_RT_REG_SZ, - NULL, - (PVOID)wszBuf, - &cbBuf) == ERROR_SUCCESS) + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\CleanupPath", + NULL, + RRF_RT_REG_SZ, + NULL, + (PVOID)wszBuf, + &cbBuf) == ERROR_SUCCESS) { WCHAR wszCmd[MAX_PATH]; @@ -460,7 +460,7 @@ if (RegGetValueW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\BackupPath", NULL, - RRF_RT_REG_EXPAND_SZ, + RRF_RT_REG_SZ, NULL, (PVOID)wszBuf, &cbBuf) == ERROR_SUCCESS) Modified: trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -1810,12 +1810,12 @@ if (m_bGroupPolicyActive) { if (RegGetValueW(HKEY_LOCAL_MACHINE, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", - pwszClsid, - RRF_RT_REG_SZ, - NULL, - NULL, - NULL) == ERROR_SUCCESS) + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + pwszClsid, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL) == ERROR_SUCCESS) { hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); } Modified: trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Fri Feb 6 00:07:23 2015 @@ -1639,7 +1639,7 @@ ret = RegGetValueW(HKEY_CURRENT_USER, L"AppEvents\\Schemes\\Apps\\Explorer\\EmptyRecycleBin\\.Current", NULL, - RRF_RT_REG_EXPAND_SZ, + RRF_RT_REG_SZ, &dwType, (PVOID)szPath, &dwSize);

1 0

[jimtabor] 66177: [Win32ss] - Validate the parent window before locking it. Attempt to fix CORE-9117.
by jimtabor＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: jimtabor Date: Thu Feb 5 23:46:57 2015 New Revision: 66177 URL: http://svn.reactos.org/svn/reactos?rev=66177&view=rev Log: [Win32ss] - Validate the parent window before locking it. Attempt to fix CORE-9117. Modified: trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Thu Feb 5 23:46:57 2015 @@ -1473,7 +1473,7 @@ if ( (pWindow->style & (WS_CHILD | WS_POPUP)) == WS_CHILD && !(pWindow->style & WS_EX_NOPARENTNOTIFY)) { - if (pWindow->spwndParent && pWindow->spwndParent != UserGetDesktopWindow()) + if (VerifyWnd(pWindow->spwndParent) && pWindow->spwndParent != UserGetDesktopWindow()) { USER_REFERENCE_ENTRY Ref; UserRefObjectCo(pWindow->spwndParent, &Ref);

1 0

[akhaldi] 66176: [DLLs] Revert r66167 (Privatize the exports that should be so). Fixes MSVC build. Of course the glorious GCC toolchain is oblivious to this.
by akhaldi＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: akhaldi Date: Thu Feb 5 22:12:55 2015 New Revision: 66176 URL: http://svn.reactos.org/svn/reactos?rev=66176&view=rev Log: [DLLs] Revert r66167 (Privatize the exports that should be so). Fixes MSVC build. Of course the glorious GCC toolchain is oblivious to this. Modified: trunk/reactos/dll/win32/msxml3/msxml3.spec trunk/reactos/dll/win32/ole32/ole32.spec trunk/reactos/dll/win32/rsaenh/rsaenh.spec Modified: trunk/reactos/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.sp… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] Thu Feb 5 22:12:55 2015 @@ -7,6 +7,6 @@ 12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() -@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: trunk/reactos/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.spec… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.spec [iso-8859-1] Thu Feb 5 22:12:55 2015 @@ -133,7 +133,7 @@ @ stdcall CreateStreamOnHGlobal(ptr long ptr) # DcomChannelSetHResult @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall DllGetClassObject(ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall DoDragDrop(ptr ptr long ptr) Modified: trunk/reactos/dll/win32/rsaenh/rsaenh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/rsaenh.sp… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/rsaenh.spec [iso-8859-1] Thu Feb 5 22:12:55 2015 @@ -23,5 +23,5 @@ @ stdcall CPSetProvParam(long long ptr long) RSAENH_CPSetProvParam @ stdcall CPSignHash(long long long wstr long ptr ptr) RSAENH_CPSignHash @ stdcall CPVerifySignature(long long ptr long long wstr long) RSAENH_CPVerifySignature -@ stdcall -private DllRegisterServer() -@ stdcall -private DllUnregisterServer() +@ stdcall DllRegisterServer() +@ stdcall DllUnregisterServer()

1 0

[jimtabor] 66175: [User32] - Return timeout if the count and wait time is zero. This is a wine hack and fixes two related mgs:test_MsgWait* tests. Attempt to fix CORE-9117. Not sure if MsgWaitForMu...
by jimtabor＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: jimtabor Date: Thu Feb 5 21:31:05 2015 New Revision: 66175 URL: http://svn.reactos.org/svn/reactos?rev=66175&view=rev Log: [User32] - Return timeout if the count and wait time is zero. This is a wine hack and fixes two related mgs:test_MsgWait* tests. Attempt to fix CORE-9117. Not sure if MsgWaitForMultipleObjects is the problem. 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] Thu Feb 5 21:31:05 2015 @@ -3107,7 +3107,7 @@ if ( (pcti->fsChangeBits & LOWORD(dwWakeMask)) || ( (dwFlags & MWMO_INPUTAVAILABLE) && (pcti->fsWakeBits & LOWORD(dwWakeMask)) ) ) { - //FIXME("Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); + //FIXME("Return Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); return nCount; } } @@ -3130,12 +3130,22 @@ RtlCopyMemory(RealHandles, pHandles, nCount * sizeof(HANDLE)); RealHandles[nCount] = MessageQueueHandle; - Result = WaitForMultipleObjectsEx(nCount + 1, RealHandles, - dwFlags & MWMO_WAITALL, - dwMilliseconds, dwFlags & MWMO_ALERTABLE); + //FIXME("1 Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); + + Result = WaitForMultipleObjectsEx( nCount + 1, + RealHandles, + dwFlags & MWMO_WAITALL, + dwMilliseconds, + dwFlags & MWMO_ALERTABLE ); + + //FIXME("2 Chg 0x%x Wake 0x%x Mask 0x%x nCnt %d\n",pcti->fsChangeBits, pcti->fsWakeBits, dwWakeMask, nCount); HeapFree(GetProcessHeap(), 0, RealHandles); NtUserxMsqClearWakeMask(); + + // wine hack! MSDN: If dwMilliseconds is zero,,specified objects are not signaled; it always returns immediately. + if (!Result && !nCount && !dwMilliseconds) Result = WAIT_TIMEOUT; + //FIXME("Result 0X%x\n",Result); return Result; }

1 0

[hbelusca] 66174: [FREELDR]: Remove some extra newlines at the end of error messages that are displayed via message boxes, and also for few of them, use the fact that our message boxes implement pr...
by hbelusca＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: hbelusca Date: Thu Feb 5 21:24:26 2015 New Revision: 66174 URL: http://svn.reactos.org/svn/reactos?rev=66174&view=rev Log: [FREELDR]: Remove some extra newlines at the end of error messages that are displayed via message boxes, and also for few of them, use the fact that our message boxes implement printf-like features. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/windows/peloader.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -384,7 +384,7 @@ PcrBasePage = Pcr >> MM_PAGE_SHIFT; if (Pcr == 0) { - UiMessageBox("Can't allocate PCR\n"); + UiMessageBox("Can't allocate PCR."); return; } RtlZeroMemory((PVOID)Pcr, 2 * MM_PAGE_SIZE); @@ -400,7 +400,7 @@ GdtIdt = (PKGDTENTRY)MmAllocateMemoryWithType(NumPages * MM_PAGE_SIZE, LoaderMemoryData); if (GdtIdt == NULL) { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); + UiMessageBox("Can't allocate pages for GDT+IDT!"); return; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/drivemap.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -30,16 +30,15 @@ #ifndef _MSC_VER VOID DriveMapMapDrivesInSection(PCSTR SectionName) { - CHAR SettingName[80]; - CHAR SettingValue[80]; - CHAR ErrorText[260]; - CHAR Drive1[80]; - CHAR Drive2[80]; - ULONG SectionId; - ULONG SectionItemCount; - ULONG Index; - ULONG Index2; - DRIVE_MAP_LIST DriveMapList; + CHAR SettingName[80]; + CHAR SettingValue[80]; + CHAR Drive1[80]; + CHAR Drive2[80]; + ULONG SectionId; + ULONG SectionItemCount; + ULONG Index; + ULONG Index2; + DRIVE_MAP_LIST DriveMapList; RtlZeroMemory(&DriveMapList, sizeof(DRIVE_MAP_LIST)); @@ -62,8 +61,7 @@ // Make sure we haven't exceeded the drive map max count if (DriveMapList.DriveMapCount >= 4) { - sprintf(ErrorText, "Max DriveMap count exceeded in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); - UiMessageBox(ErrorText); + UiMessageBox("Max DriveMap count exceeded in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); continue; } @@ -88,8 +86,7 @@ // Make sure we got good values before we add them to the map if (!DriveMapIsValidDriveString(Drive1) || !DriveMapIsValidDriveString(Drive2)) { - sprintf(ErrorText, "Error in DriveMap setting in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); - UiMessageBox(ErrorText); + UiMessageBox("Error in DriveMap setting in section [%s]:\n\n%s=%s", SectionName, SettingName, SettingValue); continue; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -365,7 +365,7 @@ if (Pcr == 0) { - UiMessageBox("Can't allocate PCR\n"); + UiMessageBox("Can't allocate PCR."); return; } @@ -384,7 +384,7 @@ if (GdtIdt == NULL) { - UiMessageBox("Can't allocate pages for GDT+IDT!\n"); + UiMessageBox("Can't allocate pages for GDT+IDT!"); return; } Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -155,7 +155,7 @@ // if (Information.EndingAddress.HighPart != 0) { - UiMessageBox("RAM disk too big\n"); + UiMessageBox("RAM disk too big."); FsCloseFile(RamFile); return FALSE; } @@ -172,7 +172,7 @@ gRamDiskBase = MmAllocateMemoryWithType(gRamDiskSize, LoaderXIPRom); if (!gRamDiskBase) { - UiMessageBox("Failed to allocate memory for RAM disk\n"); + UiMessageBox("Failed to allocate memory for RAM disk."); FsCloseFile(RamFile); return FALSE; } @@ -222,7 +222,7 @@ gRamDiskBase = NULL; gRamDiskSize = 0; FsCloseFile(RamFile); - UiMessageBox("Failed to read RAM disk\n"); + UiMessageBox("Failed to read RAM disk."); return FALSE; } } Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -41,13 +41,13 @@ if (!UiInitialize(FALSE)) { - UiMessageBoxCritical("Unable to initialize UI.\n"); + UiMessageBoxCritical("Unable to initialize UI."); goto Quit; } if (!MmInitializeMemoryManager()) { - UiMessageBoxCritical("Unable to initialize memory manager"); + UiMessageBoxCritical("Unable to initialize memory manager."); goto Quit; } Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -82,7 +82,6 @@ PCSTR Description = OperatingSystem->LoadIdentifier; PFILE LinuxKernel = 0; PFILE LinuxInitrdFile = 0; - CHAR TempString[260]; UiDrawBackdrop(); @@ -102,8 +101,7 @@ LinuxKernel = FsOpenFile(LinuxKernelName); if (!LinuxKernel) { - sprintf(TempString, "Linux kernel \'%s\' not found.", LinuxKernelName); - UiMessageBox(TempString); + UiMessageBox("Linux kernel \'%s\' not found.", LinuxKernelName); goto LinuxBootFailed; } @@ -113,8 +111,7 @@ LinuxInitrdFile = FsOpenFile(LinuxInitrdName); if (!LinuxInitrdFile) { - sprintf(TempString, "Linux initrd image \'%s\' not found.", LinuxInitrdName); - UiMessageBox(TempString); + UiMessageBox("Linux initrd image \'%s\' not found.", LinuxInitrdName); goto LinuxBootFailed; } } @@ -212,7 +209,6 @@ BOOLEAN LinuxParseIniSection(PCSTR SectionName) { ULONG_PTR SectionId; - CHAR SettingName[260]; /* Find all the message box settings and run them */ UiShowMessageBoxesInSection(SectionName); @@ -220,8 +216,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -34,7 +34,6 @@ CHAR FileName[260]; PFILE FilePointer; ULONG BytesRead; - CHAR SettingName[80]; /* Find all the message box settings and run them */ UiShowMessageBoxesInSection(SectionName); @@ -42,8 +41,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return; } @@ -56,8 +54,7 @@ FilePointer = FsOpenFile(FileName); if (!FilePointer) { - strcat(FileName, " not found."); - UiMessageBox(FileName); + UiMessageBox("%s not found.", FileName); return; } @@ -97,7 +94,6 @@ { ULONG_PTR SectionId; PCSTR SectionName = OperatingSystem->SystemPartition; - CHAR SettingName[80]; CHAR SettingValue[80]; PARTITION_TABLE_ENTRY PartitionTableEntry; UCHAR DriveNumber; @@ -109,8 +105,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return; } @@ -175,7 +170,6 @@ { ULONG_PTR SectionId; PCSTR SectionName = OperatingSystem->SystemPartition; - CHAR SettingName[80]; CHAR SettingValue[80]; UCHAR DriveNumber; @@ -185,8 +179,7 @@ /* Try to open the operating system section in the .ini file */ if (!IniOpenSection(SectionName, &SectionId)) { - sprintf(SettingName, "Section [%s] not found in freeldr.ini.\n", SectionName); - UiMessageBox(SettingName); + UiMessageBox("Section [%s] not found in freeldr.ini.", SectionName); return; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/peloader.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -282,7 +282,7 @@ Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - //UiMessageBox("Can not open the file"); + // UiMessageBox("Can not open the file."); return FALSE; } @@ -290,7 +290,7 @@ Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); if (Status != ESUCCESS) { - UiMessageBox("Error reading from file"); + UiMessageBox("Error reading from file."); ArcClose(FileId); return FALSE; } @@ -299,8 +299,8 @@ NtHeaders = RtlImageNtHeader(HeadersBuffer); if (!NtHeaders) { - //Print(L"Error - no NT header found in %s\n", FileName); - UiMessageBox("Error - no NT header found"); + // Print(L"Error - no NT header found in %s\n", FileName); + UiMessageBox("Error - no NT header found."); ArcClose(FileId); return FALSE; } @@ -308,8 +308,8 @@ /* Ensure this is executable image */ if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) { - //Print(L"Not an executable image %s\n", FileName); - UiMessageBox("Not an executable image"); + // Print(L"Not an executable image %s\n", FileName); + UiMessageBox("Not an executable image."); ArcClose(FileId); return FALSE; } @@ -330,8 +330,8 @@ if (PhysicalBase == NULL) { - //Print(L"Failed to alloc pages for image %s\n", FileName); - UiMessageBox("Failed to alloc pages for image"); + // Print(L"Failed to alloc pages for image %s\n", FileName); + UiMessageBox("Failed to alloc pages for image."); ArcClose(FileId); return FALSE; } @@ -347,7 +347,7 @@ Status = ArcSeek(FileId, &Position, SeekAbsolute); if (Status != ESUCCESS) { - UiMessageBox("Error seeking to start of file"); + UiMessageBox("Error seeking to start of file."); ArcClose(FileId); return FALSE; } @@ -355,8 +355,8 @@ Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); if (Status != ESUCCESS) { - //Print(L"Error reading headers %s\n", FileName); - UiMessageBox("Error reading headers"); + // Print(L"Error reading headers %s\n", FileName); + UiMessageBox("Error reading headers."); ArcClose(FileId); return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -682,7 +682,7 @@ /* Load the ramdisk */ if (!RamDiskLoadVirtualFile(FileName)) { - UiMessageBox("Failed to load RAM disk file %s\n", FileName); + UiMessageBox("Failed to load RAM disk file %s", FileName); return; } } Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -220,7 +220,7 @@ MemoryMap = MmGetMemoryMap(&NoEntries); if (MemoryMap == NULL) { - UiMessageBox("Can not retrieve the current memory map"); + UiMessageBox("Can not retrieve the current memory map."); return FALSE; } @@ -334,7 +334,7 @@ /*Status = MempSetupPaging(OsLoaderBase >> MM_PAGE_SHIFT, OsLoaderSize >> MM_PAGE_SHIFT); if (!Status) { - UiMessageBox("Error during MempSetupPaging"); + UiMessageBox("Error during MempSetupPaging."); return; }*/ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlregistry.c [iso-8859-1] Thu Feb 5 21:24:26 2015 @@ -437,8 +437,7 @@ return TRUE; Failure: - //UiMessageBox("Error reading NLS file %s\n", Filename); - UiMessageBox("Error reading NLS file!"); + UiMessageBox("Error reading NLS file %s", FileName); return FALSE; }

1 0

[hbelusca] 66173: [FREELDR]: Fix initialization of BootPath variable, and add some explanation comment as requested long time ago by Pierre.
by hbelusca＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: hbelusca Date: Thu Feb 5 21:17:35 2015 New Revision: 66173 URL: http://svn.reactos.org/svn/reactos?rev=66173&view=rev Log: [FREELDR]: Fix initialization of BootPath variable, and add some explanation comment as requested long time ago by Pierre. Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Thu Feb 5 21:17:35 2015 @@ -183,8 +183,16 @@ if (!HasSection || !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) { + /* + * IMPROVE: I don't want to call MachDiskGetBootPath here as a + * default choice because I can call it after (see few lines below). + * Also doing the strcpy call as it is done in winldr.c is not + * really what we want. Instead I reset BootPath here so that + * we can build the full path using the general code from below. + */ // MachDiskGetBootPath(BootPath, sizeof(BootPath)); // strcpy(BootPath, SectionName); + BootPath[0] = '\0'; } /* @@ -239,7 +247,7 @@ /* Load the ramdisk */ if (!RamDiskLoadVirtualFile(FileName)) { - UiMessageBox("Failed to load RAM disk file %s\n", FileName); + UiMessageBox("Failed to load RAM disk file %s", FileName); return; } } @@ -256,7 +264,7 @@ SystemPath = SourcePaths[i]; if (!SystemPath) { - UiMessageBox("Failed to open txtsetup.sif\n"); + UiMessageBox("Failed to open txtsetup.sif"); return; } strcpy(File, SystemPath);

1 0

[tkreuzer] 66172: [W32KNAPI] Load NtGdiFlushUserBatch dynamically to allow loading on Win 2003, where the function does not exist. ROSTESTS-131 #resolve
by tkreuzer＠svn.reactos.org 05 Feb '15

05 Feb '15

Author: tkreuzer Date: Thu Feb 5 10:10:33 2015 New Revision: 66172 URL: http://svn.reactos.org/svn/reactos?rev=66172&view=rev Log: [W32KNAPI] Load NtGdiFlushUserBatch dynamically to allow loading on Win 2003, where the function does not exist. ROSTESTS-131 #resolve Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiFlushUserBatch.c [iso-8859-1] Thu Feb 5 10:10:33 2015 @@ -1,3 +1,8 @@ + + +NTSTATUS +(NTAPI +*pNtGdiFlushUserBatch)(VOID); INT Test_NtGdiFlushUserBatch(PTESTINFO pti) @@ -5,10 +10,14 @@ PVOID pRet; PTEB pTeb; + pNtGdiFlushUserBatch = (PVOID)GetProcAddress(g_hModule, "NtGdiFlushUserBatch"); + if (pNtGdiFlushUserBatch == NULL) + return APISTATUS_NOT_FOUND; + pTeb = NtCurrentTeb(); ASSERT(pTeb); - pRet = (PVOID)NtGdiFlushUserBatch(); + pRet = (PVOID)pNtGdiFlushUserBatch(); TEST(pRet != 0); TEST(pRet == &pTeb->RealClientId); @@ -23,7 +32,7 @@ pTeb->GdiTebBatch.Offset = 21; pTeb->GdiTebBatch.HDC = (HDC)123; - pRet = (PVOID)NtGdiFlushUserBatch(); + pRet = (PVOID)pNtGdiFlushUserBatch(); TEST(pRet == &pTeb->RealClientId); TEST(pTeb->InDbgPrint == 0);

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