-
Notifications
You must be signed in to change notification settings - Fork 5
Embed installer .jar within exe's resources #15
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
Draft
modmuss50
wants to merge
6
commits into
FabricMC:main
Choose a base branch
from
modmuss50:embed-in-resources
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d1cd1ad
Embed installer in .exe's resources
modmuss50 81779ec
Fix line endings?
modmuss50 088af5c
More ending fixes
modmuss50 8ee8142
Update src/Bootstrap.cpp
modmuss50 b3bfa2d
Update src/main.cpp
modmuss50 7b86a5d
Update packager/packager.cpp
modmuss50 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| * text=auto eol=lf | ||
| *.bat text eol=crlf |
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /* | ||
|
|
||
| !.gitignore | ||
| !*.cpp | ||
| !*.h | ||
| !*.sln | ||
| !*.vcxproj | ||
| !*.filters | ||
| !packages.config |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| #include <print> | ||
| #include <filesystem> | ||
| #include <fstream> | ||
| #include <wil/resource.h> | ||
| #include <Windows.h> | ||
|
|
||
| namespace { | ||
| constexpr auto IDI_EMBEDDED_JAR = 201; | ||
|
|
||
| std::vector<char> readFile(const std::filesystem::path& path) { | ||
| wil::unique_hfile file{ | ||
| ::CreateFileW( | ||
| path.c_str(), | ||
| GENERIC_READ, | ||
| FILE_SHARE_READ, | ||
| nullptr, | ||
| OPEN_EXISTING, | ||
| FILE_ATTRIBUTE_NORMAL, | ||
| nullptr | ||
| ) | ||
| }; | ||
| THROW_LAST_ERROR_IF_MSG(!file, "CreateFileW"); | ||
|
|
||
| LARGE_INTEGER fileSize{}; | ||
| THROW_LAST_ERROR_IF(::GetFileSizeEx(file.get(), &fileSize) == 0); | ||
| THROW_WIN32_IF(ERROR_FILE_TOO_LARGE, fileSize.QuadPart > SIZE_MAX); | ||
|
|
||
| std::vector<char> buffer(static_cast<size_t>(fileSize.QuadPart)); | ||
| DWORD bytesRead = 0; | ||
| THROW_LAST_ERROR_IF(!::ReadFile(file.get(), buffer.data(), static_cast<DWORD>(buffer.size()), &bytesRead, nullptr)); | ||
| THROW_WIN32_IF(ERROR_HANDLE_EOF, bytesRead != buffer.size()); | ||
|
|
||
| return buffer; | ||
| } | ||
|
|
||
| void updateResource(const std::filesystem::path& exe, const std::vector<char>& data, WORD resourceId) { | ||
| HANDLE handle = THROW_LAST_ERROR_IF_NULL(::BeginUpdateResourceW(exe.c_str(), false)); | ||
|
|
||
| bool success = false; | ||
| auto _ = wil::scope_exit([&]() noexcept { ::EndUpdateResourceW(handle, !success); }); | ||
|
|
||
| auto intResource{ MAKEINTRESOURCE(resourceId) }; | ||
| THROW_LAST_ERROR_IF(!::UpdateResourceW(handle, RT_RCDATA, intResource, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), (LPVOID)data.data(), static_cast<DWORD>(data.size()))); | ||
|
|
||
| success = true; | ||
| } | ||
|
|
||
| void packageInstaller(const std::filesystem::path& bootstrap, std::filesystem::path& installer) { | ||
modmuss50 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| THROW_WIN32_IF_MSG(ERROR_FILE_NOT_FOUND, !std::filesystem::exists(bootstrap), "Boostrap not found"); | ||
| THROW_WIN32_IF_MSG(ERROR_FILE_NOT_FOUND, !std::filesystem::exists(installer), "Installer not found"); | ||
|
|
||
| auto installerBytes = readFile(installer); | ||
| updateResource(bootstrap, installerBytes, IDI_EMBEDDED_JAR); | ||
|
|
||
| std::print("Done, {} updated to embed {}\n", bootstrap.string(), installer.string()); | ||
| } | ||
| } | ||
|
|
||
| int wmain(int argc, wchar_t* argv[]) | ||
| { | ||
| if (argc != 3) { | ||
| std::print("Usage: packager <bootstrap_exe> <embedded_installer>\n"); | ||
| return 1; | ||
| } | ||
|
|
||
| std::filesystem::path bootstrap{ argv[1] }; | ||
| std::filesystem::path installer{ argv[2] }; | ||
|
|
||
| std::print("Packager: {} Installer: {}\n", bootstrap.string(), installer.string()); | ||
|
|
||
| try { | ||
| packageInstaller(bootstrap, installer); | ||
| } | ||
| catch (const std::exception& error) { | ||
| std::print("Packager failed: {}\n", error.what()); | ||
| throw; | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The resource ID constant IDI_EMBEDDED_JAR is duplicated. It should be defined in the shared resource.h file and included here to avoid magic numbers and maintain consistency.