Ros-diffs January 2025

ros-diffs@reactos.org

23 participants
278 discussions

[reactos] 04/14: [UCRT] Fix/improve __crt_state_management

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e2ffc35894f760c7d0718… commit e2ffc35894f760c7d0718cdf6ddfc910ac683b81 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 27 11:42:27 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Fix/improve __crt_state_management --- .../ucrt/inc/corecrt_internal_state_isolation.h | 59 ++++++++++++++++++---- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/sdk/lib/ucrt/inc/corecrt_internal_state_isolation.h b/sdk/lib/ucrt/inc/corecrt_internal_state_isolation.h index 341de26f6ff..47477fc3f57 100644 --- a/sdk/lib/ucrt/inc/corecrt_internal_state_isolation.h +++ b/sdk/lib/ucrt/inc/corecrt_internal_state_isolation.h @@ -15,33 +15,72 @@ extern "C++" { namespace __crt_state_management { +#ifdef _CRT_GLOBAL_STATE_ISOLATION +#error FIXME: Global state isolation is not implemented yet constexpr size_t state_index_count = 2; +#else + constexpr size_t state_index_count = 1; +#endif + struct scoped_global_state_reset { scoped_global_state_reset() throw() { } ~scoped_global_state_reset() throw() { } - }; // FIXME: Implement this + }; + template <typename T> class dual_state_global { - T _value[2]; + T _value[state_index_count]; + public: + + // Implemented in corecrt_internal_ptd_propagation.h T& value(__crt_cached_ptd_host& ptd) throw(); T const& value(__crt_cached_ptd_host& ptd) const throw(); - T& value(void) throw() { return _value[0]; } - T value_explicit(size_t index) throw() { return _value[index]; } - T* dangerous_get_state_array() throw() { return _value; } - void initialize(T) throw() { } - template<typename T2> void uninitialize(T2) throw() { } - template<typename T2, size_t N> void initialize_from_array(T2 const (&values)[N]) throw() { } + + T& value(void) throw() + { + return _value[0]; + } + + T value_explicit(size_t index) throw() + { + return _value[index]; + } + + T* dangerous_get_state_array() throw() + { + return _value; + } + + void initialize(T x) throw() + { + _value[0] = x; + } + + template<typename T2> + void uninitialize(T2 Lambda) throw() + { + Lambda(_value[0]); + } + + template<typename T2> + void initialize_from_array(T2 (&values)[state_index_count]) throw() + { + for (size_t i = 0; i < state_index_count; i++) + { + _value[i] = values[i]; + } + } }; - inline int get_current_state_index(__crt_scoped_get_last_error_reset const &last_error_reset) + inline size_t get_current_state_index(__crt_scoped_get_last_error_reset const &last_error_reset) { return 0; } - inline int get_current_state_index(void) + inline size_t get_current_state_index(void) { return 0; }

2 weeks

[reactos] 03/14: [UCRT] Improve __crt_seh_guarded_call

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c2b1271dbee202e0946d7… commit c2b1271dbee202e0946d7ac0f7e8ee87b301efbd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 10 16:20:55 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Improve __crt_seh_guarded_call This is a workaround for an MSVC compiler bug, which would result in degraded performance. See https://developercommunity.visualstudio.com/t/_local_unwind-generated-when-… --- sdk/lib/ucrt/inc/internal_shared.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/sdk/lib/ucrt/inc/internal_shared.h b/sdk/lib/ucrt/inc/internal_shared.h index 7ad4b4bafe3..a0f1a5a841e 100644 --- a/sdk/lib/ucrt/inc/internal_shared.h +++ b/sdk/lib/ucrt/inc/internal_shared.h @@ -206,10 +206,31 @@ struct __crt_seh_guarded_call template<typename Init, typename Action, typename Cleanup> T operator()(Init init, Action action, Cleanup cleanup) { + T result; init(); __try { - return action(); + result = action(); + } + __finally + { + cleanup(); + } + __endtry + return result; + } +}; + +template<> +struct __crt_seh_guarded_call<void> +{ + template<typename Init, typename Action, typename Cleanup> + void operator()(Init init, Action action, Cleanup cleanup) + { + init(); + __try + { + action(); } __finally {

2 weeks

[reactos] 02/14: [UCRT] Properly implement __crt_fast_encode/decode_pointer

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a58b713a5e32a8ca23f4e… commit a58b713a5e32a8ca23f4e514aad65c8b0c1e8c30 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 10 16:01:21 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Properly implement __crt_fast_encode/decode_pointer --- sdk/lib/ucrt/inc/internal_shared.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sdk/lib/ucrt/inc/internal_shared.h b/sdk/lib/ucrt/inc/internal_shared.h index 08c1cb79463..7ad4b4bafe3 100644 --- a/sdk/lib/ucrt/inc/internal_shared.h +++ b/sdk/lib/ucrt/inc/internal_shared.h @@ -166,18 +166,20 @@ extern char __ImageBase; template<typename T> __forceinline -T __crt_fast_encode_pointer(T Ptr) +T __crt_fast_encode_pointer(T ptr) { - // FIXME: use cookie - return Ptr; + union { T Ptr; uintptr_t Uint; } u = { ptr }; + u.Uint ^= __security_cookie; + return u.Ptr; } template<typename T> __forceinline -T __crt_fast_decode_pointer(T Ptr) +T __crt_fast_decode_pointer(T ptr) { - // FIXME: use cookie - return Ptr; + union { T Ptr; uintptr_t Uint; } u = { ptr }; + u.Uint ^= __security_cookie; + return u.Ptr; } template<typename T>

2 weeks

[reactos] 01/14: [UCRT] Properly implement parameter checking macros

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1145f0c89177d828a20e… commit c1145f0c89177d828a20eb2b1747a69307120c2a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 10 16:36:08 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Properly implement parameter checking macros Partly copied from corecrt_internal_strtox.h, partly imported from dotnet runtime (https://github.com/dotnet/runtime/blob/release/8.0/src/coreclr/pal/src/safe…) --- sdk/lib/ucrt/inc/internal_shared.h | 87 +++++++++++++++++++++++++++++++------- 1 file changed, 71 insertions(+), 16 deletions(-) diff --git a/sdk/lib/ucrt/inc/internal_shared.h b/sdk/lib/ucrt/inc/internal_shared.h index d4234e7cdf7..08c1cb79463 100644 --- a/sdk/lib/ucrt/inc/internal_shared.h +++ b/sdk/lib/ucrt/inc/internal_shared.h @@ -75,29 +75,84 @@ extern char __ImageBase; #define _CRT_SECURITYCRITICAL_ATTRIBUTE #define _CRT_SECURITYSAFECRITICAL_ATTRIBUTE -#define _VALIDATE_RETURN(expr, errorcode, retexpr) \ - if (!(expr)) return (retexpr); +//-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// +// Parameter validation macros +// Partly duplicated in corecrt_internal_strtox.h +// +//-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + +#ifdef _DEBUG + #define _INVALID_PARAMETER(expr) _invalid_parameter(expr, __FUNCTIONW__, __FILEW__, __LINE__, 0) +#else + #define _INVALID_PARAMETER(expr) _invalid_parameter_noinfo() +#endif -#define _VALIDATE_RETURN_VOID(expr, errorcode) \ - if (!(expr)) return; +#define _VALIDATE_RETURN(expr, errorcode, retexpr) \ + { \ + int _Expr_val = !!(expr); \ + _ASSERT_EXPR((_Expr_val), _CRT_WIDE(#expr)); \ + if (!(_Expr_val)) \ + { \ + *_errno() = (errorcode); \ + _INVALID_PARAMETER(_CRT_WIDE(#expr)); \ + return (retexpr); \ + } \ + } -#define _VALIDATE_RETURN_NOERRNO(expr, retexpr) \ - if (!(expr)) return (retexpr); +#define _VALIDATE_RETURN_VOID(expr, errorcode) \ + { \ + int _Expr_val = !!(expr); \ + _ASSERT_EXPR((_Expr_val), _CRT_WIDE(#expr)); \ + if (!(_Expr_val)) \ + { \ + *_errno() = (errorcode); \ + _INVALID_PARAMETER(_CRT_WIDE(#expr)); \ + return; \ + } \ + } -#define _VALIDATE_RETURN_ERRCODE(expr, errorcode) \ - if (!(expr)) return (errorcode); +#define _VALIDATE_RETURN_NOERRNO(expr, retexpr) \ + { \ + int _Expr_val = !!(expr); \ + _ASSERT_EXPR((_Expr_val), _CRT_WIDE(#expr)); \ + if (!(_Expr_val)) \ + { \ + _INVALID_PARAMETER(_CRT_WIDE(#expr)); \ + return (retexpr); \ + } \ + } -#define _VALIDATE_CLEAR_OSSERR_RETURN(expr, errorcode, retexpr) \ - if (!(expr)) return (retexpr); +#define _VALIDATE_RETURN_ERRCODE(expr, errorcode) \ + _VALIDATE_RETURN(expr, errorcode, errorcode) + +#define _VALIDATE_CLEAR_OSSERR_RETURN(expr, errorcode, retexpr) \ + { \ + int _Expr_val = !!(expr); \ + _ASSERT_EXPR((_Expr_val), _CRT_WIDE(#expr)); \ + if (!(_Expr_val)) \ + { \ + *__doserrno() = 0L; \ + *_errno() = errorcode; \ + _INVALID_PARAMETER(_CRT_WIDE(#expr) ); \ + return (retexpr); \ + } \ + } -#define _VALIDATE_CLEAR_OSSERR_RETURN_ERRCODE(expr, errorcode) \ - if (!(expr)) return (errorcode); +#define _VALIDATE_CLEAR_OSSERR_RETURN_ERRCODE(expr, errorcode) \ + _VALIDATE_CLEAR_OSSERR_RETURN(expr, errorcode, errorcode) -#define _VALIDATE_RETURN_NOEXC(expr, errorcode, retexpr) \ - if (!(expr)) return (retexpr); +#define _VALIDATE_RETURN_NOEXC(expr, errorcode, retexpr) \ + { \ + if (!(expr)) \ + { \ + *_errno() = errorcode; \ + return (retexpr); \ + } \ + } -#define _VALIDATE_RETURN_ERRCODE_NOEXC(expr, errorcode) \ - if (!(expr)) return (errorcode); +#define _VALIDATE_RETURN_ERRCODE_NOEXC(expr, errorcode) \ + _VALIDATE_RETURN_NOEXC(expr, errorcode, errorcode) #define _malloc_crt malloc #define _free_crt free

2 weeks

[reactos] 01/01: [NTOS:KE/x64] Improve freeze code

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85f42a25d5bcda5ce1720… commit 85f42a25d5bcda5ce1720e247b5907d372f0c042 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Dec 13 12:59:28 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 14:04:18 2025 +0200 [NTOS:KE/x64] Improve freeze code - Set ACTIVE flag on freeze owner like on Windows - Add a nice state graph - Change license to MIT --- ntoskrnl/ke/amd64/freeze.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/ke/amd64/freeze.c b/ntoskrnl/ke/amd64/freeze.c index 5cf53f3f27f..5e655d32939 100644 --- a/ntoskrnl/ke/amd64/freeze.c +++ b/ntoskrnl/ke/amd64/freeze.c @@ -1,8 +1,30 @@ /* * PROJECT: ReactOS Kernel - * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * LICENSE: MIT (https://spdx.org/licenses/MIT) * PURPOSE: Processor freeze support for x64 - * COPYRIGHT: Copyright 2023 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * COPYRIGHT: Copyright 2023-2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +/* + + IpiFrozen state graph (based on Windows behavior): + + +-----------------+ Freeze request +-----------------+ + | RUNNING |------------------------>| TARGET_FREEZE | + +-----------------+<--------- +-----------------+ + |^ | Resume | + Freeze || Thaw +-----------+ Thaw request | Freeze IPI + v| | THAW |<-----------\ v + +-----------------+ +-----------+ +-----------------+ + | OWNER + ACTIVE | ^ | FROZEN | + +-----------------+ | +-----------------+ + ^ | ^ + | Kd proc switch | | Kd proc switch + v | v + +-----------------+ | +-----------------+ + | OWNER |---------+ | FROZEN + ACTIVE | + +-----------------+ Thaw request +-----------------+ + */ /* INCLUDES *******************************************************************/ @@ -98,8 +120,8 @@ KxFreezeExecution( } } - /* We are the owner now */ - CurrentPrcb->IpiFrozen = IPI_FROZEN_STATE_OWNER; + /* We are the owner now and active */ + CurrentPrcb->IpiFrozen = IPI_FROZEN_STATE_OWNER | IPI_FROZEN_FLAG_ACTIVE; /* Loop all processors */ for (ULONG i = 0; i < KeNumberProcessors; i++) @@ -107,7 +129,7 @@ KxFreezeExecution( PKPRCB TargetPrcb = KiProcessorBlock[i]; if (TargetPrcb != CurrentPrcb) { - /* Nobody else is allowed to change IpiFrozen, except the freeze owner */ + /* Only the active processor is allowed to change IpiFrozen */ ASSERT(TargetPrcb->IpiFrozen == IPI_FROZEN_STATE_RUNNING); /* Request target to freeze */ @@ -142,6 +164,7 @@ KxThawExecution( VOID) { PKPRCB CurrentPrcb = KeGetCurrentPrcb(); + ASSERT(CurrentPrcb->IpiFrozen & IPI_FROZEN_FLAG_ACTIVE); /* Loop all processors */ for (ULONG i = 0; i < KeNumberProcessors; i++) @@ -190,6 +213,10 @@ KxSwitchKdProcessor( /* Make sure that the processor index is valid */ ASSERT(ProcessorIndex < KeNumberProcessors); + /* We are no longer active */ + ASSERT(CurrentPrcb->IpiFrozen & IPI_FROZEN_FLAG_ACTIVE); + CurrentPrcb->IpiFrozen &= ~IPI_FROZEN_FLAG_ACTIVE; + /* Inform the target processor that it's his turn now */ TargetPrcb = KiProcessorBlock[ProcessorIndex]; TargetPrcb->IpiFrozen |= IPI_FROZEN_FLAG_ACTIVE; @@ -212,12 +239,12 @@ KxSwitchKdProcessor( { /* Another CPU has completed, we can leave the debugger now */ KdpDprintf("[%u] KxSwitchKdProcessor: ContinueSuccess\n", KeGetCurrentProcessorNumber()); - CurrentPrcb->IpiFrozen = IPI_FROZEN_STATE_OWNER; + CurrentPrcb->IpiFrozen = IPI_FROZEN_STATE_OWNER | IPI_FROZEN_FLAG_ACTIVE; return ContinueSuccess; } /* We have been reselected, return to Kd to continue in the debugger */ - CurrentPrcb->IpiFrozen = IPI_FROZEN_STATE_OWNER; + ASSERT(CurrentPrcb->IpiFrozen == (IPI_FROZEN_STATE_OWNER | IPI_FROZEN_FLAG_ACTIVE)); return ContinueProcessorReselected; }

2 weeks

[reactos] 02/02: [MSHTML_WINETEST] Fix crash of mshtml_winetest:activex

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a17d32a373abc158e67d3… commit a17d32a373abc158e67d330c8235ab18634a6f5f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 20 10:52:37 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 13:38:18 2025 +0200 [MSHTML_WINETEST] Fix crash of mshtml_winetest:activex --- modules/rostests/winetests/mshtml/activex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rostests/winetests/mshtml/activex.c b/modules/rostests/winetests/mshtml/activex.c index 117becd79af..4d768378fc9 100644 --- a/modules/rostests/winetests/mshtml/activex.c +++ b/modules/rostests/winetests/mshtml/activex.c @@ -2434,6 +2434,7 @@ static void test_flash_ax(void) skip("Skipping test_ui_activate(). ROSTESTS-114.\n"); skip("Skipping test_container(notif_doc). ROSTESTS-114.\n"); skip("Skipping test_object_elem(notif_doc). ROSTESTS-114.\n"); + return; } IOleClientSite_AddRef(client_site);

2 weeks

[reactos] 01/02: [URLMON] Define PROXY_CLSID_IS on the command line

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b3406e6304638e192e7a… commit 6b3406e6304638e192e7a1cf85c98a6243d6314a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 20 12:29:24 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 13:38:18 2025 +0200 [URLMON] Define PROXY_CLSID_IS on the command line Fixes crash of mshtml_winetest:htmldoc (introduced by 716613c). Please do not ask me why. The test started crashing with commit 716613cddc8039eff5f095051dc9a79727a25e73 "[CMAKE] Use new policies for CMP0005 and CMP0018 (#1481)", which moved this definition from the command line to urlmon_main.h. This got later removed by commit 6c3c2e33f63b9e621497807591555304ecdd37ec "[URLMON] Sync with Wine Staging 4.18. CORE-16441" --- dll/win32/urlmon/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/urlmon/CMakeLists.txt b/dll/win32/urlmon/CMakeLists.txt index 6b5bef1759f..6475c18dc30 100644 --- a/dll/win32/urlmon/CMakeLists.txt +++ b/dll/win32/urlmon/CMakeLists.txt @@ -4,7 +4,8 @@ add_definitions( -D_URLMON_ -DENTRY_PREFIX=URLMON_ -DPROXY_DELEGATION - -DWINE_REGISTER_DLL) + -DWINE_REGISTER_DLL + -DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) spec2def(urlmon.dll urlmon.spec ADD_IMPORTLIB)

2 weeks

[reactos] 01/01: [FREETYPE][NTGDI] Simplify IntGdiLoadFontsFromMemory (#7651)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1868985dde6217225f83b… commit 1868985dde6217225f83b0e20c69639387e60fb2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 22 11:56:41 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 22 11:56:41 2025 +0900 [FREETYPE][NTGDI] Simplify IntGdiLoadFontsFromMemory (#7651) Simplify code logic and reduce management cost. JIRA issue: CORE-19973 - Add IntGdiLoadFontByIndexFromMemory helper function. - Simplify IntGdiLoadFontsFromMemory function. --- win32ss/gdi/ntgdi/freetype.c | 115 +++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 54 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 13932681b29..b6ba46316c7 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1737,44 +1737,13 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, FT_ULong os2_ulCodePageRange1; FT_UShort os2_usWeightClass; - if (SharedFace == NULL && CharSetIndex == -1) - { - /* load a face from memory */ - IntLockFreeType(); - Error = FT_New_Memory_Face( - g_FreeTypeLibrary, - pLoadFont->Memory->Buffer, - pLoadFont->Memory->BufferSize, - ((FontIndex != -1) ? FontIndex : 0), - &Face); - - if (!Error) - SharedFace = SharedFace_Create(Face, pLoadFont->Memory); + ASSERT(SharedFace != NULL); + ASSERT(FontIndex != -1); - IntUnLockFreeType(); - - if (!Error && FT_IS_SFNT(Face)) - pLoadFont->IsTrueType = TRUE; - - if (Error || SharedFace == NULL) - { - if (SharedFace) - SharedFace_Release(SharedFace); - - if (Error == FT_Err_Unknown_File_Format) - DPRINT1("Unknown font file format\n"); - else - DPRINT1("Error reading font (error code: %d)\n", Error); - return 0; /* failure */ - } - } - else - { - Face = SharedFace->Face; - IntLockFreeType(); - SharedFace_AddRef(SharedFace); - IntUnLockFreeType(); - } + IntLockFreeType(); + Face = SharedFace->Face; + SharedFace_AddRef(SharedFace); + IntUnLockFreeType(); /* allocate a FONT_ENTRY */ Entry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_ENTRY), TAG_FONT); @@ -1984,16 +1953,6 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, } IntUnLockFreeType(); - if (FontIndex == -1) - { - FT_Long iFace, num_faces = Face->num_faces; - for (iFace = 1; iFace < num_faces; ++iFace) - { - FaceCount += IntGdiLoadFontsFromMemory(pLoadFont, NULL, iFace, -1); - } - FontIndex = 0; - } - if (CharSetIndex == -1) { INT i; @@ -2046,6 +2005,57 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, return FaceCount; /* number of loaded faces */ } +static INT FASTCALL +IntGdiLoadFontByIndexFromMemory(PGDI_LOAD_FONT pLoadFont, FT_Long FontIndex) +{ + FT_Error Error; + FT_Face Face; + FT_Long iFace, num_faces; + PSHARED_FACE SharedFace; + INT FaceCount = 0; + + IntLockFreeType(); + + /* Load a face from memory */ + Error = FT_New_Memory_Face(g_FreeTypeLibrary, + pLoadFont->Memory->Buffer, pLoadFont->Memory->BufferSize, + ((FontIndex == -1) ? 0 : FontIndex), &Face); + if (Error) + { + if (Error == FT_Err_Unknown_File_Format) + DPRINT1("Unknown font file format\n"); + else + DPRINT1("Error reading font (error code: %d)\n", Error); + IntUnLockFreeType(); + return 0; /* Failure */ + } + + pLoadFont->IsTrueType = FT_IS_SFNT(Face); + num_faces = Face->num_faces; + SharedFace = SharedFace_Create(Face, pLoadFont->Memory); + + IntUnLockFreeType(); + + if (!SharedFace) + { + DPRINT1("SharedFace_Create failed\n"); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; /* Failure */ + } + + if (FontIndex == -1) + { + for (iFace = 1; iFace < num_faces; ++iFace) + { + FaceCount += IntGdiLoadFontByIndexFromMemory(pLoadFont, iFace); + } + FontIndex = 0; + } + + FaceCount += IntGdiLoadFontsFromMemory(pLoadFont, SharedFace, FontIndex, -1); + return FaceCount; +} + static LPCWSTR FASTCALL NameFromCharSet(BYTE CharSet) { @@ -2172,14 +2182,13 @@ IntGdiAddFontResourceEx(PUNICODE_STRING FileName, DWORD Characteristics, return 0; } + RtlZeroMemory(&LoadFont, sizeof(LoadFont)); LoadFont.pFileName = &PathName; LoadFont.Memory = SharedMem_Create(Buffer, ViewSize, TRUE); LoadFont.Characteristics = Characteristics; RtlInitUnicodeString(&LoadFont.RegValueName, NULL); - LoadFont.IsTrueType = FALSE; LoadFont.CharSet = DEFAULT_CHARSET; - LoadFont.PrivateEntry = NULL; - FontCount = IntGdiLoadFontsFromMemory(&LoadFont, NULL, -1, -1); + FontCount = IntGdiLoadFontByIndexFromMemory(&LoadFont, -1); /* Release our copy */ IntLockFreeType(); @@ -2463,13 +2472,11 @@ IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded) } RtlCopyMemory(BufferCopy, Buffer, dwSize); - LoadFont.pFileName = NULL; + RtlZeroMemory(&LoadFont, sizeof(LoadFont)); LoadFont.Memory = SharedMem_Create(BufferCopy, dwSize, FALSE); LoadFont.Characteristics = FR_PRIVATE | FR_NOT_ENUM; RtlInitUnicodeString(&LoadFont.RegValueName, NULL); - LoadFont.IsTrueType = FALSE; - LoadFont.PrivateEntry = NULL; - FaceCount = IntGdiLoadFontsFromMemory(&LoadFont, NULL, -1, -1); + FaceCount = IntGdiLoadFontByIndexFromMemory(&LoadFont, -1); RtlFreeUnicodeString(&LoadFont.RegValueName);

2 weeks, 1 day

[reactos] 01/01: [FREETYPE][FTFD][NTGDI] Split FT_Bitmap_Convert hack (#7628)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb7cf5a5b7d25308e570e… commit bb7cf5a5b7d25308e570e6bf22a14957c4384e9c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 22 10:57:40 2025 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 22 10:57:40 2025 +0900 [FREETYPE][FTFD][NTGDI] Split FT_Bitmap_Convert hack (#7628) Our FT_Bitmap_Convert function had a hack to make the bitmap image compatible to ReactOS. I think the hack on FT_Bitmap_Convert should be separated from our font engine. JIRA issue: CORE-16047 - Add FT_Bitmap_Convert_ReactOS_Hack function, that is based on FT_Bitmap_Convert, and split the hack of FT_Bitmap_Convert. - Use FT_Bitmap_Convert_ReactOS_Hack in IntGetBitmapGlyphWithCache function instead of FT_Bitmap_Convert. - Modify ftfd.spec to add FT_Bitmap_Convert_ReactOS_Hack. --- .../3rdparty/freetype/include/freetype/ftbitmap.h | 35 ++++++++++++++ sdk/lib/3rdparty/freetype/src/base/ftbitmap.c | 53 +++++++++++++++++----- win32ss/drivers/font/ftfd/ftfd.spec | 1 + win32ss/gdi/ntgdi/freetype.c | 3 +- 4 files changed, 79 insertions(+), 13 deletions(-) diff --git a/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h b/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h index a43187cad47..0b9f52a619c 100644 --- a/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h +++ b/sdk/lib/3rdparty/freetype/include/freetype/ftbitmap.h @@ -181,6 +181,41 @@ FT_BEGIN_HEADER FT_Bitmap *target, FT_Int alignment ); +#ifdef __REACTOS__ + /*************************************************************************/ + /* */ + /* <Function> */ + /* FT_Bitmap_Convert_ReactOS_Hack */ + /* */ + /* <Description> */ + /* Mainly same as @FT_Bitmap_Convert, but the bitmap will be */ + /* ReactOS compatible when hack parameter is true. */ + /* */ + /* <Input> */ + /* library :: A handle to a library object. */ + /* */ + /* source :: The source bitmap. */ + /* */ + /* alignment :: The pitch of the bitmap is a multiple of this */ + /* parameter. Common values are 1, 2, or 4. */ + /* */ + /* hack :: If TRUE, the bitmap will be ReactOS compatible. */ + /* If FALSE, the bitmap will be same as */ + /* FT_Bitmap_Convert returns. */ + /* */ + /* <Output> */ + /* target :: The target bitmap. */ + /* */ + /* <Return> */ + /* FreeType error code. 0~means success. */ + /* */ + FT_EXPORT( FT_Error ) + FT_Bitmap_Convert_ReactOS_Hack( FT_Library library, + const FT_Bitmap *source, + FT_Bitmap *target, + FT_Int alignment, + FT_Bool hack); +#endif /*************************************************************************/ /* */ diff --git a/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c b/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c index 5bfc13e2445..696db7368b1 100644 --- a/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c +++ b/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c @@ -500,11 +500,20 @@ /* documentation is in ftbitmap.h */ +#ifdef __REACTOS__ + FT_EXPORT_DEF( FT_Error ) + FT_Bitmap_Convert_ReactOS_Hack( FT_Library library, + const FT_Bitmap *source, + FT_Bitmap *target, + FT_Int alignment, + FT_Bool hack ) +#else FT_EXPORT_DEF( FT_Error ) FT_Bitmap_Convert( FT_Library library, const FT_Bitmap *source, FT_Bitmap *target, FT_Int alignment ) +#endif { FT_Error error = FT_Err_Ok; FT_Memory memory; @@ -602,15 +611,20 @@ FT_Int val = ss[0]; /* avoid a byte->int cast on each line */ #ifdef __REACTOS__ - tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); - tt[1] = (FT_Byte)( ( val & 0x40 ) ? 0xff : 0); - tt[2] = (FT_Byte)( ( val & 0x20 ) ? 0xff : 0); - tt[3] = (FT_Byte)( ( val & 0x10 ) ? 0xff : 0); - tt[4] = (FT_Byte)( ( val & 0x08 ) ? 0xff : 0); - tt[5] = (FT_Byte)( ( val & 0x04 ) ? 0xff : 0); - tt[6] = (FT_Byte)( ( val & 0x02 ) ? 0xff : 0); - tt[7] = (FT_Byte)( ( val & 0x01 ) ? 0xff : 0); -#else + if (hack) + { + tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); + tt[1] = (FT_Byte)( ( val & 0x40 ) ? 0xff : 0); + tt[2] = (FT_Byte)( ( val & 0x20 ) ? 0xff : 0); + tt[3] = (FT_Byte)( ( val & 0x10 ) ? 0xff : 0); + tt[4] = (FT_Byte)( ( val & 0x08 ) ? 0xff : 0); + tt[5] = (FT_Byte)( ( val & 0x04 ) ? 0xff : 0); + tt[6] = (FT_Byte)( ( val & 0x02 ) ? 0xff : 0); + tt[7] = (FT_Byte)( ( val & 0x01 ) ? 0xff : 0); + } + else + { +#endif tt[0] = (FT_Byte)( ( val & 0x80 ) >> 7 ); tt[1] = (FT_Byte)( ( val & 0x40 ) >> 6 ); tt[2] = (FT_Byte)( ( val & 0x20 ) >> 5 ); @@ -619,6 +633,8 @@ tt[5] = (FT_Byte)( ( val & 0x04 ) >> 2 ); tt[6] = (FT_Byte)( ( val & 0x02 ) >> 1 ); tt[7] = (FT_Byte)( val & 0x01 ); +#ifdef __REACTOS__ + } #endif tt += 8; @@ -635,10 +651,11 @@ for ( ; j > 0; j-- ) { #ifdef __REACTOS__ - tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); -#else - tt[0] = (FT_Byte)( ( val & 0x80 ) >> 7); + if (hack) + tt[0] = (FT_Byte)( ( val & 0x80 ) ? 0xff : 0); + else #endif + tt[0] = (FT_Byte)( ( val & 0x80 ) >> 7); val <<= 1; tt += 1; } @@ -794,6 +811,18 @@ return error; } +#ifdef __REACTOS__ + /* documentation is in ftbitmap.h */ + + FT_EXPORT_DEF( FT_Error ) + FT_Bitmap_Convert( FT_Library library, + const FT_Bitmap *source, + FT_Bitmap *target, + FT_Int alignment ) + { + return FT_Bitmap_Convert_ReactOS_Hack(library, source, target, alignment, FALSE); + } +#endif /* documentation is in ftbitmap.h */ diff --git a/win32ss/drivers/font/ftfd/ftfd.spec b/win32ss/drivers/font/ftfd/ftfd.spec index f4178ef7d11..f1b06a86989 100644 --- a/win32ss/drivers/font/ftfd/ftfd.spec +++ b/win32ss/drivers/font/ftfd/ftfd.spec @@ -6,6 +6,7 @@ @ cdecl FT_Attach_File () @ cdecl FT_Attach_Stream () @ cdecl FT_Bitmap_Convert () + @ cdecl FT_Bitmap_Convert_ReactOS_Hack () @ cdecl FT_Bitmap_Copy () @ cdecl FT_Bitmap_Done () @ cdecl FT_Bitmap_Embolden () diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 86efc2e2c30..13932681b29 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3852,7 +3852,8 @@ IntGetBitmapGlyphWithCache( BitmapGlyph = (FT_BitmapGlyph)GlyphCopy; FT_Bitmap_New(&AlignedBitmap); - if(FT_Bitmap_Convert(GlyphSlot->library, &BitmapGlyph->bitmap, &AlignedBitmap, 4)) + if (FT_Bitmap_Convert_ReactOS_Hack(GlyphSlot->library, &BitmapGlyph->bitmap, + &AlignedBitmap, 4, TRUE)) { DPRINT1("Conversion failed\n"); ExFreePoolWithTag(NewEntry, TAG_FONT);

2 weeks, 1 day

[reactos] 11/11: [NTOS:IO] IoVolumeDeviceToDosName(): Fix returned DosName buffer initialization (#6990)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e01cbc6cdedc187b89bf… commit 0e01cbc6cdedc187b89bfed5331d64b2af46f503 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 4 17:21:03 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jan 21 19:16:03 2025 +0100 [NTOS:IO] IoVolumeDeviceToDosName(): Fix returned DosName buffer initialization (#6990) The VolumePath buffer returned by IOCTL_MOUNTMGR_QUERY_DOS_VOLUME_PATH contains one string stored as a multi-NUL-terminated string, whose total length is given by its `MultiSzLength` member. The DosName UNICODE_STRING just returns the (single) string as a normal NUL-terminated string. So, we need to remove the two NUL-terminators from the `MultiSzLength` count to retrieve the correct length. --- ntoskrnl/io/iomgr/volume.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/io/iomgr/volume.c b/ntoskrnl/io/iomgr/volume.c index 5d5614b4454..9a5915d2802 100644 --- a/ntoskrnl/io/iomgr/volume.c +++ b/ntoskrnl/io/iomgr/volume.c @@ -1367,7 +1367,7 @@ IoVolumeDeviceToDosName( * Even if MOUNTMGR_VOLUME_PATHS allows bigger name lengths * than MAXUSHORT, we can't use them, because we have to return * this in an UNICODE_STRING that stores length in a USHORT. */ - Length = sizeof(VolumePath) + VolumePath.MultiSzLength; + Length = FIELD_OFFSET(MOUNTMGR_VOLUME_PATHS, MultiSz) + VolumePath.MultiSzLength; if (Length > MAXUSHORT) { Status = STATUS_INVALID_BUFFER_SIZE; @@ -1407,13 +1407,14 @@ IoVolumeDeviceToDosName( goto ReleaseMemory; } - /* Set output string */ - DosName->Length = (USHORT)VolumePathPtr->MultiSzLength; - DosName->MaximumLength = (USHORT)VolumePathPtr->MultiSzLength + sizeof(UNICODE_NULL); - /* Our MOUNTMGR_VOLUME_PATHS will be used as output buffer */ + /* Set the output string. Discount the last two + * NUL-terminators from the multi-string length. */ + DosName->Length = (USHORT)VolumePathPtr->MultiSzLength - 2 * sizeof(UNICODE_NULL); + DosName->MaximumLength = DosName->Length + sizeof(UNICODE_NULL); + /* Recycle our MOUNTMGR_VOLUME_PATHS as the output buffer + * and move the NUL-terminated string to the beginning */ DosName->Buffer = (PWSTR)VolumePathPtr; - /* Move name at the begin, RtlMoveMemory is OK with overlapping */ - RtlMoveMemory(DosName->Buffer, VolumePathPtr->MultiSz, VolumePathPtr->MultiSzLength); + RtlMoveMemory(DosName->Buffer, VolumePathPtr->MultiSz, DosName->Length); DosName->Buffer[DosName->Length / sizeof(WCHAR)] = UNICODE_NULL; /* Don't release the buffer, just dereference the FO and return success */

2 weeks, 1 day

← Newer
1
...
9
10
11
12
13
14
15
...
28
Older →

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 January 2025