Skip to content
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.

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

Fix Windows StringFileInfo structure #76001

Merged
merged 1 commit into from
Apr 13, 2023
Merged

Conversation

pkowal1982
Copy link
Contributor

Windows editor/template have wrong StringFileInfo structure (part of resources section) which you can check by looking at properties of exe file.
Depending on the tool used to parse resources in exe file you'll see wrong values or lack of some values at all.
Master built version decompiled with Ubuntu shows info like this:

BLOCK "StringFileInfo"
{
  BLOCK "040904b0"
  {
    VALUE "CompanyName",       "Godot Engine"
    VALUE "FileDescription",   "Godot Engine"
    VALUE "FileVersion",       ".1"                   <- this is wrong
    VALUE "ProductName",       "Godot Engine"
    VALUE "Licence",           "MIT"
    VALUE "LegalCopyright",    "Copyright (c) 2007-2023 Juan Linietsky, Ariel Manzur and contributors"
    VALUE "Info",              "https://godotengine.org"
    VALUE "ProductVersion4.1.dev.custom_build"        <- this is also wrong
  }
}

Fixed branch results in:

BLOCK "StringFileInfo"
{
  BLOCK "040904b0"
  {
    VALUE "CompanyName",       "Godot Engine"
    VALUE "FileDescription",   "Godot Engine (Console)"
    VALUE "FileVersion",       "4.1"
    VALUE "ProductName",       "Godot Engine (Console)"
    VALUE "Licence",           "MIT"
    VALUE "LegalCopyright",    "Copyright (c) 2007-2023 Juan Linietsky, Ariel Manzur and contributors"
    VALUE "Info",              "https://godotengine.org"
    VALUE "ProductVersion",    "4.1.dev.custom_build"
  }
}

Copy link
Member

@bruvzg bruvzg left a comment

Choose a reason for hiding this comment

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

Seems like "" were added to satisfy some old version of clang-format - 2a0ddc1, so removing it should not have any adverse effects.

@akien-mga akien-mga added this to the 4.1 milestone Apr 13, 2023
@akien-mga akien-mga added cherrypick:4.0 cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release labels Apr 13, 2023
@akien-mga akien-mga merged commit 1a90031 into godotengine:master Apr 13, 2023
@akien-mga
Copy link
Member

Thanks!

@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.3.

@akien-mga
Copy link
Member

Cherry-picked for 3.6.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Aug 28, 2023
@akien-mga
Copy link
Member

Cherry-picked for 3.5.3.

@akien-mga akien-mga removed the cherrypick:3.5 Considered for cherry-picking into a future 3.5.x release label Aug 28, 2023
@akien-mga akien-mga changed the title Fix Windows StringFileInfo structure Fix Windows StringFileInfo structure Jan 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants