Ros-diffs July 2018

ros-diffs@reactos.org

17 participants
89 discussions

01/01: [SDK] Add gen_baseaddress.py This tool was already used to calculate the last baseaddress update. It is based on baseaddress.sh that has been floating around. CORE-11382
by Mark Jansen 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a9dc5e791ddca0c0ae3f… commit 5a9dc5e791ddca0c0ae3f7fe1074d7ecad6ffaef Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 1 20:17:46 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 1 20:17:46 2018 +0200 [SDK] Add gen_baseaddress.py This tool was already used to calculate the last baseaddress update. It is based on baseaddress.sh that has been floating around. CORE-11382 --- sdk/cmake/baseaddress.cmake | 5 +- sdk/cmake/baseaddress_dwarf.cmake | 5 +- sdk/cmake/baseaddress_msvc.cmake | 5 +- sdk/tools/gen_baseaddress.py | 278 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 287 insertions(+), 6 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index 5ba0611cbd..dae966b723 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -1,3 +1,4 @@ +# Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 set(baseaddress_kernel32 0x7c6b0000) set(baseaddress_msvcrt 0x7c5f0000) @@ -62,7 +63,7 @@ set(baseaddress_sfc_os 0x79bf0000) set(baseaddress_snmpapi 0x79bc0000) set(baseaddress_spoolss 0x79b80000) set(baseaddress_usp10 0x79b00000) -# Extra found dlls +# Extra dlls set(baseaddress_acgenral 0x79ad0000) set(baseaddress_aclayers 0x79aa0000) set(baseaddress_acledit 0x79a70000) @@ -342,7 +343,7 @@ set(baseaddress_xinput1_3 0x73680000) set(baseaddress_xinput9_1_0 0x73650000) set(baseaddress_xmllite 0x73610000) set(baseaddress_zipfldr 0x73570000) -# Extra found files +# Extra files set(baseaddress_access 0x734f0000) set(baseaddress_appwiz 0x73470000) set(baseaddress_cmicpl 0x73430000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 5b66282d4f..98d98b2eee 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -1,3 +1,4 @@ +# Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 set(baseaddress_kernel32 0x7c650000) set(baseaddress_msvcrt 0x7c530000) @@ -62,7 +63,7 @@ set(baseaddress_sfc_os 0x79060000) set(baseaddress_snmpapi 0x79020000) set(baseaddress_spoolss 0x78fd0000) set(baseaddress_usp10 0x78f30000) -# Extra found dlls +# Extra dlls set(baseaddress_acgenral 0x78f00000) set(baseaddress_aclayers 0x78ec0000) set(baseaddress_acledit 0x78e90000) @@ -342,7 +343,7 @@ set(baseaddress_xinput1_3 0x71520000) set(baseaddress_xinput9_1_0 0x714f0000) set(baseaddress_xmllite 0x71490000) set(baseaddress_zipfldr 0x713a0000) -# Extra found files +# Extra files set(baseaddress_access 0x71310000) set(baseaddress_appwiz 0x71290000) set(baseaddress_cmicpl 0x71250000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index b4aa6468c1..fc9d2cd7a1 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -1,3 +1,4 @@ +# Generated by sdk/tools/gen_baseaddress.py set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 set(baseaddress_kernel32 0x7c700000) set(baseaddress_msvcrt 0x7c680000) @@ -62,7 +63,7 @@ set(baseaddress_sfc_os 0x7a640000) set(baseaddress_snmpapi 0x7a620000) set(baseaddress_spoolss 0x7a5f0000) set(baseaddress_usp10 0x7a590000) -# Extra found dlls +# Extra dlls set(baseaddress_acgenral 0x7a570000) set(baseaddress_aclayers 0x7a550000) set(baseaddress_acledit 0x7a530000) @@ -342,7 +343,7 @@ set(baseaddress_xinput1_3 0x75b20000) set(baseaddress_xinput9_1_0 0x75b00000) set(baseaddress_xmllite 0x75ad0000) set(baseaddress_zipfldr 0x75a80000) -# Extra found files +# Extra files set(baseaddress_access 0x75a00000) set(baseaddress_appwiz 0x75990000) set(baseaddress_cmicpl 0x75960000) diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py new file mode 100644 index 0000000000..204cfe23f2 --- /dev/null +++ b/sdk/tools/gen_baseaddress.py @@ -0,0 +1,278 @@ +''' +PROJECT: ReactOS baseaddress updater +LICENSE: MIT (https://spdx.org/licenses/MIT) +PURPOSE: Update baseaddresses of all modules +COPYRIGHT: Copyright 2017,2018 Mark Jansen (mark.jansen(a)reactos.org) +''' + +# FIXME: user32 always at 0x77a20000 + +import os +import struct +import sys +try: + import pefile +except ImportError: + print '# Please install pefile from pip or https://github.com/erocarrera/pefile' + print '# Using fallback' + print + +DLL_EXTENSIONS = ( + '.dll' +) + +OTHER_EXTENSIONS = ( + '.acm', '.ax', '.cpl', '.drv', '.ocx' +) + +PRIORITIES = ( + 'ntdll.dll', + 'kernel32.dll', + 'msvcrt.dll', + 'advapi32.dll', + 'gdi32.dll', + 'user32.dll', + 'dhcpcsvc.dll', + 'dnsapi.dll', + 'icmp.dll', + 'iphlpapi.dll', + 'ws2_32.dll', + 'ws2help.dll', + 'shlwapi.dll', + 'rpcrt4.dll', + 'comctl32.dll', + 'ole32.dll', + 'winspool.drv', + 'winmm.dll', + 'comdlg32.dll', + 'shell32.dll', + 'lz32.dll', + 'version.dll', + 'oleaut32.dll', + 'setupapi.dll', + 'mpr.dll', + 'crypt32.dll', + 'wininet.dll', + 'urlmon.dll', + 'psapi.dll', + 'imm32.dll', + 'msvfw32.dll', + 'dbghelp.dll', + 'devmgr.dll', + 'msacm32.dll', + 'netapi32.dll', + 'powrprof.dll', + 'secur32.dll', + 'wintrust.dll', + 'avicap32.dll', + 'cabinet.dll', + 'dsound.dll', + 'glu32.dll', + 'opengl32.dll', + 'riched20.dll', + 'smdll.dll', + 'userenv.dll', + 'uxtheme.dll', + 'cryptui.dll', + 'csrsrv.dll', + 'basesrv.dll', + 'winsrv.dll', + 'dplayx.dll', + 'gdiplus.dll', + 'msimg32.dll', + 'mswsock.dll', + 'oledlg.dll', + 'rasapi32.dll', + 'rsaenh.dll', + 'samlib.dll', + 'sensapi.dll', + 'sfc_os.dll', + 'snmpapi.dll', + 'spoolss.dll', + 'usp10.dll', +) + +EXCLUDE = ( + 'bmfd.dll', + 'bootvid.dll', + 'freeldr_pe.dll', + 'ftfd.dll', + 'fusion.dll', + 'hal.dll', + 'halaacpi.dll', + 'halacpi.dll', + 'halapic.dll', + 'kbda1.dll', + 'kbda2.dll', + 'kbda3.dll', + 'kbdal.dll', + 'kbdarme.dll', + 'kbdarmw.dll', + 'kbdaze.dll', + 'kbdazel.dll', + 'kbdbe.dll', + 'kbdbga.dll', + 'kbdbgm.dll', + 'kbdbgt.dll', + 'kbdblr.dll', + 'kbdbr.dll', + 'kbdbur.dll', + 'kbdcan.dll', + 'kbdcr.dll', + 'kbdcz.dll', + 'kbdcz1.dll', + 'kbdda.dll', + 'kbddv.dll', + 'kbdes.dll', + 'kbdest.dll', + 'kbdfc.dll', + 'kbdfi.dll', + 'kbdfr.dll', + 'kbdgeo.dll', + 'kbdgerg.dll', + 'kbdgneo.dll', + 'kbdgr.dll', + 'kbdgrist.dll', + 'kbdhe.dll', + 'kbdheb.dll', + 'kbdhu.dll', + 'kbdic.dll', + 'kbdinasa.dll', + 'kbdinben.dll', + 'kbdindev.dll', + 'kbdinguj.dll', + 'kbdinmal.dll', + 'kbdir.dll', + 'kbdit.dll', + 'kbdja.dll', + 'kbdkaz.dll', + 'kbdko.dll', + 'kbdla.dll', + 'kbdlt1.dll', + 'kbdlv.dll', + 'kbdmac.dll', + 'kbdne.dll', + 'kbdno.dll', + 'kbdpl.dll', + 'kbdpl1.dll', + 'kbdpo.dll', + 'kbdro.dll', + 'kbdru.dll', + 'kbdru1.dll', + 'kbdsg.dll', + 'kbdsk.dll', + 'kbdsk1.dll', + 'kbdsw.dll', + 'kbdtat.dll', + 'kbdth0.dll', + 'kbdth1.dll', + 'kbdth2.dll', + 'kbdth3.dll', + 'kbdtuf.dll', + 'kbdtuq.dll', + 'kbduk.dll', + 'kbdur.dll', + 'kbdurs.dll', + 'kbdus.dll', + 'kbdusa.dll', + 'kbdusl.dll', + 'kbdusr.dll', + 'kbdusx.dll', + 'kbduzb.dll', + 'kbdvntc.dll', + 'kbdycc.dll', + 'kbdycl.dll', + 'kdcom.dll', + 'kdvbox.dll', + 'setupldr_pe.dll', + 'vgaddi.dll', + 'dllexport_test_dll1.dll', + 'dllexport_test_dll2.dll', + 'dllimport_test.dll', + 'MyEventProvider.dll', + 'w32kdll_2k3sp2.dll', + 'w32kdll_ros.dll', + 'w32kdll_xpsp2.dll', +) + + +def size_of_image_fallback(filename): + with open(filename, 'rb') as fin: + if fin.read(2) != 'MZ': + print filename, 'No dos header found!' + return 0 + fin.seek(0x3C) + e_lfanew = struct.unpack('i', fin.read(4))[0] + fin.seek(e_lfanew) + if fin.read(4) != 'PE\0\0': + print filename, 'No PE header found!' + return 0 + fin.seek(e_lfanew + 0x18) + pe_magic = struct.unpack('h', fin.read(2))[0] + if pe_magic != 0x10b: + print filename, 'is not a 32 bit exe!' + return 0 + fin.seek(e_lfanew + 0x50) + pe_size_of_image = struct.unpack('i', fin.read(4))[0] + return pe_size_of_image + +def size_of_image(filename): + if 'pefile' in globals(): + return pefile.PE(filename, fast_load=True).OPTIONAL_HEADER.SizeOfImage + return size_of_image_fallback(filename) + +def onefile(current_address, filename, size): + name, ext = os.path.splitext(filename) + postfix = '' + if ext in('.acm', '.drv') and filename != 'winspool.drv': + name = filename + if current_address == 0: + current_address = 0x7c920000 + postfix = ' # should be above 0x%08x' % current_address + else: + current_address = (current_address - size - 0x2000 - 0xffff) & 0xffff0000 + print 'set(baseaddress_%-30s 0x%08x)%s' % (name, current_address, postfix) + return current_address + +def run_dir(target): + print '# Generated from', target + print '# Generated by sdk/tools/gen_baseaddress.py' + found_dlls = {} + found_files = {} + for root, _, files in os.walk(target): + for dll in [filename for filename in files if filename.endswith(DLL_EXTENSIONS)]: + if not dll in EXCLUDE and not dll.startswith('api-ms-win-'): + found_dlls[dll] = size_of_image(os.path.join(root, dll)) + extrafiles = [filename for filename in files if filename.endswith(OTHER_EXTENSIONS)] + for extrafile in extrafiles: + if not extrafile in EXCLUDE: + found_files[extrafile] = size_of_image(os.path.join(root, extrafile)) + + current_address = 0 + for curr in PRIORITIES: + if curr in found_dlls: + current_address = onefile(current_address, curr, found_dlls[curr]) + del found_dlls[curr] + elif curr in found_files: + current_address = onefile(current_address, curr, found_files[curr]) + del found_files[curr] + else: + print '# Did not find', curr, '!' + + print '# Extra dlls' + for curr in sorted(found_dlls): + current_address = onefile(current_address, curr, found_dlls[curr]) + print '# Extra files' + for curr in sorted(found_files): + current_address = onefile(current_address, curr, found_files[curr]) + +def main(dirs): + if len(dirs) < 1: + trydir = os.getcwd() + print '# No path specified, trying', trydir + dirs = [trydir] + for onedir in dirs: + run_dir(onedir) + +if __name__ == '__main__': + main(sys.argv[1:])

1 0

01/01: [CMAKE] Change winspool.drv to winspool again. CORE-14781
by Mark Jansen 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3ddb8a4c26bf392a3726… commit a3ddb8a4c26bf392a3726a11ae9d53dc4a05ac0b Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 1 19:21:59 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 1 19:21:59 2018 +0200 [CMAKE] Change winspool.drv to winspool again. CORE-14781 --- sdk/cmake/baseaddress.cmake | 2 +- sdk/cmake/baseaddress_dwarf.cmake | 2 +- sdk/cmake/baseaddress_msvc.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index ed9f08f833..5ba0611cbd 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -14,7 +14,7 @@ set(baseaddress_shlwapi 0x7c0c0000) set(baseaddress_rpcrt4 0x7bff0000) set(baseaddress_comctl32 0x7be10000) set(baseaddress_ole32 0x7bc30000) -set(baseaddress_winspool.drv 0x7bbe0000) +set(baseaddress_winspool 0x7bbe0000) set(baseaddress_winmm 0x7bb20000) set(baseaddress_comdlg32 0x7ba10000) set(baseaddress_shell32 0x7b150000) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 1d38a95c60..5b66282d4f 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -14,7 +14,7 @@ set(baseaddress_shlwapi 0x7be80000) set(baseaddress_rpcrt4 0x7bd70000) set(baseaddress_comctl32 0x7bb30000) set(baseaddress_ole32 0x7b860000) -set(baseaddress_winspool.drv 0x7b7f0000) +set(baseaddress_winspool 0x7b7f0000) set(baseaddress_winmm 0x7b720000) set(baseaddress_comdlg32 0x7b600000) set(baseaddress_shell32 0x7abb0000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 147dff061e..b4aa6468c1 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -14,7 +14,7 @@ set(baseaddress_shlwapi 0x7c2e0000) set(baseaddress_rpcrt4 0x7c250000) set(baseaddress_comctl32 0x7c100000) set(baseaddress_ole32 0x7bfc0000) -set(baseaddress_winspool.drv 0x7bf80000) +set(baseaddress_winspool 0x7bf80000) set(baseaddress_winmm 0x7bee0000) set(baseaddress_comdlg32 0x7be00000) set(baseaddress_shell32 0x7b630000)

1 0

01/01: [CMAKE] Update baseaddress for gcc with dwarf. CORE-14781
by Mark Jansen 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8fb0c5a0aba4fe949c931… commit 8fb0c5a0aba4fe949c931adbe9058cae8c6ddfed Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 1 16:44:16 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 1 18:21:12 2018 +0200 [CMAKE] Update baseaddress for gcc with dwarf. CORE-14781 --- sdk/cmake/baseaddress_dwarf.cmake | 704 ++++++++++++++++++++------------------ 1 file changed, 374 insertions(+), 330 deletions(-) diff --git a/sdk/cmake/baseaddress_dwarf.cmake b/sdk/cmake/baseaddress_dwarf.cmake index 43b9fb7d9c..1d38a95c60 100644 --- a/sdk/cmake/baseaddress_dwarf.cmake +++ b/sdk/cmake/baseaddress_dwarf.cmake @@ -1,330 +1,374 @@ -set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x77ca0000) -set(baseaddress_msvcrt 0x77b90000) -set(baseaddress_advapi32 0x77aa0000) -set(baseaddress_gdi32 0x77a20000) -set(baseaddress_user32 0x77820000) -set(baseaddress_dhcpcsvc 0x777c0000) -set(baseaddress_dnsapi 0x77760000) -set(baseaddress_icmp 0x77730000) -set(baseaddress_iphlpapi 0x776e0000) -set(baseaddress_ws2_32 0x77690000) -set(baseaddress_ws2help 0x77660000) -set(baseaddress_shlwapi 0x775a0000) -set(baseaddress_rpcrt4 0x77490000) -set(baseaddress_comctl32 0x772b0000) -set(baseaddress_ole32 0x77020000) -set(baseaddress_winspool.drv 0x76fe0000) -set(baseaddress_winmm 0x76f20000) -set(baseaddress_comdlg32 0x76e10000) -set(baseaddress_shell32 0x76010000) -set(baseaddress_lz32 0x75ff0000) -set(baseaddress_version 0x75fb0000) -set(baseaddress_oleaut32 0x75d60000) -set(baseaddress_setupapi 0x75b50000) -set(baseaddress_mpr 0x75b00000) -set(baseaddress_crypt32 0x759a0000) -set(baseaddress_wininet 0x758b0000) -set(baseaddress_urlmon 0x75760000) -set(baseaddress_psapi 0x75720000) -set(baseaddress_imm32 0x756d0000) -set(baseaddress_msvfw32 0x75680000) -set(baseaddress_dbghelp 0x75590000) -set(baseaddress_devmgr 0x754f0000) -set(baseaddress_msacm32 0x754a0000) -set(baseaddress_netapi32 0x75420000) -set(baseaddress_powrprof 0x753e0000) -set(baseaddress_secur32 0x75390000) -set(baseaddress_wintrust 0x75320000) -set(baseaddress_avicap32 0x752f0000) -set(baseaddress_cabinet 0x75290000) -set(baseaddress_dsound 0x751f0000) -set(baseaddress_glu32 0x750a0000) -set(baseaddress_wlnotify 0x75040000) -set(baseaddress_opengl32 0x74d90000) -set(baseaddress_riched20 0x74cd0000) -set(baseaddress_smdll 0x74cb0000) -set(baseaddress_userenv 0x74c50000) -set(baseaddress_uxtheme 0x74bd0000) -set(baseaddress_cryptui 0x74b10000) -set(baseaddress_csrsrv 0x74ad0000) -set(baseaddress_basesrv 0x74a90000) -set(baseaddress_consrv 0x74a70000) -set(baseaddress_winsrv 0x74980000) -set(baseaddress_dplayx 0x748f0000) -set(baseaddress_gdiplus 0x747e0000) -set(baseaddress_msimg32 0x747b0000) -set(baseaddress_mswsock 0x74780000) -set(baseaddress_oledlg 0x74730000) -set(baseaddress_rasapi32 0x746f0000) -set(baseaddress_rsaenh 0x74670000) -set(baseaddress_samlib 0x74620000) -set(baseaddress_sensapi 0x745f0000) -set(baseaddress_sfc_os 0x745c0000) -set(baseaddress_snmpapi 0x74580000) -set(baseaddress_spoolss 0x74540000) -set(baseaddress_usp10 0x744a0000) -set(baseaddress_acledit 0x74470000) -set(baseaddress_aclui 0x74420000) -set(baseaddress_activeds 0x743f0000) -set(baseaddress_actxprxy 0x74170000) -set(baseaddress_advpack 0x74120000) -set(baseaddress_amstream 0x740b0000) -set(baseaddress_atl 0x74050000) -set(baseaddress_atl100 0x74000000) -set(baseaddress_atl80 0x73fb0000) -set(baseaddress_authz 0x73f80000) -set(baseaddress_avifil32 0x73f00000) -set(baseaddress_batt 0x73ec0000) -set(baseaddress_bcrypt 0x73e80000) -set(baseaddress_beepmidi 0x73e50000) -set(baseaddress_browseui 0x73d10000) -set(baseaddress_cards 0x73c40000) -set(baseaddress_cfgmgr32 0x73c10000) -set(baseaddress_clusapi 0x73bd0000) -set(baseaddress_comcat 0x73ba0000) -set(baseaddress_compstui 0x73b70000) -set(baseaddress_console 0x73ae0000) -set(baseaddress_credui 0x73a90000) -set(baseaddress_crtdll 0x73a10000) -set(baseaddress_cryptdlg 0x739d0000) -set(baseaddress_cryptdll 0x739a0000) -set(baseaddress_cryptnet 0x73960000) -set(baseaddress_d3d8 0x738e0000) -set(baseaddress_d3d8thk 0x738c0000) -set(baseaddress_d3d9 0x73830000) -set(baseaddress_d3dcompiler_43 0x73750000) -set(baseaddress_d3drm 0x736a0000) -set(baseaddress_d3dx9_24 0x73670000) -set(baseaddress_d3dx9_25 0x73640000) -set(baseaddress_d3dx9_26 0x73610000) -set(baseaddress_d3dx9_27 0x735e0000) -set(baseaddress_d3dx9_28 0x735b0000) -set(baseaddress_d3dx9_29 0x73580000) -set(baseaddress_d3dx9_30 0x73550000) -set(baseaddress_d3dx9_31 0x73520000) -set(baseaddress_d3dx9_32 0x734f0000) -set(baseaddress_d3dx9_33 0x734c0000) -set(baseaddress_d3dx9_34 0x73490000) -set(baseaddress_d3dx9_35 0x73460000) -set(baseaddress_d3dx9_36 0x73330000) -set(baseaddress_d3dx9_37 0x73300000) -set(baseaddress_d3dx9_38 0x732d0000) -set(baseaddress_d3dx9_39 0x732a0000) -set(baseaddress_d3dx9_40 0x73270000) -set(baseaddress_d3dx9_41 0x73240000) -set(baseaddress_d3dx9_42 0x73210000) -set(baseaddress_d3dx9_43 0x731e0000) -set(baseaddress_d3dxof 0x73190000) -set(baseaddress_dciman32 0x73160000) -set(baseaddress_ddraw 0x73070000) -set(baseaddress_deskadp 0x73030000) -set(baseaddress_deskmon 0x72ff0000) -set(baseaddress_devcpux 0x72fc0000) -set(baseaddress_devenum 0x72f60000) -set(baseaddress_dinput 0x72ee0000) -set(baseaddress_dinput8 0x72ea0000) -set(baseaddress_dmusic 0x72e40000) -set(baseaddress_dplay 0x72e10000) -set(baseaddress_dwmapi 0x72de0000) -set(baseaddress_dxdiagn 0x72d80000) -set(baseaddress_dxgi 0x72d30000) -set(baseaddress_faultrep 0x72d00000) -set(baseaddress_fltlib 0x72cd0000) -set(baseaddress_fmifs 0x72ca0000) -set(baseaddress_fontext 0x72c70000) -set(baseaddress_framebuf 0x72c40000) -set(baseaddress_framebuf_new 0x72c10000) -set(baseaddress_framedyn 0x72bc0000) -set(baseaddress_genincdata 0x72b90000) -set(baseaddress_getuname 0x728b0000) -set(baseaddress_hid 0x72880000) -set(baseaddress_hlink 0x72830000) -set(baseaddress_hnetcfg 0x727e0000) -set(baseaddress_httpapi 0x727a0000) -set(baseaddress_iccvid 0x72760000) -set(baseaddress_ieframe 0x72660000) -set(baseaddress_iernonce 0x72630000) -set(baseaddress_imagehlp 0x725f0000) -set(baseaddress_inetcomm 0x72570000) -set(baseaddress_inetmib1 0x72530000) -set(baseaddress_initpki 0x72500000) -set(baseaddress_input 0x724a0000) -set(baseaddress_inseng 0x72460000) -set(baseaddress_iologmsg 0x72440000) -set(baseaddress_itircl 0x72410000) -set(baseaddress_itss 0x723b0000) -set(baseaddress_jscript 0x72230000) -set(baseaddress_jsproxy 0x721f0000) -set(baseaddress_kbsdll 0x721c0000) -set(baseaddress_kernel32_vista 0x721a0000) -set(baseaddress_ksuser 0x72170000) -set(baseaddress_libjpeg 0x720b0000) -set(baseaddress_libpng 0x72010000) -set(baseaddress_libtiff 0x71f00000) -set(baseaddress_libxslt 0x71b80000) -set(baseaddress_loadperf 0x71b50000) -set(baseaddress_localspl 0x71b00000) -set(baseaddress_localui 0x71ac0000) -set(baseaddress_lpk 0x71a90000) -set(baseaddress_lsasrv 0x71a10000) -set(baseaddress_mapi32 0x719b0000) -set(baseaddress_mciavi32 0x71960000) -set(baseaddress_mcicda 0x71920000) -set(baseaddress_mciqtz32 0x718d0000) -set(baseaddress_mciseq 0x71890000) -set(baseaddress_mciwave 0x71850000) -set(baseaddress_mgmtapi 0x71820000) -set(baseaddress_midimap 0x717e0000) -set(baseaddress_mlang 0x71790000) -set(baseaddress_mmdevapi 0x71740000) -set(baseaddress_mmdrv 0x71710000) -set(baseaddress_modemui 0x71690000) -set(baseaddress_mprapi 0x71650000) -set(baseaddress_msafd 0x71610000) -set(baseaddress_mscat32 0x715e0000) -set(baseaddress_mscms 0x715a0000) -set(baseaddress_mscoree 0x71530000) -set(baseaddress_msctf 0x714b0000) -set(baseaddress_msdmo 0x71470000) -set(baseaddress_msftedit 0x71440000) -set(baseaddress_msgina 0x713b0000) -set(baseaddress_mshtml 0x70f90000) -set(baseaddress_msi 0x70d70000) -set(baseaddress_msimtf 0x70d30000) -set(baseaddress_msisip 0x70d00000) -set(baseaddress_mspatcha 0x70cd0000) -set(baseaddress_msports 0x70c90000) -set(baseaddress_msrle32 0x70c50000) -set(baseaddress_mssign32 0x70c20000) -set(baseaddress_mssip32 0x70bf0000) -set(baseaddress_mstask 0x70ba0000) -set(baseaddress_msv1_0 0x70b70000) -set(baseaddress_msvcrt20 0x70a40000) -set(baseaddress_msvcrt40 0x70910000) -set(baseaddress_msvidc32 0x708d0000) -set(baseaddress_msxml 0x70890000) -set(baseaddress_msxml2 0x70850000) -set(baseaddress_msxml3 0x70370000) -set(baseaddress_msxml4 0x70320000) -set(baseaddress_msxml6 0x702d0000) -set(baseaddress_nddeapi 0x702a0000) -set(baseaddress_netcfgx 0x70200000) -set(baseaddress_netevent 0x701e0000) -set(baseaddress_netid 0x70190000) -set(baseaddress_netshell 0x700f0000) -set(baseaddress_newdev 0x70080000) -set(baseaddress_notifyhook 0x70050000) -set(baseaddress_ntdsapi 0x70010000) -set(baseaddress_ntlanman 0x6ffe0000) -set(baseaddress_ntmarta 0x6ffb0000) -set(baseaddress_ntprint 0x6ff80000) -set(baseaddress_objsel 0x6ff40000) -set(baseaddress_odbc32 0x6fef0000) -set(baseaddress_odbccp32 0x6feb0000) -set(baseaddress_oleacc 0x6fe40000) -set(baseaddress_olecli32 0x6fe00000) -set(baseaddress_olepro32 0x6fdd0000) -set(baseaddress_olesvr32 0x6fda0000) -set(baseaddress_olethk32 0x6fd70000) -set(baseaddress_pdh 0x6fd30000) -set(baseaddress_pidgen 0x6fd00000) -set(baseaddress_printui 0x6fcc0000) -set(baseaddress_propsys 0x6fc70000) -set(baseaddress_pstorec 0x6fc30000) -set(baseaddress_qedit 0x6fbd0000) -set(baseaddress_qmgr 0x6fb80000) -set(baseaddress_qmgrprxy 0x6fb10000) -set(baseaddress_quartz 0x6f910000) -set(baseaddress_query 0x6f8e0000) -set(baseaddress_rasadhlp 0x6f8b0000) -set(baseaddress_rasdlg 0x6f6d0000) -set(baseaddress_rasman 0x6f690000) -set(baseaddress_resutils 0x6f650000) -set(baseaddress_riched32 0x6f620000) -set(baseaddress_rsabase 0x6f600000) -set(baseaddress_samsrv 0x6f570000) -set(baseaddress_sccbase 0x6f540000) -set(baseaddress_schannel 0x6f4f0000) -set(baseaddress_scrrun 0x6f490000) -set(baseaddress_security 0x6f470000) -set(baseaddress_serialui 0x6f440000) -set(baseaddress_sfc 0x6f410000) -set(baseaddress_shdoclc 0x6f3d0000) -set(baseaddress_shdocvw 0x6f370000) -set(baseaddress_shfolder 0x6f350000) -set(baseaddress_shimgvw 0x6f310000) -set(baseaddress_slayer 0x6f2d0000) -set(baseaddress_slbcsp 0x6f2a0000) -set(baseaddress_sndblst 0x6f260000) -set(baseaddress_softpub 0x6f240000) -set(baseaddress_srclient 0x6f210000) -set(baseaddress_sti 0x6f1c0000) -set(baseaddress_sxs 0x6f180000) -set(baseaddress_syssetup 0x6f0c0000) -set(baseaddress_t2embed 0x6f090000) -set(baseaddress_tapi32 0x6f040000) -set(baseaddress_tapiui 0x6efd0000) -set(baseaddress_traffic 0x6efa0000) -set(baseaddress_twain_32 0x6ef60000) -set(baseaddress_uext2 0x6ef20000) -set(baseaddress_ufat 0x6eef0000) -set(baseaddress_ufatx 0x6eec0000) -set(baseaddress_umpnpmgr 0x6ee80000) -set(baseaddress_unicows 0x6ee40000) -set(baseaddress_untfs 0x6ee20000) -set(baseaddress_updspapi 0x6edf0000) -set(baseaddress_url 0x6edc0000) -set(baseaddress_vbscript 0x6ecf0000) -set(baseaddress_vdmdbg 0x6ecc0000) -set(baseaddress_wbemdisp 0x6ec80000) -set(baseaddress_wbemprox 0x6ebf0000) -set(baseaddress_windowscodecs 0x6ea60000) -set(baseaddress_windowscodecsext 0x6ea30000) -set(baseaddress_d3dwine 0x6e790000) -set(baseaddress_winfax 0x6e760000) -set(baseaddress_wing32 0x6e730000) -set(baseaddress_winhttp 0x6e6b0000) -set(baseaddress_winscard 0x6e670000) -set(baseaddress_winsta 0x6e630000) -set(baseaddress_wlanapi 0x6e5f0000) -set(baseaddress_wldap32 0x6e590000) -set(baseaddress_wmi 0x6e570000) -set(baseaddress_ws2_32_new 0x6e500000) -set(baseaddress_wshirda 0x6e4d0000) -set(baseaddress_wshtcpip 0x6e4a0000) -set(baseaddress_wsock32 0x6e470000) -set(baseaddress_wtsapi32 0x6e430000) -set(baseaddress_wuapi 0x6e3e0000) -set(baseaddress_xinput1_1 0x6e3b0000) -set(baseaddress_xinput1_2 0x6e380000) -set(baseaddress_xinput1_3 0x6e350000) -set(baseaddress_xinput9_1_0 0x6e320000) -set(baseaddress_xmllite 0x6e2d0000) -set(baseaddress_access 0x6e240000) -set(baseaddress_appwiz 0x6e1d0000) -set(baseaddress_cmicpl 0x6e190000) -set(baseaddress_desk 0x6e0e0000) -set(baseaddress_hdwwiz 0x6e050000) -set(baseaddress_hhctrl 0x6dfe0000) -set(baseaddress_imaadp32.acm 0x6dfa0000) -set(baseaddress_inetcpl 0x6df30000) -set(baseaddress_intl 0x6dec0000) -set(baseaddress_joy 0x6de70000) -set(baseaddress_main 0x6ddb0000) -set(baseaddress_mmsys 0x6dca0000) -set(baseaddress_msacm32.drv 0x6dc60000) -set(baseaddress_msadp32.acm 0x6dc20000) -set(baseaddress_msg711.acm 0x6dbe0000) -set(baseaddress_msgsm32.acm 0x6dbb0000) -set(baseaddress_msisys 0x6db80000) -set(baseaddress_ncpa 0x6db50000) -set(baseaddress_odbccp32i 0x6db20000) -set(baseaddress_powercfg 0x6dab0000) -set(baseaddress_sysdm 0x6d9c0000) -set(baseaddress_telephon 0x6d990000) -set(baseaddress_timedate 0x6d930000) -set(baseaddress_usrmgr 0x6d8d0000) -set(baseaddress_wdmaud.drv 0x6d6f0000) -set(baseaddress_wined3dcfg 0x6d6b0000) -set(baseaddress_winemp3.acm 0x6d620000) +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c650000) +set(baseaddress_msvcrt 0x7c530000) +set(baseaddress_advapi32 0x7c430000) +set(baseaddress_gdi32 0x7c350000) +set(baseaddress_user32 0x7c160000) +set(baseaddress_dhcpcsvc 0x7c100000) +set(baseaddress_dnsapi 0x7c090000) +set(baseaddress_icmp 0x7c060000) +set(baseaddress_iphlpapi 0x7c000000) +set(baseaddress_ws2_32 0x7bf90000) +set(baseaddress_ws2help 0x7bf60000) +set(baseaddress_shlwapi 0x7be80000) +set(baseaddress_rpcrt4 0x7bd70000) +set(baseaddress_comctl32 0x7bb30000) +set(baseaddress_ole32 0x7b860000) +set(baseaddress_winspool.drv 0x7b7f0000) +set(baseaddress_winmm 0x7b720000) +set(baseaddress_comdlg32 0x7b600000) +set(baseaddress_shell32 0x7abb0000) +set(baseaddress_lz32 0x7ab90000) +set(baseaddress_version 0x7ab50000) +set(baseaddress_oleaut32 0x7a8e0000) +set(baseaddress_setupapi 0x7a730000) +set(baseaddress_mpr 0x7a6e0000) +set(baseaddress_crypt32 0x7a570000) +set(baseaddress_wininet 0x7a470000) +set(baseaddress_urlmon 0x7a300000) +set(baseaddress_psapi 0x7a2c0000) +set(baseaddress_imm32 0x7a270000) +set(baseaddress_msvfw32 0x7a220000) +set(baseaddress_dbghelp 0x7a120000) +set(baseaddress_devmgr 0x7a020000) +set(baseaddress_msacm32 0x79fd0000) +set(baseaddress_netapi32 0x79f20000) +set(baseaddress_powrprof 0x79ee0000) +set(baseaddress_secur32 0x79e70000) +set(baseaddress_wintrust 0x79e00000) +set(baseaddress_avicap32 0x79dd0000) +set(baseaddress_cabinet 0x79d70000) +set(baseaddress_dsound 0x79cd0000) +set(baseaddress_glu32 0x79b70000) +set(baseaddress_opengl32 0x79860000) +set(baseaddress_riched20 0x79770000) +set(baseaddress_smdll 0x79750000) +set(baseaddress_userenv 0x796f0000) +set(baseaddress_uxtheme 0x79670000) +set(baseaddress_cryptui 0x795b0000) +set(baseaddress_csrsrv 0x79570000) +set(baseaddress_basesrv 0x79530000) +set(baseaddress_winsrv 0x79460000) +set(baseaddress_dplayx 0x793d0000) +set(baseaddress_gdiplus 0x792a0000) +set(baseaddress_msimg32 0x79270000) +set(baseaddress_mswsock 0x79230000) +set(baseaddress_oledlg 0x791d0000) +set(baseaddress_rasapi32 0x79190000) +set(baseaddress_rsaenh 0x79110000) +set(baseaddress_samlib 0x790c0000) +set(baseaddress_sensapi 0x79090000) +set(baseaddress_sfc_os 0x79060000) +set(baseaddress_snmpapi 0x79020000) +set(baseaddress_spoolss 0x78fd0000) +set(baseaddress_usp10 0x78f30000) +# Extra found dlls +set(baseaddress_acgenral 0x78f00000) +set(baseaddress_aclayers 0x78ec0000) +set(baseaddress_acledit 0x78e90000) +set(baseaddress_aclui 0x78e40000) +set(baseaddress_acppage 0x78db0000) +set(baseaddress_activeds 0x78d80000) +set(baseaddress_actxprxy 0x78a90000) +set(baseaddress_advapi32_vista 0x78a70000) +set(baseaddress_advpack 0x78a20000) +set(baseaddress_amstream 0x789b0000) +set(baseaddress_apphelp 0x78950000) +set(baseaddress_atl 0x788f0000) +set(baseaddress_atl100 0x788a0000) +set(baseaddress_atl80 0x78840000) +set(baseaddress_authz 0x78810000) +set(baseaddress_avifil32 0x78780000) +set(baseaddress_batt 0x78750000) +set(baseaddress_bcrypt 0x78710000) +set(baseaddress_beepmidi 0x786e0000) +set(baseaddress_browseui 0x784b0000) +set(baseaddress_cards 0x783e0000) +set(baseaddress_cfgmgr32 0x783b0000) +set(baseaddress_clusapi 0x78370000) +set(baseaddress_comcat 0x78340000) +set(baseaddress_compstui 0x78310000) +set(baseaddress_console 0x782b0000) +set(baseaddress_credui 0x78260000) +set(baseaddress_crtdll 0x781e0000) +set(baseaddress_cryptdlg 0x781a0000) +set(baseaddress_cryptdll 0x78170000) +set(baseaddress_cryptnet 0x78130000) +set(baseaddress_custom 0x78100000) +set(baseaddress_d3d8 0x78080000) +set(baseaddress_d3d8thk 0x78060000) +set(baseaddress_d3d9 0x77fc0000) +set(baseaddress_d3dcompiler_43 0x77ee0000) +set(baseaddress_d3drm 0x77e10000) +set(baseaddress_d3dwine 0x77b30000) +set(baseaddress_d3dx9_24 0x77b00000) +set(baseaddress_d3dx9_25 0x77ab0000) +set(baseaddress_d3dx9_26 0x77a80000) +set(baseaddress_d3dx9_27 0x77a50000) +set(baseaddress_d3dx9_28 0x77a20000) +set(baseaddress_d3dx9_29 0x779f0000) +set(baseaddress_d3dx9_30 0x779b0000) +set(baseaddress_d3dx9_31 0x77980000) +set(baseaddress_d3dx9_32 0x77950000) +set(baseaddress_d3dx9_33 0x77920000) +set(baseaddress_d3dx9_34 0x778f0000) +set(baseaddress_d3dx9_35 0x778c0000) +set(baseaddress_d3dx9_36 0x77760000) +set(baseaddress_d3dx9_37 0x77730000) +set(baseaddress_d3dx9_38 0x77700000) +set(baseaddress_d3dx9_39 0x776d0000) +set(baseaddress_d3dx9_40 0x776a0000) +set(baseaddress_d3dx9_41 0x77670000) +set(baseaddress_d3dx9_42 0x77640000) +set(baseaddress_d3dx9_43 0x77610000) +set(baseaddress_d3dxof 0x775c0000) +set(baseaddress_dciman32 0x77590000) +set(baseaddress_ddraw 0x77490000) +set(baseaddress_deskadp 0x77450000) +set(baseaddress_deskmon 0x77410000) +set(baseaddress_devcpux 0x773e0000) +set(baseaddress_devenum 0x77380000) +set(baseaddress_dinput 0x77300000) +set(baseaddress_dinput8 0x772c0000) +set(baseaddress_dmusic 0x77250000) +set(baseaddress_dplay 0x77220000) +set(baseaddress_dxdiagn 0x771c0000) +set(baseaddress_dxtn 0x77190000) +set(baseaddress_esent 0x77150000) +set(baseaddress_faultrep 0x77120000) +set(baseaddress_fltlib 0x770f0000) +set(baseaddress_fmifs 0x770c0000) +set(baseaddress_fontext 0x77090000) +set(baseaddress_fontsub 0x77060000) +set(baseaddress_framebuf 0x77030000) +set(baseaddress_framebuf_new 0x77000000) +set(baseaddress_framedyn 0x76fb0000) +set(baseaddress_genincdata 0x76f80000) +set(baseaddress_getuname 0x76670000) +set(baseaddress_hid 0x76640000) +set(baseaddress_hlink 0x765f0000) +set(baseaddress_hnetcfg 0x76590000) +set(baseaddress_httpapi 0x76550000) +set(baseaddress_iccvid 0x76510000) +set(baseaddress_ieframe 0x763d0000) +set(baseaddress_iernonce 0x76390000) +set(baseaddress_imagehlp 0x76350000) +set(baseaddress_inetcomm 0x762c0000) +set(baseaddress_inetmib1 0x76280000) +set(baseaddress_initpki 0x76250000) +set(baseaddress_input 0x761e0000) +set(baseaddress_inseng 0x76190000) +set(baseaddress_iologmsg 0x76170000) +set(baseaddress_itircl 0x76140000) +set(baseaddress_itss 0x760e0000) +set(baseaddress_jscript 0x75f50000) +set(baseaddress_jsproxy 0x75f10000) +set(baseaddress_kbdeo 0x75ef0000) +set(baseaddress_kbsdll 0x75ec0000) +set(baseaddress_kernel32_vista 0x75e90000) +set(baseaddress_ksuser 0x75e60000) +set(baseaddress_libjpeg 0x75da0000) +set(baseaddress_libpng 0x75cf0000) +set(baseaddress_libtiff 0x75c00000) +set(baseaddress_libtirpc 0x75b80000) +set(baseaddress_libxslt 0x75800000) +set(baseaddress_loadperf 0x757d0000) +set(baseaddress_localmon 0x75790000) +set(baseaddress_localspl 0x75730000) +set(baseaddress_localspl_apitest 0x75700000) +set(baseaddress_localui 0x756c0000) +set(baseaddress_lpk 0x75680000) +set(baseaddress_lsasrv 0x755f0000) +set(baseaddress_mapi32 0x75590000) +set(baseaddress_mbedtls 0x754c0000) +set(baseaddress_mciavi32 0x75470000) +set(baseaddress_mcicda 0x75430000) +set(baseaddress_mciqtz32 0x753e0000) +set(baseaddress_mciseq 0x753a0000) +set(baseaddress_mciwave 0x75360000) +set(baseaddress_mgmtapi 0x75330000) +set(baseaddress_midimap 0x75300000) +set(baseaddress_mlang 0x752b0000) +set(baseaddress_mmdrv 0x75280000) +set(baseaddress_modemui 0x75200000) +set(baseaddress_mprapi 0x751c0000) +set(baseaddress_msafd 0x75170000) +set(baseaddress_mscat32 0x75140000) +set(baseaddress_mscms 0x75100000) +set(baseaddress_mscoree 0x75090000) +set(baseaddress_msctf 0x75010000) +set(baseaddress_msdmo 0x74fd0000) +set(baseaddress_msftedit 0x74fa0000) +set(baseaddress_msgina 0x74ef0000) +set(baseaddress_mshtml 0x74a40000) +set(baseaddress_msi 0x747c0000) +set(baseaddress_msimtf 0x74780000) +set(baseaddress_msisip 0x74750000) +set(baseaddress_mspatcha 0x74720000) +set(baseaddress_msports 0x746e0000) +set(baseaddress_msrle32 0x746a0000) +set(baseaddress_mssign32 0x74670000) +set(baseaddress_mssip32 0x74640000) +set(baseaddress_mstask 0x745f0000) +set(baseaddress_msv1_0 0x745c0000) +set(baseaddress_msvcrt20 0x74490000) +set(baseaddress_msvcrt40 0x74350000) +set(baseaddress_msvcrt_crt_dll_startup 0x74320000) +set(baseaddress_msvidc32 0x742e0000) +set(baseaddress_msxml 0x742a0000) +set(baseaddress_msxml2 0x74260000) +set(baseaddress_msxml3 0x73d40000) +set(baseaddress_msxml4 0x73cf0000) +set(baseaddress_msxml6 0x73ca0000) +set(baseaddress_mycomput 0x73c80000) +set(baseaddress_nddeapi 0x73c50000) +set(baseaddress_netcfgx 0x73bb0000) +set(baseaddress_netevent 0x73b90000) +set(baseaddress_netid 0x73b40000) +set(baseaddress_netshell 0x73a80000) +set(baseaddress_newdev 0x73a10000) +set(baseaddress_nfs41_np 0x739e0000) +set(baseaddress_normaliz 0x739b0000) +set(baseaddress_notifyhook 0x73980000) +set(baseaddress_npptools 0x73950000) +set(baseaddress_ntdll_vista 0x73920000) +set(baseaddress_ntdsapi 0x738e0000) +set(baseaddress_ntlanman 0x738b0000) +set(baseaddress_ntmarta 0x73880000) +set(baseaddress_ntobjshex 0x737b0000) +set(baseaddress_objsel 0x73770000) +set(baseaddress_odbc32 0x73720000) +set(baseaddress_odbccp32 0x736e0000) +set(baseaddress_oleacc 0x73630000) +set(baseaddress_olecli32 0x735f0000) +set(baseaddress_olepro32 0x735c0000) +set(baseaddress_olesvr32 0x73590000) +set(baseaddress_olethk32 0x73560000) +set(baseaddress_pdh 0x73520000) +set(baseaddress_pidgen 0x734f0000) +set(baseaddress_pifmgr 0x73480000) +set(baseaddress_printui 0x73450000) +set(baseaddress_propsys 0x73400000) +set(baseaddress_pstorec 0x733c0000) +set(baseaddress_qedit 0x73350000) +set(baseaddress_qmgr 0x73300000) +set(baseaddress_qmgrprxy 0x73280000) +set(baseaddress_quartz 0x73060000) +set(baseaddress_query 0x73030000) +set(baseaddress_rasadhlp 0x73000000) +set(baseaddress_rasdlg 0x72e20000) +set(baseaddress_rasman 0x72de0000) +set(baseaddress_redirtest1 0x72db0000) +set(baseaddress_redirtest2 0x72d80000) +set(baseaddress_resutils 0x72d40000) +set(baseaddress_riched32 0x72d10000) +set(baseaddress_rsabase 0x72cf0000) +set(baseaddress_rshell 0x72c00000) +set(baseaddress_samsrv 0x72b70000) +set(baseaddress_sccbase 0x72b40000) +set(baseaddress_schannel 0x72af0000) +set(baseaddress_schedsvc 0x72ab0000) +set(baseaddress_scrrun 0x72a40000) +set(baseaddress_security 0x72a20000) +set(baseaddress_serialui 0x729f0000) +set(baseaddress_sfc 0x729c0000) +set(baseaddress_shdoclc 0x72980000) +set(baseaddress_shdocvw 0x72920000) +set(baseaddress_shellbtrfs 0x72790000) +set(baseaddress_shfolder 0x72770000) +set(baseaddress_shimgvw 0x72720000) +set(baseaddress_shsvcs 0x726f0000) +set(baseaddress_slbcsp 0x726c0000) +set(baseaddress_sndblst 0x72680000) +set(baseaddress_softpub 0x72660000) +set(baseaddress_srclient 0x72630000) +set(baseaddress_srvsvc 0x725f0000) +set(baseaddress_sti 0x725a0000) +set(baseaddress_stobject 0x724f0000) +set(baseaddress_streamci 0x724c0000) +set(baseaddress_sxs 0x72480000) +set(baseaddress_syssetup 0x72380000) +set(baseaddress_t2embed 0x72350000) +set(baseaddress_tapi32 0x72300000) +set(baseaddress_tapiui 0x72280000) +set(baseaddress_testvdd 0x72250000) +set(baseaddress_themeui 0x72230000) +set(baseaddress_traffic 0x72200000) +set(baseaddress_twain_32 0x721c0000) +set(baseaddress_ubtrfs 0x72190000) +set(baseaddress_ucdfs 0x72170000) +set(baseaddress_uext2 0x72130000) +set(baseaddress_ufat 0x720f0000) +set(baseaddress_ufatx 0x720c0000) +set(baseaddress_uffs 0x720a0000) +set(baseaddress_umpnpmgr 0x72060000) +set(baseaddress_untfs 0x72040000) +set(baseaddress_updspapi 0x72010000) +set(baseaddress_ureiserfs 0x71ff0000) +set(baseaddress_url 0x71fc0000) +set(baseaddress_vbscript 0x71ee0000) +set(baseaddress_vdmdbg 0x71eb0000) +set(baseaddress_verifier 0x71e80000) +set(baseaddress_vfd 0x71e10000) +set(baseaddress_vssapi 0x71dd0000) +set(baseaddress_wbemdisp 0x71d70000) +set(baseaddress_wbemprox 0x71ce0000) +set(baseaddress_win32u 0x71cb0000) +set(baseaddress_win32u_2k3sp2 0x71c80000) +set(baseaddress_win32u_xpsp2 0x71c50000) +set(baseaddress_windowscodecs 0x71a80000) +set(baseaddress_windowscodecsext 0x71a40000) +set(baseaddress_winfax 0x71a10000) +set(baseaddress_wing32 0x719e0000) +set(baseaddress_winhttp 0x71960000) +set(baseaddress_winprint 0x71930000) +set(baseaddress_winscard 0x718f0000) +set(baseaddress_winsta 0x718b0000) +set(baseaddress_wkssvc 0x71870000) +set(baseaddress_wlanapi 0x71830000) +set(baseaddress_wldap32 0x717d0000) +set(baseaddress_wmi 0x717b0000) +set(baseaddress_wmisvc 0x71780000) +set(baseaddress_wmiutils 0x71730000) +set(baseaddress_wmvcore 0x716d0000) +set(baseaddress_wshirda 0x716a0000) +set(baseaddress_wshtcpip 0x71670000) +set(baseaddress_wsock32 0x71640000) +set(baseaddress_wtsapi32 0x71600000) +set(baseaddress_wuapi 0x715b0000) +set(baseaddress_xinput1_1 0x71580000) +set(baseaddress_xinput1_2 0x71550000) +set(baseaddress_xinput1_3 0x71520000) +set(baseaddress_xinput9_1_0 0x714f0000) +set(baseaddress_xmllite 0x71490000) +set(baseaddress_zipfldr 0x713a0000) +# Extra found files +set(baseaddress_access 0x71310000) +set(baseaddress_appwiz 0x71290000) +set(baseaddress_cmicpl 0x71250000) +set(baseaddress_desk 0x71190000) +set(baseaddress_hdwwiz 0x71110000) +set(baseaddress_hhctrl 0x710a0000) +set(baseaddress_imaadp32.acm 0x71060000) +set(baseaddress_inetcpl 0x71000000) +set(baseaddress_intl 0x70f80000) +set(baseaddress_joy 0x70f40000) +set(baseaddress_main 0x70ea0000) +set(baseaddress_mmsys 0x70dc0000) +set(baseaddress_msacm32.drv 0x70d80000) +set(baseaddress_msadp32.acm 0x70d50000) +set(baseaddress_msg711.acm 0x70d20000) +set(baseaddress_msgsm32.acm 0x70cf0000) +set(baseaddress_msisys 0x70cc0000) +set(baseaddress_ncpa 0x70c90000) +set(baseaddress_odbccp32i 0x70c60000) +set(baseaddress_openglcfg 0x70c20000) +set(baseaddress_powercfg 0x70bb0000) +set(baseaddress_sysdm 0x70ac0000) +set(baseaddress_telephon 0x70a90000) +set(baseaddress_timedate 0x70a10000) +set(baseaddress_usrmgr 0x709b0000) +set(baseaddress_wdmaud.drv 0x707e0000) +set(baseaddress_wined3dcfg 0x707a0000) +set(baseaddress_winemp3.acm 0x70700000) +set(baseaddress_wshom 0x706a0000)

1 0

02/02: [LICCPA] Fix translation and align dialog controls
by Eric Kohl 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aad801914b28dc13b84d8… commit aad801914b28dc13b84d8f652c0a08488cefea62 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 1 11:07:02 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 1 17:28:29 2018 +0200 [LICCPA] Fix translation and align dialog controls --- dll/cpl/liccpa/lang/de-DE.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/cpl/liccpa/lang/de-DE.rc b/dll/cpl/liccpa/lang/de-DE.rc index 2595d16f83..e5e9aeaf8c 100644 --- a/dll/cpl/liccpa/lang/de-DE.rc +++ b/dll/cpl/liccpa/lang/de-DE.rc @@ -8,16 +8,16 @@ CAPTION "Wählen Sie den Lizenzmodus aus" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Client-Lizenzierungsmodus", 100, "BUTTON", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 4, 4, 239, 94 - CONTROL "Per Gerät oder per Benutzer", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 - CONTROL "Per Server. Nummer der gleichzeitigen Verbindungen:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 + CONTROL "Je Gerät oder je &Benutzer", 102, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 79, 107, 12 + CONTROL "Je &Server. Anzahl der gleichzeitigen Verbindungen:", 103, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE, 13, 38, 163, 9 CONTROL "Produkt:", 105, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 13, 20, 31, 8 CONTROL "", 106, "COMBOBOX", CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP, 49, 20, 171, 12 - CONTROL "OK", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 7, 46, 14 - CONTROL "Abbrechen", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 27, 46, 14 - CONTROL "Hilfe", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 48, 46, 14 - CONTROL "Replikation...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 263, 68, 46, 14 - CONTROL "Lizenz hinzufügen", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 65, 15 - CONTROL "Lizenz entfernen", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 61, 16 + CONTROL "OK", 107, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 258, 7, 50, 14 + CONTROL "Abbrechen", 108, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 258, 27, 50, 14 + CONTROL "Hilfe", 109, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 258, 48, 50, 14 + CONTROL "Replikation...", 110, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 258, 68, 50, 14 + CONTROL "Lizenz hinzufügen", 111, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 30, 56, 66, 14 + CONTROL "Lizenz entfernen", 112, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 112, 56, 66, 14 CONTROL "", 114, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 187, 39, 32, 12 END

1 0

01/02: [LICCPA] Make the License Manager GUI build and make it visible (again)
by Eric Kohl 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fdb4d99c79a86343dddd… commit 2fdb4d99c79a86343ddddd13a7f0a8b6a03588c8 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Jul 1 11:02:10 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Jul 1 17:28:28 2018 +0200 [LICCPA] Make the License Manager GUI build and make it visible (again) - Add the missing CMakeLists.txt file. - Comment-out an unused variable. - Make WM_INITDIALOG return TRUE, so that the dialog gets visible. --- dll/cpl/liccpa/CMakeLists.txt | 19 +++++++++++++++++++ dll/cpl/liccpa/liccpa.c | 9 ++------- dll/cpl/liccpa/liccpa.h | 23 ++++++++++++++++++++++- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dll/cpl/liccpa/CMakeLists.txt b/dll/cpl/liccpa/CMakeLists.txt new file mode 100644 index 0000000000..c5871dbef3 --- /dev/null +++ b/dll/cpl/liccpa/CMakeLists.txt @@ -0,0 +1,19 @@ + +spec2def(liccpa.cpl liccpa.spec) + +list(APPEND SOURCE + liccpa.c + liccpa.h) + +file(GLOB liccpa_rc_deps resources/*.*) +add_rc_deps(liccpa.rc ${liccpa_rc_deps}) + +add_library(liccpa SHARED + ${SOURCE} + liccpa.rc + ${CMAKE_CURRENT_BINARY_DIR}/liccpa.def) + +set_module_type(liccpa cpl UNICODE) +add_importlibs(liccpa advapi32 user32 gdi32 msvcrt kernel32 ntdll) +add_pch(liccpa liccpa.h SOURCE) +add_cd_file(TARGET liccpa DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/liccpa/liccpa.c b/dll/cpl/liccpa/liccpa.c index 860954bcf2..50b4fbb426 100644 --- a/dll/cpl/liccpa/liccpa.c +++ b/dll/cpl/liccpa/liccpa.c @@ -10,11 +10,6 @@ * This application does almost nothing and its really good at it. */ -#include <windows.h> -#include <commctrl.h> -#include <cpl.h> - -#include "resource.h" #include "liccpa.h" HINSTANCE hApplet = 0; @@ -26,12 +21,12 @@ DlgMainProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - TCHAR szString[256]; +// TCHAR szString[256]; switch (uMsg) { case WM_INITDIALOG: - break; + return TRUE; case WM_COMMAND: switch (HIWORD(wParam)) diff --git a/dll/cpl/liccpa/liccpa.h b/dll/cpl/liccpa/liccpa.h index 694663d208..45c010b5db 100644 --- a/dll/cpl/liccpa/liccpa.h +++ b/dll/cpl/liccpa/liccpa.h @@ -1,4 +1,23 @@ -#pragma once +#ifndef _LICCPA_H +#define _LICCPA_H + +#include <stdarg.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <wingdi.h> +#include <wincon.h> +#include <devguid.h> +#include <shlobj.h> +#include <cpl.h> +#include <regstr.h> + +#include "resource.h" typedef struct { @@ -10,4 +29,6 @@ typedef struct extern HINSTANCE hApplet; +#endif /* _LICCPA_H */ + /* EOF */

1 0

01/01: [TRANSLATION][TREE] Polish translation of tree utility (#654)
by Paweł Cholewa 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73194a8ea97da98140741… commit 73194a8ea97da98140741ec8a835943c48217f78 Author: Paweł Cholewa <MCPlayG(a)wp.pl> AuthorDate: Sun Jul 1 16:04:14 2018 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Jul 1 16:04:14 2018 +0200 [TRANSLATION][TREE] Polish translation of tree utility (#654) --- base/applications/cmdutils/tree/lang/pl-PL.rc | 12 ++++++++++++ base/applications/cmdutils/tree/tree.rc | 3 +++ 2 files changed, 15 insertions(+) diff --git a/base/applications/cmdutils/tree/lang/pl-PL.rc b/base/applications/cmdutils/tree/lang/pl-PL.rc new file mode 100644 index 0000000000..a897058cef --- /dev/null +++ b/base/applications/cmdutils/tree/lang/pl-PL.rc @@ -0,0 +1,12 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "Przedstawia graficznie strukturę folderów na dysku lub w określonej ścieżce.\n\n\ +TREE [dysk:][ścieżka] [/F] [/A]\n\n\ +\t/F Wyświetla nazwy plików w poszczególnych folderach.\n\ +\t/A Używa znaków ASCII zamiast znaków rozszerzonych.\n" + IDS_NO_SUBDIRECTORIES "Nie ma żadnych podfolderów" + IDS_FOLDER_PATH "Zmienna PATH folderu\n" + IDS_VOL_SERIAL "Numer seryjny woluminu to %x:%x\n" +END diff --git a/base/applications/cmdutils/tree/tree.rc b/base/applications/cmdutils/tree/tree.rc index 8092b180c0..c06f93e3e1 100644 --- a/base/applications/cmdutils/tree/tree.rc +++ b/base/applications/cmdutils/tree/tree.rc @@ -23,6 +23,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 0

01/01: [CMAKE] Update baseaddress for msvc & gcc with rossym. CORE-14781
by Mark Jansen 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=82351bc6d410f020b5589… commit 82351bc6d410f020b5589cfdda628073753f78f4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Jul 1 15:34:53 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Jul 1 15:35:57 2018 +0200 [CMAKE] Update baseaddress for msvc & gcc with rossym. CORE-14781 --- sdk/cmake/baseaddress.cmake | 740 ++++++++++++++++++++------------------- sdk/cmake/baseaddress_msvc.cmake | 735 +++++++++++++++++++------------------- 2 files changed, 748 insertions(+), 727 deletions(-) diff --git a/sdk/cmake/baseaddress.cmake b/sdk/cmake/baseaddress.cmake index d0c065cd18..ed9f08f833 100644 --- a/sdk/cmake/baseaddress.cmake +++ b/sdk/cmake/baseaddress.cmake @@ -1,366 +1,374 @@ -set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c710000) -set(baseaddress_msvcrt 0x7c660000) -set(baseaddress_advapi32 0x7c5b0000) -set(baseaddress_gdi32 0x7c500000) -set(baseaddress_user32 0x7c380000) -set(baseaddress_dhcpcsvc 0x7c330000) -set(baseaddress_dnsapi 0x7c2e0000) -set(baseaddress_icmp 0x7c2b0000) -set(baseaddress_iphlpapi 0x7c260000) -set(baseaddress_ws2_32 0x7c210000) -set(baseaddress_ws2help 0x7c1e0000) -set(baseaddress_shlwapi 0x7c130000) -set(baseaddress_rpcrt4 0x7c060000) -set(baseaddress_comctl32 0x7bea0000) -set(baseaddress_ole32 0x7bca0000) -set(baseaddress_winspool 0x7bc60000) -set(baseaddress_winmm 0x7bba0000) -set(baseaddress_comdlg32 0x7baa0000) -set(baseaddress_shell32 0x7b240000) -set(baseaddress_lz32 0x7b220000) -set(baseaddress_version 0x7b1f0000) -set(baseaddress_oleaut32 0x7b020000) -set(baseaddress_setupapi 0x7aeb0000) -set(baseaddress_mpr 0x7ae70000) -set(baseaddress_crypt32 0x7ad60000) -set(baseaddress_wininet 0x7aca0000) -set(baseaddress_urlmon 0x7aba0000) -set(baseaddress_psapi 0x7ab70000) -set(baseaddress_imm32 0x7ab30000) -set(baseaddress_msvfw32 0x7aae0000) -set(baseaddress_dbghelp 0x7aa30000) -set(baseaddress_devmgr 0x7a950000) -set(baseaddress_msacm32 0x7a910000) -set(baseaddress_netapi32 0x7a890000) -set(baseaddress_powrprof 0x7a860000) -set(baseaddress_secur32 0x7a810000) -set(baseaddress_wintrust 0x7a7b0000) -set(baseaddress_avicap32 0x7a780000) -set(baseaddress_cabinet 0x7a730000) -set(baseaddress_dsound 0x7a6b0000) -set(baseaddress_glu32 0x7a5b0000) -set(baseaddress_opengl32 0x7a3a0000) -set(baseaddress_riched20 0x7a2d0000) -set(baseaddress_smdll 0x7a2b0000) -set(baseaddress_userenv 0x7a260000) -set(baseaddress_uxtheme 0x7a200000) -set(baseaddress_cryptui 0x7a150000) -set(baseaddress_csrsrv 0x7a120000) -set(baseaddress_basesrv 0x7a0f0000) -set(baseaddress_winsrv 0x7a050000) -set(baseaddress_dplayx 0x79fe0000) -set(baseaddress_gdiplus 0x79f00000) -set(baseaddress_msimg32 0x79ed0000) -set(baseaddress_mswsock 0x79ea0000) -set(baseaddress_oledlg 0x79e50000) -set(baseaddress_rasapi32 0x79e20000) -set(baseaddress_rsaenh 0x79db0000) -set(baseaddress_samlib 0x79d70000) -set(baseaddress_sensapi 0x79d40000) -set(baseaddress_sfc_os 0x79d10000) -set(baseaddress_snmpapi 0x79ce0000) -set(baseaddress_spoolss 0x79ca0000) -set(baseaddress_usp10 0x79c20000) -set(baseaddress_acgenral 0x79bf0000) -set(baseaddress_aclayers 0x79bc0000) -set(baseaddress_acledit 0x79b90000) -set(baseaddress_aclui 0x79b50000) -set(baseaddress_acppage 0x79ae0000) -set(baseaddress_activeds 0x79ab0000) -set(baseaddress_actxprxy 0x798b0000) -set(baseaddress_advapi32_vista 0x79890000) -set(baseaddress_advpack 0x79850000) -set(baseaddress_amstream 0x79800000) -set(baseaddress_apphelp 0x797c0000) -set(baseaddress_atl 0x79780000) -set(baseaddress_atl100 0x79740000) -set(baseaddress_atl80 0x79700000) -set(baseaddress_authz 0x796d0000) -set(baseaddress_avifil32 0x79650000) -set(baseaddress_batt 0x79620000) -set(baseaddress_bcrypt 0x795f0000) -set(baseaddress_beepmidi 0x795c0000) -set(baseaddress_browseui 0x79450000) -set(baseaddress_cards 0x79390000) -set(baseaddress_cfgmgr32 0x79360000) -set(baseaddress_clusapi 0x79330000) -set(baseaddress_comcat 0x79300000) -set(baseaddress_compstui 0x792d0000) -set(baseaddress_console 0x79270000) -set(baseaddress_credui 0x79230000) -set(baseaddress_crtdll 0x791d0000) -set(baseaddress_cryptdlg 0x791a0000) -set(baseaddress_cryptdll 0x79170000) -set(baseaddress_cryptnet 0x79140000) -set(baseaddress_d3d8 0x790e0000) -set(baseaddress_d3d8thk 0x790c0000) -set(baseaddress_d3d9 0x79050000) -set(baseaddress_d3dcompiler_43 0x78fa0000) -set(baseaddress_d3drm 0x78f10000) -set(baseaddress_d3dwine 0x78d10000) -set(baseaddress_d3dx9_24 0x78ce0000) -set(baseaddress_d3dx9_25 0x78ca0000) -set(baseaddress_d3dx9_26 0x78c70000) -set(baseaddress_d3dx9_27 0x78c40000) -set(baseaddress_d3dx9_28 0x78c10000) -set(baseaddress_d3dx9_29 0x78be0000) -set(baseaddress_d3dx9_30 0x78bb0000) -set(baseaddress_d3dx9_31 0x78b80000) -set(baseaddress_d3dx9_32 0x78b50000) -set(baseaddress_d3dx9_33 0x78b20000) -set(baseaddress_d3dx9_34 0x78af0000) -set(baseaddress_d3dx9_35 0x78ac0000) -set(baseaddress_d3dx9_36 0x789c0000) -set(baseaddress_d3dx9_37 0x78990000) -set(baseaddress_d3dx9_38 0x78960000) -set(baseaddress_d3dx9_39 0x78930000) -set(baseaddress_d3dx9_40 0x78900000) -set(baseaddress_d3dx9_41 0x788d0000) -set(baseaddress_d3dx9_42 0x788a0000) -set(baseaddress_d3dx9_43 0x78870000) -set(baseaddress_d3dxof 0x78830000) -set(baseaddress_dciman32 0x78800000) -set(baseaddress_ddraw 0x78740000) -set(baseaddress_deskadp 0x78710000) -set(baseaddress_deskmon 0x786e0000) -set(baseaddress_devcpux 0x786b0000) -set(baseaddress_devenum 0x78660000) -set(baseaddress_dinput 0x78600000) -set(baseaddress_dinput8 0x785d0000) -set(baseaddress_dmusic 0x78580000) -set(baseaddress_dplay 0x78550000) -set(baseaddress_dxdiagn 0x78500000) -set(baseaddress_esent 0x784d0000) -set(baseaddress_faultrep 0x784a0000) -set(baseaddress_fltlib 0x78470000) -set(baseaddress_fmifs 0x78450000) -set(baseaddress_fontext 0x78420000) -set(baseaddress_fontsub 0x783f0000) -set(baseaddress_framebuf 0x783d0000) -set(baseaddress_framedyn 0x78390000) -set(baseaddress_genincdata 0x78360000) -set(baseaddress_getuname 0x77a60000) -set(baseaddress_hid 0x77a30000) -set(baseaddress_hlink 0x779f0000) -set(baseaddress_hnetcfg 0x779b0000) -set(baseaddress_httpapi 0x77980000) -set(baseaddress_iccvid 0x77950000) -set(baseaddress_ieframe 0x77860000) -set(baseaddress_iernonce 0x77830000) -set(baseaddress_imagehlp 0x77800000) -set(baseaddress_inetcomm 0x77790000) -set(baseaddress_inetmib1 0x77760000) -set(baseaddress_initpki 0x77730000) -set(baseaddress_input 0x776d0000) -set(baseaddress_inseng 0x77690000) -set(baseaddress_iologmsg 0x77670000) -set(baseaddress_itircl 0x77640000) -set(baseaddress_itss 0x77600000) -set(baseaddress_jscript 0x774f0000) -set(baseaddress_jsproxy 0x774c0000) -set(baseaddress_kbdeo 0x774a0000) -set(baseaddress_kbsdll 0x77470000) -set(baseaddress_kernel32_vista 0x77450000) -set(baseaddress_ksuser 0x77420000) -set(baseaddress_libjpeg 0x77390000) -set(baseaddress_libpng 0x77300000) -set(baseaddress_libtiff 0x77230000) -set(baseaddress_libtirpc 0x771d0000) -set(baseaddress_libxslt 0x76f00000) -set(baseaddress_loadperf 0x76ed0000) -set(baseaddress_localmon 0x76ea0000) -set(baseaddress_localspl 0x76e60000) -set(baseaddress_localspl_apitest.dll 0x76e30000) -set(baseaddress_localui 0x76e00000) -set(baseaddress_lpk 0x76dd0000) -set(baseaddress_lsasrv 0x76d60000) -set(baseaddress_mapi32 0x76d20000) -set(baseaddress_mbedtls 0x76c90000) -set(baseaddress_mciavi32 0x76c50000) -set(baseaddress_mcicda 0x76c20000) -set(baseaddress_mciqtz32 0x76be0000) -set(baseaddress_mciseq 0x76bb0000) -set(baseaddress_mciwave 0x76b80000) -set(baseaddress_mgmtapi 0x76b50000) -set(baseaddress_midimap 0x76b20000) -set(baseaddress_mlang 0x76ae0000) -set(baseaddress_mmdrv 0x76ab0000) -set(baseaddress_modemui 0x76a40000) -set(baseaddress_mprapi 0x76a10000) -set(baseaddress_msafd 0x769d0000) -set(baseaddress_mscat32 0x769a0000) -set(baseaddress_mscms 0x76970000) -set(baseaddress_mscoree 0x76920000) -set(baseaddress_msctf 0x768c0000) -set(baseaddress_msdmo 0x76890000) -set(baseaddress_msftedit 0x76860000) -set(baseaddress_msgina 0x767c0000) -set(baseaddress_mshtml 0x764b0000) -set(baseaddress_msi 0x76300000) -set(baseaddress_msimtf 0x762d0000) -set(baseaddress_msisip 0x762a0000) -set(baseaddress_mspatcha 0x76270000) -set(baseaddress_msports 0x76240000) -set(baseaddress_msrle32 0x76210000) -set(baseaddress_mssign32 0x761e0000) -set(baseaddress_mssip32 0x761b0000) -set(baseaddress_mstask 0x76170000) -set(baseaddress_msv1_0 0x76140000) -set(baseaddress_msvcrt_crt_dll_startup 0x76110000) -set(baseaddress_msvcrt20 0x76040000) -set(baseaddress_msvcrt40 0x75f70000) -set(baseaddress_msvidc32 0x75f40000) -set(baseaddress_msxml 0x75f10000) -set(baseaddress_msxml2 0x75ee0000) -set(baseaddress_msxml3 0x75b00000) -set(baseaddress_msxml4 0x75ac0000) -set(baseaddress_msxml6 0x75a80000) -set(baseaddress_mycomput 0x75a60000) -set(baseaddress_nddeapi 0x75a30000) -set(baseaddress_netcfgx 0x759a0000) -set(baseaddress_netevent 0x75980000) -set(baseaddress_netid 0x75930000) -set(baseaddress_netshell 0x75880000) -set(baseaddress_newdev 0x75820000) -set(baseaddress_nfs41_np 0x757f0000) -set(baseaddress_normaliz 0x757c0000) -set(baseaddress_npptools 0x75790000) -set(baseaddress_ntdll_vista 0x75770000) -set(baseaddress_ntdsapi 0x75740000) -set(baseaddress_ntlanman 0x75710000) -set(baseaddress_ntmarta 0x756e0000) -set(baseaddress_ntobjshex 0x75640000) -set(baseaddress_objsel 0x75610000) -set(baseaddress_odbc32 0x755d0000) -set(baseaddress_odbccp32 0x755a0000) -set(baseaddress_oleacc 0x75510000) -set(baseaddress_olecli32 0x754e0000) -set(baseaddress_olepro32 0x754b0000) -set(baseaddress_olesvr32 0x75480000) -set(baseaddress_olethk32 0x75450000) -set(baseaddress_pdh 0x75410000) -set(baseaddress_pidgen 0x753e0000) -set(baseaddress_pifmgr 0x75370000) -set(baseaddress_printui 0x75340000) -set(baseaddress_propsys 0x75300000) -set(baseaddress_pstorec 0x752d0000) -set(baseaddress_qedit 0x75280000) -set(baseaddress_qmgr 0x75240000) -set(baseaddress_qmgrprxy 0x751e0000) -set(baseaddress_quartz 0x75060000) -set(baseaddress_query 0x75030000) -set(baseaddress_rasadhlp 0x75000000) -set(baseaddress_rasdlg 0x74e30000) -set(baseaddress_rasman 0x74e00000) -set(baseaddress_redirtest1 0x74dd0000) -set(baseaddress_redirtest2 0x74da0000) -set(baseaddress_resutils 0x74d70000) -set(baseaddress_riched32 0x74d40000) -set(baseaddress_rsabase 0x74d20000) -set(baseaddress_rshell 0x74c80000) -set(baseaddress_samsrv 0x74c10000) -set(baseaddress_sccbase 0x74be0000) -set(baseaddress_schannel 0x74ba0000) -set(baseaddress_schedsvc 0x74b70000) -set(baseaddress_scrrun 0x74b10000) -set(baseaddress_security 0x74af0000) -set(baseaddress_serialui 0x74ac0000) -set(baseaddress_sfc 0x74a90000) -set(baseaddress_shdoclc 0x74a50000) -set(baseaddress_shdocvw 0x74a00000) -set(baseaddress_shellbtrfs 0x748a0000) -set(baseaddress_shfolder 0x74880000) -set(baseaddress_shimgvw 0x74830000) -set(baseaddress_shsvcs 0x74800000) -set(baseaddress_slbcsp 0x747d0000) -set(baseaddress_sndblst 0x747a0000) -set(baseaddress_softpub 0x74780000) -set(baseaddress_srclient 0x74750000) -set(baseaddress_srvsvc 0x74720000) -set(baseaddress_sti 0x746e0000) -set(baseaddress_stobject 0x74660000) -set(baseaddress_streamci 0x74630000) -set(baseaddress_sxs 0x74600000) -set(baseaddress_syssetup 0x74510000) -set(baseaddress_t2embed 0x744e0000) -set(baseaddress_tapi32 0x744a0000) -set(baseaddress_tapiui 0x74420000) -set(baseaddress_testvdd 0x743f0000) -set(baseaddress_themeui 0x743d0000) -set(baseaddress_traffic 0x743a0000) -set(baseaddress_twain_32 0x74370000) -set(baseaddress_ubtrfs 0x74340000) -set(baseaddress_ucdfs 0x74320000) -set(baseaddress_uext2 0x742e0000) -set(baseaddress_ufat 0x742a0000) -set(baseaddress_ufatx 0x74280000) -set(baseaddress_uffs 0x74260000) -set(baseaddress_umpnpmgr 0x74230000) -set(baseaddress_untfs 0x74210000) -set(baseaddress_updspapi 0x741e0000) -set(baseaddress_ureiserfs 0x741c0000) -set(baseaddress_url 0x74190000) -set(baseaddress_vbscript 0x740f0000) -set(baseaddress_vdmdbg 0x740c0000) -set(baseaddress_vssapi 0x74090000) -set(baseaddress_wbemdisp 0x74040000) -set(baseaddress_wbemprox 0x73fe0000) -set(baseaddress_win32u 0x73fb0000) -set(baseaddress_windowscodecs 0x73e70000) -set(baseaddress_windowscodecsext 0x73e40000) -set(baseaddress_winfax 0x73e10000) -set(baseaddress_wing32 0x73de0000) -set(baseaddress_winhttp 0x73d70000) -set(baseaddress_winprint 0x73d40000) -set(baseaddress_winscard 0x73d10000) -set(baseaddress_winsta 0x73ce0000) -set(baseaddress_wkssvc 0x73cb0000) -set(baseaddress_wlanapi 0x73c80000) -set(baseaddress_wldap32 0x73c40000) -set(baseaddress_wmi 0x73c20000) -set(baseaddress_wmisvc 0x73bf0000) -set(baseaddress_wmiutils 0x73bb0000) -set(baseaddress_wmvcore 0x73b60000) -set(baseaddress_wshirda 0x73b30000) -set(baseaddress_wshtcpip 0x73b00000) -set(baseaddress_wsock32 0x73ad0000) -set(baseaddress_wtsapi32 0x73aa0000) -set(baseaddress_wuapi 0x73a60000) -set(baseaddress_xinput1_1 0x73a30000) -set(baseaddress_xinput1_2 0x73a00000) -set(baseaddress_xinput1_3 0x739d0000) -set(baseaddress_xinput9_1_0 0x739a0000) -set(baseaddress_xmllite 0x73960000) -set(baseaddress_access 0x738e0000) -set(baseaddress_appwiz 0x73860000) -set(baseaddress_cmicpl 0x73820000) -set(baseaddress_desk 0x73780000) -set(baseaddress_hdwwiz 0x73700000) -set(baseaddress_hhctrl 0x736a0000) -set(baseaddress_imaadp32.acm 0x73670000) -set(baseaddress_inetcpl 0x73610000) -set(baseaddress_intl 0x735a0000) -set(baseaddress_joy 0x73560000) -set(baseaddress_main 0x734c0000) -set(baseaddress_mmsys 0x733f0000) -set(baseaddress_msacm32.drv 0x733c0000) -set(baseaddress_msadp32.acm 0x73390000) -set(baseaddress_msg711.acm 0x73360000) -set(baseaddress_msgsm32.acm 0x73330000) -set(baseaddress_msisys 0x73300000) -set(baseaddress_ncpa 0x732d0000) -set(baseaddress_odbccp32i 0x732a0000) -set(baseaddress_openglcfg 0x73270000) -set(baseaddress_powercfg 0x73210000) -set(baseaddress_sysdm 0x73130000) -set(baseaddress_telephon 0x73100000) -set(baseaddress_timedate 0x73080000) -set(baseaddress_usrmgr 0x73030000) -set(baseaddress_wdmaud.drv 0x72e70000) -set(baseaddress_wined3dcfg 0x72e40000) -set(baseaddress_winemp3.acm 0x72dc0000) -set(baseaddress_wshom 0x72d70000) -set(baseaddress_fusion 0x72d30000) -set(baseaddress_fusion_1_1 0x72cf0000) -set(baseaddress_fusion_2_0 0x72cb0000) +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c6b0000) +set(baseaddress_msvcrt 0x7c5f0000) +set(baseaddress_advapi32 0x7c540000) +set(baseaddress_gdi32 0x7c490000) +set(baseaddress_user32 0x7c310000) +set(baseaddress_dhcpcsvc 0x7c2c0000) +set(baseaddress_dnsapi 0x7c270000) +set(baseaddress_icmp 0x7c240000) +set(baseaddress_iphlpapi 0x7c1f0000) +set(baseaddress_ws2_32 0x7c1a0000) +set(baseaddress_ws2help 0x7c170000) +set(baseaddress_shlwapi 0x7c0c0000) +set(baseaddress_rpcrt4 0x7bff0000) +set(baseaddress_comctl32 0x7be10000) +set(baseaddress_ole32 0x7bc30000) +set(baseaddress_winspool.drv 0x7bbe0000) +set(baseaddress_winmm 0x7bb20000) +set(baseaddress_comdlg32 0x7ba10000) +set(baseaddress_shell32 0x7b150000) +set(baseaddress_lz32 0x7b130000) +set(baseaddress_version 0x7b100000) +set(baseaddress_oleaut32 0x7af20000) +set(baseaddress_setupapi 0x7ada0000) +set(baseaddress_mpr 0x7ad60000) +set(baseaddress_crypt32 0x7ac50000) +set(baseaddress_wininet 0x7ab90000) +set(baseaddress_urlmon 0x7aa90000) +set(baseaddress_psapi 0x7aa60000) +set(baseaddress_imm32 0x7aa20000) +set(baseaddress_msvfw32 0x7a9d0000) +set(baseaddress_dbghelp 0x7a920000) +set(baseaddress_devmgr 0x7a840000) +set(baseaddress_msacm32 0x7a800000) +set(baseaddress_netapi32 0x7a780000) +set(baseaddress_powrprof 0x7a750000) +set(baseaddress_secur32 0x7a700000) +set(baseaddress_wintrust 0x7a6a0000) +set(baseaddress_avicap32 0x7a670000) +set(baseaddress_cabinet 0x7a620000) +set(baseaddress_dsound 0x7a5a0000) +set(baseaddress_glu32 0x7a4a0000) +set(baseaddress_opengl32 0x7a290000) +set(baseaddress_riched20 0x7a1c0000) +set(baseaddress_smdll 0x7a1a0000) +set(baseaddress_userenv 0x7a150000) +set(baseaddress_uxtheme 0x7a0f0000) +set(baseaddress_cryptui 0x7a040000) +set(baseaddress_csrsrv 0x7a010000) +set(baseaddress_basesrv 0x79fe0000) +set(baseaddress_winsrv 0x79f30000) +set(baseaddress_dplayx 0x79ec0000) +set(baseaddress_gdiplus 0x79de0000) +set(baseaddress_msimg32 0x79db0000) +set(baseaddress_mswsock 0x79d80000) +set(baseaddress_oledlg 0x79d30000) +set(baseaddress_rasapi32 0x79d00000) +set(baseaddress_rsaenh 0x79c90000) +set(baseaddress_samlib 0x79c50000) +set(baseaddress_sensapi 0x79c20000) +set(baseaddress_sfc_os 0x79bf0000) +set(baseaddress_snmpapi 0x79bc0000) +set(baseaddress_spoolss 0x79b80000) +set(baseaddress_usp10 0x79b00000) +# Extra found dlls +set(baseaddress_acgenral 0x79ad0000) +set(baseaddress_aclayers 0x79aa0000) +set(baseaddress_acledit 0x79a70000) +set(baseaddress_aclui 0x79a30000) +set(baseaddress_acppage 0x799c0000) +set(baseaddress_activeds 0x79990000) +set(baseaddress_actxprxy 0x79780000) +set(baseaddress_advapi32_vista 0x79760000) +set(baseaddress_advpack 0x79720000) +set(baseaddress_amstream 0x796c0000) +set(baseaddress_apphelp 0x79680000) +set(baseaddress_atl 0x79640000) +set(baseaddress_atl100 0x79600000) +set(baseaddress_atl80 0x795c0000) +set(baseaddress_authz 0x79590000) +set(baseaddress_avifil32 0x79510000) +set(baseaddress_batt 0x794e0000) +set(baseaddress_bcrypt 0x794b0000) +set(baseaddress_beepmidi 0x79480000) +set(baseaddress_browseui 0x792f0000) +set(baseaddress_cards 0x79230000) +set(baseaddress_cfgmgr32 0x79200000) +set(baseaddress_clusapi 0x791d0000) +set(baseaddress_comcat 0x791a0000) +set(baseaddress_compstui 0x79170000) +set(baseaddress_console 0x79110000) +set(baseaddress_credui 0x790d0000) +set(baseaddress_crtdll 0x79060000) +set(baseaddress_cryptdlg 0x79030000) +set(baseaddress_cryptdll 0x79000000) +set(baseaddress_cryptnet 0x78fd0000) +set(baseaddress_custom 0x78fa0000) +set(baseaddress_d3d8 0x78f40000) +set(baseaddress_d3d8thk 0x78f20000) +set(baseaddress_d3d9 0x78eb0000) +set(baseaddress_d3dcompiler_43 0x78e00000) +set(baseaddress_d3drm 0x78d60000) +set(baseaddress_d3dwine 0x78b50000) +set(baseaddress_d3dx9_24 0x78b20000) +set(baseaddress_d3dx9_25 0x78ae0000) +set(baseaddress_d3dx9_26 0x78ab0000) +set(baseaddress_d3dx9_27 0x78a80000) +set(baseaddress_d3dx9_28 0x78a50000) +set(baseaddress_d3dx9_29 0x78a20000) +set(baseaddress_d3dx9_30 0x789f0000) +set(baseaddress_d3dx9_31 0x789c0000) +set(baseaddress_d3dx9_32 0x78990000) +set(baseaddress_d3dx9_33 0x78960000) +set(baseaddress_d3dx9_34 0x78930000) +set(baseaddress_d3dx9_35 0x78900000) +set(baseaddress_d3dx9_36 0x78800000) +set(baseaddress_d3dx9_37 0x787d0000) +set(baseaddress_d3dx9_38 0x787a0000) +set(baseaddress_d3dx9_39 0x78770000) +set(baseaddress_d3dx9_40 0x78740000) +set(baseaddress_d3dx9_41 0x78710000) +set(baseaddress_d3dx9_42 0x786e0000) +set(baseaddress_d3dx9_43 0x786b0000) +set(baseaddress_d3dxof 0x78670000) +set(baseaddress_dciman32 0x78640000) +set(baseaddress_ddraw 0x78580000) +set(baseaddress_deskadp 0x78550000) +set(baseaddress_deskmon 0x78520000) +set(baseaddress_devcpux 0x784f0000) +set(baseaddress_devenum 0x784a0000) +set(baseaddress_dinput 0x78440000) +set(baseaddress_dinput8 0x78410000) +set(baseaddress_dmusic 0x783c0000) +set(baseaddress_dplay 0x78390000) +set(baseaddress_dxdiagn 0x78340000) +set(baseaddress_dxtn 0x78320000) +set(baseaddress_esent 0x782f0000) +set(baseaddress_faultrep 0x782c0000) +set(baseaddress_fltlib 0x78290000) +set(baseaddress_fmifs 0x78270000) +set(baseaddress_fontext 0x78240000) +set(baseaddress_fontsub 0x78210000) +set(baseaddress_framebuf 0x781f0000) +set(baseaddress_framebuf_new 0x781d0000) +set(baseaddress_framedyn 0x78190000) +set(baseaddress_genincdata 0x78160000) +set(baseaddress_getuname 0x77860000) +set(baseaddress_hid 0x77830000) +set(baseaddress_hlink 0x777f0000) +set(baseaddress_hnetcfg 0x777b0000) +set(baseaddress_httpapi 0x77780000) +set(baseaddress_iccvid 0x77750000) +set(baseaddress_ieframe 0x77650000) +set(baseaddress_iernonce 0x77620000) +set(baseaddress_imagehlp 0x775f0000) +set(baseaddress_inetcomm 0x77580000) +set(baseaddress_inetmib1 0x77550000) +set(baseaddress_initpki 0x77520000) +set(baseaddress_input 0x774c0000) +set(baseaddress_inseng 0x77480000) +set(baseaddress_iologmsg 0x77460000) +set(baseaddress_itircl 0x77430000) +set(baseaddress_itss 0x773f0000) +set(baseaddress_jscript 0x772e0000) +set(baseaddress_jsproxy 0x772b0000) +set(baseaddress_kbdeo 0x77290000) +set(baseaddress_kbsdll 0x77260000) +set(baseaddress_kernel32_vista 0x77240000) +set(baseaddress_ksuser 0x77210000) +set(baseaddress_libjpeg 0x77180000) +set(baseaddress_libpng 0x770f0000) +set(baseaddress_libtiff 0x77020000) +set(baseaddress_libtirpc 0x76fc0000) +set(baseaddress_libxslt 0x76cf0000) +set(baseaddress_loadperf 0x76cc0000) +set(baseaddress_localmon 0x76c90000) +set(baseaddress_localspl 0x76c50000) +set(baseaddress_localspl_apitest 0x76c20000) +set(baseaddress_localui 0x76bf0000) +set(baseaddress_lpk 0x76bb0000) +set(baseaddress_lsasrv 0x76b40000) +set(baseaddress_mapi32 0x76b00000) +set(baseaddress_mbedtls 0x76a70000) +set(baseaddress_mciavi32 0x76a30000) +set(baseaddress_mcicda 0x76a00000) +set(baseaddress_mciqtz32 0x769c0000) +set(baseaddress_mciseq 0x76990000) +set(baseaddress_mciwave 0x76960000) +set(baseaddress_mgmtapi 0x76930000) +set(baseaddress_midimap 0x76900000) +set(baseaddress_mlang 0x768c0000) +set(baseaddress_mmdrv 0x76890000) +set(baseaddress_modemui 0x76820000) +set(baseaddress_mprapi 0x767f0000) +set(baseaddress_msafd 0x767b0000) +set(baseaddress_mscat32 0x76780000) +set(baseaddress_mscms 0x76750000) +set(baseaddress_mscoree 0x76700000) +set(baseaddress_msctf 0x766a0000) +set(baseaddress_msdmo 0x76670000) +set(baseaddress_msftedit 0x76640000) +set(baseaddress_msgina 0x765a0000) +set(baseaddress_mshtml 0x76290000) +set(baseaddress_msi 0x760e0000) +set(baseaddress_msimtf 0x760b0000) +set(baseaddress_msisip 0x76080000) +set(baseaddress_mspatcha 0x76050000) +set(baseaddress_msports 0x76020000) +set(baseaddress_msrle32 0x75ff0000) +set(baseaddress_mssign32 0x75fc0000) +set(baseaddress_mssip32 0x75f90000) +set(baseaddress_mstask 0x75f50000) +set(baseaddress_msv1_0 0x75f20000) +set(baseaddress_msvcrt20 0x75e50000) +set(baseaddress_msvcrt40 0x75d80000) +set(baseaddress_msvcrt_crt_dll_startup 0x75d50000) +set(baseaddress_msvidc32 0x75d20000) +set(baseaddress_msxml 0x75cf0000) +set(baseaddress_msxml2 0x75cc0000) +set(baseaddress_msxml3 0x758e0000) +set(baseaddress_msxml4 0x758a0000) +set(baseaddress_msxml6 0x75860000) +set(baseaddress_mycomput 0x75840000) +set(baseaddress_nddeapi 0x75810000) +set(baseaddress_netcfgx 0x75780000) +set(baseaddress_netevent 0x75760000) +set(baseaddress_netid 0x75710000) +set(baseaddress_netshell 0x75660000) +set(baseaddress_newdev 0x75600000) +set(baseaddress_nfs41_np 0x755d0000) +set(baseaddress_normaliz 0x755a0000) +set(baseaddress_notifyhook 0x75570000) +set(baseaddress_npptools 0x75540000) +set(baseaddress_ntdll_vista 0x75520000) +set(baseaddress_ntdsapi 0x754f0000) +set(baseaddress_ntlanman 0x754c0000) +set(baseaddress_ntmarta 0x75490000) +set(baseaddress_ntobjshex 0x753f0000) +set(baseaddress_objsel 0x753c0000) +set(baseaddress_odbc32 0x75380000) +set(baseaddress_odbccp32 0x75350000) +set(baseaddress_oleacc 0x752c0000) +set(baseaddress_olecli32 0x75290000) +set(baseaddress_olepro32 0x75260000) +set(baseaddress_olesvr32 0x75230000) +set(baseaddress_olethk32 0x75200000) +set(baseaddress_pdh 0x751c0000) +set(baseaddress_pidgen 0x75190000) +set(baseaddress_pifmgr 0x75120000) +set(baseaddress_printui 0x750f0000) +set(baseaddress_propsys 0x750b0000) +set(baseaddress_pstorec 0x75080000) +set(baseaddress_qedit 0x75030000) +set(baseaddress_qmgr 0x74ff0000) +set(baseaddress_qmgrprxy 0x74f90000) +set(baseaddress_quartz 0x74e10000) +set(baseaddress_query 0x74de0000) +set(baseaddress_rasadhlp 0x74db0000) +set(baseaddress_rasdlg 0x74be0000) +set(baseaddress_rasman 0x74bb0000) +set(baseaddress_redirtest1 0x74b80000) +set(baseaddress_redirtest2 0x74b50000) +set(baseaddress_resutils 0x74b20000) +set(baseaddress_riched32 0x74af0000) +set(baseaddress_rsabase 0x74ad0000) +set(baseaddress_rshell 0x74a30000) +set(baseaddress_samsrv 0x749c0000) +set(baseaddress_sccbase 0x74990000) +set(baseaddress_schannel 0x74950000) +set(baseaddress_schedsvc 0x74920000) +set(baseaddress_scrrun 0x748c0000) +set(baseaddress_security 0x748a0000) +set(baseaddress_serialui 0x74870000) +set(baseaddress_sfc 0x74840000) +set(baseaddress_shdoclc 0x74800000) +set(baseaddress_shdocvw 0x747b0000) +set(baseaddress_shellbtrfs 0x74650000) +set(baseaddress_shfolder 0x74630000) +set(baseaddress_shimgvw 0x745e0000) +set(baseaddress_shsvcs 0x745b0000) +set(baseaddress_slbcsp 0x74580000) +set(baseaddress_sndblst 0x74550000) +set(baseaddress_softpub 0x74530000) +set(baseaddress_srclient 0x74500000) +set(baseaddress_srvsvc 0x744d0000) +set(baseaddress_sti 0x74490000) +set(baseaddress_stobject 0x74400000) +set(baseaddress_streamci 0x743d0000) +set(baseaddress_sxs 0x743a0000) +set(baseaddress_syssetup 0x742b0000) +set(baseaddress_t2embed 0x74280000) +set(baseaddress_tapi32 0x74240000) +set(baseaddress_tapiui 0x741c0000) +set(baseaddress_testvdd 0x74190000) +set(baseaddress_themeui 0x74170000) +set(baseaddress_traffic 0x74140000) +set(baseaddress_twain_32 0x74110000) +set(baseaddress_ubtrfs 0x740e0000) +set(baseaddress_ucdfs 0x740c0000) +set(baseaddress_uext2 0x74080000) +set(baseaddress_ufat 0x74040000) +set(baseaddress_ufatx 0x74020000) +set(baseaddress_uffs 0x74000000) +set(baseaddress_umpnpmgr 0x73fd0000) +set(baseaddress_untfs 0x73fb0000) +set(baseaddress_updspapi 0x73f80000) +set(baseaddress_ureiserfs 0x73f60000) +set(baseaddress_url 0x73f30000) +set(baseaddress_vbscript 0x73e80000) +set(baseaddress_vdmdbg 0x73e50000) +set(baseaddress_verifier 0x73e30000) +set(baseaddress_vfd 0x73dd0000) +set(baseaddress_vssapi 0x73da0000) +set(baseaddress_wbemdisp 0x73d50000) +set(baseaddress_wbemprox 0x73cf0000) +set(baseaddress_win32u 0x73cc0000) +set(baseaddress_win32u_2k3sp2 0x73c90000) +set(baseaddress_win32u_xpsp2 0x73c60000) +set(baseaddress_windowscodecs 0x73b20000) +set(baseaddress_windowscodecsext 0x73af0000) +set(baseaddress_winfax 0x73ac0000) +set(baseaddress_wing32 0x73a90000) +set(baseaddress_winhttp 0x73a20000) +set(baseaddress_winprint 0x739f0000) +set(baseaddress_winscard 0x739c0000) +set(baseaddress_winsta 0x73990000) +set(baseaddress_wkssvc 0x73960000) +set(baseaddress_wlanapi 0x73930000) +set(baseaddress_wldap32 0x738f0000) +set(baseaddress_wmi 0x738d0000) +set(baseaddress_wmisvc 0x738a0000) +set(baseaddress_wmiutils 0x73860000) +set(baseaddress_wmvcore 0x73810000) +set(baseaddress_wshirda 0x737e0000) +set(baseaddress_wshtcpip 0x737b0000) +set(baseaddress_wsock32 0x73780000) +set(baseaddress_wtsapi32 0x73750000) +set(baseaddress_wuapi 0x73710000) +set(baseaddress_xinput1_1 0x736e0000) +set(baseaddress_xinput1_2 0x736b0000) +set(baseaddress_xinput1_3 0x73680000) +set(baseaddress_xinput9_1_0 0x73650000) +set(baseaddress_xmllite 0x73610000) +set(baseaddress_zipfldr 0x73570000) +# Extra found files +set(baseaddress_access 0x734f0000) +set(baseaddress_appwiz 0x73470000) +set(baseaddress_cmicpl 0x73430000) +set(baseaddress_desk 0x73390000) +set(baseaddress_hdwwiz 0x73310000) +set(baseaddress_hhctrl 0x732b0000) +set(baseaddress_imaadp32.acm 0x73280000) +set(baseaddress_inetcpl 0x73220000) +set(baseaddress_intl 0x731b0000) +set(baseaddress_joy 0x73170000) +set(baseaddress_main 0x730d0000) +set(baseaddress_mmsys 0x73000000) +set(baseaddress_msacm32.drv 0x72fd0000) +set(baseaddress_msadp32.acm 0x72fa0000) +set(baseaddress_msg711.acm 0x72f70000) +set(baseaddress_msgsm32.acm 0x72f40000) +set(baseaddress_msisys 0x72f10000) +set(baseaddress_ncpa 0x72ee0000) +set(baseaddress_odbccp32i 0x72eb0000) +set(baseaddress_openglcfg 0x72e80000) +set(baseaddress_powercfg 0x72e20000) +set(baseaddress_sysdm 0x72d40000) +set(baseaddress_telephon 0x72d10000) +set(baseaddress_timedate 0x72c90000) +set(baseaddress_usrmgr 0x72c40000) +set(baseaddress_wdmaud.drv 0x72a80000) +set(baseaddress_wined3dcfg 0x72a50000) +set(baseaddress_winemp3.acm 0x729d0000) +set(baseaddress_wshom 0x72980000) diff --git a/sdk/cmake/baseaddress_msvc.cmake b/sdk/cmake/baseaddress_msvc.cmake index 2946161f49..147dff061e 100644 --- a/sdk/cmake/baseaddress_msvc.cmake +++ b/sdk/cmake/baseaddress_msvc.cmake @@ -1,361 +1,374 @@ -set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c760000) -set(baseaddress_msvcrt 0x7c6e0000) -set(baseaddress_advapi32 0x7c660000) -set(baseaddress_gdi32 0x7c600000) -set(baseaddress_user32 0x7c4f0000) -set(baseaddress_dhcpcsvc 0x7c4b0000) -set(baseaddress_dnsapi 0x7c470000) -set(baseaddress_icmp 0x7c450000) -set(baseaddress_iphlpapi 0x7c410000) -set(baseaddress_ws2_32 0x7c3e0000) -set(baseaddress_ws2help 0x7c3c0000) -set(baseaddress_shlwapi 0x7c350000) -set(baseaddress_rpcrt4 0x7c2c0000) -set(baseaddress_comctl32 0x7c1a0000) -set(baseaddress_ole32 0x7c060000) -set(baseaddress_winspool 0x7c030000) -set(baseaddress_winmm 0x7bf90000) -set(baseaddress_comdlg32 0x7bec0000) -set(baseaddress_shell32 0x7b5d0000) -set(baseaddress_lz32 0x7b5b0000) -set(baseaddress_version 0x7b580000) -set(baseaddress_oleaut32 0x7b440000) -set(baseaddress_setupapi 0x7b310000) -set(baseaddress_mpr 0x7b2e0000) -set(baseaddress_crypt32 0x7b210000) -set(baseaddress_wininet 0x7b180000) -set(baseaddress_urlmon 0x7b0d0000) -set(baseaddress_psapi 0x7b0b0000) -set(baseaddress_imm32 0x7b080000) -set(baseaddress_msvfw32 0x7b040000) -set(baseaddress_dbghelp 0x7afc0000) -set(baseaddress_devmgr 0x7af20000) -set(baseaddress_msacm32 0x7aee0000) -set(baseaddress_netapi32 0x7ae80000) -set(baseaddress_powrprof 0x7ae60000) -set(baseaddress_secur32 0x7ae30000) -set(baseaddress_wintrust 0x7adf0000) -set(baseaddress_avicap32 0x7add0000) -set(baseaddress_cabinet 0x7ad90000) -set(baseaddress_dsound 0x7ad30000) -set(baseaddress_glu32 0x7acb0000) -set(baseaddress_opengl32 0x7ab40000) -set(baseaddress_riched20 0x7aab0000) -set(baseaddress_smdll 0x7aa90000) -set(baseaddress_userenv 0x7aa50000) -set(baseaddress_uxtheme 0x7aa00000) -set(baseaddress_cryptui 0x7a960000) -set(baseaddress_csrsrv 0x7a930000) -set(baseaddress_basesrv 0x7a900000) -set(baseaddress_winsrv 0x7a890000) -set(baseaddress_dplayx 0x7a840000) -set(baseaddress_gdiplus 0x7a7b0000) -set(baseaddress_msimg32 0x7a790000) -set(baseaddress_mswsock 0x7a770000) -set(baseaddress_oledlg 0x7a730000) -set(baseaddress_rasapi32 0x7a700000) -set(baseaddress_rsaenh 0x7a6b0000) -set(baseaddress_samlib 0x7a680000) -set(baseaddress_sensapi 0x7a660000) -set(baseaddress_sfc_os 0x7a640000) -set(baseaddress_snmpapi 0x7a620000) -set(baseaddress_spoolss 0x7a5f0000) -set(baseaddress_usp10 0x7a590000) -set(baseaddress_aclayers 0x7a570000) -set(baseaddress_acledit 0x7a550000) -set(baseaddress_aclui 0x7a520000) -set(baseaddress_acppage 0x7a4f0000) -set(baseaddress_activeds 0x7a4d0000) -set(baseaddress_actxprxy 0x7a370000) -set(baseaddress_advapi32_vista 0x7a350000) -set(baseaddress_advpack 0x7a320000) -set(baseaddress_amstream 0x7a2f0000) -set(baseaddress_apphelp 0x7a2c0000) -set(baseaddress_atl 0x7a290000) -set(baseaddress_atl100 0x7a260000) -set(baseaddress_atl80 0x7a230000) -set(baseaddress_authz 0x7a210000) -set(baseaddress_avifil32 0x7a1b0000) -set(baseaddress_batt 0x7a190000) -set(baseaddress_bcrypt 0x7a160000) -set(baseaddress_beepmidi 0x7a140000) -set(baseaddress_browseui 0x7a0b0000) -set(baseaddress_cards 0x79ff0000) -set(baseaddress_cfgmgr32 0x79fd0000) -set(baseaddress_clusapi 0x79fa0000) -set(baseaddress_comcat 0x79f80000) -set(baseaddress_compstui 0x79f60000) -set(baseaddress_console 0x79f10000) -set(baseaddress_credui 0x79ed0000) -set(baseaddress_crtdll 0x79e90000) -set(baseaddress_cryptdlg 0x79e60000) -set(baseaddress_cryptdll 0x79e40000) -set(baseaddress_cryptnet 0x79e10000) -set(baseaddress_d3d8 0x79dd0000) -set(baseaddress_d3d8thk 0x79db0000) -set(baseaddress_d3d9 0x79d60000) -set(baseaddress_d3dcompiler_43 0x79cd0000) -set(baseaddress_d3drm 0x79c60000) -set(baseaddress_d3dwine 0x79a70000) -set(baseaddress_d3dx9_24 0x79a50000) -set(baseaddress_d3dx9_25 0x79a20000) -set(baseaddress_d3dx9_26 0x79a00000) -set(baseaddress_d3dx9_27 0x799e0000) -set(baseaddress_d3dx9_28 0x799c0000) -set(baseaddress_d3dx9_29 0x799a0000) -set(baseaddress_d3dx9_30 0x79970000) -set(baseaddress_d3dx9_31 0x79950000) -set(baseaddress_d3dx9_32 0x79930000) -set(baseaddress_d3dx9_33 0x79910000) -set(baseaddress_d3dx9_34 0x798f0000) -set(baseaddress_d3dx9_35 0x798d0000) -set(baseaddress_d3dx9_36 0x79820000) -set(baseaddress_d3dx9_37 0x79800000) -set(baseaddress_d3dx9_38 0x797e0000) -set(baseaddress_d3dx9_39 0x797c0000) -set(baseaddress_d3dx9_40 0x797a0000) -set(baseaddress_d3dx9_41 0x79780000) -set(baseaddress_d3dx9_42 0x79760000) -set(baseaddress_d3dx9_43 0x79740000) -set(baseaddress_d3dxof 0x79710000) -set(baseaddress_dciman32 0x796f0000) -set(baseaddress_ddraw 0x79660000) -set(baseaddress_deskadp 0x79630000) -set(baseaddress_deskmon 0x79600000) -set(baseaddress_devcpux 0x795e0000) -set(baseaddress_devenum 0x795b0000) -set(baseaddress_dinput 0x79570000) -set(baseaddress_dinput8 0x79550000) -set(baseaddress_dmusic 0x79510000) -set(baseaddress_dplay 0x794f0000) -set(baseaddress_dxdiagn 0x794c0000) -set(baseaddress_esent 0x79490000) -set(baseaddress_faultrep 0x79470000) -set(baseaddress_fltlib 0x79450000) -set(baseaddress_fmifs 0x79430000) -set(baseaddress_fontext 0x79410000) -set(baseaddress_fontsub 0x793f0000) -set(baseaddress_framebuf 0x793d0000) -set(baseaddress_framebuf_new 0x793b0000) -set(baseaddress_framedyn 0x79390000) -set(baseaddress_genincdata 0x79360000) -set(baseaddress_getuname 0x79090000) -set(baseaddress_hid 0x79070000) -set(baseaddress_hlink 0x79040000) -set(baseaddress_hnetcfg 0x79010000) -set(baseaddress_httpapi 0x78ff0000) -set(baseaddress_iccvid 0x78fc0000) -set(baseaddress_ieframe 0x78f30000) -set(baseaddress_iernonce 0x78f00000) -set(baseaddress_imagehlp 0x78ed0000) -set(baseaddress_inetcomm 0x78e80000) -set(baseaddress_inetmib1 0x78e60000) -set(baseaddress_initpki 0x78e40000) -set(baseaddress_input 0x78de0000) -set(baseaddress_inseng 0x78dc0000) -set(baseaddress_iologmsg 0x78da0000) -set(baseaddress_itircl 0x78d80000) -set(baseaddress_itss 0x78d50000) -set(baseaddress_jscript 0x78cb0000) -set(baseaddress_jsproxy 0x78c90000) -set(baseaddress_kbsdll 0x78c70000) -set(baseaddress_kernel32_vista 0x78c50000) -set(baseaddress_ksuser 0x78c30000) -set(baseaddress_libjpeg 0x78bd0000) -set(baseaddress_libpng 0x78b70000) -set(baseaddress_libtiff 0x78b00000) -set(baseaddress_libxslt 0x789c0000) -set(baseaddress_loadperf 0x789a0000) -set(baseaddress_localspl 0x78970000) -set(baseaddress_localui 0x78940000) -set(baseaddress_lpk 0x78920000) -set(baseaddress_lsasrv 0x788d0000) -set(baseaddress_mapi32 0x788a0000) -set(baseaddress_mbedtls 0x78840000) -set(baseaddress_mciavi32 0x78810000) -set(baseaddress_mcicda 0x787e0000) -set(baseaddress_mciqtz32 0x787b0000) -set(baseaddress_mciseq 0x78780000) -set(baseaddress_mciwave 0x78750000) -set(baseaddress_mgmtapi 0x78730000) -set(baseaddress_midimap 0x78710000) -set(baseaddress_mlang 0x786e0000) -set(baseaddress_mmdrv 0x786c0000) -set(baseaddress_modemui 0x78650000) -set(baseaddress_mprapi 0x78620000) -set(baseaddress_msafd 0x785f0000) -set(baseaddress_mscat32 0x785d0000) -set(baseaddress_mscms 0x785a0000) -set(baseaddress_mscoree 0x78560000) -set(baseaddress_msctf 0x78520000) -set(baseaddress_msdmo 0x78500000) -set(baseaddress_msftedit 0x784e0000) -set(baseaddress_msgina 0x78460000) -set(baseaddress_mshtml 0x782c0000) -set(baseaddress_msi 0x781d0000) -set(baseaddress_msimtf 0x781b0000) -set(baseaddress_msisip 0x78190000) -set(baseaddress_mspatcha 0x78170000) -set(baseaddress_msports 0x78140000) -set(baseaddress_msrle32 0x78110000) -set(baseaddress_mssign32 0x780f0000) -set(baseaddress_mssip32 0x780d0000) -set(baseaddress_mstask 0x780a0000) -set(baseaddress_msv1_0 0x78080000) -set(baseaddress_msvcrt_crt_dll_startup 0x78060000) -set(baseaddress_msvcrt20 0x77fd0000) -set(baseaddress_msvcrt40 0x77f40000) -set(baseaddress_msvidc32 0x77f20000) -set(baseaddress_msxml 0x77ef0000) -set(baseaddress_msxml2 0x77ec0000) -set(baseaddress_msxml3 0x77cc0000) -set(baseaddress_msxml4 0x77c80000) -set(baseaddress_msxml6 0x77c40000) -set(baseaddress_mycomput 0x77c20000) -set(baseaddress_nddeapi 0x77c00000) -set(baseaddress_netcfgx 0x77b90000) -set(baseaddress_netevent 0x77b70000) -set(baseaddress_netid 0x77b30000) -set(baseaddress_netshell 0x77ab0000) -set(baseaddress_newdev 0x77a60000) -set(baseaddress_normaliz 0x77a40000) -set(baseaddress_notifyhook 0x77a20000) -set(baseaddress_npptools 0x77a00000) -set(baseaddress_ntdsapi 0x779d0000) -set(baseaddress_ntlanman 0x779b0000) -set(baseaddress_ntmarta 0x77990000) -set(baseaddress_ntobjshex 0x77930000) -set(baseaddress_ntprint 0x77910000) -set(baseaddress_objsel 0x778f0000) -set(baseaddress_odbc32 0x778b0000) -set(baseaddress_odbccp32 0x77880000) -set(baseaddress_oleacc 0x77830000) -set(baseaddress_olecli32 0x77810000) -set(baseaddress_olepro32 0x777f0000) -set(baseaddress_olesvr32 0x777d0000) -set(baseaddress_olethk32 0x777b0000) -set(baseaddress_pdh 0x77780000) -set(baseaddress_pidgen 0x77760000) -set(baseaddress_pifmgr 0x776e0000) -set(baseaddress_printui 0x776c0000) -set(baseaddress_propsys 0x77690000) -set(baseaddress_pstorec 0x77670000) -set(baseaddress_qedit 0x77640000) -set(baseaddress_qmgr 0x77610000) -set(baseaddress_qmgrprxy 0x775d0000) -set(baseaddress_quartz 0x774c0000) -set(baseaddress_query 0x774a0000) -set(baseaddress_rasadhlp 0x77480000) -set(baseaddress_rasdlg 0x772b0000) -set(baseaddress_rasman 0x77280000) -set(baseaddress_resutils 0x77260000) -set(baseaddress_riched32 0x77240000) -set(baseaddress_rsabase 0x77220000) -set(baseaddress_rshell 0x771c0000) -set(baseaddress_samsrv 0x77160000) -set(baseaddress_sccbase 0x77140000) -set(baseaddress_schannel 0x77110000) -set(baseaddress_schedsvc 0x770f0000) -set(baseaddress_scrrun 0x770b0000) -set(baseaddress_security 0x77090000) -set(baseaddress_serialui 0x77070000) -set(baseaddress_sfc 0x77050000) -set(baseaddress_shdoclc 0x77010000) -set(baseaddress_shdocvw 0x76fd0000) -set(baseaddress_shfolder 0x76fb0000) -set(baseaddress_shimgvw 0x76f70000) -set(baseaddress_slayer 0x76f40000) -set(baseaddress_slbcsp 0x76f20000) -set(baseaddress_sndblst 0x76ef0000) -set(baseaddress_softpub 0x76ed0000) -set(baseaddress_srclient 0x76eb0000) -set(baseaddress_srvsvc 0x76e80000) -set(baseaddress_sti 0x76e50000) -set(baseaddress_stobject 0x76e00000) -set(baseaddress_streamci 0x76de0000) -set(baseaddress_sxs 0x76db0000) -set(baseaddress_syssetup 0x76d10000) -set(baseaddress_t2embed 0x76cf0000) -set(baseaddress_tapi32 0x76cc0000) -set(baseaddress_tapiui 0x76c40000) -set(baseaddress_testvdd 0x76c20000) -set(baseaddress_themeui 0x76c00000) -set(baseaddress_traffic 0x76be0000) -set(baseaddress_twain_32 0x76bc0000) -set(baseaddress_ubtrfs 0x76ba0000) -set(baseaddress_uext2 0x76b70000) -set(baseaddress_ufat 0x76b40000) -set(baseaddress_ufatx 0x76b20000) -set(baseaddress_uffs 0x76b00000) -set(baseaddress_umpnpmgr 0x76ad0000) -set(baseaddress_untfs 0x76ab0000) -set(baseaddress_updspapi 0x76a90000) -set(baseaddress_ureiserfs 0x76a70000) -set(baseaddress_url 0x76a50000) -set(baseaddress_vbscript 0x769e0000) -set(baseaddress_vdmdbg 0x769c0000) -set(baseaddress_vssapi 0x76990000) -set(baseaddress_wbemdisp 0x76960000) -set(baseaddress_wbemprox 0x76920000) -set(baseaddress_win32kdll 0x76900000) -set(baseaddress_win32kdll_2k3sp2 0x768e0000) -set(baseaddress_win32kdll_xpsp2 0x768c0000) -set(baseaddress_windowscodecs 0x767f0000) -set(baseaddress_windowscodecsext 0x767d0000) -set(baseaddress_winfax 0x767b0000) -set(baseaddress_wing32 0x76790000) -set(baseaddress_winhttp 0x76750000) -set(baseaddress_winscard 0x76730000) -set(baseaddress_winsta 0x76700000) -set(baseaddress_wkssvc 0x766e0000) -set(baseaddress_wlanapi 0x766c0000) -set(baseaddress_wldap32 0x76690000) -set(baseaddress_wmi 0x76670000) -set(baseaddress_wmisvc 0x76650000) -set(baseaddress_wmiutils 0x76620000) -set(baseaddress_wmvcore 0x765f0000) -set(baseaddress_ws2_32_new 0x765c0000) -set(baseaddress_wshirda 0x765a0000) -set(baseaddress_wshtcpip 0x76580000) -set(baseaddress_wsock32 0x76560000) -set(baseaddress_wtsapi32 0x76540000) -set(baseaddress_wuapi 0x76510000) -set(baseaddress_xinput1_1 0x764f0000) -set(baseaddress_xinput1_2 0x764d0000) -set(baseaddress_xinput1_3 0x764b0000) -set(baseaddress_xinput9_1_0 0x76490000) -set(baseaddress_xmllite 0x76460000) -set(baseaddress_access 0x763e0000) -set(baseaddress_appwiz 0x76370000) -set(baseaddress_cmicpl 0x76340000) -set(baseaddress_desk 0x762c0000) -set(baseaddress_hdwwiz 0x76250000) -set(baseaddress_hhctrl 0x76210000) -set(baseaddress_imaadp32.acm 0x761f0000) -set(baseaddress_inetcpl 0x761a0000) -set(baseaddress_intl 0x76140000) -set(baseaddress_joy 0x76100000) -set(baseaddress_main 0x76080000) -set(baseaddress_mmsys 0x75fb0000) -set(baseaddress_msacm32.drv 0x75f80000) -set(baseaddress_msadp32.acm 0x75f60000) -set(baseaddress_msg711.acm 0x75f40000) -set(baseaddress_msgsm32.acm 0x75f20000) -set(baseaddress_msisys 0x75f00000) -set(baseaddress_ncpa 0x75ee0000) -set(baseaddress_odbccp32i 0x75ec0000) -set(baseaddress_powercfg 0x75e60000) -set(baseaddress_sysdm 0x75d80000) -set(baseaddress_telephon 0x75d60000) -set(baseaddress_timedate 0x75cf0000) -set(baseaddress_usrmgr 0x75ca0000) -set(baseaddress_wdmaud.drv 0x75b10000) -set(baseaddress_wined3dcfg 0x75ae0000) -set(baseaddress_winemp3.acm 0x75a70000) -set(baseaddress_wshom 0x75a40000) - -## From baseaddress.cmake (GCC) -set(baseaddress_fusion 0x73830000) -set(baseaddress_fusion_1_1 0x737f0000) -set(baseaddress_fusion_2_0 0x737b0000) +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c700000) +set(baseaddress_msvcrt 0x7c680000) +set(baseaddress_advapi32 0x7c5f0000) +set(baseaddress_gdi32 0x7c590000) +set(baseaddress_user32 0x7c480000) +set(baseaddress_dhcpcsvc 0x7c440000) +set(baseaddress_dnsapi 0x7c400000) +set(baseaddress_icmp 0x7c3e0000) +set(baseaddress_iphlpapi 0x7c3a0000) +set(baseaddress_ws2_32 0x7c370000) +set(baseaddress_ws2help 0x7c350000) +set(baseaddress_shlwapi 0x7c2e0000) +set(baseaddress_rpcrt4 0x7c250000) +set(baseaddress_comctl32 0x7c100000) +set(baseaddress_ole32 0x7bfc0000) +set(baseaddress_winspool.drv 0x7bf80000) +set(baseaddress_winmm 0x7bee0000) +set(baseaddress_comdlg32 0x7be00000) +set(baseaddress_shell32 0x7b630000) +set(baseaddress_lz32 0x7b610000) +set(baseaddress_version 0x7b5e0000) +set(baseaddress_oleaut32 0x7b4a0000) +set(baseaddress_setupapi 0x7b370000) +set(baseaddress_mpr 0x7b340000) +set(baseaddress_crypt32 0x7b270000) +set(baseaddress_wininet 0x7b1e0000) +set(baseaddress_urlmon 0x7b130000) +set(baseaddress_psapi 0x7b110000) +set(baseaddress_imm32 0x7b0e0000) +set(baseaddress_msvfw32 0x7b0a0000) +set(baseaddress_dbghelp 0x7b020000) +set(baseaddress_devmgr 0x7af70000) +set(baseaddress_msacm32 0x7af30000) +set(baseaddress_netapi32 0x7aed0000) +set(baseaddress_powrprof 0x7aeb0000) +set(baseaddress_secur32 0x7ae70000) +set(baseaddress_wintrust 0x7ae30000) +set(baseaddress_avicap32 0x7ae10000) +set(baseaddress_cabinet 0x7add0000) +set(baseaddress_dsound 0x7ad70000) +set(baseaddress_glu32 0x7acf0000) +set(baseaddress_opengl32 0x7ab40000) +set(baseaddress_riched20 0x7aab0000) +set(baseaddress_smdll 0x7aa90000) +set(baseaddress_userenv 0x7aa50000) +set(baseaddress_uxtheme 0x7aa00000) +set(baseaddress_cryptui 0x7a970000) +set(baseaddress_csrsrv 0x7a940000) +set(baseaddress_basesrv 0x7a910000) +set(baseaddress_winsrv 0x7a8a0000) +set(baseaddress_dplayx 0x7a850000) +set(baseaddress_gdiplus 0x7a7b0000) +set(baseaddress_msimg32 0x7a790000) +set(baseaddress_mswsock 0x7a770000) +set(baseaddress_oledlg 0x7a730000) +set(baseaddress_rasapi32 0x7a700000) +set(baseaddress_rsaenh 0x7a6b0000) +set(baseaddress_samlib 0x7a680000) +set(baseaddress_sensapi 0x7a660000) +set(baseaddress_sfc_os 0x7a640000) +set(baseaddress_snmpapi 0x7a620000) +set(baseaddress_spoolss 0x7a5f0000) +set(baseaddress_usp10 0x7a590000) +# Extra found dlls +set(baseaddress_acgenral 0x7a570000) +set(baseaddress_aclayers 0x7a550000) +set(baseaddress_acledit 0x7a530000) +set(baseaddress_aclui 0x7a500000) +set(baseaddress_acppage 0x7a4c0000) +set(baseaddress_activeds 0x7a4a0000) +set(baseaddress_actxprxy 0x7a320000) +set(baseaddress_advapi32_vista 0x7a300000) +set(baseaddress_advpack 0x7a2d0000) +set(baseaddress_amstream 0x7a2a0000) +set(baseaddress_apphelp 0x7a260000) +set(baseaddress_atl 0x7a230000) +set(baseaddress_atl100 0x7a200000) +set(baseaddress_atl80 0x7a1d0000) +set(baseaddress_authz 0x7a1b0000) +set(baseaddress_avifil32 0x7a150000) +set(baseaddress_batt 0x7a130000) +set(baseaddress_bcrypt 0x7a100000) +set(baseaddress_beepmidi 0x7a0e0000) +set(baseaddress_browseui 0x79fe0000) +set(baseaddress_cards 0x79f20000) +set(baseaddress_cfgmgr32 0x79f00000) +set(baseaddress_clusapi 0x79ed0000) +set(baseaddress_comcat 0x79eb0000) +set(baseaddress_compstui 0x79e90000) +set(baseaddress_console 0x79e40000) +set(baseaddress_credui 0x79e00000) +set(baseaddress_crtdll 0x79dc0000) +set(baseaddress_cryptdlg 0x79d90000) +set(baseaddress_cryptdll 0x79d70000) +set(baseaddress_cryptnet 0x79d40000) +set(baseaddress_custom 0x79d20000) +set(baseaddress_d3d8 0x79ce0000) +set(baseaddress_d3d8thk 0x79cc0000) +set(baseaddress_d3d9 0x79c70000) +set(baseaddress_d3dcompiler_43 0x79be0000) +set(baseaddress_d3drm 0x79b70000) +set(baseaddress_d3dwine 0x799c0000) +set(baseaddress_d3dx9_24 0x799a0000) +set(baseaddress_d3dx9_25 0x79970000) +set(baseaddress_d3dx9_26 0x79950000) +set(baseaddress_d3dx9_27 0x79930000) +set(baseaddress_d3dx9_28 0x79910000) +set(baseaddress_d3dx9_29 0x798f0000) +set(baseaddress_d3dx9_30 0x798d0000) +set(baseaddress_d3dx9_31 0x798b0000) +set(baseaddress_d3dx9_32 0x79890000) +set(baseaddress_d3dx9_33 0x79870000) +set(baseaddress_d3dx9_34 0x79850000) +set(baseaddress_d3dx9_35 0x79830000) +set(baseaddress_d3dx9_36 0x79770000) +set(baseaddress_d3dx9_37 0x79750000) +set(baseaddress_d3dx9_38 0x79730000) +set(baseaddress_d3dx9_39 0x79710000) +set(baseaddress_d3dx9_40 0x796f0000) +set(baseaddress_d3dx9_41 0x796d0000) +set(baseaddress_d3dx9_42 0x796b0000) +set(baseaddress_d3dx9_43 0x79690000) +set(baseaddress_d3dxof 0x79660000) +set(baseaddress_dciman32 0x79640000) +set(baseaddress_ddraw 0x795b0000) +set(baseaddress_deskadp 0x79580000) +set(baseaddress_deskmon 0x79560000) +set(baseaddress_devcpux 0x79540000) +set(baseaddress_devenum 0x79510000) +set(baseaddress_dinput 0x794d0000) +set(baseaddress_dinput8 0x794b0000) +set(baseaddress_dmusic 0x79480000) +set(baseaddress_dplay 0x79460000) +set(baseaddress_dxdiagn 0x79430000) +set(baseaddress_dxtn 0x79410000) +set(baseaddress_esent 0x793e0000) +set(baseaddress_faultrep 0x793c0000) +set(baseaddress_fltlib 0x793a0000) +set(baseaddress_fmifs 0x79380000) +set(baseaddress_fontext 0x79360000) +set(baseaddress_fontsub 0x79340000) +set(baseaddress_framebuf 0x79320000) +set(baseaddress_framebuf_new 0x79300000) +set(baseaddress_framedyn 0x792e0000) +set(baseaddress_genincdata 0x792b0000) +set(baseaddress_getuname 0x789b0000) +set(baseaddress_hid 0x78990000) +set(baseaddress_hlink 0x78960000) +set(baseaddress_hnetcfg 0x78930000) +set(baseaddress_httpapi 0x78910000) +set(baseaddress_iccvid 0x788f0000) +set(baseaddress_ieframe 0x78860000) +set(baseaddress_iernonce 0x78830000) +set(baseaddress_imagehlp 0x78800000) +set(baseaddress_inetcomm 0x787b0000) +set(baseaddress_inetmib1 0x78790000) +set(baseaddress_initpki 0x78770000) +set(baseaddress_input 0x78710000) +set(baseaddress_inseng 0x786e0000) +set(baseaddress_iologmsg 0x786c0000) +set(baseaddress_itircl 0x786a0000) +set(baseaddress_itss 0x78670000) +set(baseaddress_jscript 0x785d0000) +set(baseaddress_jsproxy 0x785b0000) +set(baseaddress_kbdeo 0x78590000) +set(baseaddress_kbsdll 0x78570000) +set(baseaddress_kernel32_vista 0x78550000) +set(baseaddress_ksuser 0x78530000) +set(baseaddress_libjpeg 0x784d0000) +set(baseaddress_libpng 0x78470000) +set(baseaddress_libtiff 0x783d0000) +set(baseaddress_libtirpc 0x78390000) +set(baseaddress_libxslt 0x78250000) +set(baseaddress_loadperf 0x78230000) +set(baseaddress_localmon 0x78210000) +set(baseaddress_localspl 0x781d0000) +set(baseaddress_localspl_apitest 0x781b0000) +set(baseaddress_localui 0x78180000) +set(baseaddress_lpk 0x78150000) +set(baseaddress_lsasrv 0x780f0000) +set(baseaddress_mapi32 0x780c0000) +set(baseaddress_mbedtls 0x78050000) +set(baseaddress_mciavi32 0x78020000) +set(baseaddress_mcicda 0x77ff0000) +set(baseaddress_mciqtz32 0x77fc0000) +set(baseaddress_mciseq 0x77f90000) +set(baseaddress_mciwave 0x77f60000) +set(baseaddress_mgmtapi 0x77f40000) +set(baseaddress_midimap 0x77f20000) +set(baseaddress_mlang 0x77ef0000) +set(baseaddress_mmdrv 0x77ed0000) +set(baseaddress_modemui 0x77e60000) +set(baseaddress_mprapi 0x77e30000) +set(baseaddress_msafd 0x77e00000) +set(baseaddress_mscat32 0x77de0000) +set(baseaddress_mscms 0x77db0000) +set(baseaddress_mscoree 0x77d70000) +set(baseaddress_msctf 0x77d30000) +set(baseaddress_msdmo 0x77d10000) +set(baseaddress_msftedit 0x77cf0000) +set(baseaddress_msgina 0x77c70000) +set(baseaddress_mshtml 0x77ae0000) +set(baseaddress_msi 0x779b0000) +set(baseaddress_msimtf 0x77990000) +set(baseaddress_msisip 0x77970000) +set(baseaddress_mspatcha 0x77950000) +set(baseaddress_msports 0x77920000) +set(baseaddress_msrle32 0x778f0000) +set(baseaddress_mssign32 0x778d0000) +set(baseaddress_mssip32 0x778b0000) +set(baseaddress_mstask 0x77880000) +set(baseaddress_msv1_0 0x77860000) +set(baseaddress_msvcrt20 0x777d0000) +set(baseaddress_msvcrt40 0x77740000) +set(baseaddress_msvcrt_crt_dll_startup 0x77720000) +set(baseaddress_msvidc32 0x77700000) +set(baseaddress_msxml 0x776d0000) +set(baseaddress_msxml2 0x776a0000) +set(baseaddress_msxml3 0x774a0000) +set(baseaddress_msxml4 0x77460000) +set(baseaddress_msxml6 0x77420000) +set(baseaddress_mycomput 0x77400000) +set(baseaddress_nddeapi 0x773e0000) +set(baseaddress_netcfgx 0x77370000) +set(baseaddress_netevent 0x77350000) +set(baseaddress_netid 0x77310000) +set(baseaddress_netshell 0x77290000) +set(baseaddress_newdev 0x77240000) +set(baseaddress_nfs41_np 0x77220000) +set(baseaddress_normaliz 0x77200000) +set(baseaddress_notifyhook 0x771e0000) +set(baseaddress_npptools 0x771c0000) +set(baseaddress_ntdll_vista 0x771a0000) +set(baseaddress_ntdsapi 0x77170000) +set(baseaddress_ntlanman 0x77150000) +set(baseaddress_ntmarta 0x77130000) +set(baseaddress_ntobjshex 0x770d0000) +set(baseaddress_objsel 0x770b0000) +set(baseaddress_odbc32 0x77080000) +set(baseaddress_odbccp32 0x77050000) +set(baseaddress_oleacc 0x77000000) +set(baseaddress_olecli32 0x76fe0000) +set(baseaddress_olepro32 0x76fc0000) +set(baseaddress_olesvr32 0x76fa0000) +set(baseaddress_olethk32 0x76f80000) +set(baseaddress_pdh 0x76f50000) +set(baseaddress_pidgen 0x76f30000) +set(baseaddress_pifmgr 0x76ec0000) +set(baseaddress_printui 0x76ea0000) +set(baseaddress_propsys 0x76e70000) +set(baseaddress_pstorec 0x76e50000) +set(baseaddress_qedit 0x76e20000) +set(baseaddress_qmgr 0x76df0000) +set(baseaddress_qmgrprxy 0x76da0000) +set(baseaddress_quartz 0x76c90000) +set(baseaddress_query 0x76c70000) +set(baseaddress_rasadhlp 0x76c50000) +set(baseaddress_rasdlg 0x76a90000) +set(baseaddress_rasman 0x76a60000) +set(baseaddress_redirtest1 0x76a40000) +set(baseaddress_redirtest2 0x76a20000) +set(baseaddress_resutils 0x76a00000) +set(baseaddress_riched32 0x769e0000) +set(baseaddress_rsabase 0x769c0000) +set(baseaddress_rshell 0x76960000) +set(baseaddress_samsrv 0x76900000) +set(baseaddress_sccbase 0x768e0000) +set(baseaddress_schannel 0x768b0000) +set(baseaddress_schedsvc 0x76890000) +set(baseaddress_scrrun 0x76850000) +set(baseaddress_security 0x76830000) +set(baseaddress_serialui 0x76810000) +set(baseaddress_sfc 0x767f0000) +set(baseaddress_shdoclc 0x767b0000) +set(baseaddress_shdocvw 0x76770000) +set(baseaddress_shellbtrfs 0x766e0000) +set(baseaddress_shfolder 0x766c0000) +set(baseaddress_shimgvw 0x76680000) +set(baseaddress_shsvcs 0x76660000) +set(baseaddress_slbcsp 0x76640000) +set(baseaddress_sndblst 0x76610000) +set(baseaddress_softpub 0x765f0000) +set(baseaddress_srclient 0x765d0000) +set(baseaddress_srvsvc 0x765a0000) +set(baseaddress_sti 0x76570000) +set(baseaddress_stobject 0x76510000) +set(baseaddress_streamci 0x764f0000) +set(baseaddress_sxs 0x764d0000) +set(baseaddress_syssetup 0x763f0000) +set(baseaddress_t2embed 0x763d0000) +set(baseaddress_tapi32 0x763a0000) +set(baseaddress_tapiui 0x76320000) +set(baseaddress_testvdd 0x76300000) +set(baseaddress_themeui 0x762e0000) +set(baseaddress_traffic 0x762c0000) +set(baseaddress_twain_32 0x762a0000) +set(baseaddress_ubtrfs 0x76280000) +set(baseaddress_ucdfs 0x76260000) +set(baseaddress_uext2 0x76230000) +set(baseaddress_ufat 0x76200000) +set(baseaddress_ufatx 0x761e0000) +set(baseaddress_uffs 0x761c0000) +set(baseaddress_umpnpmgr 0x76190000) +set(baseaddress_untfs 0x76170000) +set(baseaddress_updspapi 0x76150000) +set(baseaddress_ureiserfs 0x76130000) +set(baseaddress_url 0x76110000) +set(baseaddress_vbscript 0x760a0000) +set(baseaddress_vdmdbg 0x76080000) +set(baseaddress_verifier 0x76060000) +set(baseaddress_vfd 0x76020000) +set(baseaddress_vssapi 0x75ff0000) +set(baseaddress_wbemdisp 0x75fc0000) +set(baseaddress_wbemprox 0x75f80000) +set(baseaddress_win32u 0x75f60000) +set(baseaddress_win32u_2k3sp2 0x75f40000) +set(baseaddress_win32u_xpsp2 0x75f20000) +set(baseaddress_windowscodecs 0x75e50000) +set(baseaddress_windowscodecsext 0x75e30000) +set(baseaddress_winfax 0x75e10000) +set(baseaddress_wing32 0x75df0000) +set(baseaddress_winhttp 0x75db0000) +set(baseaddress_winprint 0x75d90000) +set(baseaddress_winscard 0x75d70000) +set(baseaddress_winsta 0x75d40000) +set(baseaddress_wkssvc 0x75d20000) +set(baseaddress_wlanapi 0x75d00000) +set(baseaddress_wldap32 0x75cd0000) +set(baseaddress_wmi 0x75cb0000) +set(baseaddress_wmisvc 0x75c90000) +set(baseaddress_wmiutils 0x75c60000) +set(baseaddress_wmvcore 0x75c30000) +set(baseaddress_wshirda 0x75c10000) +set(baseaddress_wshtcpip 0x75bf0000) +set(baseaddress_wsock32 0x75bd0000) +set(baseaddress_wtsapi32 0x75bb0000) +set(baseaddress_wuapi 0x75b80000) +set(baseaddress_xinput1_1 0x75b60000) +set(baseaddress_xinput1_2 0x75b40000) +set(baseaddress_xinput1_3 0x75b20000) +set(baseaddress_xinput9_1_0 0x75b00000) +set(baseaddress_xmllite 0x75ad0000) +set(baseaddress_zipfldr 0x75a80000) +# Extra found files +set(baseaddress_access 0x75a00000) +set(baseaddress_appwiz 0x75990000) +set(baseaddress_cmicpl 0x75960000) +set(baseaddress_desk 0x758d0000) +set(baseaddress_hdwwiz 0x75860000) +set(baseaddress_hhctrl 0x75820000) +set(baseaddress_imaadp32.acm 0x75800000) +set(baseaddress_inetcpl 0x757b0000) +set(baseaddress_intl 0x75750000) +set(baseaddress_joy 0x75710000) +set(baseaddress_main 0x75690000) +set(baseaddress_mmsys 0x755c0000) +set(baseaddress_msacm32.drv 0x75590000) +set(baseaddress_msadp32.acm 0x75570000) +set(baseaddress_msg711.acm 0x75550000) +set(baseaddress_msgsm32.acm 0x75530000) +set(baseaddress_msisys 0x75510000) +set(baseaddress_ncpa 0x754f0000) +set(baseaddress_odbccp32i 0x754d0000) +set(baseaddress_openglcfg 0x754a0000) +set(baseaddress_powercfg 0x75440000) +set(baseaddress_sysdm 0x75370000) +set(baseaddress_telephon 0x75350000) +set(baseaddress_timedate 0x752e0000) +set(baseaddress_usrmgr 0x75290000) +set(baseaddress_wdmaud.drv 0x75100000) +set(baseaddress_wined3dcfg 0x750d0000) +set(baseaddress_winemp3.acm 0x75060000) +set(baseaddress_wshom 0x75030000)

1 0

10/10: [SDK] Fix 64 bit issues
by Timo Kreuzer 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e39876dab780fab79d6aa… commit e39876dab780fab79d6aa061049a098abd3a4ebc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Apr 23 11:58:34 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [SDK] Fix 64 bit issues --- dll/win32/browseui/parsecmdline.cpp | 2 +- sdk/include/ndk/rtltypes.h | 2 +- sdk/include/reactos/browseui_undoc.h | 2 +- sdk/lib/inflib/infget.c | 22 +++++++++++----------- sdk/lib/skiplist/skiplist_test.c | 18 +++++++++--------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dll/win32/browseui/parsecmdline.cpp b/dll/win32/browseui/parsecmdline.cpp index acf617607f..ad2b4fa475 100644 --- a/dll/win32/browseui/parsecmdline.cpp +++ b/dll/win32/browseui/parsecmdline.cpp @@ -226,7 +226,7 @@ static LPITEMIDLIST _GetDocumentsPidl() * SHExplorerParseCmdLine [BROWSEUI.107] */ extern "C" -UINT +UINT_PTR WINAPI SHExplorerParseCmdLine(ExplorerCommandLineParseResults * pInfo) { diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index b526f9ea04..7070564389 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -310,7 +310,7 @@ C_ASSERT(HEAP_CREATE_VALID_MASK == 0x0007F0FF); // // Activation Contexts // -#define INVALID_ACTIVATION_CONTEXT (PVOID)0xFFFFFFFF +#define INVALID_ACTIVATION_CONTEXT ((PVOID)(LONG_PTR)-1) // // C++ CONST casting diff --git a/sdk/include/reactos/browseui_undoc.h b/sdk/include/reactos/browseui_undoc.h index 4ea2dcf605..0bc1d12db6 100644 --- a/sdk/include/reactos/browseui_undoc.h +++ b/sdk/include/reactos/browseui_undoc.h @@ -107,7 +107,7 @@ void WINAPI InitOCHostClass(long param8); long WINAPI SHOpenFolderWindow(PIE_THREAD_PARAM_BLOCK parameters); void WINAPI SHCreateSavedWindows(void); BOOL WINAPI SHCreateFromDesktop(PEXPLORER_CMDLINE_PARSE_RESULTS parseResults); -UINT WINAPI SHExplorerParseCmdLine(PEXPLORER_CMDLINE_PARSE_RESULTS pParseResults); +UINT_PTR WINAPI SHExplorerParseCmdLine(PEXPLORER_CMDLINE_PARSE_RESULTS pParseResults); void WINAPI UEMRegisterNotify(long param8, long paramC); HRESULT WINAPI SHCreateBandForPidl(LPCITEMIDLIST param8, IUnknown *paramC, BOOL param10); HRESULT WINAPI SHPidlFromDataObject(IDataObject *param8, long *paramC, long param10, FILEDESCRIPTORW *param14); diff --git a/sdk/lib/inflib/infget.c b/sdk/lib/inflib/infget.c index f148c59273..5e1ccdbf3b 100644 --- a/sdk/lib/inflib/infget.c +++ b/sdk/lib/inflib/infget.c @@ -13,11 +13,11 @@ #define NDEBUG #include <debug.h> -static unsigned int +static size_t InfpSubstituteString(PINFCACHE Inf, const WCHAR *text, WCHAR *buffer, - unsigned int size); + size_t size); static void ShortToHex(PWCHAR Buffer, @@ -36,7 +36,7 @@ ShortToHex(PWCHAR Buffer, static PCWSTR InfpGetSubstitutionString(PINFCACHE Inf, PCWSTR str, - unsigned int *len, + size_t *len, BOOL no_trailing_slash) { static const WCHAR percent = '%'; @@ -105,7 +105,7 @@ InfpGetSubstitutionString(PINFCACHE Inf, if (Status == STATUS_SUCCESS) { *len = strlenW(Data); - DPRINT("Substitute: %S Length: %ul\n", Data, *len); + DPRINT("Substitute: %S Length: %zu\n", Data, *len); return Data; } @@ -116,14 +116,14 @@ InfpGetSubstitutionString(PINFCACHE Inf, /* do string substitutions on the specified text */ /* the buffer is assumed to be large enough */ /* returns necessary length not including terminating null */ -static unsigned int +static size_t InfpSubstituteString(PINFCACHE Inf, PCWSTR text, PWSTR buffer, - unsigned int size) + size_t size) { const WCHAR *start, *subst, *p; - unsigned int len, total = 0; + size_t len, total = 0; int inside = 0; if (!buffer) size = MAX_INF_STRING_LENGTH + 1; @@ -133,7 +133,7 @@ InfpSubstituteString(PINFCACHE Inf, inside = !inside; if (inside) /* start of a %xx% string */ { - len = (unsigned int)(p - start); + len = (p - start); if (len > size - 1) len = size - 1; if (buffer) memcpy( buffer + total, start, len * sizeof(WCHAR) ); total += len; @@ -142,12 +142,12 @@ InfpSubstituteString(PINFCACHE Inf, } else /* end of the %xx% string, find substitution */ { - len = (unsigned int)(p - start - 1); + len = (p - start - 1); subst = InfpGetSubstitutionString( Inf, start + 1, &len, p[1] == '\\' ); if (!subst) { subst = start; - len = (unsigned int)(p - start + 1); + len = (p - start + 1); } if (len > size - 1) len = size - 1; if (buffer) memcpy( buffer + total, subst, len * sizeof(WCHAR) ); @@ -546,7 +546,7 @@ InfpGetStringField(PINFCONTEXT Context, PINFCACHEFIELD CacheField; ULONG Index; PWCHAR Ptr; - ULONG Size; + SIZE_T Size; if (Context == NULL || Context->Line == NULL) { diff --git a/sdk/lib/skiplist/skiplist_test.c b/sdk/lib/skiplist/skiplist_test.c index 17d9337463..5413910ea7 100644 --- a/sdk/lib/skiplist/skiplist_test.c +++ b/sdk/lib/skiplist/skiplist_test.c @@ -31,7 +31,7 @@ DumpSkiplist(PSKIPLIST Skiplist) for (j = 1; j < pNode->Distance[i]; j++) printf("---"); - printf("%02lu", (DWORD)pNode->Next[i]->Element); + printf("%02Iu", (DWORD_PTR)pNode->Next[i]->Element); pNode = pNode->Next[i]; } @@ -51,7 +51,7 @@ MyAlloc(DWORD Size) int WINAPI MyCompare(PVOID A, PVOID B) { - return (DWORD)A - (DWORD)B; + return (DWORD_PTR)A - (DWORD_PTR)B; } void WINAPI @@ -63,7 +63,7 @@ MyFree(PVOID Ptr) int main() { - DWORD Element; + PVOID Element; DWORD ElementIndex; DWORD i; SKIPLIST Skiplist; @@ -74,23 +74,23 @@ main() // Insert some random elements with random numbers. for (i = 0; i < 40; i++) - InsertElementSkiplist(&Skiplist, (PVOID)(rand() % 100)); + InsertElementSkiplist(&Skiplist, UlongToPtr(rand() % 100)); // Delete all with index 0 to 29. for (i = 0; i < 30; i++) - DeleteElementSkiplist(&Skiplist, (PVOID)i); + DeleteElementSkiplist(&Skiplist, UlongToPtr(i)); // Insert some more random elements. for (i = 0; i < 40; i++) - InsertElementSkiplist(&Skiplist, (PVOID)(rand() % 100)); + InsertElementSkiplist(&Skiplist, UlongToPtr(rand() % 100)); // Output the third element (with zero-based index 2). pNode = LookupNodeByIndexSkiplist(&Skiplist, 2); - printf("Element = %lu for index 2\n", (DWORD)pNode->Element); + printf("Element = %Iu for index 2\n", (DWORD_PTR)pNode->Element); // Check if an element with number 44 is in the list and output its index. - Element = (DWORD)LookupElementSkiplist(&Skiplist, (PVOID)44, &ElementIndex); - printf("Element = %lu, ElementIndex = %lu\n\n", Element, ElementIndex); + Element = LookupElementSkiplist(&Skiplist, UlongToPtr(44), &ElementIndex); + printf("Element = %p, ElementIndex = %lu\n\n", Element, ElementIndex); DumpSkiplist(&Skiplist);

1 0

09/10: [NDK] Fix definition of MSR_DEBUG_CTL_LBR and MSR_DEBUG_CTL_BTF
by Timo Kreuzer 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae9e9eaef330963c8b0bb… commit ae9e9eaef330963c8b0bb763ef2f71e10bf592c5 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 22:16:40 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [NDK] Fix definition of MSR_DEBUG_CTL_LBR and MSR_DEBUG_CTL_BTF --- sdk/include/ndk/amd64/ketypes.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index 0609dac137..db276ee8af 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -223,8 +223,8 @@ typedef enum // // Flags in MSR_DEBUG_CTL // -#define MSR_DEBUG_CTL_LBR equ 0x0001 -#define MSR_DEBUG_CTL_BTF equ 0x0002 +#define MSR_DEBUG_CTL_LBR 0x0001 +#define MSR_DEBUG_CTL_BTF 0x0002 // // IPI Types

1 0

08/10: [NDK] Fix alignment macros and add missing ones Remove obsolete ALIGN_UP_BY macro definition
by Timo Kreuzer 01 Jul '18

01 Jul '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b78272d3956228bb3902… commit 3b78272d3956228bb39026d7090c2b2bf14dbb87 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Feb 15 22:14:11 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Jul 1 14:45:21 2018 +0200 [NDK] Fix alignment macros and add missing ones Remove obsolete ALIGN_UP_BY macro definition --- sdk/include/ndk/umtypes.h | 28 ++++++++++++++++++++-------- sdk/lib/rtl/rxact.c | 2 -- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/sdk/include/ndk/umtypes.h b/sdk/include/ndk/umtypes.h index e9d192a40e..3037151b6b 100644 --- a/sdk/include/ndk/umtypes.h +++ b/sdk/include/ndk/umtypes.h @@ -73,17 +73,29 @@ Author: // // Alignment Macros // -#define ALIGN_DOWN(s, t) \ - ((ULONG)(s) & ~(sizeof(t) - 1)) +#define ALIGN_DOWN_BY(size, align) \ + ((ULONG_PTR)(size) & ~((ULONG_PTR)(align) - 1)) -#define ALIGN_UP(s, t) \ - (ALIGN_DOWN(((ULONG)(s) + sizeof(t) - 1), t)) +#define ALIGN_UP_BY(size, align) \ + (ALIGN_DOWN_BY(((ULONG_PTR)(size) + align - 1), align)) -#define ALIGN_DOWN_POINTER(p, t) \ - ((PVOID)((ULONG_PTR)(p) & ~((ULONG_PTR)sizeof(t) - 1))) +#define ALIGN_DOWN_POINTER_BY(ptr, align) \ + ((PVOID)ALIGN_DOWN_BY(ptr, align)) -#define ALIGN_UP_POINTER(p, t) \ - (ALIGN_DOWN_POINTER(((ULONG_PTR)(p) + sizeof(t) - 1), t)) +#define ALIGN_UP_POINTER_BY(ptr, align) \ + ((PVOID)ALIGN_UP_BY(ptr, align)) + +#define ALIGN_DOWN(size, type) \ + ALIGN_DOWN_BY(size, sizeof(type)) + +#define ALIGN_UP(size, type) \ + ALIGN_UP_BY(size, sizeof(type)) + +#define ALIGN_DOWN_POINTER(ptr, type) \ + ALIGN_DOWN_POINTER_BY(ptr, sizeof(type)) + +#define ALIGN_UP_POINTER(ptr, type) \ + ALIGN_UP_POINTER_BY(ptr, sizeof(type)) // // Native API Return Value Macros diff --git a/sdk/lib/rtl/rxact.c b/sdk/lib/rtl/rxact.c index cc9f9609a6..42936872c6 100644 --- a/sdk/lib/rtl/rxact.c +++ b/sdk/lib/rtl/rxact.c @@ -56,8 +56,6 @@ enum RXactSetValueKey = 2, }; -#define ALIGN_UP_BY ROUND_UP - /* FUNCTIONS *****************************************************************/ static

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2018