Ros-diffs August 2020

ros-diffs@reactos.org

27 participants
188 discussions

[reactos] 09/10: [CRT] Fix XMM intrinsics for clang. CORE-14306

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f86257259a21ef2aa5f02… commit f86257259a21ef2aa5f02356ada1862560dfcf2b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 17:21:24 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:10:11 2020 +0200 [CRT] Fix XMM intrinsics for clang. CORE-14306 --- sdk/include/crt/xmmintrin.h | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/sdk/include/crt/xmmintrin.h b/sdk/include/crt/xmmintrin.h index 59a1732875d..d84f8350a1f 100644 --- a/sdk/include/crt/xmmintrin.h +++ b/sdk/include/crt/xmmintrin.h @@ -11,6 +11,16 @@ #include <crtdefs.h> #include <mmintrin.h> +#ifdef __clang__ + +typedef float __v4sf __attribute__((__vector_size__(16))); +typedef signed int __v4si __attribute__((__vector_size__(16))); +typedef unsigned int __v4su __attribute__((__vector_size__(16))); + +typedef float __m128 __attribute__((__vector_size__(16), __aligned__(16))); + +#else /* __clang__ */ + typedef union _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128 { float m128_f32[4]; @@ -24,6 +34,8 @@ typedef union _DECLSPEC_INTRIN_TYPE _CRT_ALIGN(16) __m128 unsigned __int32 m128_u32[4]; } __m128; +#endif /* __clang__ */ + #ifdef __cplusplus extern "C" { @@ -39,18 +51,18 @@ unsigned int _mm_getcsr(void); #pragma intrinsic(_mm_getcsr) void _mm_setcsr(unsigned int); #pragma intrinsic(_mm_setcsr) + +#ifndef __clang__ #pragma intrinsic(_mm_xor_ps) #pragma intrinsic(_mm_div_ps) -#else +#endif /* __clang__ */ -#ifndef __INTRIN_INLINE -#ifdef __clang__ -#define __INTRIN_INLINE __forceinline -#else +#else /* _MSC_VER */ + +#if !defined(__INTRIN_INLINE) && !defined(__clang__) #define __ATTRIBUTE_ARTIFICIAL __attribute__((artificial)) #define __INTRIN_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) __ATTRIBUTE_ARTIFICIAL -#endif -#endif +#endif /* !__INTRIN_INLINE && !__clang__ */ /* * We can't use __builtin_ia32_* functions, @@ -67,7 +79,24 @@ __INTRIN_INLINE void _mm_setcsr(unsigned int val) { __asm__ __volatile__("ldmxcsr %0" : : "m"(val)); } -#endif +#endif /* _MSC_VER */ + +#ifdef __clang__ +#define __INTRIN_INLINE __forceinline + +/* + * Clang implements these as inline functions in the header instead of real builtins + */ +__INTRIN_INLINE __m128 _mm_xor_ps(__m128 a, __m128 b) +{ + return (__m128)((__v4su)a ^ (__v4su)b); +} + +__INTRIN_INLINE __m128 _mm_div_ps(__m128 a, __m128 b) +{ + return (__m128)((__v4sf)a / (__v4sf)b); +} +#endif /* __clang__ */ /* Alternate names */ #define _mm_cvtss_si32 _mm_cvt_ss2si

4 years, 4 months

[reactos] 08/10: [GITHUB] Enable Clang-Cl build in GitHub actions. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d04dcf75c74fa3f54c61c… commit d04dcf75c74fa3f54c61cc135c77ea09aa4d0def Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:36:14 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:10:11 2020 +0200 [GITHUB] Enable Clang-Cl build in GitHub actions. CORE-17202 --- .github/workflows/build.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b4cec87147..5c7d0ffc7dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,6 +55,41 @@ jobs: name: reactos-gcc-i386-${{github.sha}} path: build/livecd.iso + build-clang-cl-i386: + name: Clang-CL (i386) + runs-on: windows-latest + steps: + - name: Install packages + run: choco install ninja -y + - name: Install Flex and Bison + run: | + curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z + 7z x flexbison.7z -O${{github.workspace}}\bin + echo "::add-path::${{github.workspace}}\bin" + echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" + echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" + - name: Add CL to PATH + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64_x86 + - uses: actions/checkout@v2 + with: + path: src + - name: Configure + run: | + mkdir build + cd build + $env:PATH = "$env:PATH;$env:VCToolsInstallDir\..\..\Llvm\bin" + cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DUSE_CLANG_CL:BOOL=1 ${{github.workspace}}\src + - name: Build + working-directory: ${{github.workspace}}\build + run: cmake --build . + - name: Generate ISOs + working-directory: ${{github.workspace}}\build + run: | + cmake --build . --target bootcd + cmake --build . --target livecd + build-msvc-i386: name: MSVC (i386) runs-on: windows-latest

4 years, 4 months

[reactos] 07/10: [KERNEL32_APITEST] Enable SSE for TestSSEExceptions. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32f17b34f57f65ef9bf9e… commit 32f17b34f57f65ef9bf9eb989c6ffaa67c836e5f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:39:34 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:07:38 2020 +0200 [KERNEL32_APITEST] Enable SSE for TestSSEExceptions. CORE-17202 Clang will not let us use SSE intrinsics at all when compiling for a target that doesn't support SSE. Since this test is a special case, we can simply fix this by changing the options for one function. The alternative would be to use our own inline functions for the intrinsics instead of the builtins, like we do for GCC. --- modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c index e59d5e1e7d1..f3a8b1c1a85 100644 --- a/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c +++ b/modules/rostests/apitests/kernel32/SetUnhandledExceptionFilter.c @@ -102,6 +102,9 @@ static LONG WINAPI ExceptionFilterSSEException(LPEXCEPTION_POINTERS exp) return EXCEPTION_CONTINUE_EXECUTION; } +#ifdef __clang__ +__attribute__((__target__("sse"))) +#endif static VOID TestSSEExceptions(VOID) {

4 years, 4 months

[reactos] 06/10: [TELNET] Don't build this for clang due to compiler errors. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44ae567e396c8b6c68ae9… commit 44ae567e396c8b6c68ae90bc5c30b76c3fd83772 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:42:05 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:07:38 2020 +0200 [TELNET] Don't build this for clang due to compiler errors. CORE-17202 --- base/applications/network/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/base/applications/network/CMakeLists.txt b/base/applications/network/CMakeLists.txt index 4f95614999e..46246108408 100644 --- a/base/applications/network/CMakeLists.txt +++ b/base/applications/network/CMakeLists.txt @@ -10,7 +10,9 @@ add_subdirectory(netstat) add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) -add_subdirectory(telnet) +if(NOT USE_CLANG_CL) + add_subdirectory(telnet) +endif() add_subdirectory(tracert) add_subdirectory(whois) add_subdirectory(wlanconf)

4 years, 4 months

[reactos] 05/10: [FREELDR][NETKVM][ATL_APITEST] Pick the GCC code path for clang in some cases. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=794d00c303d05ecf64750… commit 794d00c303d05ecf6475069c2d4468d829f49b02 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:38:31 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:07:37 2020 +0200 [FREELDR][NETKVM][ATL_APITEST] Pick the GCC code path for clang in some cases. CORE-17202 --- boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 2 +- drivers/network/dd/netkvm/Common/ParaNdis-Oid.c | 2 +- modules/rostests/apitests/atl/CHeapPtrList.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index 4f70cf323bf..a87e1a28f91 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -676,7 +676,7 @@ WinLdrSetProcessorContext(void) __lidt(&IdtDesc); /* Jump to proper CS and clear prefetch queue */ -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__clang__) asm("ljmp $0x08, $1f\n" "1:\n"); #elif defined(_MSC_VER) diff --git a/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c b/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c index 8d54b445dca..0adfc4bc06f 100644 --- a/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c +++ b/drivers/network/dd/netkvm/Common/ParaNdis-Oid.c @@ -236,7 +236,7 @@ NDIS_STATUS ParaNdis_OidQueryCommon(PARANDIS_ADAPTER *pContext, tOidDesc *pOid) USHORT us; NDIS_PNP_CAPABILITIES PMCaps; } u; -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #define CONCATFIELD(object, field) object.##field #else #define CONCATFIELD(object, field) object.field diff --git a/modules/rostests/apitests/atl/CHeapPtrList.cpp b/modules/rostests/apitests/atl/CHeapPtrList.cpp index 41da433b427..43b0d3e21d6 100644 --- a/modules/rostests/apitests/atl/CHeapPtrList.cpp +++ b/modules/rostests/apitests/atl/CHeapPtrList.cpp @@ -102,7 +102,7 @@ START_TEST(CHeapPtrList) ok(g_OpenAllocations == 1, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); Ptr = test_Alloc(0x22222222); ok(g_OpenAllocations == 2, "Expected there to be 1 allocations, was: %ld\n", g_OpenAllocations); -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) heapPtr1.AddTail(CComHeapPtr<DWORD>(Ptr)); #else CComHeapPtr<DWORD> xxx(Ptr);

4 years, 4 months

[reactos] 04/10: [CMAKE] Explicitly target Pentium for clang. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a81788e5bfb95e2db2281… commit a81788e5bfb95e2db22812c268f35a6de59b793f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:41:32 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:07:37 2020 +0200 [CMAKE] Explicitly target Pentium for clang. CORE-17202 The MSVC-compatible /arch:IA32 option switches to i386 mode, which makes clang avoid 486/Pentium-specific instructions, e.g. cmpxchg8b. --- sdk/cmake/msvc.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 0039d71e9de..94847a84167 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -51,7 +51,12 @@ endif() # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507 if(ARCH STREQUAL "i386") - add_compile_flags("/arch:IA32") + # Clang's IA32 means i386, which doesn't have cmpxchg8b + if(USE_CLANG_CL) + add_compile_flags("-march=${OARCH}") + else() + add_compile_flags("/arch:IA32") + endif() endif() # VS 12+ requires /FS when used in parallel compilations

4 years, 4 months

[reactos] 03/10: [CMAKE] Use a space after /fo for the RC compiler to make clang happy. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8275c1f991bec2ce018af… commit 8275c1f991bec2ce018af24304ae30bb8d1d3f9b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:40:31 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:07:37 2020 +0200 [CMAKE] Use a space after /fo for the RC compiler to make clang happy. CORE-17202 --- sdk/cmake/msvc.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 5a5a8802443..0039d71e9de 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -177,7 +177,7 @@ if(MSVC_IDE) # For VS builds we'll only have en-US in resource files add_definitions(/DLANGUAGE_EN_US) else() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo<OBJECT> <SOURCE>") + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo <OBJECT> <SOURCE>") if(ARCH STREQUAL "arm") set(CMAKE_ASM_COMPILE_OBJECT "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp"

4 years, 4 months

[reactos] 02/10: [CRT] Make some more intrinsics conditional. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08550a504e6d9d85714ba… commit 08550a504e6d9d85714ba8d02b5114e60318c930 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:42:26 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:07:37 2020 +0200 [CRT] Make some more intrinsics conditional. CORE-17202 --- sdk/include/crt/mingw32/intrin_x86.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index 25f58316701..424bbc61d06 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -686,12 +686,14 @@ __INTRIN_INLINE long _InterlockedAddLargeStatistic(volatile long long * Addend, } #endif /* __i386__ */ +#if !HAS_BUILTIN(_interlockedbittestandreset) __INTRIN_INLINE unsigned char _interlockedbittestandreset(volatile long * a, long b) { unsigned char retval; __asm__("lock; btrl %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } +#endif #if defined(__x86_64__) __INTRIN_INLINE unsigned char _interlockedbittestandreset64(volatile long long * a, long long b) @@ -1008,6 +1010,7 @@ __INTRIN_INLINE unsigned char _BitScanReverse(unsigned long * Index, unsigned lo } #endif +#if !HAS_BUILTIN(_bittest) /* NOTE: again, the bizarre implementation follows Visual C++ */ __INTRIN_INLINE unsigned char _bittest(const long * a, long b) { @@ -1020,6 +1023,7 @@ __INTRIN_INLINE unsigned char _bittest(const long * a, long b) return retval; } +#endif #ifdef __x86_64__ __INTRIN_INLINE unsigned char _BitScanForward64(unsigned long * Index, unsigned long long Mask) @@ -1051,6 +1055,7 @@ __INTRIN_INLINE unsigned char _bittest64(const long long * a, long long b) } #endif +#if !HAS_BUILTIN(_bittestandcomplement) __INTRIN_INLINE unsigned char _bittestandcomplement(long * a, long b) { unsigned char retval; @@ -1062,7 +1067,9 @@ __INTRIN_INLINE unsigned char _bittestandcomplement(long * a, long b) return retval; } +#endif +#if !HAS_BUILTIN(_bittestandreset) __INTRIN_INLINE unsigned char _bittestandreset(long * a, long b) { unsigned char retval; @@ -1074,7 +1081,9 @@ __INTRIN_INLINE unsigned char _bittestandreset(long * a, long b) return retval; } +#endif +#if !HAS_BUILTIN(_bittestandset) __INTRIN_INLINE unsigned char _bittestandset(long * a, long b) { unsigned char retval; @@ -1086,6 +1095,7 @@ __INTRIN_INLINE unsigned char _bittestandset(long * a, long b) return retval; } +#endif #ifdef __x86_64__ @@ -1321,15 +1331,19 @@ __INTRIN_INLINE unsigned long long __cdecl _byteswap_uint64(unsigned long long v } #endif +#if !HAS_BUILTIN(__lzcnt) __INTRIN_INLINE unsigned int __lzcnt(unsigned int value) { return __builtin_clz(value); } +#endif +#if !HAS_BUILTIN(__lzcnt16) __INTRIN_INLINE unsigned short __lzcnt16(unsigned short value) { return __builtin_clz(value); } +#endif #if !HAS_BUILTIN(__popcnt) __INTRIN_INLINE unsigned int __popcnt(unsigned int value)

4 years, 4 months

[reactos] 01/10: [CMAKE] Avoid deprecated CMakeClDeps and CMakeForceCCompiler. CORE-17202

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40c5f7a8e224e9dac1202… commit 40c5f7a8e224e9dac120239603096a0ca149c9e8 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Aug 15 21:43:01 2020 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Aug 23 12:07:32 2020 +0200 [CMAKE] Avoid deprecated CMakeClDeps and CMakeForceCCompiler. CORE-17202 Also avoid now-unnecessary special-casing for ARM, and remove CMAKE_SYSTEM_PROCESSOR check that can never be true. --- toolchain-msvc.cmake | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index d1699c38d4a..f1ff2d77570 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -13,30 +13,14 @@ endif() set(CMAKE_SYSTEM_NAME Windows) set(CMAKE_SYSTEM_PROCESSOR i686) -# which compilers to use for C and C++ -# clang-cl gets detected as "Clang" instead of "MSVC" so we force it here if(USE_CLANG_CL) - include(CMakeForceCompiler) - CMAKE_FORCE_C_COMPILER(clang-cl MSVC) - set(CMAKE_C_COMPILER_VERSION "16.00.40219.01") - if(ARCH STREQUAL "i386") - set(MSVC_C_ARCHITECTURE_ID "X86") - endif() - include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake) + set(CMAKE_C_COMPILER clang-cl) + set(CMAKE_CXX_COMPILER clang-cl) + # Clang now defaults to lld-link which we're not compatible with yet + set(CMAKE_LINKER link) else() set(CMAKE_C_COMPILER cl) -endif() - -if(ARCH STREQUAL "arm") - include(CMakeForceCompiler) - CMAKE_FORCE_CXX_COMPILER(cl MSVC) -else() - if(USE_CLANG_CL) - include(CMakeForceCompiler) - CMAKE_FORCE_CXX_COMPILER(clang-cl MSVC) - else() - set(CMAKE_CXX_COMPILER cl) - endif() + set(CMAKE_CXX_COMPILER cl) endif() set(CMAKE_MC_COMPILER mc) @@ -50,12 +34,7 @@ elseif(ARCH STREQUAL "arm64") else() set(CMAKE_ASM_COMPILER ml) endif() -set(CMAKE_ASM_COMPILER_ID "VISUAL") set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") -if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") - add_definitions(-D__i386__) -endif() - set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-msvc.cmake")

4 years, 4 months

[reactos] 01/01: [SHELL32] Demote 2 noisy goodpath loggings to TRACE CORE-17216

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f363c27ab483da5530120… commit f363c27ab483da5530120aa53b96aa744b5a99f9 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Aug 23 00:35:02 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Aug 23 00:35:02 2020 +0200 [SHELL32] Demote 2 noisy goodpath loggings to TRACE CORE-17216 Those 2 did spam heavily when browsing folders with many .zip files within. Mark Jansen confirmed that this is good-path-logging and was just forgotten to be disabled earlier. --- dll/win32/shell32/folders/CFSFolder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index 9aa8281daa4..6adaba0d47c 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -645,14 +645,14 @@ HRESULT SHELL32_GetFSItemAttributes(IShellFolder * psf, LPCITEMIDLIST pidl, LPDW Status = SHRegGetValueW(hkey, NULL, L"Attributes", RRF_RT_REG_DWORD, NULL, &dwAttributes, &dwSize); if (Status == STATUS_SUCCESS) { - ERR("Augmenting '%S' with dwAttributes=0x%x\n", szFileName, dwAttributes); + TRACE("Augmenting '%S' with dwAttributes=0x%x\n", szFileName, dwAttributes); dwShellAttributes |= dwAttributes; } ::RegCloseKey(hkey); // This should be presented as directory! bDirectory = TRUE; - ERR("Treating '%S' as directory!\n", szFileName); + TRACE("Treating '%S' as directory!\n", szFileName); } } }

4 years, 4 months

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

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 August 2020