Ros-diffs January 2016

ros-diffs@reactos.org

13 participants
192 discussions

[ion] 70489: [CMLIB]: Move Value functions to CMLIB as well, so that they can be shared with the new boot code.

by ion＠svn.reactos.org

Author: ion Date: Tue Jan 5 01:51:54 2016 New Revision: 70489 URL: http://svn.reactos.org/svn/reactos?rev=70489&view=rev Log: [CMLIB]: Move Value functions to CMLIB as well, so that they can be shared with the new boot code. Added: trunk/reactos/lib/cmlib/cmvalue.c - copied, changed from r70480, trunk/reactos/ntoskrnl/config/cmvalue.c Removed: trunk/reactos/ntoskrnl/config/cmvalue.c Modified: trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c trunk/reactos/lib/cmlib/CMakeLists.txt trunk/reactos/lib/cmlib/cmdata.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/include/internal/cm_x.h trunk/reactos/ntoskrnl/ntos.cmake Modified: trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/bootmgr/r… ============================================================================== --- trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/app/bootmgr/rtlcompat.c [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -75,3 +75,15 @@ { return 0; } + +VOID +NTAPI +KeBugCheckEx( + _In_ ULONG BugCheckCode, + _In_ ULONG_PTR BugCheckParameter1, + _In_ ULONG_PTR BugCheckParameter2, + _In_ ULONG_PTR BugCheckParameter3, + _In_ ULONG_PTR BugCheckParameter4) +{ + __assume(0); +} Modified: trunk/reactos/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/CMakeLists.txt [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -9,6 +9,7 @@ cmindex.c cmname.c cmtools.c + cmvalue.c hivebin.c hivecell.c hiveinit.c Modified: trunk/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmdata.h?rev=704… ============================================================================== --- trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmdata.h [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -47,6 +47,13 @@ // CM_KEY_VALUE Flags // #define VALUE_COMP_NAME 0x0001 + +// +// CM_KEY_VALUE Types +// +#define CM_KEY_VALUE_SMALL 0x4 +#define CM_KEY_VALUE_BIG 0x3FD8 +#define CM_KEY_VALUE_SPECIAL_SIZE 0x80000000 #include <pshpack1.h> Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7048… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -160,6 +160,7 @@ #include <wchar.h> #include "hivedata.h" #include "cmdata.h" +#include "bugcodes.h" #if defined(_TYPEDEFS_HOST_H) || defined(__FREELDR_H) @@ -253,6 +254,56 @@ extern ULONG CmlibTraceLevel; +// +// Hack since bigkeys are not yet supported +// +#define ASSERT_VALUE_BIG(h, s) \ + ASSERTMSG("Big keys not supported!", !CmpIsKeyValueBig(h, s)); + +// +// Returns whether or not this is a small valued key +// +static inline +BOOLEAN +CmpIsKeyValueSmall(OUT PULONG RealLength, + IN ULONG Length) +{ + /* Check if the length has the special size value */ + if (Length >= CM_KEY_VALUE_SPECIAL_SIZE) + { + /* It does, so this is a small key: return the real length */ + *RealLength = Length - CM_KEY_VALUE_SPECIAL_SIZE; + return TRUE; + } + + /* This is not a small key, return the length we read */ + *RealLength = Length; + return FALSE; +} + +// +// Returns whether or not this is a big valued key +// +static inline +BOOLEAN +CmpIsKeyValueBig(IN PHHIVE Hive, + IN ULONG Length) +{ + /* Check if the hive is XP Beta 1 or newer */ + if (Hive->Version >= HSYS_WHISTLER_BETA1) + { + /* Check if the key length is valid for a big value key */ + if ((Length < CM_KEY_VALUE_SPECIAL_SIZE) && (Length > CM_KEY_VALUE_BIG)) + { + /* Yes, this value is big */ + return TRUE; + } + } + + /* Not a big value key */ + return FALSE; +} + /* * Public Hive functions. */ Copied: trunk/reactos/lib/cmlib/cmvalue.c (from r70480, trunk/reactos/ntoskrnl/config/cmvalue.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmvalue.c?p2=tru… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmvalue.c [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -1,16 +1,16 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/cmvalue.c - * PURPOSE: Configuration Manager - Cell Values + * FILE: lib/cmlib/cmvalue.c + * PURPOSE: Configuration Manager Library - Cell Values * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES ******************************************************************/ -#include "ntoskrnl.h" +#include "cmlib.h" #define NDEBUG -#include "debug.h" +#include <debug.h> /* FUNCTIONS *****************************************************************/ @@ -362,6 +362,46 @@ return STATUS_SUCCESS; } +HCELL_INDEX +NTAPI +CmpCopyCell(IN PHHIVE SourceHive, + IN HCELL_INDEX SourceCell, + IN PHHIVE DestinationHive, + IN HSTORAGE_TYPE StorageType) +{ + PCELL_DATA SourceData; + PCELL_DATA DestinationData = NULL; + HCELL_INDEX DestinationCell = HCELL_NIL; + LONG DataSize; + PAGED_CODE(); + + /* Get the data and the size of the source cell */ + SourceData = HvGetCell(SourceHive, SourceCell); + DataSize = HvGetCellSize(SourceHive, SourceData); + + /* Allocate a new cell in the destination hive */ + DestinationCell = HvAllocateCell(DestinationHive, + DataSize, + StorageType, + HCELL_NIL); + if (DestinationCell == HCELL_NIL) goto Cleanup; + + /* Get the data of the destination cell */ + DestinationData = HvGetCell(DestinationHive, DestinationCell); + + /* Copy the data from the source cell to the destination cell */ + RtlMoveMemory(DestinationData, SourceData, DataSize); + +Cleanup: + + /* Release the cells */ + if (SourceData) HvReleaseCell(SourceHive, SourceCell); + if (DestinationData) HvReleaseCell(DestinationHive, DestinationCell); + + /* Return the destination cell index */ + return DestinationCell; +} + NTSTATUS NTAPI CmpCopyKeyValueList(IN PHHIVE SourceHive, Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -2345,46 +2345,6 @@ return SubKeys; } -HCELL_INDEX -NTAPI -CmpCopyCell(IN PHHIVE SourceHive, - IN HCELL_INDEX SourceCell, - IN PHHIVE DestinationHive, - IN HSTORAGE_TYPE StorageType) -{ - PCELL_DATA SourceData; - PCELL_DATA DestinationData = NULL; - HCELL_INDEX DestinationCell = HCELL_NIL; - LONG DataSize; - PAGED_CODE(); - - /* Get the data and the size of the source cell */ - SourceData = HvGetCell(SourceHive, SourceCell); - DataSize = HvGetCellSize(SourceHive, SourceData); - - /* Allocate a new cell in the destination hive */ - DestinationCell = HvAllocateCell(DestinationHive, - DataSize, - StorageType, - HCELL_NIL); - if (DestinationCell == HCELL_NIL) goto Cleanup; - - /* Get the data of the destination cell */ - DestinationData = HvGetCell(DestinationHive, DestinationCell); - - /* Copy the data from the source cell to the destination cell */ - RtlMoveMemory(DestinationData, SourceData, DataSize); - -Cleanup: - - /* Release the cells */ - if (SourceData) HvReleaseCell(SourceHive, SourceCell); - if (DestinationData) HvReleaseCell(DestinationHive, DestinationCell); - - /* Return the destination cell index */ - return DestinationCell; -} - static NTSTATUS NTAPI Removed: trunk/reactos/ntoskrnl/config/cmvalue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalue.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalue.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalue.c (removed) @@ -1,422 +0,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/config/cmvalue.c - * PURPOSE: Configuration Manager - Cell Values - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include "ntoskrnl.h" -#define NDEBUG -#include "debug.h" - -/* FUNCTIONS *****************************************************************/ - -BOOLEAN -NTAPI -CmpMarkValueDataDirty(IN PHHIVE Hive, - IN PCM_KEY_VALUE Value) -{ - ULONG KeySize; - PAGED_CODE(); - - /* Make sure there's actually any data */ - if (Value->Data != HCELL_NIL) - { - /* If this is a small key, there's no need to have it dirty */ - if (CmpIsKeyValueSmall(&KeySize, Value->DataLength)) return TRUE; - - /* Check if this is a big key */ - ASSERT_VALUE_BIG(Hive, KeySize); - - /* Normal value, just mark it dirty */ - HvMarkCellDirty(Hive, Value->Data, FALSE); - } - - /* Operation complete */ - return TRUE; -} - -BOOLEAN -NTAPI -CmpFreeValueData(IN PHHIVE Hive, - IN HCELL_INDEX DataCell, - IN ULONG DataLength) -{ - ULONG KeySize; - PAGED_CODE(); - - /* If this is a small key, the data is built-in */ - if (!CmpIsKeyValueSmall(&KeySize, DataLength)) - { - /* If there's no data cell, there's nothing to do */ - if (DataCell == HCELL_NIL) return TRUE; - - /* Make sure the data cell is allocated */ - //ASSERT(HvIsCellAllocated(Hive, DataCell)); - - /* Unsupported value type */ - ASSERT_VALUE_BIG(Hive, KeySize); - - /* Normal value, just free the data cell */ - HvFreeCell(Hive, DataCell); - } - - /* Operation complete */ - return TRUE; -} - -BOOLEAN -NTAPI -CmpFreeValue(IN PHHIVE Hive, - IN HCELL_INDEX Cell) -{ - PCM_KEY_VALUE Value; - PAGED_CODE(); - - /* Get the cell data */ - Value = (PCM_KEY_VALUE)HvGetCell(Hive, Cell); - if (!Value) ASSERT(FALSE); - - /* Free it */ - if (!CmpFreeValueData(Hive, Value->Data, Value->DataLength)) - { - /* We failed to free the data, return failure */ - HvReleaseCell(Hive, Cell); - return FALSE; - } - - /* Release the cell and free it */ - HvReleaseCell(Hive, Cell); - HvFreeCell(Hive, Cell); - return TRUE; -} - -HCELL_INDEX -NTAPI -CmpFindValueByName(IN PHHIVE Hive, - IN PCM_KEY_NODE KeyNode, - IN PUNICODE_STRING Name) -{ - HCELL_INDEX CellIndex; - - /* Call the main function */ - if (!CmpFindNameInList(Hive, - &KeyNode->ValueList, - Name, - NULL, - &CellIndex)) - { - /* Santy check */ - ASSERT(CellIndex == HCELL_NIL); - } - - /* Return the index */ - return CellIndex; -} - -BOOLEAN -NTAPI -CmpGetValueData(IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - IN PULONG Length, - OUT PVOID *Buffer, - OUT PBOOLEAN BufferAllocated, - OUT PHCELL_INDEX CellToRelease) -{ - PAGED_CODE(); - - /* Sanity check */ - ASSERT(Value->Signature == CM_KEY_VALUE_SIGNATURE); - - /* Set failure defaults */ - *BufferAllocated = FALSE; - *Buffer = NULL; - *CellToRelease = HCELL_NIL; - - /* Check if this is a small key */ - if (CmpIsKeyValueSmall(Length, Value->DataLength)) - { - /* Return the data immediately */ - *Buffer = &Value->Data; - return TRUE; - } - - /* Unsupported */ - ASSERT_VALUE_BIG(Hive, *Length); - - /* Get the data from the cell */ - *Buffer = HvGetCell(Hive, Value->Data); - if (!(*Buffer)) return FALSE; - - /* Return success and the cell to be released */ - *CellToRelease = Value->Data; - return TRUE; -} - -PCELL_DATA -NTAPI -CmpValueToData(IN PHHIVE Hive, - IN PCM_KEY_VALUE Value, - OUT PULONG Length) -{ - PCELL_DATA Buffer; - BOOLEAN BufferAllocated; - HCELL_INDEX CellToRelease; - PAGED_CODE(); - - /* Sanity check */ - ASSERT(Hive->ReleaseCellRoutine == NULL); - - /* Get the actual data */ - if (!CmpGetValueData(Hive, - Value, - Length, - (PVOID)&Buffer, - &BufferAllocated, - &CellToRelease)) - { - /* We failed */ - ASSERT(BufferAllocated == FALSE); - ASSERT(Buffer == NULL); - return NULL; - } - - /* This should never happen!*/ - if (BufferAllocated) - { - /* Free the buffer and bugcheck */ - CmpFree(Buffer, 0); - KeBugCheckEx(REGISTRY_ERROR, 8, 0, (ULONG_PTR)Hive, (ULONG_PTR)Value); - } - - /* Otherwise, return the cell data */ - return Buffer; -} - -NTSTATUS -NTAPI -CmpAddValueToList(IN PHHIVE Hive, - IN HCELL_INDEX ValueCell, - IN ULONG Index, - IN ULONG Type, - IN OUT PCHILD_LIST ChildList) -{ - HCELL_INDEX ListCell; - ULONG ChildCount, Length, i; - PCELL_DATA CellData; - PAGED_CODE(); - - /* Sanity check */ - ASSERT((((LONG)Index) >= 0) && (Index <= ChildList->Count)); - - /* Get the number of entries in the child list */ - ChildCount = ChildList->Count; - ChildCount++; - if (ChildCount > 1) - { - /* The cell should be dirty at this point */ - ASSERT(HvIsCellDirty(Hive, ChildList->List)); - - /* Check if we have less then 100 children */ - if (ChildCount < 100) - { - /* Allocate just enough as requested */ - Length = ChildCount * sizeof(HCELL_INDEX); - } - else - { - /* Otherwise, we have quite a few, so allocate a batch */ - Length = ROUND_UP(ChildCount, 100) * sizeof(HCELL_INDEX); - if (Length > HBLOCK_SIZE) - { - /* But make sure we don't allocate beyond our block size */ - Length = ROUND_UP(Length, HBLOCK_SIZE); - } - } - - /* Perform the allocation */ - ListCell = HvReallocateCell(Hive, ChildList->List, Length); - } - else - { - /* This is our first child, so allocate a single cell */ - ListCell = HvAllocateCell(Hive, sizeof(HCELL_INDEX), Type, HCELL_NIL); - } - - /* Fail if we couldn't get a cell */ - if (ListCell == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; - - /* Set this cell as the child list's list cell */ - ChildList->List = ListCell; - - /* Get the actual key list memory */ - CellData = HvGetCell(Hive, ListCell); - ASSERT(CellData != NULL); - - /* Loop all the children */ - for (i = ChildCount - 1; i > Index; i--) - { - /* Move them all down */ - CellData->u.KeyList[i] = CellData->u.KeyList[i - 1]; - } - - /* Insert us on top now */ - CellData->u.KeyList[Index] = ValueCell; - ChildList->Count = ChildCount; - - /* Release the list cell and make sure the value cell is dirty */ - HvReleaseCell(Hive, ListCell); - ASSERT(HvIsCellDirty(Hive, ValueCell)); - - /* We're done here */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -CmpSetValueDataNew(IN PHHIVE Hive, - IN PVOID Data, - IN ULONG DataSize, - IN ULONG StorageType, - IN HCELL_INDEX ValueCell, - OUT PHCELL_INDEX DataCell) -{ - PCELL_DATA CellData; - PAGED_CODE(); - ASSERT(DataSize > CM_KEY_VALUE_SMALL); - - /* Check if this is a big key */ - ASSERT_VALUE_BIG(Hive, DataSize); - - /* Allocate a data cell */ - *DataCell = HvAllocateCell(Hive, DataSize, StorageType, HCELL_NIL); - if (*DataCell == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; - - /* Get the actual data */ - CellData = HvGetCell(Hive, *DataCell); - if (!CellData) ASSERT(FALSE); - - /* Copy our buffer into it */ - RtlCopyMemory(CellData, Data, DataSize); - - /* All done */ - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -CmpRemoveValueFromList(IN PHHIVE Hive, - IN ULONG Index, - IN OUT PCHILD_LIST ChildList) -{ - ULONG Count; - PCELL_DATA CellData; - HCELL_INDEX NewCell; - PAGED_CODE(); - - /* Sanity check */ - ASSERT((((LONG)Index) >= 0) && (Index <= ChildList->Count)); - - /* Get the new count after removal */ - Count = ChildList->Count - 1; - if (Count > 0) - { - /* Get the actual list array */ - CellData = HvGetCell(Hive, ChildList->List); - if (!CellData) return STATUS_INSUFFICIENT_RESOURCES; - - /* Make sure cells data have been made dirty */ - ASSERT(HvIsCellDirty(Hive, ChildList->List)); - ASSERT(HvIsCellDirty(Hive, CellData->u.KeyList[Index])); - - /* Loop the list */ - while (Index < Count) - { - /* Move everything up */ - CellData->u.KeyList[Index] = CellData->u.KeyList[Index + 1]; - Index++; - } - - /* Re-allocate the cell for the list by decreasing the count */ - NewCell = HvReallocateCell(Hive, - ChildList->List, - Count * sizeof(HCELL_INDEX)); - ASSERT(NewCell != HCELL_NIL); - HvReleaseCell(Hive,ChildList->List); - - /* Update the list cell */ - ChildList->List = NewCell; - } - else - { - /* Otherwise, we were the last entry, so free the list entirely */ - HvFreeCell(Hive, ChildList->List); - ChildList->List = HCELL_NIL; - } - - /* Update the child list with the new count */ - ChildList->Count = Count; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -CmpCopyKeyValueList(IN PHHIVE SourceHive, - IN PCHILD_LIST SrcValueList, - IN PHHIVE DestinationHive, - IN OUT PCHILD_LIST DestValueList, - IN HSTORAGE_TYPE StorageType) - -{ - NTSTATUS Status = STATUS_SUCCESS; - HCELL_INDEX CellIndex = HCELL_NIL; - ULONG Index; - PCELL_DATA SrcListData = NULL; - PCELL_DATA DestListData = NULL; - - PAGED_CODE(); - - /* Set the count */ - DestValueList->Count = SrcValueList->Count; - - /* Check if the list is empty */ - if (!DestValueList->Count) - { - DestValueList->List = HCELL_NIL; - return STATUS_SUCCESS; - } - - /* Create a simple copy of the list */ - CellIndex = CmpCopyCell(SourceHive, - SrcValueList->List, - DestinationHive, - StorageType); - if (CellIndex == HCELL_NIL) return STATUS_INSUFFICIENT_RESOURCES; - - /* Get the source and the destination value list */ - SrcListData = HvGetCell(SourceHive, SrcValueList->List); - DestListData = HvGetCell(DestinationHive, CellIndex); - - /* Copy the actual values */ - for (Index = 0; Index < SrcValueList->Count; Index++) - { - DestListData->u.KeyList[Index] = CmpCopyCell(SourceHive, - SrcListData->u.KeyList[Index], - DestinationHive, - StorageType); - if (DestListData->u.KeyList[Index] == HCELL_NIL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - } - - /* Release the cells */ - if (SrcListData) HvReleaseCell(SourceHive, SrcValueList->List); - if (DestListData) HvReleaseCell(DestinationHive, CellIndex); - - return Status; -} Modified: trunk/reactos/ntoskrnl/include/internal/cm_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm_x.h [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -5,50 +5,6 @@ * PURPOSE: Inlined Functions for the Configuration Manager * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ - -// -// Returns whether or not this is a small valued key -// -FORCEINLINE -BOOLEAN -CmpIsKeyValueSmall(OUT PULONG RealLength, - IN ULONG Length) -{ - /* Check if the length has the special size value */ - if (Length >= CM_KEY_VALUE_SPECIAL_SIZE) - { - /* It does, so this is a small key: return the real length */ - *RealLength = Length - CM_KEY_VALUE_SPECIAL_SIZE; - return TRUE; - } - - /* This is not a small key, return the length we read */ - *RealLength = Length; - return FALSE; -} - -// -// Returns whether or not this is a big valued key -// -FORCEINLINE -BOOLEAN -CmpIsKeyValueBig(IN PHHIVE Hive, - IN ULONG Length) -{ - /* Check if the hive is XP Beta 1 or newer */ - if (Hive->Version >= HSYS_WHISTLER_BETA1) - { - /* Check if the key length is valid for a big value key */ - if ((Length < CM_KEY_VALUE_SPECIAL_SIZE) && (Length > CM_KEY_VALUE_BIG)) - { - /* Yes, this value is big */ - return TRUE; - } - } - - /* Not a big value key */ - return FALSE; -} // // Returns the hashkey corresponding to a convkey Modified: trunk/reactos/ntoskrnl/ntos.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntos.cmake?rev=70… ============================================================================== --- trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntos.cmake [iso-8859-1] Tue Jan 5 01:51:54 2016 @@ -68,7 +68,6 @@ ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmsecach.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmsysini.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmvalche.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmvalue.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmwraprs.c ${REACTOS_SOURCE_DIR}/ntoskrnl/config/ntapi.c ${REACTOS_SOURCE_DIR}/ntoskrnl/dbgk/dbgkobj.c

8 years, 11 months

[gedmurphy] 70488: [FLTMGR] - Plug in the dispatch routines. These are just pass through methods for now to get the filter up and running. - Implement the FastIo handlers. The majority of these cal...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Jan 4 12:50:06 2016 New Revision: 70488 URL: http://svn.reactos.org/svn/reactos?rev=70488&view=rev Log: [FLTMGR] - Plug in the dispatch routines. These are just pass through methods for now to get the filter up and running. - Implement the FastIo handlers. The majority of these call the FastIo routines of the attached device object. - Make sure we detach from devices that are being deleted in FastIoDetachDevice. - Move the FastIoDetachDevice routine to a deferred call as it's too expensive to tie up a FastIo request. Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Mon Jan 4 12:50:06 2016 @@ -36,6 +36,12 @@ _In_ PDEVICE_OBJECT SourceDevice, _In_ PDEVICE_OBJECT Targetevice, _Out_ PDEVICE_OBJECT *AttachedToDeviceObject +); + +static +VOID +FltpCleanupDeviceObject( + _In_ PDEVICE_OBJECT DeviceObject ); static @@ -94,8 +100,6 @@ /* The file system we're attached to */ PDEVICE_OBJECT AttachedToDeviceObject; - // Pointer to the real (disk) device object that is associated with - // the file system device object we are attached to /* The storage stack(disk) accociated with the file system device object we're attached to */ PDEVICE_OBJECT StorageStackDeviceObject; @@ -106,7 +110,13 @@ } FLTMGR_DEVICE_EXTENSION, *PFLTMGR_DEVICE_EXTENSION; - +typedef struct _DETATCH_DEVICE_WORK_ITEM +{ + WORK_QUEUE_ITEM WorkItem; + PDEVICE_OBJECT SourceDevice; + PDEVICE_OBJECT TargetDevice; + +} DETATCH_DEVICE_WORK_ITEM, *PDETATCH_DEVICE_WORK_ITEM; /* DISPATCH ROUTINES **********************************************/ @@ -139,10 +149,15 @@ FltpDispatch(_In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp) { - UNREFERENCED_PARAMETER(DeviceObject); - UNREFERENCED_PARAMETER(Irp); + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); - return STATUS_SUCCESS; + FLT_ASSERT(DeviceExtension && + DeviceExtension->AttachedToDeviceObject); + + /* Just pass the IRP down the stack */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->AttachedToDeviceObject, Irp); } NTSTATUS @@ -150,10 +165,15 @@ FltpCreate(_In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp) { - UNREFERENCED_PARAMETER(DeviceObject); - UNREFERENCED_PARAMETER(Irp); + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); - return STATUS_SUCCESS; + FLT_ASSERT(DeviceExtension && + DeviceExtension->AttachedToDeviceObject); + + /* Just pass the IRP down the stack */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->AttachedToDeviceObject, Irp); } NTSTATUS @@ -161,16 +181,1025 @@ FltpFsControl(_In_ PDEVICE_OBJECT DeviceObject, _Inout_ PIRP Irp) { - UNREFERENCED_PARAMETER(DeviceObject); - UNREFERENCED_PARAMETER(Irp); + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); - return STATUS_SUCCESS; + FLT_ASSERT(DeviceExtension && + DeviceExtension->AttachedToDeviceObject); + /* Just pass the IRP down the stack */ + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->AttachedToDeviceObject, Irp); +} + + + +/* FASTIO ROUTINES ************************************************/ + +BOOLEAN +FltpFastIoCheckIfPossible(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ BOOLEAN CheckForReadOperation, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) + +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoCheckIfPossible) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoCheckIfPossible(FileObject, + FileOffset, + Length, + Wait, + LockKey, + CheckForReadOperation, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoRead(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoRead) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoRead(FileObject, + FileOffset, + Length, + Wait, + LockKey, + Buffer, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoWrite(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoWrite) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoWrite(FileObject, + FileOffset, + Length, + Wait, + LockKey, + Buffer, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoQueryBasicInfo(_In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _Out_ PFILE_BASIC_INFORMATION Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoQueryBasicInfo) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoQueryBasicInfo(FileObject, + Wait, + Buffer, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoQueryStandardInfo(_In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _Out_ PFILE_STANDARD_INFORMATION Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoQueryStandardInfo) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoQueryStandardInfo(FileObject, + Wait, + Buffer, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoLock(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PLARGE_INTEGER Length, + _In_ PEPROCESS ProcessId, + _In_ ULONG Key, + _In_ BOOLEAN FailImmediately, + _In_ BOOLEAN ExclusiveLock, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoLock) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoLock(FileObject, + FileOffset, + Length, + ProcessId, + Key, + FailImmediately, + ExclusiveLock, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoUnlockSingle(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PLARGE_INTEGER Length, + _In_ PEPROCESS ProcessId, + _In_ ULONG Key, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoUnlockSingle) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoUnlockSingle(FileObject, + FileOffset, + Length, + ProcessId, + Key, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoUnlockAll(_In_ PFILE_OBJECT FileObject, + _In_ PEPROCESS ProcessId, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) + +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoUnlockAll) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoUnlockAll(FileObject, + ProcessId, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoUnlockAllByKey(_In_ PFILE_OBJECT FileObject, + _In_ PVOID ProcessId, + _In_ ULONG Key, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoUnlockAllByKey) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoUnlockAllByKey(FileObject, + ProcessId, + Key, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoDeviceControl(_In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _In_opt_ PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_opt_ PVOID OutputBuffer, + _In_ ULONG OutputBufferLength, + _In_ ULONG IoControlCode, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the request, send it down the slow path */ + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoDeviceControl) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoDeviceControl(FileObject, + Wait, + InputBuffer, + InputBufferLength, + OutputBuffer, + OutputBufferLength, + IoControlCode, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +VOID +NTAPI +FltpFastIoDetatchDeviceWorker(_In_ PVOID Parameter) +{ + PDETATCH_DEVICE_WORK_ITEM DetatchDeviceWorkItem = Parameter; + + /* Run any cleanup routines */ + FltpCleanupDeviceObject(DetatchDeviceWorkItem->SourceDevice); + + /* Detatch from the target device */ + IoDetachDevice(DetatchDeviceWorkItem->TargetDevice); + + /* Delete the source */ + IoDeleteDevice(DetatchDeviceWorkItem->SourceDevice); + + /* Free the pool we allocated in FltpFastIoDetachDevice */ + ExFreePoolWithTag(DetatchDeviceWorkItem, 0x1234); +} + +VOID +FltpFastIoDetachDevice(_In_ PDEVICE_OBJECT SourceDevice, + _In_ PDEVICE_OBJECT TargetDevice) +{ + PDETATCH_DEVICE_WORK_ITEM DetatchDeviceWorkItem; + + PAGED_CODE(); + + /* + * Detatching and deleting devices is a lot of work and takes too long + * to be a worthwhile FastIo candidate, so we defer this call to speed + * it up. There's no return value so we're okay to do this. + */ + + /* Allocate the work item and it's corresponding data */ + DetatchDeviceWorkItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DETATCH_DEVICE_WORK_ITEM), + 0x1234); + if (DetatchDeviceWorkItem) + { + /* Initialize the work item */ + ExInitializeWorkItem(&DetatchDeviceWorkItem->WorkItem, + FltpFastIoDetatchDeviceWorker, + DetatchDeviceWorkItem); + + /* Queue the work item and return the call */ + ExQueueWorkItem(&DetatchDeviceWorkItem->WorkItem, + DelayedWorkQueue); + } + else + { + /* We failed to defer, just cleanup here */ + FltpCleanupDeviceObject(SourceDevice); + IoDetachDevice(TargetDevice); + IoDeleteDevice(SourceDevice); + } + +} + +BOOLEAN +FltpFastIoQueryNetworkOpenInfo(_In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _Out_ PFILE_NETWORK_OPEN_INFORMATION Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoQueryNetworkOpenInfo) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoQueryNetworkOpenInfo(FileObject, + Wait, + Buffer, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoMdlRead(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->MdlRead) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->MdlRead(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoMdlReadComplete(_In_ PFILE_OBJECT FileObject, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject) + +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the request, send it down the slow path */ + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->MdlReadComplete) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->MdlReadComplete(FileObject, + MdlChain, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoPrepareMdlWrite(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the call */ + IoStatus->Status = STATUS_INVALID_DEVICE_REQUEST; + IoStatus->Information = 0; + return TRUE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->PrepareMdlWrite) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->PrepareMdlWrite(FileObject, + FileOffset, + Length, + LockKey, + MdlChain, + IoStatus, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoMdlWriteComplete(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the request, send it down the slow path */ + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->MdlWriteComplete) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->MdlWriteComplete(FileObject, + FileOffset, + MdlChain, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoReadCompressed(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _Out_ PCOMPRESSED_DATA_INFO CompressedDataInfo, + _In_ ULONG CompressedDataInfoLength, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the request, send it down the slow path */ + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoReadCompressed) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoReadCompressed(FileObject, + FileOffset, + Length, + LockKey, + Buffer, + MdlChain, + IoStatus, + CompressedDataInfo, + CompressedDataInfoLength, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoWriteCompressed(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ ULONG LockKey, + _In_ PVOID Buffer, + _Out_ PMDL *MdlChain, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PCOMPRESSED_DATA_INFO CompressedDataInfo, + _In_ ULONG CompressedDataInfoLength, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + /* Fail the request, send it down the slow path */ + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoWriteCompressed) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->FastIoWriteCompressed(FileObject, + FileOffset, + Length, + LockKey, + Buffer, + MdlChain, + IoStatus, + CompressedDataInfo, + CompressedDataInfoLength, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoMdlReadCompleteCompressed(_In_ PFILE_OBJECT FileObject, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->MdlReadCompleteCompressed) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->MdlReadCompleteCompressed(FileObject, + MdlChain, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoMdlWriteCompleteCompressed(_In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ PMDL MdlChain, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->MdlWriteCompleteCompressed) + { + /* Forward the call onto the device we attached to */ + return FastIoDispatch->MdlWriteCompleteCompressed(FileObject, + FileOffset, + MdlChain, + AttachedDeviceObject); + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; +} + +BOOLEAN +FltpFastIoQueryOpen(_Inout_ PIRP Irp, + _Out_ PFILE_NETWORK_OPEN_INFORMATION NetworkInformation, + _In_ PDEVICE_OBJECT DeviceObject) +{ + PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PDEVICE_OBJECT AttachedDeviceObject; + PFAST_IO_DISPATCH FastIoDispatch; + BOOLEAN Success; + + PAGED_CODE(); + + /* If it doesn't have a device extension, then it's not our device object */ + if (DeviceObject->DeviceExtension == NULL) + { + return FALSE; + } + + DeviceExtension = DeviceObject->DeviceExtension; + FLT_ASSERT(DeviceExtension->AttachedToDeviceObject); + + /* Get the device that we attached to */ + AttachedDeviceObject = DeviceExtension->AttachedToDeviceObject; + FastIoDispatch = AttachedDeviceObject->DriverObject->FastIoDispatch; + + /* Make sure our FastIo table is valid */ + if (FastIoDispatch && FastIoDispatch->FastIoQueryOpen) + { + PIO_STACK_LOCATION StackPtr = IoGetCurrentIrpStackLocation(Irp); + + /* Update the stack to contain the correct device for the next filter */ + StackPtr->DeviceObject = AttachedDeviceObject; + + /* Now forward the call */ + Success = FastIoDispatch->FastIoQueryOpen(Irp, + NetworkInformation, + AttachedDeviceObject); + + /* Restore the DeviceObject as we found it */ + StackPtr->DeviceObject = DeviceObject; + return Success; + } + + /* We failed to handle the request, send it down the slow path */ + FLT_ASSERT(FALSE); + return FALSE; } /* FUNCTIONS **********************************************/ +static VOID FltpCleanupDeviceObject(_In_ PDEVICE_OBJECT DeviceObject) { @@ -555,7 +1584,8 @@ AttachedDevice = IoGetAttachedDeviceReference(DeviceObject); /* Loop through all attached devices until we reach the bottom (file system driver) */ - while (AttachedDevice->DriverObject != DriverData.DriverObject) + while (AttachedDevice == NULL || + AttachedDevice->DriverObject != DriverData.DriverObject) { /* Get the attached device */ LowestDevice = IoGetLowerDeviceObject(AttachedDevice); @@ -682,7 +1712,7 @@ /* Register for notifications when a new file system is loaded. This also enumerates any existing file systems */ Status = IoRegisterFsRegistrationChange(DriverObject, FltpFsNotification); - FLT_ASSERT(Status != STATUS_DEVICE_ALREADY_ATTACHED); // Windows checks for this, but I'm not sure how that can happen?? + FLT_ASSERT(Status != STATUS_DEVICE_ALREADY_ATTACHED); // Windows checks for this, I'm not sure how it can happen. Needs investigation?? if (!NT_SUCCESS(Status)) goto Cleanup; /* IoRegisterFsRegistrationChange isn't notified about the raw file systems, so we attach to them manually */ @@ -762,29 +1792,30 @@ /* Fill out the FastIo table */ RtlZeroMemory(FastIoDispatch, sizeof(FAST_IO_DISPATCH)); FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); - FastIoDispatch->FastIoCheckIfPossible = (PFAST_IO_CHECK_IF_POSSIBLE)NULL; - FastIoDispatch->FastIoRead = (PFAST_IO_READ)NULL; - FastIoDispatch->FastIoWrite = (PFAST_IO_WRITE)NULL; - FastIoDispatch->FastIoQueryBasicInfo = (PFAST_IO_QUERY_BASIC_INFO)NULL; - FastIoDispatch->FastIoQueryStandardInfo = (PFAST_IO_QUERY_STANDARD_INFO)NULL; - FastIoDispatch->FastIoLock = (PFAST_IO_LOCK)NULL; - FastIoDispatch->FastIoUnlockSingle = (PFAST_IO_UNLOCK_SINGLE)NULL; - FastIoDispatch->FastIoUnlockAll = (PFAST_IO_UNLOCK_ALL)NULL; - FastIoDispatch->FastIoUnlockAllByKey = (PFAST_IO_UNLOCK_ALL_BY_KEY)NULL; - FastIoDispatch->FastIoDeviceControl = (PFAST_IO_DEVICE_CONTROL)NULL; - FastIoDispatch->FastIoDetachDevice = (PFAST_IO_DETACH_DEVICE)NULL; - FastIoDispatch->FastIoQueryNetworkOpenInfo = (PFAST_IO_QUERY_NETWORK_OPEN_INFO)NULL; - FastIoDispatch->MdlRead = (PFAST_IO_MDL_READ)NULL; - FastIoDispatch->MdlReadComplete = (PFAST_IO_MDL_READ_COMPLETE)NULL; - FastIoDispatch->PrepareMdlWrite = (PFAST_IO_PREPARE_MDL_WRITE)NULL; - FastIoDispatch->MdlWriteComplete = (PFAST_IO_MDL_WRITE_COMPLETE)NULL; - FastIoDispatch->FastIoReadCompressed = (PFAST_IO_READ_COMPRESSED)NULL; - FastIoDispatch->FastIoWriteCompressed = (PFAST_IO_WRITE_COMPRESSED)NULL; - FastIoDispatch->MdlReadCompleteCompressed = (PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)NULL; - FastIoDispatch->MdlWriteCompleteCompressed = (PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)NULL; - FastIoDispatch->FastIoQueryOpen = (PFAST_IO_QUERY_OPEN)NULL; - - /* Store the FastIo table address for easy reference */ + FastIoDispatch->FastIoCheckIfPossible = (PFAST_IO_CHECK_IF_POSSIBLE)FltpFastIoCheckIfPossible; + FastIoDispatch->FastIoRead = (PFAST_IO_READ)FltpFastIoRead; + FastIoDispatch->FastIoWrite = (PFAST_IO_WRITE)FltpFastIoWrite; + FastIoDispatch->FastIoQueryBasicInfo = (PFAST_IO_QUERY_BASIC_INFO)FltpFastIoQueryBasicInfo; + FastIoDispatch->FastIoQueryStandardInfo = (PFAST_IO_QUERY_STANDARD_INFO)FltpFastIoQueryStandardInfo; + FastIoDispatch->FastIoLock = (PFAST_IO_LOCK)FltpFastIoLock; + FastIoDispatch->FastIoUnlockSingle = (PFAST_IO_UNLOCK_SINGLE)FltpFastIoUnlockSingle; + FastIoDispatch->FastIoUnlockAll = (PFAST_IO_UNLOCK_ALL)FltpFastIoUnlockAll; + FastIoDispatch->FastIoUnlockAllByKey = (PFAST_IO_UNLOCK_ALL_BY_KEY)FltpFastIoUnlockAllByKey; + FastIoDispatch->FastIoDeviceControl = (PFAST_IO_DEVICE_CONTROL)FltpFastIoDeviceControl; + FastIoDispatch->FastIoDetachDevice = (PFAST_IO_DETACH_DEVICE)FltpFastIoDetachDevice; + FastIoDispatch->FastIoQueryNetworkOpenInfo = (PFAST_IO_QUERY_NETWORK_OPEN_INFO)FltpFastIoQueryNetworkOpenInfo; + FastIoDispatch->MdlRead = (PFAST_IO_MDL_READ)FltpFastIoMdlRead; + FastIoDispatch->MdlReadComplete = (PFAST_IO_MDL_READ_COMPLETE)FltpFastIoMdlReadComplete; + FastIoDispatch->PrepareMdlWrite = (PFAST_IO_PREPARE_MDL_WRITE)FltpFastIoPrepareMdlWrite; + FastIoDispatch->MdlWriteComplete = (PFAST_IO_MDL_WRITE_COMPLETE)FltpFastIoMdlWriteComplete; + FastIoDispatch->FastIoReadCompressed = (PFAST_IO_READ_COMPRESSED)FltpFastIoReadCompressed; + FastIoDispatch->FastIoWriteCompressed = (PFAST_IO_WRITE_COMPRESSED)FltpFastIoWriteCompressed; + FastIoDispatch->MdlReadCompleteCompressed = (PFAST_IO_MDL_READ_COMPLETE_COMPRESSED)FltpFastIoMdlReadCompleteCompressed; + FastIoDispatch->MdlWriteCompleteCompressed = (PFAST_IO_MDL_WRITE_COMPLETE_COMPRESSED)FltpFastIoMdlWriteCompleteCompressed; + FastIoDispatch->FastIoQueryOpen = (PFAST_IO_QUERY_OPEN)FltpFastIoQueryOpen; + + /* Store the FastIo table for internal and our access */ + DriverObject->FastIoDispatch = FastIoDispatch; DriverData.FastIoDispatch = FastIoDispatch; /* Initialize the callback table */

8 years, 11 months

[tkreuzer] 70487: [WIN32K] This ASSERT was actually supposed to be removed and only accidentally brought back.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 3 19:58:33 2016 New Revision: 70487 URL: http://svn.reactos.org/svn/reactos?rev=70487&view=rev Log: [WIN32K] This ASSERT was actually supposed to be removed and only accidentally brought back. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Jan 3 19:58:33 2016 @@ -340,8 +340,6 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; - - NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj,

8 years, 11 months

[tkreuzer] 70486: [WIN32K] Fix the fix from r70482: Our DIBs are actually 32 bit aligned, so pass even uncompressed bits to GreCreateBitmapEx instead of copying them later with wrong alignment.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 3 19:46:57 2016 New Revision: 70486 URL: http://svn.reactos.org/svn/reactos?rev=70486&view=rev Log: [WIN32K] Fix the fix from r70482: Our DIBs are actually 32 bit aligned, so pass even uncompressed bits to GreCreateBitmapEx instead of copying them later with wrong alignment. Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Jan 3 19:46:57 2016 @@ -260,7 +260,6 @@ EXLATEOBJ exlo; PPALETTE ppalDIB = 0; ULONG cjSizeImage; - BOOL bCompressed; if (!bmi || !Bits) return 0; @@ -272,14 +271,12 @@ cjSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, ScanLines, bmi->bmiHeader.biBitCount); - bCompressed = FALSE; } /* Check if the header provided an image size */ else if (bmi->bmiHeader.biSizeImage != 0) { /* Use the given size */ cjSizeImage = bmi->bmiHeader.biSizeImage; - bCompressed = TRUE; } else { @@ -289,15 +286,13 @@ } /* Check if the size that we have is ok */ - if (cjSizeImage > cjMaxBits) - { - DPRINT1("Size too large! cjSizeImage = %lu, cjMaxBits = %lu\n", + if ((cjSizeImage > cjMaxBits) || (cjSizeImage == 0)) + { + DPRINT1("Invalid bitmap size! cjSizeImage = %lu, cjMaxBits = %lu\n", cjSizeImage, cjMaxBits); return 0; } - /* We cannot use the provided buffer for uncompressed bits, since they - might not be aligned correctly! */ SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, 0, @@ -305,7 +300,7 @@ bmi->bmiHeader.biCompression), bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, cjSizeImage, - bCompressed ? (PVOID)Bits : NULL, + (PVOID)Bits, 0); if (!SourceBitmap) { @@ -321,17 +316,6 @@ { DPRINT1("Error: Could not lock surfaces\n"); goto cleanup; - } - - /* Check for uncompressed bits */ - if (!bCompressed) - { - /* Copy the bitmap bits */ - if (!UnsafeSetBitmapBits(psurfSrc, cjMaxBits, Bits)) - { - DPRINT1("Error: Could not set bitmap bits\n"); - goto cleanup; - } } /* Create a palette for the DIB */ @@ -356,6 +340,8 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; + + NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj,

8 years, 11 months

[tkreuzer] 70485: [WIN32K] Disable broken code to update a device palette. Should fix testbot crashes.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 3 18:10:31 2016 New Revision: 70485 URL: http://svn.reactos.org/svn/reactos?rev=70485&view=rev Log: [WIN32K] Disable broken code to update a device palette. Should fix testbot crashes. Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Sun Jan 3 18:10:31 2016 @@ -786,9 +786,6 @@ { PPALETTE palPtr; UINT pal_entries; - HDC hDC; - PDC dc; - PWND Wnd; const PALETTEENTRY *pptr = PaletteColors; palPtr = PALETTE_ShareLockPalette(hPal); @@ -816,6 +813,16 @@ PALETTE_ShareUnlockPalette(palPtr); +#if 0 +/* FIXME: This is completely broken! We cannot call UserGetDesktopWindow + without first acquiring the USER lock. But the whole process here is + screwed anyway. Instead of messing with the desktop DC, we need to + check, whether the palette is associated with a PDEV and whether that + PDEV supports palette operations. Then we need to call pfnDrvSetPalette. + But since IntGdiRealizePalette() is not even implemented for direct DCs, + we can as well just do nothing, that will at least not ASSERT! + I leave the whole thing here, to scare people away, who want to "fix" it. */ + /* Immediately apply the new palette if current window uses it */ Wnd = UserGetDesktopWindow(); hDC = UserGetWindowDC(Wnd); @@ -831,6 +838,7 @@ DC_UnlockDc(dc); } UserReleaseDC(Wnd,hDC, FALSE); +#endif // 0 } return ret; }

8 years, 11 months

[akhaldi] 70484: [NTDLL] Fix a typo.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 3 16:27:06 2016 New Revision: 70484 URL: http://svn.reactos.org/svn/reactos?rev=70484&view=rev Log: [NTDLL] Fix a typo. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sun Jan 3 16:27:06 2016 @@ -801,7 +801,7 @@ 796 stdcall RtlPrefixString(ptr ptr long) 797 stdcall RtlPrefixUnicodeString(ptr ptr long) 798 stdcall RtlProtectHeap(ptr long) -799 stdcall RtlPushFrame(ptr)r +799 stdcall RtlPushFrame(ptr) 800 stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) 801 stdcall RtlQueryDepthSList(ptr) 802 stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr)

8 years, 11 months

[ion] 70483: [NDK]: Document RtlPushFrame, RtlPopFrame, RtlGetFrame. [NDK]: Add TEB_ACTIVE_FRAME_CONTEXT_FLAG_EXTENDED, TEB_ACTIVE_FRAME_EX, TEB_ACTIVE_FRAME_CONTEXT_EX from the CoreCLR sources (cl...

by ion＠svn.reactos.org

Author: ion Date: Sun Jan 3 16:23:38 2016 New Revision: 70483 URL: http://svn.reactos.org/svn/reactos?rev=70483&view=rev Log: [NDK]: Document RtlPushFrame, RtlPopFrame, RtlGetFrame. [NDK]: Add TEB_ACTIVE_FRAME_CONTEXT_FLAG_EXTENDED, TEB_ACTIVE_FRAME_EX, TEB_ACTIVE_FRAME_CONTEXT_EX from the CoreCLR sources (clrnt.h) [RTL]: Implement RtlPushFrame, RtlPopFrame, RtlGetFrame. [NTDLL]: Export the above. [RTL]: Fix MSVC warning after someone's earlier WINE merge. Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/rtl/actctx.c trunk/reactos/lib/rtl/debug.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sun Jan 3 16:23:38 2016 @@ -655,7 +655,7 @@ 653 stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) 654 stdcall RtlGetElementGenericTable(ptr long) 655 stdcall RtlGetElementGenericTableAvl(ptr long) -# stdcall RtlGetFrame +656 stdcall RtlGetFrame() 657 stdcall RtlGetFullPathName_U(wstr long ptr ptr) 658 stdcall RtlGetFullPathName_UstrEx(ptr ptr ptr ptr ptr ptr ptr ptr) 659 stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @@ -797,11 +797,11 @@ 792 stdcall RtlOpenCurrentUser(long ptr) 793 stdcall RtlPcToFileHeader(ptr ptr) 794 stdcall RtlPinAtomInAtomTable(ptr long) -# stdcall RtlPopFrame +795 stdcall RtlPopFrame(ptr) 796 stdcall RtlPrefixString(ptr ptr long) 797 stdcall RtlPrefixUnicodeString(ptr ptr long) 798 stdcall RtlProtectHeap(ptr long) -# stdcall RtlPushFrame +799 stdcall RtlPushFrame(ptr)r 800 stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) 801 stdcall RtlQueryDepthSList(ptr) 802 stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sun Jan 3 16:23:38 2016 @@ -181,6 +181,11 @@ // TLS Slots // #define TLS_MINIMUM_AVAILABLE 64 + +// +// TEB Active Frame Flags +// +#define TEB_ACTIVE_FRAME_CONTEXT_FLAG_EXTENDED 0x1 // // Job Access Types @@ -684,13 +689,29 @@ ULONG Flags; LPSTR FrameName; } TEB_ACTIVE_FRAME_CONTEXT, *PTEB_ACTIVE_FRAME_CONTEXT; +typedef const struct _TEB_ACTIVE_FRAME_CONTEXT *PCTEB_ACTIVE_FRAME_CONTEXT; + +typedef struct _TEB_ACTIVE_FRAME_CONTEXT_EX +{ + TEB_ACTIVE_FRAME_CONTEXT BasicContext; + PCSTR SourceLocation; +} TEB_ACTIVE_FRAME_CONTEXT_EX, *PTEB_ACTIVE_FRAME_CONTEXT_EX; +typedef const struct _TEB_ACTIVE_FRAME_CONTEXT_EX *PCTEB_ACTIVE_FRAME_CONTEXT_EX; typedef struct _TEB_ACTIVE_FRAME { ULONG Flags; struct _TEB_ACTIVE_FRAME *Previous; - PTEB_ACTIVE_FRAME_CONTEXT Context; + PCTEB_ACTIVE_FRAME_CONTEXT Context; } TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME; +typedef const struct _TEB_ACTIVE_FRAME *PCTEB_ACTIVE_FRAME; + +typedef struct _TEB_ACTIVE_FRAME_EX +{ + TEB_ACTIVE_FRAME BasicFrame; + PVOID ExtensionIdentifier; +} TEB_ACTIVE_FRAME_EX, *PTEB_ACTIVE_FRAME_EX; +typedef const struct _TEB_ACTIVE_FRAME_EX *PCTEB_ACTIVE_FRAME_EX; typedef struct _CLIENT_ID32 { Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sun Jan 3 16:23:38 2016 @@ -3004,6 +3004,30 @@ _In_ USHORT CompressionFormatAndEngine, _Out_ PULONG CompressBufferWorkSpaceSize, _Out_ PULONG CompressFragmentWorkSpaceSize +); + +// +// Frame Functions +// +NTSYSAPI +VOID +NTAPI +RtlPopFrame( + _In_ PTEB_ACTIVE_FRAME Frame +); + +NTSYSAPI +VOID +NTAPI +RtlPushFrame( + _In_ PTEB_ACTIVE_FRAME Frame +); + +NTSYSAPI +PTEB_ACTIVE_FRAME +NTAPI +RtlGetFrame( + VOID ); // Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=7048… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Jan 3 16:23:38 2016 @@ -455,6 +455,32 @@ IN PCUNICODE_STRING SearchName ); +HCELL_INDEX +NTAPI +CmpFindSubKeyByNumber( + IN PHHIVE Hive, + IN PCM_KEY_NODE Node, + IN ULONG Number + ); + +PCELL_DATA +NTAPI +CmpValueToData( + IN PHHIVE Hive, + IN PCM_KEY_VALUE Value, + OUT PULONG Length + ); + +BOOLEAN +NTAPI +CmpFindNameInList( + IN PHHIVE Hive, + IN PCHILD_LIST ChildList, + IN PUNICODE_STRING Name, + IN PULONG ChildIndex, + IN PHCELL_INDEX CellIndex + ); + /* To be implemented by the user of this library */ PVOID NTAPI Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=70483… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Sun Jan 3 16:23:38 2016 @@ -3173,7 +3173,7 @@ DPRINT("%d: dll name %S\n", j, dll->name); /* setup new index entry */ str.Buffer = dll->name; - str.Length = strlenW(dll->name)*sizeof(WCHAR); + str.Length = (USHORT)strlenW(dll->name)*sizeof(WCHAR); str.MaximumLength = str.Length + sizeof(WCHAR); /* hash original class name */ RtlHashUnicodeString(&str, TRUE, HASH_STRING_ALGORITHM_X65599, &index->hash); @@ -3390,7 +3390,7 @@ /* setup new index entry */ str.Buffer = entity->u.class.name; - str.Length = strlenW(entity->u.class.name)*sizeof(WCHAR); + str.Length = (USHORT)strlenW(entity->u.class.name)*sizeof(WCHAR); str.MaximumLength = str.Length + sizeof(WCHAR); /* hash original class name */ RtlHashUnicodeString(&str, TRUE, HASH_STRING_ALGORITHM_X65599, &index->hash); Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=70483&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Sun Jan 3 16:23:38 2016 @@ -389,3 +389,34 @@ /* Send them to the debugger */ DebugService2(&NameString, &CommandString, BREAKPOINT_COMMAND_STRING); } + +/* +* @implemented +*/ +VOID +NTAPI +RtlPopFrame(IN PTEB_ACTIVE_FRAME Frame) +{ + /* Restore the previous frame as the active one */ + NtCurrentTeb()->ActiveFrame = Frame->Previous; +} + +/* +* @implemented +*/ +VOID +NTAPI +RtlPushFrame(IN PTEB_ACTIVE_FRAME Frame) +{ + /* Save the current frame and set the new one as active */ + Frame->Previous = NtCurrentTeb()->ActiveFrame; + NtCurrentTeb()->ActiveFrame = Frame; +} + +PTEB_ACTIVE_FRAME +NTAPI +RtlGetFrame(VOID) +{ + /* Return the frame that's currently active */ + return NtCurrentTeb()->ActiveFrame; +}

8 years, 11 months

[tkreuzer] 70482: [WIN32K] NtGdiCreateDIBitmapInternal: clear CBM_INIT flag, if no bits are given. IntSetDIBits: Always calculate the bitmap size for uncompressed bitmaps, do not pass uncompressed ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jan 3 16:16:04 2016 New Revision: 70482 URL: http://svn.reactos.org/svn/reactos?rev=70482&view=rev Log: [WIN32K] NtGdiCreateDIBitmapInternal: clear CBM_INIT flag, if no bits are given. IntSetDIBits: Always calculate the bitmap size for uncompressed bitmaps, do not pass uncompressed bits to GreCreateBitmapEx, since they don't have the required alignment (the width in bytes for DIB is 16 bit aligned, bitmaps 32). Remove a broken ASSERT. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sun Jan 3 16:16:04 2016 @@ -42,15 +42,15 @@ return GreSetObjectOwner(hbmp, ulOwner); } -static -int +BOOL NTAPI UnsafeSetBitmapBits( - PSURFACE psurf, - IN ULONG cjBits, - IN PVOID pvBits) -{ - PUCHAR pjDst, pjSrc; + _Inout_ PSURFACE psurf, + _In_ ULONG cjBits, + _In_ const VOID *pvBits) +{ + PUCHAR pjDst; + const UCHAR *pjSrc; LONG lDeltaDst, lDeltaSrc; ULONG nWidth, nHeight, cBitsPixel; NT_ASSERT(psurf->flags & API_BITMAP); @@ -69,7 +69,7 @@ /* Make sure the buffer is large enough*/ if (cjBits < (lDeltaSrc * nHeight)) - return 0; + return FALSE; while (nHeight--) { @@ -79,7 +79,7 @@ pjDst += lDeltaDst; } - return 1; + return TRUE; } HBITMAP Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] Sun Jan 3 16:16:04 2016 @@ -43,3 +43,10 @@ IN FLONG fl, IN UINT cjMaxBits, IN HANDLE hcmXform); + +BOOL +NTAPI +UnsafeSetBitmapBits( + _Inout_ PSURFACE psurf, + _In_ ULONG cjBits, + _In_ const VOID *pvBits); Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Jan 3 16:16:04 2016 @@ -260,23 +260,26 @@ EXLATEOBJ exlo; PPALETTE ppalDIB = 0; ULONG cjSizeImage; - - if (!bmi) return 0; - - /* Check if the header provided an image size */ - if (bmi->bmiHeader.biSizeImage != 0) - { - /* Use the given size */ - cjSizeImage = bmi->bmiHeader.biSizeImage; - } - /* Otherwise check for uncompressed formats */ - else if ((bmi->bmiHeader.biCompression == BI_RGB) || + BOOL bCompressed; + + if (!bmi || !Bits) return 0; + + /* Check for uncompressed formats */ + if ((bmi->bmiHeader.biCompression == BI_RGB) || (bmi->bmiHeader.biCompression == BI_BITFIELDS)) { /* Calculate the image size */ cjSizeImage = DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, ScanLines, bmi->bmiHeader.biBitCount); + bCompressed = FALSE; + } + /* Check if the header provided an image size */ + else if (bmi->bmiHeader.biSizeImage != 0) + { + /* Use the given size */ + cjSizeImage = bmi->bmiHeader.biSizeImage; + bCompressed = TRUE; } else { @@ -293,6 +296,8 @@ return 0; } + /* We cannot use the provided buffer for uncompressed bits, since they + might not be aligned correctly! */ SourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, ScanLines, 0, @@ -300,7 +305,7 @@ bmi->bmiHeader.biCompression), bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, cjSizeImage, - (PVOID)Bits, + bCompressed ? (PVOID)Bits : NULL, 0); if (!SourceBitmap) { @@ -316,6 +321,17 @@ { DPRINT1("Error: Could not lock surfaces\n"); goto cleanup; + } + + /* Check for uncompressed bits */ + if (!bCompressed) + { + /* Copy the bitmap bits */ + if (!UnsafeSetBitmapBits(psurfSrc, cjMaxBits, Bits)) + { + DPRINT1("Error: Could not set bitmap bits\n"); + goto cleanup; + } } /* Create a palette for the DIB */ @@ -340,8 +356,6 @@ rcDst.right = psurfDst->SurfObj.sizlBitmap.cx; ptSrc.x = 0; ptSrc.y = 0; - - NT_ASSERT(psurfSrc->SurfObj.cjBits <= cjMaxBits); result = IntEngCopyBits(&psurfDst->SurfObj, &psurfSrc->SurfObj, @@ -1456,6 +1470,11 @@ PBYTE safeBits = NULL; HBITMAP hbmResult = NULL; + if (pjInit == NULL) + { + fInit &= ~CBM_INIT; + } + if(pjInit && (fInit & CBM_INIT)) { if (cjMaxBits == 0) return NULL;

8 years, 11 months

[akhaldi] 70481: [0.4.0] * Merge English strings improvements by Henry Tang Ih in r70480. CORE-10729

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jan 3 16:08:34 2016 New Revision: 70481 URL: http://svn.reactos.org/svn/reactos?rev=70481&view=rev Log: [0.4.0] * Merge English strings improvements by Henry Tang Ih in r70480. CORE-10729 Modified: branches/ros-branch-0_4_0/ (props changed) branches/ros-branch-0_4_0/reactos/ (props changed) branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/en-US.rc branches/ros-branch-0_4_0/reactos/base/applications/mscutils/servman/lang/en-US.rc branches/ros-branch-0_4_0/reactos/base/applications/mstsc/lang/en-US.rc branches/ros-branch-0_4_0/reactos/base/applications/sndrec32/lang/en-US.rc branches/ros-branch-0_4_0/reactos/dll/cpl/inetcpl/lang/en-US.rc branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/lang/en-US.rc Propchange: branches/ros-branch-0_4_0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 3 16:08:34 2016 @@ -1 +1 @@ -/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470 +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480 Propchange: branches/ros-branch-0_4_0/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jan 3 16:08:34 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470 +/trunk/reactos:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70436-70437,70443,70464,70470,70480 Modified: branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sun Jan 3 16:08:34 2016 @@ -323,89 +323,89 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN - POPUP "Edit" - BEGIN - MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY - MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "View" - BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC - MENUITEM "Conversion", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binary\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Help topics", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "About ReactOS Calc", IDM_HELP_ABOUT + POPUP "&Edit" + BEGIN + MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "S&tandard", IDM_VIEW_STANDARD + MENUITEM "&Scientific", IDM_VIEW_SCIENTIFIC + MENUITEM "C&onversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&Decimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Binary\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "D&egrees\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "&Radians\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "&Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Group d&igits", IDM_VIEW_GROUP, CHECKED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help topics", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT END END IDR_MENU_SCIENTIFIC_2 MENU BEGIN - POPUP "Edit" - BEGIN - MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY - MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "View" - BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC - MENUITEM "Conversion", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binary\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED - MENUITEM SEPARATOR - MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Help topics", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "About ReactOS Calc", IDM_HELP_ABOUT + POPUP "&Edit" + BEGIN + MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "S&tandard", IDM_VIEW_STANDARD + MENUITEM "&Scientific", IDM_VIEW_SCIENTIFIC + MENUITEM "C&onversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&Decimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Binary\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "&Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "&Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "B&yte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Group d&igits", IDM_VIEW_GROUP, CHECKED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help topics", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT END END IDR_MENU_STANDARD MENU BEGIN - POPUP "Edit" - BEGIN - MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY - MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "View" - BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC - MENUITEM "Conversion", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Help topics", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "About ReactOS Calc", IDM_HELP_ABOUT + POPUP "&Edit" + BEGIN + MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "S&tandard", IDM_VIEW_STANDARD + MENUITEM "&Scientific", IDM_VIEW_SCIENTIFIC + MENUITEM "C&onversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Group d&igits", IDM_VIEW_GROUP, CHECKED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help topics", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT END END Modified: branches/ros-branch-0_4_0/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Sun Jan 3 16:08:34 2016 @@ -4,41 +4,41 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "Export...", ID_EXPORT + MENUITEM "&Export...", ID_EXPORT MENUITEM SEPARATOR MENUITEM "E&xit", ID_EXIT END - POPUP "Action" - BEGIN - MENUITEM "Connect to...", ID_CONNECT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Start", ID_START, GRAYED - MENUITEM "Stop", ID_STOP, GRAYED - MENUITEM "Pause", ID_PAUSE, GRAYED - MENUITEM "Resume", ID_RESUME, GRAYED - MENUITEM "Restart", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Create...", ID_CREATE, GRAYED - MENUITEM "Delete...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties...", ID_PROP, GRAYED - END - POPUP "View" - BEGIN - MENUITEM "Large Icons", ID_VIEW_LARGE - MENUITEM "Small Icons", ID_VIEW_SMALL - MENUITEM "List", ID_VIEW_LIST - MENUITEM "Details", ID_VIEW_DETAILS - MENUITEM SEPARATOR - MENUITEM "Customize...", ID_VIEW_CUST, GRAYED - END - POPUP "Help" - BEGIN - MENUITEM "Help", ID_HELP - MENUITEM "About", ID_ABOUT + POPUP "&Action" + BEGIN + MENUITEM "&Connect to...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Start", ID_START, GRAYED + MENUITEM "St&op", ID_STOP, GRAYED + MENUITEM "&Pause", ID_PAUSE, GRAYED + MENUITEM "Resu&me", ID_RESUME, GRAYED + MENUITEM "Rest&art", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Re&fresh", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "&Edit...", ID_EDIT, GRAYED + MENUITEM "Crea&te...", ID_CREATE, GRAYED + MENUITEM "&Delete...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "P&roperties...", ID_PROP, GRAYED + END + POPUP "&View" + BEGIN + MENUITEM "Lar&ge Icons", ID_VIEW_LARGE + MENUITEM "S&mall Icons", ID_VIEW_SMALL + MENUITEM "&List", ID_VIEW_LIST + MENUITEM "&Details", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "C&ustomize...", ID_VIEW_CUST, GRAYED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help", ID_HELP + MENUITEM "&About", ID_ABOUT END END @@ -46,18 +46,18 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Start", ID_START, GRAYED - MENUITEM "Stop", ID_STOP, GRAYED - MENUITEM "Pause", ID_PAUSE, GRAYED - MENUITEM "Resume", ID_RESUME, GRAYED - MENUITEM "Restart", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Delete...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties...", ID_PROP, GRAYED + MENUITEM "&Start", ID_START, GRAYED + MENUITEM "St&op", ID_STOP, GRAYED + MENUITEM "&Pause", ID_PAUSE, GRAYED + MENUITEM "Resu&me", ID_RESUME, GRAYED + MENUITEM "Rest&art", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Re&fresh", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "&Edit...", ID_EDIT, GRAYED + MENUITEM "Dele&te...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "P&roperties...", ID_PROP, GRAYED MENUITEM SEPARATOR MENUITEM "Help...", ID_HELP END @@ -69,7 +69,7 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + PUSHBUTTON "&Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END @@ -133,8 +133,8 @@ LTEXT "Description :", IDC_STATIC, 12, 86, 44, 9 PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 PUSHBUTTON "Cancel", IDCANCEL, 176, 192, 46, 13 - LTEXT "Additional options (click help for details)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Help", ID_CREATE_HELP, 10, 192, 44, 13 + LTEXT "Additional Options (Click Help for details)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "&Help", ID_CREATE_HELP, 10, 192, 44, 13 END IDD_DLG_DELETE DIALOGEX 6, 6, 185, 148 Modified: branches/ros-branch-0_4_0/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] Sun Jan 3 16:08:34 2016 @@ -8,13 +8,13 @@ GROUPBOX "Connection settings", IDC_STATIC, 7, 103, 228, 65 ICON "", IDC_LOGONICON, 15, 19, 20, 20 LTEXT "Enter the server address.", IDC_STATIC, 47, 24, 85, 8 - LTEXT "Server:", IDC_STATIC, 47, 41, 25, 8 - LTEXT "User name:", IDC_STATIC, 47, 58, 38, 8 + LTEXT "&Server:", IDC_STATIC, 47, 41, 25, 8 + LTEXT "&User name:", IDC_STATIC, 47, 58, 38, 8 COMBOBOX IDC_SERVERCOMBO, 89, 39, 131, 15, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_NAMEEDIT, 89, 55, 131, 14, WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Save", IDC_SAVE, 67, 139, 50, 14 - PUSHBUTTON "Save As...", IDC_SAVEAS, 123, 139, 50, 14 - PUSHBUTTON "Open...", IDC_OPEN, 177, 139, 50, 14 + PUSHBUTTON "S&ave", IDC_SAVE, 67, 139, 50, 14 + PUSHBUTTON "Sa&ve As...", IDC_SAVEAS, 123, 139, 50, 14 + PUSHBUTTON "Op&en...", IDC_OPEN, 177, 139, 50, 14 ICON "", IDC_CONNICON, 16, 114, 20, 20 LTEXT "Save the current connection settings or open an existing configuration.", IDC_STATIC, 50, 115, 172, 20 END @@ -23,8 +23,8 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Remote desktop size", IDC_STATIC, 7, 7, 228, 68 - GROUPBOX "Colors", IDC_STATIC, 7, 83, 228, 85 + GROUPBOX "&Remote desktop size", IDC_STATIC, 7, 7, 228, 68 + GROUPBOX "&Colors", IDC_STATIC, 7, 83, 228, 85 ICON "", IDC_REMICON, 15, 19, 20, 20 ICON "", IDC_COLORSICON, 15, 98, 20, 20 LTEXT "Set the screen size of your remote desktop. Drag the slider to the far right to go fullscreen.", IDC_STATIC, 53, 22, 175, 21 @@ -42,7 +42,7 @@ CAPTION "Remote Desktop Connection" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Connect", IDOK, 147, 245, 50, 14 + DEFPUSHBUTTON "Co&nnect", IDOK, 147, 245, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 203, 245, 50, 14 CONTROL "", IDC_TAB, "SysTabControl32", 0x0, 7, 50, 246, 190 END Modified: branches/ros-branch-0_4_0/reactos/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/base/a… ============================================================================== --- branches/ros-branch-0_4_0/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] Sun Jan 3 16:08:34 2016 @@ -19,16 +19,16 @@ IDR_MENU1 MENU BEGIN - POPUP "File" + POPUP "&File" BEGIN - MENUITEM "New", ID_FILE_NEW - MENUITEM "Open...", ID_FILE_OPEN - MENUITEM "Save", ID_FILE_SAVE, GRAYED - MENUITEM "Save As...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "&New", ID_FILE_NEW + MENUITEM "&Open...", ID_FILE_OPEN + MENUITEM "&Save", ID_FILE_SAVE, GRAYED + MENUITEM "Save &As...", ID_FILE_SAVEAS, GRAYED + MENUITEM "&Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "&Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Exit", ID_FILE_EXIT + MENUITEM "E&xit", ID_FILE_EXIT END POPUP "&Edit" BEGIN @@ -49,15 +49,15 @@ MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "I&ncrease Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "D&ecrease Speed", ID_EFFECTS_DECSPD MENUITEM SEPARATOR MENUITEM "&Add Echo", ID_EFFECTS_ECHO MENUITEM "&Reverse", ID_EFFECTS_REVERSE END POPUP "&?" BEGIN - MENUITEM "About...", ID_ABOUT + MENUITEM "&About...", ID_ABOUT END END Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/inetcpl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] Sun Jan 3 16:08:34 2016 @@ -65,18 +65,18 @@ CAPTION "Delete browsing history" BEGIN - AUTOCHECKBOX "Temporary internet files\nCached copies of web pages, images and certificates.", + AUTOCHECKBOX "&Temporary internet files\nCached copies of web pages, images and certificates.", IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Cookies\nFiles saved on your computer by websites, which store things like user preferences and login information.", + AUTOCHECKBOX "&Cookies\nFiles saved on your computer by websites, which store things like user preferences and login information.", IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "History\nList of websites you have accessed.", + AUTOCHECKBOX "&History\nList of websites you have accessed.", IDC_DELETE_HISTORY, 10, 88, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Form data\nUsernames and other information you have entered into forms.", + AUTOCHECKBOX "&Form data\nUsernames and other information you have entered into forms.", IDC_DELETE_FORM_DATA, 10, 128, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Passwords\nSaved passwords you have entered into forms.", + AUTOCHECKBOX "&Passwords\nSaved passwords you have entered into forms.", IDC_DELETE_PASSWORDS, 10, 168, 230, 40, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "Cancel", IDCANCEL, 185, 230, 60, 15, WS_GROUP - PUSHBUTTON "Delete", IDOK, 120, 230, 60, 15, WS_GROUP + PUSHBUTTON "&Delete", IDOK, 120, 230, 60, 15, WS_GROUP END @@ -109,7 +109,7 @@ ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certificates are used for your personal identification and to identify certificate authorities and publishers.", IDC_STATIC, 40, 14, 252, 18 - PUSHBUTTON "Certificates...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Publishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "&Certificates...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Pu&blishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END Modified: branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sun Jan 3 16:08:34 2016 @@ -48,16 +48,16 @@ LTEXT "Administrator privileges are required for most of these settings.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "Performance", IDC_STATIC, 6, 18, 244, 50 LTEXT "Performance options control how applications use memory, which affects the speed of your computer.", IDC_STATIC, 16, 29, 228, 17 - PUSHBUTTON "Settings", IDC_PERFOR, 194, 48, 50, 15 + PUSHBUTTON "&Settings", IDC_PERFOR, 194, 48, 50, 15 GROUPBOX "User Profiles", IDC_STATIC, 6, 75, 244, 48 LTEXT "Desktop settings related to your logon", IDC_STATIC, 16, 88, 228, 20 - PUSHBUTTON "Settings", IDC_USERPROFILE, 194, 103, 50, 15 + PUSHBUTTON "S&ettings", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "Startup and Recovery", IDC_STATIC, 6, 131, 244, 52 LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.", IDC_STATIC, 16, 144, 228, 19 - PUSHBUTTON "Settings", IDC_STAREC, 194, 162, 50, 15 - PUSHBUTTON "System Settings", IDC_SYSSETTINGS, 6, 192, 80, 15 - PUSHBUTTON "Environment Variables", IDC_ENVVAR, 88, 192, 80, 15 - PUSHBUTTON "Error Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 + PUSHBUTTON "Se&ttings", IDC_STAREC, 194, 162, 50, 15 + PUSHBUTTON "S&ystem Settings", IDC_SYSSETTINGS, 6, 192, 80, 15 + PUSHBUTTON "Enviro&nment Variables", IDC_ENVVAR, 88, 192, 80, 15 + PUSHBUTTON "E&rror Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 END IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 @@ -66,7 +66,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 + CONTROL "&Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END @@ -154,9 +154,9 @@ LTEXT "Profiles stored on this computer:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE - PUSHBUTTON "Change Type", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 - PUSHBUTTON "Delete", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 - PUSHBUTTON "Copy To", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + PUSHBUTTON "&Change Type", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "&Delete", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "Copy &To", IDC_USERPROFILE_COPY, 200, 156, 50, 13 CONTROL "To create new user accounts, open <A>User Accounts</A> in Control Panel.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 Modified: branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_0/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ branches/ros-branch-0_4_0/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Jan 3 16:08:34 2016 @@ -247,19 +247,19 @@ BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU - POPUP "View" + MENUITEM "&Action", IDC_ACTIONMENU + POPUP "&View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "D&evices by type", IDC_DEVBYTYPE + MENUITEM "De&vices by connection", IDC_DEVBYCONN + MENUITEM "Resources by t&ype", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by co&nnection", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Sho&w hidden devices", IDC_SHOWHIDDEN END - POPUP "Help" + POPUP "&Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "&About", IDC_ABOUT END END

8 years, 11 months

[ekohl] 70480: Improve English strings in ReactOS. Patch by Henry Tang Ih. CORE-10729 #resolve #comment Committed in r70480. Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jan 3 15:40:57 2016 New Revision: 70480 URL: http://svn.reactos.org/svn/reactos?rev=70480&view=rev Log: Improve English strings in ReactOS. Patch by Henry Tang Ih. CORE-10729 #resolve #comment Committed in r70480. Thanks a lot! Modified: trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/sndrec32/lang/en-US.rc trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sun Jan 3 15:40:57 2016 @@ -323,89 +323,89 @@ IDR_MENU_SCIENTIFIC_1 MENU BEGIN - POPUP "Edit" - BEGIN - MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY - MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "View" - BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC - MENUITEM "Conversion", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binary\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Degrees\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radians\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Gradians\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Help topics", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "About ReactOS Calc", IDM_HELP_ABOUT + POPUP "&Edit" + BEGIN + MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "S&tandard", IDM_VIEW_STANDARD + MENUITEM "&Scientific", IDM_VIEW_SCIENTIFIC + MENUITEM "C&onversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&Decimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Binary\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "D&egrees\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "&Radians\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "&Gradians\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Group d&igits", IDM_VIEW_GROUP, CHECKED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help topics", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT END END IDR_MENU_SCIENTIFIC_2 MENU BEGIN - POPUP "Edit" - BEGIN - MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY - MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "View" - BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC - MENUITEM "Conversion", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Decimal\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binary\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED - MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED - MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED - MENUITEM "Byte\tF4", IDM_VIEW_BYTE, CHECKED - MENUITEM SEPARATOR - MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Help topics", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "About ReactOS Calc", IDM_HELP_ABOUT + POPUP "&Edit" + BEGIN + MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "S&tandard", IDM_VIEW_STANDARD + MENUITEM "&Scientific", IDM_VIEW_SCIENTIFIC + MENUITEM "C&onversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "&Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "&Decimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "&Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "&Binary\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "&Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "&Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "&Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "B&yte\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Group d&igits", IDM_VIEW_GROUP, CHECKED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help topics", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT END END IDR_MENU_STANDARD MENU BEGIN - POPUP "Edit" - BEGIN - MENUITEM "Copy\tCtrl+C", IDM_EDIT_COPY - MENUITEM "Paste\tCtrl+V", IDM_EDIT_PASTE - END - POPUP "View" - BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD - MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC - MENUITEM "Conversion", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Help topics", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "About ReactOS Calc", IDM_HELP_ABOUT + POPUP "&Edit" + BEGIN + MENUITEM "&Copy\tCtrl+C", IDM_EDIT_COPY + MENUITEM "&Paste\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "&View" + BEGIN + MENUITEM "S&tandard", IDM_VIEW_STANDARD + MENUITEM "&Scientific", IDM_VIEW_SCIENTIFIC + MENUITEM "C&onversion", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Group d&igits", IDM_VIEW_GROUP, CHECKED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help topics", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Sun Jan 3 15:40:57 2016 @@ -4,41 +4,41 @@ BEGIN POPUP "&File" BEGIN - MENUITEM "Export...", ID_EXPORT + MENUITEM "&Export...", ID_EXPORT MENUITEM SEPARATOR MENUITEM "E&xit", ID_EXIT END - POPUP "Action" - BEGIN - MENUITEM "Connect to...", ID_CONNECT, GRAYED - MENUITEM SEPARATOR - MENUITEM "Start", ID_START, GRAYED - MENUITEM "Stop", ID_STOP, GRAYED - MENUITEM "Pause", ID_PAUSE, GRAYED - MENUITEM "Resume", ID_RESUME, GRAYED - MENUITEM "Restart", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Create...", ID_CREATE, GRAYED - MENUITEM "Delete...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties...", ID_PROP, GRAYED - END - POPUP "View" - BEGIN - MENUITEM "Large Icons", ID_VIEW_LARGE - MENUITEM "Small Icons", ID_VIEW_SMALL - MENUITEM "List", ID_VIEW_LIST - MENUITEM "Details", ID_VIEW_DETAILS - MENUITEM SEPARATOR - MENUITEM "Customize...", ID_VIEW_CUST, GRAYED - END - POPUP "Help" - BEGIN - MENUITEM "Help", ID_HELP - MENUITEM "About", ID_ABOUT + POPUP "&Action" + BEGIN + MENUITEM "&Connect to...", ID_CONNECT, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Start", ID_START, GRAYED + MENUITEM "St&op", ID_STOP, GRAYED + MENUITEM "&Pause", ID_PAUSE, GRAYED + MENUITEM "Resu&me", ID_RESUME, GRAYED + MENUITEM "Rest&art", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Re&fresh", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "&Edit...", ID_EDIT, GRAYED + MENUITEM "Crea&te...", ID_CREATE, GRAYED + MENUITEM "&Delete...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "P&roperties...", ID_PROP, GRAYED + END + POPUP "&View" + BEGIN + MENUITEM "Lar&ge Icons", ID_VIEW_LARGE + MENUITEM "S&mall Icons", ID_VIEW_SMALL + MENUITEM "&List", ID_VIEW_LIST + MENUITEM "&Details", ID_VIEW_DETAILS + MENUITEM SEPARATOR + MENUITEM "C&ustomize...", ID_VIEW_CUST, GRAYED + END + POPUP "&Help" + BEGIN + MENUITEM "&Help", ID_HELP + MENUITEM "&About", ID_ABOUT END END @@ -46,18 +46,18 @@ BEGIN POPUP "popup" BEGIN - MENUITEM "Start", ID_START, GRAYED - MENUITEM "Stop", ID_STOP, GRAYED - MENUITEM "Pause", ID_PAUSE, GRAYED - MENUITEM "Resume", ID_RESUME, GRAYED - MENUITEM "Restart", ID_RESTART, GRAYED - MENUITEM SEPARATOR - MENUITEM "Refresh", ID_REFRESH - MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Delete...", ID_DELETE, GRAYED - MENUITEM SEPARATOR - MENUITEM "Properties...", ID_PROP, GRAYED + MENUITEM "&Start", ID_START, GRAYED + MENUITEM "St&op", ID_STOP, GRAYED + MENUITEM "&Pause", ID_PAUSE, GRAYED + MENUITEM "Resu&me", ID_RESUME, GRAYED + MENUITEM "Rest&art", ID_RESTART, GRAYED + MENUITEM SEPARATOR + MENUITEM "Re&fresh", ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "&Edit...", ID_EDIT, GRAYED + MENUITEM "Dele&te...", ID_DELETE, GRAYED + MENUITEM SEPARATOR + MENUITEM "P&roperties...", ID_PROP, GRAYED MENUITEM SEPARATOR MENUITEM "Help...", ID_HELP END @@ -69,7 +69,7 @@ STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 135, 40 - PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + PUSHBUTTON "&Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END @@ -133,8 +133,8 @@ LTEXT "Description :", IDC_STATIC, 12, 86, 44, 9 PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 PUSHBUTTON "Cancel", IDCANCEL, 176, 192, 46, 13 - LTEXT "Additional options (click help for details)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Help", ID_CREATE_HELP, 10, 192, 44, 13 + LTEXT "Additional Options (Click Help for details)", IDC_STATIC, 10, 151, 134, 9 + PUSHBUTTON "&Help", ID_CREATE_HELP, 10, 192, 44, 13 END IDD_DLG_DELETE DIALOGEX 6, 6, 185, 148 Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc [iso-8859-1] Sun Jan 3 15:40:57 2016 @@ -8,13 +8,13 @@ GROUPBOX "Connection settings", IDC_STATIC, 7, 103, 228, 65 ICON "", IDC_LOGONICON, 15, 19, 20, 20 LTEXT "Enter the server address.", IDC_STATIC, 47, 24, 85, 8 - LTEXT "Server:", IDC_STATIC, 47, 41, 25, 8 - LTEXT "User name:", IDC_STATIC, 47, 58, 38, 8 + LTEXT "&Server:", IDC_STATIC, 47, 41, 25, 8 + LTEXT "&User name:", IDC_STATIC, 47, 58, 38, 8 COMBOBOX IDC_SERVERCOMBO, 89, 39, 131, 15, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_NAMEEDIT, 89, 55, 131, 14, WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Save", IDC_SAVE, 67, 139, 50, 14 - PUSHBUTTON "Save As...", IDC_SAVEAS, 123, 139, 50, 14 - PUSHBUTTON "Open...", IDC_OPEN, 177, 139, 50, 14 + PUSHBUTTON "S&ave", IDC_SAVE, 67, 139, 50, 14 + PUSHBUTTON "Sa&ve As...", IDC_SAVEAS, 123, 139, 50, 14 + PUSHBUTTON "Op&en...", IDC_OPEN, 177, 139, 50, 14 ICON "", IDC_CONNICON, 16, 114, 20, 20 LTEXT "Save the current connection settings or open an existing configuration.", IDC_STATIC, 50, 115, 172, 20 END @@ -23,8 +23,8 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Remote desktop size", IDC_STATIC, 7, 7, 228, 68 - GROUPBOX "Colors", IDC_STATIC, 7, 83, 228, 85 + GROUPBOX "&Remote desktop size", IDC_STATIC, 7, 7, 228, 68 + GROUPBOX "&Colors", IDC_STATIC, 7, 83, 228, 85 ICON "", IDC_REMICON, 15, 19, 20, 20 ICON "", IDC_COLORSICON, 15, 98, 20, 20 LTEXT "Set the screen size of your remote desktop. Drag the slider to the far right to go fullscreen.", IDC_STATIC, 53, 22, 175, 21 @@ -42,7 +42,7 @@ CAPTION "Remote Desktop Connection" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Connect", IDOK, 147, 245, 50, 14 + DEFPUSHBUTTON "Co&nnect", IDOK, 147, 245, 50, 14 PUSHBUTTON "Cancel", IDCANCEL, 203, 245, 50, 14 CONTROL "", IDC_TAB, "SysTabControl32", 0x0, 7, 50, 246, 190 END Modified: trunk/reactos/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] Sun Jan 3 15:40:57 2016 @@ -19,16 +19,16 @@ IDR_MENU1 MENU BEGIN - POPUP "File" + POPUP "&File" BEGIN - MENUITEM "New", ID_FILE_NEW - MENUITEM "Open...", ID_FILE_OPEN - MENUITEM "Save", ID_FILE_SAVE, GRAYED - MENUITEM "Save As...", ID_FILE_SAVEAS, GRAYED - MENUITEM "Restore...", ID_FILE_RESTORE, GRAYED - MENUITEM "Properties", ID_FILE_PROPERTIES + MENUITEM "&New", ID_FILE_NEW + MENUITEM "&Open...", ID_FILE_OPEN + MENUITEM "&Save", ID_FILE_SAVE, GRAYED + MENUITEM "Save &As...", ID_FILE_SAVEAS, GRAYED + MENUITEM "&Restore...", ID_FILE_RESTORE, GRAYED + MENUITEM "&Properties", ID_FILE_PROPERTIES MENUITEM SEPARATOR - MENUITEM "Exit", ID_FILE_EXIT + MENUITEM "E&xit", ID_FILE_EXIT END POPUP "&Edit" BEGIN @@ -49,15 +49,15 @@ MENUITEM "&Increase Volume (by 25%)", ID_EFFECTS_INCVOL MENUITEM "&Decrease Volume", ID_EFFECTS_DECVOL MENUITEM SEPARATOR - MENUITEM "&Increase Speed (by 100%)", ID_EFFECTS_INCSPD - MENUITEM "&Decrease Speed", ID_EFFECTS_DECSPD + MENUITEM "I&ncrease Speed (by 100%)", ID_EFFECTS_INCSPD + MENUITEM "D&ecrease Speed", ID_EFFECTS_DECSPD MENUITEM SEPARATOR MENUITEM "&Add Echo", ID_EFFECTS_ECHO MENUITEM "&Reverse", ID_EFFECTS_REVERSE END POPUP "&?" BEGIN - MENUITEM "About...", ID_ABOUT + MENUITEM "&About...", ID_ABOUT END END Modified: trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/en-US… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] Sun Jan 3 15:40:57 2016 @@ -65,18 +65,18 @@ CAPTION "Delete browsing history" BEGIN - AUTOCHECKBOX "Temporary internet files\nCached copies of web pages, images and certificates.", + AUTOCHECKBOX "&Temporary internet files\nCached copies of web pages, images and certificates.", IDC_DELETE_TEMP_FILES, 10, 8, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Cookies\nFiles saved on your computer by websites, which store things like user preferences and login information.", + AUTOCHECKBOX "&Cookies\nFiles saved on your computer by websites, which store things like user preferences and login information.", IDC_DELETE_COOKIES, 10, 48, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "History\nList of websites you have accessed.", + AUTOCHECKBOX "&History\nList of websites you have accessed.", IDC_DELETE_HISTORY, 10, 88, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Form data\nUsernames and other information you have entered into forms.", + AUTOCHECKBOX "&Form data\nUsernames and other information you have entered into forms.", IDC_DELETE_FORM_DATA, 10, 128, 230, 40, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Passwords\nSaved passwords you have entered into forms.", + AUTOCHECKBOX "&Passwords\nSaved passwords you have entered into forms.", IDC_DELETE_PASSWORDS, 10, 168, 230, 40, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "Cancel", IDCANCEL, 185, 230, 60, 15, WS_GROUP - PUSHBUTTON "Delete", IDOK, 120, 230, 60, 15, WS_GROUP + PUSHBUTTON "&Delete", IDOK, 120, 230, 60, 15, WS_GROUP END @@ -109,7 +109,7 @@ ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certificates are used for your personal identification and to identify certificate authorities and publishers.", IDC_STATIC, 40, 14, 252, 18 - PUSHBUTTON "Certificates...", IDC_CERT, 146, 34, 80, 14 - PUSHBUTTON "Publishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 + PUSHBUTTON "&Certificates...", IDC_CERT, 146, 34, 80, 14 + PUSHBUTTON "Pu&blishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Sun Jan 3 15:40:57 2016 @@ -48,16 +48,16 @@ LTEXT "Administrator privileges are required for most of these settings.", IDC_STATIC, 12, 5, 236, 8 GROUPBOX "Performance", IDC_STATIC, 6, 18, 244, 50 LTEXT "Performance options control how applications use memory, which affects the speed of your computer.", IDC_STATIC, 16, 29, 228, 17 - PUSHBUTTON "Settings", IDC_PERFOR, 194, 48, 50, 15 + PUSHBUTTON "&Settings", IDC_PERFOR, 194, 48, 50, 15 GROUPBOX "User Profiles", IDC_STATIC, 6, 75, 244, 48 LTEXT "Desktop settings related to your logon", IDC_STATIC, 16, 88, 228, 20 - PUSHBUTTON "Settings", IDC_USERPROFILE, 194, 103, 50, 15 + PUSHBUTTON "S&ettings", IDC_USERPROFILE, 194, 103, 50, 15 GROUPBOX "Startup and Recovery", IDC_STATIC, 6, 131, 244, 52 LTEXT "Startup and recovery options tell your computer how to start and what to do if an error causes your computer to stop.", IDC_STATIC, 16, 144, 228, 19 - PUSHBUTTON "Settings", IDC_STAREC, 194, 162, 50, 15 - PUSHBUTTON "System Settings", IDC_SYSSETTINGS, 6, 192, 80, 15 - PUSHBUTTON "Environment Variables", IDC_ENVVAR, 88, 192, 80, 15 - PUSHBUTTON "Error Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 + PUSHBUTTON "Se&ttings", IDC_STAREC, 194, 162, 50, 15 + PUSHBUTTON "S&ystem Settings", IDC_SYSSETTINGS, 6, 192, 80, 15 + PUSHBUTTON "Enviro&nment Variables", IDC_ENVVAR, 88, 192, 80, 15 + PUSHBUTTON "E&rror Reporting", IDC_ERRORREPORT, 170, 192, 80, 15 END IDD_SYSSETTINGS DIALOGEX 0, 0, 221, 106 @@ -66,7 +66,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Version Info", IDC_STATIC, 6, 3, 210, 73 - CONTROL "Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 + CONTROL "&Report as Workstation", IDC_REPORTASWORKSTATION, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 16, 57, 190, 10 LTEXT "ReactOS is built as a server OS and reports as such. Check this box to change this for applications only.", IDC_STATIC, 15, 15, 183, 41 PUSHBUTTON "OK", IDOK, 166, 83, 50, 14 END @@ -154,9 +154,9 @@ LTEXT "Profiles stored on this computer:", IDC_STATIC, 16, 51, 204, 9 CONTROL "", IDC_USERPROFILE_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 6, 66, 244, 85, WS_EX_CLIENTEDGE - PUSHBUTTON "Change Type", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 - PUSHBUTTON "Delete", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 - PUSHBUTTON "Copy To", IDC_USERPROFILE_COPY, 200, 156, 50, 13 + PUSHBUTTON "&Change Type", IDC_USERPROFILE_CHANGE, 90, 156, 50, 13 + PUSHBUTTON "&Delete", IDC_USERPROFILE_DELETE, 145, 156, 50, 13 + PUSHBUTTON "Copy &To", IDC_USERPROFILE_COPY, 200, 156, 50, 13 CONTROL "To create new user accounts, open <A>User Accounts</A> in Control Panel.", IDC_USERACCOUNT_LINK, "SysLink", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 175, 245, 18 DEFPUSHBUTTON "OK", IDOK, 134, 200, 54, 13 Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Sun Jan 3 15:40:57 2016 @@ -247,19 +247,19 @@ BEGIN MENUITEM "E&xit", IDC_EXIT END - MENUITEM "Action", IDC_ACTIONMENU - POPUP "View" + MENUITEM "&Action", IDC_ACTIONMENU + POPUP "&View" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED + MENUITEM "D&evices by type", IDC_DEVBYTYPE + MENUITEM "De&vices by connection", IDC_DEVBYCONN + MENUITEM "Resources by t&ype", IDC_RESBYTYPE, GRAYED + MENUITEM "Resources by co&nnection", IDC_RESBYCONN, GRAYED MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Sho&w hidden devices", IDC_SHOWHIDDEN END - POPUP "Help" + POPUP "&Help" BEGIN - MENUITEM "About", IDC_ABOUT + MENUITEM "&About", IDC_ABOUT END END

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2016