Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 66141: [FREELDR]: Don't use a null pointer for strstr call. CORE-8198 #resolve #comment Fixed.
by hbelusca＠svn.reactos.org 01 Feb '15

01 Feb '15

Author: hbelusca Date: Sun Feb 1 15:10:19 2015 New Revision: 66141 URL: http://svn.reactos.org/svn/reactos?rev=66141&view=rev Log: [FREELDR]: Don't use a null pointer for strstr call. CORE-8198 #resolve #comment Fixed. Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Sun Feb 1 15:10:19 2015 @@ -242,34 +242,33 @@ VOID WinLdrSetupEms(IN PCHAR BootOptions) { - PCHAR RedirectPort; + PCHAR Settings; /* Start fresh */ RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK)); LoaderRedirectionInformation.PciDeviceId = PCI_INVALID_VENDORID; /* Use a direction port if one was given, or use ACPI to detect one instead */ - RedirectPort = strstr(BootOptions, "/redirect="); - - if (RedirectPort) - { - RedirectPort = strstr(RedirectPort, "com"); + Settings = strstr(BootOptions, "/redirect="); + if (Settings) + { + PCHAR RedirectPort = strstr(Settings, "com"); if (RedirectPort) { RedirectPort += sizeof("com") - 1; LoaderRedirectionInformation.PortNumber = atoi(RedirectPort); - LoaderRedirectionInformation.TerminalType = 1; //HeadlessSerialPort + LoaderRedirectionInformation.TerminalType = 1; // HeadlessSerialPort } else { - RedirectPort = strstr(RedirectPort, "usebiossettings"); - if (RedirectPort) + Settings = strstr(Settings, "usebiossettings"); + if (Settings) { UiDrawStatusText("ACPI SRT Table Not Supported..."); } else { - LoaderRedirectionInformation.PortAddress = (PUCHAR)strtoul(RedirectPort, 0, 16); + LoaderRedirectionInformation.PortAddress = (PUCHAR)strtoul(Settings, 0, 16); if (LoaderRedirectionInformation.PortAddress) { LoaderRedirectionInformation.PortNumber = 3; @@ -279,18 +278,18 @@ } /* Use a direction baudrate if one was given */ - RedirectPort = strstr(BootOptions, "/redirectbaudrate="); - if (RedirectPort) - { - if (strstr(RedirectPort, "115200")) + Settings = strstr(BootOptions, "/redirectbaudrate="); + if (Settings) + { + if (strstr(Settings, "115200")) { LoaderRedirectionInformation.BaudRate = 115200; } - else if (strstr(RedirectPort, "57600")) + else if (strstr(Settings, "57600")) { LoaderRedirectionInformation.BaudRate = 57600; } - else if (strstr(RedirectPort, "19200")) + else if (strstr(Settings, "19200")) { LoaderRedirectionInformation.BaudRate = 19200; }

1 0

[hbelusca] 66140: [CMLIB]: Whitespace fixes only.
by hbelusca＠svn.reactos.org 01 Feb '15

01 Feb '15

Author: hbelusca Date: Sun Feb 1 14:39:35 2015 New Revision: 66140 URL: http://svn.reactos.org/svn/reactos?rev=66140&view=rev Log: [CMLIB]: Whitespace fixes only. Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/cmtools.c trunk/reactos/lib/cmlib/hivebin.c trunk/reactos/lib/cmlib/hivedata.h Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=6614… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Feb 1 14:39:35 2015 @@ -345,25 +345,25 @@ BOOLEAN NTAPI CmCompareHash( - IN PCUNICODE_STRING KeyName, - IN PCHAR HashString, - IN BOOLEAN CaseInsensitive); + IN PCUNICODE_STRING KeyName, + IN PCHAR HashString, + IN BOOLEAN CaseInsensitive); BOOLEAN NTAPI CmComparePackedNames( - IN PCUNICODE_STRING Name, - IN PVOID NameBuffer, - IN USHORT NameBufferSize, - IN BOOLEAN NamePacked, - IN BOOLEAN CaseInsensitive); + IN PCUNICODE_STRING Name, + IN PVOID NameBuffer, + IN USHORT NameBufferSize, + IN BOOLEAN NamePacked, + IN BOOLEAN CaseInsensitive); BOOLEAN NTAPI CmCompareKeyName( - IN PCM_KEY_NODE KeyCell, - IN PCUNICODE_STRING KeyName, - IN BOOLEAN CaseInsensitive); + IN PCM_KEY_NODE KeyCell, + IN PCUNICODE_STRING KeyName, + IN BOOLEAN CaseInsensitive); BOOLEAN NTAPI Modified: trunk/reactos/lib/cmlib/cmtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmtools.c?rev=66… ============================================================================== --- trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmtools.c [iso-8859-1] Sun Feb 1 14:39:35 2015 @@ -12,16 +12,16 @@ BOOLEAN NTAPI CmCompareHash( - IN PCUNICODE_STRING KeyName, - IN PCHAR HashString, - IN BOOLEAN CaseInsensitive) -{ - CHAR Buffer[4]; - - Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0; - Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0; - Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0; - Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0; + IN PCUNICODE_STRING KeyName, + IN PCHAR HashString, + IN BOOLEAN CaseInsensitive) +{ + CHAR Buffer[4]; + + Buffer[0] = (KeyName->Length >= 2) ? (CHAR)KeyName->Buffer[0] : 0; + Buffer[1] = (KeyName->Length >= 4) ? (CHAR)KeyName->Buffer[1] : 0; + Buffer[2] = (KeyName->Length >= 6) ? (CHAR)KeyName->Buffer[2] : 0; + Buffer[3] = (KeyName->Length >= 8) ? (CHAR)KeyName->Buffer[3] : 0; if (CaseInsensitive) { Modified: trunk/reactos/lib/cmlib/hivebin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivebin.c?rev=66… ============================================================================== --- trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivebin.c [iso-8859-1] Sun Feb 1 14:39:35 2015 @@ -86,8 +86,8 @@ { ASSERT(RegistryHive->DirtyVector.Buffer); RtlCopyMemory(BitmapBuffer, - RegistryHive->DirtyVector.Buffer, - RegistryHive->DirtyVector.SizeOfBitMap / 8); + RegistryHive->DirtyVector.Buffer, + RegistryHive->DirtyVector.SizeOfBitMap / 8); RegistryHive->Free(RegistryHive->DirtyVector.Buffer, 0); } RtlInitializeBitMap(&RegistryHive->DirtyVector, BitmapBuffer, Modified: trunk/reactos/lib/cmlib/hivedata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivedata.h?rev=6… ============================================================================== --- trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivedata.h [iso-8859-1] Sun Feb 1 14:39:35 2015 @@ -78,15 +78,15 @@ // // Cell Magic Values // -#define HCELL_NIL MAXULONG -#define HCELL_CACHED 1 - -#define HCELL_TYPE_MASK 0x80000000 -#define HCELL_BLOCK_MASK 0x7ffff000 -#define HCELL_OFFSET_MASK 0x00000fff -#define HCELL_TYPE_SHIFT 31 -#define HCELL_BLOCK_SHIFT 12 -#define HCELL_OFFSET_SHIFT 0 +#define HCELL_NIL MAXULONG +#define HCELL_CACHED 1 + +#define HCELL_TYPE_MASK 0x80000000 +#define HCELL_BLOCK_MASK 0x7ffff000 +#define HCELL_OFFSET_MASK 0x00000fff +#define HCELL_TYPE_SHIFT 31 +#define HCELL_BLOCK_SHIFT 12 +#define HCELL_OFFSET_SHIFT 0 #define HvGetCellType(Cell) \ ((ULONG)((Cell & HCELL_TYPE_MASK) >> HCELL_TYPE_SHIFT)) @@ -107,7 +107,7 @@ * On-disk header for registry hive file. */ -#define HIVE_FILENAME_MAXLEN 31 +#define HIVE_FILENAME_MAXLEN 31 typedef struct _HBASE_BLOCK {

1 0

[ekohl] 66139: [NTOSKRNL][INCLUDE] Add keyed event access mask values and use them in the keyed event object implementation. This fixes another kmtest:ObTypes bug.
by ekohl＠svn.reactos.org 01 Feb '15

01 Feb '15

Author: ekohl Date: Sun Feb 1 13:59:09 2015 New Revision: 66139 URL: http://svn.reactos.org/svn/reactos?rev=66139&view=rev Log: [NTOSKRNL][INCLUDE] Add keyed event access mask values and use them in the keyed event object implementation. This fixes another kmtest:ObTypes bug. Modified: trunk/reactos/include/ndk/extypes.h trunk/reactos/ntoskrnl/ex/keyedevt.c Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Feb 1 13:59:09 2015 @@ -129,6 +129,15 @@ // #define PROFILE_CONTROL 0x0001 #define PROFILE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | PROFILE_CONTROL) + +// +// Keyed Event Object Access Masks +// +#define KEYEDEVENT_WAIT 0x0001 +#define KEYEDEVENT_WAKE 0x0002 +#define KEYEDEVENT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ + KEYEDEVENT_WAIT | \ + KEYEDEVENT_WAKE) // // NtRaiseHardError-related parameters Modified: trunk/reactos/ntoskrnl/ex/keyedevt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/keyedevt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/keyedevt.c [iso-8859-1] Sun Feb 1 13:59:09 2015 @@ -43,10 +43,10 @@ static GENERIC_MAPPING ExpKeyedEventMapping = { - STANDARD_RIGHTS_READ | EVENT_QUERY_STATE, - STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE, + STANDARD_RIGHTS_READ | KEYEDEVENT_WAIT, + STANDARD_RIGHTS_WRITE | KEYEDEVENT_WAKE, STANDARD_RIGHTS_EXECUTE, - EVENT_ALL_ACCESS + KEYEDEVENT_ALL_ACCESS }; /* FUNCTIONS *****************************************************************/ @@ -68,7 +68,7 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpKeyedEventMapping; ObjectTypeInitializer.PoolType = PagedPool; - ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; + ObjectTypeInitializer.ValidAccessMask = KEYEDEVENT_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; /* Create the keyed event object type */ @@ -81,14 +81,14 @@ /* Create the out of memory event for critical sections */ InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_PERMANENT, NULL, NULL); Status = ZwCreateKeyedEvent(&EventHandle, - EVENT_ALL_ACCESS, + KEYEDEVENT_ALL_ACCESS, &ObjectAttributes, 0); if (NT_SUCCESS(Status)) { /* Take a reference so we can get rid of the handle */ Status = ObReferenceObjectByHandle(EventHandle, - EVENT_ALL_ACCESS, + KEYEDEVENT_ALL_ACCESS, ExKeyedEventObjectType, KernelMode, (PVOID*)&ExpCritSecOutOfMemoryEvent, @@ -258,8 +258,8 @@ ExpReleaseKeyedEvent( _Inout_ PEX_KEYED_EVENT KeyedEvent, _In_ PVOID KeyedWaitValue, - _In_ BOOLEAN Alertable, - _In_ PLARGE_INTEGER Timeout) + _In_ BOOLEAN Alertable, + _In_ PLARGE_INTEGER Timeout) { /* Call the generic internal function */ return ExpReleaseOrWaitForKeyedEvent(KeyedEvent, @@ -433,7 +433,7 @@ { /* Get the keyed event object */ Status = ObReferenceObjectByHandle(Handle, - EVENT_MODIFY_STATE, + KEYEDEVENT_WAIT, ExKeyedEventObjectType, PreviousMode, (PVOID*)&KeyedEvent, @@ -493,7 +493,7 @@ { /* Get the keyed event object */ Status = ObReferenceObjectByHandle(Handle, - EVENT_MODIFY_STATE, + KEYEDEVENT_WAKE, ExKeyedEventObjectType, PreviousMode, (PVOID*)&KeyedEvent,

1 0

[hbelusca] 66138: [RTL] - Whitespace files. - Add missing PSEH inclusion (that can be detected if one comments the objbase.h include in rtl.h ...) [MKHIVE] Code cleanup + add a comment to explain w...
by hbelusca＠svn.reactos.org 01 Feb '15

01 Feb '15

Author: hbelusca Date: Sun Feb 1 13:33:06 2015 New Revision: 66138 URL: http://svn.reactos.org/svn/reactos?rev=66138&view=rev Log: [RTL] - Whitespace files. - Add missing PSEH inclusion (that can be detected if one comments the objbase.h include in rtl.h ...) [MKHIVE] Code cleanup + add a comment to explain what this ntoskrnl.h file is. Modified: trunk/reactos/lib/rtl/access.c trunk/reactos/lib/rtl/acl.c trunk/reactos/lib/rtl/atom.c trunk/reactos/lib/rtl/avltable.c trunk/reactos/lib/rtl/bootdata.c trunk/reactos/lib/rtl/byteswap.c trunk/reactos/lib/rtl/compress.c trunk/reactos/lib/rtl/crc32.c trunk/reactos/lib/rtl/dbgbuffer.c trunk/reactos/lib/rtl/dos8dot3.c trunk/reactos/lib/rtl/encode.c trunk/reactos/lib/rtl/exception.c trunk/reactos/lib/rtl/generictable.c trunk/reactos/lib/rtl/handle.c trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heappage.c trunk/reactos/lib/rtl/heapuser.c trunk/reactos/lib/rtl/image.c trunk/reactos/lib/rtl/largeint.c trunk/reactos/lib/rtl/luid.c trunk/reactos/lib/rtl/mem.c trunk/reactos/lib/rtl/memstream.c trunk/reactos/lib/rtl/message.c trunk/reactos/lib/rtl/rtl.h trunk/reactos/tools/mkhive/cmi.c trunk/reactos/tools/mkhive/ntoskrnl.h Modified: trunk/reactos/lib/rtl/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/access.c?rev=66138… ============================================================================== --- trunk/reactos/lib/rtl/access.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/access.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/access.c * PURPOSE: Access rights handling functions Modified: trunk/reactos/lib/rtl/acl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/acl.c?rev=66138&r1… ============================================================================== --- trunk/reactos/lib/rtl/acl.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/acl.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Security manager * FILE: lib/rtl/acl.c Modified: trunk/reactos/lib/rtl/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/atom.c?rev=66138&r… ============================================================================== --- trunk/reactos/lib/rtl/atom.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/atom.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/atom.c * PURPOSE: Atom managment Modified: trunk/reactos/lib/rtl/avltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avltable.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/avltable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avltable.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS Runtime Library -* LICENSE: BSD - See COPYING.ARM in the top level directory -* FILE: lib/rtl/avltable.c -* PURPOSE: AVL Tree Generic Table Implementation -* PROGRAMMERS: ReactOS Portable Systems Group -*/ + * PROJECT: ReactOS Runtime Library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: lib/rtl/avltable.c + * PURPOSE: AVL Tree Generic Table Implementation + * PROGRAMMERS: ReactOS Portable Systems Group + */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Boot Data implementation * FILE: lib/rtl/bootdata.c Modified: trunk/reactos/lib/rtl/byteswap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/byteswap.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/byteswap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/byteswap.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/mem.c * PURPOSE: Memory functions Modified: trunk/reactos/lib/rtl/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/compress.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/compress.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/compress.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Compression and decompression functions * FILE: lib/rtl/compress.c Modified: trunk/reactos/lib/rtl/crc32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/crc32.c?rev=66138&… ============================================================================== --- trunk/reactos/lib/rtl/crc32.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/crc32.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: crc32 functions * FILE: lib/rtl/crc32.c Modified: trunk/reactos/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dbgbuffer.c?rev=66… ============================================================================== --- trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dbgbuffer.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,8 +1,9 @@ -/* COPYRIGHT: See COPYING in the top level directory -* PROJECT: ReactOS system libraries -* FILE: lib/rtl/dbgbuffer.c -* PROGRAMER: James Tabor -*/ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/rtl/dbgbuffer.c + * PROGRAMER: James Tabor + */ /* INCLUDES *****************************************************************/ @@ -14,8 +15,8 @@ /* FUNCTIONS *****************************************************************/ /* -* @unimplemented -*/ + * @unimplemented + */ PRTL_DEBUG_INFORMATION NTAPI RtlCreateQueryDebugBuffer(IN ULONG Size, @@ -42,8 +43,8 @@ } /* -* @unimplemented -*/ + * @unimplemented + */ NTSTATUS NTAPI RtlDestroyQueryDebugBuffer(IN PRTL_DEBUG_INFORMATION Buf) @@ -66,9 +67,8 @@ } /* -* Based on lib/epsapi/enum/modules.c by KJK::Hyperion. -* -*/ + * Based on lib/epsapi/enum/modules.c by KJK::Hyperion. + */ NTSTATUS NTAPI RtlpQueryRemoteProcessModules(HANDLE ProcessHandle, @@ -233,8 +233,8 @@ } /* -* @unimplemented -*/ + * @unimplemented + */ NTSTATUS NTAPI RtlQueryProcessDebugInformation(IN ULONG ProcessId, Modified: trunk/reactos/lib/rtl/dos8dot3.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/dos8dot3.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/dos8dot3.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/dos8dot3.c * PURPOSE: Short name (8.3 name) functions Modified: trunk/reactos/lib/rtl/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/encode.c?rev=66138… ============================================================================== --- trunk/reactos/lib/rtl/encode.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/encode.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Security descriptor functions * FILE: lib/rtl/encode.c Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=66… ============================================================================== --- trunk/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/exception.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Runtime Library * PURPOSE: User-Mode Exception Support * FILE: lib/rtl/exception.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,10 +1,10 @@ /* -* PROJECT: ReactOS Runtime Library -* LICENSE: GPL - See COPYING in the top level directory -* FILE: lib/rtl/generictable.c -* PURPOSE: Splay Tree Generic Table Implementation -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -*/ + * PROJECT: ReactOS Runtime Library + * LICENSE: GPL - See COPYING in the top level directory + * FILE: lib/rtl/generictable.c + * PURPOSE: Splay Tree Generic Table Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ /* INCLUDES ******************************************************************/ Modified: trunk/reactos/lib/rtl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=66138… ============================================================================== --- trunk/reactos/lib/rtl/handle.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/handle.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Handle table * FILE: lib/rtl/handle.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=66138&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/heap.c * PURPOSE: RTL Heap backend allocator Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/heappage.c * PURPOSE: RTL Page Heap implementation Modified: trunk/reactos/lib/rtl/heapuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heapuser.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/heapuser.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heapuser.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/heap.c * PURPOSE: RTL Heap backend allocator (user mode only functions) Modified: trunk/reactos/lib/rtl/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/image.c?rev=66138&… ============================================================================== --- trunk/reactos/lib/rtl/image.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/image.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/image.c * PURPOSE: Image handling functions Modified: trunk/reactos/lib/rtl/largeint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/largeint.c?rev=661… ============================================================================== --- trunk/reactos/lib/rtl/largeint.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/largeint.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/largeint.c * PURPOSE: Large integer operations Modified: trunk/reactos/lib/rtl/luid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/luid.c?rev=66138&r… ============================================================================== --- trunk/reactos/lib/rtl/luid.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/luid.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Locally unique identifier (LUID) helper functions * FILE: lib/rtl/luid.c Modified: trunk/reactos/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/mem.c?rev=66138&r1… ============================================================================== --- trunk/reactos/lib/rtl/mem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/mem.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/mem.c * PURPOSE: Memory functions Modified: trunk/reactos/lib/rtl/memstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memstream.c?rev=66… ============================================================================== --- trunk/reactos/lib/rtl/memstream.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/memstream.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/mem.c * PURPOSE: MemoryStream functions Modified: trunk/reactos/lib/rtl/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/message.c?rev=6613… ============================================================================== --- trunk/reactos/lib/rtl/message.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/message.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,4 +1,5 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/rtl/message.c * PURPOSE: Message table functions Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=66138&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -39,6 +39,9 @@ #include <ndk/sefuncs.h> #include <ndk/umfuncs.h> +/* SEH support with PSEH */ +#include <pseh/pseh2.h> + /* Internal RTL header */ #include "rtlp.h" Modified: trunk/reactos/tools/mkhive/cmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/cmi.c?rev=661… ============================================================================== --- trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/cmi.c [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -219,7 +219,7 @@ return Status; } -NTSTATUS +static NTSTATUS CmiCreateSubKey( IN PCMHIVE RegistryHive, IN HCELL_INDEX ParentKeyCellOffset, @@ -363,6 +363,7 @@ return STATUS_SUCCESS; } +#if 0 // Those two functions seem to be unused, but keep them just in case we may need to use them in the future... static BOOLEAN CmiCompareHash( IN PCUNICODE_STRING KeyName, @@ -378,8 +379,7 @@ return (strncmp(Buffer, HashString, 4) == 0); } - -BOOLEAN +static BOOLEAN CmiCompareHashI( IN PCUNICODE_STRING KeyName, IN PCHAR HashString) @@ -393,6 +393,7 @@ return (strncasecmp(Buffer, HashString, 4) == 0); } +#endif NTSTATUS CmiScanForSubKey( Modified: trunk/reactos/tools/mkhive/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/ntoskrnl.h?re… ============================================================================== --- trunk/reactos/tools/mkhive/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/ntoskrnl.h [iso-8859-1] Sun Feb 1 13:33:06 2015 @@ -1,10 +1,6 @@ +/* + * This header is used together with cmindex.c and cmname.c + */ + #define NDEBUG #include "mkhive.h" - -PVOID -NTAPI -CmpAllocate( - IN SIZE_T Size, - IN BOOLEAN Paged, - IN ULONG Tag -);

1 0

[hbelusca] 66137: [CDMAKE]: Code cleanup (remove useless comments and that setjmp thingie).
by hbelusca＠svn.reactos.org 01 Feb '15

01 Feb '15

Author: hbelusca Date: Sun Feb 1 12:39:37 2015 New Revision: 66137 URL: http://svn.reactos.org/svn/reactos?rev=66137&view=rev Log: [CDMAKE]: Code cleanup (remove useless comments and that setjmp thingie). Modified: trunk/reactos/tools/cdmake/cdmake.c trunk/reactos/tools/cdmake/dirhash.h Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sun Feb 1 12:39:37 2015 @@ -64,7 +64,6 @@ # define FALSE 0 #endif // _WIN32 #include <ctype.h> -#include <setjmp.h> #include <time.h> #include "config.h" #include "dirhash.h" @@ -131,7 +130,6 @@ WORD path_table_index; /* directory record only */ } DIR_RECORD, *PDIR_RECORD; - typedef enum directory_record_type { DOT_RECORD, @@ -147,7 +145,6 @@ static char DIRECTORY_TIMESTAMP[] = "~Y$'KOR$.3K&"; -static jmp_buf error; static struct cd_image cd; char volume_label[32]; @@ -570,13 +567,13 @@ return c; } +/*----------------------------------------------------------------------------- +This function checks to see if there's a cdname conflict. +-----------------------------------------------------------------------------*/ + #if defined(_WIN32) && !defined(strcasecmp) #define strcasecmp stricmp #endif//_WIN32 - -/*----------------------------------------------------------------------------- -This function checks to see if there's a cdname conflict. ------------------------------------------------------------------------------*/ int cdname_exists(PDIR_RECORD d) { @@ -722,11 +719,6 @@ PDIR_RECORD parent) { PDIR_RECORD d; - /* - char *s; - char *t; - char *n; - */ d = calloc(1, sizeof(*d)); if (d == NULL) @@ -1117,8 +1109,8 @@ new_d->next_in_directory = d->first_record; d->first_record = new_d; new_d->next_in_memory = root.next_in_memory; + root.next_in_memory = new_d; new_d->date_and_time = d->date_and_time; - root.next_in_memory = new_d; if (directory) { new_d->flags |= DIRECTORY_FLAG; @@ -1730,9 +1722,6 @@ return 1; } - if (setjmp(error)) - return 1; - // initialize root directory cd.buffer = malloc(BUFFER_SIZE); @@ -1775,7 +1764,7 @@ error_exit("Missing size limit parameter"); } while (isdigit(*t)) - size_limit = size_limit * 10 + *t++ - '0'; + size_limit = size_limit * 10 + *t++ - '0'; if (size_limit < 1 || size_limit > 800) error_exit("Invalid size limit"); size_limit <<= 9; // convert megabyte to sector count @@ -1838,6 +1827,7 @@ { char *trimmedline, *targetname, *srcname, *eq; char lineread[1024]; + FILE *f = fopen(source+1, "r"); if (!f) { Modified: trunk/reactos/tools/cdmake/dirhash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/dirhash.h?rev… ============================================================================== --- trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/dirhash.h [iso-8859-1] Sun Feb 1 12:39:37 2015 @@ -1,5 +1,5 @@ -#ifndef _REACTOS_TOOLS_CDMAKE_DIRHASH_H_ -#define _REACTOS_TOOLS_CDMAKE_DIRHASH_H_ +#ifndef _DIRHASH_H_ +#define _DIRHASH_H_ #define NUM_DIR_HASH_BUCKETS 1024 @@ -35,4 +35,4 @@ dir_hash_create_dir(struct target_dir_hash *dh, const char *casename, const char *targetnorm); void dir_hash_destroy(struct target_dir_hash *dh); -#endif //_REACTOS_TOOLS_CDMAKE_DIRHASH_H_ +#endif // _DIRHASH_H_

1 0

[ekohl] 66136: [NTOSKRNL] Set invalid atributes for the mutant object type. This fixes a kmtest:ObTypes bug.
by ekohl＠svn.reactos.org 01 Feb '15

01 Feb '15

Author: ekohl Date: Sun Feb 1 12:24:03 2015 New Revision: 66136 URL: http://svn.reactos.org/svn/reactos?rev=66136&view=rev Log: [NTOSKRNL] Set invalid atributes for the mutant object type. This fixes a kmtest:ObTypes bug. Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Sun Feb 1 12:24:03 2015 @@ -69,6 +69,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteMutant; ObjectTypeInitializer.ValidAccessMask = MUTANT_ALL_ACCESS; + ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); if (!NT_SUCCESS(Status)) return FALSE; return TRUE;

1 0

[jimtabor] 66135: [NtUser] - Add default setting to Foreground Flash Count. Should fix flash.
by jimtabor＠svn.reactos.org 31 Jan '15

31 Jan '15

Author: jimtabor Date: Sat Jan 31 23:30:30 2015 New Revision: 66135 URL: http://svn.reactos.org/svn/reactos?rev=66135&view=rev Log: [NtUser] - Add default setting to Foreground Flash Count. Should fix flash. Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Sat Jan 31 23:30:30 2015 @@ -295,6 +295,7 @@ gspv.bMenuDropAlign = 1; gspv.bDropShadow = 1; gspv.dwMenuShowDelay = 100; + gspv.dwForegroundFlashCount = 3; gspv.iScrSaverTimeout = SpiLoadTimeOut(); gspv.bScrSaverActive = FALSE;

1 0

[aandrejevic] 66134: [FAST486] Implement FLDENV and FRSTOR.
by aandrejevic＠svn.reactos.org 31 Jan '15

31 Jan '15

Author: aandrejevic Date: Sat Jan 31 22:47:05 2015 New Revision: 66134 URL: http://svn.reactos.org/svn/reactos?rev=66134&view=rev Log: [FAST486] Implement FLDENV and FRSTOR. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6613… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Jan 31 22:47:05 2015 @@ -920,6 +920,49 @@ } static inline BOOLEAN FASTCALL +Fast486FpuLoadEnvironment(PFAST486_STATE State, + INT Segment, + ULONG Address, + BOOLEAN Size) +{ + UCHAR Buffer[28]; + + if (!Fast486ReadMemory(State, Segment, Address, FALSE, Buffer, (Size + 1) * 14)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check if this is a 32-bit save or a 16-bit save */ + if (Size) + { + PULONG Data = (PULONG)Buffer; + + State->FpuControl.Value = (USHORT)Data[0]; + State->FpuStatus.Value = (USHORT)Data[1]; + State->FpuTag = (USHORT)Data[2]; + State->FpuLastInstPtr.Long = Data[3]; + State->FpuLastCodeSel = (USHORT)Data[4]; + State->FpuLastOpPtr.Long = Data[5]; + State->FpuLastDataSel = (USHORT)Data[6]; + } + else + { + PUSHORT Data = (PUSHORT)Buffer; + + State->FpuControl.Value = Data[0]; + State->FpuStatus.Value = Data[1]; + State->FpuTag = Data[2]; + State->FpuLastInstPtr.LowWord = Data[3]; + State->FpuLastCodeSel = Data[4]; + State->FpuLastOpPtr.LowWord = Data[5]; + State->FpuLastDataSel = Data[6]; + } + + return TRUE; +} + +static inline BOOLEAN FASTCALL Fast486FpuSaveEnvironment(PFAST486_STATE State, INT Segment, ULONG Address, @@ -1136,9 +1179,11 @@ /* FLDENV */ case 4: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - + Fast486FpuLoadEnvironment(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress, + OperandSize); break; } @@ -1698,8 +1743,47 @@ /* FRSTOR */ case 4: { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; + INT i; + UCHAR AllRegs[80]; + + /* Save the environment */ + if (!Fast486FpuLoadEnvironment(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress, + OperandSize)) + { + /* Exception occurred */ + return; + } + + /* Load the registers */ + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? FAST486_REG_DS : State->SegmentOverride, + ModRegRm.MemoryAddress + (OperandSize + 1) * 14, + FALSE, + AllRegs, + sizeof(AllRegs))) + { + /* Exception occurred */ + return; + } + + for (i = 0; i < FAST486_NUM_FPU_REGS; i++) + { + State->FpuRegisters[i].Mantissa = *((PULONGLONG)&AllRegs[i * 10]); + State->FpuRegisters[i].Exponent = *((PUSHORT)&AllRegs[(i * 10) + sizeof(ULONGLONG)]) & 0x7FFF; + + if (*((PUSHORT)&AllRegs[(i * 10) + sizeof(ULONGLONG)]) & 0x8000) + { + State->FpuRegisters[i].Sign = TRUE; + } + else + { + State->FpuRegisters[i].Sign = FALSE; + } + } break; } @@ -1709,8 +1793,6 @@ { INT i; UCHAR AllRegs[80]; - - FPU_SAVE_LAST_INST(); /* Save the environment */ if (!Fast486FpuSaveEnvironment(State, @@ -1748,9 +1830,6 @@ /* FSTSW */ case 7: { - FPU_SAVE_LAST_INST(); - FPU_SAVE_LAST_OPERAND(); - Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, State->FpuStatus.Value); break; }

1 0

[jimtabor] 66133: [NtUser] - Get flash window ready for use. Still more testing is needed. Missing shell support.
by jimtabor＠svn.reactos.org 31 Jan '15

31 Jan '15

Author: jimtabor Date: Sat Jan 31 22:41:34 2015 New Revision: 66133 URL: http://svn.reactos.org/svn/reactos?rev=66133&view=rev Log: [NtUser] - Get flash window ready for use. Still more testing is needed. Missing shell support. Modified: trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/painting.h trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Jan 31 22:41:34 2015 @@ -942,23 +942,127 @@ FASTCALL IntFlashWindowEx(PWND pWnd, PFLASHWINFO pfwi) { - PPROPERTY pprop; - DWORD FlashState; - BOOL Ret = FALSE; - - pprop = IntGetProp(pWnd, AtomFlashWndState); - if (!pprop) - { - FlashState = pfwi->dwFlags; - IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); - return TRUE; - } - - FlashState = (DWORD)pprop->Data; + PFLASHDATA pfData; + BOOL Activate = FALSE, Ret = FALSE; + + pfData = UserGetProp(pWnd, AtomFlashWndState); + if (!pfData) + { + pfData = ExAllocatePoolWithTag(NonPagedPool, sizeof(FLASHDATA), USERTAG_WINDOW); + + pfData->FlashState = 0; + pfData->uCount = pfwi->uCount; + + IntSetProp(pWnd, AtomFlashWndState, (HANDLE) pfData); + } + + if (pfData->FlashState == FLASHW_FINISHED) + { + // Cycle has finished, kill timer and set this to Stop. + pfData->FlashState |= FLASHW_KILLSYSTIMER; + pfwi->dwFlags = FLASHW_STOP; + } + else + { + if (pfData->FlashState) + { + if (pfwi->dwFlags == FLASHW_SYSTIMER) + { + // Called from system timer, restore flags. + pfwi->dwFlags = pfData->FlashState; + } + } + else + { // First time in cycle, setup flash state. + if ( pWnd->state & WNDS_ACTIVEFRAME || + (pfwi->dwFlags & FLASHW_CAPTION && pWnd->style & (WS_BORDER|WS_DLGFRAME))) + { + pfData->FlashState = FLASHW_STARTED|FLASHW_ACTIVE; + } + } + + // Set previous window state. + Ret = !!(pfData->FlashState & FLASHW_ACTIVE); + + if ( pfwi->dwFlags & FLASHW_TIMERNOFG && + gpqForeground == pWnd->head.pti->MessageQueue ) + { + // Flashing until foreground, set this to Stop. + pfwi->dwFlags = FLASHW_STOP; + } + } + + // Toggle activate flag. if ( pfwi->dwFlags == FLASHW_STOP ) { + if (gpqForeground && gpqForeground->spwndActive == pWnd) + Activate = TRUE; + else + Activate = FALSE; + } + else + { + Activate = (pfData->FlashState & FLASHW_ACTIVE) == 0; + } + + if ( pfwi->dwFlags == FLASHW_STOP || pfwi->dwFlags & FLASHW_CAPTION ) + { + co_IntSendMessage(UserHMGetHandle(pWnd), WM_NCACTIVATE, Activate, 0); + } + + // FIXME: Check for a Stop Sign here. + if ( pfwi->dwFlags & FLASHW_TRAY ) + { + // Need some shell work here too. + TRACE("FIXME: Flash window no Tray support!\n"); + } + + if ( pfwi->dwFlags == FLASHW_STOP ) + { + if (pfData->FlashState & FLASHW_KILLSYSTIMER) + { + IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE); + } + IntRemoveProp(pWnd, AtomFlashWndState); - Ret = TRUE; + + ExFreePoolWithTag(pfData, USERTAG_WINDOW); + } + else + { // Have a count and started, set timer. + if ( pfData->uCount ) + { + pfData->FlashState |= FLASHW_COUNT; + + if (!(Activate ^ !!(pfData->FlashState & FLASHW_STARTED))) + pfData->uCount--; + + if (!(pfData->FlashState & FLASHW_KILLSYSTIMER)) + pfwi->dwFlags |= FLASHW_TIMER; + } + + if (pfwi->dwFlags & FLASHW_TIMER) + { + pfData->FlashState |= FLASHW_KILLSYSTIMER; + + IntSetTimer( pWnd, + ID_EVENT_SYSTIMER_FLASHWIN, + pfwi->dwTimeout ? pfwi->dwTimeout : gpsi->dtCaretBlink, + SystemTimerProc, + TMRF_SYSTEM ); + } + + if (pfData->FlashState & FLASHW_COUNT && pfData->uCount == 0) + { + // Keep spinning? Nothing else to do. + pfData->FlashState = FLASHW_FINISHED; + } + else + { + // Save state and flags so this can be restored next time through. + pfData->FlashState ^= (pfData->FlashState ^ -!!(Activate)) & FLASHW_ACTIVE; + pfData->FlashState ^= (pfData->FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); + } } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.h [iso-8859-1] Sat Jan 31 22:41:34 2015 @@ -1,4 +1,17 @@ #pragma once + +#define FLASHW_MASK 0x0000000f +#define FLASHW_SYSTIMER 0x00000400 +#define FLASHW_FINISHED 0x00000800 +#define FLASHW_STARTED 0x00001000 +#define FLASHW_COUNT 0x00002000 +#define FLASHW_KILLSYSTIMER 0x00004000 +#define FLASHW_ACTIVE 0x00008000 + +typedef struct _FLASHDATA{ + DWORD FlashState; + UINT uCount; +} FLASHDATA, *PFLASHDATA; BOOL FASTCALL co_UserRedrawWindow(PWND Wnd, const RECTL* UpdateRect, PREGION UpdateRgn, ULONG Flags); VOID FASTCALL IntInvalidateWindows(PWND Window, PREGION Rgn, ULONG Flags); @@ -11,3 +24,4 @@ BOOL FASTCALL IntEndPaint(PWND,PPAINTSTRUCT); HDC FASTCALL IntBeginPaint(PWND,PPAINTSTRUCT); PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND ); +BOOL FASTCALL IntFlashWindowEx(PWND,PFLASHWINFO); Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sat Jan 31 22:41:34 2015 @@ -344,6 +344,17 @@ } } return; // Not this window so just return. + + case ID_EVENT_SYSTIMER_FLASHWIN: + { + FLASHWINFO fwi = + {sizeof(FLASHWINFO), + UserHMGetHandle(pWnd), + FLASHW_SYSTIMER,0,0}; + + IntFlashWindowEx(pWnd, &fwi); + } + return; default: ERR("System Timer Proc invalid id %u!\n", idEvent);

1 0

[jimtabor] 66132: [NtUser] - Hack fix crash while removing menus. See CORE-9107 for crash information and CORE-8299 for overall menu issues.
by jimtabor＠svn.reactos.org 31 Jan '15

31 Jan '15

Author: jimtabor Date: Sat Jan 31 21:44:26 2015 New Revision: 66132 URL: http://svn.reactos.org/svn/reactos?rev=66132&view=rev Log: [NtUser] - Hack fix crash while removing menus. See CORE-9107 for crash information and CORE-8299 for overall menu issues. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sat Jan 31 21:44:26 2015 @@ -252,6 +252,11 @@ } } } + if (UserObjectInDestroy(Menu->head.h)) + { + ERR("Menu already dead!\n"); + return FALSE; + } ret = UserDeleteObject(Menu->head.h, TYPE_MENU); if (!ret) { // Make sure it is really dead or just marked for deletion.

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