Ros-diffs

ros-diffs@reactos.org

81390 discussions

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bb12665d6fd1d1f57241… commit 7bb12665d6fd1d1f57241fbc400b77b0a31d8aee Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Oct 11 14:52:11 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add CMake files --- CMakeLists.txt | 2 +- sdk/lib/CMakeLists.txt | 1 + sdk/lib/ucrt/CMakeLists.txt | 126 +++++++++++++++++++++++++++ sdk/lib/ucrt/conio/conio.cmake | 17 ++++ sdk/lib/ucrt/convert/convert.cmake | 42 +++++++++ sdk/lib/ucrt/dll/dll.cmake | 5 ++ sdk/lib/ucrt/env/env.cmake | 10 +++ sdk/lib/ucrt/exec/exec.cmake | 13 +++ sdk/lib/ucrt/filesystem/filesystem.cmake | 25 ++++++ sdk/lib/ucrt/heap/heap.cmake | 28 ++++++ sdk/lib/ucrt/initializers/initializers.cmake | 24 +++++ sdk/lib/ucrt/internal/internal.cmake | 17 ++++ sdk/lib/ucrt/locale/locale.cmake | 25 ++++++ sdk/lib/ucrt/lowio/lowio.cmake | 25 ++++++ sdk/lib/ucrt/mbstring/mbstring.cmake | 93 ++++++++++++++++++++ sdk/lib/ucrt/misc/misc.cmake | 34 ++++++++ sdk/lib/ucrt/startup/startup.cmake | 13 +++ sdk/lib/ucrt/stdio/stdio.cmake | 52 +++++++++++ sdk/lib/ucrt/stdlib/stdlib.cmake | 24 +++++ sdk/lib/ucrt/string/string.cmake | 58 ++++++++++++ sdk/lib/ucrt/time/time.cmake | 21 +++++ 21 files changed, 654 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38f70b17f63..b51f6f25dea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,7 +256,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to elseif(ARCH STREQUAL "amd64") # clang-cl defines this one for itself if (NOT (MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")) - add_compile_definitions(_M_AMD64) + add_compile_definitions(_M_AMD64 _M_X64) endif() add_definitions(-D_AMD64_ -D__x86_64__ -D_WIN64) elseif(ARCH STREQUAL "arm") diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index 34dc04870fd..e50c21cad8c 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -52,6 +52,7 @@ add_subdirectory(strmiids) add_subdirectory(smlib) add_subdirectory(tdilib) add_subdirectory(tzlib) +add_subdirectory(ucrt) add_subdirectory(udmihelp) add_subdirectory(uuid) add_subdirectory(wdmguid) diff --git a/sdk/lib/ucrt/CMakeLists.txt b/sdk/lib/ucrt/CMakeLists.txt new file mode 100644 index 00000000000..4c2b2e18559 --- /dev/null +++ b/sdk/lib/ucrt/CMakeLists.txt @@ -0,0 +1,126 @@ + +set(CMAKE_CXX_STANDARD 17) + +# Replace the old CRT include directory with the UCRT include directory +get_property(INCLUDE_DIRS DIRECTORY . PROPERTY INCLUDE_DIRECTORIES) +list(REMOVE_ITEM INCLUDE_DIRS "${REACTOS_SOURCE_DIR}/sdk/include/crt") +set_property(DIRECTORY . PROPERTY INCLUDE_DIRECTORIES ${INCLUDE_DIRS}) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/ucrt) + +if(MSVC) + # Disable warning C4083: expected ')'; found identifier '<warning identifier>' + add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4083>) + + # Disable warning C4189: 'cvt': local variable is initialized but not referenced + add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4189>) +endif() + +# Internal includes +include_directories(BEFORE inc) + +if(${ARCH} STREQUAL "i386") + include_directories(inc/i386) +endif() + +remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) +add_compile_definitions( + WINVER=0x600 + _WIN32_WINNT=0x600 + _UCRT + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY + _GCC_NO_SAL_ATTRIIBUTES + CRTDLL +) + +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR + CMAKE_C_COMPILER_ID STREQUAL "Clang") + # Silence GCC/Clang warnings + add_compile_options( + -Wno-unknown-warning-option + -Wno-unused-function + -Wno-unknown-pragmas + -Wno-builtin-declaration-mismatch + -Wno-parentheses + -Wno-unused-variable + -Wno-sign-compare + -Wno-enum-compare + -Wno-switch + -Wno-write-strings + -Wno-comment + -Wno-narrowing + -Wno-misleading-indentation + -Wno-missing-braces + -Wno-unused-value + -Wno-unused-local-typedef + -Wno-unused-function + -Wno-writable-strings + -Wno-microsoft-template + -Wno-switch + -Wno-ignored-pragmas + -Wno-empty-body + -Wno-tautological-constant-out-of-range-compare + -Wno-ignored-attributes + -Wno-uninitialized + ) + add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-reorder>) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_definitions( + _lrotl=___lrotl + _rotl=___rotl + _rotl64=___rotl64 + _lrotr=___lrotr + _rotr=___rotr + _rotr64=___rotr64 + ) +endif() + +# Hack until we support globally defining _DEBUG +if(DBG) + add_compile_definitions(_DEBUG) +endif() + +include(conio/conio.cmake) +include(convert/convert.cmake) +include(dll/dll.cmake) +include(env/env.cmake) +include(exec/exec.cmake) +include(filesystem/filesystem.cmake) +include(heap/heap.cmake) +include(initializers/initializers.cmake) +include(internal/internal.cmake) +include(locale/locale.cmake) +include(lowio/lowio.cmake) +include(mbstring/mbstring.cmake) +include(misc/misc.cmake) +include(startup/startup.cmake) +include(stdio/stdio.cmake) +include(stdlib/stdlib.cmake) +include(string/string.cmake) +include(time/time.cmake) + +add_library(ucrt OBJECT + ${UCRT_CONIO_SOURCES} + ${UCRT_CONVERT_SOURCES} + ${UCRT_DLL_SOURCES} + ${UCRT_ENV_SOURCES} + ${UCRT_EXEC_SOURCES} + ${UCRT_FILESYSTEM_SOURCES} + ${UCRT_HEAP_SOURCES} + ${UCRT_INITIALIZERS_SOURCES} + ${UCRT_INTERNAL_SOURCES} + ${UCRT_LOCALE_SOURCES} + ${UCRT_LOWIO_SOURCES} + ${UCRT_MBSTRING_SOURCES} + ${UCRT_MISC_SOURCES} + ${UCRT_STARTUP_SOURCES} + ${UCRT_STDIO_SOURCES} + ${UCRT_STDLIB_SOURCES} + ${UCRT_STRING_SOURCES} + ${UCRT_TIME_SOURCES} +) + +#target_link_libraries(ucrt pseh) +add_dependencies(ucrt psdk asm) diff --git a/sdk/lib/ucrt/conio/conio.cmake b/sdk/lib/ucrt/conio/conio.cmake new file mode 100644 index 00000000000..7e6e7842f28 --- /dev/null +++ b/sdk/lib/ucrt/conio/conio.cmake @@ -0,0 +1,17 @@ + +list(APPEND UCRT_CONIO_SOURCES + conio/cgets.cpp + conio/cgetws.cpp + conio/cprintf.cpp + conio/cputs.cpp + conio/cputws.cpp + conio/cscanf.cpp + conio/getch.cpp + conio/getwch.cpp + conio/initcon.cpp + conio/initconin.cpp + conio/pipe.cpp + conio/popen.cpp + conio/putch.cpp + conio/putwch.cpp +) diff --git a/sdk/lib/ucrt/convert/convert.cmake b/sdk/lib/ucrt/convert/convert.cmake new file mode 100644 index 00000000000..90f9bb5008b --- /dev/null +++ b/sdk/lib/ucrt/convert/convert.cmake @@ -0,0 +1,42 @@ + +list(APPEND UCRT_CONVERT_SOURCES + convert/atof.cpp + convert/atoldbl.cpp + convert/atox.cpp + convert/c16rtomb.cpp + convert/c32rtomb.cpp + convert/cfout.cpp + convert/common_utf8.cpp + convert/cvt.cpp + convert/fcvt.cpp + convert/fp_flags.cpp + convert/gcvt.cpp + convert/isctype.cpp + convert/ismbstr.cpp + convert/iswctype.cpp + convert/mblen.cpp + convert/mbrtoc16.cpp + convert/mbrtoc32.cpp + convert/mbrtowc.cpp + convert/mbstowcs.cpp + convert/mbtowc.cpp + convert/strtod.cpp + convert/strtox.cpp + convert/swab.cpp + convert/tolower_toupper.cpp + convert/towlower.cpp + convert/towupper.cpp + convert/wcrtomb.cpp + convert/wcstombs.cpp + convert/wctomb.cpp + convert/wctrans.cpp + convert/wctype.cpp + convert/xtoa.cpp + convert/_ctype.cpp + convert/_fptostr.cpp + convert/_mbslen.cpp + convert/_wctype.cpp +) + +# All multibyte string functions require the _MBCS macro to be defined +set_source_files_properties(convert/ismbstr.cpp PROPERTIES COMPILE_DEFINITIONS _MBCS) diff --git a/sdk/lib/ucrt/dll/dll.cmake b/sdk/lib/ucrt/dll/dll.cmake new file mode 100644 index 00000000000..b8984d43bc5 --- /dev/null +++ b/sdk/lib/ucrt/dll/dll.cmake @@ -0,0 +1,5 @@ + +list(APPEND UCRT_DLL_SOURCES + dll/appcrt_dllmain.cpp + dll/empty.cpp +) diff --git a/sdk/lib/ucrt/env/env.cmake b/sdk/lib/ucrt/env/env.cmake new file mode 100644 index 00000000000..891dceb27f5 --- /dev/null +++ b/sdk/lib/ucrt/env/env.cmake @@ -0,0 +1,10 @@ + +list(APPEND UCRT_ENV_SOURCES + env/environment_initialization.cpp + env/getenv.cpp + env/getpath.cpp + env/get_environment_from_os.cpp + env/putenv.cpp + env/searchenv.cpp + env/setenv.cpp +) diff --git a/sdk/lib/ucrt/exec/exec.cmake b/sdk/lib/ucrt/exec/exec.cmake new file mode 100644 index 00000000000..f9810c50999 --- /dev/null +++ b/sdk/lib/ucrt/exec/exec.cmake @@ -0,0 +1,13 @@ + +list(APPEND UCRT_EXEC_SOURCES + exec/cenvarg.cpp + exec/exec.cmake + exec/getproc.cpp + exec/loaddll.cpp + exec/spawnl.cpp + exec/spawnlp.cpp + exec/spawnv.cpp + exec/spawnvp.cpp + exec/system.cpp + exec/wait.cpp +) diff --git a/sdk/lib/ucrt/filesystem/filesystem.cmake b/sdk/lib/ucrt/filesystem/filesystem.cmake new file mode 100644 index 00000000000..77685b23ec5 --- /dev/null +++ b/sdk/lib/ucrt/filesystem/filesystem.cmake @@ -0,0 +1,25 @@ + +list(APPEND UCRT_FILESYSTEM_SOURCES + filesystem/access.cpp + filesystem/chmod.cpp + filesystem/findfile.cpp + filesystem/fullpath.cpp + filesystem/makepath.cpp + filesystem/mkdir.cpp + filesystem/rename.cpp + filesystem/rmdir.cpp + filesystem/splitpath.cpp + filesystem/stat.cpp + filesystem/unlink.cpp + filesystem/waccess.cpp + filesystem/wchmod.cpp + filesystem/wmkdir.cpp + filesystem/wrename.cpp + filesystem/wrmdir.cpp + filesystem/wunlink.cpp +) + +if(MSVC) + # Disable warning C4838: conversion from 'int' to 'size_t' requires a narrowing conversion + set_source_files_properties(filesystem/splitpath.cpp PROPERTIES COMPILE_FLAGS "/wd4838") +endif() diff --git a/sdk/lib/ucrt/heap/heap.cmake b/sdk/lib/ucrt/heap/heap.cmake new file mode 100644 index 00000000000..1d3b30c0c34 --- /dev/null +++ b/sdk/lib/ucrt/heap/heap.cmake @@ -0,0 +1,28 @@ + +list(APPEND UCRT_HEAP_SOURCES + heap/align.cpp + heap/calloc.cpp + heap/calloc_base.cpp + heap/expand.cpp + heap/free.cpp + heap/free_base.cpp + heap/heapchk.cpp + heap/heapmin.cpp + heap/heapwalk.cpp + heap/heap_handle.cpp + heap/malloc.cpp + heap/malloc_base.cpp + heap/msize.cpp + heap/new_handler.cpp + heap/new_mode.cpp + heap/realloc.cpp + heap/realloc_base.cpp + heap/recalloc.cpp +) + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND UCRT_HEAP_SOURCES + heap/debug_heap.cpp + heap/debug_heap_hook.cpp + ) +endif() diff --git a/sdk/lib/ucrt/initializers/initializers.cmake b/sdk/lib/ucrt/initializers/initializers.cmake new file mode 100644 index 00000000000..1f2944cac86 --- /dev/null +++ b/sdk/lib/ucrt/initializers/initializers.cmake @@ -0,0 +1,24 @@ + +list(APPEND UCRT_INITIALIZERS_SOURCES + initializers/clock_initializer.cpp + initializers/console_input_initializer.cpp + initializers/console_output_initializer.cpp + initializers/fmode_initializer.cpp + initializers/locale_initializer.cpp + initializers/multibyte_initializer.cpp + initializers/stdio_initializer.cpp + initializers/timeset_initializer.cpp + initializers/tmpfile_initializer.cpp +) + +if(${ARCH} STREQUAL "i386") + list(APPEND UCRT_INITIALIZERS_SOURCES + initializers/i386/sse2_initializer.cpp + ) +endif() + +if(${ARCH} STREQUAL "amd64" OR ${ARCH} STREQUAL "arm64") + list(APPEND UCRT_INITIALIZERS_SOURCES + initializers/fma3_initializer.cpp + ) +endif() diff --git a/sdk/lib/ucrt/internal/internal.cmake b/sdk/lib/ucrt/internal/internal.cmake new file mode 100644 index 00000000000..503f5a20c79 --- /dev/null +++ b/sdk/lib/ucrt/internal/internal.cmake @@ -0,0 +1,17 @@ + +list(APPEND UCRT_INTERNAL_SOURCES + internal/CreateProcessA.cpp + internal/GetModuleFileNameA.cpp + internal/initialization.cpp + internal/LoadLibraryExA.cpp + internal/locks.cpp + internal/OutputDebugStringA.cpp + internal/peb_access.cpp + internal/per_thread_data.cpp + internal/report_runtime_error.cpp + internal/SetCurrentDirectoryA.cpp + internal/SetEnvironmentVariableA.cpp + internal/shared_initialization.cpp + internal/winapi_thunks.cpp + internal/win_policies.cpp +) diff --git a/sdk/lib/ucrt/locale/locale.cmake b/sdk/lib/ucrt/locale/locale.cmake new file mode 100644 index 00000000000..97fe554114a --- /dev/null +++ b/sdk/lib/ucrt/locale/locale.cmake @@ -0,0 +1,25 @@ + +list(APPEND UCRT_LOCALE_SOURCES + locale/CompareStringA.cpp + locale/CompareStringW.cpp + locale/ctype.cpp + locale/GetLocaleInfoA.cpp + locale/getqloc_downlevel.cpp + locale/GetStringTypeA.cpp + locale/get_qualified_locale.cpp + locale/glstatus.cpp + locale/initctype.cpp + locale/initmon.cpp + locale/initnum.cpp + locale/inittime.cpp + locale/lcidtoname_downlevel.cpp + locale/LCMapStringA.cpp + locale/LCMapStringW.cpp + locale/lconv_unsigned_char_initialization.cpp + locale/localeconv.cpp + locale/locale_refcounting.cpp + locale/locale_update.cpp + locale/nlsdata.cpp + locale/setlocale.cpp + locale/wsetlocale.cpp +) diff --git a/sdk/lib/ucrt/lowio/lowio.cmake b/sdk/lib/ucrt/lowio/lowio.cmake new file mode 100644 index 00000000000..119b5b90b0e --- /dev/null +++ b/sdk/lib/ucrt/lowio/lowio.cmake @@ -0,0 +1,25 @@ + +list(APPEND UCRT_LOWIO_SOURCES + lowio/chsize.cpp + lowio/close.cpp + lowio/commit.cpp + lowio/creat.cpp + lowio/dup.cpp + lowio/dup2.cpp + lowio/eof.cpp + lowio/filelength.cpp + lowio/ioinit.cpp + lowio/isatty.cpp + lowio/locking.cpp + lowio/lseek.cpp + lowio/mktemp.cpp + lowio/open.cpp + lowio/osfinfo.cpp + lowio/read.cpp + lowio/setmode.cpp + lowio/tell.cpp + lowio/telli64.cpp + lowio/txtmode.cpp + lowio/umask.cpp + lowio/write.cpp +) diff --git a/sdk/lib/ucrt/mbstring/mbstring.cmake b/sdk/lib/ucrt/mbstring/mbstring.cmake new file mode 100644 index 00000000000..f998ae2f327 --- /dev/null +++ b/sdk/lib/ucrt/mbstring/mbstring.cmake @@ -0,0 +1,93 @@ + +list(APPEND UCRT_MBSTRING_SOURCES + mbstring/ismbalnm.cpp + mbstring/ismbalph.cpp + mbstring/ismbbyte.cpp + mbstring/ismbdgt.cpp + mbstring/ismbgrph.cpp + mbstring/ismbknj.cpp + mbstring/ismblgl.cpp + mbstring/ismblwr.cpp + mbstring/ismbprn.cpp + mbstring/ismbpunc.cpp + mbstring/ismbsle.cpp + mbstring/ismbspc.cpp + mbstring/ismbupr.cpp + mbstring/mbbtype.cpp + mbstring/mbccpy.cpp + mbstring/mbccpy_s.cpp + mbstring/mbccpy_s_l.cpp + mbstring/mbclen.cpp + mbstring/mbclevel.cpp + mbstring/mbctype.cpp + mbstring/mbsbtype.cpp + mbstring/mbscat_s.cpp + mbstring/mbscat_s_l.cpp + mbstring/mbschr.cpp + mbstring/mbscmp.cpp + mbstring/mbscoll.cpp + mbstring/mbscpy_s.cpp + mbstring/mbscpy_s_l.cpp + mbstring/mbscspn.cpp + mbstring/mbsdec.cpp + mbstring/mbsicmp.cpp + mbstring/mbsicoll.cpp + mbstring/mbsinc.cpp + mbstring/mbslen.cpp + mbstring/mbslen_s.cpp + mbstring/mbslwr.cpp + mbstring/mbsnbcat.cpp + mbstring/mbsnbcat_s.cpp + mbstring/mbsnbcat_s_l.cpp + mbstring/mbsnbcmp.cpp + mbstring/mbsnbcnt.cpp + mbstring/mbsnbcol.cpp + mbstring/mbsnbcpy.cpp + mbstring/mbsnbcpy_s.cpp + mbstring/mbsnbcpy_s_l.cpp + mbstring/mbsnbicm.cpp + mbstring/mbsnbico.cpp + mbstring/mbsnbset.cpp + mbstring/mbsnbset_s.cpp + mbstring/mbsnbset_s_l.cpp + mbstring/mbsncat.cpp + mbstring/mbsncat_s.cpp + mbstring/mbsncat_s.inl + mbstring/mbsncat_s_l.cpp + mbstring/mbsnccnt.cpp + mbstring/mbsncmp.cpp + mbstring/mbsncoll.cpp + mbstring/mbsncpy.cpp + mbstring/mbsncpy_s.cpp + mbstring/mbsncpy_s.inl + mbstring/mbsncpy_s_l.cpp + mbstring/mbsnextc.cpp + mbstring/mbsnicmp.cpp + mbstring/mbsnicol.cpp + mbstring/mbsninc.cpp + mbstring/mbsnset.cpp + mbstring/mbsnset_s.cpp + mbstring/mbsnset_s.inl + mbstring/mbsnset_s_l.cpp + mbstring/mbspbrk.cpp + mbstring/mbsrchr.cpp + mbstring/mbsrev.cpp + mbstring/mbsset.cpp + mbstring/mbsset_s.cpp + mbstring/mbsset_s_l.cpp + mbstring/mbsspn.cpp + mbstring/mbsspnp.cpp + mbstring/mbsstr.cpp + mbstring/mbstok.cpp + mbstring/mbstok_s.cpp + mbstring/mbsupr.cpp + mbstring/mbtohira.cpp + mbstring/mbtokata.cpp + mbstring/mbtolwr.cpp + mbstring/mbtoupr.cpp + mbstring/tojisjms.cpp + mbstring/tombbmbc.cpp +) + +# All multibyte string functions require the _MBCS macro to be defined +set_source_files_properties(${UCRT_MBSTRING_SOURCES} PROPERTIES COMPILE_DEFINITIONS _MBCS) diff --git a/sdk/lib/ucrt/misc/misc.cmake b/sdk/lib/ucrt/misc/misc.cmake new file mode 100644 index 00000000000..92abf476e2f --- /dev/null +++ b/sdk/lib/ucrt/misc/misc.cmake @@ -0,0 +1,34 @@ + +list(APPEND UCRT_MISC_SOURCES + misc/chdir.cpp + misc/crtmbox.cpp + misc/drive.cpp + misc/drivemap.cpp + misc/drivfree.cpp + misc/errno.cpp + misc/exception_filter.cpp + misc/getcwd.cpp + misc/getpid.cpp + misc/invalid_parameter.cpp + misc/is_wctype.cpp + misc/perror.cpp + misc/resetstk.cpp + misc/seterrm.cpp + misc/set_error_mode.cpp + misc/signal.cpp + misc/slbeep.cpp + misc/strerror.cpp + misc/syserr.cpp + misc/systime.cpp + misc/terminate.cpp + misc/wperror.cpp + misc/_strerr.cpp +) + +if (CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND UCRT_MISC_SOURCES + misc/dbgrpt.cpp + misc/dbgrptt.cpp + misc/debug_fill_threshold.cpp + ) +endif() diff --git a/sdk/lib/ucrt/startup/startup.cmake b/sdk/lib/ucrt/startup/startup.cmake new file mode 100644 index 00000000000..9bc9b454df7 --- /dev/null +++ b/sdk/lib/ucrt/startup/startup.cmake @@ -0,0 +1,13 @@ + +list(APPEND UCRT_STARTUP_SOURCES + startup/abort.cpp + startup/argv_data.cpp + startup/argv_parsing.cpp + startup/argv_wildcards.cpp + startup/argv_winmain.cpp + startup/assert.cpp + startup/exit.cpp + startup/initterm.cpp + startup/onexit.cpp + startup/thread.cpp +) diff --git a/sdk/lib/ucrt/stdio/stdio.cmake b/sdk/lib/ucrt/stdio/stdio.cmake new file mode 100644 index 00000000000..fdddb4aa133 --- /dev/null +++ b/sdk/lib/ucrt/stdio/stdio.cmake @@ -0,0 +1,52 @@ + +list(APPEND UCRT_STDIO_SOURCES + stdio/clearerr.cpp + stdio/closeall.cpp + stdio/fclose.cpp + stdio/fdopen.cpp + stdio/feoferr.cpp + stdio/fflush.cpp + stdio/fgetc.cpp + stdio/fgetpos.cpp + stdio/fgets.cpp + stdio/fgetwc.cpp + stdio/fileno.cpp + stdio/fopen.cpp + stdio/fputc.cpp + stdio/fputs.cpp + stdio/fputwc.cpp + stdio/fputws.cpp + stdio/fread.cpp + stdio/freopen.cpp + stdio/fseek.cpp + stdio/fsetpos.cpp + stdio/ftell.cpp + stdio/fwrite.cpp + stdio/gets.cpp + stdio/gettemppath.cpp + stdio/getw.cpp + stdio/input.cpp + stdio/ncommode.cpp + stdio/openfile.cpp + stdio/output.cpp + stdio/printf_count_output.cpp + stdio/puts.cpp + stdio/putw.cpp + stdio/putws.cpp + stdio/rewind.cpp + stdio/rmtmp.cpp + stdio/setbuf.cpp + stdio/setmaxf.cpp + stdio/setvbuf.cpp + stdio/stream.cpp + stdio/tempnam.cpp + stdio/tmpfile.cpp + stdio/ungetc.cpp + stdio/ungetwc.cpp + stdio/_filbuf.cpp + stdio/_file.cpp + stdio/_flsbuf.cpp + stdio/_freebuf.cpp + stdio/_getbuf.cpp + stdio/_sftbuf.cpp +) diff --git a/sdk/lib/ucrt/stdlib/stdlib.cmake b/sdk/lib/ucrt/stdlib/stdlib.cmake new file mode 100644 index 00000000000..fafbad26ea6 --- /dev/null +++ b/sdk/lib/ucrt/stdlib/stdlib.cmake @@ -0,0 +1,24 @@ + +list(APPEND UCRT_STDLIB_SOURCES + stdlib/abs.cpp + stdlib/bsearch.cpp + stdlib/bsearch_s.cpp + stdlib/byteswap.cpp + stdlib/div.cpp + stdlib/imaxabs.cpp + stdlib/imaxdiv.cpp + stdlib/labs.cpp + stdlib/ldiv.cpp + stdlib/lfind.cpp + stdlib/lfind_s.cpp + stdlib/llabs.cpp + stdlib/lldiv.cpp + stdlib/lsearch.cpp + stdlib/lsearch_s.cpp + stdlib/qsort.cpp + stdlib/qsort_s.cpp + stdlib/rand.cpp + stdlib/rand_s.cpp + stdlib/rotl.cpp + stdlib/rotr.cpp +) diff --git a/sdk/lib/ucrt/string/string.cmake b/sdk/lib/ucrt/string/string.cmake new file mode 100644 index 00000000000..2935b353269 --- /dev/null +++ b/sdk/lib/ucrt/string/string.cmake @@ -0,0 +1,58 @@ + +list(APPEND UCRT_STRING_SOURCES + string/memcpy_s.cpp + string/memicmp.cpp + string/strcat_s.cpp + string/strcoll.cpp + string/strcpy_s.cpp + string/strdup.cpp + string/stricmp.cpp + string/stricoll.cpp + string/strlwr.cpp + string/strncat_s.cpp + string/strncnt.cpp + string/strncoll.cpp + string/strncpy_s.cpp + string/strnicmp.cpp + string/strnicol.cpp + string/strnlen.cpp + string/strnset_s.cpp + string/strset_s.cpp + string/strtok.cpp + string/strtok_s.cpp + string/strupr.cpp + string/strxfrm.cpp + string/wcscat.cpp + string/wcscat_s.cpp + string/wcscmp.cpp + string/wcscoll.cpp + string/wcscpy.cpp + string/wcscpy_s.cpp + string/wcscspn.cpp + string/wcsdup.cpp + string/wcsicmp.cpp + string/wcsicoll.cpp + string/wcslwr.cpp + string/wcsncat.cpp + string/wcsncat_s.cpp + string/wcsncmp.cpp + string/wcsncnt.cpp + string/wcsncoll.cpp + string/wcsncpy.cpp + string/wcsncpy_s.cpp + string/wcsnicmp.cpp + string/wcsnicol.cpp + string/wcsnset.cpp + string/wcsnset_s.cpp + string/wcspbrk.cpp + string/wcsrev.cpp + string/wcsset.cpp + string/wcsset_s.cpp + string/wcsspn.cpp + string/wcstok.cpp + string/wcstok_s.cpp + string/wcsupr.cpp + string/wcsxfrm.cpp + string/wmemcpy_s.cpp + string/wmemmove_s.cpp +) diff --git a/sdk/lib/ucrt/time/time.cmake b/sdk/lib/ucrt/time/time.cmake new file mode 100644 index 00000000000..c74d9f291b4 --- /dev/null +++ b/sdk/lib/ucrt/time/time.cmake @@ -0,0 +1,21 @@ + +list(APPEND UCRT_TIME_SOURCES + time/asctime.cpp + time/clock.cpp + time/ctime.cpp + time/days.cpp + time/difftime.cpp + time/ftime.cpp + time/gmtime.cpp + time/localtime.cpp + time/loctotime.cpp + time/mktime.cpp + time/strdate.cpp + time/strftime.cpp + time/strtime.cpp + time/time.cpp + time/timeset.cpp + time/tzset.cpp + time/utime.cpp + time/wcsftime.cpp +)

5 months, 2 weeks

[reactos] 32/33: [UCRT] Add a hack for a clang bug

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef440b9aefcab33fab87c… commit ef440b9aefcab33fab87c9260b13a20125f34465 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Nov 28 15:14:28 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add a hack for a clang bug See CORE-19902 --- sdk/lib/ucrt/inc/corecrt_internal_traits.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_traits.h b/sdk/lib/ucrt/inc/corecrt_internal_traits.h index 71f38ab32e7..ff3fd61d388 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_traits.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_traits.h @@ -53,6 +53,13 @@ errno_t __cdecl _wsopen_nolock( } // extern "C" #endif // __GNUC__ +#ifdef __clang__ +// Hack for broken Clang, which crashes, when using __cdecl on a static template function. +// See CORE-19902 +#undef __cdecl +#define __cdecl +#endif // __clang__ + //-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ //

5 months, 2 weeks

[reactos] 31/33: [UCRT] Fix definition of offsetof for clang-cl

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42e9c802791790a7cac72… commit 42e9c802791790a7cac72863e7cf9d2dbf419e21 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Nov 27 15:24:41 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Fix definition of offsetof for clang-cl --- sdk/include/ucrt/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/ucrt/stddef.h b/sdk/include/ucrt/stddef.h index 53fa61c8f52..9d44415d361 100644 --- a/sdk/include/ucrt/stddef.h +++ b/sdk/include/ucrt/stddef.h @@ -42,7 +42,7 @@ _CRT_BEGIN_C_HEADER -#if defined _MSC_VER && !defined _CRT_USE_BUILTIN_OFFSETOF +#if defined _MSC_VER && !defined __clang__ && !defined _CRT_USE_BUILTIN_OFFSETOF #ifdef __cplusplus #define offsetof(s,m) ((::size_t)&reinterpret_cast<char const volatile&>((((s*)0)->m))) #else

5 months, 2 weeks

[reactos] 30/33: [UCRT] Make includes unix compatible

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2eb314956587a6fe9c331… commit 2eb314956587a6fe9c3316b615a95e06a43132b7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Nov 27 13:58:34 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Make includes unix compatible --- sdk/lib/ucrt/filesystem/chmod.cpp | 2 +- sdk/lib/ucrt/filesystem/wchmod.cpp | 2 +- sdk/lib/ucrt/lowio/locking.cpp | 4 ++-- sdk/lib/ucrt/lowio/umask.cpp | 2 +- sdk/lib/ucrt/time/clock.cpp | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/lib/ucrt/filesystem/chmod.cpp b/sdk/lib/ucrt/filesystem/chmod.cpp index 63832ea2823..7aa34225374 100644 --- a/sdk/lib/ucrt/filesystem/chmod.cpp +++ b/sdk/lib/ucrt/filesystem/chmod.cpp @@ -7,7 +7,7 @@ // #include <corecrt_internal.h> #include <io.h> -#include <sys\stat.h> +#include <sys/stat.h> #include <corecrt_internal_win32_buffer.h> // Changes the mode of a file. The only supported mode bit is _S_IWRITE, which diff --git a/sdk/lib/ucrt/filesystem/wchmod.cpp b/sdk/lib/ucrt/filesystem/wchmod.cpp index 181afed05e4..24590200c71 100644 --- a/sdk/lib/ucrt/filesystem/wchmod.cpp +++ b/sdk/lib/ucrt/filesystem/wchmod.cpp @@ -7,7 +7,7 @@ // #include <corecrt_internal.h> #include <io.h> -#include <sys\stat.h> +#include <sys/stat.h> diff --git a/sdk/lib/ucrt/lowio/locking.cpp b/sdk/lib/ucrt/lowio/locking.cpp index 8f7dda92b51..ab2d2e3106f 100644 --- a/sdk/lib/ucrt/lowio/locking.cpp +++ b/sdk/lib/ucrt/lowio/locking.cpp @@ -6,7 +6,7 @@ // Defines _locking(), which locks and unlocks regions of a file. // #include <corecrt_internal_lowio.h> -#include <sys\locking.h> +#include <sys/locking.h> @@ -106,7 +106,7 @@ extern "C" int __cdecl _locking(int const fh, int const locking_mode, long const { errno = EBADF; _doserrno = 0; - _ASSERTE(("Invalid file descriptor. File possibly closed by a different thread",0)); + _ASSERTE(("Invalid file descriptor. File possibly closed by a different thread",0)); __leave; } diff --git a/sdk/lib/ucrt/lowio/umask.cpp b/sdk/lib/ucrt/lowio/umask.cpp index ad0de502ccc..de90e192331 100644 --- a/sdk/lib/ucrt/lowio/umask.cpp +++ b/sdk/lib/ucrt/lowio/umask.cpp @@ -10,7 +10,7 @@ *******************************************************************************/ #include <corecrt_internal_lowio.h> -#include <sys\stat.h> +#include <sys/stat.h> extern "C" { int _umaskval = 0; } diff --git a/sdk/lib/ucrt/time/clock.cpp b/sdk/lib/ucrt/time/clock.cpp index 0c88322d562..7ff8a04e8fb 100644 --- a/sdk/lib/ucrt/time/clock.cpp +++ b/sdk/lib/ucrt/time/clock.cpp @@ -7,8 +7,8 @@ // process started execution. // #include <corecrt_internal_time.h> -#include <sys\timeb.h> -#include <sys\types.h> +#include <sys/timeb.h> +#include <sys/types.h> @@ -51,7 +51,7 @@ extern "C" int __cdecl __acrt_initialize_clock() !QueryPerformanceCounter(&local_start_count) || local_frequency.QuadPart == 0) { - source_frequency = -1; + source_frequency = -1; start_count = -1; return 0; }

5 months, 2 weeks

[reactos] 29/33: [UCRT] Fix GCC build of __crt_char_traits

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90dad446b7ac43ad54c53… commit 90dad446b7ac43ad54c538ac40d7b872d47b6084 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 16 14:13:59 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Fix GCC build of __crt_char_traits This is a workaround for GCC. It will disable debugging for tdupenv_s_crt. How it works on MSVC? Magic. --- sdk/lib/ucrt/inc/corecrt_internal_traits.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_traits.h b/sdk/lib/ucrt/inc/corecrt_internal_traits.h index d84107e72d7..71f38ab32e7 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_traits.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_traits.h @@ -112,7 +112,7 @@ struct __crt_char_traits; _APPLY(tcspbrk, strpbrk, wcspbrk ) \ _APPLY(tcsrchr, strrchr, wcsrchr ) \ _APPLY(tcstoull, strtoull, wcstoull ) \ - _APPLY(tdupenv_s_crt, _dupenv_s_crt, _wdupenv_s_crt ) \ + _APPLY(tdupenv_s_crt, _dupenv_s, _wdupenv_s ) \ _APPLY(texecve, _execve, _wexecve ) \ _APPLY(tfdopen, _fdopen, _wfdopen ) \ _APPLY(tfullpath, _fullpath, _wfullpath ) \

5 months, 2 weeks

[reactos] 28/33: [UCRT] Hack some template code, so that retarded compilers can handle it

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=693f9f51a04084b13b26b… commit 693f9f51a04084b13b26bfe0600e1735eaebd005 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 14 00:12:32 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Hack some template code, so that retarded compilers can handle it --- sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h index 6f9878a52cc..86d7ffb4ecf 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h @@ -1009,7 +1009,7 @@ protected: __crt_cached_ptd_host& ptd, va_list const arglist ) throw() - : common_data{ptd}, + : common_data<Character>{ptd}, _output_adapter(output_adapter) { // We initialize several base class data members here, so that we can @@ -1209,7 +1209,7 @@ protected: #endif typedef positional_parameter_base self_type; - typedef format_validation_base base_type; + typedef format_validation_base<Character, OutputAdapter> base_type; typedef __crt_char_traits<Character> char_traits; template <typename... Ts> @@ -1296,7 +1296,7 @@ protected: { if (_format_mode == mode::nonpositional) { - return base_type::extract_argument_from_va_list<RequestedParameterType>(result); + return base_type::template extract_argument_from_va_list<RequestedParameterType>(result); } _UCRT_VALIDATE_RETURN(_ptd, _type_index >= 0 && _type_index < _ARGMAX, EINVAL, false); @@ -2274,7 +2274,7 @@ private: if (is_wide_character_specifier(_options, _format_char, _length)) { wchar_t wide_character{}; - if (!extract_argument_from_va_list<wchar_t>(wide_character)) + if (!this->template extract_argument_from_va_list<wchar_t>(wide_character)) { return false; } @@ -2286,7 +2286,7 @@ private: // Convert to multibyte. If the conversion fails, we suppress the // output operation but we do not fail the entire operation: - errno_t const status{_wctomb_internal(&_string_length, _buffer.data<char>(), _buffer.count<char>(), wide_character, _ptd)}; + errno_t const status{_wctomb_internal(&_string_length, _buffer.template data<char>(), _buffer.template count<char>(), wide_character, _ptd)}; if (status != 0) { _suppress_output = true; @@ -2296,7 +2296,7 @@ private: // to the output, as-is. else { - if (!extract_argument_from_va_list<unsigned short>(_buffer.data<char>()[0])) + if (!this->template extract_argument_from_va_list<unsigned short>(_buffer.template data<char>()[0])) { return false; } @@ -2309,7 +2309,7 @@ private: _string_length = 1; } - _narrow_string = _buffer.data<char>(); + _narrow_string = _buffer.template data<char>(); return true; } @@ -2320,7 +2320,7 @@ private: _string_is_wide = true; wchar_t wide_character{}; - if (!extract_argument_from_va_list<wchar_t>(wide_character)) + if (!this->template extract_argument_from_va_list<wchar_t>(wide_character)) return false; if (!should_format()) @@ -2334,7 +2334,7 @@ private: // output operation. char const local_buffer[2]{ static_cast<char>(wide_character & 0x00ff), '\0' }; int const mbc_length{_mbtowc_internal( - _buffer.data<wchar_t>(), + _buffer.template data<wchar_t>(), local_buffer, _ptd.get_locale()->locinfo->_public._locale_mb_cur_max, _ptd @@ -2346,10 +2346,10 @@ private: } else { - _buffer.data<wchar_t>()[0] = wide_character; + _buffer.template data<wchar_t>()[0] = wide_character; } - _wide_string = _buffer.data<wchar_t>(); + _wide_string = _buffer.template data<wchar_t>(); _string_length = 1; return true; } @@ -2371,7 +2371,7 @@ private: }; ansi_string* string{}; - if (!extract_argument_from_va_list<ansi_string*>(string)) + if (!this->template extract_argument_from_va_list<ansi_string*>(string)) return false; if (!should_format()) @@ -2406,7 +2406,7 @@ private: // of the length of the C string and the given precision. Note that the // string needs not be null-terminated if a precision is given, so we // cannot call strlen to compute the length of the string. - if (!extract_argument_from_va_list<char*>(_narrow_string)) + if (!this->template extract_argument_from_va_list<char*>(_narrow_string)) return false; if (!should_format()) @@ -2505,18 +2505,18 @@ private: _precision = 1; // Per C Standard Library specification. } - if (!_buffer.ensure_buffer_is_big_enough<char>(_CVTBUFSIZE + _precision, _ptd)) + if (!_buffer.template ensure_buffer_is_big_enough<char>(_CVTBUFSIZE + _precision, _ptd)) { // If we fail to enlarge the buffer, cap precision so that the // statically-sized buffer may be used for the formatting: - _precision = static_cast<int>(_buffer.count<char>() - _CVTBUFSIZE); + _precision = static_cast<int>(_buffer.template count<char>() - _CVTBUFSIZE); } - _narrow_string = _buffer.data<char>(); + _narrow_string = _buffer.template data<char>(); // Note that we separately handle the FORMAT_POSSCAN_PASS above. _CRT_DOUBLE tmp{}; - if (!extract_argument_from_va_list<_CRT_DOUBLE>(tmp)) + if (!this->template extract_argument_from_va_list<_CRT_DOUBLE>(tmp)) { return false; } @@ -2524,10 +2524,10 @@ private: // Format the number into the buffer: __acrt_fp_format( &tmp.x, - _buffer.data<char>(), - _buffer.count<char>(), - _buffer.scratch_data<char>(), - _buffer.scratch_count<char>(), + _buffer.template data<char>(), + _buffer.template count<char>(), + _buffer.template scratch_data<char>(), + _buffer.template scratch_count<char>(), static_cast<char>(_format_char), _precision, _options, @@ -2639,23 +2639,23 @@ private: { case sizeof(int8_t): extraction_result = has_flag(FL_SIGNED) - ? extract_argument_from_va_list<int8_t >(original_number) - : extract_argument_from_va_list<uint8_t>(original_number); + ? this->template extract_argument_from_va_list<int8_t >(original_number) + : this->template extract_argument_from_va_list<uint8_t>(original_number); break; case sizeof(int16_t): extraction_result = has_flag(FL_SIGNED) - ? extract_argument_from_va_list<int16_t >(original_number) - : extract_argument_from_va_list<uint16_t>(original_number); + ? this->template extract_argument_from_va_list<int16_t >(original_number) + : this->template extract_argument_from_va_list<uint16_t>(original_number); break; case sizeof(int32_t): extraction_result = has_flag(FL_SIGNED) - ? extract_argument_from_va_list<int32_t >(original_number) - : extract_argument_from_va_list<uint32_t>(original_number); + ? this->template extract_argument_from_va_list<int32_t >(original_number) + : this->template extract_argument_from_va_list<uint32_t>(original_number); break; case sizeof(int64_t): extraction_result = has_flag(FL_SIGNED) - ? extract_argument_from_va_list<int64_t >(original_number) - : extract_argument_from_va_list<uint64_t>(original_number); + ? this->template extract_argument_from_va_list<int64_t >(original_number) + : this->template extract_argument_from_va_list<uint64_t>(original_number); break; default: _UCRT_VALIDATE_RETURN(_ptd, ("Invalid integer length modifier", 0), EINVAL, false); @@ -2695,7 +2695,7 @@ private: else { unset_flag(FL_LEADZERO); - _buffer.ensure_buffer_is_big_enough<Character>(_precision, _ptd); + _buffer.template ensure_buffer_is_big_enough<Character>(_precision, _ptd); } // If the number is zero, we do not want to print the hex prefix ("0x"), @@ -2741,7 +2741,7 @@ private: // buffer at the end of the formatting buffer, which allows us to perform // the formatting from least to greatest magnitude, which maps well to // the math. - Character* const last_digit{_buffer.data<Character>() + _buffer.count<Character>() - 1}; + Character* const last_digit{_buffer.template data<Character>() + _buffer.template count<Character>() - 1}; Character*& string_pointer = tchar_string(); @@ -2773,7 +2773,7 @@ private: bool type_case_n() throw() { void* p{nullptr}; - if (!extract_argument_from_va_list<void*>(p)) + if (!this->template extract_argument_from_va_list<void*>(p)) return false; if (!should_format())

5 months, 2 weeks

[reactos] 27/33: [UCRT] Use a C cast instead of const_cast for GCC

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9dc185ede4a0a3c9bda1… commit f9dc185ede4a0a3c9bda1a4a77d034ceebda8d41 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 17:02:51 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Use a C cast instead of const_cast for GCC This is because GCC will generate errors for both const_cast and static_cast depending on the template parameter: - With const_cast: error: invalid 'const_cast' from type 'std::nullptr_t' to type 'const wchar_t**' - With static_cast: error: invalid 'static_cast' from type 'wchar_t** const' to type 'const wchar_t**' --- sdk/lib/ucrt/inc/corecrt_internal_strtox.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_strtox.h b/sdk/lib/ucrt/inc/corecrt_internal_strtox.h index 102724dda7d..d3c4a0c0fb7 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_strtox.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_strtox.h @@ -1870,7 +1870,7 @@ c_string_character_source<Character> __cdecl make_c_string_character_source( EndPointer const end ) throw() { - return c_string_character_source<Character>(string, const_cast<Character const**>(end)); + return c_string_character_source<Character>(string, (Character const**)(end)); } template <typename Integer, typename Character, typename EndPointer>

5 months, 2 weeks

[reactos] 26/33: [UCRT] No __declspec(spectre(nomitigation)) for GCC/Clang

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47e3f49e5266ce9e4668b… commit 47e3f49e5266ce9e4668bc96140161877ed0ba41 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 14 00:08:12 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] No __declspec(spectre(nomitigation)) for GCC/Clang --- sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h index bb4d545d88c..6f9878a52cc 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h @@ -576,7 +576,10 @@ public: // Instead of using an lfence mitigation, we can fill the table to a power of two, // then bitwise-and all values used to index into the array. - __declspec(spectre(nomitigation)) T const& operator[](size_t const index) const + #if defined(_MSC_VER) && !defined(__clang__) + __declspec(spectre(nomitigation)) + #endif + T const& operator[](size_t const index) const { return m_array[index & mask]; }

5 months, 2 weeks

[reactos] 25/33: [UCRT] Fix GCC/Clang build of SSE2/AVX code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97e20ef342300158940d6… commit 97e20ef342300158940d61892cdc70ed63bf93cd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 10 14:57:01 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Fix GCC/Clang build of SSE2/AVX code On GCC the code using extended ISA cannot be inlined and must either be marked with a function attribute or compiled with the proper target options ('-mavx2' on the command line or '#pragma GCC target("avx2")' inside the code) --- sdk/lib/ucrt/inc/corecrt_internal_simd.h | 20 ++++++++++++++++++++ sdk/lib/ucrt/string/strnlen.cpp | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_simd.h b/sdk/lib/ucrt/inc/corecrt_internal_simd.h index 5770418e034..01a92229438 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_simd.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_simd.h @@ -18,6 +18,24 @@ #if defined _CRT_SIMD_SUPPORT_AVAILABLE +#if defined(__clang__) +#define _UCRT_ENABLE_EXTENDED_ISA \ + _Pragma("clang attribute push(__attribute__((target(\"sse2,avx,avx2\"))), apply_to=function)") +#define _UCRT_RESTORE_DEFAULT_ISA \ + _Pragma("clang attribute pop") +#elif defined(__GNUC__) +#define _UCRT_ENABLE_EXTENDED_ISA \ + _Pragma("GCC push_options") \ + _Pragma("GCC target(\"avx2\")") +#define _UCRT_RESTORE_DEFAULT_ISA \ + _Pragma("GCC pop_options") +#else +#define _UCRT_ENABLE_EXTENDED_ISA +#define _UCRT_RESTORE_DEFAULT_ISA +#endif + +_UCRT_ENABLE_EXTENDED_ISA + extern "C" int __isa_available; enum class __crt_simd_isa @@ -155,4 +173,6 @@ } }; +_UCRT_RESTORE_DEFAULT_ISA + #endif // _CRT_SIMD_SUPPORT_AVAILABLE diff --git a/sdk/lib/ucrt/string/strnlen.cpp b/sdk/lib/ucrt/string/strnlen.cpp index 6cee4e85e0f..302086cb9f9 100644 --- a/sdk/lib/ucrt/string/strnlen.cpp +++ b/sdk/lib/ucrt/string/strnlen.cpp @@ -78,11 +78,13 @@ static __forceinline size_t __cdecl common_strnlen_c( #ifdef _CRT_SIMD_SUPPORT_AVAILABLE +_UCRT_ENABLE_EXTENDED_ISA + template <strnlen_mode Mode, __crt_simd_isa Isa, typename Element> _Check_return_ _When_(maximum_count > _String_length_(string), _Post_satisfies_(return == _String_length_(string))) _When_(maximum_count <= _String_length_(string), _Post_satisfies_(return == maximum_count)) - static __forceinline size_t __cdecl common_strnlen_simd( + static __inline size_t __cdecl common_strnlen_simd( Element const* const string, size_t const maximum_count ) throw() @@ -168,6 +170,8 @@ static __forceinline size_t __cdecl common_strnlen_c( return static_cast<size_t>(it - string); } +_UCRT_RESTORE_DEFAULT_ISA + #endif // _CRT_SIMD_SUPPORT_AVAILABLE template <strnlen_mode Mode, typename Element>

5 months, 2 weeks

[reactos] 24/33: [UCRT] Add GCC compatible __FUNCTIONW__

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51e6ce3aa7c880709f8f2… commit 51e6ce3aa7c880709f8f29483d8df85c22c560ca Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 10:55:31 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add GCC compatible __FUNCTIONW__ --- sdk/include/ucrt/corecrt.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sdk/include/ucrt/corecrt.h b/sdk/include/ucrt/corecrt.h index b89f0a94c22..4fe20566df9 100644 --- a/sdk/include/ucrt/corecrt.h +++ b/sdk/include/ucrt/corecrt.h @@ -280,7 +280,18 @@ extern "C++" #define _CRT_SIZE_MAX ((size_t)-1) #define __FILEW__ _CRT_WIDE(__FILE__) + +#ifdef _MSC_VER #define __FUNCTIONW__ _CRT_WIDE(__FUNCTION__) +#else // _MSC_VER +#define __FUNCTIONW__ \ +({ \ + static wchar_t __funcw__[sizeof(__func__)]; \ + for (size_t i = 0; i < sizeof(__func__); i++) \ + __funcw__[i] = __func__[i]; \ + __funcw__; \ +}) +#endif // _MSC_VER #ifdef __cplusplus #ifndef _STATIC_ASSERT

5 months, 2 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs