Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 23/33: [UCRT] Include intrin.h for __debugbreak()

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=589bbcaa086b77f7dde51… commit 589bbcaa086b77f7dde51a691f4318255091c1b6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 16:53:29 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Include intrin.h for __debugbreak() --- sdk/include/ucrt/crtdbg.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/include/ucrt/crtdbg.h b/sdk/include/ucrt/crtdbg.h index 90925ff4266..e9f6952aced 100644 --- a/sdk/include/ucrt/crtdbg.h +++ b/sdk/include/ucrt/crtdbg.h @@ -11,6 +11,7 @@ #include <corecrt.h> #include <vcruntime_new_debug.h> +#include <intrin.h> // for __debugbreak() on GCC #pragma warning(push) #pragma warning(disable: _UCRT_DISABLED_WARNINGS)

5 months, 2 weeks

[reactos] 22/33: [UCRT] Make SEH blocks ReactOS PSEH compatible

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e98e9000c7e67e8293628… commit e98e9000c7e67e8293628c82e8342a6fab69697e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 12 00:05:27 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Make SEH blocks ReactOS PSEH compatible --- sdk/lib/ucrt/conio/cgets.cpp | 1 + sdk/lib/ucrt/conio/cgetws.cpp | 1 + sdk/lib/ucrt/conio/cputs.cpp | 1 + sdk/lib/ucrt/conio/cputws.cpp | 1 + sdk/lib/ucrt/conio/getch.cpp | 5 +++++ sdk/lib/ucrt/conio/getwch.cpp | 4 ++++ sdk/lib/ucrt/conio/pipe.cpp | 2 ++ sdk/lib/ucrt/conio/popen.cpp | 2 ++ sdk/lib/ucrt/env/getenv.cpp | 3 +++ sdk/lib/ucrt/env/putenv.cpp | 1 + sdk/lib/ucrt/heap/debug_heap.cpp | 14 ++++++++++++++ sdk/lib/ucrt/heap/heapwalk.cpp | 1 + sdk/lib/ucrt/heap/new_handler.cpp | 2 ++ sdk/lib/ucrt/inc/internal_shared.h | 1 + sdk/lib/ucrt/locale/locale_refcounting.cpp | 1 + sdk/lib/ucrt/locale/wsetlocale.cpp | 2 ++ sdk/lib/ucrt/lowio/dup.cpp | 1 + sdk/lib/ucrt/lowio/dup2.cpp | 1 + sdk/lib/ucrt/lowio/filelength.cpp | 1 + sdk/lib/ucrt/lowio/ioinit.cpp | 1 + sdk/lib/ucrt/lowio/locking.cpp | 1 + sdk/lib/ucrt/lowio/lseek.cpp | 1 + sdk/lib/ucrt/lowio/open.cpp | 2 ++ sdk/lib/ucrt/lowio/osfinfo.cpp | 3 +++ sdk/lib/ucrt/lowio/read.cpp | 1 + sdk/lib/ucrt/lowio/setmode.cpp | 1 + sdk/lib/ucrt/lowio/write.cpp | 1 + sdk/lib/ucrt/mbstring/mbctype.cpp | 1 + sdk/lib/ucrt/misc/dbgrptt.cpp | 4 ++++ sdk/lib/ucrt/misc/perror.cpp | 1 + sdk/lib/ucrt/misc/signal.cpp | 3 +++ sdk/lib/ucrt/misc/terminate.cpp | 1 + sdk/lib/ucrt/startup/exit.cpp | 1 + sdk/lib/ucrt/startup/thread.cpp | 1 + sdk/lib/ucrt/stdio/clearerr.cpp | 1 + sdk/lib/ucrt/stdio/closeall.cpp | 1 + sdk/lib/ucrt/stdio/fclose.cpp | 1 + sdk/lib/ucrt/stdio/fdopen.cpp | 1 + sdk/lib/ucrt/stdio/fgetc.cpp | 1 + sdk/lib/ucrt/stdio/fgets.cpp | 1 + sdk/lib/ucrt/stdio/fgetwc.cpp | 1 + sdk/lib/ucrt/stdio/fopen.cpp | 1 + sdk/lib/ucrt/stdio/fputc.cpp | 1 + sdk/lib/ucrt/stdio/fputwc.cpp | 1 + sdk/lib/ucrt/stdio/fread.cpp | 1 + sdk/lib/ucrt/stdio/freopen.cpp | 1 + sdk/lib/ucrt/stdio/fseek.cpp | 1 + sdk/lib/ucrt/stdio/ftell.cpp | 1 + sdk/lib/ucrt/stdio/gets.cpp | 1 + sdk/lib/ucrt/stdio/getw.cpp | 1 + sdk/lib/ucrt/stdio/putw.cpp | 1 + sdk/lib/ucrt/stdio/rewind.cpp | 1 + sdk/lib/ucrt/stdio/rmtmp.cpp | 2 ++ sdk/lib/ucrt/stdio/stream.cpp | 1 + sdk/lib/ucrt/stdio/tempnam.cpp | 1 + sdk/lib/ucrt/stdio/tmpfile.cpp | 3 +++ sdk/lib/ucrt/stdio/ungetc.cpp | 1 + sdk/lib/ucrt/stdio/ungetwc.cpp | 1 + sdk/lib/ucrt/time/tzset.cpp | 3 +++ 59 files changed, 98 insertions(+) diff --git a/sdk/lib/ucrt/conio/cgets.cpp b/sdk/lib/ucrt/conio/cgets.cpp index fe3fffea718..7ec4ae6dcfe 100644 --- a/sdk/lib/ucrt/conio/cgets.cpp +++ b/sdk/lib/ucrt/conio/cgets.cpp @@ -91,6 +91,7 @@ extern "C" errno_t __cdecl _cgets_s(char* const source_string, size_t const size { __acrt_unlock(__acrt_conio_lock); } + __endtry *string++ = '\0'; diff --git a/sdk/lib/ucrt/conio/cgetws.cpp b/sdk/lib/ucrt/conio/cgetws.cpp index 0149e82b2b4..3b40b722a3c 100644 --- a/sdk/lib/ucrt/conio/cgetws.cpp +++ b/sdk/lib/ucrt/conio/cgetws.cpp @@ -121,6 +121,7 @@ extern "C" errno_t __cdecl _cgetws_s(wchar_t* const string_buffer, size_t const { __acrt_unlock(__acrt_conio_lock); } + __endtry return retval; } diff --git a/sdk/lib/ucrt/conio/cputs.cpp b/sdk/lib/ucrt/conio/cputs.cpp index 58e312d37c6..96e2232b544 100644 --- a/sdk/lib/ucrt/conio/cputs.cpp +++ b/sdk/lib/ucrt/conio/cputs.cpp @@ -34,5 +34,6 @@ extern "C" int __cdecl _cputs(char const* const string) { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } diff --git a/sdk/lib/ucrt/conio/cputws.cpp b/sdk/lib/ucrt/conio/cputws.cpp index 2a16e4fac0a..fcede25a0cb 100644 --- a/sdk/lib/ucrt/conio/cputws.cpp +++ b/sdk/lib/ucrt/conio/cputws.cpp @@ -58,6 +58,7 @@ extern "C" int __cdecl _cputws(wchar_t const* string) { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } diff --git a/sdk/lib/ucrt/conio/getch.cpp b/sdk/lib/ucrt/conio/getch.cpp index 0a8699b8053..9850aaf0cbc 100644 --- a/sdk/lib/ucrt/conio/getch.cpp +++ b/sdk/lib/ucrt/conio/getch.cpp @@ -254,6 +254,7 @@ extern "C" int __cdecl _getch() { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } @@ -269,6 +270,7 @@ extern "C" int __cdecl _getche() { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } @@ -353,6 +355,7 @@ extern "C" int __cdecl _getch_nolock() // Restore the previous console mode: __dcrt_set_input_console_mode(old_console_mode); } + __endtry return result; } @@ -394,6 +397,7 @@ extern "C" int __cdecl _kbhit() { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } @@ -472,6 +476,7 @@ extern "C" int __cdecl _ungetch(int const c) { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } diff --git a/sdk/lib/ucrt/conio/getwch.cpp b/sdk/lib/ucrt/conio/getwch.cpp index cfc0a8ab7ac..f8fe8dd1a36 100644 --- a/sdk/lib/ucrt/conio/getwch.cpp +++ b/sdk/lib/ucrt/conio/getwch.cpp @@ -51,6 +51,7 @@ extern "C" wint_t __cdecl _getwch() { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } @@ -67,6 +68,7 @@ extern "C" wint_t __cdecl _getwche() { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } @@ -140,6 +142,7 @@ extern "C" wint_t __cdecl _getwch_nolock() // Restore the previous console mode: __dcrt_set_input_console_mode(old_console_mode); } + __endtry return result; } @@ -185,6 +188,7 @@ extern "C" wint_t __cdecl _ungetwch(wint_t const c) { __acrt_unlock(__acrt_conio_lock); } + __endtry return result; } diff --git a/sdk/lib/ucrt/conio/pipe.cpp b/sdk/lib/ucrt/conio/pipe.cpp index 17bb5b0ee83..33b5ffd4b69 100644 --- a/sdk/lib/ucrt/conio/pipe.cpp +++ b/sdk/lib/ucrt/conio/pipe.cpp @@ -61,6 +61,7 @@ extern "C" int __cdecl _pipe(int* const phandles, unsigned const psize, int cons { __acrt_lowio_unlock_fh(crt_read_handle); } + __endtry // Create the CRT write handle for the pipe: int const crt_write_handle = _alloc_osfhnd(); @@ -84,6 +85,7 @@ extern "C" int __cdecl _pipe(int* const phandles, unsigned const psize, int cons { __acrt_lowio_unlock_fh(crt_write_handle); } + __endtry // Figure out which textmode the file gets: int fmode = 0; diff --git a/sdk/lib/ucrt/conio/popen.cpp b/sdk/lib/ucrt/conio/popen.cpp index 77d73495530..f1a524cfae4 100644 --- a/sdk/lib/ucrt/conio/popen.cpp +++ b/sdk/lib/ucrt/conio/popen.cpp @@ -400,6 +400,7 @@ static FILE* __cdecl common_popen( { __acrt_unlock(__acrt_popen_lock); } + __endtry return return_value; } @@ -483,6 +484,7 @@ extern "C" int __cdecl _pclose(FILE* const stream) { __acrt_unlock(__acrt_popen_lock); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/env/getenv.cpp b/sdk/lib/ucrt/env/getenv.cpp index 5e9c24894ef..05faf989d6a 100644 --- a/sdk/lib/ucrt/env/getenv.cpp +++ b/sdk/lib/ucrt/env/getenv.cpp @@ -76,6 +76,7 @@ static Character* __cdecl common_getenv(Character const* const name) throw() { __acrt_unlock(__acrt_environment_lock); } + __endtry return result; } @@ -160,6 +161,7 @@ static errno_t __cdecl common_getenv_s( { __acrt_unlock(__acrt_environment_lock); } + __endtry return status; } @@ -275,6 +277,7 @@ static errno_t __cdecl common_dupenv_s( { __acrt_unlock(__acrt_environment_lock); } + __endtry return status; } diff --git a/sdk/lib/ucrt/env/putenv.cpp b/sdk/lib/ucrt/env/putenv.cpp index 0c8a03df005..09e504eed39 100644 --- a/sdk/lib/ucrt/env/putenv.cpp +++ b/sdk/lib/ucrt/env/putenv.cpp @@ -212,6 +212,7 @@ static int __cdecl common_putenv( { __acrt_unlock(__acrt_environment_lock); } + __endtry return status; } diff --git a/sdk/lib/ucrt/heap/debug_heap.cpp b/sdk/lib/ucrt/heap/debug_heap.cpp index 0a8841e0c5e..0c3f9d0153a 100644 --- a/sdk/lib/ucrt/heap/debug_heap.cpp +++ b/sdk/lib/ucrt/heap/debug_heap.cpp @@ -241,6 +241,7 @@ static bool __cdecl is_bad_read_pointer(void const* const p, size_t const size) { return true; } + __endtry return false; } @@ -285,6 +286,7 @@ static void __cdecl validate_heap_if_required_nolock() throw() { heap_validation_pending = false; } + __endtry __acrt_check_counter = 0; } @@ -431,6 +433,7 @@ static void* __cdecl heap_alloc_dbg_internal( { __acrt_unlock(__acrt_heap_lock); } + __endtry return block; } @@ -763,6 +766,7 @@ extern "C" __declspec(noinline) void* __cdecl _realloc_dbg( { __acrt_unlock(__acrt_heap_lock); } + __endtry return new_block; } @@ -835,6 +839,7 @@ extern "C" __declspec(noinline) void* __cdecl _expand_dbg( { __acrt_unlock(__acrt_heap_lock); } + __endtry return new_block; } @@ -1035,6 +1040,7 @@ extern "C" __declspec(noinline) void __cdecl _free_dbg(void* const block, int co { __acrt_unlock(__acrt_heap_lock); } + __endtry } @@ -1070,6 +1076,7 @@ extern "C" __declspec(noinline) size_t __cdecl _msize_dbg(void* const block, int { __acrt_unlock(__acrt_heap_lock); } + __endtry return size; } @@ -1115,6 +1122,7 @@ extern "C" void __cdecl _CrtSetDbgBlockType( { __acrt_unlock(__acrt_heap_lock); } + __endtry } @@ -1301,6 +1309,7 @@ extern "C" int __cdecl _CrtCheckMemory() { __acrt_unlock(__acrt_heap_lock); } + __endtry return all_okay ? TRUE : FALSE; } @@ -1344,6 +1353,7 @@ extern "C" int __cdecl _CrtSetDbgFlag(int const new_bits) { __acrt_unlock(__acrt_heap_lock); } + __endtry return old_bits; } @@ -1374,6 +1384,7 @@ extern "C" void __cdecl _CrtDoForAllClientObjects( { __acrt_unlock(__acrt_heap_lock); } + __endtry } @@ -1469,6 +1480,7 @@ extern "C" int __cdecl _CrtIsMemoryBlock( { __acrt_unlock(__acrt_heap_lock); } + __endtry return result; } @@ -1547,6 +1559,7 @@ extern "C" void __cdecl _CrtMemCheckpoint(_CrtMemState* const state) { __acrt_unlock(__acrt_heap_lock); } + __endtry } @@ -1701,6 +1714,7 @@ extern "C" void __cdecl _CrtMemDumpAllObjectsSince(_CrtMemState const* const sta { __acrt_unlock(__acrt_heap_lock); } + __endtry _RPT0(_CRT_WARN, "Object dump complete.\n"); } diff --git a/sdk/lib/ucrt/heap/heapwalk.cpp b/sdk/lib/ucrt/heap/heapwalk.cpp index dfaf91181ed..27b6745beb7 100644 --- a/sdk/lib/ucrt/heap/heapwalk.cpp +++ b/sdk/lib/ucrt/heap/heapwalk.cpp @@ -28,6 +28,7 @@ static int __cdecl try_walk(PROCESS_HEAP_ENTRY* const win32_entry) throw() { return _HEAPBADNODE; } + __endtry } // Walks the heap, returning information on one entry at a time. If there are diff --git a/sdk/lib/ucrt/heap/new_handler.cpp b/sdk/lib/ucrt/heap/new_handler.cpp index a0866eeb914..801da85897a 100644 --- a/sdk/lib/ucrt/heap/new_handler.cpp +++ b/sdk/lib/ucrt/heap/new_handler.cpp @@ -35,6 +35,7 @@ _PNH __cdecl _set_new_handler(_PNH new_handler) { __acrt_unlock(__acrt_heap_lock); } + __endtry return result; } @@ -65,6 +66,7 @@ _PNH __cdecl _query_new_handler() { __acrt_unlock(__acrt_heap_lock); } + __endtry return result; } diff --git a/sdk/lib/ucrt/inc/internal_shared.h b/sdk/lib/ucrt/inc/internal_shared.h index a5f50f0f681..d4234e7cdf7 100644 --- a/sdk/lib/ucrt/inc/internal_shared.h +++ b/sdk/lib/ucrt/inc/internal_shared.h @@ -158,6 +158,7 @@ struct __crt_seh_guarded_call { cleanup(); } + __endtry } }; diff --git a/sdk/lib/ucrt/locale/locale_refcounting.cpp b/sdk/lib/ucrt/locale/locale_refcounting.cpp index c949b2036c7..b9731136f47 100644 --- a/sdk/lib/ucrt/locale/locale_refcounting.cpp +++ b/sdk/lib/ucrt/locale/locale_refcounting.cpp @@ -280,6 +280,7 @@ extern "C" __crt_locale_data* __cdecl __acrt_update_thread_locale_data() { __acrt_unlock(__acrt_locale_lock); } + __endtry } else { diff --git a/sdk/lib/ucrt/locale/wsetlocale.cpp b/sdk/lib/ucrt/locale/wsetlocale.cpp index da3b6d834f6..f7b309dab71 100644 --- a/sdk/lib/ucrt/locale/wsetlocale.cpp +++ b/sdk/lib/ucrt/locale/wsetlocale.cpp @@ -168,6 +168,7 @@ void __cdecl _free_locale( { __acrt_unlock(__acrt_multibyte_cp_lock); } + __endtry if (plocinfo->locinfo != nullptr) { @@ -191,6 +192,7 @@ void __cdecl _free_locale( { __acrt_unlock(__acrt_locale_lock); } + __endtry } _free_crt(plocinfo); diff --git a/sdk/lib/ucrt/lowio/dup.cpp b/sdk/lib/ucrt/lowio/dup.cpp index dc170b62f49..0bea1ae87ad 100644 --- a/sdk/lib/ucrt/lowio/dup.cpp +++ b/sdk/lib/ucrt/lowio/dup.cpp @@ -72,6 +72,7 @@ static int __cdecl _dup_nolock_internal(int const fh, __crt_cached_ptd_host& ptd __acrt_lowio_unlock_fh(new_fh); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/lowio/dup2.cpp b/sdk/lib/ucrt/lowio/dup2.cpp index 1b38c7c6b7b..453bd9b5614 100644 --- a/sdk/lib/ucrt/lowio/dup2.cpp +++ b/sdk/lib/ucrt/lowio/dup2.cpp @@ -105,6 +105,7 @@ static int __cdecl _dup2_internal(int const source_fh, int const target_fh, __cr __acrt_lowio_unlock_fh(source_fh); __acrt_lowio_unlock_fh(target_fh); } + __endtry return result; } diff --git a/sdk/lib/ucrt/lowio/filelength.cpp b/sdk/lib/ucrt/lowio/filelength.cpp index 595b8906ca8..f9b6577ac16 100644 --- a/sdk/lib/ucrt/lowio/filelength.cpp +++ b/sdk/lib/ucrt/lowio/filelength.cpp @@ -48,6 +48,7 @@ static Integer __cdecl common_filelength(int const fh) throw() { __acrt_lowio_unlock_fh(fh); } + __endtry return end; } diff --git a/sdk/lib/ucrt/lowio/ioinit.cpp b/sdk/lib/ucrt/lowio/ioinit.cpp index 5a3e858607c..452f4011339 100644 --- a/sdk/lib/ucrt/lowio/ioinit.cpp +++ b/sdk/lib/ucrt/lowio/ioinit.cpp @@ -242,6 +242,7 @@ extern "C" bool __cdecl __acrt_initialize_lowio() { __acrt_unlock(__acrt_lowio_index_lock); } + __endtry return result; } diff --git a/sdk/lib/ucrt/lowio/locking.cpp b/sdk/lib/ucrt/lowio/locking.cpp index 6f62a514da9..8f7dda92b51 100644 --- a/sdk/lib/ucrt/lowio/locking.cpp +++ b/sdk/lib/ucrt/lowio/locking.cpp @@ -116,5 +116,6 @@ extern "C" int __cdecl _locking(int const fh, int const locking_mode, long const { __acrt_lowio_unlock_fh(fh); } + __endtry return result; } diff --git a/sdk/lib/ucrt/lowio/lseek.cpp b/sdk/lib/ucrt/lowio/lseek.cpp index 35f41aec86b..e0bbd9f0967 100644 --- a/sdk/lib/ucrt/lowio/lseek.cpp +++ b/sdk/lib/ucrt/lowio/lseek.cpp @@ -123,6 +123,7 @@ static Integer __cdecl common_lseek(int const fh, Integer const offset, int cons { __acrt_lowio_unlock_fh(fh); } + __endtry return result; } diff --git a/sdk/lib/ucrt/lowio/open.cpp b/sdk/lib/ucrt/lowio/open.cpp index 941f331b91e..62e92d108c5 100644 --- a/sdk/lib/ucrt/lowio/open.cpp +++ b/sdk/lib/ucrt/lowio/open.cpp @@ -110,6 +110,7 @@ static int __cdecl common_open( __acrt_lowio_unlock_fh(fh); } } + __endtry if (error_code != 0) { @@ -182,6 +183,7 @@ static errno_t __cdecl common_sopen_dispatch( __acrt_lowio_unlock_fh(*pfh); } } + __endtry if (error_code != 0) { diff --git a/sdk/lib/ucrt/lowio/osfinfo.cpp b/sdk/lib/ucrt/lowio/osfinfo.cpp index 89a866b9de3..e7687732f71 100644 --- a/sdk/lib/ucrt/lowio/osfinfo.cpp +++ b/sdk/lib/ucrt/lowio/osfinfo.cpp @@ -93,6 +93,7 @@ extern "C" errno_t __cdecl __acrt_lowio_ensure_fh_exists(int const fh) { __acrt_unlock(__acrt_lowio_index_lock); } + __endtry return status; } @@ -183,6 +184,7 @@ extern "C" int __cdecl _alloc_osfhnd() { __acrt_unlock(__acrt_lowio_index_lock); } + __endtry return result; } @@ -328,6 +330,7 @@ extern "C" int __cdecl _open_osfhandle(intptr_t const osfhandle, int const sourc __acrt_lowio_unlock_fh(fh); } + __endtry return fh; } diff --git a/sdk/lib/ucrt/lowio/read.cpp b/sdk/lib/ucrt/lowio/read.cpp index ee5a3cf2256..d9814556876 100644 --- a/sdk/lib/ucrt/lowio/read.cpp +++ b/sdk/lib/ucrt/lowio/read.cpp @@ -399,6 +399,7 @@ extern "C" int __cdecl _read(int const fh, void* const buffer, unsigned const bu { __acrt_lowio_unlock_fh(fh); } + __endtry return result; } diff --git a/sdk/lib/ucrt/lowio/setmode.cpp b/sdk/lib/ucrt/lowio/setmode.cpp index 414a4e5a705..5c465f4bc16 100644 --- a/sdk/lib/ucrt/lowio/setmode.cpp +++ b/sdk/lib/ucrt/lowio/setmode.cpp @@ -46,6 +46,7 @@ extern "C" int __cdecl _setmode(int const fh, int const mode) { __acrt_lowio_unlock_fh(fh); } + __endtry return result; } diff --git a/sdk/lib/ucrt/lowio/write.cpp b/sdk/lib/ucrt/lowio/write.cpp index 302d6de5f97..c251a53d4a5 100644 --- a/sdk/lib/ucrt/lowio/write.cpp +++ b/sdk/lib/ucrt/lowio/write.cpp @@ -68,6 +68,7 @@ extern "C" int __cdecl _write_internal(int const fh, void const* const buffer, u { __acrt_lowio_unlock_fh(fh); } + __endtry return result; } diff --git a/sdk/lib/ucrt/mbstring/mbctype.cpp b/sdk/lib/ucrt/mbstring/mbctype.cpp index 4d2f7f1e35f..c02db844d60 100644 --- a/sdk/lib/ucrt/mbstring/mbctype.cpp +++ b/sdk/lib/ucrt/mbstring/mbctype.cpp @@ -343,6 +343,7 @@ static __crt_multibyte_data* __cdecl update_thread_multibyte_data_internal( { __acrt_unlock(__acrt_multibyte_cp_lock); } + __endtry } else { diff --git a/sdk/lib/ucrt/misc/dbgrptt.cpp b/sdk/lib/ucrt/misc/dbgrptt.cpp index f46f9488efa..ee3a23ef76a 100644 --- a/sdk/lib/ucrt/misc/dbgrptt.cpp +++ b/sdk/lib/ucrt/misc/dbgrptt.cpp @@ -380,6 +380,7 @@ int __cdecl _VCrtDbgReportA( { __acrt_unlock(__acrt_debug_lock); } + __endtry } if (handled) @@ -427,6 +428,7 @@ int __cdecl _VCrtDbgReportA( _InterlockedDecrement(&_crtAssertBusy); } } + __endtry return retval; } @@ -602,6 +604,7 @@ int __cdecl _VCrtDbgReportW { __acrt_unlock(__acrt_debug_lock); } + __endtry } if (handled) @@ -680,6 +683,7 @@ int __cdecl _VCrtDbgReportW _InterlockedDecrement(&_crtAssertBusy); } } + __endtry return retval; } diff --git a/sdk/lib/ucrt/misc/perror.cpp b/sdk/lib/ucrt/misc/perror.cpp index 319649bbba9..2fa4c2e0465 100644 --- a/sdk/lib/ucrt/misc/perror.cpp +++ b/sdk/lib/ucrt/misc/perror.cpp @@ -62,6 +62,7 @@ static void __cdecl _perror_internal(char const* const user_prefix, __crt_cached { __acrt_lowio_unlock_fh( fh ); } + __endtry } extern "C" void __cdecl perror(char const* const user_prefix) diff --git a/sdk/lib/ucrt/misc/signal.cpp b/sdk/lib/ucrt/misc/signal.cpp index 457e2b6504f..9be5453c6bc 100644 --- a/sdk/lib/ucrt/misc/signal.cpp +++ b/sdk/lib/ucrt/misc/signal.cpp @@ -195,6 +195,7 @@ static BOOL WINAPI ctrlevent_capture(DWORD const ctrl_type) throw() { __acrt_unlock(__acrt_signal_lock); } + __endtry // The default signal action leaves the event unhandled, so return false to // indicate such: @@ -333,6 +334,7 @@ extern "C" __crt_signal_handler_t __cdecl signal(int signum, __crt_signal_handle { __acrt_unlock(__acrt_signal_lock); } + __endtry if (set_console_ctrl_error) return signal_failed(signum); @@ -525,6 +527,7 @@ extern "C" int __cdecl raise(int const signum) if (action_is_global) __acrt_unlock(__acrt_signal_lock); } + __endtry if (return0) return 0; diff --git a/sdk/lib/ucrt/misc/terminate.cpp b/sdk/lib/ucrt/misc/terminate.cpp index b62854c7d64..10cd6504064 100644 --- a/sdk/lib/ucrt/misc/terminate.cpp +++ b/sdk/lib/ucrt/misc/terminate.cpp @@ -51,6 +51,7 @@ extern "C" void __cdecl terminate() throw() { ; // Deliberately do nothing } + __endtry } // If the terminate handler returned, faulted, or otherwise failed to end diff --git a/sdk/lib/ucrt/startup/exit.cpp b/sdk/lib/ucrt/startup/exit.cpp index cc680c175ff..0b3ee5ba814 100644 --- a/sdk/lib/ucrt/startup/exit.cpp +++ b/sdk/lib/ucrt/startup/exit.cpp @@ -228,6 +228,7 @@ static void __cdecl common_exit( { terminate(); } + __endtry #ifndef CRTDLL // When the CRT is statically linked, we are responsible for executing diff --git a/sdk/lib/ucrt/startup/thread.cpp b/sdk/lib/ucrt/startup/thread.cpp index 00ce20d8b21..63884e65199 100644 --- a/sdk/lib/ucrt/startup/thread.cpp +++ b/sdk/lib/ucrt/startup/thread.cpp @@ -107,6 +107,7 @@ static unsigned long WINAPI thread_start(void* const parameter) throw() // Execution should never reach here: _exit(GetExceptionCode()); } + __endtry // This return statement will never be reached. All execution paths result // in the thread or process exiting. diff --git a/sdk/lib/ucrt/stdio/clearerr.cpp b/sdk/lib/ucrt/stdio/clearerr.cpp index d3a0afcdd77..8ce8a4f05d1 100644 --- a/sdk/lib/ucrt/stdio/clearerr.cpp +++ b/sdk/lib/ucrt/stdio/clearerr.cpp @@ -25,6 +25,7 @@ extern "C" errno_t __cdecl clearerr_s(FILE* const public_stream) { _unlock_file(stream.public_stream()); } + __endtry return 0; } diff --git a/sdk/lib/ucrt/stdio/closeall.cpp b/sdk/lib/ucrt/stdio/closeall.cpp index cb537957fe2..c857169230d 100644 --- a/sdk/lib/ucrt/stdio/closeall.cpp +++ b/sdk/lib/ucrt/stdio/closeall.cpp @@ -39,6 +39,7 @@ extern "C" int __cdecl _fcloseall() { __acrt_unlock(__acrt_stdio_index_lock); } + __endtry return count; } diff --git a/sdk/lib/ucrt/stdio/fclose.cpp b/sdk/lib/ucrt/stdio/fclose.cpp index b4c120cb686..a538f4e187e 100644 --- a/sdk/lib/ucrt/stdio/fclose.cpp +++ b/sdk/lib/ucrt/stdio/fclose.cpp @@ -75,6 +75,7 @@ static int __cdecl _fclose_internal(FILE* const public_stream, __crt_cached_ptd_ { _unlock_file(stream.public_stream()); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fdopen.cpp b/sdk/lib/ucrt/stdio/fdopen.cpp index 9edbf11d316..ab5062b78b3 100644 --- a/sdk/lib/ucrt/stdio/fdopen.cpp +++ b/sdk/lib/ucrt/stdio/fdopen.cpp @@ -53,6 +53,7 @@ static FILE* __cdecl common_fdopen( { stream.unlock(); } + __endtry return stream.public_stream(); } diff --git a/sdk/lib/ucrt/stdio/fgetc.cpp b/sdk/lib/ucrt/stdio/fgetc.cpp index ba589ec13cc..d18888ac482 100644 --- a/sdk/lib/ucrt/stdio/fgetc.cpp +++ b/sdk/lib/ucrt/stdio/fgetc.cpp @@ -55,6 +55,7 @@ extern "C" int __cdecl fgetc(FILE* const public_stream) { _unlock_file(stream.public_stream()); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fgets.cpp b/sdk/lib/ucrt/stdio/fgets.cpp index 332c9df3ad7..0f7d17a7738 100644 --- a/sdk/lib/ucrt/stdio/fgets.cpp +++ b/sdk/lib/ucrt/stdio/fgets.cpp @@ -75,6 +75,7 @@ static Character* __cdecl common_fgets( { _unlock_file(stream.public_stream()); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fgetwc.cpp b/sdk/lib/ucrt/stdio/fgetwc.cpp index bdf0efa5236..715410553f4 100644 --- a/sdk/lib/ucrt/stdio/fgetwc.cpp +++ b/sdk/lib/ucrt/stdio/fgetwc.cpp @@ -110,6 +110,7 @@ extern "C" wint_t __cdecl fgetwc(FILE* const stream) { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fopen.cpp b/sdk/lib/ucrt/stdio/fopen.cpp index 2ca0eba7ba3..aace2ba7eae 100644 --- a/sdk/lib/ucrt/stdio/fopen.cpp +++ b/sdk/lib/ucrt/stdio/fopen.cpp @@ -60,6 +60,7 @@ static FILE* __cdecl common_fsopen( stream.unlock(); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fputc.cpp b/sdk/lib/ucrt/stdio/fputc.cpp index f4e3453f9be..e191289990c 100644 --- a/sdk/lib/ucrt/stdio/fputc.cpp +++ b/sdk/lib/ucrt/stdio/fputc.cpp @@ -60,6 +60,7 @@ static int __cdecl _fputc_internal(int const c, FILE* const stream, __crt_cached { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fputwc.cpp b/sdk/lib/ucrt/stdio/fputwc.cpp index d5cfc5acef7..be357b2db67 100644 --- a/sdk/lib/ucrt/stdio/fputwc.cpp +++ b/sdk/lib/ucrt/stdio/fputwc.cpp @@ -110,6 +110,7 @@ static wint_t __cdecl _fputwc_internal(wchar_t const c, FILE* const stream, __cr { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fread.cpp b/sdk/lib/ucrt/stdio/fread.cpp index 04326dbdbca..5e607ad567d 100644 --- a/sdk/lib/ucrt/stdio/fread.cpp +++ b/sdk/lib/ucrt/stdio/fread.cpp @@ -59,6 +59,7 @@ extern "C" size_t __cdecl fread_s( { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/freopen.cpp b/sdk/lib/ucrt/stdio/freopen.cpp index fe6bf2cc4c7..c8a3b26e366 100644 --- a/sdk/lib/ucrt/stdio/freopen.cpp +++ b/sdk/lib/ucrt/stdio/freopen.cpp @@ -79,6 +79,7 @@ static errno_t __cdecl common_freopen( { _unlock_file(stream.public_stream()); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/fseek.cpp b/sdk/lib/ucrt/stdio/fseek.cpp index b635bc31cfb..4a6ea859e6c 100644 --- a/sdk/lib/ucrt/stdio/fseek.cpp +++ b/sdk/lib/ucrt/stdio/fseek.cpp @@ -194,6 +194,7 @@ static int __cdecl common_fseek( { _unlock_file(stream.public_stream()); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/ftell.cpp b/sdk/lib/ucrt/stdio/ftell.cpp index b1b4321300b..e93c19c0884 100644 --- a/sdk/lib/ucrt/stdio/ftell.cpp +++ b/sdk/lib/ucrt/stdio/ftell.cpp @@ -362,6 +362,7 @@ static Integer __cdecl common_ftell(__crt_stdio_stream const stream, __crt_cache { _unlock_file(stream.public_stream()); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/gets.cpp b/sdk/lib/ucrt/stdio/gets.cpp index b42ba038803..9a2436092e0 100644 --- a/sdk/lib/ucrt/stdio/gets.cpp +++ b/sdk/lib/ucrt/stdio/gets.cpp @@ -111,6 +111,7 @@ static Character* __cdecl common_gets( { _unlock_file(stdin); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/getw.cpp b/sdk/lib/ucrt/stdio/getw.cpp index 9c2a4fcc4d4..9f79e2a705f 100644 --- a/sdk/lib/ucrt/stdio/getw.cpp +++ b/sdk/lib/ucrt/stdio/getw.cpp @@ -43,6 +43,7 @@ extern "C" int __cdecl _getw(FILE* const stream) { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/putw.cpp b/sdk/lib/ucrt/stdio/putw.cpp index 3f264c8d838..301e8e52615 100644 --- a/sdk/lib/ucrt/stdio/putw.cpp +++ b/sdk/lib/ucrt/stdio/putw.cpp @@ -38,6 +38,7 @@ extern "C" int __cdecl _putw(int const value, FILE* const stream) { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/rewind.cpp b/sdk/lib/ucrt/stdio/rewind.cpp index 11fcb4ba81c..3cb1d26f419 100644 --- a/sdk/lib/ucrt/stdio/rewind.cpp +++ b/sdk/lib/ucrt/stdio/rewind.cpp @@ -51,6 +51,7 @@ static void __cdecl _rewind_internal(FILE* const public_stream, __crt_cached_ptd { _unlock_file(stream.public_stream()); } + __endtry } extern "C" void __cdecl rewind(FILE* const public_stream) diff --git a/sdk/lib/ucrt/stdio/rmtmp.cpp b/sdk/lib/ucrt/stdio/rmtmp.cpp index 8a3a2229bbd..0aed77d32ab 100644 --- a/sdk/lib/ucrt/stdio/rmtmp.cpp +++ b/sdk/lib/ucrt/stdio/rmtmp.cpp @@ -58,12 +58,14 @@ extern "C" int __cdecl _rmtmp() { _unlock_file(stream.public_stream()); } + __endtry } } __finally { __acrt_unlock(__acrt_stdio_index_lock); } + __endtry return count; } diff --git a/sdk/lib/ucrt/stdio/stream.cpp b/sdk/lib/ucrt/stdio/stream.cpp index 69ea56a0f8e..713556fc0e8 100644 --- a/sdk/lib/ucrt/stdio/stream.cpp +++ b/sdk/lib/ucrt/stdio/stream.cpp @@ -89,6 +89,7 @@ __crt_stdio_stream __cdecl __acrt_stdio_allocate_stream() throw() { __acrt_unlock(__acrt_stdio_index_lock); } + __endtry return stream; } diff --git a/sdk/lib/ucrt/stdio/tempnam.cpp b/sdk/lib/ucrt/stdio/tempnam.cpp index dd213f16b26..f9041d46abb 100644 --- a/sdk/lib/ucrt/stdio/tempnam.cpp +++ b/sdk/lib/ucrt/stdio/tempnam.cpp @@ -172,6 +172,7 @@ static bool __cdecl compute_name( { __acrt_unlock(__acrt_tempnam_lock); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/tmpfile.cpp b/sdk/lib/ucrt/stdio/tmpfile.cpp index a58a8e48bfe..d0786c8007a 100644 --- a/sdk/lib/ucrt/stdio/tmpfile.cpp +++ b/sdk/lib/ucrt/stdio/tmpfile.cpp @@ -309,6 +309,7 @@ static errno_t common_tmpnam( { __acrt_unlock(__acrt_tempnam_lock); } + __endtry return return_value; } @@ -408,6 +409,7 @@ static errno_t __cdecl common_tmpfile_nolock(_Out_ FILE** const stream, int cons local_stream.unlock(); } + __endtry return result; } @@ -435,6 +437,7 @@ static errno_t __cdecl common_tmpfile(_Out_ FILE** const stream, int const sh_fl { __acrt_unlock(__acrt_tempnam_lock); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/ungetc.cpp b/sdk/lib/ucrt/stdio/ungetc.cpp index 211216ec119..eabd8908941 100644 --- a/sdk/lib/ucrt/stdio/ungetc.cpp +++ b/sdk/lib/ucrt/stdio/ungetc.cpp @@ -28,6 +28,7 @@ extern "C" int __cdecl ungetc(int const c, FILE* const stream) { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/stdio/ungetwc.cpp b/sdk/lib/ucrt/stdio/ungetwc.cpp index 831ac543d2c..ceef236d5a7 100644 --- a/sdk/lib/ucrt/stdio/ungetwc.cpp +++ b/sdk/lib/ucrt/stdio/ungetwc.cpp @@ -28,6 +28,7 @@ extern "C" wint_t __cdecl ungetwc(wint_t const c, FILE* const stream) { _unlock_file(stream); } + __endtry return return_value; } diff --git a/sdk/lib/ucrt/time/tzset.cpp b/sdk/lib/ucrt/time/tzset.cpp index bd3e68931dc..2e7ae9254b3 100644 --- a/sdk/lib/ucrt/time/tzset.cpp +++ b/sdk/lib/ucrt/time/tzset.cpp @@ -381,6 +381,7 @@ extern "C" void __cdecl _tzset() { __acrt_unlock(__acrt_time_lock); } + __endtry } @@ -413,6 +414,7 @@ extern "C" void __cdecl __tzset() { __acrt_unlock(__acrt_time_lock); } + __endtry } @@ -707,6 +709,7 @@ extern "C" int __cdecl _isindst(tm* const tb) { __acrt_unlock(__acrt_time_lock); } + __endtry return retval; }

5 months, 2 weeks

[reactos] 21/33: [UCRT] Fix GCC/Clang build of enum_system_locales_ex_nolock

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bb9f6bf288a444f0c70e… commit 7bb9f6bf288a444f0c70ed59cd393935d850b539 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 16 13:02:08 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Fix GCC/Clang build of enum_system_locales_ex_nolock Add static function for Clang. Add missing __stdcall in a lambda for GCC. MSVC does this automagically. See https://devblogs.microsoft.com/oldnewthing/20150220-00/?p=44623. --- sdk/lib/ucrt/internal/winapi_thunks.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/sdk/lib/ucrt/internal/winapi_thunks.cpp b/sdk/lib/ucrt/internal/winapi_thunks.cpp index 15e9d63cfa1..d0e50cfaa58 100644 --- a/sdk/lib/ucrt/internal/winapi_thunks.cpp +++ b/sdk/lib/ucrt/internal/winapi_thunks.cpp @@ -438,6 +438,14 @@ extern "C" int WINAPI __acrt_CompareStringEx( return CompareStringW(__acrt_LocaleNameToLCID(locale_name, 0), flags, string1, string1_count, string2, string2_count); } +#ifdef __clang__ +static LOCALE_ENUMPROCEX static_enum_proc; +static BOOL CALLBACK LocaleEnumProcW(LPWSTR locale_string) +{ + return __crt_fast_decode_pointer(static_enum_proc)(locale_string, 0, 0); +} +#endif + // This has been split into its own function to work around a bug in the Dev12 // C++ compiler where nested captureless lambdas are not convertible to the // required function pointer type. @@ -445,11 +453,21 @@ static BOOL enum_system_locales_ex_nolock( LOCALE_ENUMPROCEX const enum_proc ) throw() { +#ifndef __clang__ static LOCALE_ENUMPROCEX static_enum_proc; +#endif static_enum_proc = __crt_fast_encode_pointer(enum_proc); - BOOL const result = EnumSystemLocalesW( - [](LPWSTR locale_string) { return __crt_fast_decode_pointer(static_enum_proc)(locale_string, 0, 0); }, + BOOL const result = EnumSystemLocalesW((LOCALE_ENUMPROCW) +#ifdef __clang__ + LocaleEnumProcW, +#else + [](LPWSTR locale_string) + #if defined(__GNUC__) && !defined(__clang__) + __stdcall + #endif // __GNUC__ + { return __crt_fast_decode_pointer(static_enum_proc)(locale_string, 0, 0); }, +#endif LCID_INSTALLED); static_enum_proc = __crt_fast_encode_pointer(nullptr);

5 months, 2 weeks

[reactos] 20/33: [UCRT] Silence warning about returning noreturn function

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cc6699f0d8b3593cd4c6… commit 2cc6699f0d8b3593cd4c6703c4e38c044640a4c6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 14 11:14:34 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Silence warning about returning noreturn function --- sdk/lib/ucrt/misc/invalid_parameter.cpp | 1 + sdk/lib/ucrt/startup/exit.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/sdk/lib/ucrt/misc/invalid_parameter.cpp b/sdk/lib/ucrt/misc/invalid_parameter.cpp index 7865ca156db..435115b3664 100644 --- a/sdk/lib/ucrt/misc/invalid_parameter.cpp +++ b/sdk/lib/ucrt/misc/invalid_parameter.cpp @@ -276,6 +276,7 @@ extern "C" __declspec(noreturn) void __cdecl _invalid_parameter_noinfo_noreturn( EXCEPTION_NONCONTINUABLE); TerminateProcess(GetCurrentProcess(), STATUS_INVALID_CRUNTIME_PARAMETER); + UNREACHABLE; } #else // ^^^ (_M_IX86 || _M_X64) && !_UCRT_ENCLAVE_BUILD ^^^ // vvv Newer Architectures vvv // diff --git a/sdk/lib/ucrt/startup/exit.cpp b/sdk/lib/ucrt/startup/exit.cpp index e46e0395d01..cc680c175ff 100644 --- a/sdk/lib/ucrt/startup/exit.cpp +++ b/sdk/lib/ucrt/startup/exit.cpp @@ -285,21 +285,25 @@ extern "C" int __cdecl _is_c_termination_complete() extern "C" void __cdecl exit(int const return_code) { common_exit(return_code, _crt_exit_full_cleanup, _crt_exit_terminate_process); + UNREACHABLE; } extern "C" void __cdecl _exit(int const return_code) { common_exit(return_code, _crt_exit_no_cleanup, _crt_exit_terminate_process); + UNREACHABLE; } extern "C" void __cdecl _Exit(int const return_code) { common_exit(return_code, _crt_exit_no_cleanup, _crt_exit_terminate_process); + UNREACHABLE; } extern "C" void __cdecl quick_exit(int const return_code) { common_exit(return_code, _crt_exit_quick_cleanup, _crt_exit_terminate_process); + UNREACHABLE; } extern "C" void __cdecl _cexit()

5 months, 2 weeks

[reactos] 19/33: [UCRT] Add workaround for va_arg warning about type promotion

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a21a206c89409c3d1418e… commit a21a206c89409c3d1418e1e69e0562f621517dcf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 14 00:03:54 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add workaround for va_arg warning about type promotion --- sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h index cde4af0e080..bb4d545d88c 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h @@ -30,16 +30,33 @@ namespace __crt_stdio_output { // reads the next argument of type T from the varargs list and updates the // va_list, just like va_arg does. The 'peek' function returns the next argument // of type T, but does not modify the va_list. +#if defined(__GNUC__) || defined(__clang__) +template<typename T> struct _va_arg_promoted_tye { using type = T; }; +template<> struct _va_arg_promoted_tye<signed char> { using type = int; }; +template<> struct _va_arg_promoted_tye<unsigned char> { using type = int; }; +template<> struct _va_arg_promoted_tye<wchar_t> { using type = int; }; +template<> struct _va_arg_promoted_tye<short int> { using type = int; }; +template<> struct _va_arg_promoted_tye<short unsigned int> { using type = int; }; +#endif + template <typename T> T read_va_arg(va_list& arglist) throw() { +#if defined(__GNUC__) || defined(__clang__) + return (T)(va_arg(arglist, typename _va_arg_promoted_tye<T>::type)); +#else return va_arg(arglist, T); +#endif } template <typename T> T peek_va_arg(va_list arglist) throw() { +#if defined(__GNUC__) || defined(__clang__) + return (T)(va_arg(arglist, typename _va_arg_promoted_tye<T>::type)); +#else return va_arg(arglist, T); +#endif }

5 months, 2 weeks

[reactos] 18/33: [UCRT] Use GCC inline assembler

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=faedd8ff756f41cc2bf7e… commit faedd8ff756f41cc2bf7edbee1be17d1532dcce9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 10:56:28 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Use GCC inline assembler Clang requires the asm to be split, otherwise it complains that it doesn't have enough registers. --- sdk/include/ucrt/fenv.h | 4 +++ sdk/lib/ucrt/inc/corecrt_internal_big_integer.h | 18 ++++++++++++- sdk/lib/ucrt/misc/invalid_parameter.cpp | 34 ++++++++++++++++++++++++- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/sdk/include/ucrt/fenv.h b/sdk/include/ucrt/fenv.h index d5ac594ebd9..6384e4697b5 100644 --- a/sdk/include/ucrt/fenv.h +++ b/sdk/include/ucrt/fenv.h @@ -130,7 +130,11 @@ _ACRTIMP int __cdecl fesetround(_In_ int _Round); // next floating point instruction. If we're using /arch:IA32, // force the exception to be raised immediately: #if defined _M_IX86 && _M_IX86_FP == 0 && !defined _M_HYBRID_X86_ARM64 + #ifdef _MSC_VER __asm fwait; + #else + __asm__ __volatile__("fwait"); + #endif #endif } } diff --git a/sdk/lib/ucrt/inc/corecrt_internal_big_integer.h b/sdk/lib/ucrt/inc/corecrt_internal_big_integer.h index 817eae6ea11..e97db5cfbbd 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_big_integer.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_big_integer.h @@ -686,6 +686,7 @@ __forceinline uint32_t __cdecl count_sequential_high_zeroes(uint32_t const u) th uint32_t const multiplier ) throw() { + #ifdef _MSC_VER __asm { mov eax, dword ptr [multiplicand + 4] @@ -698,6 +699,21 @@ __forceinline uint32_t __cdecl count_sequential_high_zeroes(uint32_t const u) th add edx, ecx } + #else // ^^^ _MSC_VER ^^^ // vvv !_MSC_VER vvv // + uint64_t retval; + __asm__( + "mull %[multiplier]\n" + "movl %%eax, %%ecx\n" + "movl %[multiplicand_lo], %%eax\n" + "mull %[multiplier]\n" + "addl %%ecx, %%edx\n" + : "=A" (retval) + : [multiplicand_hi] "a" ((uint32_t)((multiplicand >> 32) & 0xFFFFFFFF)), + [multiplicand_lo] "rm" ((uint32_t)((multiplicand >> 0) & 0xFFFFFFFF)), + [multiplier] "rm" (multiplier) + : "ecx" ); + return retval; + #endif // !_MSC_VER } #else __forceinline uint64_t __cdecl multiply_64_32( @@ -869,7 +885,7 @@ inline uint64_t __cdecl divide( } // Multiply and subtract. Note that uu_quo may be one too large. If - // we have a borrow at the end, we'll add the denominator back on and + // we have a borrow at the end, we'll add the denominator back on and // decrement uu_quo. if (uu_quo > 0) { diff --git a/sdk/lib/ucrt/misc/invalid_parameter.cpp b/sdk/lib/ucrt/misc/invalid_parameter.cpp index accd35f348a..7865ca156db 100644 --- a/sdk/lib/ucrt/misc/invalid_parameter.cpp +++ b/sdk/lib/ucrt/misc/invalid_parameter.cpp @@ -166,7 +166,38 @@ extern "C" __declspec(noreturn) void __cdecl _invalid_parameter_noinfo_noreturn( EXCEPTION_POINTERS ExceptionPointers = {&ExceptionRecord, &ContextRecord}; #ifdef _M_IX86 - + #if defined(__GNUC__) || defined(__clang__) + __asm__ __volatile__( + "movl %%eax, %[CxEax]\n\t" + "movl %%ecx, %[CxEcx]\n\t" + "movl %%edx, %[CxEdx]\n\t" + "movl %%ebx, %[CxEbx]\n\t" + "movl %%esi, %[CxEsi]\n\t" + "movl %%edi, %[CxEdi]\n\t" + : [CxEax] "=m" (ContextRecord.Eax), + [CxEcx] "=m" (ContextRecord.Ecx), + [CxEdx] "=m" (ContextRecord.Edx), + [CxEbx] "=m" (ContextRecord.Ebx), + [CxEsi] "=m" (ContextRecord.Esi), + [CxEdi] "=m" (ContextRecord.Edi)); + __asm__ __volatile__( + "movw %%ss, %[CxSegSs]\n\t" + "movw %%cs, %[CxSegCs]\n\t" + "movw %%ds, %[CxSegDs]\n\t" + "movw %%es, %[CxSegEs]\n\t" + "movw %%fs, %[CxSegFs]\n\t" + "movw %%gs, %[CxSegGs]\n\t" + : [CxSegSs] "=m" (ContextRecord.SegSs), + [CxSegCs] "=m" (ContextRecord.SegCs), + [CxSegDs] "=m" (ContextRecord.SegDs), + [CxSegEs] "=m" (ContextRecord.SegEs), + [CxSegFs] "=m" (ContextRecord.SegFs), + [CxSegGs] "=m" (ContextRecord.SegGs)); + __asm__ __volatile__( + "pushfl\n\t" + "popl %[CxEFlags]\n\t" + : [CxEFlags] "=m" (ContextRecord.EFlags)); + #else // ^^^ __GNUC__ ^^^ // vvv !__GNUC__ vvv // __asm { mov dword ptr [ContextRecord.Eax ], eax @@ -184,6 +215,7 @@ extern "C" __declspec(noreturn) void __cdecl _invalid_parameter_noinfo_noreturn( pushfd pop [ContextRecord.EFlags] } + #endif // !__GNUC__ ContextRecord.ContextFlags = CONTEXT_CONTROL;

5 months, 2 weeks

[reactos] 17/33: [UCRT] Add casts to make GCC happy

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0cdde63c57f00dc3abfd5… commit 0cdde63c57f00dc3abfd5663fc3d5ac52c07dcbf Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 19:22:21 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add casts to make GCC happy --- sdk/lib/ucrt/startup/thread.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/lib/ucrt/startup/thread.cpp b/sdk/lib/ucrt/startup/thread.cpp index 8af08c2c9c0..00ce20d8b21 100644 --- a/sdk/lib/ucrt/startup/thread.cpp +++ b/sdk/lib/ucrt/startup/thread.cpp @@ -126,7 +126,7 @@ static __acrt_thread_parameter* __cdecl create_thread_parameter( return nullptr; } - parameter.get()->_procedure = procedure; + parameter.get()->_procedure = reinterpret_cast<void*>(procedure); parameter.get()->_context = context; // Attempt to bump the reference count of the module in which the user's @@ -149,7 +149,7 @@ extern "C" uintptr_t __cdecl _beginthread( { _VALIDATE_RETURN(procedure != nullptr, EINVAL, reinterpret_cast<uintptr_t>(INVALID_HANDLE_VALUE)); - unique_thread_parameter parameter(create_thread_parameter(procedure, context)); + unique_thread_parameter parameter(create_thread_parameter(reinterpret_cast<void*>(procedure), context)); if (!parameter) { return reinterpret_cast<uintptr_t>(INVALID_HANDLE_VALUE); @@ -199,7 +199,7 @@ extern "C" uintptr_t __cdecl _beginthreadex( { _VALIDATE_RETURN(procedure != nullptr, EINVAL, 0); - unique_thread_parameter parameter(create_thread_parameter(procedure, context)); + unique_thread_parameter parameter(create_thread_parameter((void*)procedure, context)); if (!parameter) { return 0;

5 months, 2 weeks

[reactos] 16/33: [UCRT] Fix GCC/Clang compilation of template specializations

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbd58d766623596e466f6… commit dbd58d766623596e466f67bf6c29088c157c5c05 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 21:54:37 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Fix GCC/Clang compilation of template specializations --- sdk/lib/ucrt/inc/corecrt_internal_traits.h | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_traits.h b/sdk/lib/ucrt/inc/corecrt_internal_traits.h index bb4c36cd793..d84107e72d7 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_traits.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_traits.h @@ -17,6 +17,41 @@ #pragma pack(push, _CRT_PACKING) +#if defined(__GNUC__) || defined(__clang__) +// We have to declare them here, because GCC expects them to be declared, +// when the template specializations below are instanciated! +#include <corecrt_io.h> +extern "C" { +errno_t __cdecl _access_s(char const* const path, int const access_mode); +errno_t __cdecl _waccess_s(wchar_t const* const path, int const access_mode); +__time32_t __cdecl __loctotime32_t(int, int, int, int, int, int, int); +__time64_t __cdecl __loctotime64_t(int, int, int, int, int, int, int); +_Check_return_opt_ long __cdecl _lseek_nolock(_In_ int _FileHandle, _In_ long _Offset, _In_ int _Origin); +_Check_return_opt_ __int64 __cdecl _lseeki64_nolock(_In_ int _FileHandle, _In_ __int64 _Offset, _In_ int _Origin); +_ACRTIMP __time32_t __cdecl _time32(_Out_opt_ __time32_t* _Time); +_ACRTIMP __time64_t __cdecl _time64(_Out_opt_ __time64_t* _Time); +_Success_(return == 0) +errno_t __cdecl _sopen_nolock( + _Out_ int* _UnlockFlag, + _Out_ int* _FileHandle, + _In_z_ char const* _FileName, + _In_ int _OpenFlag, + _In_ int _ShareFlag, + _In_ int _PermissionFlag, + _In_ int _SecureFlag + ); +_Success_(return == 0) +errno_t __cdecl _wsopen_nolock( + _Out_ int* _UnlockFlag, + _Out_ int* _FileHandle, + _In_z_ wchar_t const* _FileName, + _In_ int _OpenFlag, + _In_ int _ShareFlag, + _In_ int _PermissionFlag, + _In_ int _SecureFlag + ); +} // extern "C" +#endif // __GNUC__ //-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+

5 months, 2 weeks

[reactos] 15/33: [UCRT] Add using declatarions for template base-classes (GCC compatibility)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c15b618a17c73384d897f… commit c15b618a17c73384d897f4d466b2c6a4d3d19256 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 14 00:30:51 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add using declatarions for template base-classes (GCC compatibility) --- sdk/lib/ucrt/inc/corecrt_internal_simd.h | 1 + sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h | 70 ++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_simd.h b/sdk/lib/ucrt/inc/corecrt_internal_simd.h index 6759c756900..5770418e034 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_simd.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_simd.h @@ -42,6 +42,7 @@ : __crt_simd_pack_traits<Isa> { using element_type = Element; + using __crt_simd_pack_traits<Isa>::pack_size; enum : size_t { diff --git a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h index e3ebfe4fd6f..cde4af0e080 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_stdio_output.h @@ -111,6 +111,10 @@ template <typename Character> class console_output_adapter : public output_adapter_common<Character, console_output_adapter<Character>> { +#ifndef _MSC_VER // For retarded compilers! + using oac_base = output_adapter_common<Character, console_output_adapter<Character>>; + using oac_base::write_string_impl; +#endif public: typedef __acrt_stdio_char_traits<Character> char_traits; @@ -141,6 +145,10 @@ template <typename Character> class stream_output_adapter : public output_adapter_common<Character, stream_output_adapter<Character>> { +#ifndef _MSC_VER // For retarded compilers! + using oac_base = output_adapter_common<Character, stream_output_adapter<Character>>; + using oac_base::write_string_impl; +#endif public: typedef __acrt_stdio_char_traits<Character> char_traits; @@ -969,6 +977,11 @@ class output_adapter_data : protected common_data<Character> { protected: +#ifndef _MSC_VER // For retarded compilers! + using common_data<Character>::_options; + using common_data<Character>::_format_it; + using common_data<Character>::_valist_it; +#endif output_adapter_data( OutputAdapter const& output_adapter, uint64_t const options, @@ -1003,6 +1016,12 @@ class standard_base : protected output_adapter_data<Character, OutputAdapter> { protected: +#ifndef _MSC_VER // For retarded compilers! + using common_data_base = typename output_adapter_data<Character, OutputAdapter>::template common_data<Character>; + using common_data_base::_valist_it; + using common_data_base::_field_width; + using common_data_base::_precision; +#endif template <typename... Ts> standard_base(Ts&&... arguments) throw() : output_adapter_data<Character, OutputAdapter>{arguments... }, @@ -1106,6 +1125,11 @@ class format_validation_base : protected standard_base<Character, OutputAdapter> { protected: +#ifndef _MSC_VER // For retarded compilers! + using common_data_base = typename standard_base<Character, OutputAdapter>::template output_adapter_data<Character, OutputAdapter>::template common_data<Character>; + using common_data_base::_ptd; + using common_data_base::_state; +#endif template <typename... Ts> format_validation_base(Ts&&... arguments) throw() : standard_base<Character, OutputAdapter>{arguments...} @@ -1150,6 +1174,19 @@ class positional_parameter_base : protected format_validation_base<Character, OutputAdapter> { protected: +#if defined(__GNUC__) || defined(__clang__) // For retarded compilers! + using common_data_base = typename format_validation_base<Character, OutputAdapter>::template standard_base<Character, OutputAdapter>::template output_adapter_data<Character, OutputAdapter>::template common_data<Character>; + using output_adapter_data = typename format_validation_base<Character, OutputAdapter>::template standard_base<Character, OutputAdapter>::template output_adapter_data<Character, OutputAdapter>; + using common_data_base::_format_it; + using common_data_base::_ptd; + using common_data_base::_field_width; + using common_data_base::_precision; + using common_data_base::_format_char; + using common_data_base::_valist_it; + using common_data_base::_length; + using common_data_base::_state; + using common_data_base::_options; +#endif typedef positional_parameter_base self_type; typedef format_validation_base base_type; @@ -1641,6 +1678,39 @@ class output_processor : private ProcessorBase { public: +#ifndef _MSC_VER // For retarded compilers! + using ProcessorBase::advance_to_next_pass; + using ProcessorBase::validate_and_update_state_at_beginning_of_format_character; + using ProcessorBase::validate_and_update_state_at_end_of_format_string; + using ProcessorBase::should_skip_normal_state_processing; + using ProcessorBase::update_field_width; + using ProcessorBase::should_format; + using ProcessorBase::update_precision; + using ProcessorBase::should_skip_type_state_output; + using ProcessorBase::validate_state_for_type_case_a; + using ProcessorBase::tchar_string; + using ProcessorBase::state_transition_table; + using ProcessorBase::state_count; + using oad_base = typename ProcessorBase::output_adapter_data; + using oad_base::_output_adapter; + using common_data_base = typename ProcessorBase::common_data_base; + using common_data_base::_string_length; + using common_data_base::_ptd; + using common_data_base::_format_it; + using common_data_base::_state; + using common_data_base::_format_char; + using common_data_base::_characters_written; + using common_data_base::_string_is_wide; + using common_data_base::_field_width; + using common_data_base::_suppress_output; + using common_data_base::_flags; + using common_data_base::_precision; + using common_data_base::_length; + using common_data_base::_options; + using common_data_base::_buffer; + using common_data_base::_narrow_string; + using common_data_base::_wide_string; +#endif typedef __acrt_stdio_char_traits<Character> char_traits;

5 months, 2 weeks

[reactos] 14/33: [UCRT] Add some missing typename for GCC compatibility

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ba105e9b59c49b8675f4… commit 5ba105e9b59c49b8675f4b949bf643b207a9f803 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 13 19:31:21 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Jan 16 14:18:53 2025 +0200 [UCRT] Add some missing typename for GCC compatibility --- sdk/lib/ucrt/inc/corecrt_internal_strtox.h | 2 +- sdk/lib/ucrt/internal/win_policies.cpp | 8 ++++---- sdk/lib/ucrt/string/strnlen.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_strtox.h b/sdk/lib/ucrt/inc/corecrt_internal_strtox.h index 68293919858..102724dda7d 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_strtox.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_strtox.h @@ -1329,7 +1329,7 @@ floating_point_parse_result __cdecl parse_floating_point_possible_nan( StoredState stored_state ) throw() { - using char_type = CharacterSource::char_type; + using char_type = typename CharacterSource::char_type; auto restore_state = [&]() { diff --git a/sdk/lib/ucrt/internal/win_policies.cpp b/sdk/lib/ucrt/internal/win_policies.cpp index 55efd95f05c..be0a78accab 100644 --- a/sdk/lib/ucrt/internal/win_policies.cpp +++ b/sdk/lib/ucrt/internal/win_policies.cpp @@ -11,7 +11,7 @@ template<typename TPolicy> static typename TPolicy::policy_type __cdecl get_win_policy(typename TPolicy::appmodel_policy_type defaultValue) { - TPolicy::appmodel_policy_type appmodelPolicy = defaultValue; + typename TPolicy::appmodel_policy_type appmodelPolicy = defaultValue; // Secure processes cannot load the appmodel DLL, so only attempt loading // policy information if this is not a secure process. @@ -29,10 +29,10 @@ static typename TPolicy::policy_type __cdecl get_cached_win_policy(typename TPol static long state_cache = 0; if (long const cached_state = __crt_interlocked_read(&state_cache)) { - return static_cast<TPolicy::policy_type>(cached_state); + return static_cast<typename TPolicy::policy_type>(cached_state); } - TPolicy::appmodel_policy_type appmodelPolicy = defaultValue; + typename TPolicy::appmodel_policy_type appmodelPolicy = defaultValue; // Secure processes cannot load the appmodel DLL, so only attempt loading // policy information if this is not a secure process. @@ -41,7 +41,7 @@ static typename TPolicy::policy_type __cdecl get_cached_win_policy(typename TPol TPolicy::appmodel_get_policy(&appmodelPolicy); } - TPolicy::policy_type const policyValue = TPolicy::appmodel_policy_to_policy_type(appmodelPolicy); + typename TPolicy::policy_type const policyValue = TPolicy::appmodel_policy_to_policy_type(appmodelPolicy); long const cached_state = _InterlockedExchange(&state_cache, static_cast<long>(policyValue)); if (cached_state) diff --git a/sdk/lib/ucrt/string/strnlen.cpp b/sdk/lib/ucrt/string/strnlen.cpp index 5465e0ff863..6cee4e85e0f 100644 --- a/sdk/lib/ucrt/string/strnlen.cpp +++ b/sdk/lib/ucrt/string/strnlen.cpp @@ -138,7 +138,7 @@ static __forceinline size_t __cdecl common_strnlen_c( // [2] Aligned Vector Loop (Middle) __crt_simd_cleanup_guard<Isa> const simd_cleanup; - traits::pack_type const zero = traits::get_zero_pack(); + typename traits::pack_type const zero = traits::get_zero_pack(); size_t const middle_and_suffix_count = maximum_count - prefix_count; size_t const suffix_count = middle_and_suffix_count % traits::pack_size; @@ -147,7 +147,7 @@ static __forceinline size_t __cdecl common_strnlen_c( Element const* const middle_last = it + middle_count; while (!last_reached<Mode>(it, middle_last)) { - auto const element_it = reinterpret_cast<traits::pack_type const*>(it); + auto const element_it = reinterpret_cast<typename traits::pack_type const*>(it); bool const element_has_terminator = traits::compute_byte_mask(traits::compare_equals(*element_it, zero)) != 0; if (element_has_terminator)

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