[ros-diffs] [reactos] 01/02: [ACPICA] Update to version 20200717. CORE-17170

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8605f660f479a6c391066…

commit 8605f660f479a6c391066817ff4308bb18ef179f
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sun Sep 6 12:29:37 2020 +0200
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Fri Oct 16 01:21:47 2020 +0200

    [ACPICA] Update to version 20200717. CORE-17170
---
 drivers/bus/acpi/acpica/executer/exprep.c         | 4 ----
 drivers/bus/acpi/acpica/include/acpixf.h          | 2 +-
 drivers/bus/acpi/acpica/include/actypes.h         | 2 +-
 drivers/bus/acpi/acpica/include/platform/acmsvc.h | 3 +++
 drivers/bus/acpi/acpica/utilities/utdelete.c      | 6 +-----
 drivers/bus/acpi/acpica/utilities/utids.c         | 2 +-
 media/doc/3rd Party Files.txt                     | 2 +-
 7 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/bus/acpi/acpica/executer/exprep.c
b/drivers/bus/acpi/acpica/executer/exprep.c
index 720bd3488c8..b74f430bbd8 100644
--- a/drivers/bus/acpi/acpica/executer/exprep.c
+++ b/drivers/bus/acpi/acpica/executer/exprep.c
@@ -543,10 +543,6 @@ AcpiExPrepFieldValue (
             }
         }
 
-        /* An additional reference for the container */
-
-        AcpiUtAddReference (ObjDesc->Field.RegionObj);
-
         ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
             "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n",
             ObjDesc->Field.StartFieldBitOffset,
diff --git a/drivers/bus/acpi/acpica/include/acpixf.h
b/drivers/bus/acpi/acpica/include/acpixf.h
index 1fa5770c7b4..c14c302d617 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                 0x20200528
+#define ACPI_CA_VERSION                 0x20200717
 
 #include "acconfig.h"
 #include "actypes.h"
diff --git a/drivers/bus/acpi/acpica/include/actypes.h
b/drivers/bus/acpi/acpica/include/actypes.h
index cb8d7cd4d2d..86064afe79d 100644
--- a/drivers/bus/acpi/acpica/include/actypes.h
+++ b/drivers/bus/acpi/acpica/include/actypes.h
@@ -1271,7 +1271,7 @@ typedef struct acpi_pnp_device_id_list
 {
     UINT32                          Count;              /* Number of IDs in Ids array */
     UINT32                          ListSize;           /* Size of list, including ID
strings */
-    ACPI_PNP_DEVICE_ID              Ids[1];             /* ID array */
+    ACPI_PNP_DEVICE_ID              Ids[];              /* ID array */
 
 } ACPI_PNP_DEVICE_ID_LIST;
 
diff --git a/drivers/bus/acpi/acpica/include/platform/acmsvc.h
b/drivers/bus/acpi/acpica/include/platform/acmsvc.h
index 48672f84ced..aa3492e087d 100644
--- a/drivers/bus/acpi/acpica/include/platform/acmsvc.h
+++ b/drivers/bus/acpi/acpica/include/platform/acmsvc.h
@@ -230,6 +230,9 @@
 /* warn C4131: uses old-style declarator (iASL compiler only) */
 #pragma warning(disable:4459)
 
+/* warn c4200: allow flexible arrays (of zero length) */
+#pragma warning(disable:4200)
+
 #if _MSC_VER > 1200 /* Versions above VC++ 6 */
 #pragma warning( disable : 4295 ) /* needed for acpredef.h array */
 #endif
diff --git a/drivers/bus/acpi/acpica/utilities/utdelete.c
b/drivers/bus/acpi/acpica/utilities/utdelete.c
index c339dba4557..a816dc7ea42 100644
--- a/drivers/bus/acpi/acpica/utilities/utdelete.c
+++ b/drivers/bus/acpi/acpica/utilities/utdelete.c
@@ -641,11 +641,6 @@ AcpiUtUpdateObjectReference (
             NextObject = Object->BufferField.BufferObj;
             break;
 
-        case ACPI_TYPE_LOCAL_REGION_FIELD:
-
-            NextObject = Object->Field.RegionObj;
-            break;
-
         case ACPI_TYPE_LOCAL_BANK_FIELD:
 
             NextObject = Object->BankField.BankObj;
@@ -681,6 +676,7 @@ AcpiUtUpdateObjectReference (
             }
             break;
 
+        case ACPI_TYPE_LOCAL_REGION_FIELD:
         case ACPI_TYPE_REGION:
         default:
 
diff --git a/drivers/bus/acpi/acpica/utilities/utids.c
b/drivers/bus/acpi/acpica/utilities/utids.c
index 238d7eaf3bc..c857f040b74 100644
--- a/drivers/bus/acpi/acpica/utilities/utids.c
+++ b/drivers/bus/acpi/acpica/utilities/utids.c
@@ -327,7 +327,7 @@ AcpiUtExecute_CID (
      * 3) Size of the actual CID strings
      */
     CidListSize = sizeof (ACPI_PNP_DEVICE_ID_LIST) +
-        ((Count - 1) * sizeof (ACPI_PNP_DEVICE_ID)) +
+        (Count * sizeof (ACPI_PNP_DEVICE_ID)) +
         StringAreaSize;
 
     CidList = ACPI_ALLOCATE_ZEROED (CidListSize);
diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt
index dbca0168fb5..7280aed5f64 100644
--- a/media/doc/3rd Party Files.txt	
+++ b/media/doc/3rd Party Files.txt	
@@ -92,7 +92,7 @@ Used Version: 1.6.37
 Website: http://libpng.sourceforge.net/
 
 Title: ACPICA
-Used Version: 20200528
+Used Version: 20200717
 Website: https://acpica.org/
 
 Title: Schily Tools, mkisofs