Add multibyte path and filename support for resource handling in OCRAN

This commit introduces comprehensive support for multibyte (UTF-8) characters
in file and directory names during resource extraction and script execution.

Key improvements:
- Added UTF-8 manifest to stub.exe to ensure correct handling of UTF-8 paths
  using ANSI (A) APIs on modern Windows environments.
- Added test cases covering:
  - Executables run from multibyte directories
  - Scripts with multibyte filenames
  - Resource files with multibyte names
  - Resource directories with multibyte names
- Adjusted test scripts to perform byte-wise filename matching to bypass
  Windows/Ruby encoding mismatches.
- Tests now conditionally skip if console code page is not UTF-8 (65001),
  preventing false negatives on non-UTF-8 environments (e.g., CP932).

These changes ensure that OCRAN reliably handles multibyte resources
in real-world Japanese or emoji-rich file systems.

Author: shinokaro

CHANGELOG.txt

@@ -1,5 +1,7 @@
 === 1.3.17
 - Modified `rake test` to no longer build stubs during test execution. Use `rake build_stub` when stub generation is necessary.
+- Add full support for multibyte (UTF-8) names across executables, scripts, and resources. Requires Windows 10 version 1903 or later.
+- Added UTF-8 manifest to stub.exe to enable UTF-8 support in ANSI API calls.
 
 === 1.3.16
 - Support for Ruby 3.0 and above. Drop ruby 2.6 and 2.7 support.

src/Makefile

@@ -1,5 +1,5 @@
 SRCS = lzma/LzmaDec.c
-OBJS = $(SRCS:.c=.o) stubicon.o
+OBJS = $(SRCS:.c=.o) stub.res
 CONSOLE_OBJS = error_console.o filesystem_utils_console.o inst_dir_console.o script_info_console.o unpack_console.o
 WINDOW_OBJS = error_window.o filesystem_utils_window.o inst_dir_window.o script_info_window.o unpack_window.o
 CC = gcc
@@ -12,8 +12,8 @@ STUBW_CFLAGS = -mwindows $(CFLAGS)
 
 all: stub.exe stubw.exe edicon.exe
 
-stubicon.o: stub.rc
-	windres -i $< -o $@
+stub.res: stub.rc
+	windres -i stub.rc -O coff -o stub.res
 
 stub.exe: $(OBJS) stub.o $(CONSOLE_OBJS)
 	$(CC) $(STUB_CFLAGS) $(OBJS) stub.o $(CONSOLE_OBJS) -o $@

src/stub.manifest

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!--The ID below indicates application support for Windows Vista -->
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!--The ID below indicates application support for Windows 7 -->
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!--The ID below indicates application support for Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!--The ID below indicates application support for Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!--The ID below indicates application support for Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+  <application>
+    <windowsSettings>
+      <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
+    </windowsSettings>
+  </application>
+</assembly>

src/stub.rc

@@ -1 +1,3 @@
+#include <winresrc.h>
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "stub.manifest"
 101 ICON vit-ruby.ico

test/fixtures/multibyte_dir/resource.rb

@@ -0,0 +1,14 @@
+Dir.chdir File.dirname(__FILE__)
+
+dir_expected = "äあ💎"
+file_expected = "äあ💎.txt"
+expected_content = "Hello Multibyte File!\n"
+
+dir_actual = Dir.entries(".").find { |d| File.directory?(d) && d.bytes == dir_expected.bytes }
+raise "Directory not found" unless dir_actual
+
+file_actual = Dir.entries(dir_actual).find { |f| f.bytes == file_expected.bytes }
+raise "File not found in directory" unless file_actual
+
+content = File.read(File.join(dir_actual, file_actual))
+raise "File content mismatch" unless content == expected_content

test/fixtures/multibyte_dir/äあ💎/äあ💎.txt

@@ -0,0 +1 @@
+Hello Multibyte File!

test/fixtures/multibyte_file/resource.rb

@@ -0,0 +1,10 @@
+Dir.chdir File.dirname(__FILE__)
+
+expected_name = "äあ💎.txt"
+expected_content = "Hello Multibyte File!\n"
+
+actual_name = Dir.entries(".").find { |f| f.bytes == expected_name.bytes }
+raise "File not found" unless actual_name
+
+content = File.read(actual_name)
+raise "File content mismatch" unless content == expected_content

test/fixtures/multibyte_file/äあ💎.txt

@@ -0,0 +1 @@
+Hello Multibyte File!

test/fixtures/multibyte_script/äあ💎.rb

@@ -0,0 +1 @@
+content = "Hello from multibyte-named script"

test/test_ocra.rb

@@ -807,4 +807,68 @@ def test_debug
       end
     end
   end
+
+  # Tests whether an OCRAN-built executable runs correctly from a directory
+  # with multibyte (UTF-8) characters in its name.
+  def test_multibyte_path_execution
+    with_fixture 'helloworld' do
+      exe_name = "helloworld.exe"
+      assert system("ruby", ocran, "helloworld.rb", *DefaultArgs)
+      assert File.exist?(exe_name)
+
+      multibyte_dir = "äあ💎"
+
+      pristine_env exe_name do
+        mkdir_p multibyte_dir
+        cp exe_name, multibyte_dir
+        Dir.chdir(multibyte_dir) do
+          assert system(exe_name)
+        end
+      end
+    end
+  end
+
+  # Tests building and running a Ruby script with multibyte (UTF-8) characters
+  # in its filename. Skipped unless the console code page is UTF-8 (65001),
+  # as ruby.exe misinterprets arguments under non-UTF-8 environments.
+  def test_multibyte_script_filename
+    cp = `chcp`.force_encoding(Encoding::BINARY)[/\d+/] || "unknown"
+    unless cp == "65001"
+      skip "Skipped: console code page must be UTF-8 (65001), got #{cp}"
+    end
+
+    with_fixture 'multibyte_script' do
+      script = "äあ💎.rb"
+      assert system("ruby", ocran, script, *DefaultArgs)
+      exe_name = script.sub(/\.rb$/, '.exe')
+      assert File.exist?(exe_name)
+      pristine_env exe_name do
+        assert system(exe_name)
+      end
+    end
+  end
+
+  # Tests if a multibyte-named resource file is correctly included and read
+  # at runtime after being packaged by OCRAN.
+  def test_multibyte_resource_file
+    with_fixture 'multibyte_file' do
+      assert system("ruby", ocran, "resource.rb", "äあ💎.txt", *DefaultArgs)
+      assert File.exist?("resource.exe")
+      pristine_env "resource.exe" do
+        assert system("resource.exe")
+      end
+    end
+  end
+
+  # Tests that OCRAN can handle resource files stored in a directory
+  # with multibyte (UTF-8) characters in its name.
+  def test_multibyte_resource_dir
+    with_fixture 'multibyte_dir' do
+      assert system("ruby", ocran, "resource.rb", "äあ💎/äあ💎.txt", *DefaultArgs)
+      assert File.exist?("resource.exe")
+      pristine_env "resource.exe" do
+        assert system("resource.exe")
+      end
+    end
+  end
 end