Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/01: [ACPICA] Update to version 20191018. CORE-16434

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d170b6ab3e01a5861f5da… commit d170b6ab3e01a5861f5da9f1399550fa20ca79e8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 19 16:15:32 2019 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Nov 16 16:12:16 2019 +0100 [ACPICA] Update to version 20191018. CORE-16434 This includes a cherry-pick of https://github.com/acpica/acpica/commit/3e0d03893cc7d24d3993798eeb535da057f… to fix build. --- drivers/bus/acpi/acpica/dispatcher/dscontrol.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 9 +--- drivers/bus/acpi/acpica/events/evgpeblk.c | 6 ++- drivers/bus/acpi/acpica/events/evgpeinit.c | 3 -- drivers/bus/acpi/acpica/events/evmisc.c | 17 ++++-- drivers/bus/acpi/acpica/events/evregion.c | 4 +- drivers/bus/acpi/acpica/events/evrgnini.c | 1 - drivers/bus/acpi/acpica/hardware/hwxfsleep.c | 4 ++ drivers/bus/acpi/acpica/include/acdebug.h | 4 ++ drivers/bus/acpi/acpica/include/acpixf.h | 10 +++- drivers/bus/acpi/acpica/include/acstruct.h | 13 +++++ drivers/bus/acpi/acpica/include/acutils.h | 9 ++-- .../bus/acpi/acpica/include/platform/acfreebsd.h | 4 ++ drivers/bus/acpi/acpica/namespace/nsconvert.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdump.c | 6 +-- drivers/bus/acpi/acpica/namespace/nsxfname.c | 2 +- drivers/bus/acpi/acpica/parser/psobject.c | 6 +-- drivers/bus/acpi/acpica/resources/rscreate.c | 4 ++ drivers/bus/acpi/acpica/tables/tbdata.c | 4 ++ drivers/bus/acpi/acpica/tables/tbxfload.c | 49 ++++++++++++++++- drivers/bus/acpi/acpica/utilities/utbuffer.c | 62 ++++++++++++---------- drivers/bus/acpi/acpica/utilities/uttrack.c | 2 +- media/doc/3rd Party Files.txt | 2 +- 23 files changed, 161 insertions(+), 64 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c index b2bec503330..d78f765d7c2 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dscontrol.c +++ b/drivers/bus/acpi/acpica/dispatcher/dscontrol.c @@ -127,7 +127,7 @@ AcpiDsExecBeginControlOp ( ControlState->Control.Opcode = Op->Common.AmlOpcode; ControlState->Control.LoopTimeout = AcpiOsGetTimer () + - (UINT64) (AcpiGbl_MaxLoopIterations * ACPI_100NSEC_PER_SEC); + ((UINT64) AcpiGbl_MaxLoopIterations * ACPI_100NSEC_PER_SEC); /* Push the control state on this walk's control stack */ diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index 43c1fe4fa1c..4c3c7ff22f3 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -201,7 +201,6 @@ AcpiDsCreateBufferField ( if (WalkState->DeferredNode) { Node = WalkState->DeferredNode; - Status = AE_OK; } else { @@ -327,7 +326,6 @@ AcpiDsGetFieldNames ( ACPI_PARSE_OBJECT *Child; #ifdef ACPI_EXEC_APP - UINT64 Value = 0; ACPI_OPERAND_OBJECT *ResultDesc; ACPI_OPERAND_OBJECT *ObjDesc; char *NamePath; @@ -469,14 +467,13 @@ AcpiDsGetFieldNames ( } #ifdef ACPI_EXEC_APP NamePath = AcpiNsGetExternalPathname (Info->FieldNode); - ObjDesc = AcpiUtCreateIntegerObject (Value); - if (ACPI_SUCCESS (AeLookupInitFileEntry (NamePath, &Value))) + if (ACPI_SUCCESS (AeLookupInitFileEntry (NamePath, &ObjDesc))) { AcpiExWriteDataToField (ObjDesc, AcpiNsGetAttachedObject (Info->FieldNode), &ResultDesc); + AcpiUtRemoveReference (ObjDesc); } - AcpiUtRemoveReference (ObjDesc); ACPI_FREE (NamePath); #endif } @@ -705,8 +702,6 @@ AcpiDsInitFieldObjects ( } /* Name already exists, just ignore this error */ - - Status = AE_OK; } Arg->Common.Node = Node; diff --git a/drivers/bus/acpi/acpica/events/evgpeblk.c b/drivers/bus/acpi/acpica/events/evgpeblk.c index b523bbf50a9..283b5ffedd2 100644 --- a/drivers/bus/acpi/acpica/events/evgpeblk.c +++ b/drivers/bus/acpi/acpica/events/evgpeblk.c @@ -164,6 +164,10 @@ AcpiEvDeleteGpeBlock ( /* Disable all GPEs in this block */ Status = AcpiHwDisableGpeBlock (GpeBlock->XruptBlock, GpeBlock, NULL); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } if (!GpeBlock->Previous && !GpeBlock->Next) { @@ -434,7 +438,7 @@ AcpiEvCreateGpeBlock ( WalkInfo.GpeDevice = GpeDevice; WalkInfo.ExecuteByOwnerId = FALSE; - Status = AcpiNsWalkNamespace (ACPI_TYPE_METHOD, GpeDevice, + (void) AcpiNsWalkNamespace (ACPI_TYPE_METHOD, GpeDevice, ACPI_UINT32_MAX, ACPI_NS_WALK_NO_UNLOCK, AcpiEvMatchGpeMethod, NULL, &WalkInfo, NULL); diff --git a/drivers/bus/acpi/acpica/events/evgpeinit.c b/drivers/bus/acpi/acpica/events/evgpeinit.c index 9b2d5ce928c..82d3e0c6efe 100644 --- a/drivers/bus/acpi/acpica/events/evgpeinit.c +++ b/drivers/bus/acpi/acpica/events/evgpeinit.c @@ -194,8 +194,6 @@ AcpiEvGpeInitialize ( * GPE0 and GPE1 do not have to be contiguous in the GPE number * space. However, GPE0 always starts at GPE number zero. */ - GpeNumberMax = AcpiGbl_FADT.Gpe1Base + - ((RegisterCount1 * ACPI_GPE_REGISTER_WIDTH) - 1); } } @@ -207,7 +205,6 @@ AcpiEvGpeInitialize ( ACPI_DEBUG_PRINT ((ACPI_DB_INIT, "There are no GPE blocks defined in the FADT\n")); - Status = AE_OK; goto Cleanup; } diff --git a/drivers/bus/acpi/acpica/events/evmisc.c b/drivers/bus/acpi/acpica/events/evmisc.c index 37132d41bb6..b9bf22e44ad 100644 --- a/drivers/bus/acpi/acpica/events/evmisc.c +++ b/drivers/bus/acpi/acpica/events/evmisc.c @@ -292,11 +292,16 @@ AcpiEvTerminate ( /* Disable all GPEs in all GPE blocks */ Status = AcpiEvWalkGpeList (AcpiHwDisableGpeBlock, NULL); + if (ACPI_FAILURE (Status)) + { + ACPI_EXCEPTION ((AE_INFO, Status, + "Could not disable GPEs in GPE block")); + } Status = AcpiEvRemoveGlobalLockHandler (); - if (ACPI_FAILURE(Status)) + if (ACPI_FAILURE (Status)) { - ACPI_ERROR ((AE_INFO, + ACPI_EXCEPTION ((AE_INFO, Status, "Could not remove Global Lock handler")); } @@ -306,7 +311,7 @@ AcpiEvTerminate ( /* Remove SCI handlers */ Status = AcpiEvRemoveAllSciHandlers (); - if (ACPI_FAILURE(Status)) + if (ACPI_FAILURE (Status)) { ACPI_ERROR ((AE_INFO, "Could not remove SCI handler")); @@ -315,6 +320,12 @@ AcpiEvTerminate ( /* Deallocate all handler objects installed within GPE info structs */ Status = AcpiEvWalkGpeList (AcpiEvDeleteGpeHandlers, NULL); + if (ACPI_FAILURE (Status)) + { + ACPI_EXCEPTION ((AE_INFO, Status, + "Could not delete GPE handlers")); + } + /* Return to original mode if necessary */ diff --git a/drivers/bus/acpi/acpica/events/evregion.c b/drivers/bus/acpi/acpica/events/evregion.c index ea774e27b18..209bde717e4 100644 --- a/drivers/bus/acpi/acpica/events/evregion.c +++ b/drivers/bus/acpi/acpica/events/evregion.c @@ -929,11 +929,11 @@ AcpiEvOrphanEcRegMethod ( Objects[1].Type = ACPI_TYPE_INTEGER; Objects[1].Integer.Value = ACPI_REG_CONNECT; - Status = AcpiEvaluateObject (RegMethod, NULL, &Args, NULL); + (void) AcpiEvaluateObject (RegMethod, NULL, &Args, NULL); Exit: /* We ignore all errors from above, don't care */ - Status = AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); + (void) AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); return_VOID; } diff --git a/drivers/bus/acpi/acpica/events/evrgnini.c b/drivers/bus/acpi/acpica/events/evrgnini.c index 063afaa3055..5210a719d0d 100644 --- a/drivers/bus/acpi/acpica/events/evrgnini.c +++ b/drivers/bus/acpi/acpica/events/evrgnini.c @@ -255,7 +255,6 @@ AcpiEvPciConfigRegionSetup ( * root bridge. Still need to return a context object * for the new PCI_Config operation region, however. */ - Status = AE_OK; } else { diff --git a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c index 6531d0174b8..d1c35c5a11d 100644 --- a/drivers/bus/acpi/acpica/hardware/hwxfsleep.c +++ b/drivers/bus/acpi/acpica/hardware/hwxfsleep.c @@ -249,6 +249,10 @@ AcpiEnterSleepStateS4bios ( Status = AcpiHwWritePort (AcpiGbl_FADT.SmiCommand, (UINT32) AcpiGbl_FADT.S4BiosRequest, 8); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } do { AcpiOsStall (ACPI_USEC_PER_MSEC); diff --git a/drivers/bus/acpi/acpica/include/acdebug.h b/drivers/bus/acpi/acpica/include/acdebug.h index 6db3e3626c0..c8bdf774f8d 100644 --- a/drivers/bus/acpi/acpica/include/acdebug.h +++ b/drivers/bus/acpi/acpica/include/acdebug.h @@ -284,6 +284,10 @@ void AcpiDbGetBusInfo ( void); +ACPI_STATUS +AcpiDbDisplayFields ( + UINT32 AddressSpaceId); + /* * dbdisply - debug display commands diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index d84c008daf9..bf88d566950 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 0x20190816 +#define ACPI_CA_VERSION 0x20191018 #include "acconfig.h" #include "actypes.h" @@ -556,7 +556,13 @@ AcpiInstallTable ( ACPI_EXTERNAL_RETURN_STATUS ( ACPI_STATUS AcpiLoadTable ( - ACPI_TABLE_HEADER *Table)) + ACPI_TABLE_HEADER *Table, + UINT32 *TableIdx)) + +ACPI_EXTERNAL_RETURN_STATUS ( +ACPI_STATUS +AcpiUnloadTable ( + UINT32 TableIndex)) ACPI_EXTERNAL_RETURN_STATUS ( ACPI_STATUS diff --git a/drivers/bus/acpi/acpica/include/acstruct.h b/drivers/bus/acpi/acpica/include/acstruct.h index ae168d75780..755df603c0f 100644 --- a/drivers/bus/acpi/acpica/include/acstruct.h +++ b/drivers/bus/acpi/acpica/include/acstruct.h @@ -249,6 +249,19 @@ typedef struct acpi_device_walk_info } ACPI_DEVICE_WALK_INFO; +/* Info used by Acpi AcpiDbDisplayFields */ + +typedef struct acpi_region_walk_info +{ + UINT32 DebugLevel; + UINT32 Count; + ACPI_OWNER_ID OwnerId; + UINT8 DisplayType; + UINT32 AddressSpaceId; + +} ACPI_REGION_WALK_INFO; + + /* TBD: [Restructure] Merge with struct above */ typedef struct acpi_walk_info diff --git a/drivers/bus/acpi/acpica/include/acutils.h b/drivers/bus/acpi/acpica/include/acutils.h index 7e4922f810f..1bf5fd157f6 100644 --- a/drivers/bus/acpi/acpica/include/acutils.h +++ b/drivers/bus/acpi/acpica/include/acutils.h @@ -182,10 +182,11 @@ typedef struct acpi_pkg_info /* AcpiUtDumpBuffer */ -#define DB_BYTE_DISPLAY 1 -#define DB_WORD_DISPLAY 2 -#define DB_DWORD_DISPLAY 4 -#define DB_QWORD_DISPLAY 8 +#define DB_BYTE_DISPLAY 0x01 +#define DB_WORD_DISPLAY 0x02 +#define DB_DWORD_DISPLAY 0x04 +#define DB_QWORD_DISPLAY 0x08 +#define DB_DISPLAY_DATA_ONLY 0x10 /* diff --git a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h index 40da5b0a177..d49393890c8 100644 --- a/drivers/bus/acpi/acpica/include/platform/acfreebsd.h +++ b/drivers/bus/acpi/acpica/include/platform/acfreebsd.h @@ -95,6 +95,10 @@ #define DEBUGGER_THREADING 0 /* integrated with DDB */ +#ifdef INVARIANTS +#define ACPI_MUTEX_DEBUG +#endif + #else /* _KERNEL */ #if __STDC_HOSTED__ diff --git a/drivers/bus/acpi/acpica/namespace/nsconvert.c b/drivers/bus/acpi/acpica/namespace/nsconvert.c index a96ff5bd4d9..fe854747ce6 100644 --- a/drivers/bus/acpi/acpica/namespace/nsconvert.c +++ b/drivers/bus/acpi/acpica/namespace/nsconvert.c @@ -562,5 +562,5 @@ AcpiNsConvertToReference ( ErrorExit: ACPI_FREE (Name); *ReturnObject = NewObject; - return (AE_OK); + return (Status); } diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c b/drivers/bus/acpi/acpica/namespace/nsdump.c index 67ff9369587..085630c8a76 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdump.c +++ b/drivers/bus/acpi/acpica/namespace/nsdump.c @@ -369,7 +369,7 @@ AcpiNsDumpOneObject ( AcpiOsPrintf (" ="); for (i = 0; (i < ObjDesc->Buffer.Length && i < 12); i++) { - AcpiOsPrintf (" %.2hX", ObjDesc->Buffer.Pointer[i]); + AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]); } } AcpiOsPrintf ("\n"); @@ -466,7 +466,7 @@ AcpiNsDumpOneObject ( case ACPI_TYPE_LOCAL_BANK_FIELD: case ACPI_TYPE_LOCAL_INDEX_FIELD: - AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hd\n", + AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2X\n", (ObjDesc->CommonField.BaseByteOffset * 8) + ObjDesc->CommonField.StartFieldBitOffset, ObjDesc->CommonField.BitLength, @@ -651,8 +651,6 @@ AcpiNsDumpOneObject ( goto Cleanup; } - - ObjType = ACPI_TYPE_INVALID; /* Terminate loop after next pass */ } Cleanup: diff --git a/drivers/bus/acpi/acpica/namespace/nsxfname.c b/drivers/bus/acpi/acpica/namespace/nsxfname.c index 1d44670ef38..8c7e3710fb5 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfname.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfname.c @@ -503,7 +503,7 @@ AcpiGetObjectInfo ( if (Cls) { - NextIdString = AcpiNsCopyDeviceId (&Info->ClassCode, + (void) AcpiNsCopyDeviceId (&Info->ClassCode, Cls, NextIdString); } diff --git a/drivers/bus/acpi/acpica/parser/psobject.c b/drivers/bus/acpi/acpica/parser/psobject.c index fb9652ec85a..252c13fe580 100644 --- a/drivers/bus/acpi/acpica/parser/psobject.c +++ b/drivers/bus/acpi/acpica/parser/psobject.c @@ -544,7 +544,7 @@ AcpiPsCompleteOp ( WalkState->Opcode = (*Op)->Common.AmlOpcode; Status = WalkState->AscendingCallback (WalkState); - Status = AcpiPsNextParseState (WalkState, *Op, Status); + (void) AcpiPsNextParseState (WalkState, *Op, Status); Status2 = AcpiPsCompleteThisOp (WalkState, *Op); if (ACPI_FAILURE (Status2)) @@ -553,7 +553,6 @@ AcpiPsCompleteOp ( } } - Status = AE_OK; break; case AE_CTRL_BREAK: @@ -574,7 +573,7 @@ AcpiPsCompleteOp ( WalkState->Opcode = (*Op)->Common.AmlOpcode; Status = WalkState->AscendingCallback (WalkState); - Status = AcpiPsNextParseState (WalkState, *Op, Status); + (void) AcpiPsNextParseState (WalkState, *Op, Status); Status2 = AcpiPsCompleteThisOp (WalkState, *Op); if (ACPI_FAILURE (Status2)) @@ -582,7 +581,6 @@ AcpiPsCompleteOp ( return_ACPI_STATUS (Status2); } - Status = AE_OK; break; case AE_CTRL_TERMINATE: diff --git a/drivers/bus/acpi/acpica/resources/rscreate.c b/drivers/bus/acpi/acpica/resources/rscreate.c index 5f8d5351abc..67ae548d2a9 100644 --- a/drivers/bus/acpi/acpica/resources/rscreate.c +++ b/drivers/bus/acpi/acpica/resources/rscreate.c @@ -373,6 +373,10 @@ AcpiRsCreatePciRoutingTable ( Status = AcpiNsHandleToPathname ( (ACPI_HANDLE) Node, &PathBuffer, FALSE); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } /* +1 to include null terminator */ diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c b/drivers/bus/acpi/acpica/tables/tbdata.c index e6ac5bb1130..b4b6bb87e5e 100644 --- a/drivers/bus/acpi/acpica/tables/tbdata.c +++ b/drivers/bus/acpi/acpica/tables/tbdata.c @@ -1082,6 +1082,10 @@ AcpiTbLoadTable ( } Status = AcpiNsLoadTable (TableIndex, ParentNode); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } /* * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c b/drivers/bus/acpi/acpica/tables/tbxfload.c index 4db4f522fe3..bca66fee1ec 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfload.c +++ b/drivers/bus/acpi/acpica/tables/tbxfload.c @@ -337,6 +337,8 @@ ACPI_EXPORT_SYMBOL_INIT (AcpiInstallTable) * * PARAMETERS: Table - Pointer to a buffer containing the ACPI * table to be loaded. + * TableIdx - Pointer to a UINT32 for storing the table + * index, might be NULL * * RETURN: Status * @@ -350,7 +352,8 @@ ACPI_EXPORT_SYMBOL_INIT (AcpiInstallTable) ACPI_STATUS AcpiLoadTable ( - ACPI_TABLE_HEADER *Table) + ACPI_TABLE_HEADER *Table, + UINT32 *TableIdx) { ACPI_STATUS Status; UINT32 TableIndex; @@ -371,6 +374,11 @@ AcpiLoadTable ( ACPI_INFO (("Host-directed Dynamic ACPI Table Load:")); Status = AcpiTbInstallAndLoadTable (ACPI_PTR_TO_PHYSADDR (Table), ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE, &TableIndex); + if (TableIdx) + { + *TableIdx = TableIndex; + } + if (ACPI_SUCCESS (Status)) { /* Complete the initialization/resolution of new objects */ @@ -474,3 +482,42 @@ AcpiUnloadParentTable ( } ACPI_EXPORT_SYMBOL (AcpiUnloadParentTable) + + +/******************************************************************************* + * + * FUNCTION: AcpiUnloadTable + * + * PARAMETERS: TableIndex - Index as returned by AcpiLoadTable + * + * RETURN: Status + * + * DESCRIPTION: Via the TableIndex representing an SSDT or OEMx table, unloads + * the table and deletes all namespace objects associated with + * that table. Unloading of the DSDT is not allowed. + * Note: Mainly intended to support hotplug removal of SSDTs. + * + ******************************************************************************/ + +ACPI_STATUS +AcpiUnloadTable ( + UINT32 TableIndex) +{ + ACPI_STATUS Status; + + + ACPI_FUNCTION_TRACE (AcpiUnloadTable); + + + if (TableIndex == 1) + { + /* TableIndex==1 means DSDT is the owner. DSDT cannot be unloaded */ + + return_ACPI_STATUS (AE_TYPE); + } + + Status = AcpiTbUnloadTable (TableIndex); + return_ACPI_STATUS (Status); +} + +ACPI_EXPORT_SYMBOL (AcpiUnloadTable) diff --git a/drivers/bus/acpi/acpica/utilities/utbuffer.c b/drivers/bus/acpi/acpica/utilities/utbuffer.c index e1fdc01ed2e..09d4bbe4c60 100644 --- a/drivers/bus/acpi/acpica/utilities/utbuffer.c +++ b/drivers/bus/acpi/acpica/utilities/utbuffer.c @@ -78,8 +78,10 @@ AcpiUtDumpBuffer ( UINT32 j; UINT32 Temp32; UINT8 BufChar; + UINT32 DisplayDataOnly = Display & DB_DISPLAY_DATA_ONLY; + Display &= ~DB_DISPLAY_DATA_ONLY; if (!Buffer) { AcpiOsPrintf ("Null Buffer Pointer in DumpBuffer!\n"); @@ -97,7 +99,10 @@ AcpiUtDumpBuffer ( { /* Print current offset */ - AcpiOsPrintf ("%8.4X: ", (BaseOffset + i)); + if (!DisplayDataOnly) + { + AcpiOsPrintf ("%8.4X: ", (BaseOffset + i)); + } /* Print 16 hex chars */ @@ -149,38 +154,41 @@ AcpiUtDumpBuffer ( * Print the ASCII equivalent characters but watch out for the bad * unprintable ones (printable chars are 0x20 through 0x7E) */ - AcpiOsPrintf (" "); - for (j = 0; j < 16; j++) + if (!DisplayDataOnly) { - if (i + j >= Count) + AcpiOsPrintf (" "); + for (j = 0; j < 16; j++) { - AcpiOsPrintf ("\n"); - return; + if (i + j >= Count) + { + AcpiOsPrintf ("\n"); + return; + } + + /* + * Add comment characters so rest of line is ignored when + * compiled + */ + if (j == 0) + { + AcpiOsPrintf ("// "); + } + + BufChar = Buffer[(ACPI_SIZE) i + j]; + if (isprint (BufChar)) + { + AcpiOsPrintf ("%c", BufChar); + } + else + { + AcpiOsPrintf ("."); + } } - /* - * Add comment characters so rest of line is ignored when - * compiled - */ - if (j == 0) - { - AcpiOsPrintf ("// "); - } + /* Done with that line. */ - BufChar = Buffer[(ACPI_SIZE) i + j]; - if (isprint (BufChar)) - { - AcpiOsPrintf ("%c", BufChar); - } - else - { - AcpiOsPrintf ("."); - } + AcpiOsPrintf ("\n"); } - - /* Done with that line. */ - - AcpiOsPrintf ("\n"); i += 16; } diff --git a/drivers/bus/acpi/acpica/utilities/uttrack.c b/drivers/bus/acpi/acpica/utilities/uttrack.c index a3e50a18d1a..998b3d17b9b 100644 --- a/drivers/bus/acpi/acpica/utilities/uttrack.c +++ b/drivers/bus/acpi/acpica/utilities/uttrack.c @@ -756,7 +756,7 @@ AcpiUtDumpAllocations ( case ACPI_DESC_TYPE_PARSER: - AcpiOsPrintf ("AmlOpcode 0x%04hX\n", + AcpiOsPrintf ("AmlOpcode 0x%04X\n", Descriptor->Op.Asl.AmlOpcode); break; diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 419672d3c3f..7863c686f99 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -91,5 +91,5 @@ Used Version: 1.6.37 Website: http://libpng.sourceforge.net/ Title: ACPICA -Used Version: 20190509 +Used Version: 20191018 Website: https://acpica.org/

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic) No.14

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54c8cc66aba5cd32966e9… commit 54c8cc66aba5cd32966e9d2721fecfbe99c9b32d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 15:11:57 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 16 15:11:57 2019 +0900 [MEDIA][FONTS] Improve tahoma.ttf (Cyrillic) No.14 Tahoma. Version 0.010 khmz. 12px CYRILLIC CAPITAL LETTER DE. 12px CYRILLIC SMALL LETTER DE. CORE-8408 --- media/fonts/tahoma.ttf | Bin 155304 -> 155304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahoma.ttf b/media/fonts/tahoma.ttf index 617f9823696..a855d864036 100644 Binary files a/media/fonts/tahoma.ttf and b/media/fonts/tahoma.ttf differ

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.13

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f803ab091c707f595840… commit 9f803ab091c707f5958402958250f5afba8b56b3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 15:01:08 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 16 15:01:08 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.13 Tahoma Bold font. Version 0.007 khmz. 12px LATIN SMALL LETTER R. 12px CYRILLIC CAPITAL LETTER DE. 12px CYRILLIC SMALL LETTER TSE. 12px CYRILLIC SMALL LETTER DE. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 881734c77f0..35cc64dc7a9 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 11 months

[reactos] 01/01: [USER32] Improve DM_REPOSITION CORE-16490

by Katayma Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f981a68ee06749aff831a… commit f981a68ee06749aff831a6e80008e7ffacfe72a4 Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 12:52:40 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 16 12:52:40 2019 +0900 [USER32] Improve DM_REPOSITION CORE-16490 --- win32ss/user/user32/windows/dialog.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 3a88800a810..09879a74789 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -1185,39 +1185,37 @@ static void DEFDLG_Reposition(HWND hwnd) HMONITOR hMon; MONITORINFO mi = { sizeof(mi) }; RECT rc; - SIZE siz; + LONG cx, cy; if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) return; - hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); if (!GetMonitorInfoW(hMon, &mi) || !GetWindowRect(hwnd, &rc)) return; - siz.cx = rc.right - rc.left; - siz.cy = rc.bottom - rc.top; + cx = rc.right - rc.left; + cy = rc.bottom - rc.top; if (rc.right > mi.rcWork.right) { rc.right = mi.rcWork.right; - rc.left = rc.right - siz.cx; + rc.left = rc.right - cx; } if (rc.bottom > mi.rcWork.bottom - 4) { rc.bottom = mi.rcWork.bottom - 4; - rc.top = rc.bottom - siz.cy; + rc.top = rc.bottom - cy; } if (rc.left < mi.rcWork.left) { rc.left = mi.rcWork.left; - rc.right = rc.left + siz.cx; } if (rc.top < mi.rcWork.top) { rc.top = mi.rcWork.top; - rc.bottom = rc.top + siz.cy; } SetWindowPos(hwnd, NULL, rc.left, rc.top, 0, 0,

4 years, 11 months

[reactos] 01/01: [USER32] Fix DM_REPOSITION (rc.bottom minus 4)

by Katayma Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=657887adf41e1b5df0cab… commit 657887adf41e1b5df0cab35ce07a906ce5ef6265 Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 11:21:16 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 16 11:21:16 2019 +0900 [USER32] Fix DM_REPOSITION (rc.bottom minus 4) --- win32ss/user/user32/windows/dialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 592e696e755..3a88800a810 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -1203,9 +1203,9 @@ static void DEFDLG_Reposition(HWND hwnd) rc.right = mi.rcWork.right; rc.left = rc.right - siz.cx; } - if (rc.bottom > mi.rcWork.bottom) + if (rc.bottom > mi.rcWork.bottom - 4) { - rc.bottom = mi.rcWork.bottom; + rc.bottom = mi.rcWork.bottom - 4; rc.top = rc.bottom - siz.cy; }

4 years, 11 months

[reactos] 01/01: [USER32] Implement DM_REPOSITION message (#2020)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8249d2a3fa3fc1b69400c… commit 8249d2a3fa3fc1b69400c2a6660dd46e62f8c2e8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 09:51:16 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 16 09:51:16 2019 +0900 [USER32] Implement DM_REPOSITION message (#2020) DM_REPOSITION is dialog message that can reposition the dialog to the workarea when the dialog is partially/entirely in outside of the workarea. CORE-16490 --- win32ss/user/user32/windows/dialog.c | 56 ++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c index 8808ef89915..592e696e755 100644 --- a/win32ss/user/user32/windows/dialog.c +++ b/win32ss/user/user32/windows/dialog.c @@ -1179,7 +1179,52 @@ static BOOL DEFDLG_SetDefButton( HWND hwndDlg, DIALOGINFO *dlgInfo, HWND hwndNew return TRUE; } +#ifdef __REACTOS__ +static void DEFDLG_Reposition(HWND hwnd) +{ + HMONITOR hMon; + MONITORINFO mi = { sizeof(mi) }; + RECT rc; + SIZE siz; + + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + return; + + hMon = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); + if (!GetMonitorInfoW(hMon, &mi) || !GetWindowRect(hwnd, &rc)) + return; + + siz.cx = rc.right - rc.left; + siz.cy = rc.bottom - rc.top; + + if (rc.right > mi.rcWork.right) + { + rc.right = mi.rcWork.right; + rc.left = rc.right - siz.cx; + } + if (rc.bottom > mi.rcWork.bottom) + { + rc.bottom = mi.rcWork.bottom; + rc.top = rc.bottom - siz.cy; + } + + if (rc.left < mi.rcWork.left) + { + rc.left = mi.rcWork.left; + rc.right = rc.left + siz.cx; + } + if (rc.top < mi.rcWork.top) + { + rc.top = mi.rcWork.top; + rc.bottom = rc.top + siz.cy; + } + + SetWindowPos(hwnd, NULL, rc.left, rc.top, 0, 0, + SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | + SWP_NOZORDER); +} +#endif /*********************************************************************** * DEFDLG_Proc * @@ -1253,6 +1298,11 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam, } return 0; +#ifdef __REACTOS__ + case DM_REPOSITION: + DEFDLG_Reposition(hwnd); + return 0; +#endif case WM_NEXTDLGCTL: if (dlgInfo) { @@ -1692,6 +1742,9 @@ DefDlgProcA( case WM_SETFOCUS: case DM_SETDEFID: case DM_GETDEFID: +#ifdef __REACTOS__ + case DM_REPOSITION: +#endif case WM_NEXTDLGCTL: case WM_GETFONT: case WM_CLOSE: @@ -1752,6 +1805,9 @@ DefDlgProcW( case WM_SETFOCUS: case DM_SETDEFID: case DM_GETDEFID: +#ifdef __REACTOS__ + case DM_REPOSITION: +#endif case WM_NEXTDLGCTL: case WM_GETFONT: case WM_CLOSE:

4 years, 11 months

[reactos] 01/01: [NTUSER] Support MK_SHIFT/MK_CONTROL of mouse messages (#2038)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=462b1b744496f13f1600e… commit 462b1b744496f13f1600ef9cd406027cbb134b36 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 09:49:49 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 16 09:49:49 2019 +0900 [NTUSER] Support MK_SHIFT/MK_CONTROL of mouse messages (#2038) Upon mouse message generation, The states of Shift key and/or Ctrl key must be used. If Shift key is pressed, it enables MK_SHIFT flag of the mouse message. If Ctrl key is pressed, it enables MK_CONTROL flag of the mouse message. CORE-16279 --- win32ss/user/ntuser/mouse.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/win32ss/user/ntuser/mouse.c b/win32ss/user/ntuser/mouse.c index df8d7a6cc70..6d410681592 100644 --- a/win32ss/user/ntuser/mouse.c +++ b/win32ss/user/ntuser/mouse.c @@ -227,6 +227,16 @@ UserSendMouseInput(MOUSEINPUT *pmi, BOOL bInjected) UserSetCursorPos(ptCursor.x, ptCursor.y, bInjected, pmi->dwExtraInfo, TRUE); } + if (IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT)) + pCurInfo->ButtonsDown |= MK_SHIFT; + else + pCurInfo->ButtonsDown &= ~MK_SHIFT; + + if (IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) + pCurInfo->ButtonsDown |= MK_CONTROL; + else + pCurInfo->ButtonsDown &= ~MK_CONTROL; + /* Left button */ if (dwFlags & MOUSEEVENTF_LEFTDOWN) {

4 years, 11 months

[reactos] 01/01: [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.12

by Katayma Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=67c78d88c885ca92c72e2… commit 67c78d88c885ca92c72e2bcf59ddcf1d429096b1 Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 09:14:58 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 16 09:14:58 2019 +0900 [MEDIA][FONTS] Improve tahomabd.ttf (Cyrillic and Latin) No.12 Tahoma Bold. Version 0.006 khmz. 12px LATIN SMALL LETTER E. 12px LATIN SMALL LETTER O. 12px CYRILLIC CAPITAL LETTER TSE. 12px CYRILLIC SMALL LETTER ZHE. 12px CYRILLIC SMALL LETTER I. 12px CYRILLIC SMALL LETTER SHORT I. 12px CYRILLIC SMALL LETTER KA. CORE-8408 --- media/fonts/tahomabd.ttf | Bin 160488 -> 160488 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/tahomabd.ttf b/media/fonts/tahomabd.ttf index 90ba77cd38b..881734c77f0 100644 Binary files a/media/fonts/tahomabd.ttf and b/media/fonts/tahomabd.ttf differ

4 years, 11 months

[reactos] 01/01: [SHELL32_APITEST] Strengthen DragDrop testcase (#2040)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e5f8c98ee8dbe5e1e10e… commit 8e5f8c98ee8dbe5e1e10ef1e84c954caddbc53b0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 16 02:23:25 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 16 02:23:25 2019 +0900 [SHELL32_APITEST] Strengthen DragDrop testcase (#2040) CORE-11238 --- modules/rostests/apitests/shell32/DragDrop.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/shell32/DragDrop.cpp b/modules/rostests/apitests/shell32/DragDrop.cpp index 43e06f5a0b2..8e35834490f 100644 --- a/modules/rostests/apitests/shell32/DragDrop.cpp +++ b/modules/rostests/apitests/shell32/DragDrop.cpp @@ -60,14 +60,20 @@ static const TEST_ENTRY s_TestEntries[] = { __LINE__, OP_NONE, S_OK, S_OK, MK_LBUTTON, D_NONE, D_NONE, D_NONE }, { __LINE__, OP_COPY, S_OK, S_OK, MK_LBUTTON, D_COPY, D_COPY, D_COPY }, { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON, D_COPY | D_MOVE, D_MOVE, D_NONE }, + { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON, D_COPY | D_MOVE | D_LINK, D_MOVE, D_NONE }, + { __LINE__, OP_COPY, S_OK, S_OK, MK_LBUTTON, D_COPY | D_LINK, D_COPY, D_COPY }, { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON, D_MOVE, D_MOVE, D_NONE }, + { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON, D_MOVE | D_LINK, D_MOVE, D_NONE }, { __LINE__, OP_LINK, S_OK, S_OK, MK_LBUTTON, D_LINK, D_LINK, D_LINK }, // MK_LBUTTON | MK_SHIFT { __LINE__, OP_NONE, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_NONE, D_NONE, D_NONE }, { __LINE__, OP_NONE_OR_COPY, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_COPY, D_NONE_OR_COPY, D_NONE_OR_COPY }, { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_COPY | D_MOVE, D_MOVE, D_NONE }, + { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_COPY | D_MOVE | D_LINK, D_MOVE, D_NONE }, + { __LINE__, OP_NONE_OR_COPY, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_COPY | D_LINK, D_NONE_OR_COPY, D_NONE_OR_COPY }, { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_MOVE, D_MOVE, D_NONE }, + { __LINE__, OP_MOVE, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_MOVE | D_LINK, D_MOVE, D_NONE }, { __LINE__, OP_NONE_OR_LINK, S_OK, S_OK, MK_LBUTTON | MK_SHIFT, D_LINK, D_NONE_OR_LINK, D_NONE_OR_LINK }, // MK_LBUTTON | MK_SHIFT | MK_CONTROL @@ -75,7 +81,10 @@ static const TEST_ENTRY s_TestEntries[] = { __LINE__, OP_NONE, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_NONE, D_NONE, D_NONE }, { __LINE__, OP_NONE_OR_COPY, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_COPY, D_NONE_OR_COPY, D_NONE_OR_COPY }, { __LINE__, OP_NONE_OR_COPY, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_COPY | D_MOVE, D_NONE_OR_COPY, D_NONE_OR_COPY }, - { __LINE__, OP_NONE_OR_MOVE, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_MOVE, D_NONE_OR_MOVE, D_NONE_OR_MOVE }, + { __LINE__, OP_LINK, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_COPY | D_MOVE | D_LINK, D_LINK, D_LINK }, + { __LINE__, OP_LINK, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_COPY | D_LINK, D_LINK, D_LINK }, + { __LINE__, OP_NONE_OR_MOVE, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_MOVE, D_NONE_OR_MOVE, D_NONE }, + { __LINE__, OP_LINK, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_MOVE | D_LINK, D_LINK, D_LINK }, { __LINE__, OP_LINK, S_OK, S_OK, MK_LBUTTON_SHIFT_CTRL, D_LINK, D_LINK, D_LINK }, #undef MK_LBUTTON_SHIFT_CTRL @@ -83,7 +92,10 @@ static const TEST_ENTRY s_TestEntries[] = { __LINE__, OP_NONE, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_NONE, D_NONE, D_NONE }, { __LINE__, OP_COPY, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_COPY, D_COPY, D_COPY }, { __LINE__, OP_COPY, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_COPY | D_MOVE, D_COPY, D_COPY }, - { __LINE__, OP_NONE_OR_MOVE, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_MOVE, D_NONE_OR_MOVE, D_NONE_OR_MOVE }, + { __LINE__, OP_COPY, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_COPY | D_MOVE | D_LINK, D_COPY, D_COPY }, + { __LINE__, OP_COPY, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_COPY | D_LINK, D_COPY, D_COPY }, + { __LINE__, OP_NONE_OR_MOVE, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_MOVE, D_NONE_OR_MOVE, D_NONE }, + { __LINE__, OP_NONE_OR_MOVE, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_MOVE | D_LINK, D_NONE_OR_MOVE, D_NONE }, { __LINE__, OP_NONE_OR_LINK, S_OK, S_OK, MK_LBUTTON | MK_CONTROL, D_LINK, D_NONE_OR_LINK, D_NONE_OR_LINK }, };

4 years, 11 months

[reactos] 01/01: [CMAKE] Fix host tools build on x86-64 mingw

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=493ceb7ade319953858b6… commit 493ceb7ade319953858b6b481602602f6d864e93 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Nov 15 14:07:46 2019 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Nov 15 16:22:06 2019 +0100 [CMAKE] Fix host tools build on x86-64 mingw Dynamically check for sys/types.h and pid_t in wine config.h Use TARGET_xxx defines instead of _X86_ as this is undefined by GCC Add some sense in include directories management by using interface libraries --- CMakeLists.txt | 3 +-- dll/win32/dbghelp/CMakeLists.txt | 5 +---- dll/win32/dbghelp/compat.h | 12 ++++++++++-- sdk/include/host/CMakeLists.txt | 19 +++++++++++++++++++ sdk/include/host/{config.h => config.h.in} | 6 ++++++ sdk/lib/3rdparty/zlib/CMakeLists.txt | 5 ++++- sdk/lib/cmlib/CMakeLists.txt | 3 ++- sdk/lib/inflib/CMakeLists.txt | 3 ++- sdk/tools/CMakeLists.txt | 2 ++ sdk/tools/cabman/CMakeLists.txt | 3 +-- sdk/tools/fatten/CMakeLists.txt | 1 + sdk/tools/kbdtool/CMakeLists.txt | 1 + sdk/tools/log2lines/CMakeLists.txt | 2 +- sdk/tools/mkhive/CMakeLists.txt | 12 +++--------- sdk/tools/rsym/CMakeLists.txt | 9 +++++---- sdk/tools/unicode/CMakeLists.txt | 3 ++- sdk/tools/widl/CMakeLists.txt | 2 +- sdk/tools/wpp/CMakeLists.txt | 2 +- sdk/tools/xml2sdb/CMakeLists.txt | 1 + 19 files changed, 64 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa2fefdb138..73b4e69a555 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,8 +88,7 @@ if(NOT CMAKE_CROSSCOMPILING) add_definitions(/Dinline=__inline) endif() endif() - - include_directories(sdk/include/host) + add_subdirectory(sdk/include/host) if(NOT MSVC) add_subdirectory(dll/win32/dbghelp) diff --git a/dll/win32/dbghelp/CMakeLists.txt b/dll/win32/dbghelp/CMakeLists.txt index 319d38c0e80..f1790d0d19a 100644 --- a/dll/win32/dbghelp/CMakeLists.txt +++ b/dll/win32/dbghelp/CMakeLists.txt @@ -7,10 +7,6 @@ endif() if(NOT CMAKE_CROSSCOMPILING) add_definitions(-DDBGHELP_STATIC_LIB) - if(ARCH STREQUAL "i386") - add_definitions(-D_X86_) - endif() - include_directories( ${REACTOS_SOURCE_DIR}/tools ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) @@ -32,6 +28,7 @@ if(NOT CMAKE_CROSSCOMPILING) endif() add_library(dbghelphost ${SOURCE}) + target_link_libraries(dbghelphost PRIVATE host_includes) else() add_definitions( -D__WINESRC__ diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index a3565852533..b662cdde79a 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -200,7 +200,7 @@ typedef struct _EXCEPTION_RECORD { DWORD NumberParameters; ULONG_PTR ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; } EXCEPTION_RECORD, *PEXCEPTION_RECORD; -#if defined(_X86_) +#if defined(TARGET_i386) #define SIZE_OF_80387_REGISTERS 80 #define CONTEXT_i386 0x10000 #define CONTEXT_i486 0x10000 @@ -257,7 +257,11 @@ typedef struct _CONTEXT { BYTE ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION]; } CONTEXT, *PCONTEXT; -#else /* ARM? */ +#elif defined TARGET_amd64 + +#error "Please define the CONTEXT structure for amd64 platform" + +#elif defined TARGET_arm /* ARM? */ /* The following flags control the contents of the CONTEXT structure. */ @@ -356,6 +360,10 @@ typedef struct _CONTEXT { BOOLEAN CDECL RtlAddFunctionTable(RUNTIME_FUNCTION*,DWORD,DWORD); BOOLEAN CDECL RtlDeleteFunctionTable(RUNTIME_FUNCTION*); PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry(ULONG_PTR,DWORD*,UNWIND_HISTORY_TABLE*); +#else + +#error "Unknown target platform" + #endif typedef diff --git a/sdk/include/host/CMakeLists.txt b/sdk/include/host/CMakeLists.txt new file mode 100644 index 00000000000..216e0120bdb --- /dev/null +++ b/sdk/include/host/CMakeLists.txt @@ -0,0 +1,19 @@ + +include(CheckIncludeFile) +include(CheckTypeSize) + +# check for <sys/types.h> +CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H) + +# check for pid_t definition +if (HAVE_SYS_TYPES_H) + set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h") + #this sets HAVE_PID_T + CHECK_TYPE_SIZE("pid_t" PID_T) + unset(CMAKE_EXTRA_INCLUDE_FILES) +endif() + +configure_file(config.h.in config.h @ONLY) + +add_library(host_includes INTERFACE) +target_include_directories(host_includes INTERFACE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/sdk/include/host/config.h b/sdk/include/host/config.h.in similarity index 95% rename from sdk/include/host/config.h rename to sdk/include/host/config.h.in index e6bb8afb6ea..5ba4eaa7460 100644 --- a/sdk/include/host/config.h +++ b/sdk/include/host/config.h.in @@ -3,6 +3,12 @@ #define __WINE_CONFIG_H +/* Define to 1 if you have the <sys/types.h> header file. */ +#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ + +/* Define to 1 if the system has the type `pid_t'. */ +#cmakedefine HAVE_PID_T 1 + #define HAVE_SPAWNVP 1 /* Define to 1 if you have the `z' library (-lz). */ diff --git a/sdk/lib/3rdparty/zlib/CMakeLists.txt b/sdk/lib/3rdparty/zlib/CMakeLists.txt index e507fe284d8..c68a46ee90c 100644 --- a/sdk/lib/3rdparty/zlib/CMakeLists.txt +++ b/sdk/lib/3rdparty/zlib/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DNO_VIZ) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) list(APPEND SOLO_SOURCE adler32.c @@ -35,11 +34,15 @@ list(APPEND MINIZIP_SOURCE if(CMAKE_CROSSCOMPILING) add_library(zlib ${SOURCE} ${SOLO_SOURCE}) + target_include_directories(zlib PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) add_library(zlib_solo ${SOLO_SOURCE}) add_target_compile_definitions(zlib_solo Z_SOLO) + target_include_directories(zlib_solo PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) add_library(minizip ${MINIZIP_SOURCE}) add_dependencies(minizip psdk) + target_include_directories(minizip PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) else() add_library(zlibhost ${SOLO_SOURCE}) add_target_compile_definitions(zlibhost Z_SOLO) + target_include_directories(zlibhost PUBLIC ${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) endif() diff --git a/sdk/lib/cmlib/CMakeLists.txt b/sdk/lib/cmlib/CMakeLists.txt index 21839350111..c94674f0cf8 100644 --- a/sdk/lib/cmlib/CMakeLists.txt +++ b/sdk/lib/cmlib/CMakeLists.txt @@ -26,10 +26,11 @@ else() -D__NO_CTYPE_INLINES -DCMLIB_HOST) add_library(cmlibhost ${SOURCE}) + target_include_directories(cmlibhost INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) if(NOT MSVC) add_target_compile_flags(cmlibhost "-fshort-wchar -Wno-multichar") endif() - target_link_libraries(cmlibhost unicode) + target_link_libraries(cmlibhost PRIVATE host_includes) endif() diff --git a/sdk/lib/inflib/CMakeLists.txt b/sdk/lib/inflib/CMakeLists.txt index bf8086acf08..1688d691b3e 100644 --- a/sdk/lib/inflib/CMakeLists.txt +++ b/sdk/lib/inflib/CMakeLists.txt @@ -23,10 +23,11 @@ else() add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_SECURE_NO_WARNINGS) add_library(inflibhost ${SOURCE}) + target_include_directories(inflibhost INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) if(NOT MSVC) add_target_compile_flags(inflibhost "-fshort-wchar -Wpointer-arith -Wwrite-strings") endif() - target_link_libraries(inflibhost unicode) + target_link_libraries(inflibhost PRIVATE host_includes) endif() diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index d89372552e9..7fab47e68ba 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -19,6 +19,8 @@ add_host_tool(gendib gendib/gendib.c) add_host_tool(geninc geninc/geninc.c) add_host_tool(mkshelllink mkshelllink/mkshelllink.c) add_host_tool(obj2bin obj2bin/obj2bin.c) +target_link_libraries(obj2bin PRIVATE host_includes) + add_host_tool(spec2def spec2def/spec2def.c) add_host_tool(utf16le utf16le/utf16le.cpp) diff --git a/sdk/tools/cabman/CMakeLists.txt b/sdk/tools/cabman/CMakeLists.txt index f684c73f359..938478b57bb 100644 --- a/sdk/tools/cabman/CMakeLists.txt +++ b/sdk/tools/cabman/CMakeLists.txt @@ -7,6 +7,5 @@ list(APPEND SOURCE raw.cxx CCFDATAStorage.cxx) -include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs/zlib) add_host_tool(cabman ${SOURCE}) -target_link_libraries(cabman zlibhost) +target_link_libraries(cabman PRIVATE host_includes zlibhost) diff --git a/sdk/tools/fatten/CMakeLists.txt b/sdk/tools/fatten/CMakeLists.txt index e3d507f8b26..902db728f8b 100644 --- a/sdk/tools/fatten/CMakeLists.txt +++ b/sdk/tools/fatten/CMakeLists.txt @@ -4,3 +4,4 @@ add_host_tool(fatten fatfs/diskio.c fatfs/ff.c fatfs/option/ccsbcs.c) +target_link_libraries(fatten PRIVATE host_includes) diff --git a/sdk/tools/kbdtool/CMakeLists.txt b/sdk/tools/kbdtool/CMakeLists.txt index a8adaa25bf8..c525926ab52 100644 --- a/sdk/tools/kbdtool/CMakeLists.txt +++ b/sdk/tools/kbdtool/CMakeLists.txt @@ -1,2 +1,3 @@ add_host_tool(kbdtool data.c main.c output.c parser.c) +target_link_libraries(kbdtool PRIVATE host_includes) diff --git a/sdk/tools/log2lines/CMakeLists.txt b/sdk/tools/log2lines/CMakeLists.txt index e32f0bb2b26..bc74e8e8a3a 100644 --- a/sdk/tools/log2lines/CMakeLists.txt +++ b/sdk/tools/log2lines/CMakeLists.txt @@ -14,4 +14,4 @@ list(APPEND SOURCE include_directories(${REACTOS_SOURCE_DIR}/sdk/tools/rsym) add_host_tool(log2lines ${SOURCE}) -target_link_libraries(log2lines rsym_common) +target_link_libraries(log2lines PRIVATE host_includes rsym_common) diff --git a/sdk/tools/mkhive/CMakeLists.txt b/sdk/tools/mkhive/CMakeLists.txt index 5f9446f7ae6..7f1845d6387 100644 --- a/sdk/tools/mkhive/CMakeLists.txt +++ b/sdk/tools/mkhive/CMakeLists.txt @@ -1,11 +1,4 @@ -add_definitions(-DMKHIVE_HOST) - -include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/inflib - ${REACTOS_SOURCE_DIR}/sdk/lib/cmlib - ${REACTOS_SOURCE_DIR}/sdk/lib/rtl) - list(APPEND SOURCE binhive.c cmi.c @@ -15,9 +8,10 @@ list(APPEND SOURCE rtl.c) add_host_tool(mkhive ${SOURCE}) - +target_include_directories(mkhive PRIVATE ${REACTOS_SOURCE_DIR}/sdk/lib/rtl) +target_compile_definitions(mkhive PRIVATE -DMKHIVE_HOST) if(NOT MSVC) add_target_compile_flags(mkhive "-fshort-wchar") endif() -target_link_libraries(mkhive unicode cmlibhost inflibhost) +target_link_libraries(mkhive PRIVATE host_includes unicode cmlibhost inflibhost) diff --git a/sdk/tools/rsym/CMakeLists.txt b/sdk/tools/rsym/CMakeLists.txt index 26e6d2e34e2..370f74efd8c 100644 --- a/sdk/tools/rsym/CMakeLists.txt +++ b/sdk/tools/rsym/CMakeLists.txt @@ -1,9 +1,9 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/tools) -add_library(rsym_common rsym_common.c) +add_library(rsym_common STATIC rsym_common.c) +target_link_libraries(rsym_common PRIVATE host_includes) if(ARCH STREQUAL "i386") - add_definitions(-D_X86_) add_host_tool(rsym rsym.c) elseif(ARCH STREQUAL "amd64") add_host_tool(rsym rsym64.c) @@ -11,5 +11,6 @@ elseif(ARCH STREQUAL "arm") add_executable(rsym rsym64.c) endif() -target_link_libraries(rsym rsym_common dbghelphost zlibhost unicode) -add_host_tool(raddr2line rsym_common.c raddr2line.c) +target_link_libraries(rsym PRIVATE host_includes rsym_common dbghelphost zlibhost unicode) +add_host_tool(raddr2line raddr2line.c) +target_link_libraries(raddr2line PRIVATE host_includes rsym_common) diff --git a/sdk/tools/unicode/CMakeLists.txt b/sdk/tools/unicode/CMakeLists.txt index 8e6c09f5b88..7e758617e7d 100644 --- a/sdk/tools/unicode/CMakeLists.txt +++ b/sdk/tools/unicode/CMakeLists.txt @@ -83,7 +83,8 @@ list(APPEND SOURCE wctomb.c wctype.c) -add_library(unicode ${SOURCE}) +add_library(unicode STATIC ${SOURCE}) +target_link_libraries(unicode PRIVATE host_includes) if(MSVC) # Disable warning "'<': signed/unsigned mismatch" diff --git a/sdk/tools/widl/CMakeLists.txt b/sdk/tools/widl/CMakeLists.txt index a37a80d977f..51e7356ee74 100644 --- a/sdk/tools/widl/CMakeLists.txt +++ b/sdk/tools/widl/CMakeLists.txt @@ -34,7 +34,7 @@ list(APPEND SOURCE # Taken from widl.rbuild add_definitions(-DINT16=SHORT) add_host_tool(widl ${SOURCE}) -target_link_libraries(widl wpphost) +target_link_libraries(widl PRIVATE host_includes wpphost) if(MSVC) # Disable warning "'>': signed/unsigned mismatch" diff --git a/sdk/tools/wpp/CMakeLists.txt b/sdk/tools/wpp/CMakeLists.txt index 39f3b2d9f99..4eef72c5231 100644 --- a/sdk/tools/wpp/CMakeLists.txt +++ b/sdk/tools/wpp/CMakeLists.txt @@ -28,7 +28,6 @@ if(CMAKE_CROSSCOMPILING) -Dstrtoll=_strtoi64 -Dopen=_open -Dclose=_close) - include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) endif() @@ -42,4 +41,5 @@ if(CMAKE_CROSSCOMPILING) add_library(wpp ${SOURCE}) else() add_library(wpphost ${SOURCE}) + target_link_libraries(wpphost PRIVATE host_includes) endif() diff --git a/sdk/tools/xml2sdb/CMakeLists.txt b/sdk/tools/xml2sdb/CMakeLists.txt index 15e2fc73e0b..8c302ced7dc 100644 --- a/sdk/tools/xml2sdb/CMakeLists.txt +++ b/sdk/tools/xml2sdb/CMakeLists.txt @@ -13,6 +13,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp ${REACTOS_SOURCE_DIR}/sdk/include/reactos/appcompat) add_host_tool(xml2sdb ${SOURCE}) +target_link_libraries(xml2sdb PRIVATE host_includes) if(MSVC) # Disable warning "'=': conversion from 'a' to 'b', possible loss of data"

4 years, 11 months

← Newer
1
...
15
16
17
18
19
20
21
...
33
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 November 2019