[ros-diffs] [reactos] 01/01: [SDK] Improve gen_baseaddress.py and its output files (#4964)

[Joachim Henze]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fb580a8553e1028fb942…

commit 0fb580a8553e1028fb942ed8c061f9cd88d319e9
Author:     Joachim Henze <joachim.henze(a)reactos.org>
AuthorDate: Sat Mar 4 11:45:06 2023 +0100
Commit:     GitHub <noreply(a)github.com>
CommitDate: Sat Mar 4 11:45:06 2023 +0100

    [SDK] Improve gen_baseaddress.py and its output files (#4964)
    
    
    * [SDK:TOOLS] Improve gen_baseaddress.py
    
    Adds some kbd layout modules into the excludes-section:
    that we do lack for todays master: e.g._ kbdeo, kbdsf, kbdrost
    
    and also some that we lacked in the past
    (for improving backwards compatibility of the script to older rls-branches):
    kbdgm, kbdes, kbdgrist, kbdja, kbdko, kbdsk, kbdsk1
    
    * [SDK:CMAKE] Highlight in the output files where the script does misbehave
---
 sdk/cmake/baseaddress.cmake          |  8 ++++----
 sdk/cmake/baseaddress_dwarf.cmake    |  6 +++---
 sdk/cmake/baseaddress_msvc.cmake     |  6 +++---
 sdk/cmake/baseaddress_msvc_x64.cmake |  4 ++--
 sdk/tools/gen_baseaddress.py         | 10 ++++++++++
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake
index dbaad8bb9ba..02ad613b9b9 100644
--- a/sdk/cmake/baseaddress.cmake
+++ b/sdk/cmake/baseaddress.cmake
@@ -181,9 +181,9 @@ set(baseaddress_itss                           0x745e0000)
 set(baseaddress_joy                            0x745a0000)
 set(baseaddress_jscript                        0x74400000)
 set(baseaddress_jsproxy                        0x743d0000)
-set(baseaddress_kbdeo                          0x743b0000)
-set(baseaddress_kbdrost                        0x74390000)
-set(baseaddress_kbdsf                          0x74370000)
+#set(baseaddress_kbdeo                          0x743b0000) #unwanted, should vanish when
rerunning the script
+#set(baseaddress_kbdrost                        0x74390000) #unwanted, should vanish when
rerunning the script
+#set(baseaddress_kbdsf                          0x74370000) #unwanted, should vanish when
rerunning the script
 set(baseaddress_kbsdll                         0x74340000)
 set(baseaddress_kernel32_vista                 0x74320000)
 set(baseaddress_ksuser                         0x742f0000)
@@ -196,7 +196,7 @@ set(baseaddress_load_notifications             0x73cd0000)
 set(baseaddress_loadperf                       0x73ca0000)
 set(baseaddress_localmon                       0x73c40000)
 set(baseaddress_localspl                       0x73b50000)
-set(baseaddress_localspl_apitest               0x73b20000)
+set(baseaddress_localspl_apitest.dll           0x73b20000) #module name corrected
manually
 set(baseaddress_localui                        0x73ad0000)
 set(baseaddress_lpk                            0x73aa0000)
 set(baseaddress_lsasrv                         0x73a20000)
diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake
index 00b8d491251..3ddc970ad77 100644
--- a/sdk/cmake/baseaddress_dwarf.cmake
+++ b/sdk/cmake/baseaddress_dwarf.cmake
@@ -177,8 +177,8 @@ set(baseaddress_itss                           0x738e0000)
 set(baseaddress_joy                            0x73890000)
 set(baseaddress_jscript                        0x735b0000)
 set(baseaddress_jsproxy                        0x73560000)
-set(baseaddress_kbdeo                          0x73540000)
-set(baseaddress_kbdrost                        0x73520000)
+#set(baseaddress_kbdeo                          0x73540000) #unwanted, should vanish when
rerunning the script
+#set(baseaddress_kbdrost                        0x73520000) #unwanted, should vanish when
rerunning the script
 set(baseaddress_kbsdll                         0x734f0000)
 set(baseaddress_kernel32_vista                 0x734c0000)
 set(baseaddress_ksuser                         0x73490000)
@@ -191,7 +191,7 @@ set(baseaddress_load_notifications             0x72b70000)
 set(baseaddress_loadperf                       0x72b30000)
 set(baseaddress_localmon                       0x72ae0000)
 set(baseaddress_localspl                       0x72a60000)
-set(baseaddress_localspl_apitest               0x72a20000)
+set(baseaddress_localspl_apitest.dll           0x72a20000) #module name corrected
manually
 set(baseaddress_localui                        0x729e0000)
 set(baseaddress_lpk                            0x72990000)
 set(baseaddress_lsasrv                         0x728d0000)
diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake
index a4dee3b4993..13860cfef0c 100644
--- a/sdk/cmake/baseaddress_msvc.cmake
+++ b/sdk/cmake/baseaddress_msvc.cmake
@@ -177,8 +177,8 @@ set(baseaddress_itss                           0x78080000)
 set(baseaddress_joy                            0x78040000)
 set(baseaddress_jscript                        0x77f90000)
 set(baseaddress_jsproxy                        0x77f70000)
-set(baseaddress_kbdeo                          0x77f50000)
-set(baseaddress_kbdrost                        0x77f30000)
+#set(baseaddress_kbdeo                          0x77f50000) #unwanted, should vanish when
rerunning the script
+#set(baseaddress_kbdrost                        0x77f30000) #unwanted, should vanish when
rerunning the script
 set(baseaddress_kbsdll                         0x77f10000)
 set(baseaddress_kernel32_vista                 0x77ef0000)
 set(baseaddress_ksuser                         0x77ed0000)
@@ -191,7 +191,7 @@ set(baseaddress_load_notifications             0x77bf0000)
 set(baseaddress_loadperf                       0x77bd0000)
 set(baseaddress_localmon                       0x77bb0000)
 set(baseaddress_localspl                       0x77b80000)
-set(baseaddress_localspl_apitest               0x77b60000)
+set(baseaddress_localspl_apitest.dll           0x77b60000) #module name corrected
manually
 set(baseaddress_localui                        0x77b30000)
 set(baseaddress_lpk                            0x779f0000)
 set(baseaddress_lsasrv                         0x77990000)
diff --git a/sdk/cmake/baseaddress_msvc_x64.cmake b/sdk/cmake/baseaddress_msvc_x64.cmake
index a9a251aef1d..3f69f4e018f 100644
--- a/sdk/cmake/baseaddress_msvc_x64.cmake
+++ b/sdk/cmake/baseaddress_msvc_x64.cmake
@@ -174,7 +174,7 @@ set(baseaddress_itss                   0x7FF19500000)
 set(baseaddress_joy                    0x7FF19000000)
 set(baseaddress_jscript                0x7FF18500000) # 000A4000
 set(baseaddress_jsproxy                0x7FF17500000)
-set(baseaddress_kbdeo                  0x7FF17000000)
+#set(baseaddress_kbdeo                  0x7FF17000000) #unwanted, should vanish when
rerunning the script
 set(baseaddress_kbsdll                 0x7FF16500000)
 set(baseaddress_kernel32_vista         0x7FF15500000)
 set(baseaddress_ksuser                 0x7FF14500000)
@@ -187,7 +187,7 @@ set(baseaddress_load_notifications     0x7FF10000000)
 set(baseaddress_loadperf               0x7FF0F500000)
 set(baseaddress_localmon               0x7FF0F000000)
 set(baseaddress_localspl               0x7FF0E500000)
-set(baseaddress_localspl_apitest       0x7FF0E000000)
+set(baseaddress_localspl_apitest.dll   0x7FF0E000000) #module name corrected manually
 set(baseaddress_localui                0x7FF0D500000)
 set(baseaddress_lpk                    0x7FF0C500000)
 set(baseaddress_lsasrv                 0x7FF0B500000)
diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py
index 51e89d0870d..e7a691424da 100644
--- a/sdk/tools/gen_baseaddress.py
+++ b/sdk/tools/gen_baseaddress.py
@@ -120,6 +120,7 @@ EXCLUDE = (
     'kbdazel.dll',
     'kbdbe.dll',
     'kbdbga.dll',
+    'kbdbgm.dll',
     'kbdbgt.dll',
     'kbdblr.dll',
     'kbdbr.dll',
@@ -131,6 +132,8 @@ EXCLUDE = (
     'kbdcz1.dll',
     'kbdda.dll',
     'kbddv.dll',
+    'kbdeo.dll',
+    'kbdes.dll',
     'kbdest.dll',
     'kbdfc.dll',
     'kbdfi.dll',
@@ -140,6 +143,7 @@ EXCLUDE = (
     'kbdgneo.dll',
     'kbdgr.dll',
     'kbdgr1.dll',
+    'kbdgrist.dll',
     'kbdhe.dll',
     'kbdheb.dll',
     'kbdhu.dll',
@@ -151,8 +155,10 @@ EXCLUDE = (
     'kbdinmal.dll',
     'kbdir.dll',
     'kbdit.dll',
+    'kbdja.dll',
     'kbdjpn.dll',
     'kbdkaz.dll',
+    'kbdko.dll',
     'kbdkor.dll',
     'kbdla.dll',
     'kbdlt1.dll',
@@ -164,9 +170,13 @@ EXCLUDE = (
     'kbdpl1.dll',
     'kbdpo.dll',
     'kbdro.dll',
+    'kbdrost.dll',
     'kbdru.dll',
     'kbdru1.dll',
+    'kbdsf.dll',
     'kbdsg.dll',
+    'kbdsk.dll',
+    'kbdsk1.dll',
     'kbdsl.dll',
     'kbdsl1.dll',
     'kbdsp.dll',