Skip to content

unify(win32device): Move Win32Device to Core - #3046

Merged
xezon merged 2 commits into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/win32device
Aug 3, 2026
Merged

unify(win32device): Move Win32Device to Core#3046
xezon merged 2 commits into
TheSuperHackers:mainfrom
Jaredl-Dev:unify/win32device

Conversation

@Jaredl-Dev

Copy link
Copy Markdown

This moves the remaining shared Win32Device files into Core:

  • Win32GameEngine.h
  • Win32GameEngine.cpp
  • Win32OSDisplay.cpp

Generals and Zero Hour differ only by product-name comments, a documentation typo, and an Alt-Tab audio refresh.

Generals gets:

  • Alt-Tab audio recovery that reapplies active Miles audio volumes after returning from a minimized window.

Verification

  • Verified all three Core files exactly match the Zero Hour source.
  • Win32 Release build succeeds.
  • VC6 Release build succeeds.

@Skyaero42 Skyaero42 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

If there are difference between the files (except for the header line), there needs to be a merge before a move.

  • Use one commit to merge the files.
  • Use a second commit to move the files.

This allows us the clearly review which code snippets are merged an how.

Alternatively:

  • Create a PR to merge the files
  • Create a PR to move the files.

Look at some of the other merge/move PR's how its done

@Jaredl-Dev

Copy link
Copy Markdown
Author

If there are difference between the files (except for the header line), there needs to be a merge before a move.

  • Use one commit to merge the files.
  • Use a second commit to move the files.

This allows us the clearly review which code snippets are merged an how.

Alternatively:

  • Create a PR to merge the files
  • Create a PR to move the files.

Look at some of the other merge/move PR's how its done

I have updated this PR.

@xezon
xezon requested a review from Skyaero42 August 2, 2026 20:11

@xezon xezon left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Looks correct. Pull id's are missing in commit titles.

@Jaredl-Dev

Jaredl-Dev commented Aug 2, 2026

Copy link
Copy Markdown
Author

Both commit titles now include (#3046).

@Skyaero42 Skyaero42 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Agreed

@xezon xezon added Gen Relates to Generals ZH Relates to Zero Hour Unify Unifies code between Generals and Zero Hour labels Aug 3, 2026
@xezon
xezon merged commit c090d28 into TheSuperHackers:main Aug 3, 2026
16 checks passed
@Jaredl-Dev
Jaredl-Dev deleted the unify/win32device branch August 3, 2026 20:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Gen Relates to Generals Unify Unifies code between Generals and Zero Hour ZH Relates to Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants