Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NDK] DATA_SEG requires an extra #pragma on MSVC
by Victor Perevertkin 09 Apr '21

09 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3e1697c2b96e77b670f2… commit f3e1697c2b96e77b670f2ae19260091028e82f95 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 04:38:35 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 04:38:35 2021 +0300 [NDK] DATA_SEG requires an extra #pragma on MSVC --- hal/halx86/include/hal.h | 5 +++++ ntoskrnl/config/cmdata.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/hal/halx86/include/hal.h b/hal/halx86/include/hal.h index 860651951c8..ec38e8c70ce 100644 --- a/hal/halx86/include/hal.h +++ b/hal/halx86/include/hal.h @@ -36,6 +36,11 @@ #include <ndk/kefuncs.h> #include <ndk/rtlfuncs.h> +/* For MSVC, this is required before using DATA_SEG (used in pcidata) */ +#ifdef _MSC_VER +# pragma section("INIT", read,execute,discard) +#endif + /* Internal shared PCI and ACPI header */ #include <drivers/pci/pci.h> #include <drivers/acpi/acpi.h> diff --git a/ntoskrnl/config/cmdata.c b/ntoskrnl/config/cmdata.c index eb1c39bf320..95fafb225c6 100644 --- a/ntoskrnl/config/cmdata.c +++ b/ntoskrnl/config/cmdata.c @@ -65,6 +65,11 @@ ULONG CmpTypeCount[MaximumType + 1]; HANDLE CmpRegistryRootHandle; +// for MSVC, this is required before using DATA_SEG +#ifdef _MSC_VER +# pragma section("INIT", read,execute,discard) +#endif + DATA_SEG("INIT") UNICODE_STRING CmClassName[MaximumClass + 1] = { RTL_CONSTANT_STRING(L"System"),

1 0

[reactos] 01/01: [PC98VID] Fix a typo, addendum to 959729f6eecc2b23fe5b56554cf9c61938dc4c1e
by Victor Perevertkin 09 Apr '21

09 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6645227270514ba981b89… commit 6645227270514ba981b89693038791de1cad70d4 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 03:59:55 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 03:59:55 2021 +0300 [PC98VID] Fix a typo, addendum to 959729f6eecc2b23fe5b56554cf9c61938dc4c1e --- sdk/include/reactos/drivers/pc98/video.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/drivers/pc98/video.h b/sdk/include/reactos/drivers/pc98/video.h index 00db994f68a..b9a9dc6b1e9 100644 --- a/sdk/include/reactos/drivers/pc98/video.h +++ b/sdk/include/reactos/drivers/pc98/video.h @@ -188,7 +188,7 @@ WRITE_GDC_CSRFORM(PUCHAR Port, PCSRFORMPARAM CursorParameters) WRITE_PORT_UCHAR(Port, (((_Bool)CursorParameters->Show) << 7) | (CursorParameters->LinesPerRow - 1)); WRITE_PORT_UCHAR(Port, ((CursorParameters->BlinkRate & 0x03) << 6) | - (((_Bool)CursorParameters->Blink) << 5) | CursorParameters->StartScanLine); + (((_Bool)!CursorParameters->Blink) << 5) | CursorParameters->StartScanLine); WRITE_PORT_UCHAR(Port, (CursorParameters->EndScanLine << 3) | ((CursorParameters->BlinkRate & 0x1C) >> 2)); }

1 0

[reactos] 03/03: [CMAKE] Some options are only supported by GCC, don't use them for clang
by Victor Perevertkin 09 Apr '21

09 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74ec94e12c7a4e8c7a6af… commit 74ec94e12c7a4e8c7a6af6dfadc605ec54b46f07 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 03:58:19 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 03:58:19 2021 +0300 [CMAKE] Some options are only supported by GCC, don't use them for clang These are (so far): -Wno-format-overflow -Wno-nonnull-compare -Wno-old-style-declaration -Wno-unused-but-set-variable --- base/applications/network/telnet/CMakeLists.txt | 7 ++++++- base/services/tftpd/CMakeLists.txt | 2 +- dll/3rdparty/libtiff/CMakeLists.txt | 6 ++++-- dll/directx/wine/wined3d/CMakeLists.txt | 2 +- dll/opengl/glu32/CMakeLists.txt | 10 +++++++--- dll/win32/browseui/CMakeLists.txt | 5 ++++- dll/win32/browseui/shellbars/CMakeLists.txt | 4 ++-- dll/win32/browseui/shellfind/CMakeLists.txt | 4 ++-- dll/win32/winmm/CMakeLists.txt | 4 ++-- drivers/bluetooth/fbtusb/CMakeLists.txt | 4 ++-- drivers/filesystems/ext2/CMakeLists.txt | 7 ++++--- drivers/filesystems/ffs/CMakeLists.txt | 6 ++++-- drivers/filesystems/reiserfs/CMakeLists.txt | 5 ++++- drivers/filesystems/udfs/CMakeLists.txt | 6 ++++-- drivers/network/dd/netkvm/CMakeLists.txt | 6 ++++-- drivers/storage/class/classpnp/CMakeLists.txt | 6 +++++- drivers/storage/class/disk_new/CMakeLists.txt | 6 +++++- drivers/storage/ide/uniata/CMakeLists.txt | 6 ++++-- modules/rosapps/applications/devutils/symdump/CMakeLists.txt | 4 ++-- modules/rosapps/applications/net/ncftp/CMakeLists.txt | 2 +- modules/rosapps/applications/sysutils/logevent/CMakeLists.txt | 4 ++-- modules/rosapps/applications/sysutils/pedump/CMakeLists.txt | 4 ++-- .../rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt | 4 ++-- modules/rosapps/templates/dialog/CMakeLists.txt | 4 ++-- modules/rostests/winetests/advpack/CMakeLists.txt | 2 +- modules/rostests/winetests/fusion/CMakeLists.txt | 2 +- modules/rostests/winetests/msi/CMakeLists.txt | 2 +- modules/rostests/winetests/ole32/CMakeLists.txt | 4 +++- modules/rostests/winetests/services/CMakeLists.txt | 2 +- modules/rostests/winetests/setupapi/CMakeLists.txt | 2 +- modules/rostests/winetests/shell32/CMakeLists.txt | 4 +++- modules/rostests/winetests/user32/CMakeLists.txt | 4 +++- modules/rostests/winetests/version/CMakeLists.txt | 8 +++++--- sdk/lib/3rdparty/adns/CMakeLists.txt | 4 ++-- sdk/lib/3rdparty/cardlib/CMakeLists.txt | 4 ++-- 35 files changed, 99 insertions(+), 57 deletions(-) diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index d77a95cc8bd..7bb174f62f2 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -24,10 +24,15 @@ list(APPEND SOURCE add_executable(telnet ${SOURCE} telnet.rc) target_link_libraries(telnet cppstl) set_target_cpp_properties(telnet WITH_EXCEPTIONS) + if (NOT MSVC) - target_compile_options(telnet PRIVATE -Wno-restrict $<$<COMPILE_LANGUAGE:CXX>:-Wno-narrowing>) target_compile_definitions(telnet PRIVATE _CRT_NONSTDC_NO_DEPRECATE) endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(telnet PRIVATE -Wno-restrict $<$<COMPILE_LANGUAGE:CXX>:-Wno-narrowing>) +endif() + set_module_type(telnet win32cui) add_importlibs(telnet ws2_32 user32 msvcrt kernel32 ntdll) add_pch(telnet precomp.h SOURCE) diff --git a/base/services/tftpd/CMakeLists.txt b/base/services/tftpd/CMakeLists.txt index 1b10567bd7f..1790a81dff6 100644 --- a/base/services/tftpd/CMakeLists.txt +++ b/base/services/tftpd/CMakeLists.txt @@ -4,6 +4,6 @@ set_module_type(tftpd win32cui) add_importlibs(tftpd advapi32 ws2_32 iphlpapi msvcrt kernel32) add_cd_file(TARGET tftpd DESTINATION reactos/system32 FOR all) -if(GCC OR CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(tftpd PRIVATE -Wno-format-overflow) endif() diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index fc98c11cac4..f7c0b904c23 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -67,6 +67,8 @@ if(MSVC) remove_target_compile_option(libtiff "/we4311") # error C4312: 'type cast': conversion from 'int' to 'thandle_t' of greater size remove_target_compile_option(libtiff "/we4312") -else() - target_compile_options(libtiff PRIVATE "-Wno-unused-but-set-variable") +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(libtiff PRIVATE -Wno-unused-but-set-variable) endif() diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index 3af303fd783..10f144b93e6 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -53,6 +53,6 @@ add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(d3dwine precomp.h SOURCE) add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all) -if(NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(d3dwine PRIVATE -Wno-format-overflow) endif() diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index 490732e6d49..ffa8a540818 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -121,14 +121,18 @@ target_link_libraries(glu32 cpprt) set_module_type(glu32 win32dll) if(NOT MSVC) - target_compile_options(glu32 PRIVATE -Wno-write-strings -Wno-unused-but-set-variable) - # Prevent a warning when comparing 'this' against 0 - set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_FLAGS "-Wno-nonnull-compare") + target_compile_options(glu32 PRIVATE -Wno-write-strings) elseif(USE_CLANG_CL) target_compile_options(glu32 PRIVATE -Wno-self-assign -Wno-unused-function -Wno-microsoft-include) target_compile_options(glu32 PRIVATE -Wno-deprecated-register -Wno-tautological-undefined-compare) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(glu32 PRIVATE -Wno-unused-but-set-variable) + # Prevent a warning when comparing 'this' against 0 + set_source_files_properties(src/libnurbs/internals/arc.cc PROPERTIES COMPILE_FLAGS "-Wno-nonnull-compare") +endif() + add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll) add_pch(glu32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET glu32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index d606fbfbb18..146ee786ca7 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -53,8 +53,11 @@ add_importlibs(browseui uxtheme shlwapi shell32 comctl32 gdi32 ole32 oleaut32 us add_pch(browseui precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(browseui PRIVATE -Wno-unused-but-set-variable) +endif() + if(NOT MSVC) - target_compile_options(browseui PRIVATE "-Wno-unused-but-set-variable") # Binutils linker bug if(LTCG) add_target_link_flags(browseui "-Wl,--allow-multiple-definition") diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt index 360c785e5c3..bf64a68c96f 100644 --- a/dll/win32/browseui/shellbars/CMakeLists.txt +++ b/dll/win32/browseui/shellbars/CMakeLists.txt @@ -14,8 +14,8 @@ list(APPEND SOURCE add_library(shellbars OBJECT ${SOURCE}) target_link_libraries(shellbars PRIVATE atl_classes) -if(NOT MSVC) - target_compile_options(shellbars PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(shellbars PRIVATE -Wno-unused-but-set-variable) endif() add_pch(shellbars shellbars.h SOURCE) diff --git a/dll/win32/browseui/shellfind/CMakeLists.txt b/dll/win32/browseui/shellfind/CMakeLists.txt index 72f15422fcd..43c31511710 100644 --- a/dll/win32/browseui/shellfind/CMakeLists.txt +++ b/dll/win32/browseui/shellfind/CMakeLists.txt @@ -11,8 +11,8 @@ list(APPEND SOURCE add_library(shellfind OBJECT ${SOURCE}) target_link_libraries(shellfind PRIVATE atl_classes) -if(NOT MSVC) - target_compile_options(shellfind PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(shellfind PRIVATE -Wno-unused-but-set-variable) endif() add_pch(shellfind shellfind.h SOURCE) diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index 640ebf63081..d6bc6b7f478 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -33,8 +33,8 @@ add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_pch(winmm winemm.h SOURCE) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) -if(NOT MSVC) - target_compile_options(winmm PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(winmm PRIVATE -Wno-unused-but-set-variable) endif() add_subdirectory(midimap) diff --git a/drivers/bluetooth/fbtusb/CMakeLists.txt b/drivers/bluetooth/fbtusb/CMakeLists.txt index 20c8d7bfd12..7de68e74752 100644 --- a/drivers/bluetooth/fbtusb/CMakeLists.txt +++ b/drivers/bluetooth/fbtusb/CMakeLists.txt @@ -12,8 +12,8 @@ list(APPEND SOURCE add_library(fbtusb MODULE ${SOURCE} fbtusb.rc) -if(NOT MSVC) - target_compile_options(fbtusb PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(fbtusb PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(fbtusb kernelmodedriver) diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index dadf04c06b7..06c51e756c3 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -103,9 +103,10 @@ else() target_compile_options(ext2fs PRIVATE -Wno-pointer-sign -Wno-unused-function -Wno-unused-variable -Wno-missing-braces) - if (NOT CLANG) - target_compile_options(ext2fs PRIVATE -Wno-unused-but-set-variable) - endif() +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(ext2fs PRIVATE -Wno-unused-but-set-variable) endif() if(CLANG) diff --git a/drivers/filesystems/ffs/CMakeLists.txt b/drivers/filesystems/ffs/CMakeLists.txt index b2e5135b84a..9d5670aaa56 100644 --- a/drivers/filesystems/ffs/CMakeLists.txt +++ b/drivers/filesystems/ffs/CMakeLists.txt @@ -35,11 +35,13 @@ if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(ffs PRIVATE -Wno-unused-variable -Wno-missing-braces) if(USE_CLANG_CL) target_compile_options(ffs PRIVATE -Wno-empty-body) - else() - target_compile_options(ffs PRIVATE -Wno-unused-but-set-variable) endif() endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(ffs PRIVATE -Wno-unused-but-set-variable) +endif() + add_definitions(-D__KERNEL__) set_module_type(ffs kernelmodedriver) target_link_libraries(ffs memcmp ${PSEH_LIB}) diff --git a/drivers/filesystems/reiserfs/CMakeLists.txt b/drivers/filesystems/reiserfs/CMakeLists.txt index b921bbfa250..84e680eb2f7 100644 --- a/drivers/filesystems/reiserfs/CMakeLists.txt +++ b/drivers/filesystems/reiserfs/CMakeLists.txt @@ -82,7 +82,6 @@ if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(reiserfs PRIVATE -Wno-missing-braces -Wno-pointer-sign) target_compile_options(reiserfs PRIVATE -Wno-unused-function -Wno-unused-variable) if(NOT USE_CLANG_CL) - target_compile_options(reiserfs PRIVATE -Wno-unused-but-set-variable) target_compile_definitions(reiserfs PRIVATE __GCC__) endif() else() @@ -92,6 +91,10 @@ else() target_compile_options(reiserfs PRIVATE /wd4189 /wd4142 /wd4101) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(reiserfs PRIVATE -Wno-unused-but-set-variable) +endif() + target_link_libraries(reiserfs memcmp ${PSEH_LIB}) add_definitions(-D__KERNEL__ -D_CRT_NO_POSIX_ERROR_CODES) set_module_type(reiserfs kernelmodedriver) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index 292fe2421e3..dd1b7a5694a 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -50,8 +50,10 @@ if(MSVC) target_compile_options(udfs PRIVATE -Wno-tautological-unsigned-zero-compare -Wno-self-assign) target_compile_options(udfs PRIVATE -Wno-sometimes-uninitialized -Wno-parentheses-equality) endif() -else() - target_compile_options(udfs PRIVATE "-Wno-unused-but-set-variable") +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(udfs PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(udfs kernelmodedriver) diff --git a/drivers/network/dd/netkvm/CMakeLists.txt b/drivers/network/dd/netkvm/CMakeLists.txt index ac916e92cab..26ff48a184b 100644 --- a/drivers/network/dd/netkvm/CMakeLists.txt +++ b/drivers/network/dd/netkvm/CMakeLists.txt @@ -29,11 +29,13 @@ add_driver_inf(netkvm netkvm.inf) if(NOT MSVC) target_compile_options(netkvm PRIVATE -Wno-unused-function - -Wno-old-style-declaration -Wno-unknown-pragmas - -Wno-unused-but-set-variable -Wno-pointer-sign -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wno-attributes) endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(netkvm PRIVATE -Wno-old-style-declaration -Wno-unused-but-set-variable) +endif() diff --git a/drivers/storage/class/classpnp/CMakeLists.txt b/drivers/storage/class/classpnp/CMakeLists.txt index fc80d6dba6b..a1cee352784 100644 --- a/drivers/storage/class/classpnp/CMakeLists.txt +++ b/drivers/storage/class/classpnp/CMakeLists.txt @@ -42,7 +42,11 @@ target_compile_definitions(classpnp PRIVATE CLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) if(GCC) - target_compile_options(classpnp PRIVATE -Wno-unused-but-set-variable -Wno-pointer-to-int-cast -Wno-switch) + target_compile_options(classpnp PRIVATE -Wno-pointer-to-int-cast -Wno-switch) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(classpnp PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(classpnp kernelmodedriver) diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt index 8c11bc30a72..68407eafe56 100644 --- a/drivers/storage/class/disk_new/CMakeLists.txt +++ b/drivers/storage/class/disk_new/CMakeLists.txt @@ -21,7 +21,11 @@ if(USE_CLANG_CL OR (NOT MSVC)) endif() if(GCC) - target_compile_options(disk PRIVATE -Wno-unused-but-set-variable -Wno-pointer-to-int-cast -Wno-switch) + target_compile_options(disk PRIVATE -Wno-pointer-to-int-cast -Wno-switch) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(disk PRIVATE -Wno-unused-but-set-variable) endif() set_module_type(disk kernelmodedriver) diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index 0df8e748a6c..c172d96ac54 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -25,11 +25,13 @@ if(USE_CLANG_CL OR (NOT MSVC)) target_compile_options(uniata PRIVATE "-Wno-narrowing") if(USE_CLANG_CL) target_compile_options(uniata PRIVATE "-Wno-unused-const-variable") - else() - target_compile_options(uniata PRIVATE "-Wno-unused-but-set-variable") endif() endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(uniata PRIVATE -Wno-unused-but-set-variable) +endif() + add_pch(uniata stdafx.h SOURCE) set_module_type(uniata kernelmodedriver) add_importlibs(uniata scsiport ntoskrnl hal) diff --git a/modules/rosapps/applications/devutils/symdump/CMakeLists.txt b/modules/rosapps/applications/devutils/symdump/CMakeLists.txt index 0e0bd3b2adf..327566bf97b 100644 --- a/modules/rosapps/applications/devutils/symdump/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/symdump/CMakeLists.txt @@ -4,7 +4,7 @@ add_executable(symdump symdump.c) set_module_type(symdump win32cui) target_link_libraries(symdump wine) add_importlibs(symdump dbghelp shlwapi msvcrt kernel32 ntdll) -if(NOT MSVC) - target_compile_options(symdump PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(symdump PRIVATE -Wno-unused-but-set-variable) endif() add_cd_file(TARGET symdump DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/net/ncftp/CMakeLists.txt b/modules/rosapps/applications/net/ncftp/CMakeLists.txt index 41ad22bd30e..7b080fbb687 100644 --- a/modules/rosapps/applications/net/ncftp/CMakeLists.txt +++ b/modules/rosapps/applications/net/ncftp/CMakeLists.txt @@ -71,7 +71,7 @@ list(APPEND SOURCE add_executable(ncftp ${SOURCE} ncftp.rc) set_module_type(ncftp win32cui) target_compile_definitions(ncftp PRIVATE HAVE_UTIME_H HAVE_UNISTD_H) -if(NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(ncftp PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(ncftp advapi32 user32 ws2_32 msvcrt kernel32) diff --git a/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt b/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt index 7b5aba3b6cb..2d2311a4a1d 100644 --- a/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/logevent/CMakeLists.txt @@ -1,8 +1,8 @@ add_executable(logevent logevent.c logevent.rc) set_module_type(logevent win32cui) -if(NOT MSVC) - target_compile_options(logevent PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(logevent PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(logevent advapi32 msvcrt kernel32) add_cd_file(TARGET logevent DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt b/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt index ca2eade1876..6d15201f7b8 100644 --- a/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/pedump/CMakeLists.txt @@ -1,8 +1,8 @@ add_executable(pedump pedump.c pedump.rc) set_module_type(pedump win32cui) -if(NOT MSVC) - target_compile_options(pedump PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(pedump PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(pedump msvcrt kernel32 ntdll) add_cd_file(TARGET pedump DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt b/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt index 748d0f03544..5d70928f475 100644 --- a/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt +++ b/modules/rosapps/applications/sysutils/utils/rosperf/CMakeLists.txt @@ -11,8 +11,8 @@ list(APPEND SOURCE add_executable(rosperf ${SOURCE} rosperf.rc) set_module_type(rosperf win32cui UNICODE) -if(NOT MSVC) - target_compile_options(rosperf PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(rosperf PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(rosperf version msimg32 gdi32 shell32 advapi32 user32 ntdll msvcrt kernel32) add_cd_file(TARGET rosperf DESTINATION reactos/system32 FOR all) diff --git a/modules/rosapps/templates/dialog/CMakeLists.txt b/modules/rosapps/templates/dialog/CMakeLists.txt index 16aed4a4261..2451bd065cf 100644 --- a/modules/rosapps/templates/dialog/CMakeLists.txt +++ b/modules/rosapps/templates/dialog/CMakeLists.txt @@ -9,8 +9,8 @@ list(APPEND SOURCE add_executable(template_dialog ${SOURCE} dialog.rc) set_module_type(template_dialog win32cui) -if(NOT MSVC) - target_compile_options(template_dialog PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(template_dialog PRIVATE -Wno-unused-but-set-variable) endif() add_importlibs(template_dialog user32 gdi32 comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET template_dialog DESTINATION reactos/system32 FOR all) diff --git a/modules/rostests/winetests/advpack/CMakeLists.txt b/modules/rostests/winetests/advpack/CMakeLists.txt index 9eebedf7ba0..097c91f79a5 100644 --- a/modules/rostests/winetests/advpack/CMakeLists.txt +++ b/modules/rostests/winetests/advpack/CMakeLists.txt @@ -9,7 +9,7 @@ add_executable(advpack_winetest ${SOURCE}) target_compile_definitions(advpack_winetest PRIVATE USE_WINE_TODOS) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(advpack_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/fusion/CMakeLists.txt b/modules/rostests/winetests/fusion/CMakeLists.txt index f3600c383d0..4654753fa9b 100644 --- a/modules/rostests/winetests/fusion/CMakeLists.txt +++ b/modules/rostests/winetests/fusion/CMakeLists.txt @@ -10,7 +10,7 @@ add_executable(fusion_winetest ${SOURCE}) target_compile_definitions(fusion_winetest PRIVATE USE_WINE_TODOS) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(fusion_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/msi/CMakeLists.txt b/modules/rostests/winetests/msi/CMakeLists.txt index 815c2cfc2cc..8884c47513c 100644 --- a/modules/rostests/winetests/msi/CMakeLists.txt +++ b/modules/rostests/winetests/msi/CMakeLists.txt @@ -32,7 +32,7 @@ add_executable(msi_winetest target_compile_definitions(msi_winetest PRIVATE __WINESRC__ USE_WINE_TODOS) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(msi_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/ole32/CMakeLists.txt b/modules/rostests/winetests/ole32/CMakeLists.txt index dd2aa62975d..37c0d4aa520 100644 --- a/modules/rostests/winetests/ole32/CMakeLists.txt +++ b/modules/rostests/winetests/ole32/CMakeLists.txt @@ -30,7 +30,9 @@ add_importlibs(ole32_winetest oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel if(MSVC) add_importlibs(ole32_winetest ntdll) -else() +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(ole32_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/services/CMakeLists.txt b/modules/rostests/winetests/services/CMakeLists.txt index b6313f4d2e8..a7051a0f91e 100644 --- a/modules/rostests/winetests/services/CMakeLists.txt +++ b/modules/rostests/winetests/services/CMakeLists.txt @@ -4,6 +4,6 @@ set_module_type(services_winetest win32cui) add_importlibs(services_winetest user32 advapi32 msvcrt kernel32) add_rostests_file(TARGET services_winetest) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(services_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/setupapi/CMakeLists.txt b/modules/rostests/winetests/setupapi/CMakeLists.txt index 60ba1fef77b..7233a7900b1 100644 --- a/modules/rostests/winetests/setupapi/CMakeLists.txt +++ b/modules/rostests/winetests/setupapi/CMakeLists.txt @@ -17,6 +17,6 @@ target_link_libraries(setupapi_winetest uuid) add_importlibs(setupapi_winetest advapi32 setupapi user32 shell32 msvcrt kernel32 ntdll) add_rostests_file(TARGET setupapi_winetest) -if (NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(setupapi_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/shell32/CMakeLists.txt b/modules/rostests/winetests/shell32/CMakeLists.txt index a9816a60be4..23dcd7c751b 100644 --- a/modules/rostests/winetests/shell32/CMakeLists.txt +++ b/modules/rostests/winetests/shell32/CMakeLists.txt @@ -38,7 +38,9 @@ add_importlibs(shell32_winetest shell32 shlwapi ole32 oleaut32 user32 gdi32 adva if(MSVC) add_importlibs(shell32_winetest ntdll) -else() +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(shell32_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt index 132170024a8..32f89934309 100644 --- a/modules/rostests/winetests/user32/CMakeLists.txt +++ b/modules/rostests/winetests/user32/CMakeLists.txt @@ -40,7 +40,9 @@ add_executable(user32_winetest if(MSVC) # Disable warning C4477 (printf format warnings) remove_target_compile_option(user32_winetest "/we4477") -elseif(GCC) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(user32_winetest PRIVATE -Wno-format-overflow) endif() diff --git a/modules/rostests/winetests/version/CMakeLists.txt b/modules/rostests/winetests/version/CMakeLists.txt index a4d8a7901e2..f472718d44b 100644 --- a/modules/rostests/winetests/version/CMakeLists.txt +++ b/modules/rostests/winetests/version/CMakeLists.txt @@ -10,10 +10,12 @@ add_importlibs(version_winetest shell32 version msvcrt kernel32) target_compile_definitions(version_winetest PRIVATE USE_WINE_TODOS) -if (NOT MSVC) - target_compile_options(version_winetest PRIVATE -Wno-format-overflow) -else() +if(MSVC) add_importlibs(version_winetest ntdll) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(version_winetest PRIVATE -Wno-format-overflow) +endif() + add_rostests_file(TARGET version_winetest) diff --git a/sdk/lib/3rdparty/adns/CMakeLists.txt b/sdk/lib/3rdparty/adns/CMakeLists.txt index d46b9e4cdfa..34b0deeafd8 100644 --- a/sdk/lib/3rdparty/adns/CMakeLists.txt +++ b/sdk/lib/3rdparty/adns/CMakeLists.txt @@ -24,8 +24,8 @@ list(APPEND SOURCE add_library(adns ${SOURCE}) -if(NOT MSVC) - target_compile_options(adns PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(adns PRIVATE -Wno-unused-but-set-variable) endif() add_dependencies(adns psdk) diff --git a/sdk/lib/3rdparty/cardlib/CMakeLists.txt b/sdk/lib/3rdparty/cardlib/CMakeLists.txt index 1a90575b34b..b35c25d8046 100644 --- a/sdk/lib/3rdparty/cardlib/CMakeLists.txt +++ b/sdk/lib/3rdparty/cardlib/CMakeLists.txt @@ -18,8 +18,8 @@ add_library(cardlib STATIC ${SOURCE}) target_link_libraries(cardlib PRIVATE cpprt) target_include_directories(cardlib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -if(NOT MSVC) - target_compile_options(cardlib PRIVATE "-Wno-unused-but-set-variable") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") + target_compile_options(cardlib PRIVATE -Wno-unused-but-set-variable) endif() add_dependencies(cardlib psdk)

1 0

[reactos] 02/03: [PC98VID] Fix clang 12 warning
by Victor Perevertkin 09 Apr '21

09 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=959729f6eecc2b23fe5b5… commit 959729f6eecc2b23fe5b56554cf9c61938dc4c1e Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 03:54:25 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 03:54:25 2021 +0300 [PC98VID] Fix clang 12 warning --- sdk/include/reactos/drivers/pc98/video.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/drivers/pc98/video.h b/sdk/include/reactos/drivers/pc98/video.h index f6188d2abe7..00db994f68a 100644 --- a/sdk/include/reactos/drivers/pc98/video.h +++ b/sdk/include/reactos/drivers/pc98/video.h @@ -185,10 +185,10 @@ FORCEINLINE VOID WRITE_GDC_CSRFORM(PUCHAR Port, PCSRFORMPARAM CursorParameters) { - WRITE_PORT_UCHAR(Port, ((CursorParameters->Show & 0x01) << 7) | + WRITE_PORT_UCHAR(Port, (((_Bool)CursorParameters->Show) << 7) | (CursorParameters->LinesPerRow - 1)); WRITE_PORT_UCHAR(Port, ((CursorParameters->BlinkRate & 0x03) << 6) | - ((!CursorParameters->Blink & 0x01) << 5) | CursorParameters->StartScanLine); + (((_Bool)CursorParameters->Blink) << 5) | CursorParameters->StartScanLine); WRITE_PORT_UCHAR(Port, (CursorParameters->EndScanLine << 3) | ((CursorParameters->BlinkRate & 0x1C) >> 2)); }

1 0

[reactos] 01/03: [SDK][NDK] Fix clang 12 compilation
by Victor Perevertkin 09 Apr '21

09 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7d1ff4a9d95d6596c6c7… commit c7d1ff4a9d95d6596c6c79684906b00412122e55 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Apr 9 03:51:32 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Apr 9 03:51:32 2021 +0300 [SDK][NDK] Fix clang 12 compilation --- sdk/cmake/gcc.cmake | 11 +++++++++-- sdk/include/ndk/kefuncs.h | 2 -- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index d5436cea69f..9da30e09008 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -47,16 +47,23 @@ add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:CXX>>:-nostdinc>") add_compile_options(-mstackrealign) -if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") add_compile_options(-fno-aggressive-loop-optimizations) if (DBG) add_compile_options("$<$<COMPILE_LANGUAGE:C>:-Wold-style-declaration>") endif() -else() +elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options("$<$<COMPILE_LANGUAGE:C>:-Wno-microsoft>") add_compile_options(-Wno-pragma-pack) add_compile_options(-fno-associative-math) add_compile_options(-fcommon) + + if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0) + # disable "libcall optimization" + # see https://mudongliang.github.io/2020/12/02/undefined-reference-to-stpcpy.html + add_compile_options(-fno-builtin-stpcpy) + endif() + set(CMAKE_LINK_DEF_FILE_FLAG "") set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") set(CMAKE_LINK_LIBRARY_SUFFIX "") diff --git a/sdk/include/ndk/kefuncs.h b/sdk/include/ndk/kefuncs.h index 5556a79fa56..323f9df6455 100644 --- a/sdk/include/ndk/kefuncs.h +++ b/sdk/include/ndk/kefuncs.h @@ -245,7 +245,6 @@ KeSignalCallDpcSynchronize( // ARC Configuration Functions. Only enabled if you have ARC Support // #ifdef _ARC_ -CODE_SEG("INIT") PCONFIGURATION_COMPONENT_DATA NTAPI KeFindConfigurationNextEntry( @@ -256,7 +255,6 @@ KeFindConfigurationNextEntry( _In_ PCONFIGURATION_COMPONENT_DATA *NextLink ); -CODE_SEG("INIT") PCONFIGURATION_COMPONENT_DATA NTAPI KeFindConfigurationEntry(

1 0

[reactos] 01/01: [WINSXS] Add some amd64 manifests
by Mark Jansen 08 Apr '21

08 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2587d72ef7c0673a619a7… commit 2587d72ef7c0673a619a7ad4202a82f926e8a6ab Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Dec 16 23:09:35 2020 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Apr 8 20:48:24 2021 +0300 [WINSXS] Add some amd64 manifests Co-authored-by: Timo Kreuzer <timo.kreuzer(a)reactos.org> --- boot/bootdata/packages/reactos.dff.in | 5 + dll/apisets/CMakeLists.txt | 4 +- dll/apisets/CMakeLists.txt.in | 4 +- ...6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest | 220 +++++++++++++++++++++ ...5b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in | 6 + dll/win32/comctl32/CMakeLists.txt | 9 +- ...44ccf1df_5.82.2600.2982_none_deadbeef.manifest} | 2 +- ...144ccf1df_6.0.2600.2982_none_deadbeef.manifest} | 2 +- ...144ccf1df_5.82.2600.2982_none_deadbeef.manifest | 2 +- ...4144ccf1df_6.0.2600.2982_none_deadbeef.manifest | 2 +- dll/win32/gdiplus/CMakeLists.txt | 8 +- ...b64144ccf1df_1.0.14393.0_none_deadbeef.manifest | 5 + ...144ccf1df_1.1.7601.23038_none_deadbeef.manifest | 5 + media/forwardcompatible.manifest | 6 +- media/systemcompatible.manifest | 4 +- sdk/cmake/CMakeMacros.cmake | 10 + 16 files changed, 273 insertions(+), 21 deletions(-) diff --git a/boot/bootdata/packages/reactos.dff.in b/boot/bootdata/packages/reactos.dff.in index 815db8d167c..cf80abab0e6 100644 --- a/boot/bootdata/packages/reactos.dff.in +++ b/boot/bootdata/packages/reactos.dff.in @@ -85,6 +85,11 @@ Signature = "$Windows NT$" 64 = Resources\Themes\Lunar 65 = Resources\Themes\Mizu 66 = system32\spool\prtprocs\x64 +67 = winsxs\amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef +68 = winsxs\amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef +69 = winsxs\amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef +70 = winsxs\amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef +71 = winsxs\amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef .InfEnd diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index 348cf2d4acb..3273531b34a 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -32,10 +32,10 @@ function (add_apiset apiset_name baseaddress) add_importlibs(${apiset_name} ${ARGN} ntdll) - add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) + add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) endfunction() -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) # Apisets will be appended diff --git a/dll/apisets/CMakeLists.txt.in b/dll/apisets/CMakeLists.txt.in index 3ec26d4928b..fa5961a32b1 100644 --- a/dll/apisets/CMakeLists.txt.in +++ b/dll/apisets/CMakeLists.txt.in @@ -32,10 +32,10 @@ function (add_apiset apiset_name baseaddress) add_importlibs(${apiset_name} ${ARGN} ntdll) - add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) + add_cd_file(TARGET ${apiset_name} DESTINATION reactos/winsxs/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef FOR all) endfunction() -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) # Apisets will be appended diff --git a/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest new file mode 100644 index 00000000000..83a4aaa0b7a --- /dev/null +++ b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +  + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df"/> + <file name="api-ms-win-appmodel-identity-l1-1-0.dll"/> + <file name="api-ms-win-appmodel-runtime-l1-1-1.dll"/> + <file name="api-ms-win-appmodel-runtime-l1-1-2.dll"/> + <file name="api-ms-win-core-apiquery-l1-1-0.dll"/> + <file name="api-ms-win-core-appcompat-l1-1-1.dll"/> + <file name="api-ms-win-core-appinit-l1-1-0.dll"/> + <file name="api-ms-win-core-atoms-l1-1-0.dll"/> + <file name="api-ms-win-core-bem-l1-1-0.dll"/> + <file name="api-ms-win-core-com-l1-1-0.dll"/> + <file name="api-ms-win-core-com-l1-1-1.dll"/> + <file name="api-ms-win-core-com-private-l1-1-0.dll"/> + <file name="api-ms-win-core-comm-l1-1-0.dll"/> + <file name="api-ms-win-core-console-l1-1-0.dll"/> + <file name="api-ms-win-core-console-l2-1-0.dll"/> + <file name="api-ms-win-core-crt-l1-1-0.dll"/> + <file name="api-ms-win-core-crt-l2-1-0.dll"/> + <file name="api-ms-win-core-datetime-l1-1-0.dll"/> + <file name="api-ms-win-core-datetime-l1-1-1.dll"/> + <file name="api-ms-win-core-debug-l1-1-0.dll"/> + <file name="api-ms-win-core-debug-l1-1-1.dll"/> + <file name="api-ms-win-core-delayload-l1-1-0.dll"/> + <file name="api-ms-win-core-delayload-l1-1-1.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-0.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-1.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-2.dll"/> + <file name="api-ms-win-core-errorhandling-l1-1-3.dll"/> + <file name="api-ms-win-core-fibers-l1-1-0.dll"/> + <file name="api-ms-win-core-fibers-l1-1-1.dll"/> + <file name="api-ms-win-core-file-l1-1-0.dll"/> + <file name="api-ms-win-core-file-l1-2-0.dll"/> + <file name="api-ms-win-core-file-l1-2-1.dll"/> + <file name="api-ms-win-core-file-l1-2-2.dll"/> + <file name="api-ms-win-core-file-l2-1-0.dll"/> + <file name="api-ms-win-core-file-l2-1-1.dll"/> + <file name="api-ms-win-core-file-l2-1-2.dll"/> + <file name="api-ms-win-core-handle-l1-1-0.dll"/> + <file name="api-ms-win-core-heap-l1-1-0.dll"/> + <file name="api-ms-win-core-heap-l1-2-0.dll"/> + <file name="api-ms-win-core-heap-l2-1-0.dll"/> + <file name="api-ms-win-core-heap-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-interlocked-l1-1-0.dll"/> + <file name="api-ms-win-core-interlocked-l1-2-0.dll"/> + <file name="api-ms-win-core-io-l1-1-0.dll"/> + <file name="api-ms-win-core-io-l1-1-1.dll"/> + <file name="api-ms-win-core-job-l1-1-0.dll"/> + <file name="api-ms-win-core-job-l2-1-0.dll"/> + <file name="api-ms-win-core-kernel32-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-kernel32-legacy-l1-1-1.dll"/> + <file name="api-ms-win-core-kernel32-private-l1-1-1.dll"/> + <file name="api-ms-win-core-largeinteger-l1-1-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-1-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-1-1.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-0.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-1.dll"/> + <file name="api-ms-win-core-libraryloader-l1-2-2.dll"/> + <file name="api-ms-win-core-localization-l1-1-0.dll"/> + <file name="api-ms-win-core-localization-l1-2-0.dll"/> + <file name="api-ms-win-core-localization-l1-2-1.dll"/> + <file name="api-ms-win-core-localization-l2-1-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-2-0.dll"/> + <file name="api-ms-win-core-localization-obsolete-l1-3-0.dll"/> + <file name="api-ms-win-core-localization-private-l1-1-0.dll"/> + <file name="api-ms-win-core-localregistry-l1-1-0.dll"/> + <file name="api-ms-win-core-memory-l1-1-0.dll"/> + <file name="api-ms-win-core-memory-l1-1-1.dll"/> + <file name="api-ms-win-core-memory-l1-1-2.dll"/> + <file name="api-ms-win-core-misc-l1-1-0.dll"/> + <file name="api-ms-win-core-namedpipe-l1-1-0.dll"/> + <file name="api-ms-win-core-namedpipe-l1-2-0.dll"/> + <file name="api-ms-win-core-namespace-l1-1-0.dll"/> + <file name="api-ms-win-core-normalization-l1-1-0.dll"/> + <file name="api-ms-win-core-path-l1-1-0.dll"/> + <file name="api-ms-win-core-privateprofile-l1-1-1.dll"/> + <file name="api-ms-win-core-processenvironment-l1-1-0.dll"/> + <file name="api-ms-win-core-processenvironment-l1-2-0.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-0.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-1.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-2.dll"/> + <file name="api-ms-win-core-processthreads-l1-1-3.dll"/> + <file name="api-ms-win-core-processtopology-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-profile-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-ansi-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-l1-1-0.dll"/> + <file name="api-ms-win-core-psapi-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-quirks-l1-1-0.dll"/> + <file name="api-ms-win-core-realtime-l1-1-0.dll"/> + <file name="api-ms-win-core-registry-l1-1-0.dll"/> + <file name="api-ms-win-core-registry-l2-1-0.dll"/> + <file name="api-ms-win-core-registryuserspecific-l1-1-0.dll"/> + <file name="api-ms-win-core-rtlsupport-l1-1-0.dll"/> + <file name="api-ms-win-core-rtlsupport-l1-2-0.dll"/> + <file name="api-ms-win-core-shlwapi-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-shlwapi-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-shlwapi-obsolete-l1-2-0.dll"/> + <file name="api-ms-win-core-shutdown-l1-1-0.dll"/> + <file name="api-ms-win-core-sidebyside-l1-1-0.dll"/> + <file name="api-ms-win-core-string-l1-1-0.dll"/> + <file name="api-ms-win-core-string-l2-1-0.dll"/> + <file name="api-ms-win-core-string-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-core-stringansi-l1-1-0.dll"/> + <file name="api-ms-win-core-stringloader-l1-1-1.dll"/> + <file name="api-ms-win-core-synch-ansi-l1-1-0.dll"/> + <file name="api-ms-win-core-synch-l1-1-0.dll"/> + <file name="api-ms-win-core-synch-l1-2-0.dll"/> + <file name="api-ms-win-core-synch-l1-2-1.dll"/> + <file name="api-ms-win-core-sysinfo-l1-1-0.dll"/> + <file name="api-ms-win-core-sysinfo-l1-2-0.dll"/> + <file name="api-ms-win-core-sysinfo-l1-2-1.dll"/> + <file name="api-ms-win-core-threadpool-l1-1-0.dll"/> + <file name="api-ms-win-core-threadpool-l1-2-0.dll"/> + <file name="api-ms-win-core-threadpool-legacy-l1-1-0.dll"/> + <file name="api-ms-win-core-threadpool-private-l1-1-0.dll"/> + <file name="api-ms-win-core-timezone-l1-1-0.dll"/> + <file name="api-ms-win-core-toolhelp-l1-1-0.dll"/> + <file name="api-ms-win-core-url-l1-1-0.dll"/> + <file name="api-ms-win-core-util-l1-1-0.dll"/> + <file name="api-ms-win-core-version-l1-1-0.dll"/> + <file name="api-ms-win-core-version-l1-1-1.dll"/> + <file name="api-ms-win-core-version-private-l1-1-0.dll"/> + <file name="api-ms-win-core-versionansi-l1-1-0.dll"/> + <file name="api-ms-win-core-windowserrorreporting-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-error-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-error-l1-1-1.dll"/> + <file name="api-ms-win-core-winrt-errorprivate-l1-1-1.dll"/> + <file name="api-ms-win-core-winrt-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-registration-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-string-l1-1-0.dll"/> + <file name="api-ms-win-core-winrt-string-l1-1-1.dll"/> + <file name="api-ms-win-core-wow64-l1-1-0.dll"/> + <file name="api-ms-win-core-wow64-l1-1-1.dll"/> + <file name="api-ms-win-core-xstate-l1-1-0.dll"/> + <file name="api-ms-win-core-xstate-l2-1-0.dll"/> + <file name="api-ms-win-crt-conio-l1-1-0.dll"/> + <file name="api-ms-win-crt-convert-l1-1-0.dll"/> + <file name="api-ms-win-crt-environment-l1-1-0.dll"/> + <file name="api-ms-win-crt-filesystem-l1-1-0.dll"/> + <file name="api-ms-win-crt-heap-l1-1-0.dll"/> + <file name="api-ms-win-crt-locale-l1-1-0.dll"/> + <file name="api-ms-win-crt-math-l1-1-0.dll"/> + <file name="api-ms-win-crt-multibyte-l1-1-0.dll"/> + <file name="api-ms-win-crt-private-l1-1-0.dll"/> + <file name="api-ms-win-crt-process-l1-1-0.dll"/> + <file name="api-ms-win-crt-runtime-l1-1-0.dll"/> + <file name="api-ms-win-crt-stdio-l1-1-0.dll"/> + <file name="api-ms-win-crt-string-l1-1-0.dll"/> + <file name="api-ms-win-crt-time-l1-1-0.dll"/> + <file name="api-ms-win-crt-utility-l1-1-0.dll"/> + <file name="api-ms-win-devices-config-l1-1-0.dll"/> + <file name="api-ms-win-devices-config-l1-1-1.dll"/> + <file name="api-ms-win-devices-query-l1-1-1.dll"/> + <file name="api-ms-win-downlevel-advapi32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-advapi32-l2-1-0.dll"/> + <file name="api-ms-win-downlevel-normaliz-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-ole32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shell32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shlwapi-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-shlwapi-l2-1-0.dll"/> + <file name="api-ms-win-downlevel-user32-l1-1-0.dll"/> + <file name="api-ms-win-downlevel-version-l1-1-0.dll"/> + <file name="api-ms-win-dx-d3dkmt-l1-1-0.dll"/> + <file name="api-ms-win-eventing-classicprovider-l1-1-0.dll"/> + <file name="api-ms-win-eventing-consumer-l1-1-0.dll"/> + <file name="api-ms-win-eventing-controller-l1-1-0.dll"/> + <file name="api-ms-win-eventing-legacy-l1-1-0.dll"/> + <file name="api-ms-win-eventing-provider-l1-1-0.dll"/> + <file name="api-ms-win-eventlog-legacy-l1-1-0.dll"/> + <file name="api-ms-win-gdi-dpiinfo-l1-1-0.dll"/> + <file name="api-ms-win-mm-joystick-l1-1-0.dll"/> + <file name="api-ms-win-mm-misc-l1-1-1.dll"/> + <file name="api-ms-win-mm-mme-l1-1-0.dll"/> + <file name="api-ms-win-mm-time-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-dc-access-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-rectangle-l1-1-0.dll"/> + <file name="api-ms-win-ntuser-sysparams-l1-1-0.dll"/> + <file name="api-ms-win-perf-legacy-l1-1-0.dll"/> + <file name="api-ms-win-power-base-l1-1-0.dll"/> + <file name="api-ms-win-power-setting-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-draw-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-private-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-private-l1-1-4.dll"/> + <file name="api-ms-win-rtcore-ntuser-window-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-winevent-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.dll"/> + <file name="api-ms-win-rtcore-ntuser-wmpointer-l1-1-3.dll"/> + <file name="api-ms-win-security-activedirectoryclient-l1-1-0.dll"/> + <file name="api-ms-win-security-audit-l1-1-1.dll"/> + <file name="api-ms-win-security-base-l1-1-0.dll"/> + <file name="api-ms-win-security-base-l1-2-0.dll"/> + <file name="api-ms-win-security-base-private-l1-1-1.dll"/> + <file name="api-ms-win-security-credentials-l1-1-0.dll"/> + <file name="api-ms-win-security-cryptoapi-l1-1-0.dll"/> + <file name="api-ms-win-security-grouppolicy-l1-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l1-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l1-1-1.dll"/> + <file name="api-ms-win-security-lsalookup-l2-1-0.dll"/> + <file name="api-ms-win-security-lsalookup-l2-1-1.dll"/> + <file name="api-ms-win-security-lsapolicy-l1-1-0.dll"/> + <file name="api-ms-win-security-provider-l1-1-0.dll"/> + <file name="api-ms-win-security-sddl-l1-1-0.dll"/> + <file name="api-ms-win-security-systemfunctions-l1-1-0.dll"/> + <file name="api-ms-win-service-core-l1-1-0.dll"/> + <file name="api-ms-win-service-core-l1-1-1.dll"/> + <file name="api-ms-win-service-management-l1-1-0.dll"/> + <file name="api-ms-win-service-management-l2-1-0.dll"/> + <file name="api-ms-win-service-private-l1-1-1.dll"/> + <file name="api-ms-win-service-winsvc-l1-1-0.dll"/> + <file name="api-ms-win-service-winsvc-l1-2-0.dll"/> + <file name="api-ms-win-shcore-obsolete-l1-1-0.dll"/> + <file name="api-ms-win-shcore-scaling-l1-1-1.dll"/> + <file name="api-ms-win-shcore-stream-l1-1-0.dll"/> + <file name="api-ms-win-shcore-thread-l1-1-0.dll"/> + <file name="api-ms-win-shell-shellcom-l1-1-0.dll"/> + <file name="api-ms-win-shell-shellfolders-l1-1-0.dll"/> +</assembly> diff --git a/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in new file mode 100644 index 00000000000..8044a2ed96d --- /dev/null +++ b/dll/apisets/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef.manifest.in @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +  + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df"/> +%MANIFEST_FILE_LIST% +</assembly> diff --git a/dll/win32/comctl32/CMakeLists.txt b/dll/win32/comctl32/CMakeLists.txt index 6675e8f3500..2d963efb7e1 100644 --- a/dll/win32/comctl32/CMakeLists.txt +++ b/dll/win32/comctl32/CMakeLists.txt @@ -75,7 +75,8 @@ add_delay_importlibs(comctl32 winmm uxtheme) add_importlibs(comctl32 user32 gdi32 advapi32 usp10 imm32 msvcrt kernel32 ntdll) add_pch(comctl32 precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET comctl32 DESTINATION reactos/system32 FOR all) -add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef FOR all) -add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) + +add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef FOR all) +add_cd_file(TARGET comctl32 DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest similarity index 94% copy from dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest copy to dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest index 8029acbb64c..f272350fdfd 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.2600.2982" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass versioned="no">Button</windowClass> <windowClass versioned="no">ButtonListBox</windowClass> diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest similarity index 93% copy from dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest copy to dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest index 5f9aae353ab..6aae024df59 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass>Button</windowClass> <windowClass>ButtonListBox</windowClass> diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest index 8029acbb64c..667503808bb 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.2600.2982" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass versioned="no">Button</windowClass> <windowClass versioned="no">ButtonListBox</windowClass> diff --git a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest index 5f9aae353ab..0e253694b73 100644 --- a/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest +++ b/dll/win32/comctl32/x86_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" publicKeyToken="6595b64144ccf1df"/> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.2600.2982" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/> <file name="comctl32.dll"> <windowClass>Button</windowClass> <windowClass>ButtonListBox</windowClass> diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index a3ea0e30437..c939dfa9ddb 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -40,8 +40,8 @@ add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll add_pch(gdiplus precomp.h "${PCH_SKIP_SOURCE}") add_cd_file(TARGET gdiplus DESTINATION reactos/system32 FOR all) -add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) -add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) +add_cd_file(TARGET gdiplus DESTINATION reactos/winsxs/${WINARCH}_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/${WINARCH}_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest DESTINATION reactos/winsxs/manifests FOR all) diff --git a/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest new file mode 100644 index 00000000000..93b3bf11e2e --- /dev/null +++ b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.14393.0" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly> diff --git a/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest new file mode 100644 index 00000000000..fba38187d2d --- /dev/null +++ b/dll/win32/gdiplus/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef.manifest @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df"/> + <file name="gdiplus.dll"/> +</assembly> diff --git a/media/forwardcompatible.manifest b/media/forwardcompatible.manifest index 785d62f8dbb..638f7f639cd 100644 --- a/media/forwardcompatible.manifest +++ b/media/forwardcompatible.manifest @@ -2,13 +2,13 @@ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <dependency> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> <dependentAssembly> - <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="ReactOS.Apisets" version="1.0.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> </dependency> </assembly> diff --git a/media/systemcompatible.manifest b/media/systemcompatible.manifest index 8326faa3f98..b1c76c0dac7 100644 --- a/media/systemcompatible.manifest +++ b/media/systemcompatible.manifest @@ -2,10 +2,10 @@ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <dependency> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> <dependentAssembly> - <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="x86" language="*" /> + <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*" /> </dependentAssembly> </dependency> </assembly> diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 537a045f6cd..3f9a5486c9e 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -225,6 +225,16 @@ macro(dir_to_num dir var) set(${var} 65) elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/x64) set(${var} 66) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.common-controls_6595b64144ccf1df_5.82.2600.2982_none_deadbeef) + set(${var} 67) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.common-controls_6595b64144ccf1df_6.0.2600.2982_none_deadbeef) + set(${var} 68) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.1.7601.23038_none_deadbeef) + set(${var} 69) + elseif(${dir} STREQUAL reactos/winsxs/amd64_reactos.apisets_6595b64144ccf1df_1.0.0.0_none_deadbeef) + set(${var} 70) + elseif(${dir} STREQUAL reactos/winsxs/amd64_microsoft.windows.gdiplus_6595b64144ccf1df_1.0.14393.0_none_deadbeef) + set(${var} 71) else() message(FATAL_ERROR "Wrong destination: ${dir}") endif()

1 0

[reactos] 12/12: [NTOS:MM] Fix a bit page fault handler with regard to COW sections
by Jérôme Gardou 08 Apr '21

08 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c48580135df5ef8673254… commit c48580135df5ef86732546126830a1ab98f71b29 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 6 12:58:02 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Apr 8 15:40:37 2021 +0200 [NTOS:MM] Fix a bit page fault handler with regard to COW sections --- ntoskrnl/mm/section.c | 82 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/ntoskrnl/mm/section.c b/ntoskrnl/mm/section.c index 0b6b8e80416..e273c3ac10b 100644 --- a/ntoskrnl/mm/section.c +++ b/ntoskrnl/mm/section.c @@ -1697,8 +1697,7 @@ MmNotPresentFaultSectionView(PMMSUPPORT AddressSpace, * Check if this page needs to be mapped COW */ if ((Segment->WriteCopy) && - (Region->Protect == PAGE_READWRITE || - Region->Protect == PAGE_EXECUTE_READWRITE)) + (Region->Protect == PAGE_READWRITE || Region->Protect == PAGE_EXECUTE_READWRITE)) { Attributes = Region->Protect == PAGE_READWRITE ? PAGE_READONLY : PAGE_EXECUTE_READ; } @@ -1883,32 +1882,70 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, PMM_SECTION_SEGMENT Segment; PFN_NUMBER OldPage; PFN_NUMBER NewPage; - NTSTATUS Status; PVOID PAddress; LARGE_INTEGER Offset; PMM_REGION Region; ULONG_PTR Entry; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + BOOLEAN Cow = FALSE; + ULONG NewProtect; DPRINT("MmAccessFaultSectionView(%p, %p, %p)\n", AddressSpace, MemoryArea, Address); + /* Get the region for this address */ + Region = MmFindRegion((PVOID)MA_GetStartingAddress(MemoryArea), + &MemoryArea->SectionData.RegionListHead, + Address, NULL); + ASSERT(Region != NULL); + if (!(Region->Protect & PAGE_IS_WRITABLE)) + return STATUS_ACCESS_VIOLATION; + /* Make sure we have a page mapping for this address. */ - Status = MmNotPresentFaultSectionView(AddressSpace, MemoryArea, Address, Locked); - if (!NT_SUCCESS(Status)) + if (!MmIsPagePresent(Process, Address)) { - /* This is invalid access ! */ - return Status; + NTSTATUS Status = MmNotPresentFaultSectionView(AddressSpace, MemoryArea, Address, Locked); + if (!NT_SUCCESS(Status)) + { + /* This is invalid access ! */ + return Status; + } } /* * Check if the page has already been set readwrite */ - if (MmGetPageProtect(Process, Address) & PAGE_READWRITE) + if (MmGetPageProtect(Process, Address) & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) { DPRINT("Address 0x%p\n", Address); return STATUS_SUCCESS; } + /* Check if we are doing Copy-On-Write */ + Segment = MemoryArea->SectionData.Segment; + Cow = Segment->WriteCopy || (Region->Protect & PAGE_IS_WRITECOPY); + + if (!Cow) + { + /* Simply update page protection and we're done */ + MmSetPageProtect(Process, Address, Region->Protect); + return STATUS_SUCCESS; + } + + /* Calculate the new protection & check if we should update the region */ + NewProtect = Region->Protect; + if (NewProtect & PAGE_IS_WRITECOPY) + { + NewProtect &= ~PAGE_IS_WRITECOPY; + if (Region->Protect & PAGE_IS_EXECUTABLE) + NewProtect |= PAGE_EXECUTE_READWRITE; + else + NewProtect |= PAGE_READWRITE; + MmAlterRegion(AddressSpace, (PVOID)MA_GetStartingAddress(MemoryArea), + &MemoryArea->SectionData.RegionListHead, + Address, PAGE_SIZE, Region->Type, NewProtect, + MmAlterViewAttributes); + } + /* * Find the offset of the page */ @@ -1916,23 +1953,6 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, Offset.QuadPart = (ULONG_PTR)PAddress - MA_GetStartingAddress(MemoryArea) + MemoryArea->SectionData.ViewOffset; - Segment = MemoryArea->SectionData.Segment; - Region = MmFindRegion((PVOID)MA_GetStartingAddress(MemoryArea), - &MemoryArea->SectionData.RegionListHead, - Address, NULL); - ASSERT(Region != NULL); - - /* - * Check if we are doing COW - */ - if (!((Segment->WriteCopy) && - (Region->Protect == PAGE_READWRITE || - Region->Protect == PAGE_EXECUTE_READWRITE))) - { - DPRINT("Address 0x%p\n", Address); - return STATUS_ACCESS_VIOLATION; - } - /* Get the page mapping this section offset. */ MmLockSectionSegment(Segment); Entry = MmGetPageEntrySectionSegment(Segment, &Offset); @@ -1947,15 +1967,14 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, { MmUnlockSectionSegment(Segment); /* This is a private page. We must only change the page protection. */ - MmSetPageProtect(Process, PAddress, Region->Protect); + MmSetPageProtect(Process, PAddress, NewProtect); return STATUS_SUCCESS; } /* * Allocate a page */ - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage))) { KeBugCheck(MEMORY_MANAGEMENT); } @@ -1978,15 +1997,10 @@ MmAccessFaultSectionView(PMMSUPPORT AddressSpace, /* * Set the PTE to point to the new page */ - Status = MmCreateVirtualMapping(Process, - PAddress, - Region->Protect, - NewPage); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(MmCreateVirtualMapping(Process, PAddress, NewProtect, NewPage))) { DPRINT1("MmCreateVirtualMapping failed, unable to create virtual mapping, not out of memory\n"); KeBugCheck(MEMORY_MANAGEMENT); - return Status; } if (Process)

1 0

[reactos] 11/12: [NTOS:MM] Share "page.c" between i386 & amd64 builds
by Jérôme Gardou 08 Apr '21

08 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a34d9bcfb62b0e26d5361… commit a34d9bcfb62b0e26d5361671f4324fb2293f5752 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 1 14:03:25 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Apr 8 15:40:37 2021 +0200 [NTOS:MM] Share "page.c" between i386 & amd64 builds --- ntoskrnl/include/internal/amd64/mm.h | 7 - ntoskrnl/mm/amd64/page.c | 621 ----------------------------------- ntoskrnl/ntos.cmake | 2 +- 3 files changed, 1 insertion(+), 629 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index 1afab8fd17b..e62df71cfe0 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -295,13 +295,6 @@ MI_IS_MAPPED_PTE(PMMPTE PointerPte) (PointerPte->u.Hard.PageFrameNumber != 0)); } -FORCEINLINE -VOID -MmInitGlobalKernelPageDirectory(VOID) -{ - /* Nothing to do */ -} - FORCEINLINE BOOLEAN MiIsPdeForAddressValid(PVOID Address) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c deleted file mode 100644 index 3a3c3e4c89a..00000000000 --- a/ntoskrnl/mm/amd64/page.c +++ /dev/null @@ -1,621 +0,0 @@ -/* - * COPYRIGHT: GPL, See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/amd64/page.c - * PURPOSE: Low level memory managment manipulation - * - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * ReactOS Portable Systems Group - */ - -/* INCLUDES ***************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> -#include <mm/ARM3/miarm.h> - -#undef InterlockedExchangePte -#define InterlockedExchangePte(pte1, pte2) \ - InterlockedExchange64((LONG64*)&pte1->u.Long, pte2.u.Long) - -#define PAGE_EXECUTE_ANY (PAGE_EXECUTE|PAGE_EXECUTE_READ|PAGE_EXECUTE_READWRITE|PAGE_EXECUTE_WRITECOPY) -#define PAGE_WRITE_ANY (PAGE_EXECUTE_READWRITE|PAGE_READWRITE|PAGE_EXECUTE_WRITECOPY|PAGE_WRITECOPY) -#define PAGE_WRITECOPY_ANY (PAGE_EXECUTE_WRITECOPY|PAGE_WRITECOPY) - -extern MMPTE HyperTemplatePte; - -/* GLOBALS *****************************************************************/ - -const -ULONG64 -MmProtectToPteMask[32] = -{ - // - // These are the base MM_ protection flags - // - 0, - PTE_READONLY | PTE_ENABLE_CACHE, - PTE_EXECUTE | PTE_ENABLE_CACHE, - PTE_EXECUTE_READ | PTE_ENABLE_CACHE, - PTE_READWRITE | PTE_ENABLE_CACHE, - PTE_WRITECOPY | PTE_ENABLE_CACHE, - PTE_EXECUTE_READWRITE | PTE_ENABLE_CACHE, - PTE_EXECUTE_WRITECOPY | PTE_ENABLE_CACHE, - // - // These OR in the MM_NOCACHE flag - // - 0, - PTE_READONLY | PTE_DISABLE_CACHE, - PTE_EXECUTE | PTE_DISABLE_CACHE, - PTE_EXECUTE_READ | PTE_DISABLE_CACHE, - PTE_READWRITE | PTE_DISABLE_CACHE, - PTE_WRITECOPY | PTE_DISABLE_CACHE, - PTE_EXECUTE_READWRITE | PTE_DISABLE_CACHE, - PTE_EXECUTE_WRITECOPY | PTE_DISABLE_CACHE, - // - // These OR in the MM_DECOMMIT flag, which doesn't seem supported on x86/64/ARM - // - 0, - PTE_READONLY | PTE_ENABLE_CACHE, - PTE_EXECUTE | PTE_ENABLE_CACHE, - PTE_EXECUTE_READ | PTE_ENABLE_CACHE, - PTE_READWRITE | PTE_ENABLE_CACHE, - PTE_WRITECOPY | PTE_ENABLE_CACHE, - PTE_EXECUTE_READWRITE | PTE_ENABLE_CACHE, - PTE_EXECUTE_WRITECOPY | PTE_ENABLE_CACHE, - // - // These OR in the MM_NOACCESS flag, which seems to enable WriteCombining? - // - 0, - PTE_READONLY | PTE_WRITECOMBINED_CACHE, - PTE_EXECUTE | PTE_WRITECOMBINED_CACHE, - PTE_EXECUTE_READ | PTE_WRITECOMBINED_CACHE, - PTE_READWRITE | PTE_WRITECOMBINED_CACHE, - PTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, - PTE_EXECUTE_READWRITE | PTE_WRITECOMBINED_CACHE, - PTE_EXECUTE_WRITECOPY | PTE_WRITECOMBINED_CACHE, -}; - -const -ULONG MmProtectToValue[32] = -{ - PAGE_NOACCESS, - PAGE_READONLY, - PAGE_EXECUTE, - PAGE_EXECUTE_READ, - PAGE_READWRITE, - PAGE_WRITECOPY, - PAGE_EXECUTE_READWRITE, - PAGE_EXECUTE_WRITECOPY, - PAGE_NOACCESS, - PAGE_NOCACHE | PAGE_READONLY, - PAGE_NOCACHE | PAGE_EXECUTE, - PAGE_NOCACHE | PAGE_EXECUTE_READ, - PAGE_NOCACHE | PAGE_READWRITE, - PAGE_NOCACHE | PAGE_WRITECOPY, - PAGE_NOCACHE | PAGE_EXECUTE_READWRITE, - PAGE_NOCACHE | PAGE_EXECUTE_WRITECOPY, - PAGE_NOACCESS, - PAGE_GUARD | PAGE_READONLY, - PAGE_GUARD | PAGE_EXECUTE, - PAGE_GUARD | PAGE_EXECUTE_READ, - PAGE_GUARD | PAGE_READWRITE, - PAGE_GUARD | PAGE_WRITECOPY, - PAGE_GUARD | PAGE_EXECUTE_READWRITE, - PAGE_GUARD | PAGE_EXECUTE_WRITECOPY, - PAGE_NOACCESS, - PAGE_WRITECOMBINE | PAGE_READONLY, - PAGE_WRITECOMBINE | PAGE_EXECUTE, - PAGE_WRITECOMBINE | PAGE_EXECUTE_READ, - PAGE_WRITECOMBINE | PAGE_READWRITE, - PAGE_WRITECOMBINE | PAGE_WRITECOPY, - PAGE_WRITECOMBINE | PAGE_EXECUTE_READWRITE, - PAGE_WRITECOMBINE | PAGE_EXECUTE_WRITECOPY -}; - -/* PRIVATE FUNCTIONS *******************************************************/ - -BOOLEAN -FORCEINLINE -MiIsHyperspaceAddress(PVOID Address) -{ - return ((ULONG64)Address >= HYPER_SPACE && - (ULONG64)Address <= HYPER_SPACE_END); -} - -VOID -MiFlushTlb(PMMPTE Pte, PVOID Address, KIRQL OldIrql) -{ - if (MiIsHyperspaceAddress(Pte)) - { - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); - } - else - { - __invlpg(Address); - } -} - -static -PMMPTE -MiGetPteForProcess( - PEPROCESS Process, - PVOID Address, - BOOLEAN Create, - PKIRQL OldIrql -) -{ - PMMPTE Pte; - PMMPDE Pde; - PMMPPE Ppe; - PMMPXE Pxe; - - *OldIrql = 0; - /* Make sure the process is correct */ - if (Address < MmSystemRangeStart) - { - /* FIXME: Implement this case */ - ASSERT(Process == PsGetCurrentProcess()); - } - else - { - ASSERT((Process == NULL) || (Process == PsGetCurrentProcess())); - } - - Pxe = MiAddressToPxe(Address); - Ppe = MiAddressToPpe(Address); - Pde = MiAddressToPde(Address); - Pte = MiAddressToPte(Address); - - if (Create) - { - /* Check the PXE */ - if (Pxe->u.Long == 0) - { - /* Make it demand zero */ - MI_WRITE_INVALID_PDE(Pxe, DemandZeroPde); - } - - /* Check the PPE */ - if (Ppe->u.Long == 0) - { - /* Make it demand zero */ - MI_WRITE_INVALID_PDE(Ppe, DemandZeroPde); - } - - /* Check the PDE */ - if (Pde->u.Long == 0) - { - /* Make it demand zero */ - MI_WRITE_INVALID_PDE(Pde, DemandZeroPde); - } - } - else - { - /* Check the PXE */ - if (!Pxe->u.Hard.Valid) - return NULL; - - /* Check the PPE */ - if (!Ppe->u.Hard.Valid) - return NULL; - - /* Check the PDE */ - if (!Pde->u.Hard.Valid) - return NULL; - } - - return Pte; -} - -static -ULONG64 -MiGetPteValueForProcess( - PEPROCESS Process, - PVOID Address) -{ - PMMPTE Pte; - ULONG64 PteValue; - KIRQL OldIrql; - - Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); - PteValue = Pte ? Pte->u.Long : 0; - - if (MiIsHyperspaceAddress(Pte)) - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); - - return PteValue; -} - -ULONG -NTAPI -MiGetPteProtection(MMPTE Pte) -{ - ULONG Protect; - - if (!Pte.u.Flush.Valid) - { - Protect = PAGE_NOACCESS; - } - else if (Pte.u.Flush.NoExecute) - { - if (Pte.u.Flush.CopyOnWrite) - Protect = PAGE_WRITECOPY; - else if (Pte.u.Flush.Write) - Protect = PAGE_READWRITE; - else - Protect = PAGE_READONLY; - } - else - { - if (Pte.u.Flush.CopyOnWrite) - Protect = PAGE_EXECUTE_WRITECOPY; - else if (Pte.u.Flush.Write) - Protect = PAGE_EXECUTE_READWRITE; - else - Protect = PAGE_EXECUTE_READ; - } - - if (Pte.u.Flush.CacheDisable) - Protect |= PAGE_NOCACHE; - - if (Pte.u.Flush.WriteThrough) - Protect |= PAGE_WRITETHROUGH; - - // PAGE_GUARD ? - return Protect; -} - -static -VOID -MiSetPteProtection(PMMPTE Pte, ULONG Protection) -{ - Pte->u.Flush.CopyOnWrite = (Protection & PAGE_WRITECOPY_ANY) ? 1 : 0; - Pte->u.Flush.Write = (Protection & PAGE_WRITE_ANY) ? 1 : 0; - Pte->u.Flush.CacheDisable = (Protection & PAGE_NOCACHE) ? 1 : 0; - Pte->u.Flush.WriteThrough = (Protection & PAGE_WRITETHROUGH) ? 1 : 0; - - // FIXME: This doesn't work. Why? - Pte->u.Flush.NoExecute = (Protection & PAGE_EXECUTE_ANY) ? 0 : 1; -} - -/* FUNCTIONS ***************************************************************/ - -PFN_NUMBER -NTAPI -MmGetPfnForProcess(PEPROCESS Process, - PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid ? Pte.u.Hard.PageFrameNumber : 0; -} - -BOOLEAN -NTAPI -MmIsPagePresent(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return (BOOLEAN)Pte.u.Hard.Valid; -} - -BOOLEAN -NTAPI -MmIsDisabledPage(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - - return (Pte.u.Hard.Valid == 0) && - (Pte.u.Trans.Transition == 0) && - (Pte.u.Hard.PageFrameNumber != 0); -} - -BOOLEAN -NTAPI -MmIsPageSwapEntry(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return !Pte.u.Hard.Valid && Pte.u.Soft.Transition; -} - -VOID -NTAPI -MmGetPageFileMapping( - PEPROCESS Process, - PVOID Address, - SWAPENTRY* SwapEntry) -{ - PMMPTE PointerPte; - - ASSERT(Process == PsGetCurrentProcess()); - - PointerPte = MiAddressToPte(Address); - *SwapEntry = PointerPte->u.Long >> 1; -} - -BOOLEAN -NTAPI -MmIsDirtyPage(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - return Pte.u.Hard.Valid && Pte.u.Hard.Dirty; -} - -ULONG -NTAPI -MmGetPageProtect(PEPROCESS Process, PVOID Address) -{ - MMPTE Pte; - - Pte.u.Long = MiGetPteValueForProcess(Process, Address); - - return MiGetPteProtection(Pte); -} - -VOID -NTAPI -MmSetPageProtect(PEPROCESS Process, PVOID Address, ULONG flProtect) -{ - PMMPTE Pte; - MMPTE NewPte; - KIRQL OldIrql; - - Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); - ASSERT(Pte != NULL); - - NewPte = *Pte; - - MiSetPteProtection(&NewPte, flProtect); - - InterlockedExchangePte(Pte, NewPte); - - MiFlushTlb(Pte, Address, OldIrql); -} - -VOID -NTAPI -MmSetCleanPage(PEPROCESS Process, PVOID Address) -{ - PMMPTE Pte; - KIRQL OldIrql; - - Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); - if (!Pte) - { - KeBugCheckEx(MEMORY_MANAGEMENT, 0x1234, (ULONG64)Address, 0, 0); - } - - /* Ckear the dirty bit */ - if (InterlockedBitTestAndReset64((PVOID)Pte, 6)) - { - if (!MiIsHyperspaceAddress(Pte)) - __invlpg(Address); - } - - MiFlushTlb(Pte, Address, OldIrql); -} - -VOID -NTAPI -MmSetDirtyPage(PEPROCESS Process, PVOID Address) -{ - PMMPTE Pte; - KIRQL OldIrql; - - Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); - if (!Pte) - { - KeBugCheckEx(MEMORY_MANAGEMENT, 0x1234, (ULONG64)Address, 0, 0); - } - - /* Ckear the dirty bit */ - if (InterlockedBitTestAndSet64((PVOID)Pte, 6)) - { - if (!MiIsHyperspaceAddress(Pte)) - __invlpg(Address); - } - - MiFlushTlb(Pte, Address, OldIrql); -} - -VOID -NTAPI -MmDeleteVirtualMapping( - PEPROCESS Process, - PVOID Address, - BOOLEAN* WasDirty, - PPFN_NUMBER Page) -{ - PFN_NUMBER Pfn; - PMMPTE Pte; - MMPTE OldPte; - KIRQL OldIrql; - - Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); - - if (Pte) - { - /* Atomically set the entry to zero and get the old value. */ - OldPte.u.Long = InterlockedExchange64((LONG64*)&Pte->u.Long, 0); - - if (OldPte.u.Hard.Valid) - { - Pfn = OldPte.u.Hard.PageFrameNumber; - } - else - Pfn = 0; - } - else - { - OldPte.u.Long = 0; - Pfn = 0; - } - - /* Return information to the caller */ - if (WasDirty) - *WasDirty = (BOOLEAN)OldPte.u.Hard.Dirty; - - if (Page) - *Page = Pfn; - - MiFlushTlb(Pte, Address, OldIrql); -} - -VOID -NTAPI -MmDeletePageFileMapping(PEPROCESS Process, PVOID Address, - SWAPENTRY* SwapEntry) -{ - PMMPTE Pte; - KIRQL OldIrql; - - Pte = MiGetPteForProcess(Process, Address, FALSE, &OldIrql); - if (Pte == NULL) - { - *SwapEntry = 0; - return; - } - - if (Pte->u.Trans.Valid || !Pte->u.Trans.Transition) - { - DPRINT1("Pte %x (want not 1 and 0x800)\n", Pte); - KeBugCheck(MEMORY_MANAGEMENT); - } - - *SwapEntry = Pte->u.Long >> 1; - MI_ERASE_PTE(Pte); - - if (MiIsHyperspaceAddress(Pte)) - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); -} - -NTSTATUS -NTAPI -MmCreatePageFileMapping(PEPROCESS Process, - PVOID Address, - SWAPENTRY SwapEntry) -{ - PMMPTE Pte; - MMPTE PteValue; - KIRQL OldIrql; - - if (Process == NULL && Address < MmSystemRangeStart) - { - DPRINT1("No process\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (Process != NULL && Address >= MmSystemRangeStart) - { - DPRINT1("Setting kernel address with process context\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - if (SwapEntry & (1ull << 63)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* Allocate a PTE */ - Pte = MiGetPteForProcess(Process, Address, TRUE, &OldIrql); - if (Pte == NULL) - { - return STATUS_UNSUCCESSFUL; - } - - NT_ASSERT(Pte->u.Long == 0); - PteValue.u.Long = SwapEntry << 1; - MI_WRITE_INVALID_PTE(Pte, PteValue); - - if (MiIsHyperspaceAddress(Pte)) - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); - - return STATUS_UNSUCCESSFUL; -} - - -NTSTATUS -NTAPI -MmCreateVirtualMappingUnsafe( - PEPROCESS Process, - PVOID Address, - ULONG PageProtection, - PPFN_NUMBER Pages, - ULONG PageCount) -{ - ULONG i; - MMPTE TmplPte, *Pte; - - ASSERT((ULONG_PTR)Address % PAGE_SIZE == 0); - - /* Check if the range is valid */ - if ((Process == NULL && Address < MmSystemRangeStart) || - (Process != NULL && Address > MmHighestUserAddress)) - { - DPRINT1("Address 0x%p is invalid for process %p\n", Address, Process); - ASSERT(FALSE); - } - - TmplPte.u.Long = 0; - TmplPte.u.Hard.Valid = 1; - MiSetPteProtection(&TmplPte, PageProtection); - - TmplPte.u.Flush.Owner = (Address < MmHighestUserAddress) ? 1 : 0; - -//__debugbreak(); - - for (i = 0; i < PageCount; i++) - { - KIRQL OldIrql; - - TmplPte.u.Hard.PageFrameNumber = Pages[i]; - - Pte = MiGetPteForProcess(Process, Address, TRUE, &OldIrql); - -DPRINT("MmCreateVirtualMappingUnsafe, Address=%p, TmplPte=%p, Pte=%p\n", - Address, TmplPte.u.Long, Pte); - - if (InterlockedExchangePte(Pte, TmplPte)) - { - KeInvalidateTlbEntry(Address); - } - - if (MiIsHyperspaceAddress(Pte)) - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Pte), OldIrql); - - Address = (PVOID)((ULONG64)Address + PAGE_SIZE); - } - - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -MmCreateVirtualMapping(PEPROCESS Process, - PVOID Address, - ULONG Protect, - PPFN_NUMBER Pages, - ULONG PageCount) -{ - ULONG i; - - ASSERT((ULONG_PTR)Address % PAGE_SIZE == 0); - - for (i = 0; i < PageCount; i++) - { - if (!MmIsPageInUse(Pages[i])) - { - DPRINT1("Page %x not in use\n", Pages[i]); - KeBugCheck(MEMORY_MANAGEMENT); - } - } - - return MmCreateVirtualMappingUnsafe(Process, Address, Protect, Pages, PageCount); -} - -/* EOF */ diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index d3349f9f808..c392bcd95ec 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -328,6 +328,7 @@ elseif(ARCH STREQUAL "amd64") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/usercall_asm.S) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/config/i386/cmhardwr.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/i386/page.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/amd64/kdx64.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/context.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/cpu.c @@ -339,7 +340,6 @@ elseif(ARCH STREQUAL "amd64") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/spinlock.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/thrdini.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/init.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/page.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/procsup.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/amd64/psctx.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/stubs.c

1 0

[reactos] 10/12: [NTOS:MM] Split MmCreateProcessAddressSpace in two parts
by Jérôme Gardou 08 Apr '21

08 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ea8312617df0219277b7… commit 7ea8312617df0219277b73e84d4452cb2f9f3caf Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 1 15:54:19 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Apr 8 15:40:37 2021 +0200 [NTOS:MM] Split MmCreateProcessAddressSpace in two parts Generic one and arch-specific one. Properly fail if we are out of resources. Restore a lost assert. --- ntoskrnl/include/internal/mm.h | 7 ++ ntoskrnl/mm/ARM3/procsup.c | 141 ++++++++++++----------------------------- ntoskrnl/mm/amd64/page.c | 131 -------------------------------------- ntoskrnl/mm/amd64/procsup.c | 132 ++++++++++++++++++++++++++++++++++++++ ntoskrnl/mm/i386/procsup.c | 98 ++++++++++++++++++++++++++++ ntoskrnl/ntos.cmake | 2 + 6 files changed, 279 insertions(+), 232 deletions(-) diff --git a/ntoskrnl/include/internal/mm.h b/ntoskrnl/include/internal/mm.h index d2cb0123bed..6f9d6f57f40 100644 --- a/ntoskrnl/include/internal/mm.h +++ b/ntoskrnl/include/internal/mm.h @@ -1205,6 +1205,13 @@ MmDeleteVirtualMapping( PPFN_NUMBER Page ); +/* arch/procsup.c ************************************************************/ + +BOOLEAN +MiArchCreateProcessAddressSpace( + _In_ PEPROCESS Process, + _In_ PULONG_PTR DirectoryTableBase); + /* wset.c ********************************************************************/ NTSTATUS diff --git a/ntoskrnl/mm/ARM3/procsup.c b/ntoskrnl/mm/ARM3/procsup.c index eb8e68180d4..23981bcadf1 100644 --- a/ntoskrnl/mm/ARM3/procsup.c +++ b/ntoskrnl/mm/ARM3/procsup.c @@ -999,18 +999,24 @@ MmInitializeProcessAddressSpace(IN PEPROCESS Process, /* Do the same for hyperspace */ PointerPde = MiAddressToPde((PVOID)HYPER_SPACE); PageFrameNumber = PFN_FROM_PTE(PointerPde); - //ASSERT(Process->Pcb.DirectoryTableBase[0] == PageFrameNumber * PAGE_SIZE); // we're not lucky MiInitializePfn(PageFrameNumber, (PMMPTE)PointerPde, TRUE); +#if (_MI_PAGING_LEVELS == 2) + ASSERT(Process->Pcb.DirectoryTableBase[1] == PageFrameNumber * PAGE_SIZE); +#endif #if (_MI_PAGING_LEVELS >= 3) PointerPpe = MiAddressToPpe((PVOID)HYPER_SPACE); PageFrameNumber = PFN_FROM_PTE(PointerPpe); MiInitializePfn(PageFrameNumber, PointerPpe, TRUE); +#if (_MI_PAGING_LEVELS == 3) + ASSERT(Process->Pcb.DirectoryTableBase[1] == PageFrameNumber * PAGE_SIZE); +#endif #endif #if (_MI_PAGING_LEVELS == 4) PointerPxe = MiAddressToPxe((PVOID)HYPER_SPACE); PageFrameNumber = PFN_FROM_PTE(PointerPxe); MiInitializePfn(PageFrameNumber, PointerPxe, TRUE); + ASSERT(Process->Pcb.DirectoryTableBase[1] == PageFrameNumber * PAGE_SIZE); #endif /* Setup the PFN for the PTE for the working set */ @@ -1149,8 +1155,6 @@ MmInitializeHandBuiltProcess2(IN PEPROCESS Process) return STATUS_SUCCESS; } -#ifdef _M_IX86 -/* FIXME: Evaluate ways to make this portable yet arch-specific */ BOOLEAN NTAPI MmCreateProcessAddressSpace(IN ULONG MinWs, @@ -1158,13 +1162,13 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, OUT PULONG_PTR DirectoryTableBase) { KIRQL OldIrql; - PFN_NUMBER PdeIndex, HyperIndex, WsListIndex; - PMMPTE PointerPte; - MMPTE TempPte, PdePte; - ULONG PdeOffset; - PMMPTE SystemTable, HyperTable; + PFN_NUMBER TableBaseIndex, HyperIndex, WsListIndex; ULONG Color; - PMMPFN Pfn1; + + /* Make sure we don't already have a page directory setup */ + ASSERT(Process->Pcb.DirectoryTableBase[0] == 0); + ASSERT(Process->Pcb.DirectoryTableBase[1] == 0); + ASSERT(Process->WorkingSetPage == 0); /* Choose a process color */ Process->NextPageColor = (USHORT)RtlRandom(&MmProcessColorSeed); @@ -1175,22 +1179,25 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, /* Lock PFN database */ OldIrql = MiAcquirePfnLock(); - /* Get a zero page for the PDE, if possible */ + /* + * Get a page for the table base, one for hyper space & one for the working set list. + * The PFNs for these pages will be initialized in MmInitializeProcessAddressSpace, + * when we are already attached to the process. + * The other pages (if any) are allocated in the arch-specific part. + */ Color = MI_GET_NEXT_PROCESS_COLOR(Process); MI_SET_USAGE(MI_USAGE_PAGE_DIRECTORY); - PdeIndex = MiRemoveZeroPageSafe(Color); - if (!PdeIndex) + TableBaseIndex = MiRemoveZeroPageSafe(Color); + if (!TableBaseIndex) { /* No zero pages, grab a free one */ - PdeIndex = MiRemoveAnyPage(Color); + TableBaseIndex = MiRemoveAnyPage(Color); /* Zero it outside the PFN lock */ MiReleasePfnLock(OldIrql); - MiZeroPhysicalPage(PdeIndex); + MiZeroPhysicalPage(TableBaseIndex); OldIrql = MiAcquirePfnLock(); } - - /* Get a zero page for hyperspace, if possible */ MI_SET_USAGE(MI_USAGE_PAGE_DIRECTORY); Color = MI_GET_NEXT_PROCESS_COLOR(Process); HyperIndex = MiRemoveZeroPageSafe(Color); @@ -1204,8 +1211,6 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, MiZeroPhysicalPage(HyperIndex); OldIrql = MiAcquirePfnLock(); } - - /* Get a zero page for the woring set list, if possible */ MI_SET_USAGE(MI_USAGE_PAGE_TABLE); Color = MI_GET_NEXT_PROCESS_COLOR(Process); WsListIndex = MiRemoveZeroPageSafe(Color); @@ -1224,99 +1229,33 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, MiReleasePfnLock(OldIrql); } - /* Switch to phase 1 initialization */ - ASSERT(Process->AddressSpaceInitialized == 0); - Process->AddressSpaceInitialized = 1; - /* Set the base directory pointers */ Process->WorkingSetPage = WsListIndex; - DirectoryTableBase[0] = PdeIndex << PAGE_SHIFT; + DirectoryTableBase[0] = TableBaseIndex << PAGE_SHIFT; DirectoryTableBase[1] = HyperIndex << PAGE_SHIFT; - /* Make sure we don't already have a page directory setup */ - ASSERT(Process->Pcb.DirectoryTableBase[0] == 0); - - /* Get a PTE to map hyperspace */ - PointerPte = MiReserveSystemPtes(1, SystemPteSpace); - ASSERT(PointerPte != NULL); - - /* Build it */ - MI_MAKE_HARDWARE_PTE_KERNEL(&PdePte, - PointerPte, - MM_READWRITE, - HyperIndex); - - /* Set it dirty and map it */ - MI_MAKE_DIRTY_PAGE(&PdePte); - MI_WRITE_VALID_PTE(PointerPte, PdePte); - - /* Now get hyperspace's page table */ - HyperTable = MiPteToAddress(PointerPte); - - /* Now write the PTE/PDE entry for the working set list index itself */ - TempPte = ValidKernelPteLocal; - TempPte.u.Hard.PageFrameNumber = WsListIndex; - PdeOffset = MiAddressToPteOffset(MmWorkingSetList); - HyperTable[PdeOffset] = TempPte; - - /* Let go of the system PTE */ - MiReleaseSystemPtes(PointerPte, 1, SystemPteSpace); - - /* Save the PTE address of the page directory itself */ - Pfn1 = MiGetPfnEntry(PdeIndex); - Pfn1->PteAddress = (PMMPTE)PDE_BASE; - - /* Insert us into the Mm process list */ - OldIrql = MiAcquireExpansionLock(); - InsertTailList(&MmProcessList, &Process->MmProcessLinks); - MiReleaseExpansionLock(OldIrql); - - /* Get a PTE to map the page directory */ - PointerPte = MiReserveSystemPtes(1, SystemPteSpace); - ASSERT(PointerPte != NULL); - - /* Build it */ - MI_MAKE_HARDWARE_PTE_KERNEL(&PdePte, - PointerPte, - MM_READWRITE, - PdeIndex); - - /* Set it dirty and map it */ - MI_MAKE_DIRTY_PAGE(&PdePte); - MI_WRITE_VALID_PTE(PointerPte, PdePte); - - /* Now get the page directory (which we'll double map, so call it a page table */ - SystemTable = MiPteToAddress(PointerPte); - - /* Copy all the kernel mappings */ - PdeOffset = MiGetPdeOffset(MmSystemRangeStart); - RtlCopyMemory(&SystemTable[PdeOffset], - MiAddressToPde(MmSystemRangeStart), - PAGE_SIZE - PdeOffset * sizeof(MMPTE)); - - /* Now write the PTE/PDE entry for hyperspace itself */ - TempPte = ValidKernelPteLocal; - TempPte.u.Hard.PageFrameNumber = HyperIndex; - PdeOffset = MiGetPdeOffset(HYPER_SPACE); - SystemTable[PdeOffset] = TempPte; - - /* Sanity check */ - PdeOffset++; - ASSERT(MiGetPdeOffset(MmHyperSpaceEnd) >= PdeOffset); - - /* Now do the x86 trick of making the PDE a page table itself */ - PdeOffset = MiGetPdeOffset(PTE_BASE); - TempPte.u.Hard.PageFrameNumber = PdeIndex; - SystemTable[PdeOffset] = TempPte; + /* Perform the arch-specific parts */ + if (!MiArchCreateProcessAddressSpace(Process, DirectoryTableBase)) + { + OldIrql = MiAcquirePfnLock(); + MiInsertPageInFreeList(WsListIndex); + MiInsertPageInFreeList(HyperIndex); + MiInsertPageInFreeList(TableBaseIndex); + MiReleasePfnLock(OldIrql); + Process->WorkingSetPage = 0; + DirectoryTableBase[0] = 0; + DirectoryTableBase[1] = 0; + return FALSE; + } - /* Let go of the system PTE */ - MiReleaseSystemPtes(PointerPte, 1, SystemPteSpace); + /* Switch to phase 1 initialization */ + ASSERT(Process->AddressSpaceInitialized == 0); + Process->AddressSpaceInitialized = 1; /* Add the process to the session */ MiSessionAddProcess(Process); return TRUE; } -#endif VOID NTAPI diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index 90a5d74b3b2..3a3c3e4c89a 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -618,135 +618,4 @@ MmCreateVirtualMapping(PEPROCESS Process, return MmCreateVirtualMappingUnsafe(Process, Address, Protect, Pages, PageCount); } -BOOLEAN -NTAPI -MmCreateProcessAddressSpace(IN ULONG MinWs, - IN PEPROCESS Process, - OUT PULONG_PTR DirectoryTableBase) -{ - KIRQL OldIrql; - PFN_NUMBER TableBasePfn, HyperPfn, HyperPdPfn, HyperPtPfn, WorkingSetPfn; - PMMPTE SystemPte; - MMPTE TempPte, PdePte; - ULONG TableIndex; - PMMPTE PageTablePointer; - - /* Make sure we don't already have a page directory setup */ - ASSERT(Process->Pcb.DirectoryTableBase[0] == 0); - ASSERT(Process->Pcb.DirectoryTableBase[1] == 0); - ASSERT(Process->WorkingSetPage == 0); - - /* Choose a process color */ - Process->NextPageColor = (USHORT)RtlRandom(&MmProcessColorSeed); - - /* Setup the hyperspace lock */ - KeInitializeSpinLock(&Process->HyperSpaceLock); - - /* Lock PFN database */ - OldIrql = MiAcquirePfnLock(); - - /* Get a page for the table base and one for hyper space. The PFNs for - these pages will be initialized in MmInitializeProcessAddressSpace, - when we are already attached to the process. */ - TableBasePfn = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(Process)); - HyperPfn = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(Process)); - HyperPdPfn = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(Process)); - HyperPtPfn = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(Process)); - WorkingSetPfn = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(Process)); - - /* Release PFN lock */ - MiReleasePfnLock(OldIrql); - - /* Zero pages */ - MiZeroPhysicalPage(TableBasePfn); - MiZeroPhysicalPage(HyperPfn); - MiZeroPhysicalPage(HyperPdPfn); - MiZeroPhysicalPage(HyperPtPfn); - MiZeroPhysicalPage(WorkingSetPfn); - - /* Set the base directory pointers */ - Process->WorkingSetPage = WorkingSetPfn; - DirectoryTableBase[0] = TableBasePfn << PAGE_SHIFT; - DirectoryTableBase[1] = HyperPfn << PAGE_SHIFT; - - /* Get a PTE to map the page directory */ - SystemPte = MiReserveSystemPtes(1, SystemPteSpace); - ASSERT(SystemPte != NULL); - - /* Get its address */ - PageTablePointer = MiPteToAddress(SystemPte); - - /* Build the PTE for the page directory and map it */ - PdePte = ValidKernelPte; - PdePte.u.Hard.PageFrameNumber = TableBasePfn; - *SystemPte = PdePte; - -/// architecture specific - //MiInitializePageDirectoryForProcess( - - /* Copy the kernel mappings and zero out the rest */ - TableIndex = PXE_PER_PAGE / 2; - RtlZeroMemory(PageTablePointer, TableIndex * sizeof(MMPTE)); - RtlCopyMemory(PageTablePointer + TableIndex, - MiAddressToPxe(0) + TableIndex, - PAGE_SIZE - TableIndex * sizeof(MMPTE)); - - /* Sanity check */ - ASSERT(MiAddressToPxi(MmHyperSpaceEnd) >= TableIndex); - - /* Setup a PTE for the page directory mappings */ - TempPte = ValidKernelPte; - - /* Update the self mapping of the PML4 */ - TableIndex = MiAddressToPxi((PVOID)PXE_SELFMAP); - TempPte.u.Hard.PageFrameNumber = TableBasePfn; - PageTablePointer[TableIndex] = TempPte; - - /* Write the PML4 entry for hyperspace */ - TableIndex = MiAddressToPxi((PVOID)HYPER_SPACE); - TempPte.u.Hard.PageFrameNumber = HyperPfn; - PageTablePointer[TableIndex] = TempPte; - - /* Map the hyperspace PDPT to the system PTE */ - PdePte.u.Hard.PageFrameNumber = HyperPfn; - *SystemPte = PdePte; - __invlpg(PageTablePointer); - - /* Write the hyperspace entry for the first PD */ - TempPte.u.Hard.PageFrameNumber = HyperPdPfn; - PageTablePointer[0] = TempPte; - - /* Map the hyperspace PD to the system PTE */ - PdePte.u.Hard.PageFrameNumber = HyperPdPfn; - *SystemPte = PdePte; - __invlpg(PageTablePointer); - - /* Write the hyperspace entry for the first PT */ - TempPte.u.Hard.PageFrameNumber = HyperPtPfn; - PageTablePointer[0] = TempPte; - - /* Map the hyperspace PT to the system PTE */ - PdePte.u.Hard.PageFrameNumber = HyperPtPfn; - *SystemPte = PdePte; - __invlpg(PageTablePointer); - - /* Write the hyperspace PTE for the working set list index */ - TempPte.u.Hard.PageFrameNumber = WorkingSetPfn; - TableIndex = MiAddressToPti(MmWorkingSetList); - PageTablePointer[TableIndex] = TempPte; - -/// end architecture specific - - /* Release the system PTE */ - MiReleaseSystemPtes(SystemPte, 1, SystemPteSpace); - - /* Switch to phase 1 initialization */ - ASSERT(Process->AddressSpaceInitialized == 0); - Process->AddressSpaceInitialized = 1; - - /* Add the process to the session */ - MiSessionAddProcess(Process); - return TRUE; -} - /* EOF */ diff --git a/ntoskrnl/mm/amd64/procsup.c b/ntoskrnl/mm/amd64/procsup.c new file mode 100644 index 00000000000..4cde151fb9e --- /dev/null +++ b/ntoskrnl/mm/amd64/procsup.c @@ -0,0 +1,132 @@ +/* + * COPYRIGHT: GPL, See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/amd64/procsup.c + * PURPOSE: Low level memory managment manipulation + * + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include <mm/ARM3/miarm.h> + +BOOLEAN +MiArchCreateProcessAddressSpace( + _In_ PEPROCESS Process, + _In_ PULONG_PTR DirectoryTableBase) +{ + KIRQL OldIrql; + PFN_NUMBER TableBasePfn, HyperPfn, HyperPdPfn, HyperPtPfn; + PMMPTE SystemPte; + MMPTE TempPte, PdePte; + ULONG TableIndex; + PMMPTE PageTablePointer; + ULONG PageColor; + + /* Non-arch specific code-path allocated those for us */ + TableBasePfn = DirectoryTableBase[0] >> PAGE_SHIFT; + HyperPfn = DirectoryTableBase[1] >> PAGE_SHIFT; + + /* + * Lock PFN database. Try getting zero pages. + * If that doesn't work, we take the slow path + * outside of the PFN lock. + */ + OldIrql = MiAcquirePfnLock(); + PageColor = MI_GET_NEXT_PROCESS_COLOR(Process); + HyperPdPfn = MiRemoveZeroPageSafe(PageColor); + if(!HyperPdPfn) + { + HyperPdPfn = MiRemoveAnyPage(PageColor); + MiReleasePfnLock(OldIrql); + MiZeroPhysicalPage(HyperPdPfn); + OldIrql = MiAcquirePfnLock(); + } + PageColor = MI_GET_NEXT_PROCESS_COLOR(Process); + HyperPtPfn = MiRemoveZeroPageSafe(PageColor); + if(!HyperPtPfn) + { + HyperPtPfn = MiRemoveAnyPage(PageColor); + MiReleasePfnLock(OldIrql); + MiZeroPhysicalPage(HyperPtPfn); + } + else + { + MiReleasePfnLock(OldIrql); + } + + /* Get a PTE to map the page directory */ + SystemPte = MiReserveSystemPtes(1, SystemPteSpace); + if (!SystemPte) + return FALSE; + + /* Get its address */ + PageTablePointer = MiPteToAddress(SystemPte); + + /* Build the PTE for the page directory and map it */ + MI_MAKE_HARDWARE_PTE_KERNEL(&PdePte, SystemPte, MM_READWRITE, TableBasePfn); + MI_WRITE_VALID_PTE(SystemPte, PdePte); + + /* Copy the kernel mappings and zero out the rest */ + TableIndex = PXE_PER_PAGE / 2; + RtlZeroMemory(PageTablePointer, TableIndex * sizeof(MMPTE)); + RtlCopyMemory(PageTablePointer + TableIndex, + MiAddressToPxe(0) + TableIndex, + PAGE_SIZE - TableIndex * sizeof(MMPTE)); + + /* Sanity check */ + ASSERT(MiAddressToPxi(MmHyperSpaceEnd) >= TableIndex); + + /* Setup a PTE for the page directory mappings */ + TempPte = ValidKernelPte; + + /* Update the self mapping of the PML4 */ + TableIndex = MiAddressToPxi((PVOID)PXE_SELFMAP); + TempPte.u.Hard.PageFrameNumber = TableBasePfn; + PageTablePointer[TableIndex] = TempPte; + + /* Write the PML4 entry for hyperspace */ + TableIndex = MiAddressToPxi((PVOID)HYPER_SPACE); + TempPte.u.Hard.PageFrameNumber = HyperPfn; + PageTablePointer[TableIndex] = TempPte; + + /* Map the hyperspace PDPT to the system PTE */ + PdePte.u.Hard.PageFrameNumber = HyperPfn; + *SystemPte = PdePte; + __invlpg(PageTablePointer); + + /* Write the hyperspace entry for the first PD */ + TempPte.u.Hard.PageFrameNumber = HyperPdPfn; + PageTablePointer[0] = TempPte; + + /* Map the hyperspace PD to the system PTE */ + PdePte.u.Hard.PageFrameNumber = HyperPdPfn; + *SystemPte = PdePte; + __invlpg(PageTablePointer); + + /* Write the hyperspace entry for the first PT */ + TempPte.u.Hard.PageFrameNumber = HyperPtPfn; + PageTablePointer[0] = TempPte; + + /* Map the hyperspace PT to the system PTE */ + PdePte.u.Hard.PageFrameNumber = HyperPtPfn; + *SystemPte = PdePte; + __invlpg(PageTablePointer); + + /* Write the hyperspace PTE for the working set list index */ + TempPte.u.Hard.PageFrameNumber = Process->WorkingSetPage; + TableIndex = MiAddressToPti(MmWorkingSetList); + PageTablePointer[TableIndex] = TempPte; + + /* Release the system PTE */ + MiReleaseSystemPtes(SystemPte, 1, SystemPteSpace); + + return TRUE; +} diff --git a/ntoskrnl/mm/i386/procsup.c b/ntoskrnl/mm/i386/procsup.c new file mode 100644 index 00000000000..8ffaec103c6 --- /dev/null +++ b/ntoskrnl/mm/i386/procsup.c @@ -0,0 +1,98 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD-3-Clause (https://spdx.org/licenses/BSD-3-Clause.html) + * FILE: ntoskrnl/mm/i386/procsup.c + * PURPOSE: Process handling for i386 architecture + * PROGRAMMERS: Jérôme Gardou + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#define MODULE_INVOLVED_IN_ARM3 +#include <mm/ARM3/miarm.h> + +BOOLEAN +MiArchCreateProcessAddressSpace( + _In_ PEPROCESS Process, + _In_ PULONG_PTR DirectoryTableBase) +{ + PFN_NUMBER PdeIndex = DirectoryTableBase[0] >> PAGE_SHIFT; + PFN_NUMBER HyperIndex = DirectoryTableBase[1] >> PAGE_SHIFT; + PMMPTE PointerPte; + MMPTE PdePte, TempPte; + PMMPTE PteTable; + ULONG PdeOffset; + KIRQL OldIrql; + + /* Get a PTE */ + PointerPte = MiReserveSystemPtes(1, SystemPteSpace); + if (!PointerPte) + return FALSE; + PteTable = MiPteToAddress(PointerPte); + + /* Build a page table for hyper space */ + MI_MAKE_HARDWARE_PTE_KERNEL(&PdePte, + PointerPte, + MM_READWRITE, + HyperIndex); + + /* Set it dirty and map it */ + MI_MAKE_DIRTY_PAGE(&PdePte); + MI_WRITE_VALID_PTE(PointerPte, PdePte); + + /* Now write the PTE/PDE entry for the working set list index itself */ + TempPte = ValidKernelPteLocal; + TempPte.u.Hard.PageFrameNumber = Process->WorkingSetPage; + PdeOffset = MiAddressToPteOffset(MmWorkingSetList); + PteTable[PdeOffset] = TempPte; + + /* Now we map the page directory */ + MI_MAKE_HARDWARE_PTE_KERNEL(&PdePte, + PointerPte, + MM_READWRITE, + PdeIndex); + + /* Set it dirty and map it */ + MI_MAKE_DIRTY_PAGE(&PdePte); + *PointerPte = PdePte; + /* We changed the page! */ + __invlpg(PteTable); + + /* Now get the page directory (which we'll double map, so call it a page table) */ + PteTable = MiPteToAddress(PointerPte); + + /* Copy all the kernel mappings */ + PdeOffset = MiGetPdeOffset(MmSystemRangeStart); + RtlCopyMemory(&PteTable[PdeOffset], + MiAddressToPde(MmSystemRangeStart), + PAGE_SIZE - PdeOffset * sizeof(MMPTE)); + + /* Now write the PTE/PDE entry for hyperspace itself */ + TempPte = ValidKernelPteLocal; + TempPte.u.Hard.PageFrameNumber = HyperIndex; + PdeOffset = MiGetPdeOffset(HYPER_SPACE); + PteTable[PdeOffset] = TempPte; + + /* Sanity check */ + PdeOffset++; + ASSERT(MiGetPdeOffset(MmHyperSpaceEnd) >= PdeOffset); + + /* Now do the x86 trick of making the PDE a page table itself */ + PdeOffset = MiGetPdeOffset(PTE_BASE); + TempPte.u.Hard.PageFrameNumber = PdeIndex; + PteTable[PdeOffset] = TempPte; + + /* Let go of the system PTE */ + MiReleaseSystemPtes(PointerPte, 1, SystemPteSpace); + + /* Insert us into the Mm process list */ + OldIrql = MiAcquireExpansionLock(); + InsertTailList(&MmProcessList, &Process->MmProcessLinks); + MiReleaseExpansionLock(OldIrql); + + return TRUE; +} diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 2a098336288..d3349f9f808 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -314,6 +314,7 @@ if(ARCH STREQUAL "i386") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/usercall.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/i386/v86vdm.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/i386/page.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/i386/procsup.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/ARM3/i386/init.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/i386/psctx.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/i386/psldt.c @@ -339,6 +340,7 @@ elseif(ARCH STREQUAL "amd64") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/thrdini.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/init.c ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/page.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/mm/amd64/procsup.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ps/amd64/psctx.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/stubs.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/amd64/usercall.c)

1 0

[reactos] 09/12: [NTOS:MM] Properly track system process hyper space PDE page
by Jérôme Gardou 08 Apr '21

08 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c027d28f95fdbdc09ada… commit 6c027d28f95fdbdc09ada6c0c7f5dc63b4cbe00b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Apr 8 14:36:50 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Apr 8 15:40:37 2021 +0200 [NTOS:MM] Properly track system process hyper space PDE page --- ntoskrnl/mm/ARM3/i386/init.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ntoskrnl/mm/ARM3/i386/init.c b/ntoskrnl/mm/ARM3/i386/init.c index fce53bee2ee..4ad52cf2b80 100644 --- a/ntoskrnl/mm/ARM3/i386/init.c +++ b/ntoskrnl/mm/ARM3/i386/init.c @@ -498,6 +498,7 @@ MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) TempPde = ValidKernelPdeLocal; TempPde.u.Hard.PageFrameNumber = PageFrameIndex; MI_WRITE_VALID_PTE(StartPde, TempPde); + PsGetCurrentProcess()->Pcb.DirectoryTableBase[1] = PageFrameIndex << PAGE_SHIFT; /* Flush the TLB */ KeFlushCurrentTb();

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs