Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 14/19: [RAPPS] Do not implicitly cast pointer to BOOL
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a52db76c5fe24f71c662… commit 7a52db76c5fe24f71c66231bebabac3af7a8f5ab Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 16:05:12 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [RAPPS] Do not implicitly cast pointer to BOOL --- base/applications/rapps/include/rosui.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/base/applications/rapps/include/rosui.h b/base/applications/rapps/include/rosui.h index 0aaf303b017..4402b26f28b 100644 --- a/base/applications/rapps/include/rosui.h +++ b/base/applications/rapps/include/rosui.h @@ -96,9 +96,13 @@ public: BOOL RemoveAt(INT i) { - T* ptr = (T*) DPA_GetPtr(m_hDpa, i); - OnRemoveItem(ptr); - return DPA_DeletePtr(m_hDpa, i); + PVOID ptr = DPA_DeletePtr(m_hDpa, i); + if (ptr != NULL) + { + OnRemoveItem(reinterpret_cast<T*>(ptr)); + return TRUE; + } + return FALSE; } BOOL Clear()

1 0

[reactos] 13/19: [ATL] Declare pointer as return type for functions returning pointers
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0abd14b03f7c737148b9… commit b0abd14b03f7c737148b96d96f9c25a15d192119 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 15:59:55 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [ATL] Declare pointer as return type for functions returning pointers --- sdk/lib/atl/atlpath.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk/lib/atl/atlpath.h b/sdk/lib/atl/atlpath.h index 7f476d45239..942b47f638f 100644 --- a/sdk/lib/atl/atlpath.h +++ b/sdk/lib/atl/atlpath.h @@ -23,10 +23,10 @@ class CPathT // const inline BOOL PathFileExistsX(LPCSTR pszPath) { return PathFileExistsA(pszPath); } inline BOOL PathFileExistsX(LPCWSTR pszPath) { return PathFileExistsW(pszPath); } - inline int PathFindExtensionX(LPCSTR pszPath) { return PathFindExtensionA(pszPath); } - inline int PathFindExtensionX(LPCWSTR pszPath) { return PathFindExtensionW(pszPath); } - inline int PathFindFileNameX(LPCSTR pszPath) { return PathFindFileNameA(pszPath); } - inline int PathFindFileNameX(LPCWSTR pszPath) { return PathFindFileNameW(pszPath); } + inline LPCSTR PathFindExtensionX(LPCSTR pszPath) { return PathFindExtensionA(pszPath); } + inline LPCWSTR PathFindExtensionX(LPCWSTR pszPath) { return PathFindExtensionW(pszPath); } + inline LPCSTR PathFindFileNameX(LPCSTR pszPath) { return PathFindFileNameA(pszPath); } + inline LPCWSTR PathFindFileNameX(LPCWSTR pszPath) { return PathFindFileNameW(pszPath); } inline int PathGetDriveNumberX(LPCSTR pszPath) { return PathGetDriveNumberA(pszPath); } inline int PathGetDriveNumberX(LPCWSTR pszPath) { return PathGetDriveNumberW(pszPath); } inline BOOL PathIsDirectoryX(LPCSTR pszPath) { return PathIsDirectoryA(pszPath); } @@ -49,8 +49,8 @@ class CPathT inline BOOL PathIsUNCServerShareX(LPCWSTR pszPath) { return PathIsUNCServerShareW(pszPath); } inline BOOL PathMatchSpecX(LPCSTR pszPath, LPCSTR pszSpec) { return PathMatchSpecA(pszPath, pszSpec); } inline BOOL PathMatchSpecX(LPCWSTR pszPath, LPCWSTR pszSpec) { return PathMatchSpecW(pszPath, pszSpec); } - inline int PathSkipRootX(LPCSTR pszPath) { return PathSkipRootA(pszPath); } - inline int PathSkipRootX(LPCWSTR pszPath) { return PathSkipRootW(pszPath); } + inline LPCSTR PathSkipRootX(LPCSTR pszPath) { return PathSkipRootA(pszPath); } + inline LPCWSTR PathSkipRootX(LPCWSTR pszPath) { return PathSkipRootW(pszPath); } // non-const inline void PathAddBackslashX(LPSTR pszPath) { PathAddBackslashA(pszPath); }

1 0

[reactos] 12/19: [EXT2FS] Use GNU89 standard when using CLang
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f424d524882efbd06e85a… commit f424d524882efbd06e85aad1e36fbd7aa8bb60ce Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 13:28:34 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [EXT2FS] Use GNU89 standard when using CLang --- drivers/filesystems/ext2/CMakeLists.txt | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/filesystems/ext2/CMakeLists.txt b/drivers/filesystems/ext2/CMakeLists.txt index 38851437730..dbd8cc84925 100644 --- a/drivers/filesystems/ext2/CMakeLists.txt +++ b/drivers/filesystems/ext2/CMakeLists.txt @@ -92,23 +92,32 @@ if(USE_CLANG_CL) set_property(SOURCE src/create.c src/fileinfo.c src/memory.c src/read.c APPEND_STRING PROPERTY COMPILE_FLAGS " /fallback") endif() -if(MSVC AND (NOT USE_CLANG_CL)) +if(MSVC) # Disable warnings: "unreferenced local variable", "initialized, but not used variable", "benign include" - remove_target_compile_option(ext2fs "/we4101") - remove_target_compile_option(ext2fs "/we4189") - target_compile_options(ext2fs PRIVATE /wd4189 /wd4142 /wd4101) + if (NOT CLANG) + remove_target_compile_option(ext2fs "/we4101") + remove_target_compile_option(ext2fs "/we4189") + target_compile_options(ext2fs PRIVATE /wd4189 /wd4142 /wd4101) + endif() else() - target_compile_options(ext2fs PRIVATE -Wno-pointer-sign -Wno-unused-function) - target_compile_options(ext2fs PRIVATE -Wno-unused-variable -Wno-missing-braces) - if(USE_CLANG_CL) - target_compile_options(ext2fs PRIVATE -Wno-unused-value -Wno-parentheses-equality) - target_compile_options(ext2fs PRIVATE -Wno-incompatible-pointer-types-discards-qualifiers) - target_compile_options(ext2fs PRIVATE "-Wno-#pragma-messages;-Wno-cast-calling-convention") - else() + target_compile_options(ext2fs PRIVATE + -Wno-pointer-sign -Wno-unused-function + -Wno-unused-variable -Wno-missing-braces) + if (NOT CLANG) target_compile_options(ext2fs PRIVATE -Wno-unused-but-set-variable) endif() endif() +if(CLANG) + target_compile_options(ext2fs PRIVATE + -Wno-unused-value -Wno-parentheses-equality + -Wno-incompatible-pointer-types-discards-qualifiers + "-Wno-#pragma-messages;-Wno-cast-calling-convention") + if (GCC) + target_compile_options(ext2fs PRIVATE -std=gnu89) + endif() +endif() + target_link_libraries(ext2fs memcmp ${PSEH_LIB}) add_definitions(-D__KERNEL__ -D_CRT_NO_POSIX_ERROR_CODES) set_module_type(ext2fs kernelmodedriver)

1 0

[reactos] 11/19: [CDFS] Use GNU89 standard when using CLang
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cab3e62f0ee6746b067fb… commit cab3e62f0ee6746b067fbdf8ec174b308e714dcd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 13:28:08 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [CDFS] Use GNU89 standard when using CLang --- drivers/filesystems/cdfs/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 2f1d4526c3e..3e35991bfa0 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -38,3 +38,9 @@ target_link_libraries(cdfs ${PSEH_LIB} memcmp) add_importlibs(cdfs ntoskrnl hal) add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) add_registry_inf(cdfs_reg.inf) + +if (CLANG AND GCC) + # Make __inline work as expected + target_compile_options(cdfs PRIVATE -std=gnu89) +endif() +

1 0

[reactos] 10/19: [MSVCRT] make some functions static
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c4c25e468e5bbc04594c… commit 2c4c25e468e5bbc04594c66483a2f6eb81aff591 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 12:54:46 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [MSVCRT] make some functions static --- dll/win32/msvcrt/stubs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msvcrt/stubs.c b/dll/win32/msvcrt/stubs.c index e120a130cc8..72b32222091 100644 --- a/dll/win32/msvcrt/stubs.c +++ b/dll/win32/msvcrt/stubs.c @@ -96,7 +96,7 @@ typedef struct __crt_locale_data_public unsigned int _locale_lc_codepage; } __crt_locale_data_public; -__inline +static __crt_locale_data_public* __CRTDECL __acrt_get_locale_data_prefix( @@ -106,7 +106,7 @@ __acrt_get_locale_data_prefix( return (__crt_locale_data_public*)_TypedLocalePointers->locinfo; } -__inline +static int __CRTDECL __acrt_locale_get_ctype_array_value( @@ -137,7 +137,7 @@ const unsigned short* __cdecl __pctype_func(void); #define __chvalidchk(a, b) (__acrt_locale_get_ctype_array_value(__PCTYPE_FUNC, (a), (b))) #endif -__inline +static int __CRTDECL _chvalidchk_l( @@ -158,7 +158,7 @@ _chvalidchk_l( #endif } -__inline +static int __CRTDECL _ischartype_l(

1 0

[reactos] 09/19: [CRT] Use ASM aliases for CLang builds
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=281389b7e73970fb93b07… commit 281389b7e73970fb93b075adc3335a8090cc77fa Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 12:54:06 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [CRT] Use ASM aliases for CLang builds --- sdk/lib/crt/stdlib/rot.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sdk/lib/crt/stdlib/rot.c b/sdk/lib/crt/stdlib/rot.c index 3c4b613a3a6..51a6a6c0218 100644 --- a/sdk/lib/crt/stdlib/rot.c +++ b/sdk/lib/crt/stdlib/rot.c @@ -19,8 +19,16 @@ #pragma function(_rotr, _rotl, _rotr, _lrotl, _lrotr) #endif -unsigned int _rotr( unsigned int value, int shift ); -unsigned long _lrotr(unsigned long value, int shift); +#if defined (__clang__) && !defined(_MSC_VER) +#define ASM_ALIAS __asm__ +#else +#define ASM_ALIAS(x) +#endif + +unsigned int _rotr( unsigned int value, int shift ) ASM_ALIAS("__rotr"); +unsigned long _lrotr(unsigned long value, int shift) ASM_ALIAS("__lrotr"); +unsigned int _rotl( unsigned int value, int shift ) ASM_ALIAS("__rotl"); +unsigned long _lrotl( unsigned long value, int shift ) ASM_ALIAS("__lrotl"); /* * @implemented

1 0

[reactos] 08/19: [NFS41_DRIVER] Use GNU89 standard when compiling with CLang.
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=567a5231d5a8b00327146… commit 567a5231d5a8b00327146e651464ff4ef791013b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 12:04:25 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [NFS41_DRIVER] Use GNU89 standard when compiling with CLang. --- drivers/filesystems/nfs/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/filesystems/nfs/CMakeLists.txt b/drivers/filesystems/nfs/CMakeLists.txt index 9845ef76814..3d05ff676c6 100644 --- a/drivers/filesystems/nfs/CMakeLists.txt +++ b/drivers/filesystems/nfs/CMakeLists.txt @@ -14,10 +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(USE_CLANG_CL OR (NOT MSVC)) +if(GCC OR CLANG) target_compile_options(nfs41_driver PRIVATE "-Wno-switch") - if(USE_CLANG_CL) + if(CLANG) target_compile_options(nfs41_driver PRIVATE "-Wno-unused-value") + if(GCC) + # When CLang mimicks GCC, it uses C17 as default, which breaks __inline + target_compile_options(nfs41_driver PRIVATE "-std=gnu89") + endif() endif() endif()

1 0

[reactos] 07/19: [STORAHCI] Use FORCEINLINE instead of __inline
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f8db9824e0edf1aa5225… commit 1f8db9824e0edf1aa522537cbde575c17dbef9c3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 09:45:03 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [STORAHCI] Use FORCEINLINE instead of __inline --- drivers/storage/port/storahci/storahci.c | 4 ++-- drivers/storage/port/storahci/storahci.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/storage/port/storahci/storahci.c b/drivers/storage/port/storahci/storahci.c index ed94f1d3e87..bf4c96d04c1 100644 --- a/drivers/storage/port/storahci/storahci.c +++ b/drivers/storage/port/storahci/storahci.c @@ -2559,7 +2559,7 @@ RemoveQueue ( * return SrbExtension * */ -__inline +FORCEINLINE PAHCI_SRB_EXTENSION GetSrbExtension ( __in PSCSI_REQUEST_BLOCK Srb @@ -2615,4 +2615,4 @@ AhciGetLba ( } return lba; -}// -- AhciGetLba(); \ No newline at end of file +}// -- AhciGetLba(); diff --git a/drivers/storage/port/storahci/storahci.h b/drivers/storage/port/storahci/storahci.h index fba3f2d4be5..40c08f2f462 100644 --- a/drivers/storage/port/storahci/storahci.h +++ b/drivers/storage/port/storahci/storahci.h @@ -645,7 +645,7 @@ RemoveQueue ( __inout PAHCI_QUEUE Queue ); -__inline +FORCEINLINE PAHCI_SRB_EXTENSION GetSrbExtension( __in PSCSI_REQUEST_BLOCK Srb

1 0

[reactos] 06/19: [NTOSKRNL] Link memcmp to the import lib when using CLang
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e00922a0fe09687bbd751… commit e00922a0fe09687bbd7518aa95a9142e457d82d3 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 09:41:48 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [NTOSKRNL] Link memcmp to the import lib when using CLang CLang performs some optimisations on e.g. strcmp, but memcmp is not exported by ntoskrnl --- ntoskrnl/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 13ca75e351a..84125c75c9b 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -12,6 +12,11 @@ set(NTKRNLMP_ASM_SOURCE ${ASM_SOURCE}) spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB) add_asm_files(ntoskrnl_asm ${NTOSKRNL_ASM_SOURCE}) +if (GCC AND CLANG) + # Clang optimises strcmp calls to memcmp. + target_link_libraries(libntoskrnl INTERFACE memcmp) +endif() + list(APPEND PCH_SKIP_SOURCE guid.c)

1 0

[reactos] 05/19: [NDIS] Use FORCEINLINE instead of __inline
by Jérôme Gardou 16 Nov '20

16 Nov '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=378642eb4f4ea1122e41b… commit 378642eb4f4ea1122e41bf61bd7323f0fb9d5ccb Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Mon Nov 9 09:15:57 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Mon Nov 16 16:58:10 2020 +0100 [NDIS] Use FORCEINLINE instead of __inline --- drivers/network/ndis/ndis/buffer.c | 8 +++++--- drivers/network/ndis/ndis/misc.c | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/network/ndis/ndis/buffer.c b/drivers/network/ndis/ndis/buffer.c index 4c00fa96d6f..f03f52ae94d 100644 --- a/drivers/network/ndis/ndis/buffer.c +++ b/drivers/network/ndis/ndis/buffer.c @@ -10,7 +10,9 @@ #include <ndissys.h> -__inline ULONG SkipToOffset( +FORCEINLINE +ULONG +SkipToOffset( IN PNDIS_BUFFER Buffer, IN UINT Offset, IN OUT PUCHAR *Data, @@ -481,7 +483,7 @@ NdisAllocatePacketPoolEx( NumberOfDescriptors = 0xffff; } - Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + + Length = sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + sizeof(NDIS_PACKET_EXTENSION) + ProtocolReservedLength; Size = sizeof(NDISI_PACKET_POOL) + Length * NumberOfDescriptors; @@ -1163,7 +1165,7 @@ EXPORT NdisPacketSize( IN UINT ProtocolReservedSize) { - return sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + + return sizeof(NDIS_PACKET) + sizeof(NDIS_PACKET_OOB_DATA) + sizeof(NDIS_PACKET_EXTENSION) + ProtocolReservedSize; } diff --git a/drivers/network/ndis/ndis/misc.c b/drivers/network/ndis/ndis/misc.c index 19755c5ed87..71e64c12cde 100644 --- a/drivers/network/ndis/ndis/misc.c +++ b/drivers/network/ndis/ndis/misc.c @@ -125,14 +125,14 @@ typedef struct _NDIS_HANDLE_OBJECT PVOID MapBuffer; } NDIS_HANDLE_OBJECT, *PNDIS_HANDLE_OBJECT; -__inline +FORCEINLINE PNDIS_HANDLE_OBJECT NDIS_HANDLE_TO_POBJECT ( NDIS_HANDLE handle ) { return (PNDIS_HANDLE_OBJECT)handle; } -__inline +FORCEINLINE NDIS_HANDLE NDIS_POBJECT_TO_HANDLE ( PNDIS_HANDLE_OBJECT obj ) { @@ -289,7 +289,7 @@ NdisOpenFile( FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions 0, // PVOID EaBuffer 0 ); // ULONG EaLength - + if ( !NT_SUCCESS(*Status) ) { NDIS_DbgPrint(MIN_TRACE, ("ZwCreateFile failed (%x) Name %wZ\n", *Status, FileName)); @@ -346,7 +346,7 @@ NdisGetCurrentProcessorCounts( { NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG) pIndex); + ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG) pIndex); } @@ -356,7 +356,7 @@ NdisGetCurrentProcessorCounts( VOID EXPORT NdisGetSystemUpTime(OUT PULONG pSystemUpTime) -{ +{ ULONG Increment; LARGE_INTEGER TickCount;

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