Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 62554: [NTOS:PO] - Fix symbolic link name handling in PopAddRemoveSysCapsCallback. Fixes ACPI power button. CORE-8017 #resolve
by tfaber＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: tfaber Date: Sun Mar 23 17:33:01 2014 New Revision: 62554 URL: http://svn.reactos.org/svn/reactos?rev=62554&view=rev Log: [NTOS:PO] - Fix symbolic link name handling in PopAddRemoveSysCapsCallback. Fixes ACPI power button. CORE-8017 #resolve Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/po/events.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sun Mar 23 17:33:01 2014 @@ -739,7 +739,7 @@ if (ReturnBuffer.Length + KeyName.Length + sizeof(WCHAR) > ReturnBuffer.MaximumLength) { PWSTR NewBuffer; - ReturnBuffer.MaximumLength = (USHORT)max(ReturnBuffer.MaximumLength * sizeof(WCHAR), + ReturnBuffer.MaximumLength = (USHORT)max(2 * ReturnBuffer.MaximumLength, (USHORT)(ReturnBuffer.Length + KeyName.Length + 2 * sizeof(WCHAR))); @@ -800,6 +800,7 @@ } /* Add final NULL to ReturnBuffer */ + NT_ASSERT(ReturnBuffer.Length <= ReturnBuffer.MaximumLength); if (ReturnBuffer.Length >= ReturnBuffer.MaximumLength) { PWSTR NewBuffer; Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Sun Mar 23 17:33:01 2014 @@ -162,8 +162,6 @@ BOOLEAN Arrival; ULONG Caps; NTSTATUS Status; - UNICODE_STRING DeviceName; - UNICODE_STRING DeviceNamePrefix = RTL_CONSTANT_STRING(L"\\??\\"); DPRINT("PopAddRemoveSysCapsCallback(%p %p)\n", NotificationStructure, Context); @@ -184,20 +182,10 @@ { DPRINT("Arrival of %wZ\n", Notification->SymbolicLinkName); - DeviceName.Length = 0; - DeviceName.MaximumLength = Notification->SymbolicLinkName->MaximumLength + DeviceNamePrefix.MaximumLength; - DeviceName.Buffer = ExAllocatePool(PagedPool, DeviceName.MaximumLength); - if (!DeviceName.Buffer) return STATUS_INSUFFICIENT_RESOURCES; - - RtlCopyUnicodeString(&DeviceName, &DeviceNamePrefix); - RtlAppendUnicodeStringToString(&DeviceName, Notification->SymbolicLinkName); - - DPRINT("Opening handle to %wZ\n", &DeviceName); - /* Open the device */ InitializeObjectAttributes( &ObjectAttributes, - &DeviceName, + Notification->SymbolicLinkName, OBJ_KERNEL_HANDLE, NULL, NULL); @@ -208,7 +196,6 @@ &IoStatusBlock, FILE_SHARE_READ | FILE_SHARE_WRITE, 0); - RtlFreeUnicodeString(&DeviceName); if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenFile() failed with status 0x%08lx\n", Status);

1 0

[tfaber] 62553: [KMTEST:IO] - Disable IoRegisterDeviceInterface test, since it crashes on Windows - Add test showing that IoRegisterPlugPlayNotification's callback receives the full path to the sym...
by tfaber＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: tfaber Date: Sun Mar 23 17:24:10 2014 New Revision: 62553 URL: http://svn.reactos.org/svn/reactos?rev=62553&view=rev Log: [KMTEST:IO] - Disable IoRegisterDeviceInterface test, since it crashes on Windows - Add test showing that IoRegisterPlugPlayNotification's callback receives the full path to the symbolic link (this was fixed in r62249) Added: trunk/rostests/kmtests/kmtest_drv/guid.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c 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] Sun Mar 23 17:24:10 2014 @@ -22,6 +22,7 @@ # kmtest_drv.sys driver # list(APPEND KMTEST_DRV_SOURCE + kmtest_drv/guid.c kmtest_drv/kmtest_drv.c kmtest_drv/testlist.c Added: trunk/rostests/kmtests/kmtest_drv/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/guid.c… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/guid.c (added) +++ trunk/rostests/kmtests/kmtest_drv/guid.c [iso-8859-1] Sun Mar 23 17:24:10 2014 @@ -0,0 +1,7 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <wdm.h> +#include <initguid.h> +#include <poclass.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/rostests/kmtests/kmtest_drv/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_io/IoDeviceI… ============================================================================== --- trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] Sun Mar 23 17:24:10 2014 @@ -8,6 +8,7 @@ /* TODO: what's with the prototypes at the top, what's with the if-ed out part? Doesn't process most results */ #include <kmt_test.h> +#include <poclass.h> #define NDEBUG #include <debug.h> @@ -85,7 +86,9 @@ ExFreePool(SymbolicLinkList); } -START_TEST(IoDeviceInterface) +static +VOID +Test_IoRegisterDeviceInterface(VOID) { GUID Guid = {0x378de44c, 0x56ef, 0x11d1, {0xbc, 0x8c, 0x00, 0xa0, 0xc9, 0x14, 0x05, 0xdd}}; DEVICE_OBJECT DeviceObject; @@ -118,3 +121,69 @@ DeviceInterfaceTest_Func(); } + +static UCHAR NotificationContext; + +static DRIVER_NOTIFICATION_CALLBACK_ROUTINE NotificationCallback; +static +NTSTATUS +NTAPI +NotificationCallback( + _In_ PVOID NotificationStructure, + _Inout_opt_ PVOID Context) +{ + PDEVICE_INTERFACE_CHANGE_NOTIFICATION Notification = NotificationStructure; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + + ok_irql(PASSIVE_LEVEL); + ok_eq_pointer(Context, &NotificationContext); + ok_eq_uint(Notification->Version, 1); + ok_eq_uint(Notification->Size, sizeof(*Notification)); + + /* symbolic link must exist */ + trace("Interface change: %wZ\n", Notification->SymbolicLinkName); + InitializeObjectAttributes(&ObjectAttributes, + Notification->SymbolicLinkName, + OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenSymbolicLinkObject(&Handle, GENERIC_READ, &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No symbolic link\n")) + { + Status = ObCloseHandle(Handle, KernelMode); + ok_eq_hex(Status, STATUS_SUCCESS); + } + return STATUS_SUCCESS; +} + +static +VOID +Test_IoRegisterPlugPlayNotification(VOID) +{ + NTSTATUS Status; + PVOID NotificationEntry; + + Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, + PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, + (PVOID)&GUID_DEVICE_SYS_BUTTON, + KmtDriverObject, + NotificationCallback, + &NotificationContext, + &NotificationEntry); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "PlugPlayNotification not registered\n")) + { + Status = IoUnregisterPlugPlayNotification(NotificationEntry); + ok_eq_hex(Status, STATUS_SUCCESS); + } +} + +START_TEST(IoDeviceInterface) +{ + // FIXME: This test crashes in Windows + (void)Test_IoRegisterDeviceInterface; + Test_IoRegisterPlugPlayNotification(); +}

1 0

[hbelusca] 62552: [NOTEVIL] New people from the CREDITS list.
by hbelusca＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: hbelusca Date: Sun Mar 23 02:57:36 2014 New Revision: 62552 URL: http://svn.reactos.org/svn/reactos?rev=62552&view=rev Log: [NOTEVIL] New people from the CREDITS list. Modified: trunk/rosapps/applications/notevil/notevil.rc trunk/rosapps/applications/notevil/resource.h Modified: trunk/rosapps/applications/notevil/notevil.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/notev… ============================================================================== --- trunk/rosapps/applications/notevil/notevil.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/notevil.rc [iso-8859-1] Sun Mar 23 02:57:36 2014 @@ -23,66 +23,91 @@ 1, "Boudewijn Dekker (Ariadne)" 2, "Robert Bergkvist (FragDance Galore)" 3, "Arindam Das" - 4, "Boudewijn Dekker" - 5, "Jason Eager" - 6, "Jason Filby" - 7, "Rex Jolliff" - 8, "Eric Kohl" - 9, "Hans Kremer" - 10, "Frederik Leemans" - 11, "Jean Michault" - 12, "Jim Noeth" - 13, "Brian Palmer" - 14, "Matt Pyne" - 15, "Jason Weiler" + 4, "Jason Eager" + 5, "Jason Filby" + 6, "Rex Jolliff" + 7, "Eric Kohl" + 8, "Hans Kremer" + 9, "Frederik Leemans" + 10, "Jean Michault" + 11, "Jim Noeth" + 12, "Brian Palmer" + 13, "Matt Pyne" + 14, "Jason Weiler" + 15, "David Welch" END STRINGTABLE MOVEABLE BEGIN - 16, "David Welch" - 17, "Emanuele Aliberti" - 18, "Phillip Susi" - 19, "Paolo Pantaleo" - 20, "Hernan Ochoa" - 21, "Casper Hornstrup" - 22, "Steven Edwards" - 23, "KJK::Hyperion" - 24, "Robert Dickenson" - 25, "Eugene Ingerman" - 26, "Guido de Jong" - 27, "Jurgen van Gael" - 28, "Marty Dill" - 29, "Ge van Geldorp" - 30, "Richard Campbell" + 16, "Emanuele Aliberti" + 17, "Phillip Susi" + 18, "Paolo Pantaleo" + 19, "Hernan Ochoa" + 20, "Casper S. Hornstrup" + 21, "Steven Edwards" + 22, "KJK::Hyperion" + 23, "Robert Dickenson" + 24, "Eugene Ingerman" + 25, "Guido de Jong" + 26, "Jurgen van Gael" + 27, "Marty Dill" + 28, "Ge van Geldorp" + 29, "Richard Campbell" + 30, "Gunnar Andre' Dalsnes" END STRINGTABLE MOVEABLE BEGIN - 31, "Gunnar Andre' Dalsnes" - 32, "Aleksey Bragin" - 33, "Royce Mitchell III" - 34, "Mark Tempel" - 35, "Art Yerkes" - 36, "Martin Fuchs" - 37, "Vizzini" - 38, "Filip Navara" - 39, "Andrew Greenwood" - 40, "Thomas Weidenmueller" - 41, "Jonathan Wilson" - 42, "Alex Ionescu" - 43, "Jim Tabor" - 44, "Magnus Olsen" - 45, "Herve Poussineau" + 31, "Aleksey Bragin" + 32, "Royce Mitchell III" + 33, "Mark Tempel" + 34, "Art Yerkes" + 35, "Martin Fuchs" + 36, "Vizzini" + 37, "Filip Navara" + 38, "Andrew Greenwood" + 39, "Thomas Weidenmueller" + 40, "Jonathan Wilson" + 41, "Alex Ionescu" + 42, "James Tabor" + 43, "Magnus Olsen" + 44, "Herve Poussineau" + 45, "Christoph von Wittich" END STRINGTABLE MOVEABLE BEGIN - 46, "Christoph von Wittich" - 47, "Brandon Turner" - 48, "Ged Murphy" - 49, "Klemens R. Friedl" - 50, "Maarten Bosma" - 51, "Saveliy Tretiakov" + 46, "Brandon Turner" + 47, "Ged Murphy" + 48, "Klemens R. Friedl" + 49, "Maarten Bosma" + 50, "Saveliy Tretiakov" + 51, "Amine Khaldi" + 52, "Andrew Munger" + 53, "Cameron M. Gutman" + 54, "Daniel Reimer" + 55, "Dmitry Chapyshev" + 56, "Gregor Brunmar" + 57, "Gregor Schneider" + 58, "Iwan Fatahi" + 59, "Jeffrey Morlan" + 60, "Johannes Anderwald" +END + +STRINGTABLE MOVEABLE +BEGIN + 61, "Mark Weaver" + 62, "Matthias Kupfer" + 63, "Mike Nordell" + 64, "Nathan Woods" + 65, "Pablo Borobia" + 66, "Peter Ward" + 67, "Pierre Schweitzer" + 68, "Rafal Harabien" + 69, "Samuel Serapion" + 70, "Stefan Ginsberg" + 71, "Timo Kreuzer" + 72, "Victor Kirhenshtein" END /* EOF */ Modified: trunk/rosapps/applications/notevil/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/resou… ============================================================================== --- trunk/rosapps/applications/notevil/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/resource.h [iso-8859-1] Sun Mar 23 02:57:36 2014 @@ -1,2 +1,2 @@ #define RES_FIRST_INDEX 1 -#define RES_LAST_INDEX 51 +#define RES_LAST_INDEX 72

1 0

[hbelusca] 62551: Fix CREDITS.
by hbelusca＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: hbelusca Date: Sun Mar 23 02:30:54 2014 New Revision: 62551 URL: http://svn.reactos.org/svn/reactos?rev=62551&view=rev Log: Fix CREDITS. Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=62551&r1=62550… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Sun Mar 23 02:30:54 2014 @@ -7,7 +7,7 @@ Andrew Munger <waxdragon(a)gmail.com> Arindam Das Art Yerkes <ayerkes(a)speakeasy.net> -Ariadne +Boudewijn Dekker (Ariadne) Brandon Turner <turnerb7(a)msu.edu> Brian Palmer <brianp(a)sginet.com> Cameron M. Gutman <cgutman(a)reactos.org>

1 0

[hbelusca] 62550: [NOTEVIL] - Convert our goode olde ReactOS Easter Egg "notevil" app to unicode. - Remove .rbuild file. - Code formatting.
by hbelusca＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: hbelusca Date: Sun Mar 23 02:24:33 2014 New Revision: 62550 URL: http://svn.reactos.org/svn/reactos?rev=62550&view=rev Log: [NOTEVIL] - Convert our goode olde ReactOS Easter Egg "notevil" app to unicode. - Remove .rbuild file. - Code formatting. Removed: trunk/rosapps/applications/notevil/notevil.rbuild Modified: trunk/rosapps/applications/notevil/CMakeLists.txt trunk/rosapps/applications/notevil/notevil.c trunk/rosapps/applications/notevil/notevil.rc Modified: trunk/rosapps/applications/notevil/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/CMake… ============================================================================== --- trunk/rosapps/applications/notevil/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/CMakeLists.txt [iso-8859-1] Sun Mar 23 02:24:33 2014 @@ -1,5 +1,5 @@ add_executable(notevil notevil.c notevil.rc) -set_module_type(notevil win32cui) +set_module_type(notevil win32cui UNICODE) add_importlibs(notevil user32 msvcrt kernel32) add_cd_file(TARGET notevil DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/notevil/notevil.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/notev… ============================================================================== --- trunk/rosapps/applications/notevil/notevil.c [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/notevil.c [iso-8859-1] Sun Mar 23 02:24:33 2014 @@ -24,243 +24,207 @@ * 19990411 EA * 19990515 EA */ -//#define UNICODE + #include <windows.h> #include <stdio.h> -#include <stdlib.h> -#include <tchar.h> #include "resource.h" -LPCTSTR app_name = _TEXT("notevil"); - -HANDLE myself; -HANDLE ScreenBuffer; +// #define DISPLAY_COORD + +LPCWSTR app_name = L"notevil"; + +HANDLE myself; +HANDLE ScreenBuffer; CONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo; -HANDLE WaitableTimer; - -void -WriteStringAt( - LPTSTR lpString, - COORD xy, - WORD wColor - ) -{ - DWORD cWritten = 0; - WORD wLen = lstrlen(lpString); - - if (0 == wLen) - return; - // don't bother writing text when erasing - if( wColor ) - WriteConsoleOutputCharacter( ScreenBuffer, - lpString, - wLen, - xy, - & cWritten - ); - FillConsoleOutputAttribute( - ScreenBuffer, - wColor, - wLen, - xy, - & cWritten - ); +HANDLE WaitableTimer; + +VOID +WriteStringAt(LPWSTR lpString, + COORD xy, + WORD wColor) +{ + DWORD cWritten = 0; + WORD wLen; + + if (!lpString || *lpString == 0) return; + + wLen = wcslen(lpString); + + /* Don't bother writing text when erasing */ + if (wColor) + { + WriteConsoleOutputCharacterW(ScreenBuffer, + lpString, + wLen, + xy, + &cWritten); + } + + FillConsoleOutputAttribute(ScreenBuffer, + wColor, + wLen, + xy, + &cWritten); } #ifdef DISPLAY_COORD -void +VOID WriteCoord(COORD c) { - COORD xy = {0,0}; - TCHAR buf [40]; - - wsprintf( - buf, - _TEXT("x=%02d y=%02d"), - c.X, - c.Y - ); - WriteStringAt( - buf, - xy, - (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) - ); + COORD xy = {0,0}; + WCHAR buf[40]; + + wsprintf(buf, L"x=%02d y=%02d", c.X, c.Y); + + WriteStringAt(buf, xy, + BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE); } #endif /* def DISPLAY_COORD */ -INT -GetNextString( - LPTSTR Buffer, - INT BufferSize, - DWORD *Index - ) -{ - if (RES_LAST_INDEX == *Index) - { - *Index = RES_FIRST_INDEX; - } - else - { - ++*Index; - } - LoadString( - myself, - *Index, - Buffer, - BufferSize - ); - return 0; +VOID +GetNextString(LPWSTR Buffer, + INT BufferSize, + PDWORD Index) +{ + if (RES_LAST_INDEX == *Index) + *Index = RES_FIRST_INDEX; + else + ++*Index; + + LoadStringW(myself, *Index, Buffer, BufferSize); } VOID DisplayTitle(VOID) { - LPTSTR szTitle = _TEXT("ReactOS Coders Console Parade"); - COORD xy; - - xy.X = (ScreenBufferInfo.dwSize.X - lstrlen(szTitle)) / 2; - xy.Y = ScreenBufferInfo.dwSize.Y / 2; - - WriteStringAt( - szTitle, - xy, - (FOREGROUND_GREEN | FOREGROUND_INTENSITY) - ); + LPWSTR szTitle = L"ReactOS Coders Console Parade"; + COORD xy; + + xy.X = (ScreenBufferInfo.dwSize.X - wcslen(szTitle)) / 2; + xy.Y = ScreenBufferInfo.dwSize.Y / 2; + + WriteStringAt(szTitle, xy, + FOREGROUND_GREEN | FOREGROUND_INTENSITY); } #define RES_DELAY_CHANGE 12 #define RES_BUFFER_SIZE 1024 -void -MainLoop(void) -{ - TCHAR NameString [RES_BUFFER_SIZE]; - DWORD NameIndex = 1; - INT NameLength = 0; - COORD xy; - INT n = RES_DELAY_CHANGE; - INT dir_y = 1; - INT dir_x = 1; - WORD wColor = 1; - - xy.X = ScreenBufferInfo.dwSize.X / 2; - xy.Y = ScreenBufferInfo.dwSize.Y / 2; - - for ( ; 1; ++n ) - { - if (n == RES_DELAY_CHANGE) - { - n = GetNextString( - NameString, - RES_BUFFER_SIZE, - & NameIndex - ); - NameLength = lstrlen(NameString); - wColor++; - if ((wColor & 0x000F) == 0) - wColor = 1; - } - if (xy.X == 0) - { - if (dir_x == -1) - dir_x = 1; - } - else if (xy.X >= ScreenBufferInfo.dwSize.X - NameLength - 1) - { - if (dir_x == 1) - dir_x = -1; - } - xy.X += dir_x; - - if (xy.Y == 0) - { - if (dir_y == -1) - dir_y = 1; - } - else if (xy.Y >= ScreenBufferInfo.dwSize.Y - 1) - { - if (dir_y == 1) - dir_y = -1; - } - xy.Y += dir_y; +VOID +MainLoop(VOID) +{ + WCHAR NameString[RES_BUFFER_SIZE]; + DWORD NameIndex = 0; + INT NameLength = 0; + COORD xy; + INT n = RES_DELAY_CHANGE; + INT dir_y = 1; + INT dir_x = 1; + WORD wColor = 1; + + xy.X = ScreenBufferInfo.dwSize.X / 2; + xy.Y = ScreenBufferInfo.dwSize.Y / 2; + + for ( ; 1; ++n ) + { + if (n == RES_DELAY_CHANGE) + { + n = 0; + + GetNextString(NameString, + RES_BUFFER_SIZE, + &NameIndex); + NameLength = wcslen(NameString); + + wColor++; + if ((wColor & 0x000F) == 0) + wColor = 1; + } + if (xy.X == 0) + { + if (dir_x == -1) + dir_x = 1; + } + else if (xy.X >= ScreenBufferInfo.dwSize.X - NameLength - 1) + { + if (dir_x == 1) + dir_x = -1; + } + xy.X += dir_x; + + if (xy.Y == 0) + { + if (dir_y == -1) + dir_y = 1; + } + else if (xy.Y >= ScreenBufferInfo.dwSize.Y - 1) + { + if (dir_y == 1) + dir_y = -1; + } + xy.Y += dir_y; + #ifdef DISPLAY_COORD - WriteCoord(xy); + WriteCoord(xy); #endif /* def DISPLAY_COORD */ - DisplayTitle(); - WriteStringAt( - NameString, - xy, - wColor - ); - WaitForSingleObject( WaitableTimer, INFINITE ); - WriteStringAt( - NameString, - xy, - 0 - ); - } -} - - -int -main( - int argc, - char *argv [] - ) -{ - LARGE_INTEGER lint; - DWORD Written; - COORD Coord = { 0, 0 }; - - myself = GetModuleHandle(NULL); - - GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), - &ScreenBufferInfo); - ScreenBufferInfo.dwSize.X = ScreenBufferInfo.srWindow.Right - ScreenBufferInfo.srWindow.Left + 1; - ScreenBufferInfo.dwSize.Y = ScreenBufferInfo.srWindow.Bottom - ScreenBufferInfo.srWindow.Top + 1; - ScreenBuffer = CreateConsoleScreenBuffer( - GENERIC_WRITE, - 0, - NULL, - CONSOLE_TEXTMODE_BUFFER, - NULL - ); - if (INVALID_HANDLE_VALUE == ScreenBuffer) - { - _ftprintf( - stderr, - _TEXT("%s: could not create a new screen buffer\n"), - app_name - ); - return EXIT_FAILURE; - } - // Fill buffer with black background - FillConsoleOutputAttribute( ScreenBuffer, - 0, - ScreenBufferInfo.dwSize.X * ScreenBufferInfo.dwSize.Y, - Coord, - &Written ); - - WaitableTimer = CreateWaitableTimer( NULL, FALSE, NULL ); - if( WaitableTimer == INVALID_HANDLE_VALUE ) - { - printf( "CreateWaitabletimer() failed\n" ); - return 1; - } - lint.QuadPart = -2000000; - if( SetWaitableTimer( WaitableTimer, &lint, 200, NULL, NULL, FALSE ) == FALSE ) - { - printf( "SetWaitableTimer() failed: 0x%lx\n", GetLastError() ); - return 2; - } - SetConsoleActiveScreenBuffer(ScreenBuffer); - MainLoop(); - CloseHandle(ScreenBuffer); - return EXIT_SUCCESS; -} - + + DisplayTitle(); + WriteStringAt(NameString, xy, wColor); + WaitForSingleObject(WaitableTimer, INFINITE); + WriteStringAt(NameString, xy, 0); + } +} + + +int wmain(int argc, WCHAR* argv[]) +{ + LARGE_INTEGER lint; + DWORD Written; + COORD Coord = { 0, 0 }; + + myself = GetModuleHandle(NULL); + + GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), + &ScreenBufferInfo); + ScreenBufferInfo.dwSize.X = ScreenBufferInfo.srWindow.Right - ScreenBufferInfo.srWindow.Left + 1; + ScreenBufferInfo.dwSize.Y = ScreenBufferInfo.srWindow.Bottom - ScreenBufferInfo.srWindow.Top + 1; + ScreenBuffer = CreateConsoleScreenBuffer(GENERIC_WRITE, + 0, + NULL, + CONSOLE_TEXTMODE_BUFFER, + NULL); + if (ScreenBuffer == INVALID_HANDLE_VALUE) + { + wprintf(L"%s: could not create a new screen buffer\n", app_name); + return EXIT_FAILURE; + } + + /* Fill buffer with black background */ + FillConsoleOutputAttribute(ScreenBuffer, + 0, + ScreenBufferInfo.dwSize.X * ScreenBufferInfo.dwSize.Y, + Coord, + &Written); + + WaitableTimer = CreateWaitableTimer(NULL, FALSE, NULL); + if (WaitableTimer == INVALID_HANDLE_VALUE) + { + wprintf(L"CreateWaitabletimer() failed\n"); + return 1; + } + lint.QuadPart = -2000000; + if (!SetWaitableTimer(WaitableTimer, &lint, 200, NULL, NULL, FALSE)) + { + wprintf(L"SetWaitableTimer() failed: 0x%lx\n", GetLastError()); + return 2; + } + SetConsoleActiveScreenBuffer(ScreenBuffer); + MainLoop(); + CloseHandle(ScreenBuffer); + return EXIT_SUCCESS; +} /* EOF */ Removed: trunk/rosapps/applications/notevil/notevil.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/notev… ============================================================================== --- trunk/rosapps/applications/notevil/notevil.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/notevil.rbuild (removed) @@ -1,5 +0,0 @@ -<module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe"> - <include base="notevil">.</include> - <library>user32</library> - <file>notevil.c</file> - <file>notevil.rc</file> Modified: trunk/rosapps/applications/notevil/notevil.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/notev… ============================================================================== --- trunk/rosapps/applications/notevil/notevil.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/notevil/notevil.rc [iso-8859-1] Sun Mar 23 02:24:33 2014 @@ -1,7 +1,7 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Coders Console Parade\0" -#define REACTOS_STR_INTERNAL_NAME "notevil\0" -#define REACTOS_STR_ORIGINAL_FILENAME "notevil.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Coders Console Parade" +#define REACTOS_STR_INTERNAL_NAME "notevil" +#define REACTOS_STR_ORIGINAL_FILENAME "notevil.exe" #include <reactos/version.rc> /* @@ -20,69 +20,69 @@ STRINGTABLE MOVEABLE BEGIN - 1, "Boudewijn Dekker (Ariadne)" - 2, "Robert Bergkvist (FragDance Galore)" - 3, "Arindam Das" - 4, "Boudewijn Dekker" - 5, "Jason Eager" - 6, "Jason Filby" - 7, "Rex Jolliff" - 8, "Eric Kohl" - 9, "Hans Kremer" - 10, "Frederik Leemans" - 11, "Jean Michault" - 12, "Jim Noeth" - 13, "Brian Palmer" - 14, "Matt Pyne" - 15, "Jason Weiler" + 1, "Boudewijn Dekker (Ariadne)" + 2, "Robert Bergkvist (FragDance Galore)" + 3, "Arindam Das" + 4, "Boudewijn Dekker" + 5, "Jason Eager" + 6, "Jason Filby" + 7, "Rex Jolliff" + 8, "Eric Kohl" + 9, "Hans Kremer" + 10, "Frederik Leemans" + 11, "Jean Michault" + 12, "Jim Noeth" + 13, "Brian Palmer" + 14, "Matt Pyne" + 15, "Jason Weiler" END STRINGTABLE MOVEABLE BEGIN - 16, "David Welch" - 17, "Emanuele Aliberti" - 18, "Phillip Susi" - 19, "Paolo Pantaleo" - 20, "Hernan Ochoa" - 21, "Casper Hornstrup" - 22, "Steven Edwards" - 23, "KJK::Hyperion" - 24, "Robert Dickenson" - 25, "Eugene Ingerman" - 26, "Guido de Jong" - 27, "Jurgen van Gael" - 28, "Marty Dill" - 29, "Ge van Geldorp" - 30, "Richard Campbell" + 16, "David Welch" + 17, "Emanuele Aliberti" + 18, "Phillip Susi" + 19, "Paolo Pantaleo" + 20, "Hernan Ochoa" + 21, "Casper Hornstrup" + 22, "Steven Edwards" + 23, "KJK::Hyperion" + 24, "Robert Dickenson" + 25, "Eugene Ingerman" + 26, "Guido de Jong" + 27, "Jurgen van Gael" + 28, "Marty Dill" + 29, "Ge van Geldorp" + 30, "Richard Campbell" END STRINGTABLE MOVEABLE BEGIN - 31, "Gunnar Andre' Dalsnes" - 32, "Aleksey Bragin" - 33, "Royce Mitchell III" - 34, "Mark Tempel" - 35, "Art Yerkes" - 36, "Martin Fuchs" - 37, "Vizzini" - 38, "Filip Navara" - 39, "Andrew Greenwood" - 40, "Thomas Weidenmueller" - 41, "Jonathan Wilson" - 42, "Alex Ionescu" - 43, "Jim Tabor" - 44, "Magnus Olsen" - 45, "Herve Poussineau" + 31, "Gunnar Andre' Dalsnes" + 32, "Aleksey Bragin" + 33, "Royce Mitchell III" + 34, "Mark Tempel" + 35, "Art Yerkes" + 36, "Martin Fuchs" + 37, "Vizzini" + 38, "Filip Navara" + 39, "Andrew Greenwood" + 40, "Thomas Weidenmueller" + 41, "Jonathan Wilson" + 42, "Alex Ionescu" + 43, "Jim Tabor" + 44, "Magnus Olsen" + 45, "Herve Poussineau" END STRINGTABLE MOVEABLE BEGIN - 46, "Christoph von Wittich" - 47, "Brandon Turner" - 48, "Ged Murphy" - 49, "Klemens R. Friedl" - 50, "Maarten Bosma" - 51, "Saveliy Tretiakov" + 46, "Christoph von Wittich" + 47, "Brandon Turner" + 48, "Ged Murphy" + 49, "Klemens R. Friedl" + 50, "Maarten Bosma" + 51, "Saveliy Tretiakov" END /* EOF */

1 0

[hbelusca] 62549: [COMP][SORT] Bring back COMP and SORT utilities to build.
by hbelusca＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: hbelusca Date: Sun Mar 23 01:32:46 2014 New Revision: 62549 URL: http://svn.reactos.org/svn/reactos?rev=62549&view=rev Log: [COMP][SORT] Bring back COMP and SORT utilities to build. Added: trunk/reactos/base/applications/cmdutils/comp/ - copied from r62545, trunk/rosapps/applications/cmdutils/comp/ trunk/reactos/base/applications/cmdutils/sort/ - copied from r62545, trunk/rosapps/applications/cmdutils/sort/ Removed: trunk/reactos/base/applications/cmdutils/comp/comp.rbuild trunk/reactos/base/applications/cmdutils/sort/sort.rbuild trunk/rosapps/applications/cmdutils/comp/ trunk/rosapps/applications/cmdutils/sort/ Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt trunk/reactos/base/applications/cmdutils/comp/comp.rc trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt trunk/reactos/base/applications/cmdutils/sort/sort.rc trunk/rosapps/applications/cmdutils/CMakeLists.txt trunk/rosapps/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Mar 23 01:32:46 2014 @@ -1,3 +1,4 @@ +add_subdirectory(comp) add_subdirectory(dbgprint) add_subdirectory(doskey) add_subdirectory(find) @@ -7,6 +8,7 @@ add_subdirectory(mode) add_subdirectory(more) add_subdirectory(reg) +add_subdirectory(sort) add_subdirectory(taskkill) add_subdirectory(wmic) add_subdirectory(xcopy) Removed: trunk/reactos/base/applications/cmdutils/comp/comp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/comp… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.rbuild (removed) @@ -1,4 +0,0 @@ -<module name="comp" type="win32cui" installbase="system32" installname="comp.exe" allowwarnings="true"> - <file>comp.c</file> - <file>comp.rc</file> -</module> Modified: trunk/reactos/base/applications/cmdutils/comp/comp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.rc [iso-8859-1] Sun Mar 23 01:32:46 2014 @@ -1,4 +1,5 @@ -#define REACTOS_STR_FILE_DESCRIPTION "File Compare Utility\0" -#define REACTOS_STR_INTERNAL_NAME "comp\0" -#define REACTOS_STR_ORIGINAL_FILENAME "comp.exe\0" + +#define REACTOS_STR_FILE_DESCRIPTION "File Compare Utility" +#define REACTOS_STR_INTERNAL_NAME "comp" +#define REACTOS_STR_ORIGINAL_FILENAME "comp.exe" #include <reactos/version.rc> Modified: trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt [iso-8859-1] Sun Mar 23 01:32:46 2014 @@ -2,4 +2,4 @@ add_executable(sort sort.c sort.rc) set_module_type(sort win32cui) add_importlibs(sort msvcrt kernel32) -add_cd_file(TARGET sort DESTINATION reactos/system32 FOR all) +add_cd_file(TARGET sort DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/base/applications/cmdutils/sort/sort.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/sort… ============================================================================== --- trunk/reactos/base/applications/cmdutils/sort/sort.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/sort/sort.rbuild (removed) @@ -1,4 +0,0 @@ -<module name="sort" type="win32cui" installbase="system32" installname="sort.exe"> - <file>sort.c</file> - <file>sort.rc</file> -</module> Modified: trunk/reactos/base/applications/cmdutils/sort/sort.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/sort/sort.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/sort/sort.rc [iso-8859-1] Sun Mar 23 01:32:46 2014 @@ -1,5 +1,5 @@ -#define REACTOS_STR_FILE_DESCRIPTION "W32 sort command\0" -#define REACTOS_STR_INTERNAL_NAME "sort\0" -#define REACTOS_STR_ORIGINAL_FILENAME "sort.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sort Command" +#define REACTOS_STR_INTERNAL_NAME "sort" +#define REACTOS_STR_ORIGINAL_FILENAME "sort.exe" #include <reactos/version.rc> Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Mar 23 01:32:46 2014 @@ -1,6 +1,4 @@ add_subdirectory(appwiz) -add_subdirectory(comp) -add_subdirectory(sort) add_subdirectory(tee) add_subdirectory(touch) add_subdirectory(uptime) Modified: trunk/rosapps/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/cmdu… ============================================================================== --- trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] Sun Mar 23 01:32:46 2014 @@ -2,12 +2,6 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="appwiz"> <xi:include href="appwiz/appwiz.rbuild" /> - </directory> - <directory name="comp"> - <xi:include href="comp/comp.rbuild" /> - </directory> - <directory name="sort"> - <xi:include href="sort/sort.rbuild" /> </directory> <directory name="tee"> <xi:include href="tee/tee.rbuild" />

1 0

[hbelusca] 62548: [FORMAT] As mode and more, format is a false .com (for compatibility purposes).
by hbelusca＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: hbelusca Date: Sun Mar 23 01:16:19 2014 New Revision: 62548 URL: http://svn.reactos.org/svn/reactos?rev=62548&view=rev Log: [FORMAT] As mode and more, format is a false .com (for compatibility purposes). Modified: trunk/reactos/base/system/format/CMakeLists.txt trunk/reactos/base/system/format/format.rc trunk/rosapps/applications/sysutils/man/man/2/format.man Modified: trunk/reactos/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/CMakeLi… ============================================================================== --- trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/format/CMakeLists.txt [iso-8859-1] Sun Mar 23 01:16:19 2014 @@ -1,5 +1,7 @@ add_executable(format format.c format.rc) set_module_type(format win32cui) +set_target_properties(format PROPERTIES SUFFIX ".com") + add_importlibs(format user32 fmifs msvcrt kernel32 ntdll) add_cd_file(TARGET format DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/format/format.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.rc [iso-8859-1] Sun Mar 23 01:16:19 2014 @@ -2,9 +2,9 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "Formating a device with a filesystem" +#define REACTOS_STR_FILE_DESCRIPTION "Disk Format Utility" #define REACTOS_STR_INTERNAL_NAME "format" -#define REACTOS_STR_ORIGINAL_FILENAME "format.exe" +#define REACTOS_STR_ORIGINAL_FILENAME "format.com" #include <reactos/version.rc> /* UTF-8 */ Modified: trunk/rosapps/applications/sysutils/man/man/2/format.man URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/man/… ============================================================================== --- trunk/rosapps/applications/sysutils/man/man/2/format.man [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/man/man/2/format.man [iso-8859-1] Sun Mar 23 01:16:19 2014 @@ -1,22 +1,22 @@ -[]=================================[format.exe]==============================[] +[]=================================[format.com]==============================[] Author: Mark Russinovich -Purpose: Disk formating tool +Purpose: Disk Format Utility Port on ROS: Emanuele Aliberti License: GPL -Usage: format.exe drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C] +Usage: format.com drive: [-FS:file-system] [-V:label] [-Q] [-A:size] [-C] [drive:] Specifies the drive to format. -FS:file-system Specifies the type of file system (e.g. FAT). -V:label Specifies volume label. -Q Performs a quick format. -A:size Overrides the default allocation unit size. - Default settings are strongly recommended for general - use NTFS supports 512, 1024, 2048, 4096, 8192, 16K, - 32K, 64K. FAT supports 8192, 16K, 32K, 64K, 128K, 256K. + Default settings are strongly recommended for general + use NTFS supports 512, 1024, 2048, 4096, 8192, 16K, + 32K, 64K. FAT supports 8192, 16K, 32K, 64K, 128K, 256K. NTFS compression is not supported for allocation - unit sizes above 4096. + unit sizes above 4096. -C Files created on the new volume will be compressed by default.

1 0

[hbelusca] 62547: [RTL] - Code formatting (homogeneisation of...). - For "Deadlock" DPRINT, replace the DPRINT1 by a ERROR_DBGBREAK for (user) debugging purposes only (a priori this shouldn't be hi...
by hbelusca＠svn.reactos.org 23 Mar '14

23 Mar '14

Author: hbelusca Date: Sun Mar 23 00:23:54 2014 New Revision: 62547 URL: http://svn.reactos.org/svn/reactos?rev=62547&view=rev Log: [RTL] - Code formatting (homogeneisation of...). - For "Deadlock" DPRINT, replace the DPRINT1 by a ERROR_DBGBREAK for (user) debugging purposes only (a priori this shouldn't be hit during our automated tests). Modified: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=625… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Sun Mar 23 00:23:54 2014 @@ -52,7 +52,6 @@ /* Check if we have an event */ if (!hEvent) { - /* No, so create it */ Status = NtCreateEvent(&hNewEvent, EVENT_ALL_ACCESS, @@ -61,11 +60,13 @@ FALSE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to Create Event!\n"); - - /* Use INVALID_HANDLE_VALUE (-1) to signal that the global - keyed event must be used */ - hNewEvent = INVALID_HANDLE_VALUE; + DPRINT1("Failed to Create Event!\n"); + + /* + * Use INVALID_HANDLE_VALUE (-1) to signal that + * the global keyed event must be used. + */ + hNewEvent = INVALID_HANDLE_VALUE; } DPRINT("Created Event: %p \n", hNewEvent); @@ -111,7 +112,8 @@ BOOLEAN LastChance = FALSE; /* Do we have an Event yet? */ - if (!CriticalSection->LockSemaphore) { + if (!CriticalSection->LockSemaphore) + { RtlpCreateCriticalSectionSem(CriticalSection); } @@ -123,8 +125,8 @@ if (CriticalSection->DebugInfo) CriticalSection->DebugInfo->EntryCount++; - for (;;) { - + for (;;) + { /* Increase the number of times we've had contention */ if (CriticalSection->DebugInfo) CriticalSection->DebugInfo->ContentionCount++; @@ -147,12 +149,12 @@ } /* We have Timed out */ - if (Status == STATUS_TIMEOUT) { - + if (Status == STATUS_TIMEOUT) + { /* Is this the 2nd time we've timed out? */ - if (LastChance) { - - DPRINT1("Deadlock: %p\n", CriticalSection); + if (LastChance) + { + ERROR_DBGBREAK("Deadlock: 0x%p\n", CriticalSection); /* Yes it is, we are raising an exception */ ExceptionRecord.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; @@ -162,14 +164,13 @@ ExceptionRecord.NumberParameters = 1; ExceptionRecord.ExceptionInformation[0] = (ULONG_PTR)CriticalSection; RtlRaiseException(&ExceptionRecord); - } /* One more try */ LastChance = TRUE; - - } else { - + } + else + { /* If we are here, everything went fine */ return STATUS_SUCCESS; } @@ -198,7 +199,8 @@ NTSTATUS Status; /* Do we have an Event yet? */ - if (!CriticalSection->LockSemaphore) { + if (!CriticalSection->LockSemaphore) + { RtlpCreateCriticalSectionSem(CriticalSection); } @@ -219,8 +221,8 @@ Status = NtSetEvent(CriticalSection->LockSemaphore, NULL); } - if (!NT_SUCCESS(Status)) { - + if (!NT_SUCCESS(Status)) + { /* We've failed */ DPRINT1("Signaling Failed for: %p, %p, 0x%08lx\n", CriticalSection, @@ -249,7 +251,6 @@ NTAPI RtlpInitDeferedCriticalSection(VOID) { - /* Initialize the Process Critical Section List */ InitializeListHead(&RtlCriticalSectionList); @@ -283,11 +284,11 @@ ULONG i; /* Try to allocate from our buffer first */ - for (i = 0; i < MAX_STATIC_CS_DEBUG_OBJECTS; i++) { - + for (i = 0; i < MAX_STATIC_CS_DEBUG_OBJECTS; i++) + { /* Check if Entry is free */ - if (!RtlpDebugInfoFreeList[i]) { - + if (!RtlpDebugInfoFreeList[i]) + { /* Mark entry in use */ DPRINT("Using entry: %lu. Buffer: %p\n", i, &RtlpStaticDebugInfo[i]); RtlpDebugInfoFreeList[i] = TRUE; @@ -295,7 +296,6 @@ /* Use free entry found */ return &RtlpStaticDebugInfo[i]; } - } /* We are out of static buffer, allocate dynamic */ @@ -328,8 +328,8 @@ /* Is it part of our cached entries? */ if ((DebugInfo >= RtlpStaticDebugInfo) && - (DebugInfo <= &RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS-1])) { - + (DebugInfo <= &RtlpStaticDebugInfo[MAX_STATIC_CS_DEBUG_OBJECTS-1])) + { /* Yes. zero it out */ RtlZeroMemory(DebugInfo, sizeof(RTL_CRITICAL_SECTION_DEBUG)); @@ -341,21 +341,21 @@ NtCurrentTeb()->ClientId.UniqueProcess); RtlpDebugInfoFreeList[EntryId] = FALSE; - } else if (!DebugInfo->Flags) { - + } + else if (!DebugInfo->Flags) + { /* It's a dynamic one, so free from the heap */ DPRINT("Freeing from Heap: %p inside Process: %p\n", DebugInfo, NtCurrentTeb()->ClientId.UniqueProcess); RtlFreeHeap(NtCurrentPeb()->ProcessHeap, 0, DebugInfo); - - } else { - + } + else + { /* Wine stores a section name pointer in the Flags member */ DPRINT("Assuming static: %p inside Process: %p\n", DebugInfo, NtCurrentTeb()->ClientId.UniqueProcess); - } } @@ -382,12 +382,12 @@ NTSTATUS Status = STATUS_SUCCESS; DPRINT("Deleting Critical Section: %p\n", CriticalSection); + /* Close the Event Object Handle if it exists */ - if (CriticalSection->LockSemaphore) { - + if (CriticalSection->LockSemaphore) + { /* In case NtClose fails, return the status */ Status = NtClose(CriticalSection->LockSemaphore); - } /* Protect List */ @@ -397,7 +397,8 @@ { /* Remove it from the list */ RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); -#if 0 /* We need to preserve Flags for RtlpFreeDebugInfo */ +#if 0 + /* We need to preserve Flags for RtlpFreeDebugInfo */ RtlZeroMemory(CriticalSection->DebugInfo, sizeof(RTL_CRITICAL_SECTION_DEBUG)); #endif } @@ -470,18 +471,17 @@ { HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; - /* Try to Lock it */ - if (InterlockedIncrement(&CriticalSection->LockCount) != 0) { - - /* - * We've failed to lock it! Does this thread - * actually own it? - */ - if (Thread == CriticalSection->OwningThread) { - - /* You own it, so you'll get it when you're done with it! No need to - use the interlocked functions as only the thread who already owns - the lock can modify this data. */ + /* Try to lock it */ + if (InterlockedIncrement(&CriticalSection->LockCount) != 0) + { + /* We've failed to lock it! Does this thread actually own it? */ + if (Thread == CriticalSection->OwningThread) + { + /* + * You own it, so you'll get it when you're done with it! No need to + * use the interlocked functions as only the thread who already owns + * the lock can modify this data. + */ CriticalSection->RecursionCount++; return STATUS_SUCCESS; } @@ -497,9 +497,11 @@ RtlpWaitForCriticalSection(CriticalSection); } - /* Lock successful. Changing this information has not to be serialized because - only one thread at a time can actually change it (the one who acquired - the lock)! */ + /* + * Lock successful. Changing this information has not to be serialized + * because only one thread at a time can actually change it (the one who + * acquired the lock)! + */ CriticalSection->OwningThread = Thread; CriticalSection->RecursionCount = 1; return STATUS_SUCCESS; @@ -568,8 +570,8 @@ CritcalSectionDebugData, NtCurrentTeb()->ClientId.UniqueProcess); - if (!CritcalSectionDebugData) { - + if (!CritcalSectionDebugData) + { /* This is bad! */ DPRINT1("Couldn't allocate Debug Data for: %p\n", CriticalSection); return STATUS_NO_MEMORY; @@ -584,12 +586,12 @@ CriticalSection->DebugInfo = CritcalSectionDebugData; /* - * Add it to the List of Critical Sections owned by the process. - * If we've initialized the Lock, then use it. If not, then probably - * this is the lock initialization itself, so insert it directly. - */ - if ((CriticalSection != &RtlCriticalSectionLock) && (RtlpCritSectInitialized)) { - + * Add it to the List of Critical Sections owned by the process. + * If we've initialized the Lock, then use it. If not, then probably + * this is the lock initialization itself, so insert it directly. + */ + if ((CriticalSection != &RtlCriticalSectionLock) && (RtlpCritSectInitialized)) + { DPRINT("Securely Inserting into ProcessLocks: %p, %p, %p\n", &CritcalSectionDebugData->ProcessLocksList, CriticalSection, @@ -603,9 +605,9 @@ /* Unprotect */ RtlLeaveCriticalSection(&RtlCriticalSectionLock); - - } else { - + } + else + { DPRINT("Inserting into ProcessLocks: %p, %p, %p\n", &CritcalSectionDebugData->ProcessLocksList, CriticalSection, @@ -680,8 +682,10 @@ #if DBG HANDLE Thread = (HANDLE)NtCurrentTeb()->ClientId.UniqueThread; - /* In win this case isn't checked. However it's a valid check so it should only - be performed in debug builds! */ + /* + * In win this case isn't checked. However it's a valid check so it should + * only be performed in debug builds! + */ if (Thread != CriticalSection->OwningThread) { DPRINT1("Releasing critical section not owned!\n"); @@ -689,23 +693,28 @@ } #endif - /* Decrease the Recursion Count. No need to do this atomically because only - the thread who holds the lock can call this function (unless the program - is totally screwed... */ - if (--CriticalSection->RecursionCount) { - + /* + * Decrease the Recursion Count. No need to do this atomically because only + * the thread who holds the lock can call this function (unless the program + * is totally screwed... + */ + if (--CriticalSection->RecursionCount) + { /* Someone still owns us, but we are free. This needs to be done atomically. */ InterlockedDecrement(&CriticalSection->LockCount); - } else { - - /* Nobody owns us anymore. No need to do this atomically. See comment - above. */ + } + else + { + /* + * Nobody owns us anymore. No need to do this atomically. + * See comment above. + */ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { - + if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) + { /* Let him have us */ RtlpUnWaitCriticalSection(CriticalSection); } @@ -736,17 +745,15 @@ RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ - if (InterlockedCompareExchange(&CriticalSection->LockCount, - 0, - -1) == -1) { - + if (InterlockedCompareExchange(&CriticalSection->LockCount, 0, -1) == -1) + { /* It's ours */ CriticalSection->OwningThread = NtCurrentTeb()->ClientId.UniqueThread; CriticalSection->RecursionCount = 1; return TRUE; - - } else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) { - + } + else if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) + { /* It's already ours */ InterlockedIncrement(&CriticalSection->LockCount); CriticalSection->RecursionCount++; @@ -759,8 +766,7 @@ VOID NTAPI -RtlCheckForOrphanedCriticalSections( - HANDLE ThreadHandle) +RtlCheckForOrphanedCriticalSections(HANDLE ThreadHandle) { UNIMPLEMENTED; }

1 0

[hbelusca] 62546: [SHELL] Allow opening .COM executables from the (explorer) shell, outside cmd.exe. Patch by Lee Schroeder. CORE-8009 #resolve #comment Fixed in revision 62546. Thanks :D
by hbelusca＠svn.reactos.org 22 Mar '14

22 Mar '14

Author: hbelusca Date: Sat Mar 22 21:07:28 2014 New Revision: 62546 URL: http://svn.reactos.org/svn/reactos?rev=62546&view=rev Log: [SHELL] Allow opening .COM executables from the (explorer) shell, outside cmd.exe. Patch by Lee Schroeder. CORE-8009 #resolve #comment Fixed in revision 62546. Thanks :D Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Mar 22 21:07:28 2014 @@ -45,7 +45,7 @@ HKCR,"anifile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\main.cpl,-1039" HKCR,"anifile\DefaultIcon","",0x00000000,"%1" -; DOS Batch-Files +; DOS Batch Files HKCR,".bat","",0x00000000,"batfile" HKCR,"batfile","",0x00000000,"DOS Batch File" HKCR,"batfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-158" @@ -53,6 +53,7 @@ HKCR,"batfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" HKCR,"batfile\shell\open\command","",0x00000000,"""%1"" %*" +; ReactOS Cmd Script Files HKCR,".cmd","",0x00000000,"cmdfile" HKCR,"cmdfile","",0x00000000,"ReactOS Command Script" HKCR,"cmdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-159" @@ -60,11 +61,12 @@ HKCR,"cmdfile\shell\edit\command","",0x00020000,"%SystemRoot%\system32\notepad.exe %1" HKCR,"cmdfile\shell\open\command","",0x00000000,"""%1"" %*" -; Get DOS Applications a Icon +; DOS Applications HKCR,".com","",0x00000000,"comfile" HKCR,"comfile","",0x00000000,"DOS Application" HKCR,"comfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-160" HKCR,"comfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-3" +HKCR,"comfile\shell\open\command","",0x00000000,"""%1"" %*" ; Control Panel extensions HKCR,".cpl","",0x00000000,"cplfile" @@ -93,7 +95,7 @@ HKCR,"drvfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-164" HKCR,"drvfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-154" -; Applicatons +; Applications HKCR,".exe","",0x00000000,"exefile" HKCR,"exefile","",0x00000000,"ReactOS Application" HKCR,"exefile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-165"

1 0

[hbelusca] 62545: [ADVAPI32][SECUR32] Remove useless msvcrt importing. [WINSRV] Fix imports. CORE-7985
by hbelusca＠svn.reactos.org 22 Mar '14

22 Mar '14

Author: hbelusca Date: Sat Mar 22 20:04:28 2014 New Revision: 62545 URL: http://svn.reactos.org/svn/reactos?rev=62545&view=rev Log: [ADVAPI32][SECUR32] Remove useless msvcrt importing. [WINSRV] Fix imports. CORE-7985 Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/advapi32/misc/dllmain.c trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/win32ss/user/winsrv/CMakeLists.txt Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -55,10 +55,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.c ${CMAKE_CURRENT_BINARY_DIR}/svcctl_c.c) -set_module_type(advapi32 win32dll UNICODE) +set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) -add_delay_importlibs(advapi32 rpcrt4) -add_importlibs(advapi32 secur32 msvcrt kernel32 ntdll) +add_delay_importlibs(advapi32 secur32) +add_importlibs(advapi32 rpcrt4 kernel32 ntdll) add_pch(advapi32 advapi32.h SOURCE) Modified: trunk/reactos/dll/win32/advapi32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/misc/dl… ============================================================================== --- trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/misc/dllmain.c [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -36,7 +36,7 @@ break; } - return TRUE; + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -17,11 +17,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/secur32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/secur32.def) -set_module_type(secur32 win32dll) +set_module_type(secur32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(secur32 lsalib) -add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(secur32 advapi32 kernel32 ntdll) add_pch(secur32 precomp.h SOURCE) add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/CMakeLists.txt [iso-8859-1] Sat Mar 22 20:04:28 2014 @@ -26,8 +26,8 @@ # Add win32ksys because of NtUser...() target_link_libraries(winsrv win32ksys libcntpr ${PSEH_LIB} ${CONSRV_TARGET_LINK_LIBS}) -add_delay_importlibs(winsrv advapi32 gdi32 user32 ${CONSRV_DELAY_IMPORT_LIBS}) -add_importlibs(winsrv csrsrv kernel32 ntdll ${CONSRV_IMPORT_LIBS}) +add_delay_importlibs(winsrv advapi32 ${CONSRV_DELAY_IMPORT_LIBS}) +add_importlibs(winsrv csrsrv gdi32 user32 kernel32 ntdll ${CONSRV_IMPORT_LIBS}) add_dependencies(winsrv bugcodes) add_cd_file(TARGET winsrv DESTINATION reactos/system32 FOR all)

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