chore: bump dsanders11/project-actions from 1.7.0 to 2.0.0 (#183)

Bumps [dsanders11/project-actions](https://github.com/dsanders11/project-actions) from 1.7.0 to 2.0.0.
- [Release notes](https://github.com/dsanders11/project-actions/releases)
- [Commits](https://github.com/dsanders11/project-actions/compare/2134fe7cc71c58b7ae259c82a8e63c6058255678...5767984408ccc6742f83acc8b8d8ea5e09f329af)

---
updated-dependencies:
- dependency-name: dsanders11/project-actions
  dependency-version: 2.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @electron/wg-ecosystem

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/add-to-project.yml

@@ -0,0 +1,29 @@
+name: Add to Ecosystem WG Project
+
+on:
+  issues:
+    types:
+      - opened
+  pull_request_target:
+    types:
+      - opened
+
+permissions: {}
+
+jobs:
+  add-to-project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate GitHub App token
+        uses: electron/github-app-auth-action@e14e47722ed120360649d0789e25b9baece12725 # v2.0.0
+        id: generate-token
+        with:
+          creds: ${{ secrets.ECOSYSTEM_ISSUE_TRIAGE_GH_APP_CREDS }}
+          org: electron
+      - name: Add to Project
+        uses: dsanders11/project-actions/add-item@5767984408ccc6742f83acc8b8d8ea5e09f329af # v2.0.0
+        with:
+          field: Opened
+          field-value: ${{ github.event.pull_request.created_at || github.event.issue.created_at }}
+          project-number: 89
+          token: ${{ steps.generate-token.outputs.token }}

.github/workflows/ci.yml

@@ -0,0 +1,84 @@
+name: Continuous Integration
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build
+    runs-on: windows-2022
+    steps:
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      with:
+        fetch-depth: 1
+    - name: Build
+      run: |
+        cmake -E make_directory build/x64
+        cmake -E make_directory build/Win32
+        cd build/x64
+        cmake -A x64 ../../
+        cmake --build . --config RelWithDebInfo
+        cd ../../build/Win32
+        cmake -A Win32 ../../
+        cmake --build . --config RelWithDebInfo
+    - name: Copy to dist
+      run: |
+        cmake -E make_directory dist
+        cmake -E copy build/x64/RelWithDebInfo/rcedit.exe dist/rcedit-x64.exe 
+        cmake -E copy build/Win32/RelWithDebInfo/rcedit.exe dist/rcedit-x86.exe 
+    - name: Print help
+      shell: bash
+      run: |
+        set -eo pipefail
+        dist/rcedit-x86.exe -h
+        dist/rcedit-x64.exe -h
+    - name: Upload artifacts
+      uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+      with:
+        name: dist
+        path: dist/
+
+  release:
+    name: Release
+    runs-on: windows-2022
+    needs: build
+    if: github.ref == 'refs/heads/main'
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        id: checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        with:
+          name: dist
+          path: dist/
+      - run: npm install -g semantic-release@22.0.6 semantic-release-export-data@v1.0.1
+      - run: npx semantic-release@22.0.6 --dry-run
+        id: get-next-version
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Stamp version
+        if: steps.get-next-version.outputs.new-release-published == 'true'
+        shell: bash
+        run: |
+          set -eo pipefail
+          dist/rcedit-x64.exe dist/rcedit-x86.exe --set-product-version $VERSION --set-file-version $VERSION
+          dist/rcedit-x86.exe -h | grep -q "Rcedit v$VERSION"
+          dist/rcedit-x86.exe dist/rcedit-x64.exe --set-product-version $VERSION --set-file-version $VERSION
+          dist/rcedit-x64.exe -h | grep -q "Rcedit v$VERSION"
+        env:
+          VERSION: ${{ steps.get-next-version.outputs.new-release-version }}
+      - name: Run semantic release
+        run: npx semantic-release@22.0.6
+        if: steps.get-next-version.outputs.new-release-published == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/semantic.yml

@@ -0,0 +1,26 @@
+name: "Check Semantic Commit"
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+permissions:
+  contents: read
+
+jobs:
+  main:
+    permissions:
+      pull-requests: read  # for amannn/action-semantic-pull-request to analyze PRs
+      statuses: write  # for amannn/action-semantic-pull-request to mark status of analyzed PR
+    name: Validate PR Title
+    runs-on: ubuntu-latest
+    steps:
+      - name: semantic-pull-request
+        uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          validateSingleCommit: false

.gitignore

@@ -1,11 +1,11 @@
 Default/
 ipch/
+build/
 
 *.swp
 *.sdf
+*.opensdf
 *.suo
 *.vcxproj.user
-*.sln
-*.vcxproj
-*.vcxproj.filters
-*.opensdf
+*.VC.db
+*.VC.VC.opendb

.releaserc.json

@@ -0,0 +1,18 @@
+{
+  "plugins": [
+    "semantic-release-export-data",
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          { "path": "dist/rcedit-x64.exe" },
+          { "path": "dist/rcedit-x86.exe" }
+        ],
+        "draftRelease": true
+      }
+    ]
+  ],
+  "branches": [ "main" ]
+}

CMakeLists.txt

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.15)
+
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
+
+# /Ox, full optimization
+# /Os, favour small code
+add_compile_options(/Ox /Os)
+
+project(rcedit)
+
+add_executable(rcedit src/main.cc src/rescle.cc src/rcedit.rc)
+target_link_libraries(rcedit version.lib)

README.md

@@ -1,20 +1,39 @@
 # rcedit
 
-Command line tool to edit resources of exe file on Windows
+[![Continuous Integration](https://github.com/electron/rcedit/actions/workflows/ci.yml/badge.svg)](https://github.com/electron/rcedit/actions/workflows/ci.yml)
+
+Command line tool to edit resources of exe file on Windows.
+
+## Executables
+
+Prebuilt binaries can be found in the [GitHub releases](https://github.com/electron/rcedit/releases).
 
 ## Building
-  * Clone the repository
-  * Run `gyp rcedit.gyp --depth .`
-  * Build rcedit.sln with Visual Studio
+
+To build you need CMake 3.15+ and Visual Studio 2015 or above.
+
+1. Clone the repository
+2. Create a build directory: `cmake -E make_directory build`
+3. Change to the build directory: `cd build`
+4. Make the CMake project: `cmake ..`
+5. Build: `cmake --build . --config RelWithDebInfo`
 
 ## Docs
 
+Show help:
+
+```bash
+$ rcedit -h
+```
+
 Set version string:
 
 ```bash
 $ rcedit "path-to-exe-or-dll" --set-version-string "Comments" "This is an exe"
 ```
 
+Use this option to change any supported properties, as described in the MSDN documentation [here](https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx)
+
 Set file version:
 
 ```bash
@@ -33,8 +52,40 @@ Set icon:
 $ rcedit "path-to-exe-or-dll" --set-icon "path-to-ico"
 ```
 
+Set resource string:
+
+```bash
+$ rcedit "path-to-exe-or-dll" --set-resource-string id_number "new string value"
+```
+
+Set [requested execution level](https://msdn.microsoft.com/en-us/library/6ad1fshk.aspx#Anchor_9) (`asInvoker` | `highestAvailable` | `requireAdministrator`) in the manifest:
+
+```bash
+$ rcedit "path-to-exe-or-dll" --set-requested-execution-level "requireAdministrator"
+```
+
+Set [application manifest](https://msdn.microsoft.com/en-us/library/windows/desktop/aa374191.aspx):
+
+```bash
+$ rcedit "path-to-exe-or-dll" --application-manifest ./path/to/manifest/file
+```
+
 And you can change multiple things in one command:
 
 ```bash
 $ rcedit "path-to-exe-or-dll" --set-icon "path-to-ico" --set-file-version "10.7"
 ```
+
+Get version string:
+
+```bash
+$ rcedit "path-to-exe-or-dll" --get-version-string "property"
+```
+
+Use the same properties as `--set-version-string`. Use `"FileVersion"` to get the results of `--set-file-version` and `"ProductVersion"` to get the results of `--get-product-version`.
+
+Get resource string:
+
+```bash
+$ rcedit "path-to-exe-or-dll" --get-resource-string id_number
+```

rcedit.gyp

@@ -1,70 +0,0 @@
-{
-  'variables': {
-    'conditions': [
-      ['OS=="win" and (MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e")', {
-        'msvs_express': 1,
-        'windows_driver_kit_path%': 'C:/WinDDK/7600.16385.1',
-      },{
-        'msvs_express': 0,
-      }],
-    ],
-  },
-  'targets': [
-    {
-      'target_name': 'rcedit',
-      'type': 'executable',
-      'sources': [
-        'src/main.cc',
-        'src/rescle.cc',
-        'src/rescle.h',
-        'src/rcedit.rc',
-      ],
-      'msvs_settings': {
-        'VCLinkerTool': {
-          'SubSystem': 1, # console executable
-        },
-        'VCCLCompilerTool': {
-          'Optimization': 3, # /Ox, full optimization
-          'FavorSizeOrSpeed': 1, # /Os, favour small code
-        },
-      },
-      'conditions': [
-        # Using Visual Studio Express.
-        ['msvs_express==1', {
-          'defines!': [
-            '_SECURE_ATL',
-          ],
-          'msvs_settings': {
-            'VCLibrarianTool': {
-              'AdditionalLibraryDirectories': [
-                '<(windows_driver_kit_path)/lib/ATL/i386',
-              ],
-            },
-            'VCLinkerTool': {
-              'AdditionalLibraryDirectories': [
-                '<(windows_driver_kit_path)/lib/ATL/i386',
-              ],
-              'AdditionalDependencies': [
-                'atlthunk.lib',
-              ],
-              'AdditionalOptions': [
-                # ATL 8.0 included in WDK 7.1 makes the linker to generate following
-                # warnings:
-                #   - warning LNK4254: section 'ATL' (50000040) merged into
-                #     '.rdata' (40000040) with different attributes
-                #   - warning LNK4078: multiple 'ATL' sections found with
-                #     different attributes
-                '/ignore:4254',
-                '/ignore:4078',
-              ],
-            },
-          },
-          'msvs_system_include_dirs': [
-            '<(windows_driver_kit_path)/inc/atl71',
-            '<(windows_driver_kit_path)/inc/mfc42',
-          ],
-        }],  # msvs_express==1
-      ],
-    },
-  ],
-}

src/main.cc

@@ -3,33 +3,104 @@
 // LICENSE file.
 
 #include <string.h>
-#include <stdlib.h>
+#include <vector>
+
+#include <windows.h>
+#include <winver.h>
 
 #include "rescle.h"
 
+namespace {
+
+std::vector<uint8_t> get_file_version_info() {
+  DWORD zero = 0;
+  std::vector<wchar_t> filename(MAX_PATH);
+  SetLastError(ERROR_SUCCESS);
+
+  do {
+    GetModuleFileNameW(NULL, filename.data(), filename.size());
+
+    // Double the buffer size in case the path is longer
+    filename.resize(filename.size() * 2);
+  } while (GetLastError() == ERROR_INSUFFICIENT_BUFFER);
+
+  if (GetLastError() != ERROR_SUCCESS) {
+    return std::vector<uint8_t>();
+  }
+
+  DWORD file_ver_info_size = GetFileVersionInfoSizeW(filename.data(), &zero);
+  if (file_ver_info_size == 0) {
+    return std::vector<uint8_t>();
+  }
+
+  std::vector<uint8_t> file_ver_info(file_ver_info_size);
+  if (!GetFileVersionInfoW(filename.data(), NULL, file_ver_info.size(), file_ver_info.data())) {
+    return std::vector<uint8_t>();
+  }
+
+  return file_ver_info;
+}
+
+void print_help(VS_FIXEDFILEINFO* file_info) {
+  fprintf(stdout,
+"Rcedit v%d.%d.%d: Edit resources of exe.\n\n"
+"Usage: rcedit <filename> [options...]\n\n"
+"Options:\n"
+"  -h, --help                                 Show this message\n"
+"  --set-version-string <key> <value>         Set version string\n"
+"  --get-version-string <key>                 Print version string\n"
+"  --set-file-version <version>               Set FileVersion\n"
+"  --set-product-version <version>            Set ProductVersion\n"
+"  --set-icon <path-to-icon>                  Set file icon\n"
+"  --set-requested-execution-level <level>    Pass nothing to see usage\n"
+"  --application-manifest <path-to-file>      Set manifest file\n"
+"  --set-resource-string <key> <value>        Set resource string\n"
+"  --get-resource-string <key>                Get resource string\n"
+"  --set-rcdata <key> <path-to-file>          Replace RCDATA by integer id\n",
+(file_info->dwProductVersionMS >> 16) & 0xff,
+(file_info->dwProductVersionMS >>  0) & 0xff,
+(file_info->dwProductVersionLS >> 16) & 0xff);
+}
+
 bool print_error(const char* message) {
   fprintf(stderr, "Fatal error: %s\n", message);
   return 1;
 }
 
-bool parse_version_string(const wchar_t* str, int *v1, int *v2, int *v3, int *v4) {
-  *v1 = *v2 = *v3 = *v4 = 0;
-  if (swscanf_s(str, L"%d.%d.%d.%d", v1, v2, v3, v4) == 4)
-    return true;
-  if (swscanf_s(str, L"%d.%d.%d", v1, v2, v3) == 3)
-    return true;
-  if (swscanf_s(str, L"%d.%d", v1, v2) == 2)
-    return true;
-  if (swscanf_s(str, L"%d", v1) == 1)
-    return true;
-
-  return false;
+bool print_warning(const char* message) {
+  fprintf(stderr, "Warning: %s\n", message);
+  return 1;
 }
 
+bool parse_version_string(const wchar_t* str, unsigned short *v1, unsigned short *v2, unsigned short *v3, unsigned short *v4) {
+  *v1 = *v2 = *v3 = *v4 = 0;
+  return (swscanf_s(str, L"%hu.%hu.%hu.%hu", v1, v2, v3, v4) == 4) ||
+         (swscanf_s(str, L"%hu.%hu.%hu", v1, v2, v3) == 3) ||
+         (swscanf_s(str, L"%hu.%hu", v1, v2) == 2) ||
+         (swscanf_s(str, L"%hu", v1) == 1);
+}
+
+}  // namespace
+
 int wmain(int argc, const wchar_t* argv[]) {
   bool loaded = false;
   rescle::ResourceUpdater updater;
 
+  if (argc == 1 ||
+      (argc == 2 && wcscmp(argv[1], L"-h") == 0) ||
+      (argc == 2 && wcscmp(argv[1], L"--help") == 0)) {
+    UINT ignored = 0;
+    VS_FIXEDFILEINFO* file_info = nullptr;
+    std::vector<uint8_t> file_version_info = get_file_version_info();
+
+    if (file_version_info.size() == 0 || !VerQueryValueW(file_version_info.data(), L"\\", (LPVOID*) &file_info, &ignored)) {
+      return print_error("Could not determine version of rcedit");
+    }
+
+    print_help(file_info);
+    return 0;
+  }
+
   for (int i = 1; i < argc; ++i) {
     if (wcscmp(argv[i], L"--set-version-string") == 0 ||
         wcscmp(argv[i], L"-svs") == 0) {
@@ -41,14 +112,26 @@ int wmain(int argc, const wchar_t* argv[]) {
       if (!updater.SetVersionString(key, value))
         return print_error("Unable to change version string");
 
+    } else if (wcscmp(argv[i], L"--get-version-string") == 0 ||
+               wcscmp(argv[i], L"-gvs") == 0) {
+      if (argc - i < 2)
+        return print_error("--get-version-string requires 'Key'");
+      const wchar_t* key = argv[++i];
+      const wchar_t* result = updater.GetVersionString(key);
+      if (!result)
+        return print_error("Unable to get version string");
+
+      fwprintf(stdout, L"%s", result);
+      return 0;  // no changes made
+
     } else if (wcscmp(argv[i], L"--set-file-version") == 0 ||
                wcscmp(argv[i], L"-sfv") == 0) {
       if (argc - i < 2)
         return print_error("--set-file-version requires a version string");
 
-      int v1, v2, v3, v4;
+      unsigned short v1, v2, v3, v4;
       if (!parse_version_string(argv[++i], &v1, &v2, &v3, &v4))
-        return print_error("Unable to parse version string");
+        return print_error("Unable to parse version string for FileVersion");
 
       if (!updater.SetFileVersion(v1, v2, v3, v4))
         return print_error("Unable to change file version");
@@ -61,12 +144,12 @@ int wmain(int argc, const wchar_t* argv[]) {
       if (argc - i < 2)
         return print_error("--set-product-version requires a version string");
 
-      int v1, v2, v3, v4;
+      unsigned short v1, v2, v3, v4;
       if (!parse_version_string(argv[++i], &v1, &v2, &v3, &v4))
-        return print_error("Unable to parse version string");
+        return print_error("Unable to parse version string for ProductVersion");
 
       if (!updater.SetProductVersion(v1, v2, v3, v4))
-        return print_error("Unable to change file version");
+        return print_error("Unable to change product version");
 
       if (!updater.SetVersionString(L"ProductVersion", argv[i]))
         return print_error("Unable to change ProductVersion string");
@@ -79,13 +162,82 @@ int wmain(int argc, const wchar_t* argv[]) {
       if (!updater.SetIcon(argv[++i]))
         return print_error("Unable to set icon");
 
+    } else if (wcscmp(argv[i], L"--set-requested-execution-level") == 0 ||
+      wcscmp(argv[i], L"-srel") == 0) {
+      if (argc - i < 2)
+        return print_error("--set-requested-execution-level requires asInvoker, highestAvailable or requireAdministrator");
+
+      if (updater.IsApplicationManifestSet())
+        print_warning("--set-requested-execution-level is ignored if --application-manifest is set");
+
+      if (!updater.SetExecutionLevel(argv[++i]))
+        return print_error("Unable to set execution level");
+
+    } else if (wcscmp(argv[i], L"--application-manifest") == 0 ||
+      wcscmp(argv[i], L"-am") == 0) {
+      if (argc - i < 2)
+        return print_error("--application-manifest requires local path");
+
+      if (updater.IsExecutionLevelSet())
+        print_warning("--set-requested-execution-level is ignored if --application-manifest is set");
+
+      if (!updater.SetApplicationManifest(argv[++i]))
+        return print_error("Unable to set application manifest");
+
+    } else if (wcscmp(argv[i], L"--set-resource-string") == 0 ||
+      wcscmp(argv[i], L"--srs") == 0) {
+      if (argc - i < 3)
+        return print_error("--set-resource-string requires int 'Key' and string 'Value'");
+
+      const wchar_t* key = argv[++i];
+      unsigned int key_id = 0;
+      if (swscanf_s(key, L"%d", &key_id) != 1)
+        return print_error("Unable to parse id");
+
+      const wchar_t* value = argv[++i];
+      if (!updater.ChangeString(key_id, value))
+        return print_error("Unable to change string");
+
+    } else if (wcscmp(argv[i], L"--set-rcdata") == 0) {
+      if (argc - i < 3)
+        return print_error("--set-rcdata requires int 'Key' and path to resource 'Value'");
+
+      const wchar_t* key = argv[++i];
+      unsigned int key_id = 0;
+      if (swscanf_s(key, L"%d", &key_id) != 1)
+        return print_error("Unable to parse id");
+
+      const wchar_t* pathToResource = argv[++i];
+      if (!updater.ChangeRcData(key_id, pathToResource))
+        return print_error("Unable to change RCDATA");
+    } else if (wcscmp(argv[i], L"--get-resource-string") == 0 ||
+      wcscmp(argv[i], L"-grs") == 0) {
+      if (argc - i < 2)
+        return print_error("--get-resource-string requires int 'Key'");
+
+      const wchar_t* key = argv[++i];
+      unsigned int key_id = 0;
+      if (swscanf_s(key, L"%d", &key_id) != 1)
+        return print_error("Unable to parse id");
+
+      const wchar_t* result = updater.GetString(key_id);
+      if (!result)
+        return print_error("Unable to get resource string");
+
+      fwprintf(stdout, L"%s", result);
+      return 0;  // no changes made
+
     } else {
-      if (loaded)
-        return print_error("Unexpected trailing arguments");
+      if (loaded) {
+        fprintf(stderr, "Unrecognized argument: \"%ls\"\n", argv[i]);
+        return 1;
+      }
 
       loaded = true;
-      if (!updater.Load(argv[i]))
-        return print_error("Unable to load file");
+      if (!updater.Load(argv[i])) {
+        fprintf(stderr, "Unable to load file: \"%ls\"\n", argv[i]);
+        return 1;
+      }
 
     }
   }

src/rescle.h

@@ -8,11 +8,20 @@
 #ifndef VERSION_INFO_UPDATER
 #define VERSION_INFO_UPDATER
 
+#ifndef _UNICODE
+#define _UNICODE
+#endif
+
+#ifndef UNICODE
+#define UNICODE
+#endif
+
 #include <string>
 #include <vector>
 #include <map>
 
 #include <windows.h>
+#include <memory> // unique_ptr
 
 #define RU_VS_COMMENTS          L"Comments"
 #define RU_VS_COMPANY_NAME      L"CompanyName"
@@ -20,7 +29,7 @@
 #define RU_VS_FILE_VERSION      L"FileVersion"
 #define RU_VS_INTERNAL_NAME     L"InternalName"
 #define RU_VS_LEGAL_COPYRIGHT   L"LegalCopyright"
-#define RU_VS_LEGALLRADEMARKS   L"LegalTrademarks"
+#define RU_VS_LEGAL_TRADEMARKS  L"LegalTrademarks"
 #define RU_VS_ORIGINAL_FILENAME L"OriginalFilename"
 #define RU_VS_PRIVATE_BUILD     L"PrivateBuild"
 #define RU_VS_PRODUCT_NAME      L"ProductName"
@@ -29,19 +38,7 @@
 
 namespace rescle {
 
-class VersionStampValue {
- public:
-  unsigned short wOffset;
-  unsigned short wLength;
-  unsigned short wKeyLength;
-  unsigned short wType;
-  std::wstring szKey;
-  std::vector<char> Data;
-  unsigned short GetLength(const bool& rounding = true) const;
-};
-
-class IconsValue {
- public:
+struct IconsValue {
   typedef struct _ICONENTRY {
     BYTE width;
     BYTE height;
@@ -65,66 +62,122 @@ class IconsValue {
   std::vector<BYTE> grpHeader;
 };
 
+struct Translate {
+  LANGID wLanguage;
+  WORD wCodePage;
+};
+
+typedef std::pair<std::wstring, std::wstring> VersionString;
+typedef std::pair<const BYTE* const, const size_t> OffsetLengthPair;
+
+struct VersionStringTable {
+  Translate encoding;
+  std::vector<VersionString> strings;
+};
+
+class VersionInfo {
+ public:
+  VersionInfo();
+  VersionInfo(HMODULE hModule, WORD languageId);
+
+  std::vector<BYTE> Serialize() const;
+
+  bool HasFixedFileInfo() const;
+  VS_FIXEDFILEINFO& GetFixedFileInfo();
+  const VS_FIXEDFILEINFO& GetFixedFileInfo() const;
+  void SetFixedFileInfo(const VS_FIXEDFILEINFO& value);
+
+  std::vector<VersionStringTable> stringTables;
+  std::vector<Translate> supportedTranslations;
+
+ private:
+  VS_FIXEDFILEINFO fixedFileInfo_;
+
+  void FillDefaultData();
+  void DeserializeVersionInfo(const BYTE* pData, size_t size);
+
+  VersionStringTable DeserializeVersionStringTable(const BYTE* tableData);
+  void DeserializeVersionStringFileInfo(const BYTE* offset, size_t length, std::vector<VersionStringTable>& stringTables);
+  void DeserializeVarFileInfo(const unsigned char* offset, std::vector<Translate>& translations);
+  OffsetLengthPair GetChildrenData(const BYTE* entryData);
+};
+
 class ResourceUpdater {
  public:
   typedef std::vector<std::wstring> StringValues;
-  typedef std::map<UINT,StringValues> StringTable;
-  typedef std::map<WORD,StringTable> StringTableMap;
+  typedef std::map<UINT, StringValues> StringTable;
+  typedef std::map<WORD, StringTable> StringTableMap;
+  typedef std::map<LANGID, VersionInfo> VersionStampMap;
+  typedef std::map<UINT, std::unique_ptr<IconsValue>> IconTable;
+  typedef std::vector<BYTE> RcDataValue;
+  typedef std::map<ptrdiff_t, RcDataValue> RcDataMap;
+  typedef std::map<LANGID, RcDataMap> RcDataLangMap;
 
-  typedef std::vector<VersionStampValue> VersionStampValues;
-  typedef std::map<UINT,VersionStampValues> VersionStampTable;
-  typedef std::map<WORD,VersionStampTable> VersionStampMap;
+  struct IconResInfo {
+    UINT maxIconId = 0;
+    IconTable iconBundles;
+  };
+
+  typedef std::map<LANGID, IconResInfo> IconTableMap;
 
   ResourceUpdater();
   ~ResourceUpdater();
 
   bool Load(const WCHAR* filename);
-  bool Load(const char* filename);
-  bool SetVersionString(const WORD& languageId, const WCHAR* name, const WCHAR* value);
+  bool SetVersionString(WORD languageId, const WCHAR* name, const WCHAR* value);
   bool SetVersionString(const WCHAR* name, const WCHAR* value);
-  bool SetProductVersion(const WORD& languageId, const UINT& id, const unsigned char& v1, const unsigned char& v2, const unsigned char& v3, const unsigned char& v4);
-  bool SetProductVersion(const unsigned char& v1, const unsigned char& v2, const unsigned char& v3, const unsigned char& v4);
-  bool SetFileVersion(const WORD& languageId, const UINT& id, const unsigned char& v1, const unsigned char& v2, const unsigned char& v3, const unsigned char& v4);
-  bool SetFileVersion(const unsigned char& v1, const unsigned char& v2, const unsigned char& v3, const unsigned char& v4);
-  bool ChangeString(const WORD& languageId, const UINT& id, const WCHAR* value);
-  bool ChangeString(const UINT& id, const WCHAR* value);
+  const WCHAR* GetVersionString(WORD languageId, const WCHAR* name);
+  const WCHAR* GetVersionString(const WCHAR* name);
+  bool SetProductVersion(WORD languageId, UINT id, unsigned short v1, unsigned short v2, unsigned short v3, unsigned short v4);
+  bool SetProductVersion(unsigned short v1, unsigned short v2, unsigned short v3, unsigned short v4);
+  bool SetFileVersion(WORD languageId, UINT id, unsigned short v1, unsigned short v2, unsigned short v3, unsigned short v4);
+  bool SetFileVersion(unsigned short v1, unsigned short v2, unsigned short v3, unsigned short v4);
+  bool ChangeString(WORD languageId, UINT id, const WCHAR* value);
+  bool ChangeString(UINT id, const WCHAR* value);
+  bool ChangeRcData(UINT id, const WCHAR* pathToResource);
+  const WCHAR* GetString(WORD languageId, UINT id);
+  const WCHAR* GetString(UINT id);
+  bool SetIcon(const WCHAR* path, const LANGID& langId, UINT iconBundle);
+  bool SetIcon(const WCHAR* path, const LANGID& langId);
   bool SetIcon(const WCHAR* path);
+  bool SetExecutionLevel(const WCHAR* value);
+  bool IsExecutionLevelSet();
+  bool SetApplicationManifest(const WCHAR* value);
+  bool IsApplicationManifestSet();
   bool Commit();
 
-  static bool UpdateRaw(const char* filename, const WORD& languageId, const char* type, const UINT& id, const void* data, const size_t& dataSize, const bool& deleteOld);
-  static bool GetResourcePointer(const HMODULE& hModule, const WORD& languageId, const int& id, const char* type, void*& data, size_t& dataSize);
+ private:
+  bool SerializeStringTable(const StringValues& values, UINT blockId, std::vector<char>* out);
 
-private:
-  bool Deserialize(const void* data, const size_t& dataSize, VersionStampValues& values);
-  bool SerializeVersionInfo(VersionStampValues& values, std::vector<char>& out);
-  bool SerializeStringTable(const StringValues& values, const UINT& blockId, std::vector<char>& out);
+  static BOOL CALLBACK OnEnumResourceName(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam);
+  static BOOL CALLBACK OnEnumResourceManifest(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam);
+  static BOOL CALLBACK OnEnumResourceLanguage(HANDLE hModule, LPCWSTR lpszType, LPCWSTR lpszName, WORD wIDLanguage, LONG_PTR lParam);
 
-  // not thread-safe
-  static BOOL CALLBACK OnEnumResourceName(HMODULE hModule, LPCTSTR lpszType, LPTSTR lpszName, LONG_PTR lParam);
-
-  // not thread-safe
-  static BOOL CALLBACK OnEnumResourceLanguage(HANDLE hModule, LPCTSTR lpszType, LPCTSTR lpszName, WORD wIDLanguage, LONG_PTR lParam);
-
-  HMODULE hModule;
-  std::string filename;
-  VersionStampMap versionStampMap;
-  StringTableMap stringTableMap;
-  IconsValue icon;
+  HMODULE module_;
+  std::wstring filename_;
+  std::wstring executionLevel_;
+  std::wstring originalExecutionLevel_;
+  std::wstring applicationManifestPath_;
+  std::wstring manifestString_;
+  VersionStampMap versionStampMap_;
+  StringTableMap stringTableMap_;
+  IconTableMap iconBundleMap_;
+  RcDataLangMap rcDataLngMap_;
 };
 
-class ScopedResoueceUpdater {
+class ScopedResourceUpdater {
  public:
-  ScopedResoueceUpdater(const char* filename, const bool& deleteOld);
-  ~ScopedResoueceUpdater();
+  ScopedResourceUpdater(const WCHAR* filename, bool deleteOld);
+  ~ScopedResourceUpdater();
 
   HANDLE Get() const;
   bool Commit();
 
  private:
-  bool EndUpdate(const bool& doesCommit);
+  bool EndUpdate(bool doesCommit);
 
-  HANDLE handle;
-  bool commited;
+  HANDLE handle_;
+  bool commited_ = false;
 };
 
 }  // namespace rescle