Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 11/29: [CMAKE:GCC] Enforce file alignment on driver & kernel images
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97a8953538ac48240f0f9… commit 97a8953538ac48240f0f9c4b102c9ecbfbac7c1d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 19:59:52 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [CMAKE:GCC] Enforce file alignment on driver & kernel images --- sdk/cmake/init-section.lds | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/cmake/init-section.lds b/sdk/cmake/init-section.lds index a40433ae91b..51f8299dbd0 100644 --- a/sdk/cmake/init-section.lds +++ b/sdk/cmake/init-section.lds @@ -1,13 +1,13 @@ /* Make sure the INIT & .rsrc sections are at the end of the module so we can reclaim the space */ SECTIONS { - INIT BLOCK(__section_alignment__) : + INIT BLOCK(__section_alignment__) : ALIGN(__file_alignment__) { __init_start__ = . ; *(INIT) __init_end__ = . ; } - .rsrc BLOCK(__section_alignment__) : + .rsrc BLOCK(__section_alignment__) : ALIGN(__file_alignment__) { __rsrc_start__ = . ; *(.rsrc)

1 0

[reactos] 10/29: [NDK] Add some missing defines for EFLAGS on amd64
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=382426f02e86c464af43a… commit 382426f02e86c464af43adde080bf0a0e99e73f0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 15:51:33 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [NDK] Add some missing defines for EFLAGS on amd64 --- sdk/include/ndk/amd64/ketypes.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h index c989b4be0ca..cd2083e20e3 100644 --- a/sdk/include/ndk/amd64/ketypes.h +++ b/sdk/include/ndk/amd64/ketypes.h @@ -125,11 +125,15 @@ typedef enum #define EFLAGS_TF 0x100L #define EFLAGS_INTERRUPT_MASK 0x200L #define EFLAGS_DF 0x400L +#define EFLAGS_IOPL 0x3000L #define EFLAGS_NESTED_TASK 0x4000L +//#define EFLAGS_NF 0x4000 +#define EFLAGS_RF 0x10000 #define EFLAGS_V86_MASK 0x20000 #define EFLAGS_ALIGN_CHECK 0x40000 #define EFLAGS_VIF 0x80000 #define EFLAGS_VIP 0x100000 +#define EFLAGS_ID 0x200000 #define EFLAGS_USER_SANITIZE 0x3F4DD7 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000

1 0

[reactos] 09/29: [NTOS] Do not force-align an integer value
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=662774bca3ab4e0d3fb48… commit 662774bca3ab4e0d3fb484074bad4cfb50a530f6 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 14:17:14 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [NTOS] Do not force-align an integer value --- ntoskrnl/include/internal/io.h | 2 +- ntoskrnl/io/pnpmgr/pnpirp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index e43f4769c94..12f9ebea0bc 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -1389,7 +1389,7 @@ PiIrpQueryDeviceRelations( NTSTATUS PiIrpQueryDeviceText( _In_ PDEVICE_NODE DeviceNode, - _In_ LCID POINTER_ALIGNMENT LocaleId, + _In_ LCID LocaleId, _In_ DEVICE_TEXT_TYPE Type, _Out_ PWSTR *DeviceText); diff --git a/ntoskrnl/io/pnpmgr/pnpirp.c b/ntoskrnl/io/pnpmgr/pnpirp.c index 48d924d6c7c..66e4382bdc6 100644 --- a/ntoskrnl/io/pnpmgr/pnpirp.c +++ b/ntoskrnl/io/pnpmgr/pnpirp.c @@ -200,7 +200,7 @@ PiIrpQueryDeviceRelations( NTSTATUS PiIrpQueryDeviceText( _In_ PDEVICE_NODE DeviceNode, - _In_ LCID POINTER_ALIGNMENT LocaleId, + _In_ LCID LocaleId, _In_ DEVICE_TEXT_TYPE Type, _Out_ PWSTR *DeviceText) { @@ -236,7 +236,7 @@ PiIrpQueryPnPDeviceState( PAGED_CODE(); ASSERT(DeviceNode); - ASSERT(DeviceNode->State == DeviceNodeStartPostWork || + ASSERT(DeviceNode->State == DeviceNodeStartPostWork || DeviceNode->State == DeviceNodeStarted); ULONG_PTR longState;

1 0

[reactos] 08/29: [FREELDR] Save used register when calling PNPBIOS
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d55276aad9496fe820b01… commit d55276aad9496fe820b017f272c73b6bf53220a3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 14:16:49 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [FREELDR] Save used register when calling PNPBIOS --- boot/freeldr/freeldr/arch/amd64/pnpbios.S | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/arch/amd64/pnpbios.S b/boot/freeldr/freeldr/arch/amd64/pnpbios.S index f97a9d8fb05..8dd44e933ca 100644 --- a/boot/freeldr/freeldr/arch/amd64/pnpbios.S +++ b/boot/freeldr/freeldr/arch/amd64/pnpbios.S @@ -104,7 +104,8 @@ pnp_not_found: PUBLIC PnpBiosGetDeviceNodeCount PnpBiosGetDeviceNodeCount: - /* Save param-regs */ + /* Save registers */ + push rbx push rcx push rdx @@ -115,6 +116,7 @@ PnpBiosGetDeviceNodeCount: /* Restore param-regs */ pop rdx pop rcx + pop rbx xor eax, eax mov ax, [BSS_PnpNodeSize] @@ -148,14 +150,16 @@ PnpBiosGetDeviceNode: and eax, HEX(0f) mov word ptr [BSS_PnpBiosBufferOffset], ax - /* Save rcx */ + /* Save registers */ push rcx + push rbx /* Call the real mode function */ mov bx, FNID_PnpBiosGetDeviceNode call CallRealMode - /* Restore rcx */ + /* Restore registers */ + pop rbx pop rcx /* update node number */

1 0

[reactos] 07/29: [FREELDR] Force alignment of .text section on disk
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2bf116359b5eadb163d2f… commit 2bf116359b5eadb163d2fee475cf2deff268eaeb Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 14:15:33 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [FREELDR] Force alignment of .text section on disk Fixes boot for clang & GCC-amd64 build Also rename freeldr_i386.lds to freeldr_gcc.lds for better clarity --- boot/freeldr/freeldr/CMakeLists.txt | 4 ++-- boot/freeldr/freeldr/{freeldr_i386.lds => freeldr_gcc.lds} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 980265dd54a..a76ce3e45e9 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -293,9 +293,9 @@ if(MSVC) remove_target_compile_option(freeldr_common "/hotpatch") else() add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200") - add_linker_script(freeldr_pe freeldr_i386.lds) + add_linker_script(freeldr_pe freeldr_gcc.lds) add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200") - add_linker_script(freeldr_pe_dbg freeldr_i386.lds) + add_linker_script(freeldr_pe_dbg freeldr_gcc.lds) endif() set_image_base(freeldr_pe 0x10000) diff --git a/boot/freeldr/freeldr/freeldr_i386.lds b/boot/freeldr/freeldr/freeldr_gcc.lds similarity index 98% rename from boot/freeldr/freeldr/freeldr_i386.lds rename to boot/freeldr/freeldr/freeldr_gcc.lds index 56df8f63ee1..1488ea2ef53 100644 --- a/boot/freeldr/freeldr/freeldr_i386.lds +++ b/boot/freeldr/freeldr/freeldr_gcc.lds @@ -1,6 +1,6 @@ SECTIONS { - .text __image_base__ + __section_alignment__ : + .text __image_base__ + __section_alignment__ : ALIGN(__file_alignment__) { *(.text) *(SORT(.text*))

1 0

[reactos] 06/29: [PSDK] Do not compare to max value if we can make sure that the value fits in target type
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7513cc9fca146b3da11b7… commit 7513cc9fca146b3da11b78160abe5c031bad9c89 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 10:28:11 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [PSDK] Do not compare to max value if we can make sure that the value fits in target type This fixes clang warning -Wtautological-constant-out-of-range-compare --- sdk/include/psdk/intsafe.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/psdk/intsafe.h b/sdk/include/psdk/intsafe.h index 2dc0954b152..6404ed33663 100644 --- a/sdk/include/psdk/intsafe.h +++ b/sdk/include/psdk/intsafe.h @@ -259,7 +259,7 @@ INTSAFE_NAME(_Name)( \ _In_ _TypeFrom Input, \ _Out_ _Deref_out_range_(==, Input) _TypeTo *pOutput) \ { \ - if (Input <= _TypeTo ## _MAX) \ + if ((sizeof(_TypeFrom) < sizeof(_TypeTo)) || (Input <= _TypeTo ## _MAX)) \ { \ *pOutput = (_TypeTo)Input; \ return INTSAFE_SUCCESS; \

1 0

[reactos] 05/29: [CRT] Add macros to disable diagnostics from GCC and clang
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4138329a14f75b2ab4ff… commit a4138329a14f75b2ab4fffed2d8fd24056a56db0 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Apr 12 10:07:35 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [CRT] Add macros to disable diagnostics from GCC and clang Instead of disabling them globally, this will help making finer grained decisions --- sdk/include/crt/crtdefs.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sdk/include/crt/crtdefs.h b/sdk/include/crt/crtdefs.h index 0162e7a46de..8ea3f85bdf5 100644 --- a/sdk/include/crt/crtdefs.h +++ b/sdk/include/crt/crtdefs.h @@ -38,6 +38,10 @@ #define _CRT_STRINGIZE(_Value) __CRT_STRINGIZE(_Value) #endif +#ifndef _CRT_DEFER_MACRO +#define _CRT_DEFER_MACRO(M,...) M(__VA_ARGS__) +#endif + #ifndef _CRT_WIDE #define __CRT_WIDE(_String) L ## _String #define _CRT_WIDE(_String) __CRT_WIDE(_String) @@ -440,4 +444,25 @@ typedef struct localeinfo_struct { #pragma pack(pop) +/* GCC-style diagnostics */ +#ifndef PRAGMA_DIAGNOSTIC_IGNORED +# ifdef __clang__ +# define PRAGMA_DIAGNOSTIC_PUSH() _Pragma("clang diagnostic push") +# define PRAGMA_DIAGNOSTIC_IGNORED(__x) \ + _Pragma(_CRT_STRINGIZE(clang diagnostic ignored _CRT_DEFER_MACRO(_CRT_STRINGIZE,__x))) +# define PRAGMA_DIAGNOSTIC_POP() _Pragma("clang diagnostic pop") +# elif defined (__GNUC__) +# define PRAGMA_DIAGNOSTIC_PUSH() _Pragma("GCC diagnostic push") +# define PRAGMA_DIAGNOSTIC_IGNORED(__x) \ + _Pragma("GCC diagnostic ignored \"-Wpragmas\"") /* This allows us to use it for unkonwn warnings */ \ + _Pragma(_CRT_STRINGIZE(GCC diagnostic ignored _CRT_DEFER_MACRO(_CRT_STRINGIZE,__x))) \ + _Pragma("GCC diagnostic error \"-Wpragmas\"") /* This makes sure that we don't have side effects because we disabled it for our own use. This will be popped anyway. */ +# define PRAGMA_DIAGNOSTIC_POP() _Pragma("GCC diagnostic pop") +# else +# define PRAGMA_DIAGNOSTIC_PUSH() +# define PRAGMA_DIAGNOSTIC_IGNORED(__x) +# define PRAGMA_DIAGNOSTIC_POP() +# endif +#endif + #endif /* !_INC_CRTDEFS */

1 0

[reactos] 04/29: [SDK] Make sure we build pefixup with AMD64 definitions
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1d1a21a9202380e371bae… commit 1d1a21a9202380e371bae200ee498dadefe6b2fc Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 19:21:25 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [SDK] Make sure we build pefixup with AMD64 definitions --- sdk/tools/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index 3b6bf1368f0..3f836f8e9bf 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -40,5 +40,8 @@ if(NOT MSVC) add_subdirectory(rsym) add_host_tool(pefixup pefixup.c) +if (ARCH STREQUAL "amd64") + target_compile_definitions(pefixup PRIVATE _TARGET_PE64) +endif() target_link_libraries(pefixup PRIVATE host_includes) endif()

1 0

[reactos] 03/29: [SDK] Fix definition of IMAGE_NT_HEADERS64 in host tools
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b513c61cd130b6e73ff7b… commit b513c61cd130b6e73ff7bb456edfd9aa7a41ec0d Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 27 09:56:23 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [SDK] Fix definition of IMAGE_NT_HEADERS64 in host tools --- sdk/include/host/pecoff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/host/pecoff.h b/sdk/include/host/pecoff.h index 74104075fb6..f96982e910a 100644 --- a/sdk/include/host/pecoff.h +++ b/sdk/include/host/pecoff.h @@ -188,7 +188,7 @@ typedef struct _IMAGE_NT_HEADERS64 { DWORD Signature; IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER32 OptionalHeader; + IMAGE_OPTIONAL_HEADER64 OptionalHeader; } IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64; #ifdef _TARGET_PE64

1 0

[reactos] 02/29: [COMPILER_APITEST] Disable SEH tests for GCC amd64 build
by Jérôme Gardou 28 Apr '21

28 Apr '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79bc62f206ef78ef232ab… commit 79bc62f206ef78ef232ab6758f4e4bda30ca9473 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Apr 9 16:52:53 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [COMPILER_APITEST] Disable SEH tests for GCC amd64 build --- modules/rostests/apitests/compiler/CMakeLists.txt | 12 +++++++++--- modules/rostests/apitests/compiler/testlist.c | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/rostests/apitests/compiler/CMakeLists.txt b/modules/rostests/apitests/compiler/CMakeLists.txt index 7bd2a6a6b22..1d98f54ddf6 100644 --- a/modules/rostests/apitests/compiler/CMakeLists.txt +++ b/modules/rostests/apitests/compiler/CMakeLists.txt @@ -1,15 +1,21 @@ -add_subdirectory(ms) +if (NOT (GCC AND (ARCH STREQUAL "amd64"))) + #FIXME _setjmp definitions in CRT headers is wrong + add_subdirectory(ms) + list(APPEND SOURCE ms_seh.c) +endif() list(APPEND SOURCE - ms_seh.c pseh.c pseh_cpp.cpp psehtest2.c testlist.c) add_executable(compiler_apitest ${SOURCE}) -target_link_libraries(compiler_apitest ms_seh_test wine ${PSEH_LIB}) +if (NOT (GCC AND (ARCH STREQUAL "amd64"))) + target_link_libraries(compiler_apitest ms_seh_test) +endif() +target_link_libraries(compiler_apitest wine ${PSEH_LIB}) set_module_type(compiler_apitest win32cui) add_importlibs(compiler_apitest msvcrt kernel32 ntdll) add_rostests_file(TARGET compiler_apitest) diff --git a/modules/rostests/apitests/compiler/testlist.c b/modules/rostests/apitests/compiler/testlist.c index f034cb93127..d73f7fd70bb 100644 --- a/modules/rostests/apitests/compiler/testlist.c +++ b/modules/rostests/apitests/compiler/testlist.c @@ -7,7 +7,9 @@ extern void func_pseh_cpp(void); const struct test winetest_testlist[] = { +#if !(defined(__GNUC__) && defined(_M_AMD64)) { "ms-seh", func_ms_seh }, +#endif { "pseh", func_pseh }, { "pseh_cpp", func_pseh_cpp }, { 0, 0 }

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