Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 01/01: [NTGDI][FREETYPE] lfWidth for GetTextMetrics and GetCharWidth (#4919)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=138eb58b955e733d1bb53… commit 138eb58b955e733d1bb53eb72445641ced65ebf6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 1 08:54:39 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 1 08:54:39 2022 +0900 [NTGDI][FREETYPE] lfWidth for GetTextMetrics and GetCharWidth (#4919) - Add lfWidth member into FONTGDI structure. - Delete IntWidthMatrix function. - Fix IntRequestFontSize behavior for processing lfWidth value. - Apply lfWidth in GetTextMetrics and GetCharWidth. - Ignore the XFORM values in GetTextMetrics and GetCharWidth. CORE-11848 --- win32ss/gdi/eng/engobjects.h | 1 + win32ss/gdi/ntgdi/font.h | 1 + win32ss/gdi/ntgdi/freetype.c | 127 ++++++++++++++++++++----------------------- 3 files changed, 60 insertions(+), 69 deletions(-) diff --git a/win32ss/gdi/eng/engobjects.h b/win32ss/gdi/eng/engobjects.h index 81f2b586432..98af01af982 100644 --- a/win32ss/gdi/eng/engobjects.h +++ b/win32ss/gdi/eng/engobjects.h @@ -164,6 +164,7 @@ typedef struct _FONTGDI { LONG tmInternalLeading; LONG Magic; LONG lfHeight; + LONG lfWidth; } FONTGDI, *PFONTGDI; /* The initialized 'Magic' value in FONTGDI */ diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index 674406281a0..fe54c3b8d8d 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -42,6 +42,7 @@ typedef struct _FONT_CACHE_HASHED INT GlyphIndex; FT_Face Face; LONG lfHeight; + LONG lfWidth; _ANONYMOUS_UNION union { DWORD AspectValue; FONT_ASPECT Aspect; diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index ea4a854bfad..fa60795b70c 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -703,37 +703,12 @@ InitFontSupport(VOID) return TRUE; } -static LONG FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) +static LONG IntNormalizeAngle(LONG nTenthsOfDegrees) { - LONG tmAveCharWidth; - TT_OS2 *pOS2; - FT_Fixed XScale; - - *pmat = identityMat; - - if (lfWidth == 0) - return 0; - - ASSERT_FREETYPE_LOCK_HELD(); - pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2); - if (!pOS2) - return 0; - - XScale = face->size->metrics.x_scale; - tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6; - if (tmAveCharWidth == 0) - { - tmAveCharWidth = 1; - } - - if (lfWidth == tmAveCharWidth) - return 0; - - pmat->xx = INT_TO_FIXED(lfWidth) / tmAveCharWidth; - pmat->xy = 0; - pmat->yx = 0; - pmat->yy = INT_TO_FIXED(1); - return lfWidth; + nTenthsOfDegrees %= 360 * 10; + if (nTenthsOfDegrees >= 0) + return nTenthsOfDegrees; + return nTenthsOfDegrees + 360 * 10; } VOID FASTCALL IntEscapeMatrix(FT_Matrix *pmat, LONG lfEscapement) @@ -2188,12 +2163,13 @@ FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI, - ((Ascent + Descent) - (pHori->Ascender - pHori->Descender)), YScale) + 32) >> 6); + if (FontGDI->lfWidth != 0) + TM->tmAveCharWidth = FontGDI->lfWidth; + else + TM->tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6; - TM->tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6; if (TM->tmAveCharWidth == 0) - { TM->tmAveCharWidth = 1; - } /* Correct forumla to get the maxcharwidth from unicode and ansi font */ TM->tmMaxCharWidth = (FT_MulFix(Face->max_advance_width, XScale) + 32) >> 6; @@ -3145,6 +3121,7 @@ ftGdiGlyphCacheGet(IN const FONT_CACHE_ENTRY *pCache) FontEntry->Hashed.GlyphIndex == pCache->Hashed.GlyphIndex && FontEntry->Hashed.Face == pCache->Hashed.Face && FontEntry->Hashed.lfHeight == pCache->Hashed.lfHeight && + FontEntry->Hashed.lfWidth == pCache->Hashed.lfWidth && FontEntry->Hashed.AspectValue == pCache->Hashed.AspectValue && memcmp(&FontEntry->Hashed.matTransform, &pCache->Hashed.matTransform, sizeof(FT_Matrix)) == 0) @@ -3478,7 +3455,7 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) TT_OS2 *pOS2; TT_HoriHeader *pHori; FT_WinFNT_HeaderRec WinFNT; - LONG Ascent, Descent, Sum, EmHeight; + LONG Ascent, Descent, Sum, EmHeight, Width64; lfWidth = abs(lfWidth); if (lfHeight == 0) @@ -3497,8 +3474,12 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) if (lfHeight == -1) lfHeight = -2; - if (FontGDI->Magic == FONTGDI_MAGIC && FontGDI->lfHeight == lfHeight) + if (FontGDI->Magic == FONTGDI_MAGIC && + FontGDI->lfHeight == lfHeight && + FontGDI->lfWidth == lfWidth) + { return 0; /* Cached */ + } ASSERT_FREETYPE_LOCK_HELD(); pOS2 = (TT_OS2 *)FT_Get_Sfnt_Table(face, FT_SFNT_OS2); @@ -3520,6 +3501,7 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) FontGDI->tmInternalLeading = WinFNT.internal_leading; FontGDI->Magic = FONTGDI_MAGIC; FontGDI->lfHeight = lfHeight; + FontGDI->lfWidth = lfWidth; return 0; } @@ -3574,13 +3556,19 @@ IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG lfWidth, LONG lfHeight) FontGDI->Magic = FONTGDI_MAGIC; FontGDI->lfHeight = lfHeight; + FontGDI->lfWidth = lfWidth; EmHeight = FontGDI->tmHeight - FontGDI->tmInternalLeading; EmHeight = max(EmHeight, 1); EmHeight = min(EmHeight, USHORT_MAX); + if (pOS2 && lfWidth > 0) + Width64 = FT_MulDiv(lfWidth, face->units_per_EM, pOS2->xAvgCharWidth) << 6; + else + Width64 = 0; + req.type = FT_SIZE_REQUEST_TYPE_NOMINAL; - req.width = 0; + req.width = Width64; req.height = (EmHeight << 6); req.horiResolution = 0; req.vertResolution = 0; @@ -3805,7 +3793,7 @@ ftGdiGetGlyphOutline( IntLockFreeType(); TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); FtMatrixFromMx(&mat, DC_pmxWorldToDevice(dc)); - FT_Set_Transform(ft_face, &mat, 0); + FT_Set_Transform(ft_face, &mat, NULL); TEXTOBJ_UnlockText(TextObj); @@ -4274,10 +4262,10 @@ TextIntGetTextExtentPoint(PDC dc, { PFONTGDI FontGDI; FT_BitmapGlyph realglyph; - INT glyph_index, i, previous; + INT glyph_index, i, previous, nTenthsOfDegrees; ULONGLONG TotalWidth64 = 0; LOGFONTW *plf; - BOOL use_kerning; + BOOL use_kerning, bVerticalWriting; LONG ascender, descender; FONT_CACHE_ENTRY Cache; @@ -4289,27 +4277,26 @@ TextIntGetTextExtentPoint(PDC dc, *Fit = 0; } - IntLockFreeType(); - - TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); - plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; Cache.Hashed.lfHeight = plf->lfHeight; + Cache.Hashed.lfWidth = plf->lfWidth; Cache.Hashed.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); Cache.Hashed.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); + // Check vertical writing (tategaki) + nTenthsOfDegrees = IntNormalizeAngle(plf->lfEscapement - plf->lfOrientation); + bVerticalWriting = ((nTenthsOfDegrees == 90 * 10) || (nTenthsOfDegrees == 270 * 10)); + if (IntIsFontRenderingEnabled()) Cache.Hashed.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); else Cache.Hashed.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; // NOTE: GetTextExtentPoint32 simply ignores lfEscapement and XFORM. - if (FT_IS_SCALABLE(Cache.Hashed.Face) && plf->lfWidth != 0) - IntWidthMatrix(Cache.Hashed.Face, &Cache.Hashed.matTransform, plf->lfWidth); - else - Cache.Hashed.matTransform = identityMat; - - FT_Set_Transform(Cache.Hashed.Face, &Cache.Hashed.matTransform, 0); + IntLockFreeType(); + TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); + Cache.Hashed.matTransform = identityMat; + FT_Set_Transform(Cache.Hashed.Face, NULL, NULL); use_kerning = FT_HAS_KERNING(Cache.Hashed.Face); previous = 0; @@ -4356,8 +4343,16 @@ TextIntGetTextExtentPoint(PDC dc, descender = FontGDI->tmDescent; /* Units below baseline */ IntUnLockFreeType(); - Size->cx = (TotalWidth64 + 32) >> 6; - Size->cy = ascender + descender; + if (bVerticalWriting) + { + Size->cx = ascender + descender; + Size->cy = (TotalWidth64 + 32) >> 6; + } + else + { + Size->cx = (TotalWidth64 + 32) >> 6; + Size->cy = ascender + descender; + } return TRUE; } @@ -4561,7 +4556,6 @@ ftGdiGetTextMetricsW( ULONG Error; NTSTATUS Status = STATUS_SUCCESS; LOGFONTW *plf; - FT_Matrix mat; if (!ptmwi) { @@ -4584,10 +4578,11 @@ ftGdiGetTextMetricsW( Face = FontGDI->SharedFace->Face; + // NOTE: GetTextMetrics simply ignores lfEscapement and XFORM. IntLockFreeType(); Error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); - FtMatrixFromMx(&mat, DC_pmxWorldToDevice(dc)); - FT_Set_Transform(Face, &mat, 0); + FT_Set_Transform(Face, NULL, NULL); + IntUnLockFreeType(); if (0 != Error) @@ -4597,7 +4592,6 @@ ftGdiGetTextMetricsW( } else { - FT_Face Face = FontGDI->SharedFace->Face; Status = STATUS_SUCCESS; IntLockFreeType(); @@ -6073,6 +6067,7 @@ IntExtTextOutW( plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; Cache.Hashed.lfHeight = plf->lfHeight; + Cache.Hashed.lfWidth = plf->lfWidth; Cache.Hashed.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); Cache.Hashed.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); @@ -6093,7 +6088,7 @@ IntExtTextOutW( { pmxWorldToDevice = DC_pmxWorldToDevice(dc); FtMatrixFromMx(&Cache.Hashed.matTransform, pmxWorldToDevice); - FT_Set_Transform(face, &Cache.Hashed.matTransform, 0); + FT_Set_Transform(face, &Cache.Hashed.matTransform, NULL); fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6; fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6; @@ -6102,7 +6097,7 @@ IntExtTextOutW( { pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; FtMatrixFromMx(&Cache.Hashed.matTransform, pmxWorldToDevice); - FT_Set_Transform(face, &Cache.Hashed.matTransform, 0); + FT_Set_Transform(face, &Cache.Hashed.matTransform, NULL); fixAscender = FontGDI->tmAscent << 6; fixDescender = FontGDI->tmDescent << 6; @@ -6594,11 +6589,9 @@ NtGdiGetCharABCWidthsW( PFONTGDI FontGDI; FT_Face face; FT_CharMap charmap, found = NULL; - FT_Matrix mat; UINT i, glyph_index, BufferSize; HFONT hFont = 0; NTSTATUS Status = STATUS_SUCCESS; - PMATRIX pmxWorldToDevice; PWCHAR Safepwch = NULL; LOGFONTW *plf; @@ -6668,8 +6661,6 @@ NtGdiGetCharABCWidthsW( hFont = pdcattr->hlfntNew; TextObj = RealizeFontInit(hFont); - /* Get the DC's world-to-device transformation matrix */ - pmxWorldToDevice = DC_pmxWorldToDevice(dc); DC_UnlockDc(dc); if (TextObj == NULL) @@ -6716,10 +6707,11 @@ NtGdiGetCharABCWidthsW( } plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; + + // NOTE: GetCharABCWidths simply ignores lfEscapement and XFORM. IntLockFreeType(); IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); - FtMatrixFromMx(&mat, pmxWorldToDevice); - FT_Set_Transform(face, &mat, 0); + FT_Set_Transform(face, NULL, NULL); for (i = FirstChar; i < FirstChar+Count; i++) { @@ -6801,10 +6793,8 @@ NtGdiGetCharWidthW( PFONTGDI FontGDI; FT_Face face; FT_CharMap charmap, found = NULL; - FT_Matrix mat; UINT i, glyph_index, BufferSize; HFONT hFont = 0; - PMATRIX pmxWorldToDevice; PWCHAR Safepwc = NULL; LOGFONTW *plf; @@ -6861,8 +6851,6 @@ NtGdiGetCharWidthW( pdcattr = dc->pdcattr; hFont = pdcattr->hlfntNew; TextObj = RealizeFontInit(hFont); - /* Get the DC's world-to-device transformation matrix */ - pmxWorldToDevice = DC_pmxWorldToDevice(dc); DC_UnlockDc(dc); if (TextObj == NULL) @@ -6908,10 +6896,11 @@ NtGdiGetCharWidthW( } plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; + + // NOTE: GetCharWidth simply ignores lfEscapement and XFORM. IntLockFreeType(); IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight); - FtMatrixFromMx(&mat, pmxWorldToDevice); - FT_Set_Transform(face, &mat, 0); + FT_Set_Transform(face, NULL, NULL); for (i = FirstChar; i < FirstChar+Count; i++) {

2 years

[reactos] 01/01: [NTGDI][FREETYPE] Add special structure for hashing (#4916)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4d0d22aee22a56b89990c… commit 4d0d22aee22a56b89990c9e18b2a4cb3cf8d8af5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Nov 29 19:41:09 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Nov 29 19:41:09 2022 +0900 [NTGDI][FREETYPE] Add special structure for hashing (#4916) Add FONT_CACHE_HASHED structure and use it. CORE-11848 --- win32ss/gdi/ntgdi/font.h | 34 ++++++------- win32ss/gdi/ntgdi/freetype.c | 114 +++++++++++++++++++++---------------------- 2 files changed, 73 insertions(+), 75 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index e8526d8d91d..674406281a0 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -25,42 +25,42 @@ typedef struct _FONT_ENTRY_COLL_MEM #include <pshpack1.h> /* We don't like padding for these structures for hashing */ -typedef struct _EMULATION_BOLD_ITALIC -{ - BYTE Bold; - BYTE Italic; -} EMULATION_BOLD_ITALIC, *PEMULATION_BOLD_ITALIC; - typedef struct _FONT_ASPECT { _ANONYMOUS_UNION union { - EMULATION_BOLD_ITALIC Emu; WORD EmuBoldItalic; + struct { + BYTE Bold; + BYTE Italic; + } Emu; } DUMMYUNIONNAME; WORD RenderMode; } FONT_ASPECT, *PFONT_ASPECT; -typedef struct _FONT_CACHE_ENTRY +typedef struct _FONT_CACHE_HASHED { - LIST_ENTRY ListEntry; - FT_BitmapGlyph BitmapGlyph; - DWORD dwHash; - - /* The following members are hashed */ INT GlyphIndex; FT_Face Face; LONG lfHeight; _ANONYMOUS_UNION union { - FONT_ASPECT Aspect; DWORD AspectValue; + FONT_ASPECT Aspect; } DUMMYUNIONNAME; FT_Matrix matTransform; -} FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; +} FONT_CACHE_HASHED, *PFONT_CACHE_HASHED; #include <poppack.h> -C_ASSERT(FIELD_OFFSET(FONT_CACHE_ENTRY, GlyphIndex) % sizeof(DWORD) == 0); /* for hashing */ -C_ASSERT(sizeof(FONT_CACHE_ENTRY) % sizeof(DWORD) == 0); /* for hashing */ +typedef struct _FONT_CACHE_ENTRY +{ + LIST_ENTRY ListEntry; + FT_BitmapGlyph BitmapGlyph; + DWORD dwHash; + FONT_CACHE_HASHED Hashed; +} FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; + +C_ASSERT(FIELD_OFFSET(FONT_CACHE_ENTRY, Hashed) % sizeof(DWORD) == 0); /* for hashing */ +C_ASSERT(sizeof(FONT_CACHE_HASHED) % sizeof(DWORD) == 0); /* for hashing */ /* * FONTSUBST_... --- constants for font substitutes diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 1156684c40f..ea4a854bfad 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -280,7 +280,7 @@ RemoveCacheEntries(FT_Face Face) FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry); NextEntry = CurrentEntry->Flink; - if (FontEntry->Face == Face) + if (FontEntry->Hashed.Face == Face) { RemoveCachedEntry(FontEntry); } @@ -3142,11 +3142,12 @@ ftGdiGlyphCacheGet(IN const FONT_CACHE_ENTRY *pCache) { FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry); if (FontEntry->dwHash == dwHash && - FontEntry->GlyphIndex == pCache->GlyphIndex && - FontEntry->Face == pCache->Face && - FontEntry->lfHeight == pCache->lfHeight && - FontEntry->AspectValue == pCache->AspectValue && - memcmp(&FontEntry->matTransform, &pCache->matTransform, sizeof(FT_Matrix)) == 0) + FontEntry->Hashed.GlyphIndex == pCache->Hashed.GlyphIndex && + FontEntry->Hashed.Face == pCache->Hashed.Face && + FontEntry->Hashed.lfHeight == pCache->Hashed.lfHeight && + FontEntry->Hashed.AspectValue == pCache->Hashed.AspectValue && + memcmp(&FontEntry->Hashed.matTransform, &pCache->Hashed.matTransform, + sizeof(FT_Matrix)) == 0) { break; } @@ -3226,7 +3227,7 @@ ftGdiGlyphCacheSet( return NULL; }; - error = FT_Glyph_To_Bitmap(&GlyphCopy, Cache->Aspect.RenderMode, 0, 1); + error = FT_Glyph_To_Bitmap(&GlyphCopy, Cache->Hashed.Aspect.RenderMode, 0, 1); if (error) { FT_Done_Glyph(GlyphCopy); @@ -3257,8 +3258,8 @@ ftGdiGlyphCacheSet( BitmapGlyph->bitmap = AlignedBitmap; NewEntry->BitmapGlyph = BitmapGlyph; - RtlCopyMemory(&NewEntry->dwHash, &Cache->dwHash, - sizeof(FONT_CACHE_ENTRY) - offsetof(FONT_CACHE_ENTRY, dwHash)); + NewEntry->dwHash = Cache->dwHash; + NewEntry->Hashed = Cache->Hashed; InsertHeadList(&g_FontCacheListHead, &NewEntry->ListEntry); if (++g_FontCacheNumEntries > MAX_FONT_CACHE) @@ -4213,49 +4214,48 @@ ftGdiGetRealGlyph( INT error; FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; - DWORD cdw; ASSERT_FREETYPE_LOCK_HELD(); - if (Cache->Aspect.EmuBoldItalic) + if (Cache->Hashed.Aspect.EmuBoldItalic) { - error = FT_Load_Glyph(Cache->Face, Cache->GlyphIndex, FT_LOAD_NO_BITMAP); + error = FT_Load_Glyph(Cache->Hashed.Face, Cache->Hashed.GlyphIndex, FT_LOAD_NO_BITMAP); if (error) { - DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", Cache->GlyphIndex); + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", + Cache->Hashed.GlyphIndex); return NULL; } - glyph = Cache->Face->glyph; + glyph = Cache->Hashed.Face->glyph; - if (Cache->Aspect.Emu.Bold) + if (Cache->Hashed.Aspect.Emu.Bold) FT_GlyphSlot_Embolden(glyph); - if (Cache->Aspect.Emu.Italic) + if (Cache->Hashed.Aspect.Emu.Italic) FT_GlyphSlot_Oblique(glyph); - realglyph = ftGdiGlyphSet(Cache->Face, glyph, Cache->Aspect.RenderMode); + realglyph = ftGdiGlyphSet(Cache->Hashed.Face, glyph, Cache->Hashed.Aspect.RenderMode); } else { - cdw = (sizeof(FONT_CACHE_ENTRY) - offsetof(FONT_CACHE_ENTRY, GlyphIndex)) / sizeof(DWORD); - Cache->dwHash = IntGetHash(&Cache->GlyphIndex, cdw); + Cache->dwHash = IntGetHash(&Cache->Hashed, sizeof(Cache->Hashed) / sizeof(DWORD)); realglyph = ftGdiGlyphCacheGet(Cache); if (realglyph) return realglyph; - error = FT_Load_Glyph(Cache->Face, Cache->GlyphIndex, FT_LOAD_DEFAULT); + error = FT_Load_Glyph(Cache->Hashed.Face, Cache->Hashed.GlyphIndex, FT_LOAD_DEFAULT); if (error) { - DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", Cache->GlyphIndex); + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", Cache->Hashed.GlyphIndex); return NULL; } - glyph = Cache->Face->glyph; + glyph = Cache->Hashed.Face->glyph; realglyph = ftGdiGlyphCacheSet(Cache, glyph); } if (!realglyph) - DPRINT1("Failed to render glyph! [index: %d]\n", Cache->GlyphIndex); + DPRINT1("Failed to render glyph! [index: %d]\n", Cache->Hashed.GlyphIndex); return realglyph; } @@ -4283,7 +4283,7 @@ TextIntGetTextExtentPoint(PDC dc, FontGDI = ObjToGDI(TextObj->Font, FONT); - Cache.Face = FontGDI->SharedFace->Face; + Cache.Hashed.Face = FontGDI->SharedFace->Face; if (NULL != Fit) { *Fit = 0; @@ -4294,30 +4294,30 @@ TextIntGetTextExtentPoint(PDC dc, TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - Cache.lfHeight = plf->lfHeight; - Cache.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); - Cache.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); + Cache.Hashed.lfHeight = plf->lfHeight; + Cache.Hashed.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); + Cache.Hashed.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); if (IntIsFontRenderingEnabled()) - Cache.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); + Cache.Hashed.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); else - Cache.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; + Cache.Hashed.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; // NOTE: GetTextExtentPoint32 simply ignores lfEscapement and XFORM. - if (FT_IS_SCALABLE(Cache.Face) && plf->lfWidth != 0) - IntWidthMatrix(Cache.Face, &Cache.matTransform, plf->lfWidth); + if (FT_IS_SCALABLE(Cache.Hashed.Face) && plf->lfWidth != 0) + IntWidthMatrix(Cache.Hashed.Face, &Cache.Hashed.matTransform, plf->lfWidth); else - Cache.matTransform = identityMat; + Cache.Hashed.matTransform = identityMat; - FT_Set_Transform(Cache.Face, &Cache.matTransform, 0); + FT_Set_Transform(Cache.Hashed.Face, &Cache.Hashed.matTransform, 0); - use_kerning = FT_HAS_KERNING(Cache.Face); + use_kerning = FT_HAS_KERNING(Cache.Hashed.Face); previous = 0; for (i = 0; i < Count; i++) { - glyph_index = get_glyph_index_flagged(Cache.Face, *String, GTEF_INDICES, fl); - Cache.GlyphIndex = glyph_index; + glyph_index = get_glyph_index_flagged(Cache.Hashed.Face, *String, GTEF_INDICES, fl); + Cache.Hashed.GlyphIndex = glyph_index; realglyph = ftGdiGetRealGlyph(&Cache); if (!realglyph) @@ -4327,7 +4327,7 @@ TextIntGetTextExtentPoint(PDC dc, if (use_kerning && previous && glyph_index) { FT_Vector delta; - FT_Get_Kerning(Cache.Face, previous, glyph_index, 0, &delta); + FT_Get_Kerning(Cache.Hashed.Face, previous, glyph_index, 0, &delta); TotalWidth64 += delta.x; } @@ -4337,14 +4337,13 @@ TextIntGetTextExtentPoint(PDC dc, { *Fit = i + 1; } - if (NULL != Dx) { Dx[i] = (TotalWidth64 + 32) >> 6; } /* Bold and italic do not use the cache */ - if (Cache.Aspect.EmuBoldItalic) + if (Cache.Hashed.Aspect.EmuBoldItalic) { FT_Done_Glyph((FT_Glyph)realglyph); } @@ -5874,7 +5873,7 @@ ftGdiGetTextWidth( LONGLONG TextLeft64 = 0; INT glyph_index; FT_BitmapGlyph realglyph; - FT_Face face = Cache->Face; + FT_Face face = Cache->Hashed.Face; BOOL use_kerning = FT_HAS_KERNING(face); ULONG previous = 0; FT_Vector delta; @@ -5884,7 +5883,7 @@ ftGdiGetTextWidth( while (Count-- > 0) { glyph_index = get_glyph_index_flagged(face, *String, ETO_GLYPH_INDEX, fuOptions); - Cache->GlyphIndex = glyph_index; + Cache->Hashed.GlyphIndex = glyph_index; realglyph = ftGdiGetRealGlyph(Cache); if (!realglyph) @@ -5899,7 +5898,7 @@ ftGdiGetTextWidth( TextLeft64 += realglyph->root.advance.x >> 10; - if (Cache->Aspect.EmuBoldItalic) + if (Cache->Hashed.Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); previous = glyph_index; @@ -6070,18 +6069,17 @@ IntExtTextOutW( ASSERT(FontGDI); IntLockFreeType(); - Cache.Face = face = FontGDI->SharedFace->Face; + Cache.Hashed.Face = face = FontGDI->SharedFace->Face; plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - Cache.lfHeight = plf->lfHeight; - - Cache.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); - Cache.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); + Cache.Hashed.lfHeight = plf->lfHeight; + Cache.Hashed.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); + Cache.Hashed.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); if (IntIsFontRenderingEnabled()) - Cache.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); + Cache.Hashed.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); else - Cache.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; + Cache.Hashed.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; if (!TextIntUpdateSize(dc, TextObj, FontGDI, FALSE)) { @@ -6094,8 +6092,8 @@ IntExtTextOutW( if (pdcattr->iGraphicsMode == GM_ADVANCED) { pmxWorldToDevice = DC_pmxWorldToDevice(dc); - FtMatrixFromMx(&Cache.matTransform, pmxWorldToDevice); - FT_Set_Transform(face, &Cache.matTransform, 0); + FtMatrixFromMx(&Cache.Hashed.matTransform, pmxWorldToDevice); + FT_Set_Transform(face, &Cache.Hashed.matTransform, 0); fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6; fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6; @@ -6103,8 +6101,8 @@ IntExtTextOutW( else { pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; - FtMatrixFromMx(&Cache.matTransform, pmxWorldToDevice); - FT_Set_Transform(face, &Cache.matTransform, 0); + FtMatrixFromMx(&Cache.Hashed.matTransform, pmxWorldToDevice); + FT_Set_Transform(face, &Cache.Hashed.matTransform, 0); fixAscender = FontGDI->tmAscent << 6; fixDescender = FontGDI->tmDescent << 6; @@ -6197,7 +6195,7 @@ IntExtTextOutW( for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, *String++, ETO_GLYPH_INDEX, fuOptions); - Cache.GlyphIndex = glyph_index; + Cache.Hashed.GlyphIndex = glyph_index; realglyph = ftGdiGetRealGlyph(&Cache); if (!realglyph) @@ -6243,7 +6241,7 @@ IntExtTextOutW( { DPRINT1("WARNING: EngCreateBitmap() failed!\n"); bResult = FALSE; - if (Cache.Aspect.EmuBoldItalic) + if (Cache.Hashed.Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); break; } @@ -6254,7 +6252,7 @@ IntExtTextOutW( EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); bResult = FALSE; - if (Cache.Aspect.EmuBoldItalic) + if (Cache.Hashed.Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); break; } @@ -6305,7 +6303,7 @@ IntExtTextOutW( if (DoBreak) { - if (Cache.Aspect.EmuBoldItalic) + if (Cache.Hashed.Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); break; } @@ -6335,7 +6333,7 @@ IntExtTextOutW( previous = glyph_index; - if (Cache.Aspect.EmuBoldItalic) + if (Cache.Hashed.Aspect.EmuBoldItalic) { FT_Done_Glyph((FT_Glyph)realglyph); }

2 years

[reactos] 01/01: [RPCRT4] Sync msvc.S with WINE's inline assembly,

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=062a8f20a9fae1f496288… commit 062a8f20a9fae1f4962886b582d77c04943dc0c4 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Nov 25 10:45:47 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Mon Nov 28 20:12:57 2022 +0100 [RPCRT4] Sync msvc.S with WINE's inline assembly, as suggested by Thomas CORE-18505 --- dll/win32/rpcrt4/msvc.S | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dll/win32/rpcrt4/msvc.S b/dll/win32/rpcrt4/msvc.S index ca7d77430aa..fca5ee5e612 100644 --- a/dll/win32/rpcrt4/msvc.S +++ b/dll/win32/rpcrt4/msvc.S @@ -13,24 +13,25 @@ EXTERN _ndr_client_call:PROC PUBLIC _call_stubless_func _call_stubless_func: - mov ecx,[esp+4] /* This Pointer */ - mov ecx,[ecx] /* This->lpVtbl */ - mov ecx,[ecx-8] /* MIDL_STUBLESS_PROXY_INFO */ - mov edx,[ecx+8] /* Info->FormatStringOffset */ - mov edx,[edx+eax*2] /* FormatStringOffset[index] */ - and edx, 0000FFFFh - add edx,[ecx+4] /* info->ProcFormatString + offset */ - mov eax, [edx+8] /* arguments size */ - and eax, 0000FFFFh + mov ecx, [esp+4] /* This Pointer */ + mov ecx, [ecx] /* This->lpVtbl */ + mov ecx, [ecx-8] /* MIDL_STUBLESS_PROXY_INFO */ + mov edx, [ecx+8] /* Info->FormatStringOffset */ + movzx edx, word ptr [edx+eax*2] /* FormatStringOffset[index] */ + add edx, [ecx+4] /* info->ProcFormatString + offset */ + movzx eax, byte ptr [edx+1] /* Oi_flags */ + and eax, 8 /* Oi_HAS_RPCFLAGS */ + shr eax, 1 + movzx eax, word ptr [edx+eax+4] /* arguments size */ push eax - lea eax, [esp+8] /* &This */ + lea eax, [esp+8] /* &This */ push eax - push edx /* format string */ - push [ecx] /* info->pstubdesc */ + push edx /* format string */ + push [ecx] /* info->pstubdesc */ call _ndr_client_call lea esp, [esp+12] - pop edx /* arguments size */ - mov ecx, [esp] /* return address */ + pop edx /* arguments size */ + mov ecx, [esp] /* return address */ add esp, edx jmp ecx

2 years

[reactos] 01/01: [PSDK] Fix x64 incompatibilities in ***Box_GetItemData(). Addendum to 6572dd7f4.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8398b28ae478223e1ab92… commit 8398b28ae478223e1ab92272f959e91ee7acd25a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 28 15:02:39 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Nov 28 15:02:39 2022 +0100 [PSDK] Fix x64 incompatibilities in ***Box_GetItemData(). Addendum to 6572dd7f4. --- sdk/include/psdk/windowsx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/windowsx.h b/sdk/include/psdk/windowsx.h index 0d609dfea03..c24d1daaf7d 100644 --- a/sdk/include/psdk/windowsx.h +++ b/sdk/include/psdk/windowsx.h @@ -51,7 +51,7 @@ extern "C" { #define ComboBox_GetDroppedState(hwndCtl) ((BOOL)(DWORD)SNDMSG((hwndCtl),CB_GETDROPPEDSTATE,0,0)) #define ComboBox_GetEditSel(hwndCtl) ((DWORD)SNDMSG((hwndCtl),CB_GETEDITSEL,0,0)) #define ComboBox_GetExtendedUI(hwndCtl) ((UINT)(DWORD)SNDMSG((hwndCtl),CB_GETEXTENDEDUI,0,0)) -#define ComboBox_GetItemData(hwndCtl,index) ((LRESULT)(DWORD)SNDMSG((hwndCtl),CB_GETITEMDATA,(WPARAM)(int)(index),0)) +#define ComboBox_GetItemData(hwndCtl,index) ((LRESULT)(UINT_PTR)SNDMSG((hwndCtl),CB_GETITEMDATA,(WPARAM)(int)(index),0)) #define ComboBox_GetItemHeight(hwndCtl) ((int)(DWORD)SNDMSG((hwndCtl),CB_GETITEMHEIGHT,0,0)) #define ComboBox_GetLBText(hwndCtl,index,lpszBuffer) ((int)(DWORD)SNDMSG((hwndCtl),CB_GETLBTEXT,(WPARAM)(int)(index),(LPARAM)(LPCTSTR)(lpszBuffer))) #define ComboBox_GetLBTextLen(hwndCtl,index) ((int)(DWORD)SNDMSG((hwndCtl),CB_GETLBTEXTLEN,(WPARAM)(int)(index),0)) @@ -480,7 +480,7 @@ extern "C" { #define ListBox_GetCount(hwndCtl) ((int)(DWORD)SNDMSG((hwndCtl),LB_GETCOUNT,0,0)) #define ListBox_GetCurSel(hwndCtl) ((int)(DWORD)SNDMSG((hwndCtl),LB_GETCURSEL,0,0)) #define ListBox_GetHorizontalExtent(hwndCtl) ((int)(DWORD)SNDMSG((hwndCtl),LB_GETHORIZONTALEXTENT,0,0)) -#define ListBox_GetItemData(hwndCtl,index) ((LRESULT)(DWORD)SNDMSG((hwndCtl),LB_GETITEMDATA,(WPARAM)(int)(index),0)) +#define ListBox_GetItemData(hwndCtl,index) ((LRESULT)(UINT_PTR)SNDMSG((hwndCtl),LB_GETITEMDATA,(WPARAM)(int)(index),0)) #define ListBox_GetItemHeight(hwndCtl,index) ((int)(DWORD)SNDMSG((hwndCtl),LB_GETITEMHEIGHT,(WPARAM)(int)(index),0)) #define ListBox_GetItemRect(hwndCtl,index,lprc) ((int)(DWORD)SNDMSG((hwndCtl),LB_GETITEMRECT,(WPARAM)(int)(index),(LPARAM)(RECT*)(lprc))) #define ListBox_GetSel(hwndCtl,index) ((int)(DWORD)SNDMSG((hwndCtl),LB_GETSEL,(WPARAM)(int)(index),0))

2 years

[reactos] 01/01: [NTGDI][FREETYPE] lfWidth for GetTextExtentPoint32 (#4912)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b85f0056a843d887f3427… commit b85f0056a843d887f3427dd5a3da046fc0a6cdab Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 28 07:34:58 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Nov 28 07:34:58 2022 +0900 [NTGDI][FREETYPE] lfWidth for GetTextExtentPoint32 (#4912) - Apply LOGFONT.lfWidth in TextIntGetTextExtentPoint function. - Delete XFORM transformation in TextIntGetTextExtentPoint (to be simply ignored). CORE-11848 --- win32ss/gdi/ntgdi/freetype.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7780ced82ae..1156684c40f 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -703,7 +703,7 @@ InitFontSupport(VOID) return TRUE; } -LONG FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) +static LONG FASTCALL IntWidthMatrix(FT_Face face, FT_Matrix *pmat, LONG lfWidth) { LONG tmAveCharWidth; TT_OS2 *pOS2; @@ -4276,7 +4276,6 @@ TextIntGetTextExtentPoint(PDC dc, FT_BitmapGlyph realglyph; INT glyph_index, i, previous; ULONGLONG TotalWidth64 = 0; - PMATRIX pmxWorldToDevice; LOGFONTW *plf; BOOL use_kerning; LONG ascender, descender; @@ -4296,7 +4295,6 @@ TextIntGetTextExtentPoint(PDC dc, plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; Cache.lfHeight = plf->lfHeight; - Cache.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); Cache.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); @@ -4305,9 +4303,12 @@ TextIntGetTextExtentPoint(PDC dc, else Cache.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; - /* Get the DC's world-to-device transformation matrix */ - pmxWorldToDevice = DC_pmxWorldToDevice(dc); - FtMatrixFromMx(&Cache.matTransform, pmxWorldToDevice); + // NOTE: GetTextExtentPoint32 simply ignores lfEscapement and XFORM. + if (FT_IS_SCALABLE(Cache.Face) && plf->lfWidth != 0) + IntWidthMatrix(Cache.Face, &Cache.matTransform, plf->lfWidth); + else + Cache.matTransform = identityMat; + FT_Set_Transform(Cache.Face, &Cache.matTransform, 0); use_kerning = FT_HAS_KERNING(Cache.Face); @@ -4336,6 +4337,7 @@ TextIntGetTextExtentPoint(PDC dc, { *Fit = i + 1; } + if (NULL != Dx) { Dx[i] = (TotalWidth64 + 32) >> 6;

2 years

[reactos] 02/02: [LIBPNG] Update to version 1.6.39. CORE-18670

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=991e2bd45b88b5770e810… commit 991e2bd45b88b5770e810410d5e4f3e2ac7fea00 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Nov 25 09:57:36 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 27 10:10:53 2022 -0500 [LIBPNG] Update to version 1.6.39. CORE-18670 --- dll/3rdparty/libpng/docs/ANNOUNCE | 30 +++--- dll/3rdparty/libpng/docs/CHANGES | 22 ++++- dll/3rdparty/libpng/docs/INSTALL | 10 +- dll/3rdparty/libpng/docs/README | 137 ++++++++++++++------------- dll/3rdparty/libpng/docs/libpng-manual.txt | 4 +- dll/3rdparty/libpng/png.c | 6 +- dll/3rdparty/libpng/pngpriv.h | 2 +- dll/3rdparty/libpng/pngread.c | 4 +- dll/3rdparty/libpng/pngrutil.c | 2 +- dll/3rdparty/libpng/pngwrite.c | 8 +- dll/3rdparty/libpng/pngwutil.c | 6 +- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/libpng/png.h | 16 ++-- sdk/include/reactos/libs/libpng/pngconf.h | 2 +- sdk/include/reactos/libs/libpng/pnglibconf.h | 2 +- 15 files changed, 136 insertions(+), 117 deletions(-) diff --git a/dll/3rdparty/libpng/docs/ANNOUNCE b/dll/3rdparty/libpng/docs/ANNOUNCE index 9c9bb189183..5675b973ab2 100644 --- a/dll/3rdparty/libpng/docs/ANNOUNCE +++ b/dll/3rdparty/libpng/docs/ANNOUNCE @@ -1,5 +1,5 @@ -libpng 1.6.38 - September 14, 2022 -================================== +libpng 1.6.39 - November 20, 2022 +================================= This is a public release of libpng, intended for use in production code. @@ -9,13 +9,13 @@ Files available for download Source files with LF line endings (for Unix/Linux): - * libpng-1.6.38.tar.xz (LZMA-compressed, recommended) - * libpng-1.6.38.tar.gz + * libpng-1.6.39.tar.xz (LZMA-compressed, recommended) + * libpng-1.6.39.tar.gz Source files with CRLF line endings (for Windows): - * lp1638.7z (LZMA-compressed, recommended) - * lp1638.zip + * lpng1639.7z (LZMA-compressed, recommended) + * lpng1639.zip Other information: @@ -25,13 +25,19 @@ Other information: * TRADEMARK.md -Changes since the previous public release (version 1.6.37) ----------------------------------------------------------- +Changes from version 1.6.38 to version 1.6.39 +--------------------------------------------- - * Added configurations and scripts for continuous integration. - * Fixed various errors in the handling of tRNS, hIST and eXIf. - * Implemented many stability improvements across all platforms. - * Updated the internal documentation. + * Changed the error handler of oversized chunks (i.e. larger than + PNG_USER_CHUNK_MALLOC_MAX) from png_chunk_error to png_benign_error. + * Fixed a buffer overflow error in contrib/tools/pngfix. + * Fixed a memory leak (CVE-2019-6129) in contrib/tools/pngcp. + * Disabled the ARM Neon optimizations by default in the CMake file, + following the default behavior of the configure script. + * Allowed configure.ac to work with the trunk version of autoconf. + * Removed the support for "install" targets from the legacy makefiles; + removed the obsolete makefile.cegcc. + * Cleaned up the code and updated the internal documentation. Send comments/corrections/commendations to png-mng-implement at lists.sf.net. diff --git a/dll/3rdparty/libpng/docs/CHANGES b/dll/3rdparty/libpng/docs/CHANGES index 9a86869681b..366e0f6a7be 100644 --- a/dll/3rdparty/libpng/docs/CHANGES +++ b/dll/3rdparty/libpng/docs/CHANGES @@ -4052,7 +4052,7 @@ Version 1.6.0beta16 [March 6, 2012] (in fact this is harmless, but the PNG data produced may be sub-optimal). Version 1.6.0beta17 [March 10, 2012] - Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition. + Fixed PNG_LIBPNG_BUILD_BASE_TYPE definition. Reject all iCCP chunks after the first, even if the first one is invalid. Deflate/inflate was reworked to move common zlib calls into single functions [rw]util.c. A new shared keyword check routine was also added @@ -4962,7 +4962,7 @@ Version 1.6.13beta01 [July 4, 2014] Changed "if defined(__ARM_NEON__)" to "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu). Fixed clang no-warning builds: png_digit was defined but never used. - + Version 1.6.13beta02 [July 21, 2014] Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32 (bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11. @@ -5453,7 +5453,7 @@ Version 1.6.21beta01 [December 11, 2015] Version 1.6.21beta02 [December 14, 2015] Moved png_check_keyword() from pngwutil.c to pngset.c Removed LE/BE dependencies in pngvalid, to 'fix' the current problem - in the BigEndian tests by not testing it, making the BE code the same + in the BigEndian tests by not testing it, making the BE code the same as the LE version. Fixes to pngvalid for various reduced build configurations (eliminate unused statics) and a fix for the case in rgb_to_gray when the digitize option @@ -5517,7 +5517,7 @@ Version 1.6.22beta03 [March 9, 2016] Added a common-law trademark notice and export control information to the LICENSE file, png.h, and the man page. Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that - were accidentally removed from libpng-1.6.17. + were accidentally removed from libpng-1.6.17. Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h (Robert C. Seacord). Removed dubious "#if INT_MAX" test from png.h that was added to @@ -5950,7 +5950,7 @@ Version 1.6.32beta09 [August 3, 2017] Require cmake-2.8.8 in CMakeLists.txt. Revised symlink creation, no longer using deprecated cmake LOCATION feature (Clifford Yapp). Fixed five-byte error in the calculation of IDAT maximum possible size. - + Version 1.6.32beta10 [August 5, 2017] Moved chunk-length check into a png_check_chunk_length() private function (Suggested by Max Stepin). @@ -6109,6 +6109,18 @@ Version 1.6.38 [September 14, 2022] Implemented many stability improvements across all platforms. Updated the internal documentation. +Version 1.6.39 [November 20, 2022] + Changed the error handler of oversized chunks (i.e. larger than + PNG_USER_CHUNK_MALLOC_MAX) from png_chunk_error to png_benign_error. + Fixed a buffer overflow error in contrib/tools/pngfix. + Fixed a memory leak (CVE-2019-6129) in contrib/tools/pngcp. + Disabled the ARM Neon optimizations by default in the CMake file, + following the default behavior of the configure script. + Allowed configure.ac to work with the trunk version of autoconf. + Removed the support for "install" targets from the legacy makefiles; + removed the obsolete makefile.cegcc. + Cleaned up the code and updated the internal documentation. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net. Subscription is required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/dll/3rdparty/libpng/docs/INSTALL b/dll/3rdparty/libpng/docs/INSTALL index d3aaa288426..042d7292912 100644 --- a/dll/3rdparty/libpng/docs/INSTALL +++ b/dll/3rdparty/libpng/docs/INSTALL @@ -192,11 +192,11 @@ test. For more confidence, you can run another test by typing Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare your output with the result shown in contrib/pngsuite/README. -Most of the makefiles will allow you to run "make install" to -put the library in its final resting place (if you want to -do that, run "make install" in the zlib directory first if necessary). -Some also allow you to run "make test-installed" after you have -run "make install". +Most of the makefiles used to allow you to run "make install" to put +the library in its final resting place, but that feature is no longer +supported. The only tested and supported manners to install libpng are +the conventional build and install procedures driven by the configure +script or by the CMake file. VIII. Configuring for DOS and other 16-bit platforms diff --git a/dll/3rdparty/libpng/docs/README b/dll/3rdparty/libpng/docs/README index e6e72aa5472..097a3c21841 100644 --- a/dll/3rdparty/libpng/docs/README +++ b/dll/3rdparty/libpng/docs/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.38 +README for libpng version 1.6.39 ================================ See the note about version numbers near the top of png.h. @@ -106,73 +106,74 @@ subscribe). Files in this distribution: - ANNOUNCE => Announcement of this version, with recent changes - AUTHORS => List of contributing authors - CHANGES => Description of changes between libpng versions - KNOWNBUG => List of known bugs and deficiencies - LICENSE => License to use and redistribute libpng - README => This file - TODO => Things not implemented in the current library - TRADEMARK => Trademark information - example.c => Example code for using libpng functions - libpng.3 => manual page for libpng (includes libpng-manual.txt) - libpng-manual.txt => Description of libpng and its functions - libpngpf.3 => manual page for libpng's private functions - png.5 => manual page for the PNG format - png.c => Basic interface functions common to library - png.h => Library function and interface declarations (public) - pngpriv.h => Library function and interface declarations (private) - pngconf.h => System specific library configuration (public) - pngstruct.h => png_struct declaration (private) - pnginfo.h => png_info struct declaration (private) - pngdebug.h => debugging macros (private) - pngerror.c => Error/warning message I/O functions - pngget.c => Functions for retrieving info from struct - pngmem.c => Memory handling functions - pngbar.png => PNG logo, 88x31 - pngnow.png => PNG logo, 98x31 - pngpread.c => Progressive reading functions - pngread.c => Read data/helper high-level functions - pngrio.c => Lowest-level data read I/O functions - pngrtran.c => Read data transformation functions - pngrutil.c => Read data utility functions - pngset.c => Functions for storing data into the info_struct - pngtest.c => Library test program - pngtest.png => Library test sample image - pngtrans.c => Common data transformation functions - pngwio.c => Lowest-level write I/O functions - pngwrite.c => High-level write functions - pngwtran.c => Write data transformations - pngwutil.c => Write utility functions - arm => Contains optimized code for the ARM platform - powerpc => Contains optimized code for the PowerPC platform - contrib => Contributions - arm-neon => Optimized code for ARM-NEON platform - powerpc-vsx => Optimized code for POWERPC-VSX platform - examples => Example programs - gregbook => source code for PNG reading and writing, from - Greg Roelofs' "PNG: The Definitive Guide", - O'Reilly, 1999 - libtests => Test programs - mips-msa => Optimized code for MIPS-MSA platform - pngminim => Minimal decoder, encoder, and progressive decoder - programs demonstrating use of pngusr.dfa - pngminus => Simple pnm2png and png2pnm programs - pngsuite => Test images - testpngs - tools => Various tools - visupng => Contains a MSVC workspace for VisualPng - intel => Optimized code for INTEL-SSE2 platform - mips => Optimized code for MIPS platform - projects => Contains project files and workspaces for - building a DLL - owatcom => Contains a WATCOM project for building libpng - visualc71 => Contains a Microsoft Visual C++ (MSVC) - workspace for building libpng and zlib - vstudio => Contains a Microsoft Visual C++ (MSVC) - workspace for building libpng and zlib - scripts => Directory containing scripts for building libpng: - (see scripts/README.txt for the list of scripts) + ANNOUNCE => Announcement of this version, with recent changes + AUTHORS => List of contributing authors + CHANGES => Description of changes between libpng versions + INSTALL => Instructions to install libpng + LICENSE => License to use and redistribute libpng + README => This file + TODO => Things not implemented in the current library + TRADEMARK => Trademark information + example.c => Example code for using libpng functions + libpng.3 => Manual page for libpng (includes libpng-manual.txt) + libpng-manual.txt => Description of libpng and its functions + libpngpf.3 => Manual page for libpng's private functions (deprecated) + png.5 => Manual page for the PNG format + png.c => Basic interface functions common to library + png.h => Library function and interface declarations (public) + pngpriv.h => Library function and interface declarations (private) + pngconf.h => System specific library configuration (public) + pngstruct.h => png_struct declaration (private) + pnginfo.h => png_info struct declaration (private) + pngdebug.h => debugging macros (private) + pngerror.c => Error/warning message I/O functions + pngget.c => Functions for retrieving info from struct + pngmem.c => Memory handling functions + pngbar.png => PNG logo, 88x31 + pngnow.png => PNG logo, 98x31 + pngpread.c => Progressive reading functions + pngread.c => Read data/helper high-level functions + pngrio.c => Lowest-level data read I/O functions + pngrtran.c => Read data transformation functions + pngrutil.c => Read data utility functions + pngset.c => Functions for storing data into the info_struct + pngtest.c => Library test program + pngtest.png => Library test sample image + pngtrans.c => Common data transformation functions + pngwio.c => Lowest-level write I/O functions + pngwrite.c => High-level write functions + pngwtran.c => Write data transformations + pngwutil.c => Write utility functions + arm/ => Optimized code for the ARM platform + intel/ => Optimized code for the INTEL-SSE2 platform + mips/ => Optimized code for the MIPS platform + powerpc/ => Optimized code for the PowerPC platform + ci/ => Scripts for continuous integration + contrib/ => External contributions + arm-neon/ => Optimized code for the ARM-NEON platform + mips-msa/ => Optimized code for the MIPS-MSA platform + powerpc-vsx/ => Optimized code for the POWERPC-VSX platform + examples/ => Example programs + gregbook/ => Source code for PNG reading and writing, from + "PNG: The Definitive Guide" by Greg Roelofs, + O'Reilly, 1999 + libtests/ => Test programs + oss-fuzz/ => Files used by the OSS-Fuzz project for fuzz-testing + libpng + pngminim/ => Minimal decoder, encoder, and progressive decoder + programs demonstrating the use of pngusr.dfa + pngminus/ => Simple pnm2png and png2pnm programs + pngsuite/ => Test images + testpngs/ => Test images + tools/ => Various tools + visupng/ => VisualPng, a Windows viewer for PNG images + projects/ => Project files and workspaces for various IDEs + owatcom/ => OpenWatcom project + visualc71/ => Microsoft Visual C++ 7.1 workspace + vstudio/ => Microsoft Visual Studio workspace + scripts/ => Scripts and makefiles for building libpng + (see scripts/README.txt for the complete list) + tests/ => Test scripts Good luck, and happy coding! diff --git a/dll/3rdparty/libpng/docs/libpng-manual.txt b/dll/3rdparty/libpng/docs/libpng-manual.txt index 19b1e0c3562..d8567961691 100644 --- a/dll/3rdparty/libpng/docs/libpng-manual.txt +++ b/dll/3rdparty/libpng/docs/libpng-manual.txt @@ -9,7 +9,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng version 1.6.36, December 2018, through 1.6.38 - September 2022 + libpng version 1.6.36, December 2018, through 1.6.39 - November 2022 Updated and distributed by Cosmin Truta Copyright (c) 2018-2022 Cosmin Truta @@ -877,7 +877,7 @@ described below (the latter being the two common names for associated alpha color channels). Note that PNG files always contain non-associated color channels; png_set_alpha_mode() with one of the modes causes the decoder to convert the pixels to an associated form before returning them to your -application. +application. Since it is not necessary to perform arithmetic on opaque color values so long as they are not to be resampled and are in the final color space it is diff --git a/dll/3rdparty/libpng/png.c b/dll/3rdparty/libpng/png.c index fc095642621..4f3e8bbd31f 100644 --- a/dll/3rdparty/libpng/png.c +++ b/dll/3rdparty/libpng/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38; +typedef png_libpng_version_1_6_39 Your_png_h_is_not_version_1_6_39; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -815,7 +815,7 @@ png_get_copyright(png_const_structrp png_ptr) return PNG_STRING_COPYRIGHT #else return PNG_STRING_NEWLINE \ - "libpng version 1.6.38" PNG_STRING_NEWLINE \ + "libpng version 1.6.39" PNG_STRING_NEWLINE \ "Copyright (c) 2018-2022 Cosmin Truta" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ @@ -2710,7 +2710,7 @@ png_check_IHDR(png_const_structrp png_ptr, int /* PRIVATE */ png_check_fp_number(png_const_charp string, size_t size, int *statep, - png_size_tp whereami) + size_t *whereami) { int state = *statep; size_t i = *whereami; diff --git a/dll/3rdparty/libpng/pngpriv.h b/dll/3rdparty/libpng/pngpriv.h index 2e426cf47d6..b8a73b685df 100644 --- a/dll/3rdparty/libpng/pngpriv.h +++ b/dll/3rdparty/libpng/pngpriv.h @@ -1946,7 +1946,7 @@ PNG_INTERNAL_FUNCTION(void,png_ascii_from_fixed,(png_const_structrp png_ptr, * the problem character.) This has not been tested within libpng. */ PNG_INTERNAL_FUNCTION(int,png_check_fp_number,(png_const_charp string, - size_t size, int *statep, png_size_tp whereami),PNG_EMPTY); + size_t size, int *statep, size_t *whereami),PNG_EMPTY); /* This is the same but it checks a complete string and returns true * only if it just contains a floating point number. As of 1.5.4 this diff --git a/dll/3rdparty/libpng/pngread.c b/dll/3rdparty/libpng/pngread.c index 5ab92240382..96996ced5ba 100644 --- a/dll/3rdparty/libpng/pngread.c +++ b/dll/3rdparty/libpng/pngread.c @@ -3762,13 +3762,13 @@ png_image_read_direct(png_voidp argument) mode = PNG_ALPHA_PNG; output_gamma = PNG_DEFAULT_sRGB; } - + if ((change & PNG_FORMAT_FLAG_ASSOCIATED_ALPHA) != 0) { mode = PNG_ALPHA_OPTIMIZED; change &= ~PNG_FORMAT_FLAG_ASSOCIATED_ALPHA; } - + /* If 'do_local_background' is set check for the presence of gamma * correction; this is part of the work-round for the libpng bug * described above. diff --git a/dll/3rdparty/libpng/pngrutil.c b/dll/3rdparty/libpng/pngrutil.c index ca060dd15f0..068ab193a33 100644 --- a/dll/3rdparty/libpng/pngrutil.c +++ b/dll/3rdparty/libpng/pngrutil.c @@ -3186,7 +3186,7 @@ png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length) { png_debug2(0," length = %lu, limit = %lu", (unsigned long)length,(unsigned long)limit); - png_chunk_error(png_ptr, "chunk data is too large"); + png_benign_error(png_ptr, "chunk data is too large"); } } diff --git a/dll/3rdparty/libpng/pngwrite.c b/dll/3rdparty/libpng/pngwrite.c index 06c45d16ab4..4e58d776a96 100644 --- a/dll/3rdparty/libpng/pngwrite.c +++ b/dll/3rdparty/libpng/pngwrite.c @@ -75,10 +75,10 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr, * library. If you have a new chunk to add, make a function to write it, * and put it in the correct location here. If you want the chunk written * after the image data, put it in png_write_end(). I strongly encourage - * you to supply a PNG_INFO_ flag, and check info_ptr->valid before writing - * the chunk, as that will keep the code from breaking if you want to just - * write a plain PNG file. If you have long comments, I suggest writing - * them in png_write_end(), and compressing them. + * you to supply a PNG_INFO_<chunk> flag, and check info_ptr->valid before + * writing the chunk, as that will keep the code from breaking if you want + * to just write a plain PNG file. If you have long comments, I suggest + * writing them in png_write_end(), and compressing them. */ void PNGAPI png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr) diff --git a/dll/3rdparty/libpng/pngwutil.c b/dll/3rdparty/libpng/pngwutil.c index 16345e4c0ba..01f0607c709 100644 --- a/dll/3rdparty/libpng/pngwutil.c +++ b/dll/3rdparty/libpng/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -1747,7 +1747,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0, { png_uint_32 purpose_len; size_t units_len, total_len; - png_size_tp params_len; + size_t *params_len; png_byte buf[10]; png_byte new_purpose[80]; int i; @@ -1769,7 +1769,7 @@ png_write_pCAL(png_structrp png_ptr, png_charp purpose, png_int_32 X0, png_debug1(3, "pCAL units length = %d", (int)units_len); total_len = purpose_len + units_len + 10; - params_len = (png_size_tp)png_malloc(png_ptr, + params_len = (size_t *)png_malloc(png_ptr, (png_alloc_size_t)((png_alloc_size_t)nparams * (sizeof (size_t)))); /* Find the length of each parameter, making sure we don't count the diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 7c6357a4e86..86e25d83cde 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -33,7 +33,7 @@ URL: http://www.ijg.org/ Title: libpng Path: dll/3rdparty/libpng -Used Version: 1.6.38 +Used Version: 1.6.39 License: PNG Reference Library version 2 URL: http://libpng.sourceforge.net/ diff --git a/sdk/include/reactos/libs/libpng/png.h b/sdk/include/reactos/libs/libpng/png.h index 5fb494fb1aa..f109cdf3365 100644 --- a/sdk/include/reactos/libs/libpng/png.h +++ b/sdk/include/reactos/libs/libpng/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.38 - September 14, 2022 + * libpng version 1.6.39 - November 20, 2022 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson @@ -15,7 +15,7 @@ * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger * libpng versions 0.97, January 1998, through 1.6.35, July 2018: * Glenn Randers-Pehrson - * libpng versions 1.6.36, December 2018, through 1.6.38, September 2022: + * libpng versions 1.6.36, December 2018, through 1.6.39, November 2022: * Cosmin Truta * See also "Contributing Authors", below. */ @@ -239,7 +239,7 @@ * ... * 1.5.30 15 10530 15.so.15.30[.0] * ... - * 1.6.38 16 10638 16.so.16.38[.0] + * 1.6.39 16 10639 16.so.16.39[.0] * * Henceforth the source version will match the shared-library major and * minor numbers; the shared-library major version number will be used for @@ -278,8 +278,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.38" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38 - September 14, 2022\n" +#define PNG_LIBPNG_VER_STRING "1.6.39" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.39 - November 20, 2022\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -287,7 +287,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 38 +#define PNG_LIBPNG_VER_RELEASE 39 /* This should be zero for a public release, or non-zero for a * development version. [Deprecated] @@ -318,7 +318,7 @@ * From version 1.0.1 it is: * XXYYZZ, where XX=major, YY=minor, ZZ=release */ -#define PNG_LIBPNG_VER 10638 /* 1.6.38 */ +#define PNG_LIBPNG_VER 10639 /* 1.6.39 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -428,7 +428,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_38; +typedef char* png_libpng_version_1_6_39; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/sdk/include/reactos/libs/libpng/pngconf.h b/sdk/include/reactos/libs/libpng/pngconf.h index 89d28f83a05..fcb4b430698 100644 --- a/sdk/include/reactos/libs/libpng/pngconf.h +++ b/sdk/include/reactos/libs/libpng/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine-configurable file for libpng * - * libpng version 1.6.38 + * libpng version 1.6.39 * * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson diff --git a/sdk/include/reactos/libs/libpng/pnglibconf.h b/sdk/include/reactos/libs/libpng/pnglibconf.h index 89d5b4c8adc..e5948c8ce19 100644 --- a/sdk/include/reactos/libs/libpng/pnglibconf.h +++ b/sdk/include/reactos/libs/libpng/pnglibconf.h @@ -1,6 +1,6 @@ /* pnglibconf.h - library build configuration */ -/* libpng version 1.6.38 */ +/* libpng version 1.6.39 */ /* Copyright (c) 2018-2022 Cosmin Truta */ /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */

2 years

[reactos] 01/02: [LIBPNG] Update to version 1.6.38. CORE-18670

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c5febe93f0f67fe760be6… commit c5febe93f0f67fe760be6c7b07c7f3a5fc282394 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Nov 25 09:57:24 2022 -0500 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sun Nov 27 10:10:51 2022 -0500 [LIBPNG] Update to version 1.6.38. CORE-18670 --- dll/3rdparty/libpng/docs/ANNOUNCE | 29 ++++------- dll/3rdparty/libpng/docs/CHANGES | 10 +++- dll/3rdparty/libpng/docs/INSTALL | 75 ++++++++++++++-------------- dll/3rdparty/libpng/docs/LICENSE | 4 +- dll/3rdparty/libpng/docs/README | 8 +-- dll/3rdparty/libpng/docs/example.c | 1 + dll/3rdparty/libpng/docs/libpng-manual.txt | 8 +-- dll/3rdparty/libpng/png.c | 14 +++--- dll/3rdparty/libpng/pngget.c | 14 +++--- dll/3rdparty/libpng/pngpriv.h | 65 +++++++++++------------- dll/3rdparty/libpng/pngread.c | 3 -- dll/3rdparty/libpng/pngrtran.c | 2 +- dll/3rdparty/libpng/pngrutil.c | 36 ++++++------- dll/3rdparty/libpng/pngset.c | 13 +++-- dll/3rdparty/libpng/pngstruct.h | 12 +---- dll/3rdparty/libpng/pngwrite.c | 12 ++++- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/libpng/png.h | 26 +++++----- sdk/include/reactos/libs/libpng/pngconf.h | 8 +-- sdk/include/reactos/libs/libpng/pnglibconf.h | 4 +- 20 files changed, 168 insertions(+), 178 deletions(-) diff --git a/dll/3rdparty/libpng/docs/ANNOUNCE b/dll/3rdparty/libpng/docs/ANNOUNCE index ecf9c7043b0..9c9bb189183 100644 --- a/dll/3rdparty/libpng/docs/ANNOUNCE +++ b/dll/3rdparty/libpng/docs/ANNOUNCE @@ -1,5 +1,5 @@ -libpng 1.6.37 - April 14, 2019 -============================== +libpng 1.6.38 - September 14, 2022 +================================== This is a public release of libpng, intended for use in production code. @@ -9,13 +9,13 @@ Files available for download Source files with LF line endings (for Unix/Linux): - * libpng-1.6.37.tar.xz (LZMA-compressed, recommended) - * libpng-1.6.37.tar.gz + * libpng-1.6.38.tar.xz (LZMA-compressed, recommended) + * libpng-1.6.38.tar.gz Source files with CRLF line endings (for Windows): - * lp1637.7z (LZMA-compressed, recommended) - * lp1637.zip + * lp1638.7z (LZMA-compressed, recommended) + * lp1638.zip Other information: @@ -25,20 +25,13 @@ Other information: * TRADEMARK.md -Changes since the previous public release (version 1.6.36) +Changes since the previous public release (version 1.6.37) ---------------------------------------------------------- - * Fixed a use-after-free vulnerability (CVE-2019-7317) in png_image_free. - * Fixed a memory leak in the ARM NEON implementation of png_do_expand_palette. - * Fixed a memory leak in pngtest.c. - * Fixed two vulnerabilities (CVE-2018-14048, CVE-2018-14550) in - contrib/pngminus; refactor. - * Changed the license of contrib/pngminus to MIT; refresh makefile and docs. - (Contributed by Willem van Schaik) - * Fixed a typo in the libpng license v2. - (Contributed by Miguel Ojeda) - * Added makefiles for AddressSanitizer-enabled builds. - * Cleaned up various makefiles. + * Added configurations and scripts for continuous integration. + * Fixed various errors in the handling of tRNS, hIST and eXIf. + * Implemented many stability improvements across all platforms. + * Updated the internal documentation. Send comments/corrections/commendations to png-mng-implement at lists.sf.net. diff --git a/dll/3rdparty/libpng/docs/CHANGES b/dll/3rdparty/libpng/docs/CHANGES index f0b0a9342c3..9a86869681b 100644 --- a/dll/3rdparty/libpng/docs/CHANGES +++ b/dll/3rdparty/libpng/docs/CHANGES @@ -2295,7 +2295,7 @@ Version 1.4.0beta58 [May 14, 2009] Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri) Version 1.4.0beta59 [May 15, 2009] - Reformated sources in libpng style (3-space intentation, comment format) + Reformated sources in libpng style (3-space indentation, comment format) Fixed typo in libpng docs (PNG_FILTER_AVE should be PNG_FILTER_AVG) Added sections about the git repository and our coding style to the documentation @@ -3886,7 +3886,7 @@ Version 1.6.0beta06 [January 24, 2012] Version 1.6.0beta07 [January 28, 2012] Eliminated Intel icc/icl compiler warnings. The Intel (GCC derived) compiler issues slightly different warnings from those issued by the - current vesions of GCC. This eliminates those warnings by + current versions of GCC. This eliminates those warnings by adding/removing casts and small code rewrites. Updated configure.ac from autoupdate: added --enable-werror option. Also some layout regularization and removal of introduced tab characters @@ -6103,6 +6103,12 @@ Version 1.6.37 [April 14, 2019] Added makefiles for AddressSanitizer-enabled builds. Cleaned up various makefiles. +Version 1.6.38 [September 14, 2022] + Added configurations and scripts for continuous integration. + Fixed various errors in the handling of tRNS, hIST and eXIf. + Implemented many stability improvements across all platforms. + Updated the internal documentation. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net. Subscription is required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/dll/3rdparty/libpng/docs/INSTALL b/dll/3rdparty/libpng/docs/INSTALL index 4c170225150..d3aaa288426 100644 --- a/dll/3rdparty/libpng/docs/INSTALL +++ b/dll/3rdparty/libpng/docs/INSTALL @@ -128,16 +128,18 @@ Your directory structure should look like this: README *.h, *.c => libpng source files CMakeLists.txt => "cmake" script + ci + ci_*.sh configuration files: configure.ac, configure, Makefile.am, Makefile.in, autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in, libpng-config.in, aclocal.m4, config.h.in, config.sub, - depcomp, install-sh, mkinstalldirs, test-pngtest.sh + depcomp, install-sh, mkinstalldirs, test-pngtest.sh, etc. contrib arm-neon, conftest, examples, gregbook, libtests, pngminim, pngminus, pngsuite, tools, visupng projects - cbuilder5, owatcom, visualc71, vstudio, xcode + owatcom, visualc71, vstudio scripts makefile.* *.def (module definition files) @@ -145,7 +147,7 @@ Your directory structure should look like this: pngtest.png etc. zlib - README, *.h, *.c contrib, etc. + README, *.h, *.c, contrib, etc. If the line endings in the files look funny, you may wish to get the other distribution of libpng. It is available in both tar.gz (UNIX style line @@ -153,28 +155,27 @@ endings) and zip (DOS style line endings) formats. VI. Building with project files -If you are building libpng with MSVC, you can enter the -libpng projects\visualc71 or vstudio directory and follow the instructions -in README.txt. +If you are building libpng with Microsoft Visual Studio, you can enter +the directory projects\visualc71 or projects\vstudio and follow the +instructions in README.txt. -Otherwise enter the zlib directory and follow the instructions in zlib/README, -then come back here and run "configure" or choose the appropriate -makefile.sys in the scripts directory. +Otherwise, enter the zlib directory and follow the instructions in +zlib/README, then come back here and run "configure" or choose the +appropriate makefile in the scripts directory. VII. Building with makefiles Copy the file (or files) that you need from the scripts directory into this directory, for example -MSDOS example: +UNIX example: - copy scripts\makefile.msc makefile - copy scripts\pnglibconf.h.prebuilt pnglibconf.h + cp scripts/makefile.std Makefile + make -UNIX example: +Windows example: - cp scripts/makefile.std makefile - cp scripts/pnglibconf.h.prebuilt pnglibconf.h + nmake -f scripts\makefile.vcwin32 Read the makefile to see if you need to change any source or target directories to match your preferences. @@ -197,30 +198,27 @@ do that, run "make install" in the zlib directory first if necessary). Some also allow you to run "make test-installed" after you have run "make install". -VIII. Configuring libpng for 16-bit platforms - -You will want to look into zconf.h to tell zlib (and thus libpng) that -it cannot allocate more than 64K at a time. Even if you can, the memory -won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K. +VIII. Configuring for DOS and other 16-bit platforms -IX. Configuring for DOS +Officially, the support for 16-bit platforms has been removed. For DOS users who only have access to the lower 640K, you will have to limit zlib's memory usage via a png_set_compression_mem_level() call. See zlib.h or zconf.h in the zlib library for more information. -X. Configuring for Medium Model +You may be or may not be in luck if you target the "large" memory model, +but all the smaller models ("small", "compact" and "medium") are known +to be unworkable. For DOS users who have access beyond the lower 640K, +a "flat" 32-bit DOS model (such as DJGPP) is strongly recommended. -Libpng's support for medium model has been tested on most of the popular -compilers. Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets -defined, and FAR gets defined to far in pngconf.h, and you should be -all set. Everything in the library (except for zlib's structure) is -expecting far data. You must use the typedefs with the p or pp on -the end for pointers (or at least look at them and be careful). Make -note that the rows of data are defined as png_bytepp, which is -an "unsigned char far * far *". +For DOS users who only have access to the lower 640K, you will have to +limit zlib's memory usage via a png_set_compression_mem_level() call. +You will also have to look into zconf.h to tell zlib (and thus libpng) +that it cannot allocate more than 64K at a time. Even if you can, the +memory won't be accessible. Therefore, you should limit zlib and libpng +to 64K by defining MAXSEG_64K. -XI. Prepending a prefix to exported symbols +IX. Prepending a prefix to exported symbols Starting with libpng-1.6.0, you can configure libpng (when using the "configure" script) to prefix all exported symbols by means of the @@ -231,7 +229,7 @@ identifier). This creates a set of macros in pnglibconf.h, so this is transparent to applications; their function calls get transformed by the macros to use the modified names. -XII. Configuring for compiler xxx: +X. Configuring for compiler xxx: All includes for libpng are in pngconf.h. If you need to add, change or delete an include, this is the place to do it. @@ -243,7 +241,7 @@ As of libpng-1.5.0, pngpriv.h also includes three other private header files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material that previously appeared in the public headers. -XIII. Removing unwanted object code +XI. Removing unwanted object code There are a bunch of #define's in pngconf.h that control what parts of libpng are compiled. All the defines end in _SUPPORTED. If you are @@ -282,7 +280,7 @@ library to fail if they call functions not available in your library. The size of the library itself should not be an issue, because only those sections that are actually used will be loaded into memory. -XIV. Enabling or disabling hardware optimizations +XII. Enabling or disabling hardware optimizations Certain hardware capabilities, such as the Intel SSE instructions, are normally detected at run time. Enable them with configure options @@ -332,7 +330,7 @@ or disable them all at once with cmake . -DPNG_HARDWARE_OPTIMIZATIONS=no -XV. Changes to the build and configuration of libpng in libpng-1.5.x +XIII. Changes to the build and configuration of libpng in libpng-1.5.x Details of internal changes to the library code can be found in the CHANGES file and in the GIT repository logs. These will be of no concern to the vast @@ -423,7 +421,7 @@ $PREFIX/include directory). Do not edit pnglibconf.h after you have built libpng, because than the settings would not accurately reflect the settings that were used to build libpng. -XVI. Setjmp/longjmp issues +XIV. Setjmp/longjmp issues Libpng uses setjmp()/longjmp() for error handling. Unfortunately setjmp() is known to be not thread-safe on some platforms and we don't know of @@ -441,7 +439,7 @@ This requires setjmp/longjmp, so you must either build the library with PNG_SETJMP_SUPPORTED defined, or with PNG_SIMPLIFIED_READ_SUPPORTED and PNG_SIMPLIFIED_WRITE_SUPPORTED undefined. -XVII. Common linking failures +XV. Common linking failures If your application fails to find libpng or zlib entries while linking: @@ -453,12 +451,13 @@ If your application fails to find libpng or zlib entries while linking: If you are using the vstudio project, observe the WARNING in project/vstudio/README.txt. -XVIII. Other sources of information about libpng: +XVI. Other sources of information about libpng: Further information can be found in the README and libpng-manual.txt files, in the individual makefiles, in png.h, and the manual pages libpng.3 and png.5. +Copyright (c) 2022 Cosmin Truta Copyright (c) 1998-2002,2006-2016 Glenn Randers-Pehrson This document is released under the libpng license. For conditions of distribution and use, see the disclaimer diff --git a/dll/3rdparty/libpng/docs/LICENSE b/dll/3rdparty/libpng/docs/LICENSE index e0c5b531cf5..c8ad24eecf7 100644 --- a/dll/3rdparty/libpng/docs/LICENSE +++ b/dll/3rdparty/libpng/docs/LICENSE @@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE PNG Reference Library License version 2 --------------------------------------- - * Copyright (c) 1995-2019 The PNG Reference Library Authors. - * Copyright (c) 2018-2019 Cosmin Truta. + * Copyright (c) 1995-2022 The PNG Reference Library Authors. + * Copyright (c) 2018-2022 Cosmin Truta. * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. * Copyright (c) 1996-1997 Andreas Dilger. * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. diff --git a/dll/3rdparty/libpng/docs/README b/dll/3rdparty/libpng/docs/README index cfc1f0e3dc9..e6e72aa5472 100644 --- a/dll/3rdparty/libpng/docs/README +++ b/dll/3rdparty/libpng/docs/README @@ -1,12 +1,12 @@ -README for libpng version 1.6.37 - April 14, 2019 -================================================= +README for libpng version 1.6.38 +================================ See the note about version numbers near the top of png.h. See INSTALL for instructions on how to install libpng. Libpng comes in several distribution formats. Get libpng-*.tar.gz or -libpng-*.tar.xz or if you want UNIX-style line endings in the text -files, or lpng*.7z or lpng*.zip if you want DOS-style line endings. +libpng-*.tar.xz if you want UNIX-style line endings in the text files, +or lpng*.7z or lpng*.zip if you want DOS-style line endings. Version 0.89 was the first official release of libpng. Don't let the fact that it's the first release fool you. The libpng library has been diff --git a/dll/3rdparty/libpng/docs/example.c b/dll/3rdparty/libpng/docs/example.c index 2e2afaafb66..b3038efb0d5 100644 --- a/dll/3rdparty/libpng/docs/example.c +++ b/dll/3rdparty/libpng/docs/example.c @@ -125,6 +125,7 @@ int main(int argc, const char **argv) png_image_free(&image); else free(buffer); + } } /* Something went wrong reading or writing the image. libpng stores a diff --git a/dll/3rdparty/libpng/docs/libpng-manual.txt b/dll/3rdparty/libpng/docs/libpng-manual.txt index 5dad92fbf74..19b1e0c3562 100644 --- a/dll/3rdparty/libpng/docs/libpng-manual.txt +++ b/dll/3rdparty/libpng/docs/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - Copyright (c) 2018-2019 Cosmin Truta + Copyright (c) 2018-2022 Cosmin Truta Copyright (c) 1998-2018 Glenn Randers-Pehrson This document is released under the libpng license. @@ -9,9 +9,9 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng version 1.6.36, December 2018, through 1.6.37 - April 2019 + libpng version 1.6.36, December 2018, through 1.6.38 - September 2022 Updated and distributed by Cosmin Truta - Copyright (c) 2018-2019 Cosmin Truta + Copyright (c) 2018-2022 Cosmin Truta libpng versions 0.97, January 1998, through 1.6.35 - July 2018 Updated and distributed by Glenn Randers-Pehrson @@ -1792,7 +1792,7 @@ the information. If, instead, you want to convert the image to an opaque version with no alpha channel use png_set_background; see below. As of libpng version 1.5.2, almost all useful expansions are supported, the -major ommissions are conversion of grayscale to indexed images (which can be +major omissions are conversion of grayscale to indexed images (which can be done trivially in the application) and conversion of indexed to grayscale (which can be done by a trivial manipulation of the palette.) diff --git a/dll/3rdparty/libpng/png.c b/dll/3rdparty/libpng/png.c index 757c755f97c..fc095642621 100644 --- a/dll/3rdparty/libpng/png.c +++ b/dll/3rdparty/libpng/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Copyright (c) 2018-2019 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_37 Your_png_h_is_not_version_1_6_37; +typedef png_libpng_version_1_6_38 Your_png_h_is_not_version_1_6_38; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -720,7 +720,7 @@ png_init_io(png_structrp png_ptr, png_FILE_p fp) * * Where UNSIGNED_MAX is the appropriate maximum unsigned value, so when the * negative integral value is added the result will be an unsigned value - * correspnding to the 2's complement representation. + * corresponding to the 2's complement representation. */ void PNGAPI png_save_int_32(png_bytep buf, png_int_32 i) @@ -815,8 +815,8 @@ png_get_copyright(png_const_structrp png_ptr) return PNG_STRING_COPYRIGHT #else return PNG_STRING_NEWLINE \ - "libpng version 1.6.37" PNG_STRING_NEWLINE \ - "Copyright (c) 2018-2019 Cosmin Truta" PNG_STRING_NEWLINE \ + "libpng version 1.6.38" PNG_STRING_NEWLINE \ + "Copyright (c) 2018-2022 Cosmin Truta" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ @@ -1843,12 +1843,12 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace, # ifdef PNG_WARNINGS_SUPPORTED else { - char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114*/ + char number[PNG_NUMBER_BUFFER_SIZE]; /* +24 = 114 */ pos = png_safecat(message, (sizeof message), pos, png_format_number(number, number+(sizeof number), PNG_NUMBER_FORMAT_x, value)); - pos = png_safecat(message, (sizeof message), pos, "h: "); /*+2 = 116*/ + pos = png_safecat(message, (sizeof message), pos, "h: "); /* +2 = 116 */ } # endif /* The 'reason' is an arbitrary message, allow +79 maximum 195 */ diff --git a/dll/3rdparty/libpng/pngget.c b/dll/3rdparty/libpng/pngget.c index 5abf1efd9f7..e44933c0d2c 100644 --- a/dll/3rdparty/libpng/pngget.c +++ b/dll/3rdparty/libpng/pngget.c @@ -1151,7 +1151,7 @@ png_get_unknown_chunks(png_const_structrp png_ptr, png_inforp info_ptr, #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED png_byte PNGAPI -png_get_rgb_to_gray_status (png_const_structrp png_ptr) +png_get_rgb_to_gray_status(png_const_structrp png_ptr) { return (png_byte)(png_ptr ? png_ptr->rgb_to_gray_status : 0); } @@ -1192,27 +1192,27 @@ png_get_compression_buffer_size(png_const_structrp png_ptr) /* These functions were added to libpng 1.2.6 and were enabled * by default in libpng-1.4.0 */ png_uint_32 PNGAPI -png_get_user_width_max (png_const_structrp png_ptr) +png_get_user_width_max(png_const_structrp png_ptr) { return (png_ptr ? png_ptr->user_width_max : 0); } png_uint_32 PNGAPI -png_get_user_height_max (png_const_structrp png_ptr) +png_get_user_height_max(png_const_structrp png_ptr) { return (png_ptr ? png_ptr->user_height_max : 0); } /* This function was added to libpng 1.4.0 */ png_uint_32 PNGAPI -png_get_chunk_cache_max (png_const_structrp png_ptr) +png_get_chunk_cache_max(png_const_structrp png_ptr) { return (png_ptr ? png_ptr->user_chunk_cache_max : 0); } /* This function was added to libpng 1.4.1 */ png_alloc_size_t PNGAPI -png_get_chunk_malloc_max (png_const_structrp png_ptr) +png_get_chunk_malloc_max(png_const_structrp png_ptr) { return (png_ptr ? png_ptr->user_chunk_malloc_max : 0); } @@ -1221,13 +1221,13 @@ png_get_chunk_malloc_max (png_const_structrp png_ptr) /* These functions were added to libpng 1.4.0 */ #ifdef PNG_IO_STATE_SUPPORTED png_uint_32 PNGAPI -png_get_io_state (png_const_structrp png_ptr) +png_get_io_state(png_const_structrp png_ptr) { return png_ptr->io_state; } png_uint_32 PNGAPI -png_get_io_chunk_type (png_const_structrp png_ptr) +png_get_io_chunk_type(png_const_structrp png_ptr) { return png_ptr->chunk_name; } diff --git a/dll/3rdparty/libpng/pngpriv.h b/dll/3rdparty/libpng/pngpriv.h index 583c26f9bde..2e426cf47d6 100644 --- a/dll/3rdparty/libpng/pngpriv.h +++ b/dll/3rdparty/libpng/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * Copyright (c) 2018-2019 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -174,7 +174,7 @@ # else /* !defined __ARM_NEON__ */ /* The 'intrinsics' code simply won't compile without this -mfpu=neon: */ -# if !defined(__aarch64__) +# if !defined(__aarch64__) && !defined(_M_ARM64) /* The assembler code currently does not work on ARM64 */ # define PNG_ARM_NEON_IMPLEMENTATION 2 # endif /* __aarch64__ */ @@ -185,6 +185,8 @@ /* Use the intrinsics code by default. */ # define PNG_ARM_NEON_IMPLEMENTATION 1 # endif +#else /* PNG_ARM_NEON_OPT == 0 */ +# define PNG_ARM_NEON_IMPLEMENTATION 0 #endif /* PNG_ARM_NEON_OPT > 0 */ #ifndef PNG_MIPS_MSA_OPT @@ -263,11 +265,15 @@ # ifndef PNG_MIPS_MSA_IMPLEMENTATION # define PNG_MIPS_MSA_IMPLEMENTATION 1 # endif +#else +# define PNG_MIPS_MSA_IMPLEMENTATION 0 #endif /* PNG_MIPS_MSA_OPT > 0 */ #if PNG_POWERPC_VSX_OPT > 0 # define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_vsx # define PNG_POWERPC_VSX_IMPLEMENTATION 1 +#else +# define PNG_POWERPC_VSX_IMPLEMENTATION 0 #endif @@ -492,16 +498,7 @@ static_cast<type>(static_cast<const void*>(value)) #else # define png_voidcast(type, value) (value) -# ifdef _WIN64 -# ifdef __GNUC__ - typedef unsigned long long png_ptruint; -# else - typedef unsigned __int64 png_ptruint; -# endif -# else - typedef unsigned long png_ptruint; -# endif -# define png_constcast(type, value) ((type)(png_ptruint)(const void*)(value)) +# define png_constcast(type, value) ((type)(void*)(const void*)(value)) # define png_aligncast(type, value) ((void*)(value)) # define png_aligncastconst(type, value) ((const void*)(value)) #endif /* __cplusplus */ @@ -543,9 +540,8 @@ # include <alloc.h> #endif -#if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \ - defined(_WIN32) || defined(__WIN32__) -# include <windows.h> /* defines _WINDOWS_ macro */ +#if defined(_WIN32) || defined(__WIN32__) || defined(__NT__) +# include <windows.h> #endif #endif /* PNG_VERSION_INFO_ONLY */ @@ -554,24 +550,20 @@ * functions that are passed far data must be model-independent. */ -/* Memory model/platform independent fns */ +/* Platform-independent functions */ #ifndef PNG_ABORT -# ifdef _WINDOWS_ -# define PNG_ABORT() ExitProcess(0) -# else -# define PNG_ABORT() abort() -# endif +# define PNG_ABORT() abort() #endif /* These macros may need to be architecture dependent. */ -#define PNG_ALIGN_NONE 0 /* do not use data alignment */ -#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */ +#define PNG_ALIGN_NONE 0 /* do not use data alignment */ +#define PNG_ALIGN_ALWAYS 1 /* assume unaligned accesses are OK */ #ifdef offsetof -# define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */ +# define PNG_ALIGN_OFFSET 2 /* use offsetof to determine alignment */ #else # define PNG_ALIGN_OFFSET -1 /* prevent the use of this */ #endif -#define PNG_ALIGN_SIZE 3 /* use sizeof to determine alignment */ +#define PNG_ALIGN_SIZE 3 /* use sizeof to determine alignment */ #ifndef PNG_ALIGN_TYPE /* Default to using aligned access optimizations and requiring alignment to a @@ -585,26 +577,25 @@ /* This is used because in some compiler implementations non-aligned * structure members are supported, so the offsetof approach below fails. * Set PNG_ALIGN_SIZE=0 for compiler combinations where unaligned access - * is good for performance. Do not do this unless you have tested the result - * and understand it. + * is good for performance. Do not do this unless you have tested the + * result and understand it. */ -# define png_alignof(type) (sizeof (type)) +# define png_alignof(type) (sizeof(type)) #else # if PNG_ALIGN_TYPE == PNG_ALIGN_OFFSET -# define png_alignof(type) offsetof(struct{char c; type t;}, t) +# define png_alignof(type) offsetof(struct{char c; type t;}, t) # else -# if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS -# define png_alignof(type) (1) -# endif - /* Else leave png_alignof undefined to prevent use thereof */ +# if PNG_ALIGN_TYPE == PNG_ALIGN_ALWAYS +# define png_alignof(type) 1 +# endif + /* Else leave png_alignof undefined to prevent use thereof */ # endif #endif -/* This implicitly assumes alignment is always to a power of 2. */ +/* This implicitly assumes alignment is always a multiple of 2. */ #ifdef png_alignof -# define png_isaligned(ptr, type)\ - (((type)((const char*)ptr-(const char*)0) & \ - (type)(png_alignof(type)-1)) == 0) +# define png_isaligned(ptr, type) \ + (((type)(size_t)((const void*)(ptr)) & (type)(png_alignof(type)-1)) == 0) #else # define png_isaligned(ptr, type) 0 #endif diff --git a/dll/3rdparty/libpng/pngread.c b/dll/3rdparty/libpng/pngread.c index 8fa7d9f1628..5ab92240382 100644 --- a/dll/3rdparty/libpng/pngread.c +++ b/dll/3rdparty/libpng/pngread.c @@ -3452,7 +3452,6 @@ png_image_read_background(png_voidp argument) for (pass = 0; pass < passes; ++pass) { - png_bytep row = png_voidcast(png_bytep, display->first_row); unsigned int startx, stepx, stepy; png_uint_32 y; @@ -3557,8 +3556,6 @@ png_image_read_background(png_voidp argument) inrow += 2; /* gray and alpha channel */ } - - row += display->row_bytes; } } } diff --git a/dll/3rdparty/libpng/pngrtran.c b/dll/3rdparty/libpng/pngrtran.c index 9a8fad9f4aa..238f5afe7e8 100644 --- a/dll/3rdparty/libpng/pngrtran.c +++ b/dll/3rdparty/libpng/pngrtran.c @@ -21,7 +21,7 @@ #ifdef PNG_ARM_NEON_IMPLEMENTATION # if PNG_ARM_NEON_IMPLEMENTATION == 1 # define PNG_ARM_NEON_INTRINSICS_AVAILABLE -# if defined(_MSC_VER) && defined(_M_ARM64) +# if defined(_MSC_VER) && !defined(__clang__) && defined(_M_ARM64) # include <arm64_neon.h> # else # include <arm_neon.h> diff --git a/dll/3rdparty/libpng/pngrutil.c b/dll/3rdparty/libpng/pngrutil.c index d5fa08c397d..ca060dd15f0 100644 --- a/dll/3rdparty/libpng/pngrutil.c +++ b/dll/3rdparty/libpng/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -301,7 +301,6 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn) if (buffer != NULL && new_size > png_ptr->read_buffer_size) { - png_ptr->read_buffer = NULL; png_ptr->read_buffer = NULL; png_ptr->read_buffer_size = 0; png_free(png_ptr, buffer); @@ -2076,21 +2075,22 @@ png_handle_eXIf(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_byte buf[1]; png_crc_read(png_ptr, buf, 1); info_ptr->eXIf_buf[i] = buf[0]; - if (i == 1 && buf[0] != 'M' && buf[0] != 'I' - && info_ptr->eXIf_buf[0] != buf[0]) + if (i == 1) { - png_crc_finish(png_ptr, length); - png_chunk_benign_error(png_ptr, "incorrect byte-order specifier"); - png_free(png_ptr, info_ptr->eXIf_buf); - info_ptr->eXIf_buf = NULL; - return; + if ((buf[0] != 'M' && buf[0] != 'I') || + (info_ptr->eXIf_buf[0] != buf[0])) + { + png_crc_finish(png_ptr, length - 2); + png_chunk_benign_error(png_ptr, "incorrect byte-order specifier"); + png_free(png_ptr, info_ptr->eXIf_buf); + info_ptr->eXIf_buf = NULL; + return; + } } } - if (png_crc_finish(png_ptr, 0) != 0) - return; - - png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf); + if (png_crc_finish(png_ptr, 0) == 0) + png_set_eXIf_1(png_ptr, info_ptr, length, info_ptr->eXIf_buf); png_free(png_ptr, info_ptr->eXIf_buf); info_ptr->eXIf_buf = NULL; @@ -2126,8 +2126,9 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) num = length / 2 ; - if (num != (unsigned int) png_ptr->num_palette || - num > (unsigned int) PNG_MAX_PALETTE_LENGTH) + if (length != num * 2 || + num != (unsigned int)png_ptr->num_palette || + num > (unsigned int)PNG_MAX_PALETTE_LENGTH) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "invalid"); @@ -4621,14 +4622,13 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) */ { png_bytep temp = png_ptr->big_row_buf + 32; - int extra = (int)((temp - (png_bytep)0) & 0x0f); + size_t extra = (size_t)temp & 0x0f; png_ptr->row_buf = temp - extra - 1/*filter byte*/; temp = png_ptr->big_prev_row + 32; - extra = (int)((temp - (png_bytep)0) & 0x0f); + extra = (size_t)temp & 0x0f; png_ptr->prev_row = temp - extra - 1/*filter byte*/; } - #else /* Use 31 bytes of padding before and 17 bytes after row_buf. */ png_ptr->row_buf = png_ptr->big_row_buf + 31; diff --git a/dll/3rdparty/libpng/pngset.c b/dll/3rdparty/libpng/pngset.c index ec75dbe3690..8c372cf4150 100644 --- a/dll/3rdparty/libpng/pngset.c +++ b/dll/3rdparty/libpng/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -1019,6 +1019,9 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr, info_ptr->trans_alpha = png_voidcast(png_bytep, png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH)); memcpy(info_ptr->trans_alpha, trans_alpha, (size_t)num_trans); + + info_ptr->valid |= PNG_INFO_tRNS; + info_ptr->free_me |= PNG_FREE_TRNS; } png_ptr->trans_alpha = info_ptr->trans_alpha; } @@ -1326,7 +1329,7 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr, #ifdef PNG_MNG_FEATURES_SUPPORTED png_uint_32 PNGAPI -png_permit_mng_features (png_structrp png_ptr, png_uint_32 mng_features) +png_permit_mng_features(png_structrp png_ptr, png_uint_32 mng_features) { png_debug(1, "in png_permit_mng_features"); @@ -1633,7 +1636,7 @@ png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask) #ifdef PNG_SET_USER_LIMITS_SUPPORTED /* This function was added to libpng 1.2.6 */ void PNGAPI -png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max, +png_set_user_limits(png_structrp png_ptr, png_uint_32 user_width_max, png_uint_32 user_height_max) { /* Images with dimensions larger than these limits will be @@ -1649,7 +1652,7 @@ png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max, /* This function was added to libpng 1.4.0 */ void PNGAPI -png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max) +png_set_chunk_cache_max(png_structrp png_ptr, png_uint_32 user_chunk_cache_max) { if (png_ptr != NULL) png_ptr->user_chunk_cache_max = user_chunk_cache_max; @@ -1657,7 +1660,7 @@ png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max) /* This function was added to libpng 1.4.1 */ void PNGAPI -png_set_chunk_malloc_max (png_structrp png_ptr, +png_set_chunk_malloc_max(png_structrp png_ptr, png_alloc_size_t user_chunk_malloc_max) { if (png_ptr != NULL) diff --git a/dll/3rdparty/libpng/pngstruct.h b/dll/3rdparty/libpng/pngstruct.h index 8bdc7ce46db..e591d94d587 100644 --- a/dll/3rdparty/libpng/pngstruct.h +++ b/dll/3rdparty/libpng/pngstruct.h @@ -1,7 +1,7 @@ /* pngstruct.h - header file for PNG reference library * - * Copyright (c) 2018-2019 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -334,18 +334,8 @@ struct png_struct_def size_t current_buffer_size; /* amount of data now in current_buffer */ int process_mode; /* what push library is currently doing */ int cur_palette; /* current push library palette index */ - #endif /* PROGRESSIVE_READ */ -#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__) -/* For the Borland special 64K segment handler */ - png_bytepp offset_table_ptr; - png_bytep offset_table; - png_uint_16 offset_table_number; - png_uint_16 offset_table_count; - png_uint_16 offset_table_count_free; -#endif - #ifdef PNG_READ_QUANTIZE_SUPPORTED png_bytep palette_lookup; /* lookup table for quantizing */ png_bytep quantize_index; /* index translation for palette files */ diff --git a/dll/3rdparty/libpng/pngwrite.c b/dll/3rdparty/libpng/pngwrite.c index 59377a4ddea..06c45d16ab4 100644 --- a/dll/3rdparty/libpng/pngwrite.c +++ b/dll/3rdparty/libpng/pngwrite.c @@ -1,7 +1,7 @@ /* pngwrite.c - general routines to write a PNG file * - * Copyright (c) 2018-2019 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -489,6 +489,16 @@ png_convert_from_time_t(png_timep ptime, time_t ttime) png_debug(1, "in png_convert_from_time_t"); tbuf = gmtime(&ttime); + if (tbuf == NULL) + { + /* TODO: add a safe function which takes a png_ptr argument and raises + * a png_error if the ttime argument is invalid and the call to gmtime + * fails as a consequence. + */ + memset(ptime, 0, sizeof(*ptime)); + return; + } + png_convert_from_struct_tm(ptime, tbuf); } #endif diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index e27e5758f1c..7c6357a4e86 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -33,7 +33,7 @@ URL: http://www.ijg.org/ Title: libpng Path: dll/3rdparty/libpng -Used Version: 1.6.37 +Used Version: 1.6.38 License: PNG Reference Library version 2 URL: http://libpng.sourceforge.net/ diff --git a/sdk/include/reactos/libs/libpng/png.h b/sdk/include/reactos/libs/libpng/png.h index 139eb0dc0f3..5fb494fb1aa 100644 --- a/sdk/include/reactos/libs/libpng/png.h +++ b/sdk/include/reactos/libs/libpng/png.h @@ -1,9 +1,9 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.37 - April 14, 2019 + * libpng version 1.6.38 - September 14, 2022 * - * Copyright (c) 2018-2019 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -15,7 +15,7 @@ * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger * libpng versions 0.97, January 1998, through 1.6.35, July 2018: * Glenn Randers-Pehrson - * libpng versions 1.6.36, December 2018, through 1.6.37, April 2019: + * libpng versions 1.6.36, December 2018, through 1.6.38, September 2022: * Cosmin Truta * See also "Contributing Authors", below. */ @@ -27,8 +27,8 @@ * PNG Reference Library License version 2 * --------------------------------------- * - * * Copyright (c) 1995-2019 The PNG Reference Library Authors. - * * Copyright (c) 2018-2019 Cosmin Truta. + * * Copyright (c) 1995-2022 The PNG Reference Library Authors. + * * Copyright (c) 2018-2022 Cosmin Truta. * * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. * * Copyright (c) 1996-1997 Andreas Dilger. * * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -239,7 +239,7 @@ * ... * 1.5.30 15 10530 15.so.15.30[.0] * ... - * 1.6.37 16 10637 16.so.16.37[.0] + * 1.6.38 16 10638 16.so.16.38[.0] * * Henceforth the source version will match the shared-library major and * minor numbers; the shared-library major version number will be used for @@ -278,8 +278,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.37" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.37 - April 14, 2019\n" +#define PNG_LIBPNG_VER_STRING "1.6.38" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.38 - September 14, 2022\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -287,7 +287,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 37 +#define PNG_LIBPNG_VER_RELEASE 38 /* This should be zero for a public release, or non-zero for a * development version. [Deprecated] @@ -318,7 +318,7 @@ * From version 1.0.1 it is: * XXYYZZ, where XX=major, YY=minor, ZZ=release */ -#define PNG_LIBPNG_VER 10637 /* 1.6.37 */ +#define PNG_LIBPNG_VER 10638 /* 1.6.38 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -428,7 +428,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_37; +typedef char* png_libpng_version_1_6_38; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -1446,7 +1446,7 @@ PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action, * mainly useful for testing, as the defaults should work with most users. * Those users who are tight on memory or want faster performance at the * expense of compression can modify them. See the compression library - * header file (zlib.h) for an explination of the compression functions. + * header file (zlib.h) for an explanation of the compression functions. */ /* Set the filtering method(s) used by libpng. Currently, the only valid @@ -1501,7 +1501,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, * 0 - 9, corresponding directly to the zlib compression levels 0 - 9 * (0 - no compression, 9 - "maximal" compression). Note that tests have * shown that zlib compression levels 3-6 usually perform as well as level 9 - * for PNG images, and do considerably fewer caclulations. In the future, + * for PNG images, and do considerably fewer calculations. In the future, * these values may not correspond directly to the zlib compression levels. */ #ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED diff --git a/sdk/include/reactos/libs/libpng/pngconf.h b/sdk/include/reactos/libs/libpng/pngconf.h index 927a769dbee..89d28f83a05 100644 --- a/sdk/include/reactos/libs/libpng/pngconf.h +++ b/sdk/include/reactos/libs/libpng/pngconf.h @@ -1,9 +1,9 @@ /* pngconf.h - machine-configurable file for libpng * - * libpng version 1.6.37 + * libpng version 1.6.38 * - * Copyright (c) 2018-2019 Cosmin Truta + * Copyright (c) 2018-2022 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson * Copyright (c) 1996-1997 Andreas Dilger * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. @@ -180,8 +180,8 @@ * compiler-specific macros to the values required to change the calling * conventions of the various functions. */ -#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\ - defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) +#if defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || \ + defined(__CYGWIN__) /* Windows system (DOS doesn't support DLLs). Includes builds under Cygwin or * MinGW on any architecture currently supported by Windows. Also includes * Watcom builds but these need special treatment because they are not diff --git a/sdk/include/reactos/libs/libpng/pnglibconf.h b/sdk/include/reactos/libs/libpng/pnglibconf.h index e1e27e957ea..89d5b4c8adc 100644 --- a/sdk/include/reactos/libs/libpng/pnglibconf.h +++ b/sdk/include/reactos/libs/libpng/pnglibconf.h @@ -1,8 +1,8 @@ /* pnglibconf.h - library build configuration */ -/* libpng version 1.6.37 */ +/* libpng version 1.6.38 */ -/* Copyright (c) 2018-2019 Cosmin Truta */ +/* Copyright (c) 2018-2022 Cosmin Truta */ /* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */

2 years

[reactos] 01/01: [NEWDEV][SHELL32][SYSSETUP] Improve browse driver folder dialog (#4293)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45c8e4dcd022fdec232a9… commit 45c8e4dcd022fdec232a9644d717bf466ac05f5c Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sun Nov 27 15:00:46 2022 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 27 18:00:46 2022 +0300 [NEWDEV][SHELL32][SYSSETUP] Improve browse driver folder dialog (#4293) [NEWDEV] Enable OK button in "Browse For Folder" only when driver is found Implement BrowseCallbackProc() function which sends BFFM_ENABLEOK message to the browse dialog whether the driver is found in the selected folder. Pass the search path to the browse dialog depending on the current index of the drop down combobox. If the index is not set, just get window text. Then, automatically expand the tree view to the specified path by sending BFFM_SETSELECTION message. Also fix a bug in SearchDriverRecursive() where a duplicate backslash was added to the PathWithPattern string variable. [SHELL32] Do not add Recycle Bin to the tree view items in FillTreeView() [SYSSETUP] Add source path to the "Installation Sources" multi-string key Each time the ProcessSetupInf() is being called, add the source path to the "Installation Sources" registry key, if it's not added there yet. The driver search path combobox will be then populated using its value. --- dll/win32/newdev/newdev.c | 10 +++- dll/win32/newdev/newdev_private.h | 5 ++ dll/win32/newdev/wizard.c | 54 ++++++++++++++++- dll/win32/shell32/wine/brsfolder.c | 8 +++ dll/win32/syssetup/wizard.c | 120 +++++++++++++++++++++++++++++++++++++ 5 files changed, 194 insertions(+), 3 deletions(-) diff --git a/dll/win32/newdev/newdev.c b/dll/win32/newdev/newdev.c index 960f75212d3..8eade90eb32 100644 --- a/dll/win32/newdev/newdev.c +++ b/dll/win32/newdev/newdev.c @@ -359,7 +359,7 @@ SearchDriverRecursive( wcscat(DirPath, L"\\"); wcscpy(PathWithPattern, DirPath); - wcscat(PathWithPattern, L"\\*"); + wcscat(PathWithPattern, L"*"); for (hFindFile = FindFirstFileW(PathWithPattern, &wfd); ok && hFindFile != INVALID_HANDLE_VALUE; @@ -408,6 +408,14 @@ SearchDriverRecursive( return retval; } +BOOL +CheckBestDriver( + _In_ PDEVINSTDATA DevInstData, + _In_ PCWSTR pszDir) +{ + return SearchDriverRecursive(DevInstData, pszDir); +} + BOOL ScanFoldersForDriver( IN PDEVINSTDATA DevInstData) diff --git a/dll/win32/newdev/newdev_private.h b/dll/win32/newdev/newdev_private.h index baf570c331c..213f0c2865a 100644 --- a/dll/win32/newdev/newdev_private.h +++ b/dll/win32/newdev/newdev_private.h @@ -61,6 +61,11 @@ BOOL InstallCurrentDriver( IN PDEVINSTDATA DevInstData); +BOOL +CheckBestDriver( + _In_ PDEVINSTDATA DevInstData, + _In_ PCWSTR pszDir); + /* wizard.c */ BOOL DisplayWizard( diff --git a/dll/win32/newdev/wizard.c b/dll/win32/newdev/wizard.c index 7cdd4df3960..3dd231a4013 100644 --- a/dll/win32/newdev/wizard.c +++ b/dll/win32/newdev/wizard.c @@ -579,6 +579,38 @@ AutoDriver(HWND Dlg, BOOL Enabled) IncludePath(Dlg, Enabled & IsDlgButtonChecked(Dlg, IDC_CHECK_PATH)); } +static INT CALLBACK +BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData) +{ + BOOL bValid = FALSE; + + switch (uMsg) + { + case BFFM_INITIALIZED: + { + PCWSTR pszPath = ((PDEVINSTDATA)lpData)->CustomSearchPath; + + bValid = CheckBestDriver((PDEVINSTDATA)lpData, pszPath); + SendMessageW(hwnd, BFFM_SETSELECTION, TRUE, (LPARAM)pszPath); + SendMessageW(hwnd, BFFM_ENABLEOK, 0, bValid); + break; + } + + case BFFM_SELCHANGED: + { + WCHAR szDir[MAX_PATH]; + + if (SHGetPathFromIDListW((LPITEMIDLIST)lParam, szDir)) + { + bValid = CheckBestDriver((PDEVINSTDATA)lpData, szDir); + } + PostMessageW(hwnd, BFFM_ENABLEOK, 0, bValid); + break; + } + } + return 0; +} + static INT_PTR CALLBACK CHSourceDlgProc( IN HWND hwndDlg, @@ -651,15 +683,33 @@ CHSourceDlgProc( case IDC_BROWSE: { - BROWSEINFO bi = { 0 }; + BROWSEINFOW bi = { 0 }; LPITEMIDLIST pidl; WCHAR Title[MAX_PATH]; + WCHAR CustomSearchPath[MAX_PATH] = { 0 }; + INT len, idx = (INT)SendDlgItemMessageW(hwndDlg, IDC_COMBO_PATH, CB_GETCURSEL, 0, 0); LoadStringW(hDllInstance, IDS_BROWSE_FOR_FOLDER_TITLE, Title, _countof(Title)); + if (idx == CB_ERR) + len = GetWindowTextLengthW(GetDlgItem(hwndDlg, IDC_COMBO_PATH)); + else + len = (INT)SendDlgItemMessageW(hwndDlg, IDC_COMBO_PATH, CB_GETLBTEXTLEN, idx, 0); + + if (len < _countof(CustomSearchPath)) + { + if (idx == CB_ERR) + GetWindowTextW(GetDlgItem(hwndDlg, IDC_COMBO_PATH), CustomSearchPath, _countof(CustomSearchPath)); + else + SendDlgItemMessageW(hwndDlg, IDC_COMBO_PATH, CB_GETLBTEXT, idx, (LPARAM)CustomSearchPath); + } + DevInstData->CustomSearchPath = CustomSearchPath; + bi.hwndOwner = hwndDlg; bi.ulFlags = BIF_USENEWUI | BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NONEWFOLDERBUTTON; bi.lpszTitle = Title; - pidl = SHBrowseForFolder(&bi); + bi.lpfn = BrowseCallbackProc; + bi.lParam = (LPARAM)DevInstData; + pidl = SHBrowseForFolderW(&bi); if (pidl) { WCHAR Directory[MAX_PATH]; diff --git a/dll/win32/shell32/wine/brsfolder.c b/dll/win32/shell32/wine/brsfolder.c index 17a0236b944..d454ecf0f53 100644 --- a/dll/win32/shell32/wine/brsfolder.c +++ b/dll/win32/shell32/wine/brsfolder.c @@ -464,9 +464,17 @@ static void FillTreeView( browse_info *info, IShellFolder * lpsf, IShellFolder_Release(pSFChild); } } +#ifdef __REACTOS__ + if (ulAttrs != (ulAttrs & SFGAO_FOLDER)) + { + if (!InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent)) + goto done; + } +#else if (!InsertTreeViewItem(info, lpsf, pidlTemp, pidl, pEnumIL, hParent)) goto done; +#endif SHFree(pidlTemp); /* Finally, free the pidl that the shell gave us... */ pidlTemp=NULL; } diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 75842349d3e..9afef48c4c5 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -20,6 +20,7 @@ #include <windowsx.h> #include <wincon.h> #include <shlobj.h> +#include <shlwapi.h> #include <tzlib.h> #include <strsafe.h> @@ -2880,6 +2881,123 @@ ProcessUnattendSection( } } +static BOOL +PathIsEqual( + IN LPCWSTR lpPath1, + IN LPCWSTR lpPath2) +{ + WCHAR szPath1[MAX_PATH]; + WCHAR szPath2[MAX_PATH]; + + /* If something goes wrong, better return TRUE, + * so the calling function returns early. + */ + if (!PathCanonicalizeW(szPath1, lpPath1)) + return TRUE; + + if (!PathAddBackslashW(szPath1)) + return TRUE; + + if (!PathCanonicalizeW(szPath2, lpPath2)) + return TRUE; + + if (!PathAddBackslashW(szPath2)) + return TRUE; + + return (_wcsicmp(szPath1, szPath2) == 0); +} + +static VOID +AddInstallationSource( + IN HKEY hKey, + IN LPWSTR lpPath) +{ + LONG res; + DWORD dwRegType; + DWORD dwPathLength = 0; + DWORD dwNewLength = 0; + LPWSTR Buffer = NULL; + LPWSTR Path; + + res = RegQueryValueExW( + hKey, + L"Installation Sources", + NULL, + &dwRegType, + NULL, + &dwPathLength); + + if (res != ERROR_SUCCESS || + dwRegType != REG_MULTI_SZ || + dwPathLength == 0 || + dwPathLength % sizeof(WCHAR) != 0) + { + dwPathLength = 0; + goto set; + } + + /* Reserve space for existing data + new string */ + dwNewLength = dwPathLength + (wcslen(lpPath) + 1) * sizeof(WCHAR); + Buffer = HeapAlloc(GetProcessHeap(), 0, dwNewLength); + if (!Buffer) + return; + + ZeroMemory(Buffer, dwNewLength); + + res = RegQueryValueExW( + hKey, + L"Installation Sources", + NULL, + NULL, + (LPBYTE)Buffer, + &dwPathLength); + + if (res != ERROR_SUCCESS) + { + HeapFree(GetProcessHeap(), 0, Buffer); + dwPathLength = 0; + goto set; + } + + /* Sanity check, these should already be zeros */ + Buffer[dwPathLength / sizeof(WCHAR) - 2] = UNICODE_NULL; + Buffer[dwPathLength / sizeof(WCHAR) - 1] = UNICODE_NULL; + + for (Path = Buffer; *Path; Path += wcslen(Path) + 1) + { + /* Check if path is already added */ + if (PathIsEqual(Path, lpPath)) + goto cleanup; + } + + Path = Buffer + dwPathLength / sizeof(WCHAR) - 1; + +set: + if (dwPathLength == 0) + { + dwNewLength = (wcslen(lpPath) + 1 + 1) * sizeof(WCHAR); + Buffer = HeapAlloc(GetProcessHeap(), 0, dwNewLength); + if (!Buffer) + return; + + Path = Buffer; + } + + StringCbCopyW(Path, dwNewLength - (Path - Buffer) * sizeof(WCHAR), lpPath); + Buffer[dwNewLength / sizeof(WCHAR) - 1] = UNICODE_NULL; + + RegSetValueExW( + hKey, + L"Installation Sources", + 0, + REG_MULTI_SZ, + (LPBYTE)Buffer, + dwNewLength); + +cleanup: + HeapFree(GetProcessHeap(), 0, Buffer); +} + VOID ProcessSetupInf( IN OUT PSETUPDATA pSetupData) @@ -2978,6 +3096,8 @@ ProcessSetupInf( NULL); if (res == ERROR_SUCCESS) { + AddInstallationSource(hKey, pSetupData->SourcePath); + res = RegSetValueExW(hKey, L"SourcePath", 0,

2 years

[reactos] 01/01: [NTGDI][FREETYPE] Follow-up of #4901 (57702ed)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=015cd2596c817deecd824… commit 015cd2596c817deecd82437792aabbe8ef7ac5b6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 27 12:42:25 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 27 12:42:25 2022 +0900 [NTGDI][FREETYPE] Follow-up of #4901 (57702ed) - Drop APIENTRYs for static functions. - Use FIELD_OFFSET instead of offsetof. - Delete unnecessary ASSERTs. - Add annotations. CORE-11848 --- win32ss/gdi/ntgdi/font.h | 6 +++--- win32ss/gdi/ntgdi/freetype.c | 32 ++++++++++++-------------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index ccf49c39603..e8526d8d91d 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -23,7 +23,7 @@ typedef struct _FONT_ENTRY_COLL_MEM FONT_ENTRY_MEM *Entry; } FONT_ENTRY_COLL_MEM, *PFONT_ENTRY_COLL_MEM; -#include <pshpack1.h> /* We don't like padding for these structures */ +#include <pshpack1.h> /* We don't like padding for these structures for hashing */ typedef struct _EMULATION_BOLD_ITALIC { @@ -59,8 +59,8 @@ typedef struct _FONT_CACHE_ENTRY #include <poppack.h> -C_ASSERT(offsetof(FONT_CACHE_ENTRY, GlyphIndex) % sizeof(DWORD) == 0); -C_ASSERT(sizeof(FONT_CACHE_ENTRY) % sizeof(DWORD) == 0); +C_ASSERT(FIELD_OFFSET(FONT_CACHE_ENTRY, GlyphIndex) % sizeof(DWORD) == 0); /* for hashing */ +C_ASSERT(sizeof(FONT_CACHE_ENTRY) % sizeof(DWORD) == 0); /* for hashing */ /* * FONTSUBST_... --- constants for font substitutes diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7c9ef1b09d2..7780ced82ae 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2059,7 +2059,7 @@ TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) * TRUE on success, FALSE on failure. * */ -static BOOLEAN APIENTRY +static BOOLEAN IntTranslateCharsetInfo(PDWORD Src, /* [in] if flags == TCI_SRCFONTSIG: pointer to fsCsb of a FONTSIGNATURE if flags == TCI_SRCCHARSET: a character set value @@ -3112,8 +3112,8 @@ ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs) return FALSE; } -static DWORD APIENTRY -IntGetHash(LPCVOID pv, DWORD cdw) +static DWORD +IntGetHash(IN LPCVOID pv, IN DWORD cdw) { DWORD dwHash = cdw; const DWORD *pdw = pv; @@ -3127,8 +3127,8 @@ IntGetHash(LPCVOID pv, DWORD cdw) return dwHash; } -FT_BitmapGlyph APIENTRY -ftGdiGlyphCacheGet(const FONT_CACHE_ENTRY *pCache) +static FT_BitmapGlyph +ftGdiGlyphCacheGet(IN const FONT_CACHE_ENTRY *pCache) { PLIST_ENTRY CurrentEntry; PFONT_CACHE_ENTRY FontEntry; @@ -3163,7 +3163,7 @@ ftGdiGlyphCacheGet(const FONT_CACHE_ENTRY *pCache) } /* no cache */ -FT_BitmapGlyph APIENTRY +static FT_BitmapGlyph ftGdiGlyphSet( FT_Face Face, FT_GlyphSlot GlyphSlot, @@ -3206,10 +3206,10 @@ ftGdiGlyphSet( return BitmapGlyph; } -FT_BitmapGlyph APIENTRY +static FT_BitmapGlyph ftGdiGlyphCacheSet( - PFONT_CACHE_ENTRY Cache, - FT_GlyphSlot GlyphSlot) + IN OUT PFONT_CACHE_ENTRY Cache, + IN FT_GlyphSlot GlyphSlot) { FT_Glyph GlyphCopy; INT error; @@ -4206,10 +4206,9 @@ ftGdiGetGlyphOutline( return needed; } -FT_BitmapGlyph -APIENTRY +static FT_BitmapGlyph ftGdiGetRealGlyph( - PFONT_CACHE_ENTRY Cache) + IN OUT PFONT_CACHE_ENTRY Cache) { INT error; FT_GlyphSlot glyph; @@ -4299,10 +4298,7 @@ TextIntGetTextExtentPoint(PDC dc, Cache.lfHeight = plf->lfHeight; Cache.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); - ASSERT(Cache.Aspect.Emu.Bold <= 1); - Cache.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); - ASSERT(Cache.Aspect.Emu.Italic <= 1); if (IntIsFontRenderingEnabled()) Cache.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); @@ -5865,8 +5861,7 @@ ScaleLong(LONG lValue, PFLOATOBJ pef) } /* Calculate width of the text. */ -BOOL -APIENTRY +static BOOL ftGdiGetTextWidth( LONGLONG *pTextWidth64, LPCWSTR String, @@ -6079,10 +6074,7 @@ IntExtTextOutW( Cache.lfHeight = plf->lfHeight; Cache.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); - ASSERT(Cache.Aspect.Emu.Bold <= 1); - Cache.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); - ASSERT(Cache.Aspect.Emu.Italic <= 1); if (IntIsFontRenderingEnabled()) Cache.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf);

2 years

[reactos] 01/01: [NTGDI][FREETYPE] Font cache: Use hash (#4901)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57702ed401b6736eeafed… commit 57702ed401b6736eeafedb5a5cf22536e74d531e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 27 11:26:44 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 27 11:26:44 2022 +0900 [NTGDI][FREETYPE] Font cache: Use hash (#4901) - Modify FONT_CACHE_ENTRY structure to use hash. - Use hash in ftGdiGlyphCacheGet and ftGdiGlyphCacheSet functions. - Reduce function call overheads by using FONT_CACHE_ENTRY, in getting glyph. CORE-11848 --- win32ss/gdi/ntgdi/font.h | 37 +++++-- win32ss/gdi/ntgdi/freetype.c | 227 ++++++++++++++++++++++--------------------- 2 files changed, 146 insertions(+), 118 deletions(-) diff --git a/win32ss/gdi/ntgdi/font.h b/win32ss/gdi/ntgdi/font.h index 2ed0f2d93be..ccf49c39603 100644 --- a/win32ss/gdi/ntgdi/font.h +++ b/win32ss/gdi/ntgdi/font.h @@ -23,19 +23,44 @@ typedef struct _FONT_ENTRY_COLL_MEM FONT_ENTRY_MEM *Entry; } FONT_ENTRY_COLL_MEM, *PFONT_ENTRY_COLL_MEM; +#include <pshpack1.h> /* We don't like padding for these structures */ + +typedef struct _EMULATION_BOLD_ITALIC +{ + BYTE Bold; + BYTE Italic; +} EMULATION_BOLD_ITALIC, *PEMULATION_BOLD_ITALIC; + +typedef struct _FONT_ASPECT +{ + _ANONYMOUS_UNION union { + EMULATION_BOLD_ITALIC Emu; + WORD EmuBoldItalic; + } DUMMYUNIONNAME; + WORD RenderMode; +} FONT_ASPECT, *PFONT_ASPECT; + typedef struct _FONT_CACHE_ENTRY { LIST_ENTRY ListEntry; - int GlyphIndex; - FT_Face Face; FT_BitmapGlyph BitmapGlyph; - int Height; - int Width; - int Escapement; - FT_Render_Mode RenderMode; + DWORD dwHash; + + /* The following members are hashed */ + INT GlyphIndex; + FT_Face Face; + LONG lfHeight; + _ANONYMOUS_UNION union { + FONT_ASPECT Aspect; + DWORD AspectValue; + } DUMMYUNIONNAME; FT_Matrix matTransform; } FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; +#include <poppack.h> + +C_ASSERT(offsetof(FONT_CACHE_ENTRY, GlyphIndex) % sizeof(DWORD) == 0); +C_ASSERT(sizeof(FONT_CACHE_ENTRY) % sizeof(DWORD) == 0); /* * FONTSUBST_... --- constants for font substitutes diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 553b1c8d1cb..7c9ef1b09d2 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -43,7 +43,7 @@ /* Is bold emulation necessary? */ #define EMUBOLD_NEEDED(original, request) \ - ((request) != FW_DONTCARE) && ((request) - (original) >= FW_BOLD - FW_MEDIUM) + (((request) != FW_DONTCARE) && ((request) - (original) >= FW_BOLD - FW_MEDIUM)) extern const MATRIX gmxWorldToDeviceDefault; extern const MATRIX gmxWorldToPageDefault; @@ -3112,16 +3112,27 @@ ftGdiGetRasterizerCaps(LPRASTERIZER_STATUS lprs) return FALSE; } +static DWORD APIENTRY +IntGetHash(LPCVOID pv, DWORD cdw) +{ + DWORD dwHash = cdw; + const DWORD *pdw = pv; + + while (cdw-- > 0) + { + dwHash *= 3; + dwHash ^= *pdw++; + } + + return dwHash; +} + FT_BitmapGlyph APIENTRY -ftGdiGlyphCacheGet( - FT_Face Face, - INT GlyphIndex, - INT Height, - FT_Render_Mode RenderMode, - const FT_Matrix *pmatTransform) +ftGdiGlyphCacheGet(const FONT_CACHE_ENTRY *pCache) { PLIST_ENTRY CurrentEntry; PFONT_CACHE_ENTRY FontEntry; + DWORD dwHash = pCache->dwHash; ASSERT_FREETYPE_LOCK_HELD(); @@ -3130,12 +3141,15 @@ ftGdiGlyphCacheGet( CurrentEntry = CurrentEntry->Flink) { FontEntry = CONTAINING_RECORD(CurrentEntry, FONT_CACHE_ENTRY, ListEntry); - if ((FontEntry->Face == Face) && - (FontEntry->GlyphIndex == GlyphIndex) && - (FontEntry->Height == Height) && - (FontEntry->RenderMode == RenderMode) && - (memcmp(&FontEntry->matTransform, pmatTransform, sizeof(*pmatTransform)) == 0)) + if (FontEntry->dwHash == dwHash && + FontEntry->GlyphIndex == pCache->GlyphIndex && + FontEntry->Face == pCache->Face && + FontEntry->lfHeight == pCache->lfHeight && + FontEntry->AspectValue == pCache->AspectValue && + memcmp(&FontEntry->matTransform, &pCache->matTransform, sizeof(FT_Matrix)) == 0) + { break; + } } if (CurrentEntry == &g_FontCacheListHead) @@ -3160,6 +3174,8 @@ ftGdiGlyphSet( FT_Bitmap AlignedBitmap; FT_BitmapGlyph BitmapGlyph; + ASSERT_FREETYPE_LOCK_HELD(); + error = FT_Get_Glyph(GlyphSlot, &Glyph); if (error) { @@ -3192,12 +3208,8 @@ ftGdiGlyphSet( FT_BitmapGlyph APIENTRY ftGdiGlyphCacheSet( - FT_Face Face, - INT GlyphIndex, - INT Height, - const FT_Matrix *pmatTransform, - FT_GlyphSlot GlyphSlot, - FT_Render_Mode RenderMode) + PFONT_CACHE_ENTRY Cache, + FT_GlyphSlot GlyphSlot) { FT_Glyph GlyphCopy; INT error; @@ -3214,7 +3226,7 @@ ftGdiGlyphCacheSet( return NULL; }; - error = FT_Glyph_To_Bitmap(&GlyphCopy, RenderMode, 0, 1); + error = FT_Glyph_To_Bitmap(&GlyphCopy, Cache->Aspect.RenderMode, 0, 1); if (error) { FT_Done_Glyph(GlyphCopy); @@ -3244,12 +3256,9 @@ ftGdiGlyphCacheSet( FT_Bitmap_Done(GlyphSlot->library, &BitmapGlyph->bitmap); BitmapGlyph->bitmap = AlignedBitmap; - NewEntry->GlyphIndex = GlyphIndex; - NewEntry->Face = Face; NewEntry->BitmapGlyph = BitmapGlyph; - NewEntry->Height = Height; - NewEntry->RenderMode = RenderMode; - NewEntry->matTransform = *pmatTransform; + RtlCopyMemory(&NewEntry->dwHash, &Cache->dwHash, + sizeof(FONT_CACHE_ENTRY) - offsetof(FONT_CACHE_ENTRY, dwHash)); InsertHeadList(&g_FontCacheListHead, &NewEntry->ListEntry); if (++g_FontCacheNumEntries > MAX_FONT_CACHE) @@ -4200,55 +4209,54 @@ ftGdiGetGlyphOutline( FT_BitmapGlyph APIENTRY ftGdiGetRealGlyph( - FT_Face face, - INT glyph_index, - LONG lfHeight, - FT_Render_Mode RenderMode, - const FT_Matrix *pmat, - BOOL EmuBold, - BOOL EmuItalic) + PFONT_CACHE_ENTRY Cache) { INT error; FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; + DWORD cdw; - if (EmuBold || EmuItalic) - { - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_NO_BITMAP); - } - else - { - realglyph = ftGdiGlyphCacheGet(face, glyph_index, lfHeight, - RenderMode, pmat); - if (realglyph) - return realglyph; - - error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); - } + ASSERT_FREETYPE_LOCK_HELD(); - if (error) + if (Cache->Aspect.EmuBoldItalic) { - DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", glyph_index); - return NULL; - } + error = FT_Load_Glyph(Cache->Face, Cache->GlyphIndex, FT_LOAD_NO_BITMAP); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", Cache->GlyphIndex); + return NULL; + } - glyph = face->glyph; - if (EmuBold || EmuItalic) - { - if (EmuBold) + glyph = Cache->Face->glyph; + + if (Cache->Aspect.Emu.Bold) FT_GlyphSlot_Embolden(glyph); - if (EmuItalic) + if (Cache->Aspect.Emu.Italic) FT_GlyphSlot_Oblique(glyph); - realglyph = ftGdiGlyphSet(face, glyph, RenderMode); + realglyph = ftGdiGlyphSet(Cache->Face, glyph, Cache->Aspect.RenderMode); } else { - realglyph = ftGdiGlyphCacheSet(face, glyph_index, lfHeight, - pmat, glyph, RenderMode); + cdw = (sizeof(FONT_CACHE_ENTRY) - offsetof(FONT_CACHE_ENTRY, GlyphIndex)) / sizeof(DWORD); + Cache->dwHash = IntGetHash(&Cache->GlyphIndex, cdw); + + realglyph = ftGdiGlyphCacheGet(Cache); + if (realglyph) + return realglyph; + + error = FT_Load_Glyph(Cache->Face, Cache->GlyphIndex, FT_LOAD_DEFAULT); + if (error) + { + DPRINT1("WARNING: Failed to load and render glyph! [index: %d]\n", Cache->GlyphIndex); + return NULL; + } + + glyph = Cache->Face->glyph; + realglyph = ftGdiGlyphCacheSet(Cache, glyph); } if (!realglyph) - DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); + DPRINT1("Failed to render glyph! [index: %d]\n", Cache->GlyphIndex); return realglyph; } @@ -4266,20 +4274,18 @@ TextIntGetTextExtentPoint(PDC dc, FLONG fl) { PFONTGDI FontGDI; - FT_Face face; FT_BitmapGlyph realglyph; INT glyph_index, i, previous; ULONGLONG TotalWidth64 = 0; - FT_Render_Mode RenderMode; - FT_Matrix mat; PMATRIX pmxWorldToDevice; LOGFONTW *plf; - BOOL use_kerning, EmuBold, EmuItalic; + BOOL use_kerning; LONG ascender, descender; + FONT_CACHE_ENTRY Cache; FontGDI = ObjToGDI(TextObj->Font, FONT); - face = FontGDI->SharedFace->Face; + Cache.Face = FontGDI->SharedFace->Face; if (NULL != Fit) { *Fit = 0; @@ -4290,28 +4296,33 @@ TextIntGetTextExtentPoint(PDC dc, TextIntUpdateSize(dc, TextObj, FontGDI, FALSE); plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - EmuBold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); - EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); + Cache.lfHeight = plf->lfHeight; + + Cache.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); + ASSERT(Cache.Aspect.Emu.Bold <= 1); + + Cache.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); + ASSERT(Cache.Aspect.Emu.Italic <= 1); if (IntIsFontRenderingEnabled()) - RenderMode = IntGetFontRenderMode(plf); + Cache.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); else - RenderMode = FT_RENDER_MODE_MONO; + Cache.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; /* Get the DC's world-to-device transformation matrix */ pmxWorldToDevice = DC_pmxWorldToDevice(dc); - FtMatrixFromMx(&mat, pmxWorldToDevice); - FT_Set_Transform(face, &mat, 0); + FtMatrixFromMx(&Cache.matTransform, pmxWorldToDevice); + FT_Set_Transform(Cache.Face, &Cache.matTransform, 0); - use_kerning = FT_HAS_KERNING(face); + use_kerning = FT_HAS_KERNING(Cache.Face); previous = 0; for (i = 0; i < Count; i++) { - glyph_index = get_glyph_index_flagged(face, *String, GTEF_INDICES, fl); + glyph_index = get_glyph_index_flagged(Cache.Face, *String, GTEF_INDICES, fl); + Cache.GlyphIndex = glyph_index; - realglyph = ftGdiGetRealGlyph(face, glyph_index, plf->lfHeight, RenderMode, - &mat, EmuBold, EmuItalic); + realglyph = ftGdiGetRealGlyph(&Cache); if (!realglyph) break; @@ -4319,7 +4330,7 @@ TextIntGetTextExtentPoint(PDC dc, if (use_kerning && previous && glyph_index) { FT_Vector delta; - FT_Get_Kerning(face, previous, glyph_index, 0, &delta); + FT_Get_Kerning(Cache.Face, previous, glyph_index, 0, &delta); TotalWidth64 += delta.x; } @@ -4335,7 +4346,7 @@ TextIntGetTextExtentPoint(PDC dc, } /* Bold and italic do not use the cache */ - if (EmuBold || EmuItalic) + if (Cache.Aspect.EmuBoldItalic) { FT_Done_Glyph((FT_Glyph)realglyph); } @@ -5860,17 +5871,13 @@ ftGdiGetTextWidth( LONGLONG *pTextWidth64, LPCWSTR String, INT Count, - FT_Face face, - LONG lfHeight, - UINT fuOptions, - FT_Render_Mode RenderMode, - const FT_Matrix *pmat, - BOOL EmuBold, - BOOL EmuItalic) + PFONT_CACHE_ENTRY Cache, + UINT fuOptions) { LONGLONG TextLeft64 = 0; INT glyph_index; FT_BitmapGlyph realglyph; + FT_Face face = Cache->Face; BOOL use_kerning = FT_HAS_KERNING(face); ULONG previous = 0; FT_Vector delta; @@ -5880,9 +5887,9 @@ ftGdiGetTextWidth( while (Count-- > 0) { glyph_index = get_glyph_index_flagged(face, *String, ETO_GLYPH_INDEX, fuOptions); + Cache->GlyphIndex = glyph_index; - realglyph = ftGdiGetRealGlyph(face, glyph_index, lfHeight, RenderMode, - pmat, EmuBold, EmuItalic); + realglyph = ftGdiGetRealGlyph(Cache); if (!realglyph) return FALSE; @@ -5895,7 +5902,7 @@ ftGdiGetTextWidth( TextLeft64 += realglyph->root.advance.x >> 10; - if (EmuBold || EmuItalic) + if (Cache->Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); previous = glyph_index; @@ -5941,16 +5948,15 @@ IntExtTextOutW( PFONTGDI FontGDI; PTEXTOBJ TextObj; EXLATEOBJ exloRGB2Dst, exloDst2RGB; - FT_Render_Mode RenderMode; - FT_Matrix mat; POINT Start; USHORT DxShift; PMATRIX pmxWorldToDevice; - LONG lfHeight, fixAscender, fixDescender; + LONG fixAscender, fixDescender; FLOATOBJ Scale; LOGFONTW *plf; - BOOL use_kerning, EmuBold, EmuItalic, bResult, DoBreak; + BOOL use_kerning, bResult, DoBreak; FT_Vector delta; + FONT_CACHE_ENTRY Cache; /* Check if String is valid */ if (Count > 0xFFFF || (Count > 0 && String == NULL)) @@ -6067,17 +6073,21 @@ IntExtTextOutW( ASSERT(FontGDI); IntLockFreeType(); - face = FontGDI->SharedFace->Face; + Cache.Face = face = FontGDI->SharedFace->Face; plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; - lfHeight = plf->lfHeight; - EmuBold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); - EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); + Cache.lfHeight = plf->lfHeight; + + Cache.Aspect.Emu.Bold = EMUBOLD_NEEDED(FontGDI->OriginalWeight, plf->lfWeight); + ASSERT(Cache.Aspect.Emu.Bold <= 1); + + Cache.Aspect.Emu.Italic = (plf->lfItalic && !FontGDI->OriginalItalic); + ASSERT(Cache.Aspect.Emu.Italic <= 1); if (IntIsFontRenderingEnabled()) - RenderMode = IntGetFontRenderMode(plf); + Cache.Aspect.RenderMode = (BYTE)IntGetFontRenderMode(plf); else - RenderMode = FT_RENDER_MODE_MONO; + Cache.Aspect.RenderMode = (BYTE)FT_RENDER_MODE_MONO; if (!TextIntUpdateSize(dc, TextObj, FontGDI, FALSE)) { @@ -6090,8 +6100,8 @@ IntExtTextOutW( if (pdcattr->iGraphicsMode == GM_ADVANCED) { pmxWorldToDevice = DC_pmxWorldToDevice(dc); - FtMatrixFromMx(&mat, pmxWorldToDevice); - FT_Set_Transform(face, &mat, 0); + FtMatrixFromMx(&Cache.matTransform, pmxWorldToDevice); + FT_Set_Transform(face, &Cache.matTransform, 0); fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6; fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6; @@ -6099,8 +6109,8 @@ IntExtTextOutW( else { pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; - FtMatrixFromMx(&mat, pmxWorldToDevice); - FT_Set_Transform(face, &mat, 0); + FtMatrixFromMx(&Cache.matTransform, pmxWorldToDevice); + FT_Set_Transform(face, &Cache.matTransform, 0); fixAscender = FontGDI->tmAscent << 6; fixDescender = FontGDI->tmDescent << 6; @@ -6123,14 +6133,7 @@ IntExtTextOutW( /* Calculate the text width if necessary */ if ((fuOptions & ETO_OPAQUE) || (pdcattr->flTextAlign & (TA_CENTER | TA_RIGHT))) { - if (!ftGdiGetTextWidth(&TextWidth64, - String, Count, - face, - lfHeight, - fuOptions, - RenderMode, - &mat, - EmuBold, EmuItalic)) + if (!ftGdiGetTextWidth(&TextWidth64, String, Count, &Cache, fuOptions)) { IntUnLockFreeType(); bResult = FALSE; @@ -6200,9 +6203,9 @@ IntExtTextOutW( for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, *String++, ETO_GLYPH_INDEX, fuOptions); + Cache.GlyphIndex = glyph_index; - realglyph = ftGdiGetRealGlyph(face, glyph_index, lfHeight, RenderMode, - &mat, EmuBold, EmuItalic); + realglyph = ftGdiGetRealGlyph(&Cache); if (!realglyph) { bResult = FALSE; @@ -6246,7 +6249,7 @@ IntExtTextOutW( { DPRINT1("WARNING: EngCreateBitmap() failed!\n"); bResult = FALSE; - if (EmuBold || EmuItalic) + if (Cache.Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); break; } @@ -6257,7 +6260,7 @@ IntExtTextOutW( EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); bResult = FALSE; - if (EmuBold || EmuItalic) + if (Cache.Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); break; } @@ -6308,7 +6311,7 @@ IntExtTextOutW( if (DoBreak) { - if (EmuBold || EmuItalic) + if (Cache.Aspect.EmuBoldItalic) FT_Done_Glyph((FT_Glyph)realglyph); break; } @@ -6338,7 +6341,7 @@ IntExtTextOutW( previous = glyph_index; - if (EmuBold || EmuItalic) + if (Cache.Aspect.EmuBoldItalic) { FT_Done_Glyph((FT_Glyph)realglyph); }

2 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2022