Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 01/01: [NTOS:KE] Use PNT_TIB as argument in KeSetTebBase
by Jérôme Gardou 24 Mar '21

24 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=187ca32175062f666c554… commit 187ca32175062f666c55464802c31db40ad59980 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 11 16:26:28 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 11:09:20 2021 +0100 [NTOS:KE] Use PNT_TIB as argument in KeSetTebBase --- ntoskrnl/include/internal/i386/ke.h | 2 +- ntoskrnl/ke/i386/thrdini.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index 021a379472f..e7152395c92 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -315,7 +315,7 @@ Ke386SetGdtEntryBase(PKGDTENTRY GdtEntry, PVOID BaseAddress) FORCEINLINE VOID -KiSetTebBase(PKPCR Pcr, PVOID TebAddress) +KiSetTebBase(PKPCR Pcr, PNT_TIB TebAddress) { Pcr->NtTib.Self = TebAddress; Ke386SetGdtEntryBase(&Pcr->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)], TebAddress); diff --git a/ntoskrnl/ke/i386/thrdini.c b/ntoskrnl/ke/i386/thrdini.c index bb90f78cadf..11bf02de2fb 100644 --- a/ntoskrnl/ke/i386/thrdini.c +++ b/ntoskrnl/ke/i386/thrdini.c @@ -363,7 +363,7 @@ KiSwapContextExit(IN PKTHREAD OldThread, Ke386SetGs(0); /* Set the TEB */ - KiSetTebBase((PKPCR)Pcr, NewThread->Teb); + KiSetTebBase((PKPCR)Pcr, &NewThread->Teb->NtTib); /* Set new TSS fields */ Pcr->TSS->Esp0 = (ULONG_PTR)NewThread->InitialStack;

1 0

[reactos] 01/01: [SDK:INCLUDE] Cast to type instead of PVOID
by Jérôme Gardou 24 Mar '21

24 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f963c38c6c72f3208f0b… commit 8f963c38c6c72f3208f0b0ca19ea303001a74c70 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 11 16:08:34 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 11:08:40 2021 +0100 [SDK:INCLUDE] Cast to type instead of PVOID For C++ header compatibility --- sdk/include/reactos/drivers/cmreslist.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/drivers/cmreslist.h b/sdk/include/reactos/drivers/cmreslist.h index 5b52b8b6656..73229767cfd 100644 --- a/sdk/include/reactos/drivers/cmreslist.h +++ b/sdk/include/reactos/drivers/cmreslist.h @@ -40,8 +40,8 @@ CmiGetNextPartialDescriptor( if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific) { /* Add the size of the variable section as well */ - NextDescriptor = (PVOID)((ULONG_PTR)NextDescriptor + - PartialDescriptor->u.DeviceSpecificData.DataSize); + NextDescriptor = (PCM_PARTIAL_RESOURCE_DESCRIPTOR)((ULONG_PTR)NextDescriptor + + PartialDescriptor->u.DeviceSpecificData.DataSize); ASSERT(NextDescriptor >= PartialDescriptor + 1); }

1 0

[reactos] 01/01: [XDK] Undefine some defines once they are not needed
by Jérôme Gardou 24 Mar '21

24 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa74ae571b36255a8f8cf… commit fa74ae571b36255a8f8cfbd1cedad4aa08df1abc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 11 16:06:32 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Mar 24 11:07:54 2021 +0100 [XDK] Undefine some defines once they are not needed --- sdk/include/xdk/iotypes.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index db056814088..a8a2d8d601e 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -1216,6 +1216,9 @@ typedef enum { DevicePropertyAllocatedResources = 0x15, DevicePropertyContainerID = 0x16 | __string_type } DEVICE_REGISTRY_PROPERTY; +#undef __string_type +#undef __guid_type +#undef __multiString_type typedef enum _IO_NOTIFICATION_EVENT_CATEGORY { EventCategoryReserved,

1 0

[reactos] 01/01: [HHPCOMP] Add ARM (32-bit) types (#3548)
by Konrad Dybcio 24 Mar '21

24 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c7b71ac4ffd8d93caf83… commit 4c7b71ac4ffd8d93caf83267a68c81b414a9dfbf Author: Konrad Dybcio <32096130+konradybcio(a)users.noreply.github.com> AuthorDate: Wed Mar 24 07:32:11 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 24 09:32:11 2021 +0300 [HHPCOMP] Add ARM (32-bit) types (#3548) ARM32 seems to use the same type defines as i386 and friends. Let's allow the thing to be compiled again! CORE-17517 Signed-off-by: Konrad Dybcio <konrad.dybcio(a)somainline.org> --- sdk/tools/hhpcomp/chmc/chm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/tools/hhpcomp/chmc/chm.h b/sdk/tools/hhpcomp/chmc/chm.h index 27aa6f79901..7256a3991f4 100644 --- a/sdk/tools/hhpcomp/chmc/chm.h +++ b/sdk/tools/hhpcomp/chmc/chm.h @@ -49,7 +49,8 @@ typedef unsigned __int64 UInt64; /* Sparc */ /* MIPS */ /* PPC */ -#elif __i386__ || __sun || __sgi || __ppc__ +/* ARM (32-bit) */ +#elif __i386__ || __sun || __sgi || __ppc__ || __arm__ typedef unsigned char UChar; typedef short Int16; typedef unsigned short UInt16;

1 0

[reactos] 01/01: [CSRSRV] Fix comment
by Jérôme Gardou 23 Mar '21

23 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6bea426f36fddfe601a4… commit e6bea426f36fddfe601a42d17ed1950484f5edf2 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 23 18:35:13 2021 +0100 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Tue Mar 23 18:35:13 2021 +0100 [CSRSRV] Fix comment --- subsystems/win32/csrsrv/procsup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c index c580328b1e8..13540d00d4e 100644 --- a/subsystems/win32/csrsrv/procsup.c +++ b/subsystems/win32/csrsrv/procsup.c @@ -168,7 +168,7 @@ CsrLockedDereferenceProcess(PCSR_PROCESS CsrProcess) /* Call the generic cleanup code */ DPRINT1("Should kill process: %p\n", CsrProcess); CsrProcessRefcountZero(CsrProcess); - /* Acquire again, the lock it was released in CsrProcessRefcountZero */ + /* Acquire the lock again, it was released in CsrProcessRefcountZero */ CsrAcquireProcessLock(); } }

1 0

[reactos] 01/01: [CSRSRV] Fix locking logic when destroying threads & processes
by Jérôme Gardou 23 Mar '21

23 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7054cd10b17f602a0d695… commit 7054cd10b17f602a0d6958e618ab327c5fdce3da Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 23 18:15:23 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 18:17:44 2021 +0100 [CSRSRV] Fix locking logic when destroying threads & processes --- subsystems/win32/csrsrv/procsup.c | 3 ++- subsystems/win32/csrsrv/thredsup.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/subsystems/win32/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c index de9743cd6c2..c580328b1e8 100644 --- a/subsystems/win32/csrsrv/procsup.c +++ b/subsystems/win32/csrsrv/procsup.c @@ -167,8 +167,9 @@ CsrLockedDereferenceProcess(PCSR_PROCESS CsrProcess) { /* Call the generic cleanup code */ DPRINT1("Should kill process: %p\n", CsrProcess); - CsrAcquireProcessLock(); CsrProcessRefcountZero(CsrProcess); + /* Acquire again, the lock it was released in CsrProcessRefcountZero */ + CsrAcquireProcessLock(); } } diff --git a/subsystems/win32/csrsrv/thredsup.c b/subsystems/win32/csrsrv/thredsup.c index 678a468812c..9f674b4942f 100644 --- a/subsystems/win32/csrsrv/thredsup.c +++ b/subsystems/win32/csrsrv/thredsup.c @@ -474,8 +474,9 @@ CsrLockedDereferenceThread(IN PCSR_THREAD CsrThread) if (LockCount == 0) { /* Call the generic cleanup code */ - CsrAcquireProcessLock(); CsrThreadRefcountZero(CsrThread); + /* Acquire the lock again, it was released by CsrThreadRefcountZero */ + CsrAcquireProcessLock(); } }

1 0

[reactos] 08/08: [CMAKE] Move toolchain specific handling to set_module_type_toolchain
by Jérôme Gardou 23 Mar '21

23 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f5bace8536ef75d796cf6… commit f5bace8536ef75d796cf684cb0d6cd2de7b0f46c Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Mar 23 09:54:46 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [CMAKE] Move toolchain specific handling to set_module_type_toolchain + style fixes --- sdk/cmake/CMakeMacros.cmake | 10 +--------- sdk/cmake/gcc.cmake | 10 +++++++++- sdk/cmake/msvc.cmake | 5 ++++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 9df6eb608e2..537a045f6cd 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -574,14 +574,6 @@ function(set_module_type MODULE TYPE) set_subsystem(${MODULE} windows) endif() - # Set the PE image version numbers from the NT OS version ReactOS is based on - if(MSVC) - target_link_options(${MODULE} PRIVATE "/VERSION:5.01") - else() - target_link_options(${MODULE} PRIVATE - -Wl,--major-image-version,5 -Wl,--minor-image-version,01 -Wl,--major-os-version,5 -Wl,--minor-os-version,01) - endif() - # Set unicode definitions if(__module_UNICODE) target_compile_definitions(${MODULE} PRIVATE UNICODE _UNICODE) @@ -643,7 +635,7 @@ function(set_module_type MODULE TYPE) endif() endif() - if (TYPE STREQUAL kernel) + if(TYPE STREQUAL kernel) # Kernels are executables with exports set_property(TARGET ${MODULE} PROPERTY ENABLE_EXPORTS TRUE) set_target_properties(${MODULE} PROPERTIES DEFINE_SYMBOL "") diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index cd9585dc6cf..1b5604b6ccb 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -280,13 +280,20 @@ function(set_image_base MODULE IMAGE_BASE) endfunction() function(set_module_type_toolchain MODULE TYPE) - if (TYPE IN_LIST KERNEL_MODULE_TYPES) + # Set the PE image version numbers from the NT OS version ReactOS is based on + target_link_options(${MODULE} PRIVATE + -Wl,--major-image-version,5 -Wl,--minor-image-version,01 -Wl,--major-os-version,5 -Wl,--minor-os-version,01) + + if(TYPE IN_LIST KERNEL_MODULE_TYPES) target_link_options(${MODULE} PRIVATE -Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000) + if(${TYPE} STREQUAL "wdmdriver") target_link_options(${MODULE} PRIVATE "-Wl,--wdmdriver") endif() + # Place INIT &.rsrc section at the tail of the module, before .reloc add_linker_script(${MODULE} ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) + # Fixup section characteristics # - Remove flags that LD overzealously puts (alignment flag, Initialized flags for code sections) # - INIT section is made discardable @@ -294,6 +301,7 @@ function(set_module_type_toolchain MODULE TYPE) # - PAGE & .edata sections are made pageable. add_custom_command(TARGET ${MODULE} POST_BUILD COMMAND native-pefixup --${TYPE} $<TARGET_FILE:${MODULE}>) + # Believe it or not, cmake doesn't do that set_property(TARGET ${MODULE} APPEND PROPERTY LINK_DEPENDS $<TARGET_PROPERTY:native-pefixup,IMPORTED_LOCATION>) endif() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index fd716b96266..43a2c8a7fdc 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -249,6 +249,9 @@ function(set_image_base MODULE IMAGE_BASE) endfunction() function(set_module_type_toolchain MODULE TYPE) + # Set the PE image version numbers from the NT OS version ReactOS is based on + target_link_options(${MODULE} PRIVATE "/VERSION:5.01") + if((TYPE STREQUAL win32dll) OR (TYPE STREQUAL win32ocx) OR (TYPE STREQUAL cpl)) target_link_options(${MODULE} PRIVATE /DLL) elseif(TYPE IN_LIST KERNEL_MODULE_TYPES) @@ -261,7 +264,7 @@ function(set_module_type_toolchain MODULE TYPE) target_link_options(${MODULE} PRIVATE /DRIVER:WDM) elseif (TYPE STREQUAL kernel) # Mark .rsrc section as non-disposable non-pageable, as bugcheck code needs to access it - target_link_options(${MODULE} PRIVATE /SECTION:.rsrc,!DP ) + target_link_options(${MODULE} PRIVATE /SECTION:.rsrc,!DP) endif() endif()

1 0

[reactos] 07/08: [CMAKE] Put .rsrc section after the INIT section on drivers, like link.exe does
by Jérôme Gardou 23 Mar '21

23 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c21460680f4a5308e935… commit 5c21460680f4a5308e935a166a27e3de2622033c Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Mar 18 09:48:22 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [CMAKE] Put .rsrc section after the INIT section on drivers, like link.exe does --- sdk/cmake/init-section.lds | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/init-section.lds b/sdk/cmake/init-section.lds index eeda07bf3ce..a40433ae91b 100644 --- a/sdk/cmake/init-section.lds +++ b/sdk/cmake/init-section.lds @@ -1,4 +1,4 @@ -/* Make sure the INIT section is at the end of the module so we can reclaim the space */ +/* Make sure the INIT & .rsrc sections are at the end of the module so we can reclaim the space */ SECTIONS { INIT BLOCK(__section_alignment__) : @@ -7,5 +7,11 @@ SECTIONS *(INIT) __init_end__ = . ; } + .rsrc BLOCK(__section_alignment__) : + { + __rsrc_start__ = . ; + *(.rsrc) + __rsrc_end__ = . ; + } } INSERT BEFORE .reloc; /* .reloc is always at the end */

1 0

[reactos] 06/08: [CMAKE] Use the "kernel" module type for ntoskrnl and ntkrnlmp
by Jérôme Gardou 23 Mar '21

23 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=173cdcae8fbe8194d2393… commit 173cdcae8fbe8194d23931aae034efc0b8f7f534 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 24 11:47:18 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [CMAKE] Use the "kernel" module type for ntoskrnl and ntkrnlmp --- ntoskrnl/CMakeLists.txt | 34 +++++++--------------------------- ntoskrnl/ntkrnlmp/CMakeLists.txt | 23 ++--------------------- 2 files changed, 9 insertions(+), 48 deletions(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 8048520ec90..2efd6f12833 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -32,46 +32,26 @@ add_executable(ntoskrnl ${PCH_SKIP_SOURCE} ntoskrnl.rc ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) -set_property(TARGET ntoskrnl PROPERTY ENABLE_EXPORTS TRUE) -set_target_properties(ntoskrnl PROPERTIES DEFINE_SYMBOL "") +set_module_type(ntoskrnl kernel) source_group(TREE ${REACTOS_SOURCE_DIR}/ntoskrnl PREFIX "Source Files" FILES ${NTOSKRNL_SOURCE}) -if(ARCH STREQUAL "i386") - set_entrypoint(ntoskrnl KiSystemStartup 4) -else() - set_entrypoint(ntoskrnl KiSystemStartup) -endif() -set_subsystem(ntoskrnl native) - -if(MSVC) - set_image_base(ntoskrnl 0x00400000) - add_target_link_flags(ntoskrnl "/SECTION:.rsrc,!DP") #Accessed from bugcheck code - add_target_link_flags(ntoskrnl "/SECTION:INIT,ERWD") -else() - if(GDB AND NOT CLANG) - # Completely disable optimizations when debugging the kernel - # Not for CLang, which fails as following in _SEH2_EXCEPT macro: - # error: inline assembly requires more registers than available - target_compile_options(ntoskrnl PRIVATE -O0) - set_image_base(ntoskrnl 0x00800000) - else() - set_image_base(ntoskrnl 0x80800000) - endif() - add_linker_script(ntoskrnl ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) +if(GDB AND NOT CLANG) + # Completely disable optimizations when debugging the kernel + # Not for CLang, which fails as following in _SEH2_EXCEPT macro: + # error: inline assembly requires more registers than available + target_compile_options(ntoskrnl PRIVATE -O0) endif() target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) if(STACK_PROTECTOR) target_sources(ntoskrnl PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>) -elseif(RUNTIME_CHECKS) - target_link_libraries(ntoskrnl runtmchk) endif() add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${PCH_SKIP_SOURCE}") -add_dependencies(ntoskrnl psdk bugcodes asm) +add_dependencies(ntoskrnl psdk asm) add_cd_file(TARGET ntoskrnl DESTINATION reactos/system32 NO_CAB FOR all) if(BUILD_MP) diff --git a/ntoskrnl/ntkrnlmp/CMakeLists.txt b/ntoskrnl/ntkrnlmp/CMakeLists.txt index 393fee96409..a56ec6ce8e3 100644 --- a/ntoskrnl/ntkrnlmp/CMakeLists.txt +++ b/ntoskrnl/ntkrnlmp/CMakeLists.txt @@ -19,35 +19,16 @@ add_executable(ntkrnlmp ${NTKRNLMP_PCH_SKIP_SOURCE} ${REACTOS_SOURCE_DIR}/ntoskrnl/ntoskrnl.rc ${CMAKE_CURRENT_BINARY_DIR}/ntkrnlmp.def) -set_property(TARGET ntkrnlmp PROPERTY ENABLE_EXPORTS TRUE) - +set_module_type(ntkrnlmp kernel) target_compile_definitions(ntkrnlmp PRIVATE CONFIG_SMP) -if(ARCH STREQUAL "i386") - set_entrypoint(ntkrnlmp KiSystemStartup 4) -else() - set_entrypoint(ntkrnlmp KiSystemStartup) -endif() -set_subsystem(ntkrnlmp native) - -if(MSVC) - set_image_base(ntkrnlmp 0x00400000) - add_target_link_flags(ntkrnlmp "/SECTION:.rsrc,!DP") #Accessed from bugcheck code -else() - set_image_base(ntkrnlmp 0x80800000) -endif() - # dynamic analysis switches if(STACK_PROTECTOR) target_sources(ntkrnlmp PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>) endif() -if(RUNTIME_CHECKS) - target_link_libraries(ntkrnlmp runtmchk) -endif() - target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) add_importlibs(ntkrnlmp hal kdcom bootvid) add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${NTKRNLMP_PCH_SKIP_SOURCE}") -add_dependencies(ntkrnlmp psdk bugcodes asm) +add_dependencies(ntkrnlmp psdk asm) add_cd_file(TARGET ntkrnlmp DESTINATION reactos/system32 NO_CAB FOR all)

1 0

[reactos] 05/08: [CMAKE] Add the kernel module type
by Jérôme Gardou 23 Mar '21

23 Mar '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e55123a6a286202dea242… commit e55123a6a286202dea24269ad35b35ab412d68aa Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 24 11:46:53 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Tue Mar 23 11:18:43 2021 +0100 [CMAKE] Add the kernel module type Take this as an occasion to use target_link_options more --- sdk/cmake/CMakeMacros.cmake | 99 +++++++++++++++++++++------------------------ sdk/cmake/gcc.cmake | 10 +++-- sdk/cmake/msvc.cmake | 21 ++++++---- sdk/include/host/pecoff.h | 16 ++++++++ sdk/tools/pefixup.c | 48 ++++++++++++++++++---- 5 files changed, 124 insertions(+), 70 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 2d5628f02a2..9df6eb608e2 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -541,7 +541,10 @@ function(add_importlibs _module) endfunction() # Some helper lists -list(APPEND KERNEL_MODULE_TYPES kerneldll kernelmodedriver wdmdriver) +list(APPEND VALID_MODULE_TYPES kernel kerneldll kernelmodedriver wdmdriver nativecui nativedll win32cui win32gui win32dll win32ocx cpl module) +list(APPEND KERNEL_MODULE_TYPES kernel kerneldll kernelmodedriver wdmdriver) +list(APPEND NATIVE_MODULE_TYPES kernel kerneldll kernelmodedriver wdmdriver nativecui nativedll) + function(set_module_type MODULE TYPE) cmake_parse_arguments(__module "UNICODE" "IMAGEBASE" "ENTRYPOINT" ${ARGN}) @@ -549,38 +552,34 @@ function(set_module_type MODULE TYPE) message(STATUS "set_module_type : unparsed arguments ${__module_UNPARSED_ARGUMENTS}, module : ${MODULE}") endif() + # Check this is a type that we know + if (NOT TYPE IN_LIST VALID_MODULE_TYPES) + message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") + endif() + + # Set our target property + set_target_properties(${MODULE} PROPERTIES REACTOS_MODULE_TYPE ${TYPE}) + # Add the module to the module group list, if it is defined if(DEFINED CURRENT_MODULE_GROUP) set_property(GLOBAL APPEND PROPERTY ${CURRENT_MODULE_GROUP}_MODULE_LIST "${MODULE}") endif() - # Set subsystem. Also take this as an occasion - # to error out if someone gave a non existing type - if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) - OR (${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) - set(__subsystem native) + # Set subsystem. + if(TYPE IN_LIST NATIVE_MODULE_TYPES) + set_subsystem(${MODULE} native) elseif(${TYPE} STREQUAL win32cui) - set(__subsystem console) + set_subsystem(${MODULE} console) elseif(${TYPE} STREQUAL win32gui) - set(__subsystem windows) - elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) - OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module))) - message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") - endif() - - # Set our target property - set_target_properties(${MODULE} PROPERTIES REACTOS_MODULE_TYPE ${TYPE}) - - if(DEFINED __subsystem) - set_subsystem(${MODULE} ${__subsystem}) + set_subsystem(${MODULE} windows) endif() # Set the PE image version numbers from the NT OS version ReactOS is based on if(MSVC) - add_target_link_flags(${MODULE} "/VERSION:5.01") + target_link_options(${MODULE} PRIVATE "/VERSION:5.01") else() - add_target_link_flags(${MODULE} "-Wl,--major-image-version,5 -Wl,--minor-image-version,01") - add_target_link_flags(${MODULE} "-Wl,--major-os-version,5 -Wl,--minor-os-version,01") + target_link_options(${MODULE} PRIVATE + -Wl,--major-image-version,5 -Wl,--minor-image-version,01 -Wl,--major-os-version,5 -Wl,--minor-os-version,01) endif() # Set unicode definitions @@ -590,49 +589,32 @@ function(set_module_type MODULE TYPE) # Set entry point if(__module_ENTRYPOINT OR (__module_ENTRYPOINT STREQUAL "0")) - list(GET __module_ENTRYPOINT 0 __entrypoint) - list(LENGTH __module_ENTRYPOINT __length) - if(${__length} EQUAL 2) - list(GET __module_ENTRYPOINT 1 __entrystack) - elseif(NOT ${__length} EQUAL 1) - message(FATAL_ERROR "Wrong arguments for ENTRYPOINT parameter of set_module_type : ${__module_ENTRYPOINT}") - endif() - unset(__length) + set_entrypoint(${MODULE} ${__module_ENTRYPOINT}) elseif(${TYPE} STREQUAL nativecui) - set(__entrypoint NtProcessStartup) - set(__entrystack 4) + set_entrypoint(${MODULE} NtProcessStartup 4) elseif(${TYPE} STREQUAL win32cui) if(__module_UNICODE) - set(__entrypoint wmainCRTStartup) + set_entrypoint(${MODULE} wmainCRTStartup) else() - set(__entrypoint mainCRTStartup) + set_entrypoint(${MODULE} mainCRTStartup) endif() elseif(${TYPE} STREQUAL win32gui) if(__module_UNICODE) - set(__entrypoint wWinMainCRTStartup) + set_entrypoint(${MODULE} wWinMainCRTStartup) else() - set(__entrypoint WinMainCRTStartup) + set_entrypoint(${MODULE} WinMainCRTStartup) endif() elseif((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl)) - set(__entrypoint DllMainCRTStartup) - set(__entrystack 12) + set_entrypoint(${MODULE} DllMainCRTStartup 12) elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) - set(__entrypoint DriverEntry) - set(__entrystack 8) + set_entrypoint(${MODULE} DriverEntry 8) elseif(${TYPE} STREQUAL nativedll) - set(__entrypoint DllMain) - set(__entrystack 12) + set_entrypoint(${MODULE} DllMain 12) + elseif(TYPE STREQUAL kernel) + set_entrypoint(${MODULE} KiSystemStartup 4) elseif(${TYPE} STREQUAL module) - set(__entrypoint 0) - endif() - - if(DEFINED __entrypoint) - if(DEFINED __entrystack) - set_entrypoint(${MODULE} ${__entrypoint} ${__entrystack}) - else() - set_entrypoint(${MODULE} ${__entrypoint}) - endif() + set_entrypoint(${MODULE} 0) endif() # Set base address @@ -644,18 +626,29 @@ function(set_module_type MODULE TYPE) else() message(STATUS "${MODULE} has no base address") endif() - elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) - set_image_base(${MODULE} 0x00010000) + elseif(TYPE IN_LIST KERNEL_MODULE_TYPES) + # special case for kernel + if (TYPE STREQUAL kernel) + set_image_base(${MODULE} 0x00400000) + else() + set_image_base(${MODULE} 0x00010000) + endif() endif() # Now do some stuff which is specific to each type - if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) + if(TYPE IN_LIST KERNEL_MODULE_TYPES) add_dependencies(${MODULE} bugcodes xdk) if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") endif() endif() + if (TYPE STREQUAL kernel) + # Kernels are executables with exports + set_property(TARGET ${MODULE} PROPERTY ENABLE_EXPORTS TRUE) + set_target_properties(${MODULE} PROPERTIES DEFINE_SYMBOL "") + endif() + if(${TYPE} STREQUAL win32ocx) set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx") endif() diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 442422a74dc..cd9585dc6cf 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -285,11 +285,15 @@ function(set_module_type_toolchain MODULE TYPE) if(${TYPE} STREQUAL "wdmdriver") target_link_options(${MODULE} PRIVATE "-Wl,--wdmdriver") endif() - # Place INIT section at the tail of the module + # Place INIT &.rsrc section at the tail of the module, before .reloc add_linker_script(${MODULE} ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) - # Fixup section characteristiscs + # Fixup section characteristics + # - Remove flags that LD overzealously puts (alignment flag, Initialized flags for code sections) + # - INIT section is made discardable + # - .rsrc is made read-only + # - PAGE & .edata sections are made pageable. add_custom_command(TARGET ${MODULE} POST_BUILD - COMMAND native-pefixup --driver $<TARGET_FILE:${MODULE}>) + COMMAND native-pefixup --${TYPE} $<TARGET_FILE:${MODULE}>) # Believe it or not, cmake doesn't do that set_property(TARGET ${MODULE} APPEND PROPERTY LINK_DEPENDS $<TARGET_PROPERTY:native-pefixup,IMPORTED_LOCATION>) endif() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 33fdbea00f0..fd716b96266 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -249,13 +249,20 @@ function(set_image_base MODULE IMAGE_BASE) endfunction() function(set_module_type_toolchain MODULE TYPE) - if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl")) - add_target_link_flags(${MODULE} "/DLL") - elseif(${TYPE} STREQUAL "kernelmodedriver") - # Disable linker warning 4078 (multiple sections found with different attributes) for INIT section use - add_target_link_flags(${MODULE} "/DRIVER /SECTION:INIT,ERWD") - elseif(${TYPE} STREQUAL "wdmdriver") - add_target_link_flags(${MODULE} "/DRIVER:WDM /SECTION:INIT,ERWD") + if((TYPE STREQUAL win32dll) OR (TYPE STREQUAL win32ocx) OR (TYPE STREQUAL cpl)) + target_link_options(${MODULE} PRIVATE /DLL) + elseif(TYPE IN_LIST KERNEL_MODULE_TYPES) + # Mark INIT section as Executable Read Write Discardable + target_link_options(${MODULE} PRIVATE /SECTION:INIT,ERWD) + + if(TYPE STREQUAL kernelmodedriver) + target_link_options(${MODULE} PRIVATE /DRIVER) + elseif(TYPE STREQUAL wdmdriver) + target_link_options(${MODULE} PRIVATE /DRIVER:WDM) + elseif (TYPE STREQUAL kernel) + # Mark .rsrc section as non-disposable non-pageable, as bugcheck code needs to access it + target_link_options(${MODULE} PRIVATE /SECTION:.rsrc,!DP ) + endif() endif() if(RUNTIME_CHECKS) diff --git a/sdk/include/host/pecoff.h b/sdk/include/host/pecoff.h index 28daca13da4..74104075fb6 100644 --- a/sdk/include/host/pecoff.h +++ b/sdk/include/host/pecoff.h @@ -39,6 +39,22 @@ #define IMAGE_SCN_MEM_READ 0x40000000 #define IMAGE_SCN_MEM_WRITE 0x80000000 +#define IMAGE_SCN_ALIGN_1BYTES 0x00100000 +#define IMAGE_SCN_ALIGN_2BYTES 0x00200000 +#define IMAGE_SCN_ALIGN_4BYTES 0x00300000 +#define IMAGE_SCN_ALIGN_8BYTES 0x00400000 +#define IMAGE_SCN_ALIGN_16BYTES 0x00500000 +#define IMAGE_SCN_ALIGN_32BYTES 0x00600000 +#define IMAGE_SCN_ALIGN_64BYTES 0x00700000 +#define IMAGE_SCN_ALIGN_128BYTES 0x00800000 +#define IMAGE_SCN_ALIGN_256BYTES 0x00900000 +#define IMAGE_SCN_ALIGN_512BYTES 0x00A00000 +#define IMAGE_SCN_ALIGN_1024BYTES 0x00B00000 +#define IMAGE_SCN_ALIGN_2048BYTES 0x00C00000 +#define IMAGE_SCN_ALIGN_4096BYTES 0x00D00000 +#define IMAGE_SCN_ALIGN_8192BYTES 0x00E00000 +#define IMAGE_SCN_ALIGN_MASK 0x00F00000 + #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 #define IMAGE_REL_I386_ABSOLUTE 0x0001 diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index 81dfcc96c5a..3ea638653a0 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -27,7 +27,10 @@ static const char* g_Target; enum fixup_mode { MODE_LOADCONFIG, - MODE_DRIVER + MODE_KERNELDRIVER, + MODE_WDMDRIVER, + MODE_KERNELDLL, + MODE_KERNEL }; void *rva_to_ptr(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header, DWORD rva) @@ -127,13 +130,27 @@ static int add_loadconfig(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) return 1; } -static int driver_fixup(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) +static int driver_fixup(int mode, unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) { /* GNU LD just doesn't know what a driver is, and has notably no idea of paged vs non-paged sections */ for (unsigned i = 0; i < nt_header->FileHeader.NumberOfSections; i++) { PIMAGE_SECTION_HEADER Section = IMAGE_FIRST_SECTION(nt_header) + i; + /* LD puts alignment crap that nobody asked for */ + Section->Characteristics &= ~IMAGE_SCN_ALIGN_MASK; + + /* LD overdoes it and puts the initialized flag everywhere */ + if (Section->Characteristics & IMAGE_SCN_CNT_CODE) + Section->Characteristics &= ~IMAGE_SCN_CNT_INITIALIZED_DATA; + + /* For some reason, .rsrc is made writable by windres */ + if (strncasecmp((char*)Section->Name, ".rsrc", 5) == 0) + { + Section->Characteristics &= ~IMAGE_SCN_MEM_WRITE; + continue; + } + /* Known sections which can be discarded */ if (strncasecmp((char*)Section->Name, "INIT", 4) == 0) { @@ -143,6 +160,8 @@ static int driver_fixup(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) /* Known sections which can be paged */ if ((strncasecmp((char*)Section->Name, "PAGE", 4) == 0) + || (strncasecmp((char*)Section->Name, ".rsrc", 5) == 0) + || (strncasecmp((char*)Section->Name, ".edata", 6) == 0) || (strncasecmp((char*)Section->Name, ".reloc", 6) == 0)) { continue; @@ -164,8 +183,11 @@ print_usage(void) { printf("Usage: %s <mode> <filename>\n", g_ApplicationName); printf("Where <mode> is on of the following:\n"); - printf(" --loadconfig Fix the LOAD_CONFIG directory entry\n"); - printf(" --driver Fix code and data sections for driver images\n"); + printf(" --loadconfig Fix the LOAD_CONFIG directory entry\n"); + printf(" --kernelmodedriver Fix code and data sections for driver images\n"); + printf(" --wdmdriver Fix code and data sections for WDM drivers\n"); + printf(" --kerneldll Fix code and data sections for Kernel-Mode DLLs\n"); + printf(" --kernel Fix code and data sections for kernels\n"); } int main(int argc, char **argv) @@ -189,9 +211,21 @@ int main(int argc, char **argv) { mode = MODE_LOADCONFIG; } - else if (strcmp(argv[1], "--driver") == 0) + else if (strcmp(argv[1], "--kernelmodedriver") == 0) + { + mode = MODE_KERNELDRIVER; + } + else if (strcmp(argv[1], "--wdmdriver") == 0) + { + mode = MODE_WDMDRIVER; + } + else if (strcmp(argv[1], "--kerneldll") == 0) + { + mode = MODE_KERNELDLL; + } + else if (strcmp(argv[1], "--kernel") == 0) { - mode = MODE_DRIVER; + mode = MODE_KERNEL; } else { @@ -245,7 +279,7 @@ int main(int argc, char **argv) if (mode == MODE_LOADCONFIG) result = add_loadconfig(buffer, nt_header); else - result = driver_fixup(buffer, nt_header); + result = driver_fixup(mode, buffer, nt_header); if (!result) {

1 0

← Newer
1
2
3
4
5
6
7
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2021