Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [WIN32SS:NTGDI] freetype.c: Use the correct last-error functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f22efba486eb8ad5811ad… commit f22efba486eb8ad5811ad5abc7b2e42c0ae80330 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 23 21:03:11 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 23 21:03:26 2025 +0100 [WIN32SS:NTGDI] freetype.c: Use the correct last-error functions. EngSetLastError() is for Win32 errors; SetLastNtError() is for NTSTATUS. --- win32ss/gdi/ntgdi/freetype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index dd153ff3185..83c024a4c94 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5284,7 +5284,7 @@ ftGdiGetTextMetricsW( if (!ptmwi) { - EngSetLastError(STATUS_INVALID_PARAMETER); + EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } RtlZeroMemory(ptmwi, sizeof(TMW_INTERNAL)); @@ -7528,7 +7528,7 @@ NtGdiGetCharABCWidthsW( if(Safepwch) ExFreePoolWithTag(Safepwch , GDITAG_TEXT); - EngSetLastError(Status); + SetLastNtError(Status); return FALSE; } @@ -7721,7 +7721,7 @@ NtGdiGetCharWidthW( if (!NT_SUCCESS(Status)) { - EngSetLastError(Status); + SetLastNtError(Status); return FALSE; }

5 months, 1 week

[reactos] 01/02: [WIN32SS:NTGDI] Improve a DPRINT

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6cd3b242aabffc94c363… commit c6cd3b242aabffc94c3639ccfb6aa5978e6dc60f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 23 20:51:18 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 23 20:51:18 2025 +0100 [WIN32SS:NTGDI] Improve a DPRINT --- win32ss/gdi/ntgdi/freetype.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 457bb6e324c..dd153ff3185 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -1998,12 +1998,12 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, for (i = 1; i < CharSetCount; ++i) { - /* Do not count charsets towards 'faces' loaded */ + /* Do not count charsets as loaded 'faces' */ IntGdiLoadFontsFromMemory(pLoadFont, SharedFace, FontIndex, i); } } - return FaceCount; /* number of loaded faces */ + return FaceCount; /* Number of loaded faces */ } static INT FASTCALL @@ -5938,9 +5938,10 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) /* substitute */ SubstitutedLogFont = *pLogFont; - DPRINT("Font '%S,%u' is substituted by: ", pLogFont->lfFaceName, pLogFont->lfCharSet); SubstituteFontRecurse(&SubstitutedLogFont); - DPRINT("'%S,%u'.\n", SubstitutedLogFont.lfFaceName, SubstitutedLogFont.lfCharSet); + DPRINT("Font '%S,%u' is substituted by '%S,%u'.\n", + pLogFont->lfFaceName, pLogFont->lfCharSet, + SubstitutedLogFont.lfFaceName, SubstitutedLogFont.lfCharSet); MatchPenalty = 0xFFFFFFFF; TextObj->Font = NULL;

5 months, 1 week

[reactos] 02/02: [WIN32SS:NTGDI] freetype.c: Use debug channel "GdiFont"

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c474c4b7372c4c4fdfc9… commit 9c474c4b7372c4c4fdfc9b0f83238ee92aa04c76 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 23 20:25:25 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 23 20:25:25 2025 +0100 [WIN32SS:NTGDI] freetype.c: Use debug channel "GdiFont" --- win32ss/gdi/ntgdi/freetype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index b6ba46316c7..457bb6e324c 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -34,6 +34,7 @@ #define NDEBUG #include <debug.h> +DBG_DEFAULT_CHANNEL(GdiFont); typedef struct _FONTLINK {

5 months, 1 week

[reactos] 01/02: [WIN32SS:ENG:GDI] bitblt(_new).c: Use correct debug channel "GdiBlt"

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e16dc27e476e922351834… commit e16dc27e476e922351834dc49cfd33f64a7777a9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Sep 13 23:04:41 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jan 23 20:23:30 2025 +0100 [WIN32SS:ENG:GDI] bitblt(_new).c: Use correct debug channel "GdiBlt" --- win32ss/gdi/eng/bitblt_new.c | 2 +- win32ss/gdi/ntgdi/bitblt.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/win32ss/gdi/eng/bitblt_new.c b/win32ss/gdi/eng/bitblt_new.c index d97886626ad..0a2c86c1003 100644 --- a/win32ss/gdi/eng/bitblt_new.c +++ b/win32ss/gdi/eng/bitblt_new.c @@ -1,7 +1,7 @@ #include <win32k.h> #include "../diblib/DibLib_interface.h" -DBG_DEFAULT_CHANNEL(GdiFont); +DBG_DEFAULT_CHANNEL(GdiBlt); #define SURFOBJ_flags(pso) (CONTAINING_RECORD(pso, SURFACE, SurfObj)->flags) diff --git a/win32ss/gdi/ntgdi/bitblt.c b/win32ss/gdi/ntgdi/bitblt.c index 033fcf6421f..2462cef83a8 100644 --- a/win32ss/gdi/ntgdi/bitblt.c +++ b/win32ss/gdi/ntgdi/bitblt.c @@ -7,8 +7,6 @@ */ #include <win32k.h> -#define NDEBUG -#include <debug.h> DBG_DEFAULT_CHANNEL(GdiBlt); BOOL APIENTRY @@ -491,11 +489,11 @@ NtGdiMaskBlt( XlateObj = &exlo.xlo; } - DPRINT("DestRect: (%d,%d)-(%d,%d) and SourcePoint is (%d,%d)\n", - DestRect.left, DestRect.top, DestRect.right, DestRect.bottom, - SourcePoint.x, SourcePoint.y); + TRACE("DestRect: (%d,%d)-(%d,%d) and SourcePoint is (%d,%d)\n", + DestRect.left, DestRect.top, DestRect.right, DestRect.bottom, + SourcePoint.x, SourcePoint.y); - DPRINT("nWidth is '%d' and nHeight is '%d'.\n", nWidth, nHeight); + TRACE("nWidth is '%d' and nHeight is '%d'.\n", nWidth, nHeight); /* Fix BitBlt so that it will not flip left to right */ if ((DestRect.left > DestRect.right) && (nWidth < 0)) @@ -767,9 +765,9 @@ GreStretchBltMask( MaskPoint.y += DCMask->ptlDCOrig.y; } - DPRINT("Calling IntEngStrethBlt SourceRect: (%d,%d)-(%d,%d) and DestRect: (%d,%d)-(%d,%d).\n", - SourceRect.left, SourceRect.top, SourceRect.right, SourceRect.bottom, - DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); + TRACE("Calling IntEngStrethBlt SourceRect: (%d,%d)-(%d,%d) and DestRect: (%d,%d)-(%d,%d).\n", + SourceRect.left, SourceRect.top, SourceRect.right, SourceRect.bottom, + DestRect.left, DestRect.top, DestRect.right, DestRect.bottom); /* Perform the bitblt operation */ Status = IntEngStretchBlt(&BitmapDest->SurfObj,

5 months, 1 week

[reactos] 01/01: [FONTS] MS Sans Serif (sse*.fon): Fix letter 'g' misalign

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05c3f303bfddd816fb71e… commit 05c3f303bfddd816fb71e897a1aa1d5c6257e43b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 23 15:32:44 2025 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jan 23 15:32:44 2025 +0900 [FONTS] MS Sans Serif (sse*.fon): Fix letter 'g' misalign Copyright (C) 2019-2025 Katayama Hirofumi MZ. License: MIT CORE-16165 --- media/fonts/ssee1255.fon | Bin 69168 -> 69168 bytes media/fonts/ssee1256.fon | Bin 71632 -> 71632 bytes media/fonts/ssee1257.fon | Bin 65424 -> 65424 bytes media/fonts/ssee874.fon | Bin 71792 -> 71792 bytes media/fonts/sserife.fon | Bin 64560 -> 64560 bytes media/fonts/sserifeg.fon | Bin 65456 -> 65456 bytes media/fonts/sserifer.fon | Bin 68848 -> 68848 bytes media/fonts/sserifet.fon | Bin 64304 -> 64304 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1255.fon b/media/fonts/ssee1255.fon index 87c4b6319fd..cadb9272ba1 100644 Binary files a/media/fonts/ssee1255.fon and b/media/fonts/ssee1255.fon differ diff --git a/media/fonts/ssee1256.fon b/media/fonts/ssee1256.fon index 8e3804388e8..bf6198a73c6 100644 Binary files a/media/fonts/ssee1256.fon and b/media/fonts/ssee1256.fon differ diff --git a/media/fonts/ssee1257.fon b/media/fonts/ssee1257.fon index 65c819512ec..42e512576af 100644 Binary files a/media/fonts/ssee1257.fon and b/media/fonts/ssee1257.fon differ diff --git a/media/fonts/ssee874.fon b/media/fonts/ssee874.fon index 4f6db4f0a9e..44877c4b057 100644 Binary files a/media/fonts/ssee874.fon and b/media/fonts/ssee874.fon differ diff --git a/media/fonts/sserife.fon b/media/fonts/sserife.fon index 264757092cb..0216f63548d 100644 Binary files a/media/fonts/sserife.fon and b/media/fonts/sserife.fon differ diff --git a/media/fonts/sserifeg.fon b/media/fonts/sserifeg.fon index fd7d539e784..b9e0cf4a2e5 100644 Binary files a/media/fonts/sserifeg.fon and b/media/fonts/sserifeg.fon differ diff --git a/media/fonts/sserifer.fon b/media/fonts/sserifer.fon index 600d9fe251d..e54b8a4822b 100644 Binary files a/media/fonts/sserifer.fon and b/media/fonts/sserifer.fon differ diff --git a/media/fonts/sserifet.fon b/media/fonts/sserifet.fon index 6aa8dc2ddc9..801f75844f7 100644 Binary files a/media/fonts/sserifet.fon and b/media/fonts/sserifet.fon differ

5 months, 1 week

[reactos] 14/14: [UCRT] Fix build of memcpy_s.cpp

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f07ea94798007fcf1b1d6… commit f07ea94798007fcf1b1d6344844f2e5d1aede104 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Nov 12 10:54:59 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Fix build of memcpy_s.cpp extern inline creates a global symbol on MSVC, but not on GCC. Use extern instead. --- sdk/lib/ucrt/string/memcpy_s.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/ucrt/string/memcpy_s.cpp b/sdk/lib/ucrt/string/memcpy_s.cpp index 4232b2cd580..80717335c27 100644 --- a/sdk/lib/ucrt/string/memcpy_s.cpp +++ b/sdk/lib/ucrt/string/memcpy_s.cpp @@ -6,5 +6,5 @@ // Provides external definitions of the inline functions memcpy_s and memmove_s // for use by objects compiled with older versions of the CRT headers. // -#define _CRT_MEMCPY_S_INLINE extern __inline +#define _CRT_MEMCPY_S_INLINE extern #include <corecrt_memcpy_s.h>

5 months, 1 week

[reactos] 13/14: [UCRT] Remove __inline from conversion functions

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fea0f9243dd09e2237af7… commit fea0f9243dd09e2237af7810ff4dd8d6ebc7e1f3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Oct 21 17:35:07 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Remove __inline from conversion functions Otherwise no actual symbols will be created. --- sdk/lib/ucrt/convert/_wctype.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/lib/ucrt/convert/_wctype.cpp b/sdk/lib/ucrt/convert/_wctype.cpp index e1a64516a5b..aee7fa72500 100644 --- a/sdk/lib/ucrt/convert/_wctype.cpp +++ b/sdk/lib/ucrt/convert/_wctype.cpp @@ -12,6 +12,7 @@ #include <ctype.h> #include <locale.h> +#define __inline extern "C" __inline int (__cdecl _isleadbyte_l)(int const c, _locale_t const locale)

5 months, 1 week

[reactos] 12/14: [VCRUNTIME] Fix _rotl64/_rotr64 inline asm

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13356a9001119c60c912d… commit 13356a9001119c60c912dcb7fa8a84605012757c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Dec 2 17:44:37 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [VCRUNTIME] Fix _rotl64/_rotr64 inline asm %k is only valid for 32 bit operands. --- sdk/include/vcruntime/mingw32/intrin_x86.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/vcruntime/mingw32/intrin_x86.h b/sdk/include/vcruntime/mingw32/intrin_x86.h index 429b4896a03..0eb1da7258e 100644 --- a/sdk/include/vcruntime/mingw32/intrin_x86.h +++ b/sdk/include/vcruntime/mingw32/intrin_x86.h @@ -1227,7 +1227,7 @@ __INTRIN_INLINE unsigned int __cdecl _rotl(unsigned int value, int shift) __INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) { unsigned long long retval; - __asm__("rolq %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + __asm__("rolq %b[shift], %[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } #else /* __x86_64__ */ @@ -1271,7 +1271,7 @@ __INTRIN_INLINE unsigned short __cdecl _rotr16(unsigned short value, unsigned ch __INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) { unsigned long long retval; - __asm__("rorq %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); + __asm__("rorq %b[shift], %[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } #else /* __x86_64__ */

5 months, 1 week

[reactos] 11/14: [UCRT] Fix definition of _alloca for GCC/Clang

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9db517f3243018f4861f2… commit 9db517f3243018f4861f2353d3e60659a39b68d6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Nov 12 16:25:30 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Fix definition of _alloca for GCC/Clang --- sdk/include/ucrt/malloc.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/include/ucrt/malloc.h b/sdk/include/ucrt/malloc.h index c9e0c24cf19..20abe3fe929 100644 --- a/sdk/include/ucrt/malloc.h +++ b/sdk/include/ucrt/malloc.h @@ -50,9 +50,12 @@ typedef struct _heapinfo #define _mm_malloc(a, b) _aligned_malloc(a, b) - +#if defined(__GNUC__) || defined(__clang__) +#define _alloca(x) __builtin_alloca((x)) +#else _Ret_notnull_ _Post_writable_byte_size_(_Size) void* __cdecl _alloca(_In_ size_t _Size); +#endif

5 months, 1 week

[reactos] 10/14: [UCRT] Add architecturally optimized code to build

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61175644d0b155eaff332… commit 61175644d0b155eaff332a811427836f3599abcd Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Oct 22 14:29:41 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Jan 22 18:56:08 2025 +0200 [UCRT] Add architecturally optimized code to build --- sdk/lib/ucrt/string/string.cmake | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/sdk/lib/ucrt/string/string.cmake b/sdk/lib/ucrt/string/string.cmake index 2935b353269..afd2ec57db6 100644 --- a/sdk/lib/ucrt/string/string.cmake +++ b/sdk/lib/ucrt/string/string.cmake @@ -56,3 +56,69 @@ list(APPEND UCRT_STRING_SOURCES string/wmemcpy_s.cpp string/wmemmove_s.cpp ) + +if(${ARCH} STREQUAL "i386") + list(APPEND UCRT_STRING_ASM_SOURCES + string/i386/_memicmp.s + string/i386/_strnicm.s + string/i386/memccpy.s + string/i386/strcat.s + string/i386/strcmp.s + string/i386/strcspn.s + string/i386/strlen.s + string/i386/strncat.s + string/i386/strncmp.s + string/i386/strncpy.s + string/i386/strnset.s + string/i386/strpbrk.s + string/i386/strrev.s + string/i386/strset.s + string/i386/strspn.s + ) +elseif(${ARCH} STREQUAL "amd64") + list(APPEND UCRT_STRING_ASM_SOURCES + string/amd64/strcat.s + string/amd64/strcmp.s + string/amd64/strlen.s + string/amd64/strncat.s + string/amd64/strncmp.s + string/amd64/strncpy.s + ) + list(APPEND UCRT_STRING_SOURCES + string/amd64/strcspn.c + string/amd64/strpbrk.c + string/amd64/strspn.c + string/memccpy.c + string/strnset.c + string/strrev.c + string/strset.c + ) +else() + if(${ARCH} STREQUAL "arm64") + list(APPEND UCRT_STRING_ASM_SOURCES + string/arm64/strlen.s + string/arm64/wcslen.s + ) + else() + list(APPEND UCRT_STRING_SOURCES + string/arm/strlen.c + ) + endif() + list(APPEND UCRT_STRING_SOURCES + string/memccpy.c + string/strcat.c + string/strcmp.c + string/strcspn.c + string/strncat.c + string/strncmp.c + string/strncpy.c + string/strnset.c + string/strpbrk.c + string/strrev.c + string/strset.c + string/strspn.c + ) +endif() + +add_asm_files(UCRT_STRING_ASM ${UCRT_STRING_ASM_SOURCES}) +list(APPEND UCRT_STRING_SOURCES ${UCRT_STRING_ASM})

5 months, 1 week

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