Ros-diffs May 2022

ros-diffs@reactos.org

31 participants
165 discussions

[reactos] 02/02: [PC98VID] Fix video driver settings

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17e0e4428caf08d0b3548… commit 17e0e4428caf08d0b35487b1428531bd9e51b873 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu May 26 23:34:12 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri May 27 18:56:13 2022 +0300 [PC98VID] Fix video driver settings - Store settings in non hardware-profile registry key. - Rename driver file to vgapnp.sys to keep in sync with VBE. - This makes PC-98 video driver working again. Addendum to 073a1ea3 and f03750de. CORE-18201 CORE-17977 --- win32ss/drivers/miniport/pc98vid/CMakeLists.txt | 4 ++-- win32ss/drivers/miniport/pc98vid/pc98disp.inf | 4 ++-- win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf | 6 +++--- win32ss/drivers/miniport/vbe/CMakeLists.txt | 8 ++++++-- win32ss/drivers/miniport/vga_new/CMakeLists.txt | 6 +----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt index db0f8ae4a39..b1966da028d 100644 --- a/win32ss/drivers/miniport/pc98vid/CMakeLists.txt +++ b/win32ss/drivers/miniport/pc98vid/CMakeLists.txt @@ -8,8 +8,8 @@ list(APPEND SOURCE add_library(pc98vid MODULE ${SOURCE} pc98vid.rc) set_module_type(pc98vid kernelmodedriver) -# Actual binary filename is vga.sys -set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vga" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") +# Actual binary filename is vgapnp.sys +set_target_properties(pc98vid PROPERTIES OUTPUT_NAME "vgapnp" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") add_pch(pc98vid pc98vid.h SOURCE) add_importlibs(pc98vid ntoskrnl videoprt) diff --git a/win32ss/drivers/miniport/pc98vid/pc98disp.inf b/win32ss/drivers/miniport/pc98vid/pc98disp.inf index 81a8608625a..d67f9882517 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98disp.inf +++ b/win32ss/drivers/miniport/pc98vid/pc98disp.inf @@ -27,7 +27,7 @@ DefaultDestDir = 12 CopyFiles = pc98vid_CopyFiles.NT [pc98vid_CopyFiles.NT] -vga.sys +vgapnp.sys [Pc98Vid_Inst.NT.Services] AddService = vga, 0x00000002, vga_Service_Inst @@ -36,7 +36,7 @@ AddService = vga, 0x00000002, vga_Service_Inst ServiceType = 1 StartType = 1 ErrorControl = 0 -ServiceBinary = %12%\vga.sys +ServiceBinary = %12%\vgapnp.sys LoadOrderGroup = Video [vga.SoftwareSettings] diff --git a/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf b/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf index becce43fdff..753dfb80bf4 100644 --- a/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf +++ b/win32ss/drivers/miniport/pc98vid/pc98vid_reg.inf @@ -2,9 +2,9 @@ [AddReg] HKLM,"SYSTEM\CurrentControlSet\Services\vga","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\vga","Group",0x00000000,"Video Save" -HKLM,"SYSTEM\CurrentControlSet\Services\vga","ImagePath",0x00020000,"system32\drivers\vga.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\vga","ImagePath",0x00020000,"system32\drivers\vgapnp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\vga","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\vga","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Services\vga\Device0","VgaCompatible",0x00010001,1 diff --git a/win32ss/drivers/miniport/vbe/CMakeLists.txt b/win32ss/drivers/miniport/vbe/CMakeLists.txt index 415c9cc8d4f..3b79632d850 100644 --- a/win32ss/drivers/miniport/vbe/CMakeLists.txt +++ b/win32ss/drivers/miniport/vbe/CMakeLists.txt @@ -9,5 +9,9 @@ set_module_type(vgapnp kernelmodedriver) add_importlibs(vgapnp videoprt) add_pch(vgapnp vbemp.h SOURCE) target_link_libraries(vgapnp libcntpr) -add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) -add_registry_inf(vbemp_reg.inf) + +# pc98vid takes place of vga service on PC-98 platform +if(NOT SARCH STREQUAL "pc98") + add_cd_file(TARGET vgapnp DESTINATION reactos/system32/drivers FOR all) + add_registry_inf(vbemp_reg.inf) +endif() diff --git a/win32ss/drivers/miniport/vga_new/CMakeLists.txt b/win32ss/drivers/miniport/vga_new/CMakeLists.txt index b0e304ba906..b278c71e87e 100644 --- a/win32ss/drivers/miniport/vga_new/CMakeLists.txt +++ b/win32ss/drivers/miniport/vga_new/CMakeLists.txt @@ -15,8 +15,4 @@ target_link_libraries(vga libcntpr) set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) add_pch(vga vga.h SOURCE) - -# pc98vid takes place of vga.sys on PC-98 platform -if(NOT SARCH STREQUAL "pc98") - add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all) -endif() +add_cd_file(TARGET vga DESTINATION reactos/system32/drivers FOR all)

2 years, 7 months

[reactos] 01/02: [XBOXVMP] Fix video driver settings

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5471363801a2faf160579… commit 5471363801a2faf160579615e663e18a4e5c206d Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu May 26 02:48:39 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Fri May 27 18:54:20 2022 +0300 [XBOXVMP] Fix video driver settings - Store settings in non hardware-profile registry key. - This makes Xbox video driver working again. Addendum to f03750de. CORE-16216 --- win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf b/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf index e7c2a3c5fdf..43d659323e8 100644 --- a/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf +++ b/win32ss/drivers/miniport/xboxvmp/xboxvmp_reg.inf @@ -7,7 +7,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10DE&DEV_02A0&SUBSYS_00000000&REV_A1\0000","Service",0x00000000,"XboxVmp" -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" ; This is not true but it allows to use 3rd party drivers while having the XboxVmp driver installed -HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\XboxVmp\Device0","VgaCompatible",0x00010001,1 +HKLM,"SYSTEM\CurrentControlSet\Services\XboxVmp\Device0","VgaCompatible",0x00010001,1

2 years, 7 months

[reactos] 01/01: [CMAKE] Fix buildbot builders

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5a6101ca03514c292dc1… commit a5a6101ca03514c292dc1d2c0cc8d9145c223627 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri May 27 01:48:52 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 27 01:48:52 2022 +0300 [CMAKE] Fix buildbot builders --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b05726a694..63353f0c58b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,8 @@ add_definitions( # There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime. file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR}) -if (NOT MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")) +if (NOT MSVC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0") + OR (CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0"))) # Thankfully, GCC has this add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=) add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=)

2 years, 7 months

[reactos] 02/02: [CMAKE] Do not use USE_CLANG_CL variable in CMake scripts

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=447ef2aa4a15adfb4060b… commit 447ef2aa4a15adfb4060b72383a34001a14d13ac Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu May 26 02:03:50 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 27 01:37:37 2022 +0300 [CMAKE] Do not use USE_CLANG_CL variable in CMake scripts --- CMakeLists.txt | 3 ++- base/applications/network/CMakeLists.txt | 4 +--- base/applications/network/telnet/CMakeLists.txt | 2 +- base/services/rpcss/CMakeLists.txt | 2 +- base/services/wlansvc/CMakeLists.txt | 2 +- base/setup/usetup/CMakeLists.txt | 2 +- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- dll/3rdparty/libtirpc/CMakeLists.txt | 2 +- drivers/wdm/audio/backpln/portcls/CMakeLists.txt | 2 +- sdk/cmake/msvc.cmake | 16 ++++++++-------- sdk/lib/3rdparty/stlport/CMakeLists.txt | 2 +- sdk/lib/crt/stdlib/stdlib.cmake | 2 +- subsystems/mvdm/asm16.cmake | 2 +- win32ss/printing/base/spoolsv/CMakeLists.txt | 2 +- 14 files changed, 23 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40adc041d20..2b05726a694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -245,7 +245,8 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to # Arch Options if(ARCH STREQUAL "i386") - if(NOT USE_CLANG_CL) + # clang-cl defines this one for itself + if(NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_definitions(-D_M_IX86) endif() add_definitions(-D_X86_ -D__i386__ -Di386) diff --git a/base/applications/network/CMakeLists.txt b/base/applications/network/CMakeLists.txt index 46246108408..4f95614999e 100644 --- a/base/applications/network/CMakeLists.txt +++ b/base/applications/network/CMakeLists.txt @@ -10,9 +10,7 @@ add_subdirectory(netstat) add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) -if(NOT USE_CLANG_CL) - add_subdirectory(telnet) -endif() +add_subdirectory(telnet) add_subdirectory(tracert) add_subdirectory(whois) add_subdirectory(wlanconf) diff --git a/base/applications/network/telnet/CMakeLists.txt b/base/applications/network/telnet/CMakeLists.txt index 1af3dfefe26..8d0de5ac306 100644 --- a/base/applications/network/telnet/CMakeLists.txt +++ b/base/applications/network/telnet/CMakeLists.txt @@ -35,7 +35,7 @@ if (NOT MSVC) target_compile_definitions(telnet PRIVATE _CRT_NONSTDC_NO_DEPRECATE) endif() -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(telnet PRIVATE -Wno-restrict $<$<COMPILE_LANGUAGE:CXX>:-Wno-narrowing>) endif() diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index 347356773c3..a8141072143 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -16,7 +16,7 @@ list(APPEND SOURCE include_directories(${REACTOS_BINARY_DIR}/sdk/include/reactos/wine) add_executable(rpcss ${SOURCE} rpcss.rc) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(rpcss PRIVATE "-Wno-cast-calling-convention") endif() diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt index 0ac461728e5..f1023aff221 100644 --- a/base/services/wlansvc/CMakeLists.txt +++ b/base/services/wlansvc/CMakeLists.txt @@ -10,7 +10,7 @@ list(APPEND SOURCE add_executable(wlansvc ${SOURCE} wlansvc.rc) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(wlansvc PRIVATE "-Wno-cast-calling-convention") endif() diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index 35d4ac099ee..1ef57a42082 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -30,7 +30,7 @@ list(APPEND SOURCE add_executable(usetup ${SOURCE} usetup.rc) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(usetup PRIVATE "-Wno-invalid-source-encoding") endif() diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 00d6dc8271b..c00416befbc 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -211,7 +211,7 @@ add_library(freeldr_common ${FREELDR_NTLDR_SOURCE} ${FREELDR_BOOTMGR_SOURCE}) -if(USE_CLANG_CL) +if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang") # We need to reduce the binary size target_compile_options(freeldr_common PRIVATE "/Os") endif() @@ -219,7 +219,7 @@ if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox") # Prevent a warning when doing a memcmp with address 0 set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") endif() -if(ARCH STREQUAL "amd64" AND NOT MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") # Prevent using SSE (not support in freeldr) target_compile_options(freeldr_common PUBLIC -mno-sse) endif() diff --git a/dll/3rdparty/libtirpc/CMakeLists.txt b/dll/3rdparty/libtirpc/CMakeLists.txt index 0975514febf..a0cb36ce8eb 100644 --- a/dll/3rdparty/libtirpc/CMakeLists.txt +++ b/dll/3rdparty/libtirpc/CMakeLists.txt @@ -97,7 +97,7 @@ if(MSVC) # Disable warning C4273: 'strtok_s': inconsistent dll linkage # Disable warning C4313: 'fprintf': '%x' in format string conflicts with argument 2 of type 'HANDLE' target_compile_options(libtirpc PRIVATE /wd4273 /wd4313) - if (NOT USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") target_compile_options(libtirpc PRIVATE /wd4101 /wd4133 /wd4473 /wd4477) endif() else() diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index a873b75fe2a..a2bd9b19d4e 100644 --- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -56,7 +56,7 @@ add_library(portcls MODULE portcls.rc ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(portcls PRIVATE "-Wno-missing-braces") endif() diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 2d482227730..ede1597a454 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -33,14 +33,14 @@ endif() add_definitions(/D__STDC__=1) # Ignore any "standard" include paths, and do not use any default CRT library. -if(NOT USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") add_compile_options(/X /Zl) endif() # Disable buffer security checks by default. add_compile_options(/GS-) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(CMAKE_CL_SHOWINCLUDES_PREFIX "Note: including file: ") endif() @@ -48,7 +48,7 @@ endif() # default for older compilers. See CORE-6507 if(ARCH STREQUAL "i386") # Clang's IA32 means i386, which doesn't have cmpxchg8b - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options(-march=${OARCH}) else() add_compile_options(/arch:IA32) @@ -93,7 +93,7 @@ if (MSVC_IDE) endif() # On x86 Debug builds, if it's not Clang-CL or msbuild, treat all warnings as errors -if ((ARCH STREQUAL "i386") AND (CMAKE_BUILD_TYPE STREQUAL "Debug") AND (NOT USE_CLANG_CL) AND (NOT MSVC_IDE)) +if ((ARCH STREQUAL "i386") AND (CMAKE_BUILD_TYPE STREQUAL "Debug") AND (CMAKE_C_COMPILER_ID STREQUAL "MSVC") AND (NOT MSVC_IDE)) set(TREAT_ALL_WARNINGS_AS_ERRORS=TRUE) endif() @@ -140,7 +140,7 @@ endif() # - C4115: named type definition in parentheses add_compile_options(/w14115) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options("$<$<COMPILE_LANGUAGE:C,CXX>:-nostdinc;-Wno-multichar;-Wno-char-subscripts;-Wno-microsoft-enum-forward-reference;-Wno-pragma-pack;-Wno-microsoft-anon-tag;-Wno-parentheses-equality;-Wno-unknown-pragmas>") endif() @@ -152,7 +152,7 @@ add_compile_definitions($<$<CONFIG:Release>:NDEBUG>) # Hotpatchable images if(ARCH STREQUAL "i386") - if(NOT USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") add_compile_options(/hotpatch) endif() set(_hotpatch_link_flag "/FUNCTIONPADMIN:5") @@ -432,7 +432,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres get_defines(_defines) get_includes(_includes) - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(_no_std_includes_flag "-nostdinc") else() set(_no_std_includes_flag "/X") @@ -519,7 +519,7 @@ function(add_linker_script _target _linker_script_file) # Create the additional linker response file. set(_generated_file "${_generated_file_path_prefix}.rsp") - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(_no_std_includes_flag "-nostdinc") else() set(_no_std_includes_flag "/X") diff --git a/sdk/lib/3rdparty/stlport/CMakeLists.txt b/sdk/lib/3rdparty/stlport/CMakeLists.txt index b2f245bb62f..2fb3f5643a5 100644 --- a/sdk/lib/3rdparty/stlport/CMakeLists.txt +++ b/sdk/lib/3rdparty/stlport/CMakeLists.txt @@ -40,7 +40,7 @@ add_library(stlport src/cxa.c src/c_locale.c) -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(stlport PRIVATE -Wno-missing-braces -Wno-unused-local-typedef) target_compile_options(stlport PRIVATE -Wno-infinite-recursion -Wno-deprecated-register) target_compile_options(stlport PRIVATE -Wno-tautological-unsigned-zero-compare) diff --git a/sdk/lib/crt/stdlib/stdlib.cmake b/sdk/lib/crt/stdlib/stdlib.cmake index aaf745c4519..3ab02840e34 100644 --- a/sdk/lib/crt/stdlib/stdlib.cmake +++ b/sdk/lib/crt/stdlib/stdlib.cmake @@ -32,7 +32,7 @@ list(APPEND CRT_STDLIB_SOURCE stdlib/wmakpath_s.c ) -if(USE_CLANG_CL) +if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang") if(ARCH STREQUAL "i386") list(APPEND CRT_STDLIB_ASM_SOURCE stdlib/clang-alias.s diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake index 3848aa1f129..a2df957c080 100644 --- a/subsystems/mvdm/asm16.cmake +++ b/subsystems/mvdm/asm16.cmake @@ -100,7 +100,7 @@ function(add_asm16_bin _target _binary_file _base_address) ## ## All this part is the same as CreateBootSectorTarget ## - if(USE_CLANG_CL) + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(_no_std_includes_flag "-nostdinc") else() set(_no_std_includes_flag "/X") diff --git a/win32ss/printing/base/spoolsv/CMakeLists.txt b/win32ss/printing/base/spoolsv/CMakeLists.txt index 6602eba9fab..566fe63f107 100644 --- a/win32ss/printing/base/spoolsv/CMakeLists.txt +++ b/win32ss/printing/base/spoolsv/CMakeLists.txt @@ -35,7 +35,7 @@ set_target_properties(spoolsv ENABLE_EXPORTS TRUE DEFINE_SYMBOL "") -if(USE_CLANG_CL) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(spoolsv PRIVATE "-Wno-cast-calling-convention") endif()

2 years, 7 months

[reactos] 01/02: [CMAKE] Elimitate the use of GCC and CLANG variables

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f155b9377f4e8b32d9378… commit f155b9377f4e8b32d93787a27924e0860e57dbf8 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Thu May 26 01:37:23 2022 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri May 27 01:37:34 2022 +0300 [CMAKE] Elimitate the use of GCC and CLANG variables --- CMakeLists.txt | 5 ++--- base/services/nfsd/CMakeLists.txt | 2 +- boot/rtl/blrtl.cmake | 2 +- dll/3rdparty/libxslt/CMakeLists.txt | 2 +- dll/3rdparty/mbedtls/CMakeLists.txt | 4 +++- dll/opengl/glu32/CMakeLists.txt | 14 ++++++------ drivers/filesystems/ext2/CMakeLists.txt | 25 +++++++++------------- drivers/filesystems/fastfat_new/CMakeLists.txt | 2 +- drivers/filesystems/nfs/CMakeLists.txt | 10 +++++---- drivers/filesystems/udfs/CMakeLists.txt | 16 ++++++-------- drivers/storage/class/cdrom/CMakeLists.txt | 7 ++---- drivers/storage/class/classpnp/CMakeLists.txt | 2 +- drivers/storage/class/disk/CMakeLists.txt | 5 +---- drivers/storage/ide/uniata/CMakeLists.txt | 15 ++++++------- drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt | 2 +- modules/rostests/apitests/compiler/CMakeLists.txt | 4 ++-- modules/rostests/apitests/crt/CMakeLists.txt | 2 +- modules/rostests/winetests/advapi32/CMakeLists.txt | 2 +- modules/rostests/winetests/kernel32/CMakeLists.txt | 2 +- modules/rostests/winetests/msvcrt/CMakeLists.txt | 7 ++---- modules/rostests/winetests/ntdll/CMakeLists.txt | 2 +- modules/rostests/winetests/rpcrt4/CMakeLists.txt | 9 ++++---- modules/rostests/winetests/winmm/CMakeLists.txt | 2 +- modules/rostests/winetests/ws2_32/CMakeLists.txt | 2 +- ntoskrnl/CMakeLists.txt | 7 +----- sdk/cmake/config.cmake | 24 ++------------------- sdk/cmake/gcc.cmake | 4 ++-- sdk/lib/3rdparty/freetype/CMakeLists.txt | 4 +++- sdk/lib/3rdparty/libxml2/CMakeLists.txt | 2 +- sdk/lib/crt/msvcrtex.cmake | 4 ++-- sdk/lib/drivers/wdf/CMakeLists.txt | 2 +- sdk/lib/rtl/CMakeLists.txt | 2 +- 32 files changed, 78 insertions(+), 116 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2168dcb2422..40adc041d20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,8 +76,7 @@ add_definitions( # There doesn't seem to be a standard for __FILE__ being relative or absolute, so detect it at runtime. file(RELATIVE_PATH _PATH_PREFIX ${REACTOS_BINARY_DIR} ${REACTOS_SOURCE_DIR}) -if (GCC AND ((CMAKE_C_COMPILER_ID STREQUAL "GNU") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0.0") - OR ((CMAKE_C_COMPILER_ID STREQUAL "Clang") AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.0")))) +if (NOT MSVC AND (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")) # Thankfully, GCC has this add_compile_options(-ffile-prefix-map=${REACTOS_SOURCE_DIR}=) add_compile_options(-ffile-prefix-map=${_PATH_PREFIX}=) @@ -229,7 +228,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to message(WARNING "-- Disabling precompiled headers support (ccache).") option(PCH "Whether to use precompiled headers" OFF) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) - elseif(GCC) + elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU") message(WARNING "-- Disabling precompiled headers on GCC by default CORE-17108.") option(PCH "Whether to use precompiled headers" OFF) else() diff --git a/base/services/nfsd/CMakeLists.txt b/base/services/nfsd/CMakeLists.txt index 6a96dd66c80..9d079e00c46 100644 --- a/base/services/nfsd/CMakeLists.txt +++ b/base/services/nfsd/CMakeLists.txt @@ -48,7 +48,7 @@ list(APPEND SOURCE add_executable(nfsd ${SOURCE} nfsd.rc) -if(MSVC AND (NOT USE_CLANG_CL)) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") # Disable warning C4477 (printf format warnings) target_compile_options(nfsd PRIVATE /wd4477) else() diff --git a/boot/rtl/blrtl.cmake b/boot/rtl/blrtl.cmake index 692727892b0..7f65e76343b 100644 --- a/boot/rtl/blrtl.cmake +++ b/boot/rtl/blrtl.cmake @@ -7,7 +7,7 @@ add_definitions( set(NTOS_RTL_SOURCE_DIR "${REACTOS_SOURCE_DIR}/sdk/lib/rtl") include_directories(${NTOS_RTL_SOURCE_DIR}) -if (GCC) +if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") # Enable this again. CORE-17637 add_compile_options(-Wunused-result) endif() diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt index 5a4910b6f3d..86af9b2003e 100644 --- a/dll/3rdparty/libxslt/CMakeLists.txt +++ b/dll/3rdparty/libxslt/CMakeLists.txt @@ -43,7 +43,7 @@ if(MSVC) add_importlibs(libxslt ntdll) endif() -if(GCC OR CLANG) +if(NOT MSVC) target_compile_options(libxslt PRIVATE -Wno-misleading-indentation -Wno-pointer-sign -Wno-unused-function) endif() diff --git a/dll/3rdparty/mbedtls/CMakeLists.txt b/dll/3rdparty/mbedtls/CMakeLists.txt index e43e1e8b732..a3cc7ab97a8 100644 --- a/dll/3rdparty/mbedtls/CMakeLists.txt +++ b/dll/3rdparty/mbedtls/CMakeLists.txt @@ -102,6 +102,8 @@ add_cd_file(TARGET mbedtls DESTINATION reactos/system32 FOR all) if(NOT MSVC) target_compile_options(mbedtls PRIVATE -Wno-pointer-sign -Wno-unused-function) -elseif(USE_CLANG_CL) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(mbedtls PRIVATE -Wno-tautological-constant-compare) endif() diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index ffa8a540818..76ace8871bf 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -120,19 +120,19 @@ target_link_libraries(glu32 cpprt) set_module_type(glu32 win32dll) -if(NOT MSVC) - 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-write-strings) 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() +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(glu32 PRIVATE -Wno-write-strings) + 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() + 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/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index e07135b419d..4a79c51e139 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -88,26 +88,21 @@ list(APPEND SOURCE add_library(ext2fs MODULE ${SOURCE} ext2fs.rc) -if(MSVC) - if (NOT CLANG) - # Disable warning C4101: 'i': unreferenced local variable - # Disable warning C4189: 'sbi': local variable is initialized but not referenced - # Disable warning C4267: '=': conversion from 'size_t' to 'USHORT', possible loss of data - target_compile_options(ext2fs PRIVATE /wd4101 /wd4189 /wd4267) - endif() -else() - target_compile_options(ext2fs PRIVATE - -Wno-pointer-sign -Wno-unused-function - -Wno-unused-variable -Wno-missing-braces) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") + # Disable warning C4101: 'i': unreferenced local variable + # Disable warning C4189: 'sbi': local variable is initialized but not referenced + # Disable warning C4267: '=': conversion from 'size_t' to 'USHORT', possible loss of data + target_compile_options(ext2fs PRIVATE /wd4101 /wd4189 /wd4267) endif() -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - target_compile_options(ext2fs PRIVATE -Wno-unused-but-set-variable) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(ext2fs PRIVATE + -Wno-pointer-sign -Wno-unused-function -Wno-unused-variable -Wno-missing-braces -Wno-unused-but-set-variable) endif() -if(CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(ext2fs PRIVATE - -Wno-unused-value -Wno-parentheses-equality + -Wno-parentheses-equality -Wno-incompatible-pointer-types-discards-qualifiers "-Wno-#pragma-messages;-Wno-cast-calling-convention") endif() diff --git a/drivers/filesystems/fastfat_new/CMakeLists.txt b/drivers/filesystems/fastfat_new/CMakeLists.txt index c425ff0ad3e..d00e6eca900 100644 --- a/drivers/filesystems/fastfat_new/CMakeLists.txt +++ b/drivers/filesystems/fastfat_new/CMakeLists.txt @@ -38,7 +38,7 @@ list(APPEND SOURCE add_library(fastfat MODULE ${SOURCE} fastfat.rc) set_module_type(fastfat kernelmodedriver) target_link_libraries(fastfat ${PSEH_LIB} memcmp) -if(GDB AND NOT CLANG) +if(GDB AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(fastfat PRIVATE -O0) endif() add_importlibs(fastfat ntoskrnl hal) diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 10b71000757..9eb45900649 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -14,12 +14,14 @@ set_module_type(nfs41_driver kernelmodedriver) target_link_libraries(nfs41_driver ntoskrnl_vista rdbsslib rxce copysup memcmp ${PSEH_LIB}) add_importlibs(nfs41_driver ntoskrnl hal) -if(GCC OR CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(nfs41_driver PRIVATE "-Wno-switch") - if(CLANG) - target_compile_options(nfs41_driver PRIVATE "-Wno-unused-value") - endif() endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(nfs41_driver PRIVATE "-Wno-unused-value") +endif() + set_property(TARGET nfs41_driver PROPERTY C_STANDARD 90) add_cd_file(TARGET nfs41_driver DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/udfs/CMakeLists.txt b/drivers/filesystems/udfs/CMakeLists.txt index 1c4a396b879..b1bfdd9db84 100644 --- a/drivers/filesystems/udfs/CMakeLists.txt +++ b/drivers/filesystems/udfs/CMakeLists.txt @@ -41,19 +41,17 @@ list(APPEND SOURCE add_library(udfs MODULE ${SOURCE} udffs.rc) -if(MSVC) - if(USE_CLANG_CL) - target_compile_options(udfs PRIVATE -Wno-extern-c-compat -Wno-unused-value) - target_compile_options(udfs PRIVATE -Wno-tautological-constant-out-of-range-compare) - 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() -endif() - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") target_compile_options(udfs PRIVATE -Wno-unused-but-set-variable) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(udfs PRIVATE -Wno-extern-c-compat -Wno-unused-value) + target_compile_options(udfs PRIVATE -Wno-tautological-constant-out-of-range-compare) + 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() + set_module_type(udfs kernelmodedriver) target_link_libraries(udfs ${PSEH_LIB}) add_importlibs(udfs ntoskrnl hal) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index d4bd2dd924c..fc04713730b 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -20,15 +20,12 @@ list(APPEND SOURCE add_library(cdrom MODULE ${SOURCE} cdrom.rc) set_module_type(cdrom kernelmodedriver) -if(GCC OR CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(cdrom PRIVATE -Wno-format -Wno-unused-variable -Wno-pointer-sign) -endif() - -if(GCC) target_compile_options(cdrom PRIVATE -Wno-unknown-pragmas -Wno-incompatible-pointer-types -Wno-switch) endif() -if(CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(cdrom PRIVATE -Wno-enum-conversion -Wno-tautological-constant-compare) endif() diff --git a/drivers/storage/class/classpnp/CMakeLists.txt b/drivers/storage/class/classpnp/CMakeLists.txt index a1cee352784..fadc6ff48c7 100644 --- a/drivers/storage/class/classpnp/CMakeLists.txt +++ b/drivers/storage/class/classpnp/CMakeLists.txt @@ -41,7 +41,7 @@ target_compile_definitions(classpnp PRIVATE CLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512 CLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) -if(GCC) +if(NOT MSVC) target_compile_options(classpnp PRIVATE -Wno-pointer-to-int-cast -Wno-switch) endif() diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index 68407eafe56..5250b8cdec3 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -16,11 +16,8 @@ target_compile_definitions(disk PUBLIC _WIN32_WINNT=0x602 NTDDI_VERSION=0x06020000) # NTDDI_WIN8 -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(disk PRIVATE -Wno-format -Wno-pointer-sign) -endif() - -if(GCC) target_compile_options(disk PRIVATE -Wno-pointer-to-int-cast -Wno-switch) endif() diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index 6b9cdcff5e9..4a78222a28b 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -21,21 +21,18 @@ list(APPEND SOURCE add_library(uniata MODULE ${SOURCE} idedma.rc) -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") - endif() -endif() - if(MSVC) # Disable warning C4267: '=': conversion from 'size_t' to 'USHORT', possible loss of data # Disable warning C4838: conversion from 'int' to 'ULONG' requires a narrowing conversion target_compile_options(uniata PRIVATE /wd4267 /wd4838) endif() -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - target_compile_options(uniata PRIVATE -Wno-unused-but-set-variable) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(uniata PRIVATE -Wno-narrowing -Wno-unused-but-set-variable) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(uniata PRIVATE -Wno-unused-const-variable) endif() add_pch(uniata stdafx.h SOURCE) diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index eda3493b308..609babac1f4 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(cmipci stdunk libcntpr uuid) set_module_type(cmipci wdmdriver UNICODE) add_importlibs(cmipci portcls hal ntoskrnl) -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(cmipci PRIVATE -Wno-write-strings -Wno-switch) endif() diff --git a/modules/rostests/apitests/compiler/CMakeLists.txt b/modules/rostests/apitests/compiler/CMakeLists.txt index 1d98f54ddf6..163a0220c03 100644 --- a/modules/rostests/apitests/compiler/CMakeLists.txt +++ b/modules/rostests/apitests/compiler/CMakeLists.txt @@ -1,5 +1,5 @@ -if (NOT (GCC AND (ARCH STREQUAL "amd64"))) +if (MSVC OR ARCH STREQUAL "i386") #FIXME _setjmp definitions in CRT headers is wrong add_subdirectory(ms) list(APPEND SOURCE ms_seh.c) @@ -12,7 +12,7 @@ list(APPEND SOURCE testlist.c) add_executable(compiler_apitest ${SOURCE}) -if (NOT (GCC AND (ARCH STREQUAL "amd64"))) +if (MSVC OR ARCH STREQUAL "i386") target_link_libraries(compiler_apitest ms_seh_test) endif() target_link_libraries(compiler_apitest wine ${PSEH_LIB}) diff --git a/modules/rostests/apitests/crt/CMakeLists.txt b/modules/rostests/apitests/crt/CMakeLists.txt index 7af9e3a2463..6220856065e 100644 --- a/modules/rostests/apitests/crt/CMakeLists.txt +++ b/modules/rostests/apitests/crt/CMakeLists.txt @@ -1,5 +1,5 @@ -if (GCC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") add_compile_options(-fno-builtin) endif() diff --git a/modules/rostests/winetests/advapi32/CMakeLists.txt b/modules/rostests/winetests/advapi32/CMakeLists.txt index 34a3055167b..c6b8953189a 100644 --- a/modules/rostests/winetests/advapi32/CMakeLists.txt +++ b/modules/rostests/winetests/advapi32/CMakeLists.txt @@ -21,7 +21,7 @@ add_executable(advapi32_winetest ${SOURCE} ${PCH_SKIP_SOURCE}) -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(advapi32_winetest PRIVATE "-Wno-format") endif() diff --git a/modules/rostests/winetests/kernel32/CMakeLists.txt b/modules/rostests/winetests/kernel32/CMakeLists.txt index 44c24f653fb..862aaed9076 100644 --- a/modules/rostests/winetests/kernel32/CMakeLists.txt +++ b/modules/rostests/winetests/kernel32/CMakeLists.txt @@ -56,7 +56,7 @@ if(MSVC) endif() endif() -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(kernel32_winetest PRIVATE "-Wno-format") endif() diff --git a/modules/rostests/winetests/msvcrt/CMakeLists.txt b/modules/rostests/winetests/msvcrt/CMakeLists.txt index f05f14bd28a..44f4b3bf9cb 100644 --- a/modules/rostests/winetests/msvcrt/CMakeLists.txt +++ b/modules/rostests/winetests/msvcrt/CMakeLists.txt @@ -27,11 +27,8 @@ target_compile_definitions(msvcrt_winetest PRIVATE _CRT_NONSTDC_NO_DEPRECATE __msvcrt_ulong=ULONG) -if ((NOT MSVC) OR USE_CLANG_CL) - if (NOT USE_CLANG_CL) - target_compile_options(msvcrt_winetest PRIVATE -Wno-stringop-truncation) - endif() - target_compile_options(msvcrt_winetest PRIVATE -Wno-format) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(msvcrt_winetest PRIVATE -Wno-format -Wno-stringop-truncation) endif() set_module_type(msvcrt_winetest win32cui) diff --git a/modules/rostests/winetests/ntdll/CMakeLists.txt b/modules/rostests/winetests/ntdll/CMakeLists.txt index b835ed34331..c5a886481e7 100644 --- a/modules/rostests/winetests/ntdll/CMakeLists.txt +++ b/modules/rostests/winetests/ntdll/CMakeLists.txt @@ -40,7 +40,7 @@ if(MSVC AND ARCH STREQUAL "amd64") target_compile_options(ntdll_winetest PRIVATE /wd4334) endif() -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(ntdll_winetest PRIVATE "-Wno-format") endif() diff --git a/modules/rostests/winetests/rpcrt4/CMakeLists.txt b/modules/rostests/winetests/rpcrt4/CMakeLists.txt index f764a4b89c7..753de69ef8b 100644 --- a/modules/rostests/winetests/rpcrt4/CMakeLists.txt +++ b/modules/rostests/winetests/rpcrt4/CMakeLists.txt @@ -40,11 +40,12 @@ endif() add_executable(rpcrt4_winetest ${SOURCE}) -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(rpcrt4_winetest PRIVATE "-Wno-format") - if(USE_CLANG_CL) - target_compile_options(rpcrt4_winetest PRIVATE "-Wno-cast-calling-convention") - endif() +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_compile_options(rpcrt4_winetest PRIVATE "-Wno-cast-calling-convention") endif() target_link_libraries(rpcrt4_winetest uuid wine ${PSEH_LIB}) diff --git a/modules/rostests/winetests/winmm/CMakeLists.txt b/modules/rostests/winetests/winmm/CMakeLists.txt index c30a6b2a565..0d502f4f14a 100644 --- a/modules/rostests/winetests/winmm/CMakeLists.txt +++ b/modules/rostests/winetests/winmm/CMakeLists.txt @@ -14,7 +14,7 @@ list(APPEND SOURCE add_executable(winmm_winetest ${SOURCE}) -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(winmm_winetest PRIVATE "-Wno-format") endif() diff --git a/modules/rostests/winetests/ws2_32/CMakeLists.txt b/modules/rostests/winetests/ws2_32/CMakeLists.txt index 2229f5787aa..092a51e63ed 100644 --- a/modules/rostests/winetests/ws2_32/CMakeLists.txt +++ b/modules/rostests/winetests/ws2_32/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) -if(USE_CLANG_CL OR (NOT MSVC)) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(ws2_32_winetest PRIVATE "-Wno-format") endif() diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 9109a7bc3c7..b9c51ab0c4a 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -1,18 +1,13 @@ PROJECT(NTOS) -if (GCC) +if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") # Enable this again. CORE-17637 add_compile_options(-Wunused-result) endif() include(ntos.cmake) -if(NOT MSVC) - # Make sure we don't duplicate some symbols - add_compile_options(-fno-common) -endif() - set(NTOSKRNL_SOURCE ${SOURCE}) set(NTOSKRNL_ASM_SOURCE ${ASM_SOURCE}) diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index 020f0c7eda4..5e6243dd35a 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -75,25 +75,6 @@ else() "Whether to compile for debugging.") endif() -if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - set(GCC TRUE CACHE BOOL "The compiler is GCC") - set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") -elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang") - # We can use LLVM Clang mimicking CL or GCC. Account for this - if (MSVC) - set(GCC FALSE CACHE BOOL "The compiler is GCC") - else() - set(GCC TRUE CACHE BOOL "The compiler is GCC") - endif() - set(CLANG TRUE CACHE BOOL "The compiler is LLVM Clang") -elseif(MSVC) # aka CMAKE_C_COMPILER_ID STREQUAL "MSVC" - set(GCC FALSE CACHE BOOL "The compiler is GCC") - set(CLANG FALSE CACHE BOOL "The compiler is LLVM Clang") - # MSVC variable is already set by cmake -else() - message("WARNING: the compiler has not been recognized") -endif() - if(MSVC) set(KDBG FALSE CACHE BOOL "Whether to compile in the integrated kernel debugger.") @@ -102,7 +83,6 @@ if(MSVC) else() set(_WINKD_ TRUE CACHE BOOL "Whether to compile with the KD protocol.") endif() - else() if(CMAKE_BUILD_TYPE STREQUAL "Release") set(KDBG FALSE CACHE BOOL "Whether to compile in the integrated kernel debugger.") @@ -120,7 +100,7 @@ cmake_dependent_option(ISAPNP_ENABLE "Whether to enable the ISA PnP support." ON set(GENERATE_DEPENDENCY_GRAPH FALSE CACHE BOOL "Whether to create a GraphML dependency graph of DLLs.") -if(MSVC) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") option(_PREFAST_ "Whether to enable PREFAST while compiling." OFF) option(_VS_ANALYZE_ "Whether to enable static analysis while compiling." OFF) # RTC are incompatible with compiler optimizations. @@ -128,7 +108,7 @@ if(MSVC) "CMAKE_BUILD_TYPE STREQUAL Debug" OFF) endif() -if(GCC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU") option(STACK_PROTECTOR "Whether to enable the GCC stack checker while compiling" OFF) endif() diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 076a9fc5731..5a37db32dea 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -485,12 +485,12 @@ add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<IF:$<BOOL:$<TARGET_PROPERTY:WIT add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:$<IF:$<BOOL:$<TARGET_PROPERTY:WITH_CXX_EXCEPTIONS>>,-fexceptions,-fno-exceptions>>") # G++ shipped with ROSBE uses sjlj exceptions on i386. Tell Clang it is so -if (CLANG AND (ARCH STREQUAL "i386")) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND ARCH STREQUAL "i386") add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<BOOL:$<TARGET_PROPERTY:WITH_CXX_EXCEPTIONS>>>:-fsjlj-exceptions>") endif() # Find default G++ libraries -if (CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") set(GXX_EXECUTABLE ${CMAKE_CXX_COMPILER_TARGET}-g++) else() set(GXX_EXECUTABLE ${CMAKE_CXX_COMPILER}) diff --git a/sdk/lib/3rdparty/freetype/CMakeLists.txt b/sdk/lib/3rdparty/freetype/CMakeLists.txt index bac1f0bb249..e714504f97c 100644 --- a/sdk/lib/3rdparty/freetype/CMakeLists.txt +++ b/sdk/lib/3rdparty/freetype/CMakeLists.txt @@ -58,6 +58,8 @@ add_library(freetype ${SOURCE}) if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" AND ARCH STREQUAL "amd64") # error C4312: 'type cast': conversion from 'unsigned long' to 'void *' of greater size remove_target_compile_option(freetype "/we4312") -elseif(GCC) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(freetype PRIVATE -fno-builtin-malloc) endif() diff --git a/sdk/lib/3rdparty/libxml2/CMakeLists.txt b/sdk/lib/3rdparty/libxml2/CMakeLists.txt index 5d7186e69b4..e56e434d3e8 100644 --- a/sdk/lib/3rdparty/libxml2/CMakeLists.txt +++ b/sdk/lib/3rdparty/libxml2/CMakeLists.txt @@ -64,7 +64,7 @@ list(APPEND SOURCE add_library(libxml2 ${SOURCE}) -if(MSVC AND (NOT USE_CLANG_CL)) +if(CMAKE_C_COMPILER_ID STREQUAL "MSVC") # Unreferenced local variable remove_target_compile_option(libxml2 "/we4101") target_compile_options(libxml2 PRIVATE "/wd4101") diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 8f159a6b968..e8acbd7e2ca 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -26,7 +26,7 @@ if(ARCH STREQUAL "i386") math/i386/alldiv_asm.s math/i386/aulldiv_asm.s ) - if (GCC AND CLANG) + if (CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MSVC) list(APPEND MSVCRTEX_ASM_SOURCE math/i386/ceilf.S math/i386/floorf.S) @@ -77,7 +77,7 @@ if(MSVC AND (ARCH STREQUAL "i386")) endif() -if(GCC OR CLANG) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(msvcrtex PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-main>) if(LTCG) target_compile_options(msvcrtex PRIVATE -fno-lto) diff --git a/sdk/lib/drivers/wdf/CMakeLists.txt b/sdk/lib/drivers/wdf/CMakeLists.txt index 1210764d036..206d70031ef 100644 --- a/sdk/lib/drivers/wdf/CMakeLists.txt +++ b/sdk/lib/drivers/wdf/CMakeLists.txt @@ -210,7 +210,7 @@ target_include_directories(wdf01000 target_link_libraries(wdf01000 aux_klib ntoskrnl_vista ${PSEH_LIB}) -if(GCC) +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") target_compile_options(wdf01000 PRIVATE -Wno-write-strings -Wno-unknown-pragmas -Wno-switch PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-reorder -Wno-invalid-offsetof -Wno-delete-non-virtual-dtor>) diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 042e51e4e4a..a8d2fdbe348 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -5,7 +5,7 @@ add_definitions( -D_NTSYSTEM_ -D_NTDLLBUILD_) -if (GCC) +if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") # Enable this again. CORE-17637 add_compile_options(-Wunused-result) endif()

2 years, 7 months

[reactos] 01/01: [HALX86] Print the correct size of the BAR in HalpDebugPciDumpBus()

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f4be52a1c710ac062d35… commit 6f4be52a1c710ac062d35a8c9083c0dcec69827e Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Thu May 26 19:40:17 2022 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 26 16:40:17 2022 +0300 [HALX86] Print the correct size of the BAR in HalpDebugPciDumpBus() Reference: https://wiki.osdev.org/PCI#Address_and_size_of_the_BAR To determine the amount of address space needed by a PCI device, you must save the original value of the BAR, write a value of all 1's to the register, then read it back. Note: 64-bit BARs are not supported yet. --- hal/halx86/include/halp.h | 2 ++ hal/halx86/legacy/bussupp.c | 32 ++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 62d0254773e..5446482dfc8 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -516,6 +516,8 @@ CODE_SEG("INIT") VOID NTAPI HalpDebugPciDumpBus( + IN PBUS_HANDLER BusHandler, + IN PCI_SLOT_NUMBER PciSlot, IN ULONG i, IN ULONG j, IN ULONG k, diff --git a/hal/halx86/legacy/bussupp.c b/hal/halx86/legacy/bussupp.c index 97b535285d3..f967ece635c 100644 --- a/hal/halx86/legacy/bussupp.c +++ b/hal/halx86/legacy/bussupp.c @@ -787,7 +787,9 @@ ShowSize(ULONG x) CODE_SEG("INIT") VOID NTAPI -HalpDebugPciDumpBus(IN ULONG i, +HalpDebugPciDumpBus(IN PBUS_HANDLER BusHandler, + IN PCI_SLOT_NUMBER PciSlot, + IN ULONG i, IN ULONG j, IN ULONG k, IN PPCI_COMMON_CONFIG PciData) @@ -963,12 +965,30 @@ HalpDebugPciDumpBus(IN ULONG i, Mem = 0; if (Mem) { + ULONG PciBar = 0xFFFFFFFF; + + HalpWritePCIConfig(BusHandler, + PciSlot, + &PciBar, + FIELD_OFFSET(PCI_COMMON_HEADER, u.type0.BaseAddresses[b]), + sizeof(ULONG)); + HalpReadPCIConfig(BusHandler, + PciSlot, + &PciBar, + FIELD_OFFSET(PCI_COMMON_HEADER, u.type0.BaseAddresses[b]), + sizeof(ULONG)); + HalpWritePCIConfig(BusHandler, + PciSlot, + &Mem, + FIELD_OFFSET(PCI_COMMON_HEADER, u.type0.BaseAddresses[b]), + sizeof(ULONG)); + /* Decode the address type */ - if (Mem & PCI_ADDRESS_IO_SPACE) + if (PciBar & PCI_ADDRESS_IO_SPACE) { /* Guess the size */ Size = 1 << 2; - while (!(Mem & Size) && (Size)) Size <<= 1; + while (!(PciBar & Size) && (Size)) Size <<= 1; /* Print it out */ DbgPrint("\tI/O ports at %04lx", Mem & PCI_ADDRESS_IO_ADDRESS_MASK); @@ -977,8 +997,8 @@ HalpDebugPciDumpBus(IN ULONG i, else { /* Guess the size */ - Size = 1 << 8; - while (!(Mem & Size) && (Size)) Size <<= 1; + Size = 1 << 4; + while (!(PciBar & Size) && (Size)) Size <<= 1; /* Print it out */ DbgPrint("\tMemory at %08lx (%d-bit, %sprefetchable)", @@ -1102,7 +1122,7 @@ HalpInitializePciBus(VOID) if (PciData->VendorID == PCI_INVALID_VENDORID) continue; /* Print out the entry */ - HalpDebugPciDumpBus(i, j, k, PciData); + HalpDebugPciDumpBus(BusHandler, PciSlot, i, j, k, PciData); /* Check if this is a Cardbus bridge */ if (PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE)

2 years, 7 months

[reactos] 01/01: [ASM x64] Fix UNIMPLEMENTED macro for MSVC

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11e0ed3c2bafb92793085… commit 11e0ed3c2bafb92793085090272cda5d200a8595 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Apr 22 01:15:40 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed May 25 23:16:04 2022 +0200 [ASM x64] Fix UNIMPLEMENTED macro for MSVC --- sdk/include/asm/asm.inc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index de46fb5c963..7b3df60e6b1 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -189,8 +189,23 @@ data32 MACRO opcode:VARARG opcode ENDM -UNIMPLEMENTED MACRO name +UNIMPLEMENTED2 MACRO file, line, func + jmp UNIMPLEMENTED2_IMPL +UNIMPLEMENTED_MSG: .ascii "WARNING: %s at %s:%d is UNIMPLEMENTED!", 10, 0 +UNIMPLEMENTED_FUNC: .ascii "&func&", 0 +UNIMPLEMENTED_FILE: .ascii file, 0 +EXTERN DbgPrint:PROC +UNIMPLEMENTED2_IMPL: + sub rsp, 28h + mov r9, line + lea r8, UNIMPLEMENTED_FILE + lea rdx, UNIMPLEMENTED_FUNC + lea rcx, UNIMPLEMENTED_MSG + call DbgPrint + add rsp, 28h + xor eax, eax ENDM +#define UNIMPLEMENTED UNIMPLEMENTED2 __FILE__, __LINE__, absolute MACRO address __absolute__address__ = address @@ -389,7 +404,7 @@ ENDM .macro UNIMPLEMENTED2 file, line, func jmp 4f -1: .ascii "Unimplemented", CR, LF, NUL +1: .ascii "Unimplemented %s (%s:%d)", CR, LF, NUL 2: .asciz "\func" 3: .asciz \file 4:

2 years, 7 months

[reactos] 01/01: [KERNEL32] Fix reading SafeDllSearchMode

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ea46b53e3ddfc4120c16… commit 8ea46b53e3ddfc4120c16f3781adf453616fddee Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Apr 8 00:22:54 2022 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed May 25 22:43:47 2022 +0200 [KERNEL32] Fix reading SafeDllSearchMode --- dll/win32/kernel32/client/path.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dll/win32/kernel32/client/path.c b/dll/win32/kernel32/client/path.c index 1db908212f7..1fa09d530c8 100644 --- a/dll/win32/kernel32/client/path.c +++ b/dll/win32/kernel32/client/path.c @@ -424,7 +424,7 @@ BaseComputeProcessDllPath(IN LPWSTR FullPath, UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session Manager"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SafeDllSearchMode"); OBJECT_ATTRIBUTES ObjectAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&KeyName, OBJ_CASE_INSENSITIVE); - KEY_VALUE_PARTIAL_INFORMATION PartialInfo; + CHAR PartialInfoBuffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + sizeof(ULONG)]; HANDLE KeyHandle; NTSTATUS Status; ULONG ResultLength; @@ -461,15 +461,16 @@ BaseComputeProcessDllPath(IN LPWSTR FullPath, Status = NtQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, - &PartialInfo, - sizeof(PartialInfo), + PartialInfoBuffer, + sizeof(PartialInfoBuffer), &ResultLength); if (NT_SUCCESS(Status)) { /* Read the value if the size is OK */ - if (ResultLength == sizeof(PartialInfo)) + if (ResultLength == sizeof(PartialInfoBuffer)) { - CurrentDirPlacement = *(PULONG)PartialInfo.Data; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PKEY_VALUE_PARTIAL_INFORMATION)PartialInfoBuffer; + CurrentDirPlacement = *(PULONG)PartialInfo->Data; } }

2 years, 7 months

[reactos] 01/01: [GITHUB] Add MSVC ARM64 builder

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b55d712a75d2da462a96… commit 8b55d712a75d2da462a96adff4f6684c0b43e2d6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed May 25 18:38:41 2022 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed May 25 21:10:17 2022 +0300 [GITHUB] Add MSVC ARM64 builder This builds only some applications for now. CORE-17518 --- .github/workflows/build.yml | 17 +++++++++++++++-- sdk/include/c++/stlport/stl/config/features.h | 2 +- win32ss/user/user32/user32.spec | 4 ++-- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b45b9b1d87b..50f2c5ac91b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -141,7 +141,7 @@ jobs: strategy: matrix: toolset: ['14.2', '14.1'] # VS 2019, 2017 - arch: [arm] + arch: [arm, arm64] config: [Debug, Release] fail-fast: false runs-on: windows-latest @@ -156,9 +156,16 @@ jobs: echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - name: Activate VS cmd (arm) + if: ${{ matrix.arch == 'arm' }} uses: ilammy/msvc-dev-cmd@v1 with: - arch: x86_arm + arch: amd64_arm + toolset: ${{matrix.toolset}} + - name: Activate VS cmd (arm64) + if: ${{ matrix.arch == 'arm64' }} + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64_arm64 toolset: ${{matrix.toolset}} - name: Source checkout uses: actions/checkout@v2 @@ -167,11 +174,17 @@ jobs: - name: Configure run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 - name: Build base module + if: ${{ matrix.arch == 'arm' }} run: cmake --build build --target base/all - name: Build control panel applets + if: ${{ matrix.arch == 'arm' }} run: cmake --build build --target dll/cpl/all - name: Build rosapps + if: ${{ matrix.arch == 'arm' }} run: cmake --build build --target modules/rosapps/all + - name: Build some applications (arm64) + if: ${{ matrix.arch == 'arm64' }} + run: cmake --build build --target calc magnify mstsc notepad osk regedit taskmgr winmine wordpad base/applications/screensavers/all -- -k0 - name: Upload compiled binaries uses: actions/upload-artifact@v2 with: diff --git a/sdk/include/c++/stlport/stl/config/features.h b/sdk/include/c++/stlport/stl/config/features.h index aacbf2904d5..3379bff5473 100644 --- a/sdk/include/c++/stlport/stl/config/features.h +++ b/sdk/include/c++/stlport/stl/config/features.h @@ -162,7 +162,7 @@ # if defined (_MIPSEB) || defined (__sparc) || defined (_AIX) || \ defined (__hpux) || defined (macintosh) || defined (_MAC) # define _STLP_BIG_ENDIAN 1 -# elif defined (__i386) || defined (_M_IX86) || defined (_M_ARM) || \ +# elif defined (__i386) || defined (_M_IX86) || defined (_M_ARM) || defined (_M_ARM64) || \ defined (__amd64__) || defined (_M_AMD64) || defined (__x86_64__) || \ defined (__alpha__) # define _STLP_LITTLE_ENDIAN 1 diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index c7097cc662b..6af9bbc06b0 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -252,8 +252,8 @@ 251 stdcall GetClassInfoExW(long wstr ptr) 252 stdcall GetClassInfoW(long wstr ptr) 253 stdcall GetClassLongA(long long) -@ stdcall -arch=x86_64 GetClassLongPtrA(ptr long) -@ stdcall -arch=x86_64 GetClassLongPtrW(ptr long) +@ stdcall -arch=x86_64,arm64 GetClassLongPtrA(ptr long) +@ stdcall -arch=x86_64,arm64 GetClassLongPtrW(ptr long) 254 stdcall GetClassLongW(long long) 255 stdcall GetClassNameA(long ptr long) 256 stdcall GetClassNameW(long ptr long)

2 years, 7 months

[reactos] 01/01: [REACTOS] Finally get some ARM64 applications building (#4517)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4363e74ddcb26a528c272… commit 4363e74ddcb26a528c2723ab0afe5af3443bde6f Author: Justin Miller <justinmiller100(a)gmail.com> AuthorDate: Wed May 25 07:06:32 2022 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 25 17:06:32 2022 +0300 [REACTOS] Finally get some ARM64 applications building (#4517) - Add some missing ARM64 exports to ntdll, kernel32 and user32 - Create mmtypes header file based on WoA debug symbols - Get the remaining headers in order, so we can build ARM64 apps - Adjust subsystem version for binaries so they can run on WoA host - Get calc, notepad and more base apps to build for ARM64 platform CORE-17518 Reviewed-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> Reviewed-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/ntdll/def/ntdll.spec | 4 +- dll/win32/kernel32/kernel32.spec | 6 +- sdk/cmake/msvc.cmake | 2 +- sdk/include/asm/CMakeLists.txt | 2 + sdk/include/asm/genincdata.c | 2 + sdk/include/asm/ksarm64.template.h | 8 + sdk/include/asm/ksx.template.h | 2 +- sdk/include/crt/excpt.h | 2 +- sdk/include/crt/malloc.h | 2 +- sdk/include/ndk/arch/ketypes.h | 2 + sdk/include/ndk/arch/mmtypes.h | 2 + sdk/include/ndk/arm64/ketypes.h | 293 +++++++++++++++++++++++++++++++++++++ sdk/include/ndk/arm64/mmtypes.h | 151 +++++++++++++++++++ sdk/include/ndk/ketypes.h | 4 +- sdk/include/ndk/rtltypes.h | 2 + sdk/include/reactos/windbgkd.h | 20 +++ sdk/include/xdk/arm64/ke.h | 17 +++ sdk/include/xdk/winnt_old.h | 13 ++ sdk/lib/crt/startup/mscmain.c | 2 +- sdk/lib/runtmchk/rtcapi.c | 2 +- win32ss/user/user32/user32.spec | 8 +- 21 files changed, 529 insertions(+), 17 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index ef7b4f90ed4..57ba0653d7c 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -1756,8 +1756,8 @@ @ cdecl -arch=i386 _CIpow() @ cdecl -arch=i386 _CIsin() @ cdecl -arch=i386 _CIsqrt() -@ cdecl -arch=x86_64,arm __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=x86_64,arm __chkstk() +@ cdecl -arch=x86_64,arm,arm64 __C_specific_handler(ptr long ptr ptr) +@ cdecl -arch=x86_64,arm,arm64 __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 14050c9447d..5286c2a3e26 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -1224,15 +1224,15 @@ @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long) @ stdcall ZombifyActCtx(ptr) -@ stdcall -arch=x86_64 __C_specific_handler() ntdll.__C_specific_handler -@ stdcall -arch=x86_64 __chkstk() ntdll.__chkstk +@ stdcall -arch=x86_64,arm64 __C_specific_handler() ntdll.__C_specific_handler +@ stdcall -arch=x86_64,arm64 __chkstk() ntdll.__chkstk ;@ stdcall -arch=x86_64 __misaligned_access() ntdll.__misaligned_access @ stdcall _hread(long ptr long) @ stdcall _hwrite(long ptr long) @ stdcall _lclose(long) @ stdcall _lcreat(str long) @ stdcall _llseek(long long long) -@ stdcall -arch=x86_64 _local_unwind() ntdll._local_unwind +@ stdcall -arch=x86_64,arm64 _local_unwind() ntdll._local_unwind @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) _hread @ stdcall _lwrite(long ptr long) _hwrite diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index cfd852211f6..2d482227730 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -252,7 +252,7 @@ function(set_subsystem MODULE SUBSYSTEM) elseif(ARCH STREQUAL "arm") target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},6.02") elseif(ARCH STREQUAL "arm64") - target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},6.04") + target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},6.02") else() target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},5.01") endif() diff --git a/sdk/include/asm/CMakeLists.txt b/sdk/include/asm/CMakeLists.txt index dd3ad312565..9daa2f7721d 100644 --- a/sdk/include/asm/CMakeLists.txt +++ b/sdk/include/asm/CMakeLists.txt @@ -16,6 +16,8 @@ elseif(ARCH STREQUAL "amd64") set(_filename ksamd64.inc) elseif(ARCH STREQUAL "arm") set(_filename ksarm.h) +elseif(ARCH STREQUAL "arm64") + set(_filename ksarm64.h) endif() add_custom_command( diff --git a/sdk/include/asm/genincdata.c b/sdk/include/asm/genincdata.c index ec4c364edb7..de21836bed6 100644 --- a/sdk/include/asm/genincdata.c +++ b/sdk/include/asm/genincdata.c @@ -67,6 +67,8 @@ ASMGENDATA Table[] = #include "ksamd64.template.h" #elif defined(_M_ARM) #include "ksarm.template.h" +#elif defined(_M_ARM64) +#include "ksarm64.template.h" #endif /* PORTABLE CONSTANTS ********************************************************/ diff --git a/sdk/include/asm/ksarm64.template.h b/sdk/include/asm/ksarm64.template.h new file mode 100644 index 00000000000..0919d3379f9 --- /dev/null +++ b/sdk/include/asm/ksarm64.template.h @@ -0,0 +1,8 @@ + +#define CONTEXT_ARM64 0x00400000L +#define CONTEXT_CONTROL (CONTEXT_ARM64 | 0x1L) +#define CONTEXT_INTEGER (CONTEXT_ARM64 | 0x2L) +#define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x4L) +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x8L) +#define CONTEXT_X18 (CONTEXT_ARM64 | 0x10L) +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT) diff --git a/sdk/include/asm/ksx.template.h b/sdk/include/asm/ksx.template.h index 9cf895d3fd2..b434717f382 100644 --- a/sdk/include/asm/ksx.template.h +++ b/sdk/include/asm/ksx.template.h @@ -332,7 +332,7 @@ CONSTANT(DBG_STATUS_CONTROL_C), //CONSTANT(KI_SLIST_FAULT_COUNT_MAXIMUM), // i386 //CONSTANTUSER_CALLBACK_FILTER), -#ifndef _M_ARM +#if !defined(_M_ARM) && !defined(_M_ARM64) CONSTANT(MAXIMUM_IDTVECTOR), //CONSTANT(MAXIMUM_PRIMARY_VECTOR), CONSTANT(PRIMARY_VECTOR_BASE), diff --git a/sdk/include/crt/excpt.h b/sdk/include/crt/excpt.h index 8bf543416c1..62841cbda23 100644 --- a/sdk/include/crt/excpt.h +++ b/sdk/include/crt/excpt.h @@ -53,7 +53,7 @@ typedef enum _EXCEPTION_DISPOSITION _Inout_ struct _DISPATCHER_CONTEXT *_DispatcherContext, _In_ unsigned __int64 _GlobalPointer); -#elif defined(__x86_64) || defined(_M_ARM) +#elif defined(__x86_64) || defined(_M_ARM) || defined(_M_ARM64) struct _EXCEPTION_RECORD; struct _CONTEXT; diff --git a/sdk/include/crt/malloc.h b/sdk/include/crt/malloc.h index 553032edfb7..77854f3b7c7 100644 --- a/sdk/include/crt/malloc.h +++ b/sdk/include/crt/malloc.h @@ -310,7 +310,7 @@ extern "C" { #if(defined(_X86_) && !defined(__x86_64)) #define _ALLOCA_S_MARKER_SIZE 8 -#elif defined(__ia64__) || defined(__x86_64) +#elif defined(__ia64__) || defined(__x86_64) || defined(__arm64__) #define _ALLOCA_S_MARKER_SIZE 16 #elif defined(__arm__) #define _ALLOCA_S_MARKER_SIZE 8 diff --git a/sdk/include/ndk/arch/ketypes.h b/sdk/include/ndk/arch/ketypes.h index 1d6394144c5..5eb1ee14a83 100644 --- a/sdk/include/ndk/arch/ketypes.h +++ b/sdk/include/ndk/arch/ketypes.h @@ -30,6 +30,8 @@ Author: #include <powerpc/ketypes.h> #elif defined(_M_ARM) #include <arm/ketypes.h> +#elif defined(_M_ARM64) +#include <arm64/ketypes.h> #else #error "Unknown processor" #endif diff --git a/sdk/include/ndk/arch/mmtypes.h b/sdk/include/ndk/arch/mmtypes.h index e83c9579e64..d8744c52b68 100644 --- a/sdk/include/ndk/arch/mmtypes.h +++ b/sdk/include/ndk/arch/mmtypes.h @@ -30,6 +30,8 @@ Author: #include <arm/mmtypes.h> #elif defined(_M_AMD64) #include <amd64/mmtypes.h> +#elif defined(_M_ARM64) +#include <arm64/mmtypes.h> #else #error "Unknown processor" #endif diff --git a/sdk/include/ndk/arm64/ketypes.h b/sdk/include/ndk/arm64/ketypes.h new file mode 100644 index 00000000000..2536ecc6c74 --- /dev/null +++ b/sdk/include/ndk/arm64/ketypes.h @@ -0,0 +1,293 @@ + + +#ifndef _ARM64_KETYPES_H +#define _ARM64_KETYPES_H + +#ifdef __cplusplus +extern "C" { +#endif + +/* Interrupt request levels */ +#define PASSIVE_LEVEL 0 +#define LOW_LEVEL 0 +#define APC_LEVEL 1 +#define DISPATCH_LEVEL 2 +#define CMCI_LEVEL 5 +#define CLOCK_LEVEL 13 +#define IPI_LEVEL 14 +#define DRS_LEVEL 14 +#define POWER_LEVEL 14 +#define PROFILE_LEVEL 15 +#define HIGH_LEVEL 15 + +// +// IPI Types +// +#define IPI_APC 1 +#define IPI_DPC 2 +#define IPI_FREEZE 4 +#define IPI_PACKET_READY 6 +#define IPI_SYNCH_REQUEST 16 + +// +// PRCB Flags +// +#define PRCB_MAJOR_VERSION 1 +#define PRCB_BUILD_DEBUG 1 +#define PRCB_BUILD_UNIPROCESSOR 2 + +// +// No LDTs on ARM64 +// +#define LDT_ENTRY ULONG + + +// +// HAL Variables +// +#define INITIAL_STALL_COUNT 100 +#define MM_HAL_VA_START 0xFFFFFFFFFFC00000ULL +#define MM_HAL_VA_END 0xFFFFFFFFFFFFFFFFULL + +// +// Structure for CPUID info +// +typedef union _CPU_INFO +{ + ULONG dummy; +} CPU_INFO, *PCPU_INFO; + +typedef struct _KTRAP_FRAME +{ + UCHAR ExceptionActive; + UCHAR ContextFromKFramesUnwound; + UCHAR DebugRegistersValid; + union + { + struct + { + CHAR PreviousMode; + UCHAR PreviousIrql; + }; + }; + ULONG Reserved; + union + { + struct + { + ULONG64 FaultAddress; + ULONG64 TrapFrame; + }; + }; + //struct PKARM64_VFP_STATE VfpState; + ULONG VfpState; + ULONG Bcr[8]; + ULONG64 Bvr[8]; + ULONG Wcr[2]; + ULONG64 Wvr[2]; + ULONG Spsr; + ULONG Esr; + ULONG64 Sp; + union + { + ULONG64 X[19]; + struct + { + ULONG64 X0; + ULONG64 X1; + ULONG64 X2; + ULONG64 X3; + ULONG64 X4; + ULONG64 X5; + ULONG64 X6; + ULONG64 X7; + ULONG64 X8; + ULONG64 X9; + ULONG64 X10; + ULONG64 X11; + ULONG64 X12; + ULONG64 X13; + ULONG64 X14; + ULONG64 X15; + ULONG64 X16; + ULONG64 X17; + ULONG64 X18; + }; + }; + ULONG64 Lr; + ULONG64 Fp; + ULONG64 Pc; +} KTRAP_FRAME, *PKTRAP_FRAME; + +typedef struct _KEXCEPTION_FRAME +{ + ULONG dummy; +} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; + +#ifndef NTOS_MODE_USER + +typedef struct _TRAPFRAME_LOG_ENTRY +{ + ULONG64 Thread; + UCHAR CpuNumber; + UCHAR TrapType; + USHORT Padding; + ULONG Cpsrl; + ULONG64 X0; + ULONG64 X1; + ULONG64 X2; + ULONG64 X3; + ULONG64 X4; + ULONG64 X5; + ULONG64 X6; + ULONG64 X7; + ULONG64 Fp; + ULONG64 Lr; + ULONG64 Sp; + ULONG64 Pc; + ULONG64 Far; + ULONG Esr; + ULONG Reserved1; +} TRAPFRAME_LOG_ENTRY, *PTRAPFRAME_LOG_ENTRY; + +// +// Processor Region Control Block +// Based on WoA +// +typedef struct _KPRCB +{ + ULONG dummy; +} KPRCB, *PKPRCB; + +// +// Processor Control Region +// Based on WoA +// +typedef struct _KIPCR +{ + union + { + struct + { + ULONG TibPad0[2]; + PVOID Spare1; + struct _KPCR *Self; + PVOID PcrReserved0; + struct _KSPIN_LOCK_QUEUE* LockArray; + PVOID Used_Self; + }; + }; + KIRQL CurrentIrql; + UCHAR SecondLevelCacheAssociativity; + UCHAR Pad1[2]; + USHORT MajorVersion; + USHORT MinorVersion; + ULONG StallScaleFactor; + ULONG SecondLevelCacheSize; + struct + { + UCHAR ApcInterrupt; + UCHAR DispatchInterrupt; + }; + USHORT InterruptPad; + UCHAR BtiMitigation; + struct + { + UCHAR SsbMitigationFirmware:1; + UCHAR SsbMitigationDynamic:1; + UCHAR SsbMitigationKernel:1; + UCHAR SsbMitigationUser:1; + UCHAR SsbMitigationReserved:4; + }; + UCHAR Pad2[2]; + ULONG64 PanicStorage[6]; + PVOID KdVersionBlock; + PVOID HalReserved[134]; + PVOID KvaUserModeTtbr1; + + /* Private members, not in ntddk.h */ + PVOID Idt[256]; + PVOID* IdtExt; + PVOID PcrAlign[15]; + KPRCB Prcb; +} KIPCR, *PKIPCR; + +// +// Special Registers Structure (outside of CONTEXT) +// Based on WoA symbols +// +typedef struct _KSPECIAL_REGISTERS +{ + ULONG64 Elr_El1; + UINT32 Spsr_El1; + ULONG64 Tpidr_El0; + ULONG64 Tpidrro_El0; + ULONG64 Tpidr_El1; + ULONG64 KernelBvr[8]; + ULONG KernelBcr[8]; + ULONG64 KernelWvr[2]; + ULONG KernelWcr[2]; +} KSPECIAL_REGISTERS, *PKSPECIAL_REGISTERS; + +// +// ARM64 Architecture State +// Based on WoA symbols +// +typedef struct _KARM64_ARCH_STATE +{ + ULONG64 Midr_El1; + ULONG64 Sctlr_El1; + ULONG64 Actlr_El1; + ULONG64 Cpacr_El1; + ULONG64 Tcr_El1; + ULONG64 Ttbr0_El1; + ULONG64 Ttbr1_El1; + ULONG64 Esr_El1; + ULONG64 Far_El1; + ULONG64 Pmcr_El0; + ULONG64 Pmcntenset_El0; + ULONG64 Pmccntr_El0; + ULONG64 Pmxevcntr_El0[31]; + ULONG64 Pmxevtyper_El0[31]; + ULONG64 Pmovsclr_El0; + ULONG64 Pmselr_El0; + ULONG64 Pmuserenr_El0; + ULONG64 Mair_El1; + ULONG64 Vbar_El1; +} KARM64_ARCH_STATE, *PKARM64_ARCH_STATE; + +typedef struct _KPROCESSOR_STATE +{ + KSPECIAL_REGISTERS SpecialRegisters; // 0 + KARM64_ARCH_STATE ArchState; // 160 + CONTEXT ContextFrame; // 800 +} KPROCESSOR_STATE, *PKPROCESSOR_STATE; + +// +// Macro to get current KPRCB +// +FORCEINLINE +struct _KPRCB * +KeGetCurrentPrcb(VOID) +{ + //UNIMPLEMENTED; + return 0; +} + +// +// Just read it from the PCR +// +#define KeGetCurrentIrql() KeGetPcr()->CurrentIrql +#define _KeGetCurrentThread() KeGetCurrentPrcb()->CurrentThread +#define _KeGetPreviousMode() KeGetCurrentPrcb()->CurrentThread->PreviousMode +#define _KeIsExecutingDpc() (KeGetCurrentPrcb()->DpcRoutineActive != 0) +#define KeGetCurrentThread() _KeGetCurrentThread() +#define KeGetPreviousMode() _KeGetPreviousMode() + +#endif // !NTOS_MODE_USER + +#ifdef __cplusplus +}; // extern "C" +#endif + +#endif // !_ARM64_KETYPES_H diff --git a/sdk/include/ndk/arm64/mmtypes.h b/sdk/include/ndk/arm64/mmtypes.h new file mode 100644 index 00000000000..96235a3d3b9 --- /dev/null +++ b/sdk/include/ndk/arm64/mmtypes.h @@ -0,0 +1,151 @@ + +#ifndef _ARM64_MMTYPES_H +#define _ARM64_MMTYPES_H + +#ifdef __cplusplus +extern "C" { +#endif + +// +// Page-related Macros +// +#ifndef PAGE_SIZE +#define PAGE_SIZE 0x1000 +#endif +#define PAGE_SHIFT 12L +#define MM_ALLOCATION_GRANULARITY 0x10000 +#define MM_ALLOCATION_GRANULARITY_SHIFT 16L +#define MM_PAGE_FRAME_NUMBER_SIZE 20 + +/* Following structs are based on WoA symbols */ +typedef struct _HARDWARE_PTE +{ + /* 8 Byte struct */ + ULONG64 Valid:1; + ULONG64 NotLargePage:1; + ULONG64 CacheType:2; + ULONG64 OsAvailable2:1; + ULONG64 NonSecure:1; + ULONG64 Owner:1; + ULONG64 NotDirty:1; + ULONG64 Shareability:2; + ULONG64 Accessed:1; + ULONG64 NonGlobal:1; + ULONG64 PageFrameNumber:36; + ULONG64 RsvdZ1:4; + ULONG64 ContigousBit:1; + ULONG64 PrivilegedNoExecute:1; + ULONG64 UserNoExecute:1; + ULONG64 Writable:1; + ULONG64 CopyOnWrite:1; + ULONG64 OsAvailable:2; + ULONG64 PxnTable:1; + ULONG64 UxnTable:1; + ULONG64 ApTable:2; + ULONG64 NsTable:1; +} HARDWARE_PTE, *PHARDWARE_PTE; + +typedef struct _MMPTE_SOFTWARE +{ + /* 8 Byte struct */ + ULONG64 Valid:1; + ULONG64 Protection:5; + ULONG64 PageFileLow:4; + ULONG64 Prototype:1; + ULONG64 Transition:1; + ULONG64 PageFileReserved:1; + ULONG64 PageFileAllocated:1; + ULONG64 UsedPageTableEntries:10; + ULONG64 ColdPage:1; + ULONG64 OnStandbyLookaside:1; + ULONG64 RsvdZ1:6; + ULONG64 PageFileHigh:32; +} MMPTE_SOFTWARE; + +typedef struct _MMPTE_TRANSITION +{ + /* 8 Byte struct */ + ULONG64 Valid:1; + ULONG64 Protection:5; + ULONG64 Spare:2; + ULONG64 OnStandbyLookaside:1; + ULONG64 IoTracker:1; + ULONG64 Prototype:1; + ULONG64 Transition:1; + ULONG64 PageFrameNumber:40; + ULONG64 RsvdZ1:12; +} MMPTE_TRANSITION; + +typedef struct _MMPTE_PROTOTYPE +{ + /* 8 Byte struct */ + ULONG64 Valid:1; + ULONG64 Protection:5; + ULONG64 HiberVerifyConverted:1; + ULONG64 Unused1:1; + ULONG64 ReadOnly:1; + ULONG64 Combined:1; + ULONG64 Prototype:1; + ULONG64 DemandFillProto:1; + ULONG64 RsvdZ1:4; + ULONG64 ProtoAddress:48; +} MMPTE_PROTOTYPE; + +typedef struct _MMPTE_SUBSECTION +{ + /* 8 Byte struct */ + ULONG64 Valid:1; + ULONG64 Protection:5; + ULONG64 OnStandbyLookaside:1; + ULONG64 RsvdZ1:3; + ULONG64 Prototype:1; + ULONG64 ColdPage:1; + ULONG64 RsvdZ2:4; + ULONG64 SubsectionAddress:48; +} MMPTE_SUBSECTION; + +typedef struct _MMPTE_TIMESTAMP +{ + /* 8 Byte struct */ + ULONG64 MustBeZero:1; + ULONG64 Protection:5; + ULONG64 PageFileLow:4; + ULONG64 Prototype:1; + ULONG64 Transition:1; + ULONG64 RsvdZ1:20; + ULONG64 GlobalTimeStamp:32; +} MMPTE_TIMESTAMP; + +typedef struct _MMPTE_LIST +{ + /* 8 Byte struct */ + ULONG64 Valid:1; + ULONG64 Protection:5; + ULONG64 OneEntry:1; + ULONG64 RsvdZ1:3; + ULONG64 Prototype:1; + ULONG64 Transition:1; + ULONG64 RsvdZ2:16; + ULONG64 NextEntry:36; +} MMPTE_LIST; + +typedef struct _MMPTE +{ + union + { + ULONG_PTR Long; + HARDWARE_PTE Flush; + HARDWARE_PTE Hard; + MMPTE_PROTOTYPE Proto; + MMPTE_SOFTWARE Soft; + MMPTE_TRANSITION Trans; + MMPTE_SUBSECTION Subsect; + MMPTE_LIST List; + } u; +} MMPTE, *PMMPTE; + +#ifdef __cplusplus +}; // extern "C" +#endif + +#endif diff --git a/sdk/include/ndk/ketypes.h b/sdk/include/ndk/ketypes.h index 255ba53a1c9..6556de0d737 100644 --- a/sdk/include/ndk/ketypes.h +++ b/sdk/include/ndk/ketypes.h @@ -1213,7 +1213,7 @@ typedef struct _KTHREAD }; }; KSPIN_LOCK ApcQueueLock; -#ifndef _M_AMD64 // [ +#if !defined(_M_AMD64) && !defined(_M_ARM64) // [ ULONG ContextSwitches; volatile UCHAR State; UCHAR NpxState; @@ -1263,7 +1263,7 @@ typedef struct _KTHREAD SINGLE_LIST_ENTRY SwapListEntry; }; PKQUEUE Queue; -#ifndef _M_AMD64 // [ +#if !defined(_M_AMD64) && !defined(_M_ARM64) // [ ULONG WaitTime; union { diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h index 62bca65bee1..03ac5156214 100644 --- a/sdk/include/ndk/rtltypes.h +++ b/sdk/include/ndk/rtltypes.h @@ -1797,6 +1797,8 @@ typedef struct _STACK_TRACE_DATABASE #ifndef NTOS_MODE_USER #if defined(_M_AMD64) C_ASSERT(sizeof(ERESOURCE) <= 0x68); +#elif defined(_M_ARM64) +C_ASSERT(sizeof(ERESOURCE) <= 0x68); #else C_ASSERT(sizeof(ERESOURCE) <= 56); #endif diff --git a/sdk/include/reactos/windbgkd.h b/sdk/include/reactos/windbgkd.h index 1f928b041a0..8c0784cabaf 100644 --- a/sdk/include/reactos/windbgkd.h +++ b/sdk/include/reactos/windbgkd.h @@ -266,6 +266,13 @@ typedef struct _ARM_DBGKD_CONTROL_SET ULONG CurrentSymbolEnd; } ARM_DBGKD_CONTROL_SET, *PARM_DBGKD_CONTROL_SET; +typedef struct _ARM64_DBGKD_CONTROL_SET +{ + ULONG Continue; + ULONG CurrentSymbolStart; + ULONG CurrentSymbolEnd; +} ARM64_DBGKD_CONTROL_SET, *PARM64_DBGKD_CONTROL_SET; + typedef struct _DBGKD_ANY_CONTROL_SET { union @@ -285,6 +292,8 @@ typedef X86_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; typedef AMD64_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; #elif defined(_M_ARM) typedef ARM_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; +#elif defined(_M_ARM64) +typedef ARM64_DBGKD_CONTROL_SET DBGKD_CONTROL_SET, *PDBGKD_CONTROL_SET; #else #error Unsupported Architecture #endif @@ -354,6 +363,14 @@ typedef struct _ARM_DBGKD_CONTROL_REPORT UCHAR InstructionStream[DBGKD_MAXSTREAM]; } ARM_DBGKD_CONTROL_REPORT, *PARM_DBGKD_CONTROL_REPORT; +typedef struct _ARM64_DBGKD_CONTROL_REPORT +{ + ULONG64 Bvr; + ULONG64 Wvr; + ULONG InstructionCount; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; +} ARM64_DBGKD_CONTROL_REPORT, *PARM64_DBGKD_CONTROL_REPORT; + typedef struct _DBGKD_ANY_CONTROL_REPORT { union @@ -363,6 +380,7 @@ typedef struct _DBGKD_ANY_CONTROL_REPORT IA64_DBGKD_CONTROL_REPORT IA64ControlReport; AMD64_DBGKD_CONTROL_REPORT Amd64ControlReport; ARM_DBGKD_CONTROL_REPORT ARMControlReport; + ARM64_DBGKD_CONTROL_REPORT ARM64ControlReport; }; } DBGKD_ANY_CONTROL_REPORT, *PDBGKD_ANY_CONTROL_REPORT; @@ -372,6 +390,8 @@ typedef X86_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; typedef AMD64_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; #elif defined(_M_ARM) typedef ARM_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; +#elif defined(_M_ARM64) +typedef ARM64_DBGKD_CONTROL_REPORT DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; #else #error Unsupported Architecture #endif diff --git a/sdk/include/xdk/arm64/ke.h b/sdk/include/xdk/arm64/ke.h index 6fca07e5e56..9b123794e12 100644 --- a/sdk/include/xdk/arm64/ke.h +++ b/sdk/include/xdk/arm64/ke.h @@ -13,6 +13,23 @@ $if (_WDMDDK_) #define PROFILE_LEVEL 15 #define HIGH_LEVEL 15 +#define SharedUserData ((KUSER_SHARED_DATA * const)KI_USER_SHARED_DATA) + +#define PAGE_SIZE 0x1000 +#define PAGE_SHIFT 12L + +#define PAUSE_PROCESSOR YieldProcessor(); + +/* FIXME: Based on AMD64 but needed to compile apps */ +#define KERNEL_STACK_SIZE 12288 +#define KERNEL_LARGE_STACK_SIZE 61440 +#define KERNEL_LARGE_STACK_COMMIT KERNEL_STACK_SIZE +/* FIXME End */ + +#define EXCEPTION_READ_FAULT 0 +#define EXCEPTION_WRITE_FAULT 1 +#define EXCEPTION_EXECUTE_FAULT 8 + NTSYSAPI PKTHREAD NTAPI diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index c62c462b294..8e0de26a3da 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -4383,6 +4383,17 @@ FORCEINLINE PVOID GetCurrentFiber(VOID) return ((PNT_TIB )(ULONG_PTR)_MoveFromCoprocessor(CP15_TPIDRURW))->FiberData; #endif } +#elif defined (_M_ARM64) +FORCEINLINE struct _TEB * NtCurrentTeb(void) +{ + //UNIMPLEMENTED; + return 0; +} +FORCEINLINE PVOID GetCurrentFiber(VOID) +{ + //UNIMPLEMENTED; + return 0; +} #elif defined(_M_PPC) FORCEINLINE unsigned long _read_teb_dword(const unsigned long Offset) { @@ -4478,6 +4489,8 @@ DbgRaiseAssertionFailure(VOID) #define YieldProcessor() __asm__ __volatile__("nop"); #elif defined(_M_ARM) #define YieldProcessor __yield +#elif defined(_M_ARM64) +#define YieldProcessor __yield #else #error Unknown architecture #endif diff --git a/sdk/lib/crt/startup/mscmain.c b/sdk/lib/crt/startup/mscmain.c index cffeb0ab4f9..1a0a91c439f 100644 --- a/sdk/lib/crt/startup/mscmain.c +++ b/sdk/lib/crt/startup/mscmain.c @@ -14,7 +14,7 @@ #if defined(_M_IX86) #pragma comment(linker, "/alternatename:__RTC_Initialize=__RTC_NoInitialize") -#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) +#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) || defined(_M_ARM64) #pragma comment(linker, "/alternatename:_RTC_Initialize=_RTC_NoInitialize") #else #error Unsupported platform diff --git a/sdk/lib/runtmchk/rtcapi.c b/sdk/lib/runtmchk/rtcapi.c index 20e3a5b4b3b..e246fbc0bb5 100644 --- a/sdk/lib/runtmchk/rtcapi.c +++ b/sdk/lib/runtmchk/rtcapi.c @@ -9,7 +9,7 @@ #if defined(_M_IX86) #pragma comment(linker, "/alternatename:__CRT_RTC_INITW=__CRT_RTC_INITW0") -#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) +#elif defined(_M_IA64) || defined(_M_AMD64) || defined(_M_ARM) || defined(_M_ARM64) #pragma comment(linker, "/alternatename:_CRT_RTC_INITW=_CRT_RTC_INITW0") #else #error Unsupported platform diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index c026984892a..c7097cc662b 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -372,8 +372,8 @@ 369 stdcall GetWindowDC(long) NtUserGetWindowDC 370 stdcall GetWindowInfo(long ptr) 371 stdcall GetWindowLongA(long long) -@ stdcall -arch=x86_64 GetWindowLongPtrA(ptr long) -@ stdcall -arch=x86_64 GetWindowLongPtrW(ptr long) +@ stdcall -arch=x86_64,arm64 GetWindowLongPtrA(ptr long) +@ stdcall -arch=x86_64,arm64 GetWindowLongPtrW(ptr long) 372 stdcall GetWindowLongW(long long) 373 stdcall GetWindowModuleFileName(long ptr long) GetWindowModuleFileNameA 374 stdcall GetWindowModuleFileNameA(long ptr long) @@ -654,8 +654,8 @@ 647 stdcall SetWinEventHook(long long long ptr long long long) 648 stdcall SetWindowContextHelpId(long long) 649 stdcall SetWindowLongA(long long long) -@ stdcall -arch=x86_64 SetWindowLongPtrA(ptr long ptr) -@ stdcall -arch=x86_64 SetWindowLongPtrW(ptr long ptr) +@ stdcall -arch=x86_64,arm64 SetWindowLongPtrA(ptr long ptr) +@ stdcall -arch=x86_64,arm64 SetWindowLongPtrW(ptr long ptr) 650 stdcall SetWindowLongW(long long long) 651 stdcall SetWindowPlacement(long ptr) NtUserSetWindowPlacement 652 stdcall SetWindowPos(long long long long long long long) NtUserSetWindowPos

2 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2022