Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[pschweitzer] 75414: [DDK] Define RxIsFcbTableLockAcquired CORE-8204 CORE-11327 CORE-13581

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jul 26 19:57:50 2017 New Revision: 75414 URL: http://svn.reactos.org/svn/reactos?rev=75414&view=rev Log: [DDK] Define RxIsFcbTableLockAcquired CORE-8204 CORE-11327 CORE-13581 Modified: trunk/reactos/sdk/include/ddk/fcbtable.h Modified: trunk/reactos/sdk/include/ddk/fcbtable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/fcbtable.h… ============================================================================== --- trunk/reactos/sdk/include/ddk/fcbtable.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/fcbtable.h [iso-8859-1] Wed Jul 26 19:57:50 2017 @@ -57,6 +57,9 @@ #define RxIsFcbTableLockExclusive(T) ExIsResourceAcquiredExclusiveLite(&(T)->TableLock) +#define RxIsFcbTableLockAcquired(T) (ExIsResourceAcquiredSharedLite(&(T)->TableLock) || \ + ExIsResourceAcquiredExclusiveLite(&(T)->TableLock)) + #ifdef __REACTOS__ #define FCB_HASH_BUCKET(T, H) &(T)->HashBuckets[H % (T)->NumberOfBuckets] #endif

7 years, 5 months

[ashaposhnikov] 75413: [RAPPS] - A quick fix for counter - used a list that is not updated prior to the message

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Wed Jul 26 17:27:34 2017 New Revision: 75413 URL: http://svn.reactos.org/svn/reactos?rev=75413&view=rev Log: [RAPPS] - A quick fix for counter - used a list that is not updated prior to the message Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Wed Jul 26 17:27:34 2017 @@ -1023,7 +1023,7 @@ /* Check if the item is checked */ if ((pnic->uNewState & LVIS_STATEIMAGEMASK) && !bUpdating) { - BOOL checked = m_ListView->GetCheckState(pnic->iItem); + BOOL checked = ListView_GetCheckState(pnic->hdr.hwndFrom, pnic->iItem); nSelectedApps += (checked) ? 1 : -1; UpdateStatusBarText(); }

7 years, 5 months

[tfaber] 75412: [ACPICA] - Update to version 20170629 CORE-13538 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Jul 26 14:49:35 2017 New Revision: 75412 URL: http://svn.reactos.org/svn/reactos?rev=75412&view=rev Log: [ACPICA] - Update to version 20170629 CORE-13538 #resolve Removed: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h trunk/reactos/drivers/bus/acpi/acpica/include/actables.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -156,6 +156,7 @@ acpica/utilities/utownerid.c acpica/utilities/utpredef.c # acpica/utilities/utprint.c + # acpica/utilities/utresdecode.c acpica/utilities/utresrc.c acpica/utilities/utstate.c acpica/utilities/utstring.c Removed: trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/di… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/dispatcher/dspkginit.c (removed) @@ -1,530 +0,0 @@ -/****************************************************************************** - * - * Module Name: dspkginit - Completion of deferred package initialization - * - *****************************************************************************/ - -/* - * Copyright (C) 2000 - 2017, Intel Corp. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce at minimum a disclaimer - * substantially similar to the "NO WARRANTY" disclaimer below - * ("Disclaimer") and any redistribution must be conditioned upon - * including a substantially similar Disclaimer requirement for further - * binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGES. - */ - -#include "acpi.h" -#include "accommon.h" -#include "acnamesp.h" -#include "amlcode.h" -#include "acdispat.h" -#include "acinterp.h" - - -#define _COMPONENT ACPI_NAMESPACE - ACPI_MODULE_NAME ("dspkginit") - - -/* Local prototypes */ - -static void -AcpiDsResolvePackageElement ( - ACPI_OPERAND_OBJECT **Element); - - -/******************************************************************************* - * - * FUNCTION: AcpiDsBuildInternalPackageObj - * - * PARAMETERS: WalkState - Current walk state - * Op - Parser object to be translated - * ElementCount - Number of elements in the package - this is - * the NumElements argument to Package() - * ObjDescPtr - Where the ACPI internal object is returned - * - * RETURN: Status - * - * DESCRIPTION: Translate a parser Op package object to the equivalent - * namespace object - * - * NOTE: The number of elements in the package will be always be the NumElements - * count, regardless of the number of elements in the package list. If - * NumElements is smaller, only that many package list elements are used. - * if NumElements is larger, the Package object is padded out with - * objects of type Uninitialized (as per ACPI spec.) - * - * Even though the ASL compilers do not allow NumElements to be smaller - * than the Package list length (for the fixed length package opcode), some - * BIOS code modifies the AML on the fly to adjust the NumElements, and - * this code compensates for that. This also provides compatibility with - * other AML interpreters. - * - ******************************************************************************/ - -ACPI_STATUS -AcpiDsBuildInternalPackageObj ( - ACPI_WALK_STATE *WalkState, - ACPI_PARSE_OBJECT *Op, - UINT32 ElementCount, - ACPI_OPERAND_OBJECT **ObjDescPtr) -{ - ACPI_PARSE_OBJECT *Arg; - ACPI_PARSE_OBJECT *Parent; - ACPI_OPERAND_OBJECT *ObjDesc = NULL; - ACPI_STATUS Status = AE_OK; - UINT16 Index; - UINT16 ReferenceCount; - UINT32 i; - - - ACPI_FUNCTION_TRACE (DsBuildInternalPackageObj); - - - /* Find the parent of a possibly nested package */ - - Parent = Op->Common.Parent; - while ((Parent->Common.AmlOpcode == AML_PACKAGE_OP) || - (Parent->Common.AmlOpcode == AML_VARIABLE_PACKAGE_OP)) - { - Parent = Parent->Common.Parent; - } - - /* - * If we are evaluating a Named package object of the form: - * Name (xxxx, Package) - * the package object already exists, otherwise it must be created. - */ - ObjDesc = *ObjDescPtr; - if (!ObjDesc) - { - ObjDesc = AcpiUtCreateInternalObject (ACPI_TYPE_PACKAGE); - *ObjDescPtr = ObjDesc; - if (!ObjDesc) - { - return_ACPI_STATUS (AE_NO_MEMORY); - } - -printf ("****DS: BuildPkg - Create package object %p\n", ObjDesc); - - ObjDesc->Package.Node = Parent->Common.Node; - } - -// -printf ("****DS: BuildPkg, from DsEvalDataObjectOperands - Valid: %X, Pass %u, %p\n", - ObjDesc->Package.Flags & AOPOBJ_DATA_VALID, - WalkState->PassNumber, ObjDesc); - -// just in case -if (ObjDesc->Package.Flags & AOPOBJ_DATA_VALID) -{ - return_ACPI_STATUS (AE_OK); -} - - /* - * Allocate the element array (array of pointers to the individual - * objects) based on the NumElements parameter. Add an extra pointer slot - * so that the list is always null terminated. - */ - ObjDesc->Package.Elements = ACPI_ALLOCATE_ZEROED ( - ((ACPI_SIZE) ElementCount + 1) * sizeof (void *)); - - if (!ObjDesc->Package.Elements) - { - AcpiUtDeleteObjectDesc (ObjDesc); - return_ACPI_STATUS (AE_NO_MEMORY); - } - - ObjDesc->Package.Count = ElementCount; - - /* - * Initialize the elements of the package, up to the NumElements count. - * Package is automatically padded with uninitialized (NULL) elements - * if NumElements is greater than the package list length. Likewise, - * Package is truncated if NumElements is less than the list length. - */ - Arg = Op->Common.Value.Arg; - Arg = Arg->Common.Next; - - if (Arg) - { - printf ("****DS: Mark package evaluated\n"); - ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID; - } - - for (i = 0; Arg && (i < ElementCount); i++) - { -printf ("****DS: Eval package element\n"); - - if (Arg->Common.AmlOpcode == AML_INT_RETURN_VALUE_OP) - { -// Maybe this is just temp code: -/* -if (!Arg->Common.Node) -{ - printf ("****DS: No attached NS node\n"); - return_ACPI_STATUS (AE_AML_INTERNAL); -} -else */ if (Arg->Common.Node->Type == ACPI_TYPE_METHOD) - { - - /* - * A method reference "looks" to the parser to be a method - * invocation, so we special case it here - */ - Arg->Common.AmlOpcode = AML_INT_NAMEPATH_OP; - Status = AcpiDsBuildInternalObject ( - WalkState, Arg, &ObjDesc->Package.Elements[i]); - } - else - { - /* This package element is already built, just get it */ - - ObjDesc->Package.Elements[i] = - ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Arg->Common.Node); - } - } - else - { - Status = AcpiDsBuildInternalObject ( - WalkState, Arg, &ObjDesc->Package.Elements[i]); - if (Status == AE_NOT_FOUND) - { -// remove or fix - ACPI_ERROR ((AE_INFO, "%-48s", "****DS namepath not found")); - } - - /* - * Initialize this package element. This function handles the - * resolution of named references within the package. - */ - AcpiDsInitPackageElement (0, ObjDesc->Package.Elements[i], - NULL, &ObjDesc->Package.Elements[i]); - } - - if (*ObjDescPtr) - { - /* Existing package, get existing reference count */ - - ReferenceCount = (*ObjDescPtr)->Common.ReferenceCount; - if (ReferenceCount > 1) - { - /* Make new element ref count match original ref count */ - - for (Index = 0; Index < (ReferenceCount - 1); Index++) - { - AcpiUtAddReference ((ObjDesc->Package.Elements[i])); - } - } - } - - Arg = Arg->Common.Next; - } - - /* Check for match between NumElements and actual length of PackageList */ - - if (Arg) - { - //ObjDesc->Package.Flags |= AOPOBJ_DATA_VALID; - - - /* - * NumElements was exhausted, but there are remaining elements in the - * PackageList. Truncate the package to NumElements. - * - * Note: technically, this is an error, from ACPI spec: "It is an error - * for NumElements to be less than the number of elements in the - * PackageList". However, we just print a message and - * no exception is returned. This provides Windows compatibility. Some - * BIOSs will alter the NumElements on the fly, creating this type - * of ill-formed package object. - */ - while (Arg) - { - /* - * We must delete any package elements that were created earlier - * and are not going to be used because of the package truncation. - */ - if (Arg->Common.Node) - { - AcpiUtRemoveReference ( - ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, Arg->Common.Node)); - Arg->Common.Node = NULL; - } - - /* Find out how many elements there really are */ - - i++; - Arg = Arg->Common.Next; - } - - ACPI_INFO (( - "Actual Package length (%u) is larger than " - "NumElements field (%u), truncated", - i, ElementCount)); - } - else if (i < ElementCount) - { - /* - * Arg list (elements) was exhausted, but we did not reach - * NumElements count. - * - * Note: this is not an error, the package is padded out - * with NULLs. - */ - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, - "Package List length (%u) smaller than NumElements " - "count (%u), padded with null elements\n", - i, ElementCount)); - } - - Op->Common.Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjDesc); - return_ACPI_STATUS (Status); -} - - -/******************************************************************************* - * - * FUNCTION: AcpiDsInitPackageElement - * - * PARAMETERS: ACPI_PKG_CALLBACK - * - * RETURN: Status - * - * DESCRIPTION: Resolve a named reference element within a package object - * - ******************************************************************************/ - -ACPI_STATUS -AcpiDsInitPackageElement ( - UINT8 ObjectType, - ACPI_OPERAND_OBJECT *SourceObject, - ACPI_GENERIC_STATE *State, - void *Context) -{ - ACPI_OPERAND_OBJECT **ElementPtr; - - - if (!SourceObject) - { - return (AE_OK); - } - - /* - * The following code is a bit of a hack to workaround a (current) - * limitation of the ACPI_PKG_CALLBACK interface. We need a pointer - * to the location within the element array because a new object - * may be created and stored there. - */ - if (Context) - { - /* A direct call was made to this function */ - - ElementPtr = (ACPI_OPERAND_OBJECT **) Context; - } - else - { - /* Call came from AcpiUtWalkPackageTree */ - - ElementPtr = State->Pkg.ThisTargetObj; - } - - /* We are only interested in reference objects/elements */ - - if (SourceObject->Common.Type == ACPI_TYPE_LOCAL_REFERENCE) - { - /* Resolve the (named) reference to a namespace node */ - - AcpiDsResolvePackageElement (ElementPtr); - } - else if (SourceObject->Common.Type == ACPI_TYPE_PACKAGE) - { - SourceObject->Package.Flags |= AOPOBJ_DATA_VALID; - } - - return (AE_OK); -} - - -/******************************************************************************* - * - * FUNCTION: AcpiDsResolvePackageElement - * - * PARAMETERS: ElementPtr - Pointer to a reference object - * - * RETURN: Status - * - * DESCRIPTION: Resolve a package element that is a reference to a named - * object. - * - ******************************************************************************/ - -static void -AcpiDsResolvePackageElement ( - ACPI_OPERAND_OBJECT **ElementPtr) -{ - ACPI_STATUS Status; - ACPI_GENERIC_STATE ScopeInfo; - ACPI_OPERAND_OBJECT *Element = *ElementPtr; - ACPI_NAMESPACE_NODE *ResolvedNode; - ACPI_OBJECT_TYPE Type; - - - ACPI_FUNCTION_TRACE (DsResolvePackageElement); - - - /* Check if reference element is already resolved */ - - if (Element->Reference.Resolved) - { - return_VOID; - } - - /* Element must be a reference object of correct type */ - - ScopeInfo.Scope.Node = Element->Reference.Node; /* Prefix node */ - - Status = AcpiNsLookup (&ScopeInfo, - (char *) Element->Reference.Aml, /* Pointer to AML path */ - ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS2, - ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE, - NULL, &ResolvedNode); - - if (ACPI_FAILURE (Status)) - { - ACPI_EXCEPTION ((AE_INFO, Status, - "Could not resolve package element")); - return_VOID; - } - - else if (ResolvedNode->Type == ACPI_TYPE_ANY) - { - /* Named reference not resolved, return a NULL package element */ - - ACPI_ERROR ((AE_INFO, - "Could not resolve package element [%4.4s] in [%4.4s]", - ResolvedNode->Name.Ascii, ScopeInfo.Scope.Node->Name.Ascii)); - *ElementPtr = NULL; - return_VOID; - } - - else if (ResolvedNode->Flags & ANOBJ_TEMPORARY) - { - /* - * A temporary node found here indicates that the reference is - * to a node that was created within this method. We are not - * going to allow it (especially if the package is returned - * from the method) -- the temporary node will be deleted out - * from under the method. (05/2017). - */ - ACPI_ERROR ((AE_INFO, - "Package element is a temporary name [%4.4s], " - "returning NULL element", - ResolvedNode->Name.Ascii)); - *ElementPtr = NULL; - return_VOID; - } - - /* Update the reference object */ - - Element->Reference.Resolved = TRUE; - Element->Reference.Node = ResolvedNode; - Type = Element->Reference.Node->Type; - - /* - * Attempt to resolve the node to a value before we insert it into - * the package. If this is a reference to a common data type, - * resolve it immediately. According to the ACPI spec, package - * elements can only be "data objects" or method references. - * Attempt to resolve to an Integer, Buffer, String or Package. - * If cannot, return the named reference (for things like Devices, - * Methods, etc.) Buffer Fields and Fields will resolve to simple - * objects (int/buf/str/pkg). - * - * NOTE: References to things like Devices, Methods, Mutexes, etc. - * will remain as named references. This behavior is not described - * in the ACPI spec, but it appears to be an oversight. - */ - Status = AcpiExResolveNodeToValue (&ResolvedNode, NULL); - if (ACPI_FAILURE (Status)) - { - return_VOID; - } - -#if 0 - /* - * Special handling for Alias objects. We need to setup the type - * and the Op->Common.Node to point to the Alias target. Note, - * Alias has at most one level of indirection internally. - */ - Type = Op->Common.Node->Type; - if (Type == ACPI_TYPE_LOCAL_ALIAS) - { - Type = ObjDesc->Common.Type; - Op->Common.Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, - Op->Common.Node->Object); - } -#endif - - switch (Type) - { - /* - * These object types are a result of named references, so we will - * leave them as reference objects. In other words, these types - * have no intrinsic "value". - */ - case ACPI_TYPE_DEVICE: - case ACPI_TYPE_THERMAL: - - /* TBD: This may not be necesssary */ - - AcpiUtAddReference (ResolvedNode->Object); - break; - - case ACPI_TYPE_MUTEX: - case ACPI_TYPE_METHOD: - case ACPI_TYPE_POWER: - case ACPI_TYPE_PROCESSOR: - case ACPI_TYPE_EVENT: - case ACPI_TYPE_REGION: - - break; - - default: - /* - * For all other types - the node was resolved to an actual - * operand object with a value, return the object - */ - *ElementPtr = (ACPI_OPERAND_OBJECT *) ResolvedNode; - break; - } - - return_VOID; -} Modified: trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ex… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/executer/excreate.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -94,6 +94,12 @@ TargetNode = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, TargetNode->Object); } + /* Ensure that the target node is valid */ + if (!TargetNode) + { + return_ACPI_STATUS (AE_NULL_OBJECT); + } + /* * For objects that can never change (i.e., the NS node will * permanently point to the same object), we can simply attach Modified: trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ha… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/hardware/hwxfsleep.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -76,9 +76,18 @@ static ACPI_SLEEP_FUNCTIONS AcpiSleepDispatch[] = { - {ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacySleep), AcpiHwExtendedSleep}, - {ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWakePrep), AcpiHwExtendedWakePrep}, - {ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWake), AcpiHwExtendedWake} + {ACPI_STRUCT_INIT (legacy_function, + ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacySleep)), + ACPI_STRUCT_INIT (extended_function, + AcpiHwExtendedSleep) }, + {ACPI_STRUCT_INIT (legacy_function, + ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWakePrep)), + ACPI_STRUCT_INIT (extended_function, + AcpiHwExtendedWakePrep) }, + {ACPI_STRUCT_INIT (legacy_function, + ACPI_HW_OPTIONAL_FUNCTION (AcpiHwLegacyWake)), + ACPI_STRUCT_INIT (extended_function, + AcpiHwExtendedWake) } }; Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acapps.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -118,6 +118,10 @@ UINT8 GetOnlyAmlTables, ACPI_NEW_TABLE_DESC **ReturnListHead); +void +AcDeleteTableList ( + ACPI_NEW_TABLE_DESC *ListHead); + BOOLEAN AcIsFileBinary ( FILE *File); Modified: trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/aclocal.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -220,6 +220,7 @@ #define ANOBJ_EVALUATED 0x20 /* Set on first evaluation of node */ #define ANOBJ_ALLOCATED_BUFFER 0x40 /* Method AML buffer is dynamic (InstallMethod) */ +#define IMPLICIT_EXTERNAL 0x02 /* iASL only: This object created implicitly via External */ #define ANOBJ_IS_EXTERNAL 0x08 /* iASL only: This object created via External() */ #define ANOBJ_METHOD_NO_RETVAL 0x10 /* iASL only: Method has no return value */ #define ANOBJ_METHOD_SOME_NO_RETVAL 0x20 /* iASL only: Method has at least one return value */ @@ -1038,7 +1039,7 @@ /* This version is used by the iASL compiler only */ -#define ACPI_MAX_PARSEOP_NAME 20 +#define ACPI_MAX_PARSEOP_NAME 20 typedef struct acpi_parse_obj_asl { @@ -1082,11 +1083,12 @@ typedef struct asl_comment_state { - UINT8 CommentType; - UINT32 SpacesBefore; - ACPI_PARSE_OBJECT *Latest_Parse_Node; - ACPI_PARSE_OBJECT *ParsingParenBraceNode; - BOOLEAN CaptureComments; + UINT8 CommentType; + UINT32 SpacesBefore; + ACPI_PARSE_OBJECT *LatestParseOp; + ACPI_PARSE_OBJECT *ParsingParenBraceNode; + BOOLEAN CaptureComments; + } ASL_COMMENT_STATE; Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acobject.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -133,7 +133,9 @@ UINT32 Length; -typedef struct acpi_object_string /* Null terminated, ASCII characters only */ +/* Null terminated, ASCII characters only */ + +typedef struct acpi_object_string { ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_BUFFER_INFO (char) /* String in AML stream or allocated string */ @@ -251,8 +253,9 @@ union acpi_operand_object *NotifyList[2]; /* Handlers for system/device notifies */\ union acpi_operand_object *Handler; /* Handler for Address space */ - -typedef struct acpi_object_notify_common /* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */ +/* COMMON NOTIFY for POWER, PROCESSOR, DEVICE, and THERMAL */ + +typedef struct acpi_object_notify_common { ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_NOTIFY_INFO @@ -323,8 +326,9 @@ UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */\ UINT8 AccessLength; /* For serial regions/fields */ - -typedef struct acpi_object_field_common /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */ +/* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */ + +typedef struct acpi_object_field_common { ACPI_OBJECT_COMMON_HEADER ACPI_COMMON_FIELD_INFO Modified: trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/acpixf.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20170531 +#define ACPI_CA_VERSION 0x20170629 #include "acconfig.h" #include "actypes.h" @@ -162,13 +162,14 @@ ACPI_INIT_GLOBAL (UINT8, AcpiGbl_UseDefaultRegisterWidths, TRUE); /* - * Whether or not to verify the table checksum before installation. Set - * this to TRUE to verify the table checksum before install it to the table - * manager. Note that enabling this option causes errors to happen in some - * OSPMs during early initialization stages. Default behavior is to do such - * verification. - */ -ACPI_INIT_GLOBAL (UINT8, AcpiGbl_VerifyTableChecksum, TRUE); + * Whether or not to validate (map) an entire table to verify + * checksum/duplication in early stage before install. Set this to TRUE to + * allow early table validation before install it to the table manager. + * Note that enabling this option causes errors to happen in some OSPMs + * during early initialization stages. Default behavior is to allow such + * validation. + */ +ACPI_INIT_GLOBAL (UINT8, AcpiGbl_EnableTableValidation, TRUE); /* * Optionally enable output from the AML Debug Object. Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/actables.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/actables.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -98,7 +98,8 @@ ACPI_STATUS AcpiTbVerifyTempTable ( ACPI_TABLE_DESC *TableDesc, - char *Signature); + char *Signature, + UINT32 *TableIndex); BOOLEAN AcpiTbIsTableLoaded ( @@ -195,6 +196,11 @@ UINT32 TableIndex); void +AcpiTbNotifyTable ( + UINT32 Event, + void *Table); + +void AcpiTbTerminate ( void); Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/actbl.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -409,12 +409,27 @@ } ACPI_TABLE_DESC; +/* + * Maximum value of the ValidationCount field in ACPI_TABLE_DESC. + * When reached, ValidationCount cannot be changed any more and the table will + * be permanently regarded as validated. + * + * This is to prevent situations in which unbalanced table get/put operations + * may cause premature table unmapping in the OS to happen. + * + * The maximum validation count can be defined to any value, but should be + * greater than the maximum number of OS early stage mapping slots to avoid + * leaking early stage table mappings to the late stage. + */ +#define ACPI_MAX_TABLE_VALIDATIONS ACPI_UINT16_MAX + /* Masks for Flags field above */ #define ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL (0) /* Virtual address, external maintained */ #define ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL (1) /* Physical address, internally mapped */ #define ACPI_TABLE_ORIGIN_INTERNAL_VIRTUAL (2) /* Virtual address, internallly allocated */ #define ACPI_TABLE_ORIGIN_MASK (3) +#define ACPI_TABLE_IS_VERIFIED (4) #define ACPI_TABLE_IS_LOADED (8) Modified: trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/actbl2.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -766,7 +766,7 @@ * IORT - IO Remapping Table * * Conforms to "IO Remapping Table System Software on ARM Platforms", - * Document number: ARM DEN 0049B, October 2015 + * Document number: ARM DEN 0049C, May 2017 * ******************************************************************************/ @@ -905,6 +905,8 @@ #define ACPI_IORT_SMMU_V2 0x00000001 /* Generic SMMUv2 */ #define ACPI_IORT_SMMU_CORELINK_MMU400 0x00000002 /* ARM Corelink MMU-400 */ #define ACPI_IORT_SMMU_CORELINK_MMU500 0x00000003 /* ARM Corelink MMU-500 */ +#define ACPI_IORT_SMMU_CORELINK_MMU401 0x00000004 /* ARM Corelink MMU-401 */ +#define ACPI_IORT_SMMU_CAVIUM_THUNDERX 0x00000005 /* Cavium ThunderX SMMUv2 */ /* Masks for Flags field above */ @@ -928,18 +930,28 @@ UINT32 Flags; UINT32 Reserved; UINT64 VatosAddress; - UINT32 Model; /* O: generic SMMUv3 */ + UINT32 Model; UINT32 EventGsiv; UINT32 PriGsiv; UINT32 GerrGsiv; UINT32 SyncGsiv; + UINT8 Pxm; + UINT8 Reserved1; + UINT16 Reserved2; } ACPI_IORT_SMMU_V3; + +/* Values for Model field above */ + +#define ACPI_IORT_SMMU_V3_GENERIC 0x00000000 /* Generic SMMUv3 */ +#define ACPI_IORT_SMMU_V3_HISILICON_HI161X 0x00000001 /* HiSilicon Hi161x SMMUv3 */ +#define ACPI_IORT_SMMU_V3_CAVIUM_CN99XX 0x00000002 /* Cavium CN99xx SMMUv3 */ /* Masks for Flags field above */ #define ACPI_IORT_SMMU_V3_COHACC_OVERRIDE (1) #define ACPI_IORT_SMMU_V3_HTTU_OVERRIDE (1<<1) +#define ACPI_IORT_SMMU_V3_PXM_VALID (1<<3) /******************************************************************************* Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/acenv.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -294,6 +294,11 @@ #define ACPI_INLINE #endif +/* Use ordered initialization if compiler doesn't support designated. */ +#ifndef ACPI_STRUCT_INIT +#define ACPI_STRUCT_INIT(field, value) value +#endif + /* * Configurable calling conventions: * Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/aclinux.h [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -179,6 +179,11 @@ #define ACPI_MSG_BIOS_ERROR KERN_ERR "ACPI BIOS Error (bug): " #define ACPI_MSG_BIOS_WARNING KERN_WARNING "ACPI BIOS Warning (bug): " +/* + * Linux wants to use designated initializers for function pointer structs. + */ +#define ACPI_STRUCT_INIT(field, value) .field = value + #else /* !__KERNEL__ */ #define ACPI_USE_STANDARD_HEADERS Modified: trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/na… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/namespace/nsaccess.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -656,6 +656,13 @@ ThisNode = (ACPI_NAMESPACE_NODE *) ThisNode->Object; } } +#ifdef ACPI_ASL_COMPILER + if (!AcpiGbl_DisasmFlag && + (ThisNode->Flags & ANOBJ_IS_EXTERNAL)) + { + ThisNode->Flags |= IMPLICIT_EXTERNAL; + } +#endif } /* Special handling for the last segment (NumSegments == 0) */ Modified: trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/pa… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/parser/psobject.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -379,6 +379,31 @@ { Status = AcpiPsBuildNamedOp (WalkState, AmlOpStart, Op, &NamedOp); AcpiPsFreeOp (Op); + +#ifdef ACPI_ASL_COMPILER + if (AcpiGbl_DisasmFlag && WalkState->Opcode == AML_EXTERNAL_OP && + Status == AE_NOT_FOUND) + { + /* + * If parsing of AML_EXTERNAL_OP's name path fails, then skip + * past this opcode and keep parsing. This is a much better + * alternative than to abort the entire disassembler. At this + * point, the ParserState is at the end of the namepath of the + * external declaration opcode. Setting WalkState->Aml to + * WalkState->ParserState.Aml + 2 moves increments the + * WalkState->Aml past the object type and the paramcount of the + * external opcode. For the error message, only print the AML + * offset. We could attempt to print the name but this may cause + * a segmentation fault when printing the namepath because the + * AML may be incorrect. + */ + AcpiOsPrintf ( + "// Invalid external declaration at AML offset 0x%x.\n", + WalkState->Aml - WalkState->ParserState.AmlStart); + WalkState->Aml = WalkState->ParserState.Aml + 2; + return_ACPI_STATUS (AE_CTRL_PARSE_CONTINUE); + } +#endif if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbdata.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -50,6 +50,66 @@ #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbdata") +/* Local prototypes */ + +static ACPI_STATUS +AcpiTbCheckDuplication ( + ACPI_TABLE_DESC *TableDesc, + UINT32 *TableIndex); + +static BOOLEAN +AcpiTbCompareTables ( + ACPI_TABLE_DESC *TableDesc, + UINT32 TableIndex); + + +/******************************************************************************* + * + * FUNCTION: AcpiTbCompareTables + * + * PARAMETERS: TableDesc - Table 1 descriptor to be compared + * TableIndex - Index of table 2 to be compared + * + * RETURN: TRUE if both tables are identical. + * + * DESCRIPTION: This function compares a table with another table that has + * already been installed in the root table list. + * + ******************************************************************************/ + +static BOOLEAN +AcpiTbCompareTables ( + ACPI_TABLE_DESC *TableDesc, + UINT32 TableIndex) +{ + ACPI_STATUS Status = AE_OK; + BOOLEAN IsIdentical; + ACPI_TABLE_HEADER *Table; + UINT32 TableLength; + UINT8 TableFlags; + + + Status = AcpiTbAcquireTable (&AcpiGbl_RootTableList.Tables[TableIndex], + &Table, &TableLength, &TableFlags); + if (ACPI_FAILURE (Status)) + { + return (FALSE); + } + + /* + * Check for a table match on the entire table length, + * not just the header. + */ + IsIdentical = (BOOLEAN)((TableDesc->Length != TableLength || + memcmp (TableDesc->Pointer, Table, TableLength)) ? + FALSE : TRUE); + + /* Release the acquired table */ + + AcpiTbReleaseTable (Table, TableLength, TableFlags); + return (IsIdentical); +} + /******************************************************************************* * @@ -369,7 +429,7 @@ ACPI_TABLE_DESC *TableDesc) { - if (!TableDesc->Pointer && !AcpiGbl_VerifyTableChecksum) + if (!TableDesc->Pointer && !AcpiGbl_EnableTableValidation) { /* * Only validates the header of the table. @@ -387,12 +447,94 @@ } +/******************************************************************************* + * + * FUNCTION: AcpiTbCheckDuplication + * + * PARAMETERS: TableDesc - Table descriptor + * TableIndex - Where the table index is returned + * + * RETURN: Status + * + * DESCRIPTION: Avoid installing duplicated tables. However table override and + * user aided dynamic table load is allowed, thus comparing the + * address of the table is not sufficient, and checking the entire + * table content is required. + * + ******************************************************************************/ + +static ACPI_STATUS +AcpiTbCheckDuplication ( + ACPI_TABLE_DESC *TableDesc, + UINT32 *TableIndex) +{ + UINT32 i; + + + ACPI_FUNCTION_TRACE (TbCheckDuplication); + + + /* Check if table is already registered */ + + for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) + { + /* Do not compare with unverified tables */ + + if (!(AcpiGbl_RootTableList.Tables[i].Flags & ACPI_TABLE_IS_VERIFIED)) + { + continue; + } + + /* + * Check for a table match on the entire table length, + * not just the header. + */ + if (!AcpiTbCompareTables (TableDesc, i)) + { + continue; + } + + /* + * Note: the current mechanism does not unregister a table if it is + * dynamically unloaded. The related namespace entries are deleted, + * but the table remains in the root table list. + * + * The assumption here is that the number of different tables that + * will be loaded is actually small, and there is minimal overhead + * in just keeping the table in case it is needed again. + * + * If this assumption changes in the future (perhaps on large + * machines with many table load/unload operations), tables will + * need to be unregistered when they are unloaded, and slots in the + * root table list should be reused when empty. + */ + if (AcpiGbl_RootTableList.Tables[i].Flags & + ACPI_TABLE_IS_LOADED) + { + /* Table is still loaded, this is an error */ + + return_ACPI_STATUS (AE_ALREADY_EXISTS); + } + else + { + *TableIndex = i; + return_ACPI_STATUS (AE_CTRL_TERMINATE); + } + } + + /* Indicate no duplication to the caller */ + + return_ACPI_STATUS (AE_OK); +} + + /****************************************************************************** * * FUNCTION: AcpiTbVerifyTempTable * * PARAMETERS: TableDesc - Table descriptor * Signature - Table signature to verify + * TableIndex - Where the table index is returned * * RETURN: Status * @@ -404,7 +546,8 @@ ACPI_STATUS AcpiTbVerifyTempTable ( ACPI_TABLE_DESC *TableDesc, - char *Signature) + char *Signature, + UINT32 *TableIndex) { ACPI_STATUS Status = AE_OK; @@ -432,10 +575,10 @@ goto InvalidateAndExit; } - /* Verify the checksum */ - - if (AcpiGbl_VerifyTableChecksum) - { + if (AcpiGbl_EnableTableValidation) + { + /* Verify the checksum */ + Status = AcpiTbVerifyChecksum (TableDesc->Pointer, TableDesc->Length); if (ACPI_FAILURE (Status)) { @@ -448,9 +591,32 @@ goto InvalidateAndExit; } - } - - return_ACPI_STATUS (AE_OK); + + /* Avoid duplications */ + + if (TableIndex) + { + Status = AcpiTbCheckDuplication (TableDesc, TableIndex); + if (ACPI_FAILURE (Status)) + { + if (Status != AE_CTRL_TERMINATE) + { + ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, + "%4.4s 0x%8.8X%8.8X" + " Table is duplicated", + AcpiUtValidNameseg (TableDesc->Signature.Ascii) ? + TableDesc->Signature.Ascii : "????", + ACPI_FORMAT_UINT64 (TableDesc->Address))); + } + + goto InvalidateAndExit; + } + } + + TableDesc->Flags |= ACPI_TABLE_IS_VERIFIED; + } + + return_ACPI_STATUS (Status); InvalidateAndExit: AcpiTbInvalidateTable (TableDesc); @@ -476,6 +642,8 @@ { ACPI_TABLE_DESC *Tables; UINT32 TableCount; + UINT32 CurrentTableCount, MaxTableCount; + UINT32 i; ACPI_FUNCTION_TRACE (TbResizeRootTableList); @@ -500,9 +668,9 @@ TableCount = AcpiGbl_RootTableList.CurrentTableCount; } + MaxTableCount = TableCount + ACPI_ROOT_TABLE_SIZE_INCREMENT; Tables = ACPI_ALLOCATE_ZEROED ( - ((ACPI_SIZE) TableCount + ACPI_ROOT_TABLE_SIZE_INCREMENT) * - sizeof (ACPI_TABLE_DESC)); + ((ACPI_SIZE) MaxTableCount) * sizeof (ACPI_TABLE_DESC)); if (!Tables) { ACPI_ERROR ((AE_INFO, "Could not allocate new root table array")); @@ -511,10 +679,19 @@ /* Copy and free the previous table array */ + CurrentTableCount = 0; if (AcpiGbl_RootTableList.Tables) { - memcpy (Tables, AcpiGbl_RootTableList.Tables, - (ACPI_SIZE) TableCount * sizeof (ACPI_TABLE_DESC)); + for (i = 0; i < TableCount; i++) + { + if (AcpiGbl_RootTableList.Tables[i].Address) + { + memcpy (Tables + CurrentTableCount, + AcpiGbl_RootTableList.Tables + i, + sizeof (ACPI_TABLE_DESC)); + CurrentTableCount++; + } + } if (AcpiGbl_RootTableList.Flags & ACPI_ROOT_ORIGIN_ALLOCATED) { @@ -523,8 +700,8 @@ } AcpiGbl_RootTableList.Tables = Tables; - AcpiGbl_RootTableList.MaxTableCount = - TableCount + ACPI_ROOT_TABLE_SIZE_INCREMENT; + AcpiGbl_RootTableList.MaxTableCount = MaxTableCount; + AcpiGbl_RootTableList.CurrentTableCount = CurrentTableCount; AcpiGbl_RootTableList.Flags |= ACPI_ROOT_ORIGIN_ALLOCATED; return_ACPI_STATUS (AE_OK); @@ -921,14 +1098,9 @@ AcpiEvUpdateGpes (OwnerId); } - /* Invoke table handler if present */ - - if (AcpiGbl_TableHandler) - { - (void) AcpiGbl_TableHandler (ACPI_TABLE_EVENT_LOAD, Table, - AcpiGbl_TableHandlerContext); - } - + /* Invoke table handler */ + + AcpiTbNotifyTable (ACPI_TABLE_EVENT_LOAD, Table); return_ACPI_STATUS (Status); } @@ -962,24 +1134,19 @@ ACPI_FUNCTION_TRACE (TbInstallAndLoadTable); - (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); - /* Install the table and load it into the namespace */ Status = AcpiTbInstallStandardTable (Address, Flags, TRUE, Override, &i); if (ACPI_FAILURE (Status)) { - goto UnlockAndExit; - } - - (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); + goto Exit; + } + Status = AcpiTbLoadTable (i, AcpiGbl_RootNode); - (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); - -UnlockAndExit: + +Exit: *TableIndex = i; - (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); return_ACPI_STATUS (Status); } @@ -1014,16 +1181,12 @@ return_ACPI_STATUS (AE_NOT_EXIST); } - /* Invoke table handler if present */ - - if (AcpiGbl_TableHandler) - { - Status = AcpiGetTableByIndex (TableIndex, &Table); - if (ACPI_SUCCESS (Status)) - { - (void) AcpiGbl_TableHandler (ACPI_TABLE_EVENT_UNLOAD, Table, - AcpiGbl_TableHandlerContext); - } + /* Invoke table handler */ + + Status = AcpiGetTableByIndex (TableIndex, &Table); + if (ACPI_SUCCESS (Status)) + { + AcpiTbNotifyTable (ACPI_TABLE_EVENT_UNLOAD, Table); } /* Delete the portion of the namespace owned by this table */ @@ -1038,3 +1201,31 @@ AcpiTbSetTableLoadedFlag (TableIndex, FALSE); return_ACPI_STATUS (Status); } + + +/******************************************************************************* + * + * FUNCTION: AcpiTbNotifyTable + * + * PARAMETERS: Event - Table event + * Table - Validated table pointer + * + * RETURN: None + * + * DESCRIPTION: Notify a table event to the users. + * + ******************************************************************************/ + +void +AcpiTbNotifyTable ( + UINT32 Event, + void *Table) +{ + /* Invoke table handler if present */ + + if (AcpiGbl_TableHandler) + { + (void) AcpiGbl_TableHandler (Event, Table, + AcpiGbl_TableHandlerContext); + } +} Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbinstal.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -48,61 +48,6 @@ #define _COMPONENT ACPI_TABLES ACPI_MODULE_NAME ("tbinstal") -/* Local prototypes */ - -static BOOLEAN -AcpiTbCompareTables ( - ACPI_TABLE_DESC *TableDesc, - UINT32 TableIndex); - - -/******************************************************************************* - * - * FUNCTION: AcpiTbCompareTables - * - * PARAMETERS: TableDesc - Table 1 descriptor to be compared - * TableIndex - Index of table 2 to be compared - * - * RETURN: TRUE if both tables are identical. - * - * DESCRIPTION: This function compares a table with another table that has - * already been installed in the root table list. - * - ******************************************************************************/ - -static BOOLEAN -AcpiTbCompareTables ( - ACPI_TABLE_DESC *TableDesc, - UINT32 TableIndex) -{ - ACPI_STATUS Status = AE_OK; - BOOLEAN IsIdentical; - ACPI_TABLE_HEADER *Table; - UINT32 TableLength; - UINT8 TableFlags; - - - Status = AcpiTbAcquireTable (&AcpiGbl_RootTableList.Tables[TableIndex], - &Table, &TableLength, &TableFlags); - if (ACPI_FAILURE (Status)) - { - return (FALSE); - } - - /* - * Check for a table match on the entire table length, - * not just the header. - */ - IsIdentical = (BOOLEAN)((TableDesc->Length != TableLength || - memcmp (TableDesc->Pointer, Table, TableLength)) ? - FALSE : TRUE); - - /* Release the acquired table */ - - AcpiTbReleaseTable (Table, TableLength, TableFlags); - return (IsIdentical); -} - /******************************************************************************* * @@ -229,105 +174,48 @@ goto ReleaseAndExit; } + /* Acquire the table lock */ + + (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); + /* Validate and verify a table before installation */ - Status = AcpiTbVerifyTempTable (&NewTableDesc, NULL); + Status = AcpiTbVerifyTempTable (&NewTableDesc, NULL, &i); if (ACPI_FAILURE (Status)) { - goto ReleaseAndExit; - } - - if (Reload) - { - /* - * Validate the incoming table signature. - * - * 1) Originally, we checked the table signature for "SSDT" or "PSDT". - * 2) We added support for OEMx tables, signature "OEM". - * 3) Valid tables were encountered with a null signature, so we just - * gave up on validating the signature, (05/2008). - * 4) We encountered non-AML tables such as the MADT, which caused - * interpreter errors and kernel faults. So now, we once again allow - * only "SSDT", "OEMx", and now, also a null signature. (05/2011). - */ - if ((NewTableDesc.Signature.Ascii[0] != 0x00) && - (!ACPI_COMPARE_NAME (&NewTableDesc.Signature, ACPI_SIG_SSDT)) && - (strncmp (NewTableDesc.Signature.Ascii, "OEM", 3))) - { - ACPI_BIOS_ERROR ((AE_INFO, - "Table has invalid signature [%4.4s] (0x%8.8X), " - "must be SSDT or OEMx", - AcpiUtValidNameseg (NewTableDesc.Signature.Ascii) ? - NewTableDesc.Signature.Ascii : "????", - NewTableDesc.Signature.Integer)); - - Status = AE_BAD_SIGNATURE; - goto ReleaseAndExit; - } - - /* Check if table is already registered */ - - for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) + if (Status == AE_CTRL_TERMINATE) { /* - * Check for a table match on the entire table length, - * not just the header. + * Table was unloaded, allow it to be reloaded. + * As we are going to return AE_OK to the caller, we should + * take the responsibility of freeing the input descriptor. + * Refill the input descriptor to ensure + * AcpiTbInstallTableWithOverride() can be called again to + * indicate the re-installation. */ - if (!AcpiTbCompareTables (&NewTableDesc, i)) - { - continue; - } - - /* - * Note: the current mechanism does not unregister a table if it is - * dynamically unloaded. The related namespace entries are deleted, - * but the table remains in the root table list. - * - * The assumption here is that the number of different tables that - * will be loaded is actually small, and there is minimal overhead - * in just keeping the table in case it is needed again. - * - * If this assumption changes in the future (perhaps on large - * machines with many table load/unload operations), tables will - * need to be unregistered when they are unloaded, and slots in the - * root table list should be reused when empty. - */ - if (AcpiGbl_RootTableList.Tables[i].Flags & - ACPI_TABLE_IS_LOADED) - { - /* Table is still loaded, this is an error */ - - Status = AE_ALREADY_EXISTS; - goto ReleaseAndExit; - } - else - { - /* - * Table was unloaded, allow it to be reloaded. - * As we are going to return AE_OK to the caller, we should - * take the responsibility of freeing the input descriptor. - * Refill the input descriptor to ensure - * AcpiTbInstallTableWithOverride() can be called again to - * indicate the re-installation. - */ - AcpiTbUninstallTable (&NewTableDesc); - *TableIndex = i; - return_ACPI_STATUS (AE_OK); - } + AcpiTbUninstallTable (&NewTableDesc); + (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); + *TableIndex = i; + return_ACPI_STATUS (AE_OK); } + goto UnlockAndExit; } /* Add the table to the global root table list */ AcpiTbInstallTableWithOverride (&NewTableDesc, Override, TableIndex); - /* Invoke table handler if present */ - - if (AcpiGbl_TableHandler) - { - (void) AcpiGbl_TableHandler (ACPI_TABLE_EVENT_INSTALL, - NewTableDesc.Pointer, AcpiGbl_TableHandlerContext); - } + /* Invoke table handler */ + + (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); + AcpiTbNotifyTable (ACPI_TABLE_EVENT_INSTALL, NewTableDesc.Pointer); + (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); + +UnlockAndExit: + + /* Release the table lock */ + + (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); ReleaseAndExit: @@ -395,9 +283,11 @@ FinishOverride: - /* Validate and verify a table before overriding */ - - Status = AcpiTbVerifyTempTable (&NewTableDesc, NULL); + /* + * Validate and verify a table before overriding, no nested table + * duplication check as it's too complicated and unnecessary. + */ + Status = AcpiTbVerifyTempTable (&NewTableDesc, NULL, NULL); if (ACPI_FAILURE (Status)) { return; Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbutils.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -451,14 +451,19 @@ } } - TableDesc->ValidationCount++; - if (TableDesc->ValidationCount == 0) - { - ACPI_ERROR ((AE_INFO, - "Table %p, Validation count is zero after increment\n", - TableDesc)); - TableDesc->ValidationCount--; - return_ACPI_STATUS (AE_LIMIT); + if (TableDesc->ValidationCount < ACPI_MAX_TABLE_VALIDATIONS) + { + TableDesc->ValidationCount++; + + /* + * Detect ValidationCount overflows to ensure that the warning + * message will only be printed once. + */ + if (TableDesc->ValidationCount >= ACPI_MAX_TABLE_VALIDATIONS) + { + ACPI_WARNING((AE_INFO, + "Table %p, Validation count overflows\n", TableDesc)); + } } *OutTable = TableDesc->Pointer; @@ -489,17 +494,24 @@ ACPI_FUNCTION_TRACE (AcpiTbPutTable); + if (TableDesc->ValidationCount < ACPI_MAX_TABLE_VALIDATIONS) + { + TableDesc->ValidationCount--; + + /* + * Detect ValidationCount underflows to ensure that the warning + * message will only be printed once. + */ + if (TableDesc->ValidationCount >= ACPI_MAX_TABLE_VALIDATIONS) + { + ACPI_WARNING ((AE_INFO, + "Table %p, Validation count underflows\n", TableDesc)); + return_VOID; + } + } + if (TableDesc->ValidationCount == 0) { - ACPI_WARNING ((AE_INFO, - "Table %p, Validation count is zero before decrement\n", - TableDesc)); - return_VOID; - } - TableDesc->ValidationCount--; - - if (TableDesc->ValidationCount == 0) - { /* Table need to be "INVALIDATED" */ AcpiTbInvalidateTable (TableDesc); Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbxface.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -184,6 +184,7 @@ void) { ACPI_STATUS Status; + ACPI_TABLE_DESC *TableDesc; UINT32 i; @@ -198,6 +199,8 @@ { return_ACPI_STATUS (AE_SUPPORT); } + + (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); /* * Ensure OS early boot logic, which is required by some hosts. If the @@ -207,17 +210,41 @@ */ for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) { - if (AcpiGbl_RootTableList.Tables[i].Pointer) + TableDesc = &AcpiGbl_RootTableList.Tables[i]; + if (TableDesc->Pointer) { ACPI_ERROR ((AE_INFO, "Table [%4.4s] is not invalidated during early boot stage", - AcpiGbl_RootTableList.Tables[i].Signature.Ascii)); + TableDesc->Signature.Ascii)); + } + } + + if (!AcpiGbl_EnableTableValidation) + { + /* + * Now it's safe to do full table validation. We can do deferred + * table initilization here once the flag is set. + */ + AcpiGbl_EnableTableValidation = TRUE; + for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) + { + TableDesc = &AcpiGbl_RootTableList.Tables[i]; + if (!(TableDesc->Flags & ACPI_TABLE_IS_VERIFIED)) + { + Status = AcpiTbVerifyTempTable (TableDesc, NULL, NULL); + if (ACPI_FAILURE (Status)) + { + AcpiTbUninstallTable (TableDesc); + } + } } } AcpiGbl_RootTableList.Flags |= ACPI_ROOT_ALLOW_RESIZE; - Status = AcpiTbResizeRootTableList (); + AcpiGbl_RootTableList.Flags |= ACPI_ROOT_ORIGIN_ALLOCATED; + + (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES); return_ACPI_STATUS (Status); } @@ -414,6 +441,11 @@ ACPI_FUNCTION_TRACE (AcpiPutTable); + if (!Table) + { + return_VOID; + } + (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); /* Walk the root table list */ Modified: trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ta… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/tables/tbxfload.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -228,11 +228,11 @@ { Table = &AcpiGbl_RootTableList.Tables[i]; - if (!AcpiGbl_RootTableList.Tables[i].Address || + if (!Table->Address || (!ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_SSDT) && !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_PSDT) && !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_OSDT)) || - ACPI_FAILURE (AcpiTbValidateTable (Table))) + ACPI_FAILURE (AcpiTbValidateTable (Table))) { continue; } Modified: trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/utilities/utresrc.c [iso-8859-1] Wed Jul 26 14:49:35 2017 @@ -195,11 +195,9 @@ ACPI_FUNCTION_TRACE (UtWalkAmlResources); - /* - * The absolute minimum resource template is one EndTag descriptor. - * However, we will treat a lone EndTag as just a simple buffer. - */ - if (AmlLength <= sizeof (AML_RESOURCE_END_TAG)) + /* The absolute minimum resource template is one EndTag descriptor */ + + if (AmlLength < sizeof (AML_RESOURCE_END_TAG)) { return_ACPI_STATUS (AE_AML_NO_RESOURCE_END_TAG); } @@ -270,10 +268,8 @@ *Context = Aml; } - /* - * Normal exit. Note: We allow the buffer to be larger than - * the resource template, as long as the END_TAG exists. - */ + /* Normal exit */ + return_ACPI_STATUS (AE_OK); }

7 years, 5 months

[ashaposhnikov] 75411: [RAPPS] Making checkboxes useful WIP - Added selection counter *NOTE: This requires changes in lang files* - Added Sellect/Desellect button functionality - Fixed some typos a...

by ashaposhnikov＠svn.reactos.org

Author: ashaposhnikov Date: Wed Jul 26 13:30:46 2017 New Revision: 75411 URL: http://svn.reactos.org/svn/reactos?rev=75411&view=rev Log: [RAPPS] Making checkboxes useful WIP - Added selection counter *NOTE: This requires changes in lang files* - Added Sellect/Desellect button functionality - Fixed some typos and macros-to-wide-functions Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1] Wed Jul 26 13:30:46 2017 @@ -11,7 +11,6 @@ #include "rapps.h" // CAvailableApplicationInfo - CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam) : m_Parser(sFileNameParam) { @@ -311,7 +310,7 @@ m_InfoList.RemoveAt(LastListPosition); delete Info; - Info = nullptr; + Info = NULL; break; } else Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Wed Jul 26 13:30:46 2017 @@ -111,8 +111,8 @@ ATL::CStringW szLangInfo; ATL::CStringW szLoadedTextAvailability; ATL::CStringW szLoadedAInfoText; + szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES); - //TODO: replace those hardcoded strings if (Info->HasNativeLanguage()) @@ -199,7 +199,7 @@ DeleteObject(hImage); } - HIMAGELIST InitImageList(VOID) + HIMAGELIST InitImageList() { HIMAGELIST hImageList; @@ -328,13 +328,14 @@ int iSubItem; }; - BOOL HasAllChecked; + BOOL bHasAllChecked; + BOOL bAscending; + public: - BOOL bAscending; - - CAppsListView() - { - bAscending = TRUE; + CAppsListView() : + bAscending(TRUE), + bHasAllChecked(FALSE) + { } VOID ColumnClick(LPNMLISTVIEW pnmv) @@ -349,7 +350,7 @@ PVOID GetLParam(INT Index) { INT ItemIndex; - LVITEM Item; + LVITEMW Item; if (Index == -1) { @@ -379,13 +380,13 @@ BOOL AddColumn(INT Index, LPWSTR lpText, INT Width, INT Format) { - LV_COLUMN Column; + LV_COLUMNW Column; ZeroMemory(&Column, sizeof(Column)); Column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; Column.iSubItem = Index; - Column.pszText = (LPTSTR) lpText; + Column.pszText = lpText; Column.cx = Width; Column.fmt = Format; @@ -449,18 +450,39 @@ if (hwnd) { - SetExtendedListViewStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT ); + SetExtendedListViewStyle(LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT); } return hwnd; } + BOOL GetCheckState(INT item) + { + return (BOOL) GetItemState(item, LVIS_STATEIMAGEMASK); + } + + VOID SetCheckState(INT item, BOOL fCheck) + { + SetItemState(item, INDEXTOSTATEIMAGEMASK((fCheck) ? 2 : 1), LVIS_STATEIMAGEMASK); + } + VOID CheckAll() { - if (HasAllChecked) - { - - } + bHasAllChecked = !bHasAllChecked; + SetCheckState(-1, bHasAllChecked); + } + + ATL::CAtlList<PAPPLICATION_INFO> GetCheckedItems() + { + ATL::CAtlList<PAPPLICATION_INFO> list; + for (INT i = 0; i != -1; i = GetNextItem(i, LVNI_ALL)) + { + if (GetCheckState(i) != FALSE) + { + list.AddTail((PAPPLICATION_INFO) GetItemData(i)); + } + } + return list; } }; @@ -558,23 +580,24 @@ CUiWindow<CRichEdit> * m_RichEdit; CUiWindow<CSearchBar> * m_SearchBar; + CAvailableApps m_AvailableApps; LPWSTR pLink; - BOOL SearchEnabled; - - CAvailableApps m_AvailableApps; - + INT nSelectedApps; + + BOOL bSearchEnabled; + BOOL bUpdating; public: CMainWindow() : m_ClientPanel(NULL), pLink(NULL), - SearchEnabled(FALSE) + bSearchEnabled(FALSE) { } private: - VOID InitApplicationsList(VOID) + VOID InitApplicationsList() { ATL::CStringW szText; @@ -597,7 +620,7 @@ return m_TreeView->AddCategory(hRootItem, TextIndex, IconIndex); } - VOID InitCategoriesList(VOID) + VOID InitCategoriesList() { HTREEITEM hRootItem; @@ -703,7 +726,7 @@ return m_HSplitter->Create(m_hWnd) != NULL; } - BOOL CreateSearchBar(VOID) + BOOL CreateSearchBar() { m_SearchBar = new CUiWindow<CSearchBar>(); m_SearchBar->m_VerticalAlignment = UiAlign_LeftTop; @@ -716,7 +739,8 @@ BOOL CreateLayout() { - bool b = TRUE; + BOOL b = TRUE; + bUpdating = TRUE; m_ClientPanel = new CUiPanel(); m_ClientPanel->m_VerticalAlignment = UiAlign_Stretch; @@ -754,6 +778,7 @@ m_VSplitter->m_Margin.bottom = rBottom.bottom - rBottom.top; } + bUpdating = FALSE; return b; } @@ -761,16 +786,13 @@ { if (CreateLayout()) { - ATL::CStringW szBuffer1, szBuffer2; InitApplicationsList(); - InitCategoriesList(); - szBuffer2.LoadStringW(hInst, IDS_APPS_COUNT); - szBuffer1.Format(szBuffer2, m_ListView->GetItemCount()); - - m_StatusBar->SetText(szBuffer1); + nSelectedApps = 0; + UpdateStatusBarText(); + return TRUE; } @@ -998,6 +1020,13 @@ if (IS_AVAILABLE_ENUM(SelectedEnumType)) CAvailableAppView::ShowAvailableAppInfo(ItemIndex); } + /* Check if the item is checked */ + if ((pnic->uNewState & LVIS_STATEIMAGEMASK) && !bUpdating) + { + BOOL checked = m_ListView->GetCheckState(pnic->iItem); + nSelectedApps += (checked) ? 1 : -1; + UpdateStatusBarText(); + } } } break; @@ -1083,10 +1112,10 @@ if (wParam == SEARCH_TIMER_ID) { ::KillTimer(hwnd, SEARCH_TIMER_ID); - if (SearchEnabled) + if (bSearchEnabled) UpdateApplicationsList(-1); } - break; + break; } return FALSE; @@ -1119,7 +1148,7 @@ } } - BOOL IsSelectedNodeInstalled(void) + BOOL IsSelectedNodeInstalled() { HTREEITEM hSelectedItem = m_TreeView->GetSelection(); TV_ITEM tItem; @@ -1156,7 +1185,7 @@ m_SearchBar->GetWindowTextW(szWndText); if (szBuf == szWndText) { - SearchEnabled = FALSE; + bSearchEnabled = FALSE; m_SearchBar->SetWindowTextW(L""); } } @@ -1168,7 +1197,7 @@ if (szBuf.IsEmpty()) { szBuf.LoadStringW(hInst, IDS_SEARCH_TEXT); - SearchEnabled = FALSE; + bSearchEnabled = FALSE; m_SearchBar->SetWindowTextW(szBuf.GetString()); } } @@ -1178,9 +1207,9 @@ { ATL::CStringW szWndText; - if (!SearchEnabled) + if (!bSearchEnabled) { - SearchEnabled = TRUE; + bSearchEnabled = TRUE; break; } @@ -1265,13 +1294,14 @@ break; case ID_CHECK_ALL: - break; - } - } - - VOID FreeInstalledAppList(VOID) - { - INT Count = ListView_GetItemCount(hListView) - 1; + m_ListView->CheckAll(); + break; + } + } + + VOID FreeInstalledAppList() + { + INT Count = m_ListView->GetItemCount() - 1; PINSTALLED_INFO Info; while (Count >= 0) @@ -1369,32 +1399,44 @@ return TRUE; } + VOID UpdateStatusBarText() + { + if (m_StatusBar) + { + ATL::CStringW szBuffer1, szBuffer2; + + szBuffer2.LoadStringW(hInst, IDS_APPS_COUNT); + szBuffer1.Format(szBuffer2, m_ListView->GetItemCount(), nSelectedApps); + m_StatusBar->SetText(szBuffer1); + } + } VOID UpdateApplicationsList(INT EnumType) { ATL::CStringW szBuffer1, szBuffer2; HIMAGELIST hImageListView; - - m_ListView->SendMessageW(WM_SETREDRAW, FALSE, 0); - + bUpdating = TRUE; + + m_ListView->SetRedraw(FALSE); + + nSelectedApps = 0; if (EnumType < 0) EnumType = SelectedEnumType; if (IS_INSTALLED_ENUM(SelectedEnumType)) FreeInstalledAppList(); - (VOID) ListView_DeleteAllItems(hListView); + m_ListView->DeleteAllItems(); /* Create new ImageList */ hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, LISTVIEW_ICON_SIZE, GetSystemColorDepth() | ILC_MASK, 0, 1); - HIMAGELIST hImageListBuf = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL); + HIMAGELIST hImageListBuf = m_ListView->SetImageList(hImageListView, LVSIL_SMALL); if (hImageListBuf) { ImageList_Destroy(hImageListBuf); } - if (IS_AVAILABLE_ENUM(EnumType)) { @@ -1404,17 +1446,16 @@ SelectedEnumType = EnumType; - szBuffer2.LoadStringW(hInst, IDS_APPS_COUNT); - szBuffer1.Format(szBuffer2, ListView_GetItemCount(hListView)); - SetStatusBarText(szBuffer1); + UpdateStatusBarText(); SetWelcomeText(); /* set automatic column width for program names if the list is not empty */ - if (ListView_GetItemCount(hListView) > 0) - ListView_SetColumnWidth(hListView, 0, LVSCW_AUTOSIZE); - - SendMessageW(hListView, WM_SETREDRAW, TRUE, 0); + if (m_ListView->GetItemCount() > 0) + ListView_SetColumnWidth(m_ListView->GetWindow(), 0, LVSCW_AUTOSIZE); + + bUpdating = FALSE; + m_ListView->SetRedraw(TRUE); } public: Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1] Wed Jul 26 13:30:46 2017 @@ -101,7 +101,7 @@ WCHAR szAppName[MAX_STR_LEN]; DWORD dwType, dwSize; INT ItemIndex; - LVITEM Item; + LVITEMW Item; HKEY hKey; PINSTALLED_INFO ItemInfo; Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Wed Jul 26 13:30:46 2017 @@ -110,6 +110,16 @@ ICON IDI_MAIN, IDC_STATIC, 10, 10, 7, 30 END +IDD_DOWNLOAD_DIALOG_MULTI DIALOGEX 0, 0, 220, 72 +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +CAPTION "Downloading (multiple)..." +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Progress1", IDC_DOWNLOAD_PROGRESS, "msctls_progress32", WS_BORDER | PBS_SMOOTH, 10, 10, 200, 12 + EDITTEXT IDC_DOWNLOAD_STATUS, 10, 28, 200, 22, ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_DISABLED | NOT WS_BORDER + PUSHBUTTON "Cancel", IDCANCEL, 85, 53, 50, 15, WS_GROUP | WS_TABSTOP +END + STRINGTABLE BEGIN IDS_TOOLTIP_INSTALL "Install" @@ -187,7 +197,7 @@ IDS_INSTALL "Install" IDS_UNINSTALL "Uninstall" IDS_MODIFY "Modify" - IDS_APPS_COUNT "Applications count: %d" + IDS_APPS_COUNT "Applications count: %d; Selected: %d" IDS_WELCOME_TITLE "Welcome to ReactOS Applications Manager!\n\n" IDS_WELCOME_TEXT "Choose a category on the left, then choose an application to install or uninstall.\nReactOS Web Site: " IDS_WELCOME_URL "http://www.reactos.org" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Wed Jul 26 13:30:46 2017 @@ -91,7 +91,7 @@ END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE CAPTION "ÐÐ°Ð³ÑÑÐ·ÐºÐ°..." FONT 8, "MS Shell Dlg" BEGIN @@ -186,7 +186,7 @@ IDS_INSTALL "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ" IDS_UNINSTALL "Ð£Ð´Ð°Ð»Ð¸ÑÑ" IDS_MODIFY "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ" - IDS_APPS_COUNT "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾: %d" + IDS_APPS_COUNT "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹: %d; ÐÑÐ±ÑÐ°Ð½Ð¾: %d" IDS_WELCOME_TITLE "ÐÐ¾Ð±ÑÐ¾ Ð¿Ð¾Ð¶Ð°Ð»Ð¾Ð²Ð°ÑÑ Ð² ""ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ ReactOS""!\n\n" IDS_WELCOME_TEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ñ ÑÐ»ÐµÐ²Ð° Ð¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¸Ð»Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ.\nÐ¡Ð°Ð¹Ñ ReactOS: " IDS_WELCOME_URL "http://www.reactos.org" Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap… ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Wed Jul 26 13:30:46 2017 @@ -99,7 +99,7 @@ END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 72 -STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_SYSMENU | WS_VISIBLE CAPTION "ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ..." FONT 8, "MS Shell Dlg" BEGIN @@ -194,7 +194,7 @@ IDS_INSTALL "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸" IDS_UNINSTALL "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸" IDS_MODIFY "ÐÐ¼ÑÐ½Ð¸ÑÐ¸" - IDS_APPS_COUNT "KÑÐ»ÑÐºÑÑÑÑ Ð´Ð¾Ð´Ð°ÑÐºÑÐ²: %d" + IDS_APPS_COUNT "KÑÐ»ÑÐºÑÑÑÑ Ð´Ð¾Ð´Ð°ÑÐºÑÐ²: %d; ÐÐ±ÑÐ°Ð½Ð¾: %d" IDS_WELCOME_TITLE "ÐÐ°ÑÐºÐ°Ð²Ð¾ Ð¿ÑÐ¾ÑÐ¸Ð¼Ð¾ Ð² ÐÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð´Ð¾Ð´Ð°ÑÐºÑÐ² ReactOS!\n\n" IDS_WELCOME_TEXT "ÐÐ¸Ð±ÐµÑÑÑÑ ÐºÐ°ÑÐµÐ³Ð¾ÑÑÑ Ð·Ð»ÑÐ²Ð°, Ð° Ð¿Ð¾ÑÑÐ¼ Ð²Ð¸Ð±ÐµÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ Ð´Ð»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÐ¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ.\nÐ¡ÑÐ¾ÑÑÐ½ÐºÐ° ReactOS: " IDS_WELCOME_URL "http://www.reactos.org"

7 years, 5 months

[pschweitzer] 75410: [COPYSUP] Remove leftovers from some attempted ugly things. Should fix MSVC build

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jul 26 09:55:30 2017 New Revision: 75410 URL: http://svn.reactos.org/svn/reactos?rev=75410&view=rev Log: [COPYSUP] Remove leftovers from some attempted ugly things. Should fix MSVC build Modified: trunk/reactos/sdk/lib/drivers/copysup/copysup.c Modified: trunk/reactos/sdk/lib/drivers/copysup/copysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/copysup/co… ============================================================================== --- trunk/reactos/sdk/lib/drivers/copysup/copysup.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/copysup/copysup.c [iso-8859-1] Wed Jul 26 09:55:30 2017 @@ -548,8 +548,7 @@ { WriteOffset.LowPart = Fcb->FileSize.LowPart; LastOffset.LowPart = WriteOffset.LowPart + Length; - AboveFour = (((LARGE_INTEGER)LastOffset).LowPart < - Fcb->FileSize.LowPart); + AboveFour = (LastOffset.LowPart < Fcb->FileSize.LowPart); } /* Make sure caching is still enabled */ @@ -580,7 +579,6 @@ { PFAST_IO_DISPATCH FastIoDispatch; PDEVICE_OBJECT RelatedDeviceObject; - C_ASSERT(sizeof(LARGE_INTEGER) == sizeof(LONGLONG)); RelatedDeviceObject = IoGetRelatedDeviceObject(FileObject); FastIoDispatch = RelatedDeviceObject->DriverObject->FastIoDispatch;

7 years, 5 months

[pschweitzer] 75409: [RDBSS] - Implement RxFastIoWrite() - Finish implementation of RxFastIoCheckIfPossible() [COPYSUP] - Implement FsRtlCopyWrite2() This brings (in link with r75398 fast IO writes...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Jul 26 09:28:41 2017 New Revision: 75409 URL: http://svn.reactos.org/svn/reactos?rev=75409&view=rev Log: [RDBSS] - Implement RxFastIoWrite() - Finish implementation of RxFastIoCheckIfPossible() [COPYSUP] - Implement FsRtlCopyWrite2() This brings (in link with r75398 fast IO writes to RDBSS, and thus NFS! CORE-8204 CORE-11327 Modified: trunk/reactos/sdk/include/ddk/mrxfcb.h trunk/reactos/sdk/lib/drivers/copysup/copysup.c trunk/reactos/sdk/lib/drivers/copysup/copysup.h trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c Modified: trunk/reactos/sdk/include/ddk/mrxfcb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/ddk/mrxfcb.h?r… ============================================================================== --- trunk/reactos/sdk/include/ddk/mrxfcb.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/ddk/mrxfcb.h [iso-8859-1] Wed Jul 26 09:28:41 2017 @@ -179,6 +179,7 @@ } MRX_SRV_OPEN, *PMRX_SRV_OPEN; #define FOBX_FLAG_DFS_OPEN 0x0001 +#define FOBX_FLAG_BAD_HANDLE 0x0002 #define FOBX_FLAG_BACKUP_INTENT 0x0004 typedef struct _MRX_PIPE_HANDLE_INFORMATION Modified: trunk/reactos/sdk/lib/drivers/copysup/copysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/copysup/co… ============================================================================== --- trunk/reactos/sdk/lib/drivers/copysup/copysup.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/copysup/copysup.c [iso-8859-1] Wed Jul 26 09:28:41 2017 @@ -28,6 +28,8 @@ #include "copysup.h" #include <pseh/pseh2.h> +#define NDEBUG +#include <debug.h> /* FUNCTIONS ****************************************************************/ @@ -180,3 +182,513 @@ return Ret; } + +/* + * @implemented + */ +BOOLEAN +FsRtlCopyWrite2( + 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, + IN PVOID TopLevelContext) +{ + IO_STATUS_BLOCK LocalIoStatus; + PFSRTL_ADVANCED_FCB_HEADER Fcb; + BOOLEAN WriteToEof, AcquiredShared, FileSizeChanged, Ret; + LARGE_INTEGER WriteOffset, LastOffset, InitialFileSize, InitialValidDataLength; + + PAGED_CODE(); + + /* First, check whether we're writing to EOF */ + WriteToEof = ((FileOffset->LowPart == FILE_WRITE_TO_END_OF_FILE) && + (FileOffset->HighPart == -1)); + + /* If Cc says we cannot write, fail now */ + if (!CcCanIWrite(FileObject, Length, Wait, FALSE)) + { + return FALSE; + } + + /* Write through means no cache */ + if (BooleanFlagOn(FileObject->Flags, FO_WRITE_THROUGH)) + { + return FALSE; + } + + /* If write is > 64Kb, don't use FastIO */ + if (!CcCopyWriteWontFlush(FileObject, FileOffset, Length)) + { + return FALSE; + } + + /* Initialize the IO_STATUS_BLOCK */ + IoStatus->Status = STATUS_SUCCESS; + IoStatus->Information = Length; + + /* No length, it's already written! */ + if (Length == 0) + { + return TRUE; + } + + AcquiredShared = FALSE; + FileSizeChanged = FALSE; + Fcb = FileObject->FsContext; + + FsRtlEnterFileSystem(); + + /* If we cannot wait, or deal with files bigger then 4GB */ + if (!Wait || (Fcb->AllocationSize.HighPart != 0)) + { + /* If we're to extend the file, then, acquire exclusively */ + if (WriteToEof || FileOffset->QuadPart + Length > Fcb->ValidDataLength.QuadPart) + { + if (!ExAcquireResourceExclusiveLite(Fcb->Resource, Wait)) + { + FsRtlExitFileSystem(); + return FALSE; + } + } + /* Otherwise, a shared lock is enough */ + else + { + if (!ExAcquireResourceSharedLite(Fcb->Resource, Wait)) + { + FsRtlExitFileSystem(); + return FALSE; + } + + AcquiredShared = TRUE; + } + + /* Get first write offset, and last */ + if (WriteToEof) + { + WriteOffset.QuadPart = Fcb->FileSize.QuadPart; + LastOffset.QuadPart = WriteOffset.QuadPart + Length; + } + else + { + WriteOffset.QuadPart = FileOffset->QuadPart; + LastOffset.QuadPart = WriteOffset.QuadPart + Length; + } + + /* If cache wasn't initialized, fail */ + if (FileObject->PrivateCacheMap == NULL || + Fcb->IsFastIoPossible == FastIoIsNotPossible) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + + /* If we're to write beyond allocation size, it's no go, + * same is we create a hole bigger than 8kb + */ + if ((Fcb->ValidDataLength.QuadPart + 0x2000 <= WriteOffset.QuadPart) || + (Length > MAXLONGLONG - WriteOffset.QuadPart) || + (Fcb->AllocationSize.QuadPart < LastOffset.QuadPart)) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + + /* If we have to extend the VDL, shared lock isn't enough */ + if (AcquiredShared && LastOffset.QuadPart > Fcb->ValidDataLength.QuadPart) + { + /* So release, and attempt to acquire exclusively */ + ExReleaseResourceLite(Fcb->Resource); + if (!ExAcquireResourceExclusiveLite(Fcb->Resource, Wait)) + { + FsRtlExitFileSystem(); + return FALSE; + } + + /* Get again EOF, in case file size changed in between */ + if (WriteToEof) + { + WriteOffset.QuadPart = Fcb->FileSize.QuadPart; + LastOffset.QuadPart = WriteOffset.QuadPart + Length; + } + + /* Make sure caching is still enabled */ + if (FileObject->PrivateCacheMap == NULL || + Fcb->IsFastIoPossible == FastIoIsNotPossible) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + + /* And that we're not writting beyond allocation size */ + if (Fcb->AllocationSize.QuadPart < LastOffset.QuadPart) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + } + + /* If FastIO is questionable, then question */ + if (Fcb->IsFastIoPossible == FastIoIsQuestionable) + { + PFAST_IO_DISPATCH FastIoDispatch; + PDEVICE_OBJECT RelatedDeviceObject; + + RelatedDeviceObject = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = RelatedDeviceObject->DriverObject->FastIoDispatch; + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + &WriteOffset, + Length, Wait, LockKey, + FALSE, &LocalIoStatus, + RelatedDeviceObject)) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + } + + /* If we write beyond EOF, then, save previous sizes (in case of failure) + * and update file size, to allow writing + */ + if (LastOffset.QuadPart > Fcb->FileSize.QuadPart) + { + FileSizeChanged = TRUE; + InitialFileSize.QuadPart = Fcb->FileSize.QuadPart; + InitialValidDataLength.QuadPart = Fcb->ValidDataLength.QuadPart; + + if (LastOffset.HighPart != Fcb->FileSize.HighPart && + Fcb->PagingIoResource != NULL) + { + ExAcquireResourceExclusiveLite(Fcb->PagingIoResource, TRUE); + Fcb->FileSize.QuadPart = LastOffset.QuadPart; + ExReleaseResourceLite(Fcb->PagingIoResource); + } + else + { + Fcb->FileSize.QuadPart = LastOffset.QuadPart; + } + } + + /* Set caller provided context as top level IRP */ + IoSetTopLevelIrp(TopLevelContext); + + Ret = TRUE; + + /* And perform the writing */ + _SEH2_TRY + { + /* Check whether we've to create a hole first */ + if (LastOffset.QuadPart > Fcb->ValidDataLength.QuadPart) + { + Ret = CcZeroData(FileObject, &Fcb->ValidDataLength, + &WriteOffset, Wait); + } + + /* If not needed, or if it worked, write data */ + if (Ret) + { + Ret = CcCopyWrite(FileObject, &WriteOffset, + Length, Wait, Buffer); + } + } + _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? + EXCEPTION_EXECUTE_HANDLER : + EXCEPTION_CONTINUE_SEARCH) + { + Ret = FALSE; + } + _SEH2_END; + + /* Restore top level IRP */ + IoSetTopLevelIrp(NULL); + + /* If writing succeed */ + if (Ret) + { + /* If we wrote beyond VDL, update it */ + if (LastOffset.QuadPart > Fcb->ValidDataLength.QuadPart) + { + if (LastOffset.HighPart != Fcb->ValidDataLength.HighPart && + Fcb->PagingIoResource != NULL) + { + ExAcquireResourceExclusiveLite(Fcb->PagingIoResource, TRUE); + Fcb->ValidDataLength.QuadPart = LastOffset.QuadPart; + ExReleaseResourceLite(Fcb->PagingIoResource); + } + else + { + Fcb->ValidDataLength.QuadPart = LastOffset.QuadPart; + } + } + + /* File was obviously modified */ + SetFlag(FileObject->Flags, FO_FILE_MODIFIED); + + /* And if we increased it, modify size in Cc and update FO */ + if (FileSizeChanged) + { + (*CcGetFileSizePointer(FileObject)).QuadPart = LastOffset.QuadPart; + SetFlag(FileObject->Flags, FO_FILE_SIZE_CHANGED); + } + + /* Update offset */ + FileObject->CurrentByteOffset.QuadPart = WriteOffset.QuadPart + Length; + } + else + { + /* We failed, we need to restore previous sizes */ + if (FileSizeChanged) + { + if (Fcb->PagingIoResource != NULL) + { + ExAcquireResourceExclusiveLite(Fcb->PagingIoResource, TRUE); + Fcb->FileSize.QuadPart = InitialFileSize.QuadPart; + Fcb->ValidDataLength.QuadPart = InitialValidDataLength.QuadPart; + ExReleaseResourceLite(Fcb->PagingIoResource); + } + else + { + Fcb->FileSize.QuadPart = InitialFileSize.QuadPart; + Fcb->ValidDataLength.QuadPart = InitialValidDataLength.QuadPart; + } + } + } + } + else + { + BOOLEAN AboveFour; + + WriteOffset.HighPart = 0; + LastOffset.HighPart = 0; + + /* If we're to extend the file, then, acquire exclusively + * Here, easy stuff, we know we can wait, no return to check! + */ + if (WriteToEof || FileOffset->QuadPart + Length > Fcb->ValidDataLength.QuadPart) + { + ExAcquireResourceExclusiveLite(Fcb->Resource, TRUE); + } + /* Otherwise, a shared lock is enough */ + else + { + ExAcquireResourceSharedLite(Fcb->Resource, TRUE); + AcquiredShared = TRUE; + } + + /* Get first write offset, and last + * Also check whether our writing will bring us + * beyond the 4GB + */ + if (WriteToEof) + { + WriteOffset.LowPart = Fcb->FileSize.LowPart; + LastOffset.LowPart = WriteOffset.LowPart + Length; + AboveFour = (LastOffset.LowPart < Fcb->FileSize.LowPart); + } + else + { + WriteOffset.LowPart = FileOffset->LowPart; + LastOffset.LowPart = WriteOffset.LowPart + Length; + AboveFour = (LastOffset.LowPart < FileOffset->LowPart) || + (FileOffset->HighPart != 0); + } + + /* If cache wasn't initialized, fail */ + if (FileObject->PrivateCacheMap == NULL || + Fcb->IsFastIoPossible == FastIoIsNotPossible) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + + /* If we're to write beyond allocation size, it's no go, + * same is we create a hole bigger than 8kb + * same if we end writing beyond 4GB + */ + if ((Fcb->AllocationSize.LowPart < LastOffset.LowPart) || + (WriteOffset.LowPart >= Fcb->ValidDataLength.LowPart + 0x2000) || + AboveFour) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + + /* If we have to extend the VDL, shared lock isn't enough */ + if (AcquiredShared && LastOffset.LowPart > Fcb->ValidDataLength.LowPart) + { + /* So release, and acquire exclusively */ + ExReleaseResourceLite(Fcb->Resource); + ExAcquireResourceExclusiveLite(Fcb->Resource, TRUE); + + /* Get again EOF, in case file size changed in between and + * recheck we won't go beyond 4GB + */ + if (WriteToEof) + { + WriteOffset.LowPart = Fcb->FileSize.LowPart; + LastOffset.LowPart = WriteOffset.LowPart + Length; + AboveFour = (((LARGE_INTEGER)LastOffset).LowPart < + Fcb->FileSize.LowPart); + } + + /* Make sure caching is still enabled */ + if (FileObject->PrivateCacheMap == NULL || + Fcb->IsFastIoPossible == FastIoIsNotPossible) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + + /* And that we're not writting beyond allocation size + * and that we're not going above 4GB + */ + if ((Fcb->AllocationSize.LowPart < LastOffset.LowPart) || + (Fcb->AllocationSize.HighPart != 0) || AboveFour) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + } + + /* If FastIO is questionable, then question */ + if (Fcb->IsFastIoPossible == FastIoIsQuestionable) + { + PFAST_IO_DISPATCH FastIoDispatch; + PDEVICE_OBJECT RelatedDeviceObject; + C_ASSERT(sizeof(LARGE_INTEGER) == sizeof(LONGLONG)); + + RelatedDeviceObject = IoGetRelatedDeviceObject(FileObject); + FastIoDispatch = RelatedDeviceObject->DriverObject->FastIoDispatch; + ASSERT(FastIoDispatch != NULL); + ASSERT(FastIoDispatch->FastIoCheckIfPossible != NULL); + + if (!FastIoDispatch->FastIoCheckIfPossible(FileObject, + &WriteOffset, + Length, Wait, LockKey, + FALSE, &LocalIoStatus, + RelatedDeviceObject)) + { + ExReleaseResourceLite(Fcb->Resource); + FsRtlExitFileSystem(); + + return FALSE; + } + } + + /* If we write beyond EOF, then, save previous sizes (in case of failure) + * and update file size, to allow writing + */ + if (LastOffset.LowPart > Fcb->FileSize.LowPart) + { + FileSizeChanged = TRUE; + InitialFileSize.LowPart = Fcb->FileSize.LowPart; + InitialValidDataLength.LowPart = Fcb->ValidDataLength.LowPart; + Fcb->FileSize.LowPart = LastOffset.LowPart; + } + + /* Set caller provided context as top level IRP */ + IoSetTopLevelIrp(TopLevelContext); + + Ret = TRUE; + + /* And perform the writing */ + _SEH2_TRY + { + /* Check whether we've to create a hole first - + * it cannot fail, we can wait + */ + if (LastOffset.LowPart > Fcb->ValidDataLength.LowPart) + { + CcZeroData(FileObject, &Fcb->ValidDataLength, &WriteOffset, TRUE); + } + + /* Write data */ + CcFastCopyWrite(FileObject, WriteOffset.LowPart, Length, Buffer); + } + _SEH2_EXCEPT(FsRtlIsNtstatusExpected(_SEH2_GetExceptionCode()) ? + EXCEPTION_EXECUTE_HANDLER : + EXCEPTION_CONTINUE_SEARCH) + { + Ret = FALSE; + } + _SEH2_END; + + /* Restore top level IRP */ + IoSetTopLevelIrp(NULL); + + /* If writing succeed */ + if (Ret) + { + /* If we wrote beyond VDL, update it */ + if (LastOffset.LowPart > Fcb->ValidDataLength.LowPart) + { + Fcb->ValidDataLength.LowPart = LastOffset.LowPart; + } + + /* File was obviously modified */ + SetFlag(FileObject->Flags, FO_FILE_MODIFIED); + + /* And if we increased it, modify size in Cc and update FO */ + if (FileSizeChanged) + { + (*CcGetFileSizePointer(FileObject)).LowPart = LastOffset.LowPart; + SetFlag(FileObject->Flags, FO_FILE_SIZE_CHANGED); + } + + /* Update offset - we're still below 4GB, so high part must be 0 */ + FileObject->CurrentByteOffset.LowPart = WriteOffset.LowPart + Length; + FileObject->CurrentByteOffset.HighPart = 0; + } + else + { + /* We failed, we need to restore previous sizes */ + if (FileSizeChanged) + { + if (Fcb->PagingIoResource != NULL) + { + ExAcquireResourceExclusiveLite(Fcb->PagingIoResource, TRUE); + Fcb->FileSize.LowPart = InitialFileSize.LowPart; + Fcb->ValidDataLength.LowPart = InitialValidDataLength.LowPart; + ExReleaseResourceLite(Fcb->PagingIoResource); + } + else + { + Fcb->FileSize.LowPart = InitialFileSize.LowPart; + Fcb->ValidDataLength.LowPart = InitialValidDataLength.LowPart; + } + } + } + } + + /* Release our resource and leave */ + ExReleaseResourceLite(Fcb->Resource); + + FsRtlExitFileSystem(); + + return Ret; +} Modified: trunk/reactos/sdk/lib/drivers/copysup/copysup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/copysup/co… ============================================================================== --- trunk/reactos/sdk/lib/drivers/copysup/copysup.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/copysup/copysup.h [iso-8859-1] Wed Jul 26 09:28:41 2017 @@ -15,4 +15,16 @@ _In_ PDEVICE_OBJECT DeviceObject, _In_ PVOID TopLevelContext); +BOOLEAN +FsRtlCopyWrite2( + _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, + _In_ PVOID TopLevelContext); + #endif Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/r… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/rdbss.c [iso-8859-1] Wed Jul 26 09:28:41 2017 @@ -5364,6 +5364,9 @@ PAGED_CODE(); } +/* + * @implemented + */ BOOLEAN NTAPI RxFastIoCheckIfPossible( @@ -5376,6 +5379,7 @@ { PFCB Fcb; PSRV_OPEN SrvOpen; + LARGE_INTEGER LargeLength; PAGED_CODE(); @@ -5436,11 +5440,11 @@ RxProcessChangeBufferingStateRequestsForSrvOpen(SrvOpen); FsRtlExitFileSystem(); + LargeLength.QuadPart = Length; + /* If operation to come is a read operation */ if (CheckForReadOperation) { - LARGE_INTEGER LargeLength; - /* Check that read cache is enabled */ if (!BooleanFlagOn(Fcb->FcbState, FCB_STATE_READCACHING_ENABLED)) { @@ -5449,7 +5453,6 @@ } /* Check whether there's a lock conflict */ - LargeLength.QuadPart = Length; if (!FsRtlFastCheckLockForRead(&Fcb->Specific.Fcb.FileLock, FileOffset, &LargeLength, @@ -5464,8 +5467,26 @@ return TRUE; } - UNIMPLEMENTED; - return FALSE; + /* Check that write cache is enabled */ + if (!BooleanFlagOn(Fcb->FcbState, FCB_STATE_WRITECACHING_ENABLED)) + { + DPRINT1("Write caching disabled\n"); + return FALSE; + } + + /* Check whether there's a lock conflict */ + if (!FsRtlFastCheckLockForWrite(&Fcb->Specific.Fcb.FileLock, + FileOffset, + &LargeLength, + LockKey, + FileObject, + PsGetCurrentProcess())) + { + DPRINT1("FsRtlFastCheckLockForWrite failed\n"); + return FALSE; + } + + return TRUE; } BOOLEAN @@ -5536,6 +5557,9 @@ return Ret; } +/* + * @implemented + */ BOOLEAN NTAPI RxFastIoWrite( @@ -5548,8 +5572,39 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED; - return FALSE; + PFOBX Fobx; + BOOLEAN Ret; + RX_TOPLEVELIRP_CONTEXT TopLevelContext; + + PAGED_CODE(); + + Fobx = (PFOBX)FileObject->FsContext2; + if (BooleanFlagOn(Fobx->Flags, FOBX_FLAG_BAD_HANDLE)) + { + return FALSE; + } + + DPRINT("RxFastIoWrite: %p (%p, %p)\n", FileObject, FileObject->FsContext, + FileObject->FsContext2); + DPRINT("Writing %ld at %I64x\n", Length, FileOffset->QuadPart); + + /* Prepare a TLI context */ + ASSERT(RxIsThisTheTopLevelIrp(NULL)); + RxInitializeTopLevelIrpContext(&TopLevelContext, (PIRP)FSRTL_FAST_IO_TOP_LEVEL_IRP, + (PRDBSS_DEVICE_OBJECT)DeviceObject); + + Ret = FsRtlCopyWrite2(FileObject, FileOffset, Length, Wait, LockKey, Buffer, + IoStatus, DeviceObject, &TopLevelContext); + if (Ret) + { + DPRINT("Write OK\n"); + } + else + { + DPRINT1("Write failed!\n"); + } + + return Ret; } NTSTATUS

7 years, 5 months

[rgampa] 75408: [USBXHCI] - Changed the ring structure to a segment model. - some unnecessary parts of the code removed. - added a function to write 64bit reg. CORE-13344

by rgampa＠svn.reactos.org

Author: rgampa Date: Wed Jul 26 03:53:57 2017 New Revision: 75408 URL: http://svn.reactos.org/svn/reactos?rev=75408&view=rev Log: [USBXHCI] - Changed the ring structure to a segment model. - some unnecessary parts of the code removed. - added a function to write 64bit reg. CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Wed Jul 26 03:53:57 2017 @@ -52,13 +52,11 @@ IN USHORT Port, IN PULONG PortStatus) { - int cntr = 0; - DPRINT1("XHCI_RH_GetPortStatus: function initiated\n" + cntr); - cntr = cntr + 1; + DPRINT1("XHCI_RH_GetPortStatus: function initiated\n"); PXHCI_EXTENSION XhciExtension; PULONG PortStatusReg; XHCI_PORT_STATUS_CONTROL PortStatusRegister; - + //USB_30_PORT_STATUS x; XhciExtension = (PXHCI_EXTENSION)xhciExtension; PortStatusReg = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusReg) ; @@ -216,7 +214,7 @@ XHCI_RH_DisableIrq(IN PVOID xhciExtension) { DPRINT1("XHCI_RH_DisableIrq: function initiated\n"); - /*PXHCI_EXTENSION XhciExtension; + PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; XHCI_USB_COMMAND usbCommand; @@ -227,7 +225,7 @@ usbCommand.InterrupterEnable = 0; WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD,usbCommand.AsULONG ); - DPRINT1("XHCI_RH_DisableIrq: Disable Interupts succesfull\n");*/ + DPRINT1("XHCI_RH_DisableIrq: Disable Interupts succesfull\n"); } VOID Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Wed Jul 26 03:53:57 2017 @@ -7,6 +7,15 @@ USBPORT_REGISTRATION_PACKET RegPacket; +VOID +NTAPI +XHCI_Write64bitReg(IN PULONG baseAddr, + IN ULONGLONG data) +{ + DPRINT1("XHCI_Write64bitReg: function initiated\n"); + WRITE_REGISTER_ULONG(baseAddr, data); + WRITE_REGISTER_ULONG(baseAddr+1, data >> 32); +} MPSTATUS NTAPI @@ -79,7 +88,7 @@ trb.CommandTRB.NoOperation.TRBType = 8; trb.CommandTRB.NoOperation.RsvdZ5 = 0; - HcResourcesVA -> CommandRing.XhciTrb[0] = trb; + HcResourcesVA -> CommandRing.firstSeg.XhciTrb[0] = trb; // ring the commmand ring door bell register DoorBellRegisterBase = XhciExtension->DoorBellRegisterBase; Doorbell_0.DoorBellTarget = 0; @@ -98,7 +107,7 @@ } } // check for event completion trb - eventtrb = HcResourcesVA -> EventRing.XhciTrb[0]; + eventtrb = HcResourcesVA -> EventRing.firstSeg.XhciTrb[0]; DPRINT("XHCI_ControllerWorkTest: eventtrb word0 - %p\n", eventtrb.EventTRB.Word0); DPRINT("XHCI_ControllerWorkTest: eventtrb word1 - %p\n", eventtrb.EventTRB.Word1); DPRINT("XHCI_ControllerWorkTest: eventtrb word2 - %p\n", eventtrb.EventTRB.Word2); @@ -114,14 +123,14 @@ DPRINT("XHCI_ControllerWorkTest: Status - %p\n", Status.AsULONG); // command ring check HcResourcesPA.QuadPart = (ULONG_PTR)resourcesStartPA; - CommandRingAddr = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.XhciTrb[0]); + CommandRingAddr = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.firstSeg.XhciTrb[0]); DPRINT("XHCI_ControllerWorkTest: CommandRingAddr - %x\n", CommandRingAddr); CommandRingControlRegister.AsULONGLONG = READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR+1) | READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR ); DPRINT("XHCI_ControllerWorkTest: CommandRingControlRegister - %x\n", CommandRingControlRegister.AsULONGLONG); DPRINT("XHCI_ControllerWorkTest: CommandRingControlRegister1 - %p\n", READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR )); DPRINT("XHCI_ControllerWorkTest: CommandRingControlRegister2 - %p\n", READ_REGISTER_ULONG(XhciExtension->OperationalRegs + XHCI_CRCR + 1 )); // event ring dprints - EventRingAddr = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing.XhciTrb[0]); + EventRingAddr = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing.firstSeg.XhciTrb[0]); DPRINT("XHCI_ControllerWorkTest: EventRingSegTable.RingSegmentBaseAddr - %x\n", HcResourcesVA -> EventRingSegTable.RingSegmentBaseAddr); DPRINT("XHCI_ControllerWorkTest: EventRingSegTable.RingSegmentSize - %i\n", HcResourcesVA -> EventRingSegTable.RingSegmentSize); DPRINT("XHCI_ControllerWorkTest: event ring addr - %x\n", EventRingAddr); @@ -167,7 +176,6 @@ XHCI_COMMAND_RING_CONTROL CommandRingControlRegister, CommandRingControlRegister_temp; XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY_POINTER DCBAAPointer; - unsigned long X, Y; DPRINT_XHCI("XHCI_InitializeResources: BaseVA - %p, BasePA - %p\n", resourcesStartVA, @@ -177,60 +185,27 @@ HcResourcesPA.QuadPart = (ULONG_PTR)resourcesStartPA; BaseIoAdress = XhciExtension->BaseIoAdress; OperationalRegs = XhciExtension->OperationalRegs; + //DCBAA init DCBAAPointer.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, DCBAA); - - - - WRITE_REGISTER_ULONG(OperationalRegs + XHCI_DCBAAP, DCBAAPointer.DCBAAPointerLo | DCBAAPointer.RsvdZ ); - WRITE_REGISTER_ULONG(OperationalRegs + XHCI_DCBAAP + 1, DCBAAPointer.DCBAAPointerHi); - - X = READ_REGISTER_ULONG(OperationalRegs + XHCI_DCBAAP) ; - Y = READ_REGISTER_ULONG(OperationalRegs + XHCI_DCBAAP + 1) ; - DCBAAPointer.AsULONGLONG = Y|X ; - ASSERT(DCBAAPointer.RsvdZ == 0); - + DPRINT1("XHCI_InitializeResources : DCBAAPointer %p\n",DCBAAPointer.AsULONGLONG ); + + XHCI_Write64bitReg (OperationalRegs + XHCI_DCBAAP,DCBAAPointer.AsULONGLONG); + // command ring intialisation. - /* - HcResourcesVA->CommandRing.Segment[0].Link[0].AsULONG = 0; - HcResourcesVA->CommandRing.Segment[0].Link[1].AsULONG = 0; - HcResourcesVA->CommandRing.Segment[0].Link[2].AsULONG = 0; - HcResourcesVA->CommandRing.Segment[0].Link[3].AsULONG = 0; - - HcResourcesVA->CommandRing.CREnquePointer= &HcResourcesVA->CommandRing.Segment[0]; - HcResourcesVA->CommandRing.CRDequePointer= HcResourcesVA->CommandRing.CREnquePointer; - - CommandRingControlRegister.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.Segment); - ASSERT(CommandRingControlRegister.RingCycleState == 0); - ASSERT(CommandRingControlRegister.CommandStop == 0); - ASSERT(CommandRingControlRegister.CommandAbort == 0); - ASSERT(CommandRingControlRegister.CommandRingRunning == 0); - ASSERT(CommandRingControlRegister.RsvdP == 0); - - WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR, CommandRingControlRegister.AsULONGLONG); - WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR + 1, CommandRingControlRegister.CommandRingPointerHi); - */ - // end of command ring init - // command ring intialisation. - for(int i=0; i<16; i++){ - HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word0=0; - HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word1=0; - HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word2=0; - HcResourcesVA->CommandRing.XhciTrb[i].CommandTRB.GenericTRB.Word3=0; - } - CommandRingControlRegister.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.XhciTrb[0]); - ASSERT(CommandRingControlRegister.RingCycleState == 0); - ASSERT(CommandRingControlRegister.CommandStop == 0); - ASSERT(CommandRingControlRegister.CommandAbort == 0); - ASSERT(CommandRingControlRegister.CommandRingRunning == 0); - //ASSERT(CommandRingControlRegister.RsvdP == 0); + for(int i=0; i<256; i++){ + HcResourcesVA->CommandRing.firstSeg.XhciTrb[i].CommandTRB.GenericTRB.Word0=0; + HcResourcesVA->CommandRing.firstSeg.XhciTrb[i].CommandTRB.GenericTRB.Word1=0; + HcResourcesVA->CommandRing.firstSeg.XhciTrb[i].CommandTRB.GenericTRB.Word2=0; + HcResourcesVA->CommandRing.firstSeg.XhciTrb[i].CommandTRB.GenericTRB.Word3=0; + } + CommandRingControlRegister.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, CommandRing.firstSeg); CommandRingControlRegister_temp.AsULONGLONG = READ_REGISTER_ULONG(OperationalRegs + XHCI_CRCR + 1) | READ_REGISTER_ULONG(OperationalRegs + XHCI_CRCR); - CommandRingControlRegister.RsvdP = CommandRingControlRegister_temp.RsvdP; DPRINT1("XHCI_InitializeResources : CommandRingControlRegister %p\n",CommandRingControlRegister.AsULONGLONG ); - WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR, CommandRingControlRegister.AsULONGLONG); - WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CRCR + 1, CommandRingControlRegister.AsULONGLONG >> 32); + XHCI_Write64bitReg (OperationalRegs + XHCI_CRCR, CommandRingControlRegister.AsULONGLONG); // end of command ring init + //Primary Interrupter init RunTimeRegisterBase = XhciExtension -> RunTimeRegisterBase; @@ -240,30 +215,28 @@ DPRINT1("XHCI_InitializeResources : erstz.AsULONG %p\n",erstz.AsULONG ); WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTSZ , erstz.AsULONG); // event ring dequeue pointer. - erstdp.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing); + erstdp.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing.firstSeg); + //ASSERT(erstdp.AsULONGLONG & 0x0F == 0); erstdp.DequeueERSTIndex =0; DPRINT1("XHCI_InitializeResources : erstdp.AsULONGLONG %p\n",erstdp.AsULONGLONG ); - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP + 1, erstdp.AsULONGLONG >> 32); + XHCI_Write64bitReg(RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); // event ring segment table base address array erstba.AsULONGLONG = HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRingSegTable); - EventRingSegTable.RingSegmentBaseAddr = (ULONGLONG)HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing.XhciTrb[0]); - //EventRingSegTable.RingSegmentBaseAddr = &(HcResourcesVA -> EventRing.XhciTrb[0]); + EventRingSegTable.RingSegmentBaseAddr = (ULONGLONG)HcResourcesPA.QuadPart + FIELD_OFFSET(XHCI_HC_RESOURCES, EventRing.firstSeg.XhciTrb[0]); EventRingSegTable.RingSegmentSize = 16; EventRingSegTable.RsvdZ = 0; HcResourcesVA->EventRingSegTable = EventRingSegTable; DPRINT1("XHCI_InitializeResources : erstba.AsULONGLONG %p\n",erstba.AsULONGLONG ); - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTBA, erstba.AsULONGLONG); - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTBA + 1, erstba.AsULONGLONG >> 32); + XHCI_Write64bitReg(RunTimeRegisterBase + XHCI_ERSTBA, erstba.AsULONGLONG); // intially enque and deque are equal. - for(int i=0; i<16; i++){ - HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word0=0; - HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word1=0; - HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word2=0; - HcResourcesVA->EventRing.XhciTrb[i].EventTRB.Word3=0; + for(int i=0; i<256; i++){ + HcResourcesVA->EventRing.firstSeg.XhciTrb[i].EventTRB.Word0=0; + HcResourcesVA->EventRing.firstSeg.XhciTrb[i].EventTRB.Word1=0; + HcResourcesVA->EventRing.firstSeg.XhciTrb[i].EventTRB.Word2=0; + HcResourcesVA->EventRing.firstSeg.XhciTrb[i].EventTRB.Word3=0; } //DbgBreakPoint(); @@ -349,7 +322,6 @@ PULONG RunTimeRegisterBase; PULONG DoorBellRegisterBase; XHCI_CAPLENGHT_INTERFACE_VERSION CapLenReg; - XHCI_DOORBELL_OFFSET DoorBellOffsetRegister; MPSTATUS MPStatus; XHCI_USB_COMMAND Command; @@ -367,6 +339,7 @@ return MP_STATUS_ERROR; } + XhciExtension = (PXHCI_EXTENSION)xhciExtension; BaseIoAdress = (PULONG)Resources->ResourceBase; @@ -418,6 +391,7 @@ return MPStatus; } + // starting the controller Command.AsULONG = READ_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD); Command.RunStop =1; WRITE_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD, Command.AsULONG ); @@ -495,8 +469,7 @@ erstdp.AsULONGLONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_ERSTDP + 1)|READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_ERSTDP); erstdp.AsULONGLONG = erstdp.AsULONGLONG +2; erstdp.DequeueERSTIndex =0; - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); - WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_ERSTDP + 1, erstdp.AsULONGLONG >> 32); + XHCI_Write64bitReg (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); return TRUE; } @@ -641,6 +614,25 @@ XHCI_DisableInterrupts(IN PVOID xhciExtension) { DPRINT1("XHCI_DisableInterrupts: function initiated\n"); + PXHCI_EXTENSION XhciExtension; + PULONG OperationalRegs; + PULONG RunTimeRegisterBase; + XHCI_INTERRUPTER_MANAGEMENT Iman; + XHCI_USB_COMMAND usbCommand; + + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + OperationalRegs = XhciExtension->OperationalRegs; + //usbCommand.AsULONG =READ_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD); + RunTimeRegisterBase = XhciExtension -> RunTimeRegisterBase; + Iman.AsULONG = READ_REGISTER_ULONG(RunTimeRegisterBase + XHCI_IMAN) ; + Iman.InterruptEnable = 0; + WRITE_REGISTER_ULONG (RunTimeRegisterBase + XHCI_IMAN , Iman.AsULONG); + + //usbCommand.InterrupterEnable = 1; + + //WRITE_REGISTER_ULONG(OperationalRegs + XHCI_USBCMD,usbCommand.AsULONG ); + DPRINT1("XHCI_EnableInterrupts: Interrupts enabled\n"); } VOID Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] Wed Jul 26 03:53:57 2017 @@ -18,7 +18,7 @@ PHYSICAL_ADDRESS ContextBaseAddr [256]; } XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY, *PXHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY; //----------------------------------------LINK TRB-------------------------------------------------------------------- -typedef union _XHCI_LINK_TRB{ +typedef struct _XHCI_LINK_TRB{ struct { ULONG RsvdZ1 : 4; ULONG RingSegmentPointerLo : 28; @@ -40,7 +40,7 @@ ULONG TRBType : 6; ULONG RsvdZ5 : 16; }; - ULONG AsULONG; + //ULONG AsULONG; } XHCI_LINK_TRB; //----------------------------------------generic trb---------------------------------------------------------------- typedef struct _XHCI_GENERIC_TRB { @@ -64,15 +64,15 @@ typedef union _XHCI_COMMAND_TRB { XHCI_COMMAND_NO_OP_TRB NoOperation; - XHCI_LINK_TRB Link[4]; + XHCI_LINK_TRB Link; XHCI_GENERIC_TRB GenericTRB; }XHCI_COMMAND_TRB, *PXHCI_COMMAND_TRB; -typedef struct _XHCI_COMMAND_RING { +/*typedef struct _XHCI_COMMAND_RING { XHCI_COMMAND_TRB Segment[4]; PXHCI_COMMAND_TRB CREnquePointer; PXHCI_COMMAND_TRB CRDequePointer; -} XHCI_COMMAND_RING; +} XHCI_COMMAND_RING;*/ //----------------------------------------CONTROL TRANSFER DATA STRUCTUERS-------------------------------------------- typedef union _XHCI_CONTROL_SETUP_TRB { @@ -187,10 +187,20 @@ XHCI_EVENT_TRB EventTRB; } XHCI_TRB, *PXHCI_TRB; +typedef struct _XHCI_SEGMENT { + XHCI_TRB XhciTrb[256]; + PVOID nextSegment; +}XHCI_SEGMENT , *PXHCI_SEGMENT; + typedef struct _XHCI_RING { - XHCI_TRB XhciTrb[16]; - //PXHCI_TRB dequeue_pointer; -}XHCI_RING , *PXHCI_RING; + //XHCI_TRB XhciTrb[256]; + XHCI_SEGMENT firstSeg; + PXHCI_TRB dequeue_pointer; + PXHCI_TRB enqueue_pointer; + PXHCI_SEGMENT enqueue_segment; + PXHCI_SEGMENT dequeue_segment; + ULONGLONG Padding; +} XHCI_RING , *PXHCI_RING; typedef struct _XHCI_EXTENSION { ULONG Reserved; @@ -211,8 +221,8 @@ typedef struct _XHCI_HC_RESOURCES { XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY DCBAA; //XHCI_COMMAND_RING CommandRing; - XHCI_RING EventRing; - XHCI_RING CommandRing; + XHCI_RING EventRing ; + XHCI_RING CommandRing ; XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; } XHCI_HC_RESOURCES, *PXHCI_HC_RESOURCES;

7 years, 5 months

[jimtabor] 75407: [NtUser] - Broadcast the appropriate messages to notify a change in display parameters and color. This should fix rollback issues from setting display modes. See CORE-12571 and CO...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Jul 26 02:52:00 2017 New Revision: 75407 URL: http://svn.reactos.org/svn/reactos?rev=75407&view=rev Log: [NtUser] - Broadcast the appropriate messages to notify a change in display parameters and color. This should fix rollback issues from setting display modes. See CORE-12571 and CORE-13212. Modified: trunk/reactos/win32ss/user/ntuser/display.c trunk/reactos/win32ss/user/ntuser/monitor.c Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Wed Jul 26 02:52:00 2017 @@ -697,6 +697,7 @@ HKEY hkey; NTSTATUS Status; PPDEVOBJ ppdev; + WORD OrigBC; //PDESKTOP pdesk; /* If no DEVMODE is given, use registry settings */ @@ -715,6 +716,9 @@ else dm = *pdm; + /* Save original bit count */ + OrigBC = gpsi->BitCount; + /* Check params */ if ((dm.dmFields & (DM_PELSWIDTH | DM_PELSHEIGHT)) != (DM_PELSWIDTH | DM_PELSHEIGHT)) { @@ -775,18 +779,12 @@ } } - /* Check if DEVMODE matches the current mode */ - if (pdm == ppdev->pdmwDev && !(flags & CDS_RESET)) - { - ERR("DEVMODE matches, nothing to do\n"); - goto leave; - } - /* Shall we apply the settings? */ if (!(flags & CDS_NORESET)) { ULONG ulResult; PVOID pvOldCursor; + TEXTMETRICW tmw; /* Remove mouse pointer */ pvOldCursor = UserSetCursor(NULL, TRUE); @@ -813,11 +811,24 @@ /* Update the system metrics */ InitMetrics(); - //IntvGetDeviceCaps(&PrimarySurface, &GdiHandleTable->DevCaps); - /* Set new size of the monitor */ UserUpdateMonitorSize((HDEV)ppdev); + /* Update the SERVERINFO */ + gpsi->dmLogPixels = ppdev->gdiinfo.ulLogPixelsY; + gpsi->Planes = ppdev->gdiinfo.cPlanes; + gpsi->BitsPixel = ppdev->gdiinfo.cBitsPixel; + gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; + if (ppdev->gdiinfo.flRaster & RC_PALETTE) + { + gpsi->PUSIFlags |= PUSIF_PALETTEDISPLAY; + } + else + gpsi->PUSIFlags &= ~PUSIF_PALETTEDISPLAY; + // Font is realized and this dc was previously set to internal DC_ATTR. + gpsi->cxSysFontChar = IntGetCharDimensions(hSystemBM, &tmw, (DWORD*)&gpsi->cySysFontChar); + gpsi->tmSysFont = tmw; + /* Remove all cursor clipping */ UserClipCursor(NULL); @@ -825,13 +836,21 @@ //IntHideDesktop(pdesk); /* Send WM_DISPLAYCHANGE to all toplevel windows */ - co_IntSendMessageTimeout(HWND_BROADCAST, - WM_DISPLAYCHANGE, - (WPARAM)ppdev->gdiinfo.cBitsPixel, - (LPARAM)(ppdev->gdiinfo.ulHorzRes + (ppdev->gdiinfo.ulVertRes << 16)), - SMTO_NORMAL, - 100, - &ulResult); + UserSendNotifyMessage( HWND_BROADCAST, + WM_DISPLAYCHANGE, + gpsi->BitCount, + MAKELONG(gpsi->aiSysMet[SM_CXSCREEN], gpsi->aiSysMet[SM_CYSCREEN]) ); + + ERR("BitCount New %d Orig %d ChkNew %d\n",gpsi->BitCount,OrigBC,ppdev->gdiinfo.cBitsPixel); + + /* Not full screen and different bit count, send messages */ + if (!(flags & CDS_FULLSCREEN) && + gpsi->BitCount != OrigBC ) + { + ERR("Detect settings changed.\n"); + UserSendNotifyMessage( HWND_BROADCAST, WM_SETTINGCHANGE, 0, 0 ); + UserSendNotifyMessage( HWND_BROADCAST, WM_SYSCOLORCHANGE, 0, 0 ); + } //co_IntShowDesktop(pdesk, ppdev->gdiinfo.ulHorzRes, ppdev->gdiinfo.ulVertRes); Modified: trunk/reactos/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/monito… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/monitor.c [iso-8859-1] Wed Jul 26 02:52:00 2017 @@ -266,6 +266,11 @@ if (pMonitor->hrgnMonitor) IntGdiSetRegionOwner(pMonitor->hrgnMonitor, GDI_OBJ_HMGR_PUBLIC); + // + // Should be Virtual accumulation of all the available monitors. + // + gpsi->rcScreenReal = pMonitor->rcMonitor; + return STATUS_SUCCESS; }

7 years, 5 months

[gadamopoulos] 75406: [COMCTL32] -Implement taking into account the contents margins from the theme when calculating the size of the toolbar button. Using it while painting the button will be imple...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jul 25 22:41:26 2017 New Revision: 75406 URL: http://svn.reactos.org/svn/reactos?rev=75406&view=rev Log: [COMCTL32] -Implement taking into account the contents margins from the theme when calculating the size of the toolbar button. Using it while painting the button will be implemented in a later commit as it caused me some problems. Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Tue Jul 25 22:41:26 2017 @@ -126,6 +126,7 @@ #ifdef __REACTOS__ SIZE szBarPadding; /* padding values around the toolbar (NOT USED BUT STORED) */ SIZE szSpacing; /* spacing values between buttons */ + MARGINS themeMargins; #endif INT iTopMargin; /* the top margin */ INT iListGap; /* default gap between text and image for toolbar with list style */ @@ -1706,6 +1707,12 @@ max(2*GetSystemMetrics(SM_CXEDGE) + sizeString.cx, infoPtr->nBitmapWidth); } } + +#ifdef __REACTOS__ + sizeButton.cx += infoPtr->themeMargins.cxLeftWidth + infoPtr->themeMargins.cxRightWidth; + sizeButton.cy += infoPtr->themeMargins.cyTopHeight + infoPtr->themeMargins.cyBottomHeight; +#endif + return sizeButton; } @@ -2064,16 +2071,6 @@ SendMessageW (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg); } -#ifdef __REACTOS__ -static LRESULT -TOOLBAR_ThemeChanged(HWND hwnd) -{ - HTHEME theme = GetWindowTheme(hwnd); - CloseThemeData(theme); - OpenThemeData(hwnd, themeClass); - return 0; -} -#endif static void TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button) @@ -4601,8 +4598,13 @@ if (cx == 0) cx = 24; if (cy == 0) cy = 22; +#ifdef __REACTOS__ + cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth + infoPtr->themeMargins.cxLeftWidth + infoPtr->themeMargins.cxRightWidth); + cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight + infoPtr->themeMargins.cyTopHeight + infoPtr->themeMargins.cyBottomHeight); +#else cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight); +#endif if (cx != infoPtr->nButtonWidth || cy != infoPtr->nButtonHeight || top != infoPtr->iTopMargin) @@ -5463,8 +5465,16 @@ SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); - + +#ifdef __REACTOS__ + { + HTHEME theme = OpenThemeData (hwnd, themeClass); + if (theme) + GetThemeMargins(theme, NULL, TP_BUTTON, TS_NORMAL, TMT_CONTENTMARGINS, NULL, &infoPtr->themeMargins); + } +#else OpenThemeData (hwnd, themeClass); +#endif TOOLBAR_CheckStyle (infoPtr); @@ -6239,6 +6249,7 @@ #ifdef __REACTOS__ infoPtr->szSpacing.cx = DEFSPACE_CX; infoPtr->szSpacing.cy = DEFSPACE_CY; + memset(&infoPtr->themeMargins, 0 , sizeof(infoPtr->themeMargins)); #endif infoPtr->iListGap = DEFLISTGAP; infoPtr->iTopMargin = default_top_margin(infoPtr); @@ -6649,8 +6660,22 @@ return 0; } -#ifndef __REACTOS__ +#ifdef __REACTOS__ /* update theme after a WM_THEMECHANGED message */ +static LRESULT theme_changed (TOOLBAR_INFO *infoPtr) +{ + HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); + CloseThemeData (theme); + OpenThemeData (infoPtr->hwndSelf, themeClass); + theme = GetWindowTheme (infoPtr->hwndSelf); + if (theme) + GetThemeMargins(theme, NULL, TP_BUTTON, TS_NORMAL, TMT_CONTENTMARGINS, NULL, &infoPtr->themeMargins); + else + memset(&infoPtr->themeMargins, 0 ,sizeof(infoPtr->themeMargins)); + + return 0; +} +#else static LRESULT theme_changed (HWND hwnd) { HTHEME theme = GetWindowTheme (hwnd); @@ -7056,10 +7081,9 @@ case WM_SYSCOLORCHANGE: return TOOLBAR_SysColorChange (); - - case WM_THEMECHANGED: + case WM_THEMECHANGED: #ifdef __REACTOS__ - return TOOLBAR_ThemeChanged(hwnd); + return theme_changed (infoPtr); #else return theme_changed (hwnd); #endif

7 years, 5 months

[ssawant] 75405: [STOBJECT] -Fixed bugs related to strings and localization (needs further improvement). -Fixed ContextMenu Position bug (for both power and volume). -Now battery tooltip is as dyna...

by ssawant＠svn.reactos.org

Author: ssawant Date: Tue Jul 25 21:48:51 2017 New Revision: 75405 URL: http://svn.reactos.org/svn/reactos?rev=75405&view=rev Log: [STOBJECT] -Fixed bugs related to strings and localization (needs further improvement). -Fixed ContextMenu Position bug (for both power and volume). -Now battery tooltip is as dynamic as its icon. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/lang/en-US.rc branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/volume.cpp Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/lang/en-US.rc [iso-8859-1] Tue Jul 25 21:48:51 2017 @@ -17,8 +17,8 @@ //Power related strings IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" - IDS_PWR_PERCENT_REMAINING "%1!u!%% remaining" - IDS_PWR_CHARGING " (charging)" + IDS_PWR_PERCENT_REMAINING "%.2f%% remaining" + IDS_PWR_CHARGING "%.2f%% and charging" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining" Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/power.cpp [iso-8859-1] Tue Jul 25 21:48:51 2017 @@ -18,12 +18,10 @@ #include <mmsystem.h> #include <mmddk.h> +#include <atlstr.h> #define GBS_HASBATTERY 0x1 #define GBS_ONBATTERY 0x2 - -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) WINE_DEFAULT_DEBUG_CHANNEL(stobject); @@ -37,10 +35,9 @@ UINT uiLast; } PWRSCHEMECONTEXT, *PPWRSCHEMECONTEXT; +CString g_strTooltip; static float g_batCap = 0; static HICON g_hIconBattery = NULL; -static HICON g_hIconAC = NULL; - static BOOL g_IsRunning = FALSE; /*** This function enumerates the available battery devices and provides the remaining capacity @@ -168,56 +165,67 @@ return i - 1; } +/*** This function returns the respective icon as per the current battery capacity. + It also does the work of setting global parameters of battery capacity and tooltips. +@param hinst: instance handle +@return : icon handle +*/ static HICON DynamicLoadIcon(HINSTANCE hinst) -{ +{ HICON hBatIcon; float cap = 0; DWORD dw = 0; UINT index = -1; HRESULT hr = GetBatteryState(cap, dw); + if (!FAILED(hr) && (dw & GBS_HASBATTERY)) { index = Quantize(cap, 4); g_batCap = cap; } + else + { + g_batCap = 0; + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_BATTCAP_ERR)); + g_strTooltip.LoadStringW(IDS_PWR_UNKNOWN_REMAINING); + return hBatIcon; + } if (dw & GBS_ONBATTERY) - hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(index<0 ? IDI_BATTCAP_ERR : br_icons[index])); + { + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(br_icons[index])); + g_strTooltip.Format(IDS_PWR_PERCENT_REMAINING, cap); + + } else - hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(index<0 ? IDI_BATTCAP_ERR : bc_icons[index])); + { + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(bc_icons[index])); + g_strTooltip.Format(IDS_PWR_CHARGING, cap); + } return hBatIcon; } HRESULT STDMETHODCALLTYPE Power_Init(_In_ CSysTray * pSysTray) -{ - WCHAR strTooltip[128]; - HICON icon; - - TRACE("Power_Init\n"); - +{ + TRACE("Power_Init\n"); + g_hIconBattery = DynamicLoadIcon(g_hInstance); + g_IsRunning = TRUE; + + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, g_hIconBattery, g_strTooltip); +} + +HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray) +{ + TRACE("Power_Update\n"); g_hIconBattery = DynamicLoadIcon(g_hInstance); - swprintf(strTooltip, L"%.2f %% Remaining", g_batCap); - g_IsRunning = TRUE; - - return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_POWER, g_hIconBattery, strTooltip); -} - -HRESULT STDMETHODCALLTYPE Power_Update(_In_ CSysTray * pSysTray) -{ - TRACE("Power_Update\n"); - - WCHAR strTooltip[128]; - g_hIconBattery = DynamicLoadIcon(g_hInstance); - swprintf(strTooltip, L"%.2f %% Remaining", g_batCap); - - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_POWER, g_hIconBattery, strTooltip); + + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_POWER, g_hIconBattery, g_strTooltip); } HRESULT STDMETHODCALLTYPE Power_Shutdown(_In_ CSysTray * pSysTray) { TRACE("Power_Shutdown\n"); - g_IsRunning = FALSE; return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_POWER, NULL, NULL); @@ -230,22 +238,18 @@ static void _ShowContextMenu(CSysTray * pSysTray) { - WCHAR strOpen[128]; - - LoadStringW(g_hInstance, IDS_PWR_PROPERTIES, strOpen, _countof(strOpen)); - - HMENU hPopup = CreatePopupMenu(); - AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, strOpen); - + CString strOpen((LPCSTR)IDS_PWR_PROPERTIES); + HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_PWR_PROPERTIES, strOpen); + + SetForegroundWindow(pSysTray->GetHWnd()); DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; - DWORD msgPos = GetMessagePos(); - - SetForegroundWindow(pSysTray->GetHWnd()); + POINT pt; + GetCursorPos(&pt); + DWORD id = TrackPopupMenuEx(hPopup, flags, - GET_X_LPARAM(msgPos), GET_Y_LPARAM(msgPos), - pSysTray->GetHWnd(), NULL); - - DestroyMenu(hPopup); + pt.x, pt.y, + pSysTray->GetHWnd(), NULL); switch (id) { @@ -253,6 +257,7 @@ _RunPower(); break; } + DestroyMenu(hPopup); } static @@ -287,8 +292,8 @@ { PWRSCHEMECONTEXT PowerSchemeContext = {NULL, 0, 0}; UINT uiActiveScheme; - DWORD id, msgPos; - + DWORD id; + POINT pt; PowerSchemeContext.hPopup = CreatePopupMenu(); EnumPwrSchemes(PowerSchemesEnumProc, (LPARAM)&PowerSchemeContext); @@ -301,13 +306,13 @@ MF_BYCOMMAND); } - msgPos = GetMessagePos(); - SetForegroundWindow(pSysTray->GetHWnd()); + GetCursorPos(&pt); + id = TrackPopupMenuEx(PowerSchemeContext.hPopup, TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN, - GET_X_LPARAM(msgPos), - GET_Y_LPARAM(msgPos), + pt.x, + pt.y, pSysTray->GetHWnd(), NULL); @@ -363,7 +368,7 @@ break; case WM_RBUTTONUP: - _ShowContextMenu(pSysTray); + _ShowContextMenu(pSysTray); break; case WM_RBUTTONDBLCLK: Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Tue Jul 25 21:48:51 2017 @@ -31,7 +31,7 @@ #include <reactos/manifest_dll.rc> // Strings common to all languages -STRINGTABLE +/*STRINGTABLE BEGIN // Power related strings IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" @@ -41,7 +41,7 @@ // Volume related strings IDS_VOL_RUN "SNDVOL32.EXE" -END +END*/ /* UTF-8 */ #pragma code_page(65001) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Tue Jul 25 21:48:51 2017 @@ -243,11 +243,12 @@ AppendMenuW(hPopup, MF_STRING, IDS_VOL_ADJUST, strAdjust); DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; - DWORD msgPos = GetMessagePos(); - + POINT pt; SetForegroundWindow(pSysTray->GetHWnd()); + GetCursorPos(&pt); + DWORD id = TrackPopupMenuEx(hPopup, flags, - GET_X_LPARAM(msgPos), GET_Y_LPARAM(msgPos), + pt.x, pt.y, pSysTray->GetHWnd(), NULL); DestroyMenu(hPopup);

7 years, 5 months

← Newer
1
2
3
4
5
6
7
8
9
...
22
Older →

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 July 2017