fix: shape wire classes inherit Record (not WithBounds) + bitmap + naming - #5
Merged
Merged
Conversation
Per MS-EMF 2.3.5, EMR_RECTANGLE/ELLIPSE/ROUNDRECT carry only rclBox (+ szlCorner for RoundRect). They do NOT carry rclBounds. The earlier class declarations wrongly inherited from WithBounds, causing bindata to expect 16 extra bytes per record — when the source bytes ran out the parser fell through to Raw, hiding ~3500 records from emfsvg. Also: - StretchDIBits: full MS-EMF 2.3.1.7 layout (offBmiSrc, cbBmiSrc, offBitsSrc, cbBitsSrc, iUsageSrc, dwRop, cxDest, cyDest) instead of stubbed rest body. Enables bitmap rendering in emfsvg. - PolyTextOutA/W: class name fix (PolyTextout -> PolyTextOut) to match autoload. - ColorMatchToTargetW: class name fix to match autoload. Round-trip verified: 208/208 byte-identical.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Companion to emfsvg PR #3.
Three distinct fixes:
Rectangle/Ellipse/RoundRect base class fix. These records carry
only rclBox per MS-EMF 2.3.5, NOT rclBounds. Wrong inheritance from
WithBounds caused bindata to expect 16 extra bytes; records fell
through to Raw. ~3500 records affected across the corpus.
StretchDIBits full layout. Declares offBmiSrc/cbBmiSrc/offBitsSrc/
cbBitsSrc/iUsageSrc/dwRop/cxDest/cyDest. Enables emfsvg to decode
embedded DIBs.
Class-name / autoload consistency. PolyTextOutA/W and
ColorMatchToTargetW — class definitions in their files now match
the autoload symbols.
Round-trip verified: 208/208 byte-identical.