ocran 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5b96c7de7250942c3f67b874546b10ff2ef0cb193e91f96c7c9736369937277
-  data.tar.gz: ef03135551cce98a71c1eb546c0717ee82031e7a2b1eddf73bb63ba06017ed4e
+  metadata.gz: 23bee04c3290671dc55673fcb757a222e04af6977bd015a0791bab76ef492f1c
+  data.tar.gz: a4d437bda8e4bd00ea4a66c9c75c2aaa85b6904b8c7619e4f04a5e2b931688d5
 SHA512:
-  metadata.gz: ba4c9a62f6a0c0cbcf88b6b7307df3777872e8cfb9a9b4e40352d0b8941dae0cf79d518c8ba4deea1eee2226137ecdcaf7cd2c575e0737f56db9f8e68907ab44
-  data.tar.gz: a43d0bd6b7e17b2c8120182468ec9f594ec2707f2cef0a8e086c1c5e33646e3e76606d4b4d6a93725d0a0b1517f5a77c4b8f0391a6e2be6fc5bfb99507b20cec
+  metadata.gz: 0bd96938ab10206fe5009d93d9356034cbb9913159507b51f0df1fa4d46f428fbf7ae0c75ce1e8359079af70094ab8b68d64671064a59ec8bda313baf863dc79
+  data.tar.gz: 199615b364954980946418e4c850e9153cf2a2aabf4a5475143e08ff8bbeeda4dcb784a2fb578ef07b9559b8ae37b24103b36f99e4f86c96357674a115c371a6

data/CHANGELOG.txt

@@ -1,3 +1,15 @@
+=== 1.4.3
+- Migrate edicon from C to Ruby: replace edicon.exe with a pure-Ruby implementation (ed_icon.rb), fixing incorrect BeginUpdateResource error checking and wrong GroupIconSize calculation. Shortens build times and removes the C binary from the build.
+- Include Gem.default_dir in GEM_PATH on all platforms: previously the exec_prefix gem directory was excluded on Windows, causing native-extension gems (e.g. fxruby/fox16) to fail at runtime with a LoadError even though they were bundled correctly.
+- Add FXRuby (fox16) test: verify that native extension DLLs are bundled correctly so the packaged executable does not raise a LoadError at runtime.
+- CI: start a virtual display (xpra + Xorg dummy driver with GLX) on Linux before running tests so FXRuby's X11 requirement is satisfied.
+- CI: install XQuartz on macOS runners and add it to the portability test job so FXRuby can connect to a display on both test and portability jobs.
+
+=== 1.4.2
+- Auto-bundle OpenSSL and all its transitive dependencies (openssl.rb, digest.so, etc.) when net/http is loaded but no HTTPS request was made during the dependency scan. OpenSSL is now required inside the OCRAN build process so every file it pulls in appears in the bundled executable.
+- Add companion DLL scan on windows: when a native extension (.so) within the Ruby installation is loaded, all DLLs in the same directory are proactively included. This ensures libssl-3-x64.dll, libcrypto-3-x64.dll, libwinpthread-1.dll, and libyaml-0-2.dll are bundled even when no HTTPS connection is made during the build scan.
+- Add `return if defined?(Ocran)` guards to test fixtures that have runtime-only side effects (file writes, Dir.chdir, file existence checks, network requests) to prevent them from running during the dependency scan, so we can check if the dependencies are included correctly.
+
 === 1.4.1
 - Fix kernel_require.rb packed at wrong path when rubygems-update is installed (e.g. via asdf on Linux/macOS). kernel_require.rb is now located relative to the actually-loaded rubygems.rb from $LOADED_FEATURES, falling back to rubylibdir for standard Ruby installations.
 

data/README.md

@@ -1,7 +1,6 @@
 # ocran
 
 home   :: https://github.com/largo/ocran/
-
 issues :: http://github.com/largo/ocran/issues
 
 ## Description
@@ -23,18 +22,19 @@ Ruby 3.2+ compatibility.
 
 ## Recommended usage
 
-The most common use-case is shipping a program to Windows servers or users
-who do not have Ruby installed. By default, each time the `.exe` is opened it
+The most common use-case is shipping a program to users running Windows / Linux / macOS
+who do not have Ruby installed. By default, each time the `.exe` / executable is opened it
 extracts the Ruby interpreter and your code to a temporary directory and runs
 them from there.
 
-Because extraction takes time on each launch, consider using the Inno Setup
+Because extraction takes time on each launch, use `--output-dir` or
+`--output-zip` to produce a portable directory/archive that runs with the
+bundled Ruby on Linux, macOS, or Windows.
+If using Windows you can use  the Inno Setup
 option (`--innosetup`) to produce a proper installer that extracts once to a
 permanent directory.
 
-For cross-platform packaging or CI artifacts, use `--output-dir` or
-`--output-zip` to produce a portable directory/archive that runs with the
-bundled Ruby on Linux, macOS, or Windows.
+You can easily generate binaries for the supported Operating Systems with GitHub Actions.
 
 ## Features
 
@@ -74,12 +74,12 @@ https://github.com/largo/ocran/releases/.
 
 ## Synopsis
 
-### Building a Windows executable:
+### Building an executable:
 
     ocran script.rb
 
 Packages `script.rb`, the Ruby interpreter, and all dependencies (gems and
-DLLs) into `script.exe`.
+DLLs) into `script.exe` or `script` on Linux or macOS.
 
 ### Building a portable directory (Linux / macOS / Windows):
 
@@ -115,10 +115,11 @@ Same as `--output-dir`, but packages the result into a zip file. Requires
 ### Options:
 
     ocran --help
+    ocran -h
 
 #### General options:
 
-* `--help`: Display available command-line options.
+* `--help`, `-h`: Display available command-line options.
 * `--quiet`: Suppress all output during the build process.
 * `--verbose`: Provide detailed output during the build process.
 * `--version`: Display the OCRAN version number and exit.
@@ -222,10 +223,28 @@ On Windows, run the batch file:
 * OCRAN-built executables correctly handle multibyte paths (e.g. Japanese, emoji) on Windows 10 1903+.
 * When using the executable from the console, run `chcp 65001` first to switch to UTF-8 on windows.
 
+## Limitations
+
+### No cross-platform building
+
+OCRAN is not a cross-compiler. The executable or directory it produces bundles
+the Ruby interpreter from the machine where OCRAN is run, so you must **run
+OCRAN on the same platform (and architecture) as the intended target**:
+
+* To produce a Windows `.exe`, run OCRAN on Windows.
+* To produce a Linux binary, run OCRAN on Linux.
+* To produce a macOS app bundle, run OCRAN on macOS.
+
+There is no support for building a Windows `.exe` from a Linux or macOS host,
+or vice versa. If you need builds for multiple platforms, run OCRAN in CI on
+each target platform separately (e.g., a Windows runner for `.exe` builds and
+a Linux runner for Linux builds).
+
 ## Requirements
 
 * Ruby 3.2+
-* For building Windows `.exe`: Windows with RubyInstaller DevKit (mingw-w64), or Wine on Linux/macOS
+* For building Windows `.exe`: Windows with [RubyInstaller DevKit](https://rubyinstaller.org/downloads/) (mingw-w64), or Wine on Linux/macOS
+* For building Linux and MacOS binaries: the respective build tools
 * For `--output-dir` / `--output-zip`: any platform with Ruby 3.2+
 * For `--output-zip` on Linux/macOS: the `zip` command must be available
 * For `--output-zip` on Windows: PowerShell (included in Windows 8+)
@@ -508,6 +527,11 @@ file:
       end
     end
 
+## See elsewhere
+
+- [State of Ruby Packagers](https://gist.github.com/YOU54F/3775e66e6090e0371c11601e6b75c305)
+- [Traveling Ruby](https://github.com/trubygems/traveling-ruby)
+
 ## Credits
 
 Lars Christensen and contributors for the OCRA project which this is forked from.

data/lib/ocran/direction.rb

@@ -144,6 +144,24 @@ module Ocran
       # Store the currently loaded files
       features = normalized_features
 
+      # If net/http was loaded but openssl wasn't (it is only required lazily
+      # at the point of an actual HTTPS connection), require it now inside the
+      # OCRAN build process so that every transitive dependency — openssl.rb,
+      # digest.so, and any other files pulled in by the extension — appears in
+      # $LOADED_FEATURES and gets bundled alongside the application.
+      openssl_so = Pathname(RbConfig::CONFIG["archdir"]) / "openssl.so"
+      if openssl_so.exist? &&
+          features.any? { |f| f.to_posix.end_with?("/net/http.rb") } &&
+          features.none? { |f| f == openssl_so }
+        say "Auto-loading openssl (net/http loaded but openssl not yet required)"
+        before = $LOADED_FEATURES.dup
+        require "openssl"
+        ($LOADED_FEATURES - before).each do |f|
+          path = Pathname(f).cleanpath
+          features << path if path.absolute?
+        end
+      end
+
       say "Building #{@option.output_executable}"
       require_relative "build_helper"
       builder.extend(BuildHelper)
@@ -185,6 +203,22 @@ module Ocran
             builder.copy_to_bin(dll, dll.basename)
           end
         end
+
+        # Proactively include companion DLLs for loaded native extensions.
+        # Native extensions (.so) may depend on DLLs in the same archdir
+        # directory (e.g., libssl-3-x64.dll alongside openssl.so) that are
+        # loaded lazily on first use. Scanning .so directories ensures those
+        # DLLs are bundled even when the extension is required but not
+        # exercised during the OCRAN dependency scan.
+        features.select { |f| f.extname?(".so") && f.subpath?(exec_prefix) }
+                .map(&:dirname).uniq
+                .each do |dir|
+          dir.each_child do |path|
+            next unless path.file? && path.extname?(".dll")
+            say "Adding companion DLL #{path}"
+            builder.duplicate_to_exec_prefix(path)
+          end
+        end
       end
 
       # Windows-only: Add external manifest and builtin DLLs
@@ -480,14 +514,15 @@ module Ocran
       builder.set_env_path("GEM_HOME", GEMDIR)
 
       gem_paths = [GEMDIR]
-      # On POSIX, default gems (e.g. error_highlight) are stored under the Ruby
-      # installation's gem dir (Gem.default_dir), not in GEMDIR. Include it in
-      # GEM_PATH so RubyGems can find and activate them in the extracted tree.
-      unless Gem.win_platform?
-        default_gem_dir = Pathname(Gem.default_dir)
-        if default_gem_dir.subpath?(exec_prefix)
-          gem_paths << default_gem_dir.relative_path_from(exec_prefix)
-        end
+      # Gems installed under the Ruby prefix (exec_prefix) have their specs and
+      # extension dirs placed there via duplicate_to_exec_prefix. Include
+      # Gem.default_dir (relative to exec_prefix) in GEM_PATH so RubyGems can
+      # find and activate them at runtime. This is required on both Windows
+      # (e.g. fxruby/fox16 whose fox16_c.so lives in extension_dir under the
+      # Ruby prefix) and POSIX (e.g. error_highlight default gems).
+      default_gem_dir = Pathname(Gem.default_dir)
+      if default_gem_dir.subpath?(exec_prefix)
+        gem_paths << default_gem_dir.relative_path_from(exec_prefix)
       end
       builder.set_env_path("GEM_PATH", *gem_paths)
 

data/lib/ocran/ed_icon.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+require "fiddle/import"
+require "fiddle/types"
+
+module Ocran
+  # Changes the Icon in a PE executable.
+  module EdIcon
+    extend Fiddle::Importer
+    dlload "kernel32.dll"
+
+    include Fiddle::Win32Types
+    typealias "LPVOID", "void*"
+    typealias "LPCWSTR", "char*"
+
+    module Successive
+      include Enumerable
+
+      def each
+        return to_enum(__method__) unless block_given?
+
+        entry = self
+        while true
+          yield(entry)
+          entry = self.class.new(tail)
+        end
+      end
+
+      def tail
+        to_ptr + self.class.size
+      end
+    end
+
+    # Icon file header
+    IconHeader = struct(
+      [
+        "WORD Reserved",
+        "WORD ResourceType",
+        "WORD ImageCount"
+      ]
+    ).include(Successive)
+
+    icon_info = [
+      "BYTE Width",
+      "BYTE Height",
+      "BYTE Colors",
+      "BYTE Reserved",
+      "WORD Planes",
+      "WORD BitsPerPixel",
+      "DWORD ImageSize"
+    ]
+
+    # Icon File directory entry structure
+    IconDirectoryEntry = struct(icon_info + ["DWORD ImageOffset"]).include(Successive)
+
+    # Group Icon Resource directory entry structure
+    IconDirResEntry = struct(icon_info + ["WORD ResourceID"]).include(Successive)
+
+    class IconFile < IconHeader
+      def initialize(icon_filename)
+        @data = File.binread(icon_filename)
+        super(Fiddle::Pointer.to_ptr(@data))
+
+        entries_end = IconHeader.size + self.ImageCount * IconDirectoryEntry.size
+        if entries_end > @data.bytesize
+          raise "Icon file too small for declared ImageCount"
+        end
+
+        entries.each_with_index do |entry, i|
+          if entry.ImageOffset + entry.ImageSize > @data.bytesize
+            raise "Icon entry #{i} exceeds file bounds"
+          end
+        end
+      end
+
+      def entries
+        IconDirectoryEntry.new(self.tail).take(self.ImageCount)
+      end
+    end
+
+    class GroupIcon < IconHeader
+      attr_reader :size
+
+      def initialize(image_count, resource_type)
+        @size = IconHeader.size + image_count * IconDirResEntry.size
+        super(Fiddle.malloc(@size), Fiddle::RUBY_FREE)
+        self.Reserved = 0
+        self.ResourceType = resource_type
+        self.ImageCount = image_count
+      end
+
+      def entries
+        IconDirResEntry.new(self.tail).take(self.ImageCount)
+      end
+    end
+
+    MAKEINTRESOURCE = -> (i) { Fiddle::Pointer.new(i) }
+    RT_ICON = MAKEINTRESOURCE.(3)
+    RT_GROUP_ICON = MAKEINTRESOURCE.(RT_ICON.to_i + 11)
+
+    MAKELANGID = -> (p, s) { s << 10 | p }
+    LANG_NEUTRAL = 0x00
+    SUBLANG_DEFAULT = 0x01
+    LANGID = MAKELANGID.(LANG_NEUTRAL, SUBLANG_DEFAULT)
+
+    extern "DWORD GetLastError()"
+    extern "HANDLE BeginUpdateResourceW(LPCWSTR, BOOL)"
+    extern "BOOL EndUpdateResourceW(HANDLE, BOOL)"
+    extern "BOOL UpdateResourceW(HANDLE, LPCWSTR, LPCWSTR, WORD, LPVOID, DWORD)"
+
+    class << self
+      def update_icon(executable_filename, icon_filename)
+        update_resource(executable_filename) do |handle|
+          icon_file = IconFile.new(icon_filename)
+          icon_entries = icon_file.entries
+
+          # Create the RT_ICON resources
+          icon_entries.each_with_index do |entry, i|
+            if UpdateResourceW(handle, RT_ICON, 101 + i, LANGID, icon_file.to_i + entry.ImageOffset, entry.ImageSize) == 0
+              raise "failed to UpdateResource(#{GetLastError()})"
+            end
+          end
+
+          # Create the RT_GROUP_ICON structure
+          group_icon = GroupIcon.new(icon_file.ImageCount, icon_file.ResourceType)
+          group_icon.entries.zip(icon_entries).each_with_index do |(res, icon), i|
+            res.Width = icon.Width
+            res.Height = icon.Height
+            res.Colors = icon.Colors
+            res.Reserved = icon.Reserved
+            res.Planes = icon.Planes
+            res.BitsPerPixel = icon.BitsPerPixel
+            res.ImageSize = icon.ImageSize
+            res.ResourceID = 101 + i
+          end
+
+          # Save the RT_GROUP_ICON resource
+          if UpdateResourceW(handle, RT_GROUP_ICON, 100, LANGID, group_icon, group_icon.size) == 0
+            raise "Failed to create group icon(#{GetLastError()})"
+          end
+        end
+      end
+
+      def update_resource(executable_filename)
+        handle = BeginUpdateResourceW(executable_filename.encode("UTF-16LE"), 0)
+        if handle == Fiddle::NULL
+          raise "Failed to BeginUpdateResourceW(#{GetLastError()})"
+        end
+
+        yield(handle)
+
+        if EndUpdateResourceW(handle, 0) == 0
+          raise "Failed to EndUpdateResourceW(#{GetLastError()})"
+        end
+      end
+    end
+  end
+end

data/lib/ocran/option.rb

@@ -46,7 +46,7 @@ ocran [options] script.rb
 
 Ocran options:
 
---help             Display this information.
+--help, -h         Display this information.
 --quiet            Suppress output while building executable.
 --verbose          Show extra output while building executable.
 --version          Display version number and exit.
@@ -179,7 +179,7 @@ EOF
         when /\A--(no-)?gem-(\w+)(?:=(.*))?$/
           negate, group, list = $1, $2, $3
           @options[:gem_options] << [negate, group.to_sym, list&.split(",")] if group
-        when "--help", /\A--./
+        when "--help", "-h", /\A--./
           puts usage
           raise SystemExit
         else

data/lib/ocran/stub_builder.rb

@@ -27,7 +27,6 @@ module Ocran
     STUB_PATH = File.expand_path(WINDOWS ? "stub.exe" : "stub", base_dir)
     STUBW_PATH = WINDOWS ? File.expand_path("stubw.exe", base_dir) : nil
     LZMA_PATH = WINDOWS ? File.expand_path("lzma.exe", base_dir) : nil
-    EDICON_PATH = WINDOWS ? File.expand_path("edicon.exe", base_dir) : nil
 
     def self.find_posix_lzma_cmd
       if system("which lzma > /dev/null 2>&1")
@@ -122,7 +121,8 @@ module Ocran
 
       # Embed icon resource (Windows only)
       if icon_path && WINDOWS
-        system(EDICON_PATH, stub, icon_path.to_s, exception: true)
+        require_relative "ed_icon"
+        EdIcon.update_icon(stub, icon_path.to_s)
       end
 
       File.open(stub, "ab") do |of|

data/lib/ocran/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ocran
-  VERSION = "1.4.1"
+  VERSION = "1.4.3"
 end

data/src/Makefile

@@ -21,7 +21,7 @@ else
   STUB_CFLAGS     := $(CFLAGS) -D_CONSOLE
   STUBW_CFLAGS    := $(CFLAGS)
   SYSTEM_UTILS_SRC := system_utils.c
-  PROG_NAMES      := stub stubw edicon
+  PROG_NAMES      := stub stubw
   RESOURCE_OBJ    := stub.res
 endif
 
@@ -62,13 +62,11 @@ ifeq ($(IS_POSIX),)
 stubw$(EXEEXT): $(COMMON_OBJS) $(WINDOW_OBJS)
 	$(CC) $(LDFLAGS) $(GUI_LDFLAGS) $^ $(LDLIBS) -o $@
 
-edicon$(EXEEXT): edicon.o
-	$(CC) $(LDFLAGS) $^ -o $@
 endif
 
 clean:
 	rm -f $(BINARIES) $(COMMON_OBJS) $(CONSOLE_OBJS) $(WINDOW_OBJS) \
-	      edicon.o $(RESOURCE_OBJ)
+	      $(RESOURCE_OBJ)
 
 install: $(BINARIES)
 	mkdir -p $(BINDIR)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocran
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Andi Idogawa
@@ -66,6 +66,7 @@ files:
 - lib/ocran/command_output.rb
 - lib/ocran/dir_builder.rb
 - lib/ocran/direction.rb
+- lib/ocran/ed_icon.rb
 - lib/ocran/empty_source
 - lib/ocran/file_path_set.rb
 - lib/ocran/gem_spec_queryable.rb
@@ -83,7 +84,6 @@ files:
 - lib/ocran/windows_command_escaping.rb
 - share/ocran/lzma.exe
 - src/Makefile
-- src/edicon.c
 - src/error.c
 - src/error.h
 - src/inst_dir.c
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: OCRAN (One-Click Ruby Application Next) packages Ruby applications for distribution
   on Windows, Linux, and macOS.

data/src/edicon.c

@@ -1,161 +0,0 @@
-/**
-   Changes the Icon in a PE executable.
-*/
-
-#include <windows.h>
-#include <stdio.h>
-
-#pragma pack(push, 2)
-
-/* Icon file header */
-typedef struct
-{
-   WORD Reserved;
-   WORD ResourceType;
-   WORD ImageCount;
-} IconFileHeader;
-
-/* Icon File directory entry structure */
-typedef struct
-{
-   BYTE Width;
-   BYTE Height;
-   BYTE Colors;
-   BYTE Reserved;
-   WORD Planes;
-   WORD BitsPerPixel;
-   DWORD ImageSize;
-   DWORD ImageOffset;
-} IconDirectoryEntry;
-
-/* Group Icon Resource directory entry structure */
-typedef struct
-{
-   BYTE Width;
-   BYTE Height;
-   BYTE Colors;
-   BYTE Reserved;
-   WORD Planes;
-   WORD BitsPerPixel;
-   DWORD ImageSize;
-   WORD ResourceID;
-} IconDirResEntry, *PIconDirResEntry;
-
-/* Group Icon Structore (RT_GROUP_ICON) */
-typedef struct
-{
-   WORD Reserved;
-   WORD ResourceType;
-   WORD ImageCount;
-   IconDirResEntry Enries[0]; /* Number of these is in ImageCount */
-} GroupIcon;
-
-#pragma pack(pop)
-
-BOOL UpdateIcon(LPTSTR ExecutableFileName, LPTSTR IconFileName)
-{
-   HANDLE h = BeginUpdateResource(ExecutableFileName, FALSE);
-   if (h == INVALID_HANDLE_VALUE)
-   {
-      printf("Failed to BeginUpdateResource\n");
-      return FALSE;
-   }
-
-   /* Read the Icon file */
-   HANDLE hIconFile = CreateFile(IconFileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL);
-   if (hIconFile == INVALID_HANDLE_VALUE)
-   {
-      fprintf(stderr, "Failed to open icon file.\n");
-      return FALSE;
-   }
-   DWORD Size = GetFileSize(hIconFile, NULL);
-   BYTE* Data = LocalAlloc(LMEM_FIXED, Size);
-   DWORD BytesRead;
-   if (!ReadFile(hIconFile, Data, Size, &BytesRead, NULL))
-   {
-      fprintf(stderr, "Failed to read icon file.\n");
-      return FALSE;
-   }
-   CloseHandle(hIconFile);
-   
-   IconFileHeader* header = (IconFileHeader*)Data;
-   IconDirectoryEntry* entries = (IconDirectoryEntry*)(header + 1);
-
-   /* Validate that all directory entries fit within the file */
-   DWORD entriesEnd = sizeof(IconFileHeader) + header->ImageCount * sizeof(IconDirectoryEntry);
-   if (entriesEnd > Size)
-   {
-      fprintf(stderr, "Icon file too small for declared ImageCount.\n");
-      LocalFree(Data);
-      return FALSE;
-   }
-
-   /* Create the RT_ICON resources */
-   int i;
-   for (i = 0; i < header->ImageCount; ++i)
-   {
-      if (entries[i].ImageOffset + entries[i].ImageSize > Size)
-      {
-         fprintf(stderr, "Icon entry %d exceeds file bounds.\n", i);
-         LocalFree(Data);
-         return FALSE;
-      }
-      BOOL b = UpdateResource(h, MAKEINTRESOURCE(RT_ICON), MAKEINTRESOURCE(101 + i), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), Data + entries[i].ImageOffset, entries[i].ImageSize);
-      if (!b)
-      {
-         fprintf(stderr, "failed to UpdateResource %lu\n", GetLastError());
-         return FALSE;
-      }
-   }
-
-   /* Create the RT_GROUP_ICON structure */
-   DWORD GroupIconSize = sizeof(GroupIcon) + header->ImageCount * sizeof(IconDirectoryEntry);
-   GroupIcon* gi = (GroupIcon*)LocalAlloc(LMEM_FIXED, GroupIconSize);
-   gi->Reserved = 0;
-   gi->ResourceType = header->ResourceType;
-   gi->ImageCount = header->ImageCount;
-   for (i = 0; i < header->ImageCount; ++i)
-   {
-      IconDirResEntry* e = &gi->Enries[i];
-      e->Width = entries[i].Width;
-      e->Height = entries[i].Height;
-      e->Colors = entries[i].Colors;
-      e->Reserved = entries[i].Reserved;
-      e->Planes = entries[i].Planes;
-      e->BitsPerPixel = entries[i].BitsPerPixel;
-      e->ImageSize = entries[i].ImageSize;
-      e->ResourceID = 101 + i;
-   }
-
-   /* Save the RT_GROUP_ICON resource */
-   BOOL b = UpdateResource(h, MAKEINTRESOURCE(RT_GROUP_ICON), MAKEINTRESOURCE(100), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), gi, GroupIconSize);
-   if (!b)
-   {
-      fprintf(stderr, "Failed to create group icon.\n");
-      return FALSE;
-   }
-
-   if (!EndUpdateResource(h, FALSE))
-   {
-      fprintf(stderr, "Failed to EndUpdateResource.\n");
-      return FALSE;
-   }
-   
-   return TRUE;
-}
-
-int main(int argc, char* argv[])
-{
-   if (argc == 3)
-   {
-      if (UpdateIcon(argv[1], argv[2]))
-         return 0;
-      else
-         return -1;
-   }
-   else
-   {
-      fprintf(stderr, "Usage: edicon.exe <exefile> <icofile>\n");
-      return -1;
-   }
-}