Merge changes requires to get 3DMM building on VC++2.1 ontop of WIndows 11#3
Open
NCommander wants to merge 7 commits into
Open
Merge changes requires to get 3DMM building on VC++2.1 ontop of WIndows 11#3NCommander wants to merge 7 commits into
NCommander wants to merge 7 commits into
Conversation
Disable SETBLD target in makefiles, fix paths in UTEST.RC, and modify toplevel makefile to include a missing variable Signed-off-by: Michael Casadevall <michael@casadevall.pro>
Signed-off-by: Michael Casadevall <michael@casadevall.pro>
Signed-off-by: Michael Casadevall <michael@casadevall.pro>
Signed-off-by: Michael Casadevall <michael@casadevall.pro>
Signed-off-by: Michael Casadevall <michael@casadevall.pro>
Signed-off-by: Michael Casadevall <michael@casadevall.pro>
Signed-off-by: Michael Casadevall <michael@casadevall.pro>
foone
pushed a commit
that referenced
this pull request
May 30, 2022
🔨 Add target_chomp_sources to allow for generating chk files This is currently barely working, and there are clearly some issues with regards to the preprocessor. 😔 Fix TargetChompSources and clean up CHTs (#4) Fix target_chomp_sources and clean up CHTs This patches up some of the accidental misspells in the TargetChompSources CMake script and moves the IN_80386 and WIN preprocessor defines to COMPILE_DEFINITIONS, as the CHT files require it for some Mac / Windows differences. The CHT files have also been cleaned up, so they shouldn't report any preprocessor warnings anymore. Signed-off-by: bjrkk <cfxqpkjq@gmail.com> Signed-off-by: Izzy Muerte <63051+bruxisma@users.noreply.github.com> Co-authored-by: björk <61477479+bjrkk@users.noreply.github.com>
willbr
pushed a commit
to willbr/3dmm-research
that referenced
this pull request
May 2, 2026
ThumbnailDescriptor's union aliased (grfontMask, grfont) and (ctg, chid)
onto (tag.ctg, tag.cno) so font-browser and chid-browser code paths could
reuse the same storage as a plain TAG-pointing thumbnail. That alias was
load-bearing -- BrowserContentList::_FAddGokdToThd writes via
tag.{ctg,cno} and reads back via grfontMask/grfont, asserting they match.
The union assumed TAG was 16 bytes ([sid:4][pcrf:4][ctg:4][cno:4]). On
x64 TAG grew to 24 bytes (pcrf is an 8-byte pointer plus 4 bytes of
alignment padding before it), so the original 8-byte preamble of two long
fillers put grfontMask at offset 8 -- which on x64 is *inside* tag.pcrf.
The alias shifted off (ctg, cno) and writes through grfontMask corrupted
the pcrf pointer instead. Clicking the Scene Choices button (kidSettings-
Browser, hid 0x20042) repro'd as Run-Time Check Failure foone#3 -- variable
'thd' is being used without being initialized -- and downstream as
"Font style browser broken" assertion at browser.cpp:1682.
Pad the alternate union members with three additional longs on x64 so
grfontMask lands at offset 16 and grfont at offset 20, matching tag.ctg
and tag.cno. Add static_asserts using offsetof to guard against future
TAG layout drift.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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.
No description provided.