Skip to content

[WOWBOX64] Initialize memory before reading RC file #4285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
airidosas252 wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

[WOWBOX64] Initialize memory before reading RC file #4285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wine/wow64/wowbox64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,9 @@ NTSTATUS WINAPI BTCpuProcessInit(void)
#undef STATIC_ASSERT

LoadEnvVariables();
InitializeEnvFiles();
InitializeSystemInfo();

@ptitSeb ptitSeb Aug 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The issue with this ordering is that InitialiazeSystemInfo() might depends on some of the env. var. in InitializeEnvFiles() (for cpu cores counts & rdtsc options)

@airidosas252 airidosas252 Aug 25, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I just overthinked this too much...

The order of inits was correct, custommem init wasn't. I'll fix it up later.

init_custommem_helper(&box64_context);
InitializeEnvFiles();

if (!BOX64ENV(nobanner)) PrintBox64Version(1);
if (DetectHostCpuFeatures())
Expand All @@ -272,7 +273,6 @@ NTSTATUS WINAPI BTCpuProcessInit(void)
bopcode[0] = 0x2ecd;
unxcode[0] = 0x2ecd;

init_custommem_helper(&box64_context);
box64_context.db_sizes = rbtree_init("db_sizes");

if ((ULONG_PTR)bopcode >> 32 || (ULONG_PTR)unxcode >> 32) {
Expand Down
Loading