From 422a69f8b4090e2a057b2d58c665d2c5ba04e4d3 Mon Sep 17 00:00:00 2001 From: "E. C. Masloch" Date: Tue, 14 Apr 2026 23:22:12 +0200 Subject: [PATCH 1/2] makelist: allow -sort-as- specifier in Unique ID As suggested for https://github.com/LoopZ/TheList/issues/62 --- utilities/makelist/makelist.lpr | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/utilities/makelist/makelist.lpr b/utilities/makelist/makelist.lpr index 1a4f9af3b..5e1661f11 100644 --- a/utilities/makelist/makelist.lpr +++ b/utilities/makelist/makelist.lpr @@ -632,13 +632,14 @@ procedure AddSMM(const Name : String; var Data : RawByteString); end; procedure FileToSection(const Name : String; var Data : RawByteString; - out ID, Category, Flags : String); + out IDSORT, IDLIST, Category, Flags : String); var - I : Integer; + I, SORTAS : Integer; H : TArrayOfString; K, V : String; begin - ID:=''; + IDSORT:=''; + IDLIST:=''; Category:=''; Flags:=''; // Remove Header Stub from Data @@ -655,9 +656,15 @@ procedure FileToSection(const Name : String; var Data : RawByteString; H[I]:=Trim(H[I]); case UpperCase(K) of 'UNIQUE ID' : begin - ID:=V; + IDSORT:=V; + IDLIST:=V; if H[I] <> '' then LogMessage(vbMinimal, 'Extraneous Data in Unique ID for file: '+ Name); + SORTAS := Pos('-sort-as-', IDSORT); + if SORTAS > 0 then begin + IDSORT := Copy(IDSORT, SORTAS + Length('-sort-as-')); + IDLIST := Copy(IDLIST, 1, SORTAS - 1); + end; end; 'CATEGORY' : begin if UpperCase(V) = 'N/A' then @@ -739,10 +746,10 @@ procedure HighestTable(const Name : String; const Data : RawByteString); procedure AddStandard(const Name : String; var Data : RawByteString); var - ID, Category, Flags : String; + IDSORT, IDLIST, Category, Flags : String; begin - FileToSection(Name, Data, ID, Category, Flags); - if ID='' then begin + FileToSection(Name, Data, IDSORT, IDLIST, Category, Flags); + if IDLIST='' then begin LogMessage(vbMinimal, TAB + 'No ID found for file: ' + Name); WriteIssue; Inc(TotalErrors); @@ -763,7 +770,7 @@ procedure AddStandard(const Name : String; var Data : RawByteString); Inc(TotalErrors); Exit; end; - AddToTree(Name, ID + SPACE + CATEGORY, SectionEntry(ID, Category) + Data); + AddToTree(Name, IDSORT, SectionEntry(IDLIST, Category) + Data); end; procedure AddDataFiles; From d87ad7a0f6bd553fd265ef6e3d815899ebd6962d Mon Sep 17 00:00:00 2001 From: "E. C. Masloch" Date: Tue, 14 Apr 2026 23:23:12 +0200 Subject: [PATCH 2/2] fix order of 21.58 DOS entries by adding -sort-as- to their unique IDs Second take of https://github.com/LoopZ/TheList/pull/63 --- .../INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt | 2 +- .../INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt index bb55b1a19..44e023f67 100644 --- a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt +++ b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- - Unique ID: 2158 + Unique ID: 2158-sort-as-215800 Category: D DOS kernel Flag: n/a -------------------------------------------------------------------------------- diff --git a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt index 58970ad9f..ee92014bb 100644 --- a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt +++ b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- - Unique ID: 2158 + Unique ID: 2158-sort-as-215802 Category: D DOS kernel Flag: n/a --------------------------------------------------------------------------------