Ros-diffs September 2019

ros-diffs@reactos.org

21 participants
115 discussions

[reactos] 01/02: [ACPICA] Update to version 20190816. CORE-16368

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d4f13f625bdd4abfc31f… commit 5d4f13f625bdd4abfc31fe282a7696eab24e3ba2 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Sep 7 13:56:10 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Sep 8 07:46:53 2019 +0200 [ACPICA] Update to version 20190816. CORE-16368 --- drivers/bus/acpi/acpica/events/evgpe.c | 9 ++++++++ drivers/bus/acpi/acpica/events/evxfgpe.c | 27 +++++++++++++++++++++++ drivers/bus/acpi/acpica/executer/exconfig.c | 4 +++- drivers/bus/acpi/acpica/executer/exdump.c | 6 ++--- drivers/bus/acpi/acpica/include/acconfig.h | 4 ++-- drivers/bus/acpi/acpica/include/aclocal.h | 4 ++-- drivers/bus/acpi/acpica/include/acobject.h | 2 +- drivers/bus/acpi/acpica/include/acpiosxf.h | 1 + drivers/bus/acpi/acpica/include/acpixf.h | 14 +++++++++++- drivers/bus/acpi/acpica/include/acstruct.h | 2 +- drivers/bus/acpi/acpica/include/actypes.h | 20 +++++++++-------- drivers/bus/acpi/acpica/include/acutils.h | 9 +++++--- drivers/bus/acpi/acpica/include/platform/acmsvc.h | 1 - drivers/bus/acpi/acpica/namespace/nsaccess.c | 2 +- drivers/bus/acpi/acpica/namespace/nsalloc.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdump.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair2.c | 2 +- drivers/bus/acpi/acpica/tables/tbdata.c | 1 + drivers/bus/acpi/acpica/utilities/utdebug.c | 4 ++-- drivers/bus/acpi/acpica/utilities/uterror.c | 6 ++--- drivers/bus/acpi/acpica/utilities/utosi.c | 3 ++- drivers/bus/acpi/acpica/utilities/utownerid.c | 12 +++++----- 22 files changed, 97 insertions(+), 40 deletions(-) diff --git a/drivers/bus/acpi/acpica/events/evgpe.c b/drivers/bus/acpi/acpica/events/evgpe.c index 4f282e21937..5908e593ce4 100644 --- a/drivers/bus/acpi/acpica/events/evgpe.c +++ b/drivers/bus/acpi/acpica/events/evgpe.c @@ -740,6 +740,15 @@ AcpiEvDetectGpe ( Flags = AcpiOsAcquireLock (AcpiGbl_GpeLock); + if (!GpeEventInfo) + { + GpeEventInfo = AcpiEvGetGpeEventInfo (GpeDevice, GpeNumber); + if (!GpeEventInfo) + { + goto ErrorExit; + } + } + /* Get the info block for the entire GPE register */ GpeRegisterInfo = GpeEventInfo->RegisterInfo; diff --git a/drivers/bus/acpi/acpica/events/evxfgpe.c b/drivers/bus/acpi/acpica/events/evxfgpe.c index f56aa1d9bb4..f2946bc46c5 100644 --- a/drivers/bus/acpi/acpica/events/evxfgpe.c +++ b/drivers/bus/acpi/acpica/events/evxfgpe.c @@ -767,6 +767,33 @@ UnlockAndExit: ACPI_EXPORT_SYMBOL (AcpiGetGpeStatus) +/******************************************************************************* + * + * FUNCTION: AcpiDispatchGpe + * + * PARAMETERS: GpeDevice - Parent GPE Device. NULL for GPE0/GPE1 + * GpeNumber - GPE level within the GPE block + * + * RETURN: INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED + * + * DESCRIPTION: Detect and dispatch a General Purpose Event to either a function + * (e.g. EC) or method (e.g. _Lxx/_Exx) handler. + * + ******************************************************************************/ + +UINT32 +AcpiDispatchGpe( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber) +{ + ACPI_FUNCTION_TRACE(acpi_dispatch_gpe); + + return (AcpiEvDetectGpe (GpeDevice, NULL, GpeNumber)); +} + +ACPI_EXPORT_SYMBOL (AcpiDispatchGpe) + + /******************************************************************************* * * FUNCTION: AcpiFinishGpe diff --git a/drivers/bus/acpi/acpica/executer/exconfig.c b/drivers/bus/acpi/acpica/executer/exconfig.c index 7e2b0dbfb9d..4555b53136a 100644 --- a/drivers/bus/acpi/acpica/executer/exconfig.c +++ b/drivers/bus/acpi/acpica/executer/exconfig.c @@ -235,7 +235,9 @@ AcpiExLoadTableOp ( /* Complete the initialization/resolution of new objects */ - AcpiNsInitializeObjects (); + AcpiExExitInterpreter(); + AcpiNsInitializeObjects(); + AcpiExEnterInterpreter(); /* Parameter Data (optional) */ diff --git a/drivers/bus/acpi/acpica/executer/exdump.c b/drivers/bus/acpi/acpica/executer/exdump.c index cfe1e30409d..607707afb39 100644 --- a/drivers/bus/acpi/acpica/executer/exdump.c +++ b/drivers/bus/acpi/acpica/executer/exdump.c @@ -147,7 +147,7 @@ static ACPI_EXDUMP_INFO AcpiExDumpMethod[9] = {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.ParamCount), "Parameter Count"}, {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.SyncLevel), "Sync Level"}, {ACPI_EXD_POINTER, ACPI_EXD_OFFSET (Method.Mutex), "Mutex"}, - {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.OwnerId), "Owner Id"}, + {ACPI_EXD_UINT16, ACPI_EXD_OFFSET (Method.OwnerId), "Owner Id"}, {ACPI_EXD_UINT8, ACPI_EXD_OFFSET (Method.ThreadCount), "Thread Count"}, {ACPI_EXD_UINT32, ACPI_EXD_OFFSET (Method.AmlLength), "Aml Length"}, {ACPI_EXD_POINTER, ACPI_EXD_OFFSET (Method.AmlStart), "Aml Start"} @@ -314,8 +314,8 @@ static ACPI_EXDUMP_INFO AcpiExDumpFieldCommon[7] = static ACPI_EXDUMP_INFO AcpiExDumpNode[7] = { {ACPI_EXD_INIT, ACPI_EXD_TABLE_SIZE (AcpiExDumpNode), NULL}, - {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET (Flags), "Flags"}, - {ACPI_EXD_UINT8, ACPI_EXD_NSOFFSET (OwnerId), "Owner Id"}, + {ACPI_EXD_UINT16, ACPI_EXD_NSOFFSET (Flags), "Flags"}, + {ACPI_EXD_UINT16, ACPI_EXD_NSOFFSET (OwnerId), "Owner Id"}, {ACPI_EXD_LIST, ACPI_EXD_NSOFFSET (Object), "Object List"}, {ACPI_EXD_NODE, ACPI_EXD_NSOFFSET (Parent), "Parent"}, {ACPI_EXD_NODE, ACPI_EXD_NSOFFSET (Child), "Child"}, diff --git a/drivers/bus/acpi/acpica/include/acconfig.h b/drivers/bus/acpi/acpica/include/acconfig.h index 4a95e203add..530983ebee4 100644 --- a/drivers/bus/acpi/acpica/include/acconfig.h +++ b/drivers/bus/acpi/acpica/include/acconfig.h @@ -131,9 +131,9 @@ #define ACPI_DEFAULT_PAGE_SIZE 4096 /* Must be power of 2 */ -/* OwnerId tracking. 8 entries allows for 255 OwnerIds */ +/* OwnerId tracking. 128 entries allows for 4095 OwnerIds */ -#define ACPI_NUM_OWNERID_MASKS 8 +#define ACPI_NUM_OWNERID_MASKS 128 /* Size of the root table array is increased by this increment */ diff --git a/drivers/bus/acpi/acpica/include/aclocal.h b/drivers/bus/acpi/acpica/include/aclocal.h index 0d683460f9d..e45d97cdcd6 100644 --- a/drivers/bus/acpi/acpica/include/aclocal.h +++ b/drivers/bus/acpi/acpica/include/aclocal.h @@ -187,12 +187,12 @@ typedef struct acpi_namespace_node union acpi_operand_object *Object; /* Interpreter object */ UINT8 DescriptorType; /* Differentiate object descriptor types */ UINT8 Type; /* ACPI Type associated with this name */ - UINT8 Flags; /* Miscellaneous flags */ - ACPI_OWNER_ID OwnerId; /* Node creator */ + UINT16 Flags; /* Miscellaneous flags */ ACPI_NAME_UNION Name; /* ACPI Name, always 4 chars per ACPI spec */ struct acpi_namespace_node *Parent; /* Parent node */ struct acpi_namespace_node *Child; /* First child */ struct acpi_namespace_node *Peer; /* First peer */ + ACPI_OWNER_ID OwnerId; /* Node creator */ /* * The following fields are used by the ASL compiler and disassembler only diff --git a/drivers/bus/acpi/acpica/include/acobject.h b/drivers/bus/acpi/acpica/include/acobject.h index 150f6fb236e..45f09839b6d 100644 --- a/drivers/bus/acpi/acpica/include/acobject.h +++ b/drivers/bus/acpi/acpica/include/acobject.h @@ -225,8 +225,8 @@ typedef struct acpi_object_method } Dispatch; UINT32 AmlLength; - UINT8 ThreadCount; ACPI_OWNER_ID OwnerId; + UINT8 ThreadCount; } ACPI_OBJECT_METHOD; diff --git a/drivers/bus/acpi/acpica/include/acpiosxf.h b/drivers/bus/acpi/acpica/include/acpiosxf.h index a874f65f316..9209c5af078 100644 --- a/drivers/bus/acpi/acpica/include/acpiosxf.h +++ b/drivers/bus/acpi/acpica/include/acpiosxf.h @@ -469,6 +469,7 @@ AcpiOsEnterSleep ( * Debug print routines */ #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_AcpiOsPrintf +ACPI_PRINTF_LIKE (1) void ACPI_INTERNAL_VAR_XFACE AcpiOsPrintf ( const char *Format, diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index 9322858f8fe..d84c008daf9 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20190703 +#define ACPI_CA_VERSION 0x20190816 #include "acconfig.h" #include "actypes.h" @@ -338,6 +338,9 @@ ACPI_GLOBAL (BOOLEAN, AcpiGbl_SystemAwakeAndRunning); #define ACPI_HW_DEPENDENT_RETURN_OK(Prototype) \ ACPI_EXTERNAL_RETURN_OK(Prototype) +#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \ + ACPI_EXTERNAL_RETURN_UINT32(prototype) + #define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \ ACPI_EXTERNAL_RETURN_VOID(Prototype) @@ -348,6 +351,9 @@ ACPI_GLOBAL (BOOLEAN, AcpiGbl_SystemAwakeAndRunning); #define ACPI_HW_DEPENDENT_RETURN_OK(Prototype) \ static ACPI_INLINE Prototype {return(AE_OK);} +#define ACPI_HW_DEPENDENT_RETURN_UINT32(prototype) \ + static ACPI_INLINE prototype {return(0);} + #define ACPI_HW_DEPENDENT_RETURN_VOID(Prototype) \ static ACPI_INLINE Prototype {return;} @@ -968,6 +974,12 @@ AcpiGetGpeStatus ( UINT32 GpeNumber, ACPI_EVENT_STATUS *EventStatus)) +ACPI_HW_DEPENDENT_RETURN_UINT32 ( +UINT32 +AcpiDispatchGpe ( + ACPI_HANDLE GpeDevice, + UINT32 GpeNumber)) + ACPI_HW_DEPENDENT_RETURN_STATUS ( ACPI_STATUS AcpiDisableAllGpes ( diff --git a/drivers/bus/acpi/acpica/include/acstruct.h b/drivers/bus/acpi/acpica/include/acstruct.h index 04123f307f1..ae168d75780 100644 --- a/drivers/bus/acpi/acpica/include/acstruct.h +++ b/drivers/bus/acpi/acpica/include/acstruct.h @@ -219,9 +219,9 @@ typedef struct acpi_evaluate_info UINT32 ReturnFlags; /* Used for return value analysis */ UINT32 ReturnBtype; /* Bitmapped type of the returned object */ UINT16 ParamCount; /* Count of the input argument list */ + UINT16 NodeFlags; /* Same as Node->Flags */ UINT8 PassNumber; /* Parser pass number */ UINT8 ReturnObjectType; /* Object type of the returned object */ - UINT8 NodeFlags; /* Same as Node->Flags */ UINT8 Flags; /* General flags */ } ACPI_EVALUATE_INFO; diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index 48a192a5b8e..e73dee3b673 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -483,8 +483,8 @@ typedef void * ACPI_HANDLE; /* Actually a ptr to a N /* Owner IDs are used to track namespace nodes for selective deletion */ -typedef UINT8 ACPI_OWNER_ID; -#define ACPI_OWNER_ID_MAX 0xFF +typedef UINT16 ACPI_OWNER_ID; +#define ACPI_OWNER_ID_MAX 0xFFF /* 4095 possible owner IDs */ #define ACPI_INTEGER_BIT_SIZE 64 @@ -549,7 +549,7 @@ typedef UINT64 ACPI_INTEGER; /* Pointer/Integer type conversions */ -#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (ACPI_SIZE) (i)) +#define ACPI_TO_POINTER(i) ACPI_CAST_PTR (void, (ACPI_SIZE) (i)) #define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0) #define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0) #define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i) @@ -1405,12 +1405,14 @@ typedef enum #define ACPI_OSI_WIN_VISTA_SP2 0x0A #define ACPI_OSI_WIN_7 0x0B #define ACPI_OSI_WIN_8 0x0C -#define ACPI_OSI_WIN_10 0x0D -#define ACPI_OSI_WIN_10_RS1 0x0E -#define ACPI_OSI_WIN_10_RS2 0x0F -#define ACPI_OSI_WIN_10_RS3 0x10 -#define ACPI_OSI_WIN_10_RS4 0x11 -#define ACPI_OSI_WIN_10_RS5 0x12 +#define ACPI_OSI_WIN_8_1 0x0D +#define ACPI_OSI_WIN_10 0x0E +#define ACPI_OSI_WIN_10_RS1 0x0F +#define ACPI_OSI_WIN_10_RS2 0x10 +#define ACPI_OSI_WIN_10_RS3 0x11 +#define ACPI_OSI_WIN_10_RS4 0x12 +#define ACPI_OSI_WIN_10_RS5 0x13 +#define ACPI_OSI_WIN_10_19H1 0x14 /* Definitions of getopt */ diff --git a/drivers/bus/acpi/acpica/include/acutils.h b/drivers/bus/acpi/acpica/include/acutils.h index 5d407343dff..7e4922f810f 100644 --- a/drivers/bus/acpi/acpica/include/acutils.h +++ b/drivers/bus/acpi/acpica/include/acutils.h @@ -1086,30 +1086,33 @@ AcpiUtDeleteAddressLists ( /* * utxferror - various error/warning output functions */ +ACPI_PRINTF_LIKE(5) void ACPI_INTERNAL_VAR_XFACE AcpiUtPredefinedWarning ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...); +ACPI_PRINTF_LIKE(5) void ACPI_INTERNAL_VAR_XFACE AcpiUtPredefinedInfo ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...); +ACPI_PRINTF_LIKE(5) void ACPI_INTERNAL_VAR_XFACE AcpiUtPredefinedBiosError ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...); diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvc.h b/drivers/bus/acpi/acpica/include/platform/acmsvc.h index fe8ca747178..6a39e9caa43 100644 --- a/drivers/bus/acpi/acpica/include/platform/acmsvc.h +++ b/drivers/bus/acpi/acpica/include/platform/acmsvc.h @@ -242,7 +242,6 @@ #pragma warning(disable:4459) - /* Debug support. */ #ifdef _DEBUG diff --git a/drivers/bus/acpi/acpica/namespace/nsaccess.c b/drivers/bus/acpi/acpica/namespace/nsaccess.c index c0c829012d3..5321edaca8f 100644 --- a/drivers/bus/acpi/acpica/namespace/nsaccess.c +++ b/drivers/bus/acpi/acpica/namespace/nsaccess.c @@ -659,7 +659,7 @@ AcpiNsLookup ( if (Flags & ACPI_NS_PREFIX_MUST_EXIST) { AcpiOsPrintf (ACPI_MSG_BIOS_ERROR - "Object does not exist: %4.4s\n", &SimpleName); + "Object does not exist: %4.4s\n", (char *) &SimpleName); } #endif /* Name not found in ACPI namespace */ diff --git a/drivers/bus/acpi/acpica/namespace/nsalloc.c b/drivers/bus/acpi/acpica/namespace/nsalloc.c index fb5cc71d007..b77725b915c 100644 --- a/drivers/bus/acpi/acpica/namespace/nsalloc.c +++ b/drivers/bus/acpi/acpica/namespace/nsalloc.c @@ -315,7 +315,7 @@ AcpiNsInstallNode ( Node->Type = (UINT8) Type; ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, - "%4.4s (%s) [Node %p Owner %X] added to %4.4s (%s) [Node %p]\n", + "%4.4s (%s) [Node %p Owner %3.3X] added to %4.4s (%s) [Node %p]\n", AcpiUtGetNodeName (Node), AcpiUtGetTypeName (Node->Type), Node, OwnerId, AcpiUtGetNodeName (ParentNode), AcpiUtGetTypeName (ParentNode->Type), ParentNode)); diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c b/drivers/bus/acpi/acpica/namespace/nsdump.c index cf03a110f36..67ff9369587 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdump.c +++ b/drivers/bus/acpi/acpica/namespace/nsdump.c @@ -272,7 +272,7 @@ AcpiNsDumpOneObject ( /* Now we can print out the pertinent information */ - AcpiOsPrintf (" %-12s %p %2.2X ", + AcpiOsPrintf (" %-12s %p %3.3X ", AcpiUtGetTypeName (Type), ThisNode, ThisNode->OwnerId); DbgLevel = AcpiDbgLevel; diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair2.c b/drivers/bus/acpi/acpica/namespace/nsrepair2.c index 6668ad1130f..88b8dc9636d 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair2.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair2.c @@ -181,7 +181,7 @@ static const ACPI_REPAIR_INFO AcpiNsRepairableNames[] = #define ACPI_FDE_FIELD_COUNT 5 #define ACPI_FDE_BYTE_BUFFER_SIZE 5 -#define ACPI_FDE_DWORD_BUFFER_SIZE (ACPI_FDE_FIELD_COUNT * sizeof (UINT32)) +#define ACPI_FDE_DWORD_BUFFER_SIZE (ACPI_FDE_FIELD_COUNT * (UINT32) sizeof (UINT32)) /****************************************************************************** diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c b/drivers/bus/acpi/acpica/tables/tbdata.c index 977eee87318..e6ac5bb1130 100644 --- a/drivers/bus/acpi/acpica/tables/tbdata.c +++ b/drivers/bus/acpi/acpica/tables/tbdata.c @@ -865,6 +865,7 @@ AcpiTbDeleteNamespaceByOwner ( { return_ACPI_STATUS (Status); } + AcpiNsDeleteNamespaceByOwner (OwnerId); AcpiUtReleaseWriteLock (&AcpiGbl_NamespaceRwLock); return_ACPI_STATUS (Status); diff --git a/drivers/bus/acpi/acpica/utilities/utdebug.c b/drivers/bus/acpi/acpica/utilities/utdebug.c index 9ceed9754a9..583589555cd 100644 --- a/drivers/bus/acpi/acpica/utilities/utdebug.c +++ b/drivers/bus/acpi/acpica/utilities/utdebug.c @@ -214,7 +214,7 @@ AcpiDebugPrint ( * Display the module name, current line number, thread ID (if requested), * current procedure nesting level, and the current procedure name */ - AcpiOsPrintf ("%9s-%04ld ", ModuleName, LineNumber); + AcpiOsPrintf ("%9s-%04d ", ModuleName, LineNumber); #ifdef ACPI_APPLICATION /* @@ -235,7 +235,7 @@ AcpiDebugPrint ( FillCount = 0; } - AcpiOsPrintf ("[%02ld] %*s", + AcpiOsPrintf ("[%02d] %*s", AcpiGbl_NestingLevel, AcpiGbl_NestingLevel + 1, " "); AcpiOsPrintf ("%s%*s: ", AcpiUtTrimFunctionName (FunctionName), FillCount, " "); diff --git a/drivers/bus/acpi/acpica/utilities/uterror.c b/drivers/bus/acpi/acpica/utilities/uterror.c index 76778943a5a..52edc68994a 100644 --- a/drivers/bus/acpi/acpica/utilities/uterror.c +++ b/drivers/bus/acpi/acpica/utilities/uterror.c @@ -80,7 +80,7 @@ AcpiUtPredefinedWarning ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...) { @@ -129,7 +129,7 @@ AcpiUtPredefinedInfo ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...) { @@ -178,7 +178,7 @@ AcpiUtPredefinedBiosError ( const char *ModuleName, UINT32 LineNumber, char *Pathname, - UINT8 NodeFlags, + UINT16 NodeFlags, const char *Format, ...) { diff --git a/drivers/bus/acpi/acpica/utilities/utosi.c b/drivers/bus/acpi/acpica/utilities/utosi.c index 8c0da51cff4..d145055aeea 100644 --- a/drivers/bus/acpi/acpica/utilities/utosi.c +++ b/drivers/bus/acpi/acpica/utilities/utosi.c @@ -104,13 +104,14 @@ static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] = {"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2}, /* Windows Vista SP2 - Added 09/2010 */ {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */ {"Windows 2012", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8 and Server 2012 - Added 08/2012 */ - {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */ + {"Windows 2013", NULL, 0, ACPI_OSI_WIN_8_1}, /* Windows 8.1 and Server 2012 R2 - Added 01/2014 */ {"Windows 2015", NULL, 0, ACPI_OSI_WIN_10}, /* Windows 10 - Added 03/2015 */ {"Windows 2016", NULL, 0, ACPI_OSI_WIN_10_RS1}, /* Windows 10 version 1607 - Added 12/2017 */ {"Windows 2017", NULL, 0, ACPI_OSI_WIN_10_RS2}, /* Windows 10 version 1703 - Added 12/2017 */ {"Windows 2017.2", NULL, 0, ACPI_OSI_WIN_10_RS3}, /* Windows 10 version 1709 - Added 02/2018 */ {"Windows 2018", NULL, 0, ACPI_OSI_WIN_10_RS4}, /* Windows 10 version 1803 - Added 11/2018 */ {"Windows 2018.2", NULL, 0, ACPI_OSI_WIN_10_RS5}, /* Windows 10 version 1809 - Added 11/2018 */ + {"Windows 2019", NULL, 0, ACPI_OSI_WIN_10_19H1}, /* Windows 10 version 1903 - Added 08/2019 */ /* Feature Group Strings */ diff --git a/drivers/bus/acpi/acpica/utilities/utownerid.c b/drivers/bus/acpi/acpica/utilities/utownerid.c index ea98b81d590..8e723fabdc7 100644 --- a/drivers/bus/acpi/acpica/utilities/utownerid.c +++ b/drivers/bus/acpi/acpica/utilities/utownerid.c @@ -82,7 +82,7 @@ AcpiUtAllocateOwnerId ( if (*OwnerId) { ACPI_ERROR ((AE_INFO, - "Owner ID [0x%2.2X] already exists", *OwnerId)); + "Owner ID [0x%3.3X] already exists", *OwnerId)); return_ACPI_STATUS (AE_ALREADY_EXISTS); } @@ -138,13 +138,13 @@ AcpiUtAllocateOwnerId ( /* * Construct encoded ID from the index and bit position * - * Note: Last [j].k (bit 255) is never used and is marked + * Note: Last [j].k (bit 4095) is never used and is marked * permanently allocated (prevents +1 overflow) */ *OwnerId = (ACPI_OWNER_ID) ((k + 1) + ACPI_MUL_32 (j)); ACPI_DEBUG_PRINT ((ACPI_DB_VALUES, - "Allocated OwnerId: %2.2X\n", (unsigned int) *OwnerId)); + "Allocated OwnerId: 0x%3.3X\n", (unsigned int) *OwnerId)); goto Exit; } } @@ -164,7 +164,7 @@ AcpiUtAllocateOwnerId ( */ Status = AE_OWNER_ID_LIMIT; ACPI_ERROR ((AE_INFO, - "Could not allocate new OwnerId (255 max), AE_OWNER_ID_LIMIT")); + "Could not allocate new OwnerId (4095 max), AE_OWNER_ID_LIMIT")); Exit: (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); @@ -207,7 +207,7 @@ AcpiUtReleaseOwnerId ( if (OwnerId == 0) { - ACPI_ERROR ((AE_INFO, "Invalid OwnerId: 0x%2.2X", OwnerId)); + ACPI_ERROR ((AE_INFO, "Invalid OwnerId: 0x%3.3X", OwnerId)); return_VOID; } @@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId ( else { ACPI_ERROR ((AE_INFO, - "Release of non-allocated OwnerId: 0x%2.2X", OwnerId + 1)); + "Attempted release of non-allocated OwnerId: 0x%3.3X", OwnerId + 1)); } (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);

5 years, 3 months

[reactos] 01/01: [BTRFS] Reenable the MountMgr thread

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ff3658f109357ea033c7… commit 7ff3658f109357ea033c759e993ccc3b2027cac1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 7 23:28:58 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 23:28:58 2019 +0200 [BTRFS] Reenable the MountMgr thread Now that IOCTL_MOUNTMGR_QUERY_POINTS and IOCTL_MOUNTMGR_CHANGE_NOTIFY have been fixed, the thread no longer eats 100% CPU nor prevent ReactOS shutdown --- drivers/filesystems/btrfs/btrfs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 2f0c97d5675..2977667de9a 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -6013,11 +6013,9 @@ NTSTATUS __stdcall DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_S KeInitializeEvent(&mountmgr_thread_event, NotificationEvent, false); -#ifndef __REACTOS__ Status = PsCreateSystemThread(&mountmgr_thread_handle, 0, NULL, NULL, NULL, mountmgr_thread, NULL); if (!NT_SUCCESS(Status)) WARN("PsCreateSystemThread returned %08x\n", Status); -#endif IoRegisterFileSystem(DeviceObject);

5 years, 3 months

[reactos] 01/01: [MOUNTMGR] Properly return EpicNumber in MountMgrChangeNotify

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d904ee19c5cda7d7a6548… commit d904ee19c5cda7d7a6548b888ae9d6742658e5d0 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 7 23:07:54 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 23:07:54 2019 +0200 [MOUNTMGR] Properly return EpicNumber in MountMgrChangeNotify --- drivers/filters/mountmgr/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/device.c b/drivers/filters/mountmgr/device.c index 7172a3b5da8..ce8f58ce855 100644 --- a/drivers/filters/mountmgr/device.c +++ b/drivers/filters/mountmgr/device.c @@ -57,7 +57,7 @@ MountMgrChangeNotify(IN PDEVICE_EXTENSION DeviceExtension, if (DeviceExtension->EpicNumber != ChangeNotify->EpicNumber) { ChangeNotify->EpicNumber = DeviceExtension->EpicNumber; - Irp->IoStatus.Information = 0; + Irp->IoStatus.Information = sizeof(MOUNTMGR_CHANGE_NOTIFY_INFO); return STATUS_SUCCESS; }

5 years, 3 months

[reactos] 02/02: [BTRFS] Revert "Allow driver to start at first stage when no hive is present."

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=400eb23a6474f15ed65fd… commit 400eb23a6474f15ed65fdb49b9618436017dc035 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Sep 7 02:41:26 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 19:58:03 2019 +0200 [BTRFS] Revert "Allow driver to start at first stage when no hive is present." Not needed anymore. This reverts commit 80e11516b12b19530b56be7539ecc6af2039ed7b. --- drivers/filesystems/btrfs/btrfs.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index ada1cc18f45..2f0c97d5675 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -5949,19 +5949,12 @@ NTSTATUS __stdcall DriverEntry(_In_ PDRIVER_OBJECT DriverObject, _In_ PUNICODE_S InitializeObjectAttributes(&oa, RegistryPath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); Status = ZwCreateKey(&regh, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS | KEY_NOTIFY, &oa, 0, NULL, REG_OPTION_NON_VOLATILE, &dispos); - /* ReactOS specific hack: allow BtrFS driver to start in 1st stage with no hive */ -#ifndef __REACTOS__ if (!NT_SUCCESS(Status)) { ERR("ZwCreateKey returned %08x\n", Status); return Status; } watch_registry(regh); -#else - if (NT_SUCCESS(Status)) { - watch_registry(regh); - } -#endif Status = IoCreateDevice(DriverObject, sizeof(bus_device_extension), NULL, FILE_DEVICE_UNKNOWN, FILE_DEVICE_SECURE_OPEN, false, &busobj);

5 years, 3 months

[reactos] 01/02: [BTRFS] Revert "Leak the root stream file object on mount."

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e08dc305696616b7d52e7… commit e08dc305696616b7d52e7e7591c1810e2e8f2ff6 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sat Sep 7 02:38:46 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 7 19:58:03 2019 +0200 [BTRFS] Revert "Leak the root stream file object on mount." Not needed anymore. This reverts commit c13ccc92f66d9fd537ffdd4c0324af5b9c2723e1. --- drivers/filesystems/btrfs/btrfs.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/drivers/filesystems/btrfs/btrfs.c b/drivers/filesystems/btrfs/btrfs.c index 61f3dc666db..ada1cc18f45 100644 --- a/drivers/filesystems/btrfs/btrfs.c +++ b/drivers/filesystems/btrfs/btrfs.c @@ -4785,21 +4785,7 @@ static NTSTATUS mount_vol(_In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp) { goto exit; } - /* HACK: stream file object seems to get deleted at some point - * leading to use after free when installing ReactOS on - * BtrFS. - * Workaround: leak a handle to the fileobject - * XXX: Could be improved by storing it somewhere and releasing it - * on dismount. Or even by referencing again the file object. - */ -#ifndef __REACTOS__ Vcb->root_file = IoCreateStreamFileObject(NULL, DeviceToMount); -#else - { - HANDLE Dummy; - Vcb->root_file = IoCreateStreamFileObjectEx(NULL, DeviceToMount, &Dummy); - } -#endif Vcb->root_file->FsContext = root_fcb; Vcb->root_file->SectionObjectPointer = &root_fcb->nonpaged->segment_object; Vcb->root_file->Vpb = DeviceObject->Vpb;

5 years, 3 months

[reactos] 02/02: [SDK] Workaround MSVC2010 not having _Bool type

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ddc853a4be9c8ae821149… commit ddc853a4be9c8ae821149a7ed4f5bbc7c44abbfc Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:56:58 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:56:58 2019 +0200 [SDK] Workaround MSVC2010 not having _Bool type CORE-16366 --- sdk/include/crt/stdbool.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/crt/stdbool.h b/sdk/include/crt/stdbool.h index 5cb66b55d02..497bb493cb6 100644 --- a/sdk/include/crt/stdbool.h +++ b/sdk/include/crt/stdbool.h @@ -28,7 +28,11 @@ /* Don't define bool, true, and false in C++, except as a GNU extension. */ #ifndef __cplusplus +#if _MSC_VER <= 1600 +#define bool unsigned char +#else #define bool _Bool +#endif #define true 1 #define false 0 #elif defined(__GNUC__) && !defined(__STRICT_ANSI__)

5 years, 3 months

[reactos] 01/02: [BTRFS] bool must be 1-sized

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e3c0d360b58a005f84e8… commit 6e3c0d360b58a005f84e8ccf236f2b577a3adb2e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:56:26 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:56:26 2019 +0200 [BTRFS] bool must be 1-sized CORE-16366 --- drivers/filesystems/btrfs/btrfs_drv.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index 3af0170e6c9..67cb24902c7 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -70,6 +70,10 @@ #include "btrfs.h" #include "btrfsioctl.h" +#ifdef __REACTOS__ +C_ASSERT(sizeof(bool) == 1); +#endif + #ifdef _DEBUG // #define DEBUG_FCB_REFCOUNTS // #define DEBUG_LONG_MESSAGES

5 years, 3 months

[reactos] 01/01: [MOUNTMGR] Remove a leftover UNREFERENCED_PARAMETER()

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b45f27cf2e9d0f554b5ca… commit b45f27cf2e9d0f554b5ca96158a737e72f269274 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Sep 6 01:50:34 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:34:14 2019 +0200 [MOUNTMGR] Remove a leftover UNREFERENCED_PARAMETER() Addendum to 77657c22c950dc1d5404df1cac7ce06e0cf8fa24. --- drivers/filters/mountmgr/symlink.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/filters/mountmgr/symlink.c b/drivers/filters/mountmgr/symlink.c index 254eb2fb452..f4d23815249 100644 --- a/drivers/filters/mountmgr/symlink.c +++ b/drivers/filters/mountmgr/symlink.c @@ -114,8 +114,6 @@ GlobalCreateSymbolicLink(IN PUNICODE_STRING DosName, NTSTATUS Status; UNICODE_STRING GlobalName; - UNREFERENCED_PARAMETER(DeviceName); - /* First create the global string */ Status = CreateStringWithGlobal(DosName, &GlobalName); if (!NT_SUCCESS(Status))

5 years, 3 months

[reactos] 02/02: [MOUNTMGR] Don't overrun output buffer in QueryPointsFromMemory

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff19ce934bf35768e3478… commit ff19ce934bf35768e3478bf484ed4935bb826eb3 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:30:18 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:30:18 2019 +0200 [MOUNTMGR] Don't overrun output buffer in QueryPointsFromMemory --- drivers/filters/mountmgr/point.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index 77fc6fba95f..4c1d843db50 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -342,6 +342,8 @@ QueryPointsFromMemory(IN PDEVICE_EXTENSION DeviceExtension, if (MountPoints->Size > Stack->Parameters.DeviceIoControl.OutputBufferLength) { + Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS); + return STATUS_BUFFER_OVERFLOW; }

5 years, 3 months

[reactos] 01/02: [MOUNTMGR] Fix QueryPointsFromSymbolicLinkName and make it working

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26a31b160ab3db16bf92c… commit 26a31b160ab3db16bf92cc786e9d5ecf080057fe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Sep 6 08:28:36 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Sep 6 08:28:36 2019 +0200 [MOUNTMGR] Fix QueryPointsFromSymbolicLinkName and make it working Select the current stack location for output buffer And set output size so that buffer gets properly copied to caller --- drivers/filters/mountmgr/point.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/filters/mountmgr/point.c b/drivers/filters/mountmgr/point.c index d63ec3a4592..77fc6fba95f 100644 --- a/drivers/filters/mountmgr/point.c +++ b/drivers/filters/mountmgr/point.c @@ -518,7 +518,7 @@ QueryPointsFromSymbolicLinkName(IN PDEVICE_EXTENSION DeviceExtension, } /* Get output buffer */ - Stack = IoGetNextIrpStackLocation(Irp); + Stack = IoGetCurrentIrpStackLocation(Irp); MountPoints = (PMOUNTMGR_MOUNT_POINTS)Irp->AssociatedIrp.SystemBuffer; /* Compute output length */ @@ -528,9 +528,12 @@ QueryPointsFromSymbolicLinkName(IN PDEVICE_EXTENSION DeviceExtension, /* Give length to allow reallocation */ MountPoints->Size = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalLength; MountPoints->NumberOfMountPoints = 1; + Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS) + TotalLength; if (MountPoints->Size > Stack->Parameters.DeviceIoControl.OutputBufferLength) { + Irp->IoStatus.Information = sizeof(MOUNTMGR_MOUNT_POINTS); + return STATUS_BUFFER_OVERFLOW; }

5 years, 3 months

← Newer
1
...
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2019