Add Version Label to Config Window

Core/RenderManager.cs

@@ -364,9 +364,10 @@ internal class RenderManager : MonoBehaviour
 
     private IEnumerator SetupPlay()
     {
-        if (Configuration.AudioConfig.RenderAudio && Configuration.VideoConfig.Codec is Codec.VP9 or Codec.AV1 or Codec.VVC)
+        if (Configuration.AudioConfig.RenderAudio)
         {
-            if (Configuration.AudioConfig.AudioSampleRate == 44100) Configuration.AudioConfig.AudioSampleRate = 48000;
+            if (!CodecUtil.AvailableSampleRate[CodecUtil.AudioCodecMatch[Configuration.VideoConfig.Codec]].Contains(Configuration.AudioConfig.AudioSampleRate)) 
+                Configuration.AudioConfig.AudioSampleRate = 48000; // most compatible value
         }
 
         for (; countdown > 0; countdown--)
@@ -463,7 +464,7 @@ internal class RenderManager : MonoBehaviour
         try
         {
             var effectiveVideoFps = Math.Min(videoFPS, renderFPS);
-            var codecId = AudioCodecMatch[Configuration.VideoConfig.Codec];
+            var codecId = CodecUtil.AudioCodecMatch[Configuration.VideoConfig.Codec];
             var settings = new FFmpegNativeEncoder.EncoderSettings
             {
                 Width = Configuration.RenderWidth,
@@ -816,13 +817,4 @@ internal class RenderManager : MonoBehaviour
             Melon<RenderMod>.Logger.Error($"OnLastUpdate callback caused error: {err}");
         }
     }
-
-    private static readonly Dictionary<Codec, AVCodecID> AudioCodecMatch = new()
-    {
-        [Codec.H264] = AVCodecID.AV_CODEC_ID_AAC,
-        [Codec.H265] = AVCodecID.AV_CODEC_ID_AAC,
-        [Codec.VP9] = AVCodecID.AV_CODEC_ID_OPUS,
-        [Codec.AV1] = AVCodecID.AV_CODEC_ID_OPUS,
-        [Codec.VVC] = AVCodecID.AV_CODEC_ID_OPUS
-    };
 }

Data/RenderConfig.cs

@@ -17,7 +17,7 @@ public class RenderConfig
     public AudioEncodingConfig AudioConfig { get; set; } = new();
     public AdvancedConfig AdvancedConfig { get; set; } = new();
 
-    public double DelayAfterEnd { get; set; }
+    public double DelayAfterEnd { get; set; } = 15;
     public bool ShowJudgementText { get; set; } = false;
 }
 
@@ -57,8 +57,8 @@ public class AudioEncodingConfig
 
     public int AudioSampleRate
     {
-        get => _audioSampleRate <= 0 ? 44100 : _audioSampleRate;
+        get => _audioSampleRate <= 0 ? 48000 : _audioSampleRate;
-        set => _audioSampleRate = value <= 0 ? 44100 : value;
+        set => _audioSampleRate = value <= 0 ? 48000 : value;
     }
 
     public int AudioChannels

Localization/Locale/en.json

@@ -31,5 +31,6 @@
   "ui.render_config.random_seed": "Random Seed (Optional)",
   "ui.render_config.validation_title": "Invalid Settings",
   "ui.render_config.validation_error": "Please check your input values:\n- Width and Height must be integers > 0\n- Render FPS and Video FPS must be > 0\n- Delay After End must be >= 0",
-  "ui.render_config.invalid_path": "Output directory path is invalid:\n{0}"
+  "ui.render_config.invalid_path": "Output directory path is invalid:\n{0}",
+  "ui.render_config.expired": "(Expired)"
 }

Localization/Locale/ko.json

@@ -31,5 +31,6 @@
   "ui.render_config.random_seed": "랜덤 시드 (선택 사항)",
   "ui.render_config.validation_title": "설정 오류",
   "ui.render_config.validation_error": "입력값을 확인해 주세요:\n- 너비와 높이는 0보다 큰 정수여야 합니다.\n- 렌더 FPS와 영상 FPS는 0보다 커야 합니다.\n- 종료 후 대기 시간은 0 이상이어야 합니다.",
-  "ui.render_config.invalid_path": "출력 디렉토리 경로가 올바르지 않습니다:\n{0}"
+  "ui.render_config.invalid_path": "출력 디렉토리 경로가 올바르지 않습니다:\n{0}",
+  "ui.render_config.expired": "(만료됨)"
 }

RenderMod.cs

@@ -9,7 +9,7 @@ using MelonLoader.Utils;
 using UnityEngine;
 using Object = UnityEngine.Object;
 
-[assembly: MelonInfo(typeof(RenderMod), "ADOFAI Renderer", "0.2.0-INDEV", "ADOFAI Editor Forum")]
+[assembly: MelonInfo(typeof(RenderMod), "ADOFAI Renderer", "0.2.1-INDEV", "ADOFAI Editor Forum")]
 [assembly: MelonGame("7th Beat Games", "A Dance of Fire and Ice")]
 
 namespace ADOFAIRenderer;

UI/Window/RenderConfigWindow.cs

@@ -8,6 +8,7 @@ using ADOFAIRenderer.Data;
 using ADOFAIRenderer.Localization;
 using ADOFAIRenderer.Util;
 using ADOFAIRenderer.Util.FFmpeg;
+using HarmonyLib;
 using MelonLoader;
 using O5Kit.Control;
 using O5Kit.Core;
@@ -102,6 +103,20 @@ internal static class RenderConfigWindow
         
         double[] audioBitrateSnap = { 64, 96, 128, 192, 256, 320, 384 };
         
+        double[] renderWidthSnap = {
+            256, 426, 640, 854, 960, 1280, 1366, 1600, 1920, 2048, 2560, 3200, 3840, 4096, 5120, 5760, 6016, 7680, 10240, 15360, // 16:9
+            230, 384, 576, 768, 1152, 1440, 1680, 2880, 3072, // 16:10
+            192, 320, 480, 800, 1024, 1400, 2732, 6400, 11520 // 4:3
+        };
+
+        double[] renderHeightSnap = {
+            144, 240, 360, 480, 540, 720, 768, 900, 1080, 1152, 1440, 1800, 2160, 2304, 2880, 3240, 3384, 4320, 5760, 8640, // 16:9
+            400, 600, 800, 1050, 1200, 1600, 1920, 2400, 3200, 4800, 9600, // 16:10
+            864, 960, 1536, 2048, 3072 // 4:3
+        };
+        
+        // TODO: Presets
+        
         // 1-3. Top section: 좌/우 컨테이너 1개씩으로 3행을 쌓는다 (중앙선 1개)
         var (topLeft, topRight) = CreateTwoColumnPanel(scrollContent, spacing: 8f, columnSpacing: 10f);
         
@@ -132,7 +147,7 @@ internal static class RenderConfigWindow
             defaultValue: 2560, min: 0, max: 15360, value: 2560,
             format: "F0", clampMode: ClampMode.All,
             
-            sliderFilter: value => Math.Max(value, 2), inputFilter: value => Math.Max(value, 2), 
+            sliderFilter: value => renderWidthSnap.OrderBy(n => Math.Abs(n - value)).First(), inputFilter: value => Math.Max(value, 2), 
             onComplete: null, onChanged: val => { config.RenderWidth = (int)Math.Round(val); },
             text: LocalizationManager.Get("ui.render_config.render_width"),
             id: "slider_render_width", showFill: true
@@ -143,7 +158,7 @@ internal static class RenderConfigWindow
             defaultValue: 1440, min: 0, max: 8640, value: 1440,
             format: "F0", clampMode: ClampMode.All,
             
-            sliderFilter: value => Math.Max(value, 2), inputFilter: value => Math.Max(value, 2), 
+            sliderFilter: value => renderHeightSnap.OrderBy(n => Math.Abs(n - value)).First(), inputFilter: value => Math.Max(value, 2), 
             onComplete: null, onChanged: val => { config.RenderWidth = (int)Math.Round(val); },
             text: LocalizationManager.Get("ui.render_config.render_height"),
             id: "slider_render_height", showFill: true
@@ -188,8 +203,12 @@ internal static class RenderConfigWindow
             Codec.H264, config.VideoConfig.Codec,
             codecs, c => c.ToString(),
             "dd_video_codec",
-            c => config.VideoConfig.Codec = c
+            c =>
-        );
+            {
+                config.VideoConfig.Codec = c;
+                UpdateVideoCodec(c);
+            });
+        
         _bitrateInput = CreateInputField(
             ctx, CreateFieldSlot(videoLeft),
             LocalizationManager.Get("ui.render_config.bitrate"),
@@ -198,6 +217,7 @@ internal static class RenderConfigWindow
             TMPro.TMP_InputField.CharacterValidation.Integer,
             val => { if (int.TryParse(val, out var b) && b > 0) config.VideoConfig.Bitrate = b; }
         );
+        
         _qpInput = CreateInputField(
             ctx, CreateFieldSlot(videoLeft),
             LocalizationManager.Get("ui.render_config.qp"),
@@ -216,6 +236,7 @@ internal static class RenderConfigWindow
             "dd_rate_control",
             m => config.VideoConfig.RateControlMode = m
         );
+        
         _maxBitrateInput = CreateInputField(
             ctx, CreateFieldSlot(videoRight),
             LocalizationManager.Get("ui.render_config.max_bitrate"),
@@ -227,7 +248,7 @@ internal static class RenderConfigWindow
         
         _forceSoftwareToggle = CreateToggleField(
             ctx, CreateFieldSlot(videoRight), "",
-            true, config.VideoConfig.ForceSoftwareEncoder,
+            false, config.VideoConfig.ForceSoftwareEncoder,
             LocalizationManager.Get("ui.render_config.force_software"),
             "toggle_force_software",
             val => config.AudioConfig.RenderAudio = val,
@@ -287,12 +308,11 @@ internal static class RenderConfigWindow
             c => config.AudioConfig.AudioChannels = c
         );
 
-        var sampleRates = new[] { 44100, 48000, 96000 };
         _sampleRateDropdown = CreateDropdownField(
             ctx, CreateFieldSlot(audioRight),
             LocalizationManager.Get("ui.render_config.sample_rate"),
             48000, config.AudioConfig.AudioSampleRate,
-            sampleRates, r => $"{r/1000.0} kHz",
+            CodecUtil.AvailableSampleRate[CodecUtil.AudioCodecMatch[config.VideoConfig.Codec]], r => $"{r/1000.0} kHz", 
             "dd_sample_rate",
             r => config.AudioConfig.AudioSampleRate = r
         );
@@ -339,6 +359,7 @@ internal static class RenderConfigWindow
                     : _outputDirInput.Value;
                 FolderDialogUtil.OpenFolderBrowser(initial, selected =>
                 {
+                    Melon<RenderMod>.Logger.Msg("Output Directory Selected: " + selected);
                     if (!string.IsNullOrWhiteSpace(selected))
                     {
                         _outputDirInput.Set(selected);
@@ -384,6 +405,7 @@ internal static class RenderConfigWindow
             "dd_adv_file_extension",
             e => { if (!string.IsNullOrEmpty(e)) config.AdvancedConfig.FileExtension = e; }
         );
+        
         _processAudioToggle = CreateToggleField(
             ctx, CreateFieldSlot(advLeft), "",
             true, config.AdvancedConfig.ProcessAudio,
@@ -405,6 +427,7 @@ internal static class RenderConfigWindow
                 else if (string.IsNullOrWhiteSpace(val)) config.AdvancedConfig.RandomSeed = null;
             }
         );
+        
         _nonTileToggle = CreateToggleField(
             ctx, CreateFieldSlot(advRight), "",
             false, config.AdvancedConfig.NonTile,
@@ -413,6 +436,8 @@ internal static class RenderConfigWindow
             val => config.AdvancedConfig.NonTile = val,
             generateLabel: false
         );
+        
+        // TODO: Fire Planet, Ice Planet, Wind Planet Color Settings (Each Optional)
 
         // 8. Go Render Button
         O5Factory.Button(
@@ -422,12 +447,33 @@ internal static class RenderConfigWindow
             "btn_go_render",
             height: 48f
         );
+
+        // 9. Version Label
+        var versionLabel = O5Factory.ControlText(ctx, scrollContent, 12f, noPad: true);
+        var versionText = $"ADOFAI Renderer v{Melon<RenderMod>.Instance.Info.Version}";
+        if (DateTime.UtcNow >= RenderMod.ExpirationTime) versionText += " " + LocalizationManager.Get("ui.render_config.expired");
+        
+        versionLabel.text = versionText;
+        versionLabel.alignment = TMPro.TextAlignmentOptions.Center;
+        versionLabel.color = ctx.Theme.TextDim;
+
+        // ReSharper disable once InconsistentNaming
+        var versionLE = versionLabel.gameObject.AddComponent<LayoutElement>();
+        versionLE.preferredHeight = 18f;
+        versionLE.minHeight = 18f;
+
+        return;
+
+        void UpdateVideoCodec(Codec codec)
+        {
+            _sampleRateDropdown?.SetValues(CodecUtil.AvailableSampleRate[CodecUtil.AudioCodecMatch[codec]]);
+        }
     }
 
     private static void EnsureDefaultConfig(RenderConfig config)
     {
-        if (config.RenderWidth <= 0) config.RenderWidth = Screen.width > 0 ? Screen.width : 2560;
+        if (config.RenderWidth <= 0) config.RenderWidth = 2560;
-        if (config.RenderHeight <= 0) config.RenderHeight = Screen.height > 0 ? Screen.height : 1440;
+        if (config.RenderHeight <= 0) config.RenderHeight = 1440;
         if (config.RenderFPS <= 0) config.RenderFPS = 60.0;
         if (config.VideoFPS <= 0) config.VideoFPS = 60.0;
         if (config.DelayAfterEnd < 0) config.DelayAfterEnd = 15.0;

Util/FFmpeg/Codec.cs

@@ -1,4 +1,6 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using FFmpeg.AutoGen;
 
 namespace ADOFAIRenderer.Util.FFmpeg
 {
@@ -7,4 +9,22 @@ namespace ADOFAIRenderer.Util.FFmpeg
     {
         H264, H265, VP9, AV1, VVC
     }
+
+    internal static class CodecUtil
+    {
+        public static readonly Dictionary<Codec, AVCodecID> AudioCodecMatch = new()
+        {
+            [Codec.H264] = AVCodecID.AV_CODEC_ID_AAC,
+            [Codec.H265] = AVCodecID.AV_CODEC_ID_AAC,
+            [Codec.VP9] = AVCodecID.AV_CODEC_ID_OPUS,
+            [Codec.AV1] = AVCodecID.AV_CODEC_ID_OPUS,
+            [Codec.VVC] = AVCodecID.AV_CODEC_ID_OPUS
+        };
+
+        public static readonly Dictionary<AVCodecID, List<int>> AvailableSampleRate = new()
+        {
+            [AVCodecID.AV_CODEC_ID_AAC] = new List<int> { 44100, 48000, 96000 },
+            [AVCodecID.AV_CODEC_ID_OPUS] = new List<int> { 48000 }
+        };
+    }
 }

Util/FFmpeg/FFmpegNativeEncoder.cs

@@ -1536,9 +1536,9 @@ namespace ADOFAIRenderer.Util.FFmpeg
             if (_pAudioCodecContext == null)
                 throw new Exception("Failed to allocate audio codec context.");
 
-            var sampleRate = audioSettings.SampleRate > 0 ? audioSettings.SampleRate : 44100;
+            var sampleRate = audioSettings.SampleRate > 0 ? audioSettings.SampleRate : 48000;
             var channels = audioSettings.Channels > 0 ? audioSettings.Channels : 2;
-            var bitrate = audioSettings.Bitrate > 0 ? audioSettings.Bitrate : 128000;
+            var bitrate = audioSettings.Bitrate > 0 ? audioSettings.Bitrate : 256000;
 
             // Select the first sample format supported by the encoder.
             // Most encoders prefer AV_SAMPLE_FMT_FLTP (float planar).

Util/FolderDialogUtil.cs

@@ -2,6 +2,7 @@ using System;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using MelonLoader;
@@ -10,95 +11,505 @@ namespace ADOFAIRenderer.Util;
 
 internal static class FolderDialogUtil
 {
+    private static int _isDialogOpen;
+
     public static void OpenFolderBrowser(string initialDirectory, Action<string?> onSelected)
     {
+        if (Interlocked.CompareExchange(ref _isDialogOpen, 1, 0) != 0)
+        {
+            MelonLogger.Msg("[FolderDialogUtil] Folder dialog is already open.");
+            return;
+        }
+
         var syncContext = SynchronizationContext.Current;
 
-        Task.Run(() =>
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            string? selected = null;
+            var ownerHandle = GetGameWindowHandle();
-            try
-            {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                {
-                    selected = OpenWindowsFolderBrowser(initialDirectory);
-                }
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                {
-                    selected = OpenMacFolderBrowser(initialDirectory);
-                }
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                {
-                    selected = OpenLinuxFolderBrowser(initialDirectory);
-                }
-            }
-            catch (Exception ex)
-            {
-                MelonLogger.Warning($"[FolderDialogUtil] Failed to open folder browser: {ex.Message}");
-            }
 
-            if (syncContext != null)
+            var thread = new Thread(() =>
             {
-                syncContext.Post(_ => onSelected(selected), null);
+                string? selected = null;
-            }
+                int oleHr = -1;
-            else
+                try
+                {
+                    oleHr = OleInitialize(IntPtr.Zero);
+                    selected = OpenWindowsFolderBrowser(initialDirectory, ownerHandle);
+                }
+                catch (Exception ex)
+                {
+                    MelonLogger.Warning($"[FolderDialogUtil] Windows folder dialog error: {ex.Message}");
+                }
+                finally
+                {
+                    if (oleHr >= 0)
+                    {
+                        try
+                        {
+                            OleUninitialize();
+                        }
+                        catch
+                        {
+                            // Ignore uninitialize error
+                        }
+                    }
+                    Interlocked.Exchange(ref _isDialogOpen, 0);
+                }
+
+                DispatchResult(syncContext, onSelected, selected);
+            })
+            {
+                IsBackground = true,
+                Name = "FolderDialog-Win"
+            };
+            thread.SetApartmentState(ApartmentState.STA);
+            thread.Start();
+        }
+        else
+        {
+            Task.Run(() =>
+            {
+                string? selected = null;
+                try
+                {
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                    {
+                        selected = OpenMacFolderBrowser(initialDirectory);
+                    }
+                    else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                    {
+                        selected = OpenLinuxFolderBrowser(initialDirectory);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MelonLogger.Warning($"[FolderDialogUtil] Failed to open folder browser: {ex.Message}");
+                }
+                finally
+                {
+                    Interlocked.Exchange(ref _isDialogOpen, 0);
+                }
+
+                DispatchResult(syncContext, onSelected, selected);
+            });
+        }
+    }
+
+    private static void DispatchResult(SynchronizationContext? syncContext, Action<string?> onSelected, string? selected)
+    {
+        if (syncContext != null)
+        {
+            syncContext.Post(_ =>
+            {
+                try
+                {
+                    onSelected(selected);
+                }
+                catch (Exception ex)
+                {
+                    MelonLogger.Warning($"[FolderDialogUtil] Error in folder selected callback: {ex.Message}");
+                }
+            }, null);
+        }
+        else
+        {
+            try
             {
                 onSelected(selected);
             }
-        });
+            catch (Exception ex)
+            {
+                MelonLogger.Warning($"[FolderDialogUtil] Error in folder selected callback: {ex.Message}");
+            }
+        }
     }
 
-    private static string? OpenWindowsFolderBrowser(string initialDirectory)
+    #region Windows Implementation
+
+    private static readonly Guid CLSID_FileOpenDialog = new("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7");
+    private static readonly Guid IID_IFileOpenDialog = new("d57c7288-d4ad-4768-be02-9d969532d960");
+    private static readonly Guid IID_IShellItem = new("43826D1E-E718-42EE-BC55-A1E261C37BFE");
+    private const int ERROR_CANCELLED_HR = unchecked((int)0x800704C7);
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetActiveWindow();
+
+    [DllImport("user32.dll")]
+    private static extern IntPtr GetForegroundWindow();
+
+    [DllImport("user32.dll")]
+    private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+    private static IntPtr GetGameWindowHandle()
     {
         try
         {
-            var escapedDir = initialDirectory.Replace("'", "''");
+            var active = GetActiveWindow();
-            var script = $@"
+            if (active != IntPtr.Zero) return active;
-[System.Reflection.Assembly]::LoadWithPartialName('System.Windows.Forms') | Out-Null
-$f = New-Object System.Windows.Forms.FolderBrowserDialog
-$f.Description = 'Select Output Directory'
-if ([System.IO.Directory]::Exists('{escapedDir}')) {{
-    $f.SelectedPath = '{escapedDir}'
-}}
-$f.ShowNewFolderButton = $true
-if ($f.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) {{
-    [Console]::Write($f.SelectedPath)
-}}";
 
-            var bytes = System.Text.Encoding.Unicode.GetBytes(script);
+            var currentPid = (uint)Process.GetCurrentProcess().Id;
-            var base64 = Convert.ToBase64String(bytes);
+            var fg = GetForegroundWindow();
-
+            if (fg != IntPtr.Zero)
-            var startInfo = new ProcessStartInfo
             {
-                FileName = "powershell.exe",
+                GetWindowThreadProcessId(fg, out var fgPid);
-                Arguments = $"-NoProfile -NonInteractive -ExecutionPolicy Bypass -EncodedCommand {base64}",
+                if (fgPid == currentPid)
-                CreateNoWindow = true,
+                {
-                UseShellExecute = false,
+                    return fg;
-                RedirectStandardOutput = true,
+                }
-                WindowStyle = ProcessWindowStyle.Hidden
+            }
-            };
 
-            using var process = Process.Start(startInfo);
+            var mainHandle = Process.GetCurrentProcess().MainWindowHandle;
-            if (process == null) return null;
+            if (mainHandle != IntPtr.Zero)
+            {
+                return mainHandle;
+            }
+        }
+        catch
+        {
+            // Ignore failure to detect window handle
+        }
 
-            var output = process.StandardOutput.ReadToEnd().Trim();
+        return IntPtr.Zero;
-            process.WaitForExit();
+    }
 
-            return !string.IsNullOrEmpty(output) && Directory.Exists(output) ? output : null;
+    private static string? OpenWindowsFolderBrowser(string initialDirectory, IntPtr ownerHandle)
+    {
+        try
+        {
+            return OpenWindowsFolderBrowserModern(initialDirectory, ownerHandle);
         }
         catch (Exception ex)
         {
-            MelonLogger.Warning($"[FolderDialogUtil] Windows folder dialog error: {ex.Message}");
+            MelonLogger.Warning($"[FolderDialogUtil] Modern folder dialog failed ({ex.Message}), falling back to legacy dialog.");
-            return null;
+            return OpenWindowsFolderBrowserLegacy(initialDirectory, ownerHandle);
         }
     }
 
+    private static string? OpenWindowsFolderBrowserModern(string initialDirectory, IntPtr ownerHandle)
+    {
+        IFileOpenDialog? dialog = null;
+
+        // 1. Try native CoCreateInstance first (works on Mono and .NET without class registration)
+        var clsid = CLSID_FileOpenDialog;
+        var iid = IID_IFileOpenDialog;
+        int createHr = CoCreateInstance(ref clsid, IntPtr.Zero, 1 /* CLSCTX_INPROC_SERVER */, ref iid, out dialog);
+
+        if (createHr != 0 || dialog == null)
+        {
+            // 2. Fallback to Activator via Type.GetTypeFromCLSID
+            var comType = Type.GetTypeFromCLSID(CLSID_FileOpenDialog);
+            if (comType != null)
+            {
+                var instance = Activator.CreateInstance(comType);
+                dialog = instance as IFileOpenDialog;
+            }
+        }
+
+        if (dialog == null)
+        {
+            throw new COMException("Failed to instantiate IFileOpenDialog via COM.", createHr);
+        }
+
+        try
+        {
+            dialog.SetOptions(FOS.FOS_PICKFOLDERS | FOS.FOS_FORCEFILESYSTEM | FOS.FOS_PATHMUSTEXIST);
+            dialog.SetTitle("Select Output Directory");
+
+            if (!string.IsNullOrWhiteSpace(initialDirectory))
+            {
+                try
+                {
+                    var normalized = Path.GetFullPath(initialDirectory).TrimEnd('\\', '/');
+                    if (Directory.Exists(normalized))
+                    {
+                        var shellItemGuid = IID_IShellItem;
+                        int itemHr = SHCreateItemFromParsingName(normalized, IntPtr.Zero, ref shellItemGuid, out var initialItem);
+                        if (itemHr == 0 && initialItem != null)
+                        {
+                            try
+                            {
+                                dialog.SetFolder(initialItem);
+                                dialog.SetDefaultFolder(initialItem);
+                            }
+                            finally
+                            {
+                                Marshal.ReleaseComObject(initialItem);
+                            }
+                        }
+                    }
+                }
+                catch
+                {
+                    // Ignore failure to set initial folder
+                }
+            }
+
+            int hr = dialog.Show(ownerHandle);
+            if (hr != 0 && hr != ERROR_CANCELLED_HR && ownerHandle != IntPtr.Zero)
+            {
+                // If Show failed with ownerHandle (e.g. cross-thread or invalid handle), retry without owner
+                MelonLogger.Msg($"[FolderDialogUtil] dialog.Show(ownerHandle) returned 0x{hr:X8}, retrying with IntPtr.Zero.");
+                hr = dialog.Show(IntPtr.Zero);
+            }
+
+            if (hr == ERROR_CANCELLED_HR)
+            {
+                return null;
+            }
+
+            if (hr != 0)
+            {
+                throw new COMException("IFileOpenDialog.Show failed", hr);
+            }
+
+            dialog.GetResult(out var resultItem);
+            if (resultItem == null) return null;
+
+            try
+            {
+                if (resultItem.GetDisplayName(SIGDN.SIGDN_FILESYSPATH, out var pszPath) == 0 && pszPath != IntPtr.Zero)
+                {
+                    try
+                    {
+                        var path = Marshal.PtrToStringUni(pszPath);
+                        return !string.IsNullOrEmpty(path) && Directory.Exists(path) ? path : null;
+                    }
+                    finally
+                    {
+                        Marshal.FreeCoTaskMem(pszPath);
+                    }
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(resultItem);
+            }
+
+            return null;
+        }
+        finally
+        {
+            Marshal.ReleaseComObject(dialog);
+        }
+    }
+
+    private static string? OpenWindowsFolderBrowserLegacy(string initialDirectory, IntPtr ownerHandle)
+    {
+        IntPtr pszDisplayName = Marshal.AllocHGlobal(260 * sizeof(char));
+        IntPtr initialDirPtr = IntPtr.Zero;
+        BrowseCallbackProc? callback = null;
+        IntPtr pidl = IntPtr.Zero;
+
+        try
+        {
+            var bi = new BROWSEINFO
+            {
+                hwndOwner = ownerHandle,
+                pidlRoot = IntPtr.Zero,
+                pszDisplayName = pszDisplayName,
+                lpszTitle = "Select Output Directory",
+                ulFlags = BIF_RETURNONLYFSDIRS | BIF_NEWDIALOGSTYLE | BIF_EDITBOX
+            };
+
+            if (!string.IsNullOrWhiteSpace(initialDirectory))
+            {
+                try
+                {
+                    var normalized = Path.GetFullPath(initialDirectory).TrimEnd('\\', '/');
+                    if (Directory.Exists(normalized))
+                    {
+                        initialDirPtr = Marshal.StringToHGlobalUni(normalized);
+                        callback = (hwnd, uMsg, lParam, lpData) =>
+                        {
+                            if (uMsg == BFFM_INITIALIZED && lpData != IntPtr.Zero)
+                            {
+                                SendMessage(hwnd, BFFM_SETSELECTIONW, (IntPtr)1, lpData);
+                            }
+                            return 0;
+                        };
+                        bi.lpfn = callback;
+                        bi.lParam = initialDirPtr;
+                    }
+                }
+                catch
+                {
+                    // Ignore failure to prepare initial directory
+                }
+            }
+
+            pidl = SHBrowseForFolderW(ref bi);
+            if (pidl == IntPtr.Zero && ownerHandle != IntPtr.Zero)
+            {
+                // If it returned null with ownerHandle, check if retry with IntPtr.Zero is appropriate
+                // But note: cancelling also returns Zero. We do not redundantly re-prompt if cancelled.
+            }
+
+            if (pidl != IntPtr.Zero)
+            {
+                var sb = new StringBuilder(260);
+                if (SHGetPathFromIDListW(pidl, sb))
+                {
+                    var path = sb.ToString();
+                    return !string.IsNullOrEmpty(path) && Directory.Exists(path) ? path : null;
+                }
+            }
+
+            return null;
+        }
+        finally
+        {
+            if (pidl != IntPtr.Zero)
+            {
+                Marshal.FreeCoTaskMem(pidl);
+            }
+            if (initialDirPtr != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(initialDirPtr);
+            }
+            if (pszDisplayName != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(pszDisplayName);
+            }
+            GC.KeepAlive(callback);
+        }
+    }
+
+    #region COM & Win32 Interop Definitions
+
+    [Flags]
+    private enum FOS : uint
+    {
+        FOS_NOCHANGEDIR = 0x00000008,
+        FOS_PICKFOLDERS = 0x00000020,
+        FOS_FORCEFILESYSTEM = 0x00000040,
+        FOS_PATHMUSTEXIST = 0x00000800,
+        FOS_FILEMUSTEXIST = 0x00001000,
+    }
+
+    private enum SIGDN : uint
+    {
+        SIGDN_FILESYSPATH = 0x80058000
+    }
+
+    [ComImport]
+    [Guid("43826D1E-E718-42EE-BC55-A1E261C37BFE")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    private interface IShellItem
+    {
+        void BindToHandler(IntPtr pbc, [In] ref Guid bhid, [In] ref Guid riid, out IntPtr ppv);
+        void GetParent(out IShellItem ppsi);
+        [PreserveSig]
+        int GetDisplayName(SIGDN sigdnName, out IntPtr ppszName);
+        void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs);
+        void Compare(IShellItem psi, uint hint, out int piOrder);
+    }
+
+    [ComImport]
+    [Guid("d57c7288-d4ad-4768-be02-9d969532d960")]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    private interface IFileOpenDialog
+    {
+        [PreserveSig]
+        int Show(IntPtr parent);
+        void SetFileTypes(uint cFileTypes, IntPtr rgFilterSpec);
+        void SetFileTypeIndex(uint iFileType);
+        void GetFileTypeIndex(out uint piFileType);
+        void Advise(IntPtr pfde, out uint pdwCookie);
+        void Unadvise(uint dwCookie);
+        void SetOptions(FOS fos);
+        void GetOptions(out FOS pfos);
+        void SetDefaultFolder(IShellItem psi);
+        void SetFolder(IShellItem psi);
+        void GetFolder(out IShellItem ppsi);
+        void GetCurrentSelection(out IShellItem ppsi);
+        void SetFileName([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+        void GetFileName([MarshalAs(UnmanagedType.LPWStr)] out string pszName);
+        void SetTitle([MarshalAs(UnmanagedType.LPWStr)] string pszTitle);
+        void SetOkButtonLabel([MarshalAs(UnmanagedType.LPWStr)] string pszText);
+        void SetFileNameLabel([MarshalAs(UnmanagedType.LPWStr)] string pszLabel);
+        void GetResult(out IShellItem ppsi);
+        void AddPlace(IShellItem psi, int fdap);
+        void SetDefaultExtension([MarshalAs(UnmanagedType.LPWStr)] string pszDefaultExtension);
+        void Close(int hr);
+        void SetClientGuid(ref Guid guid);
+        void ClearClientData();
+        void SetFilter(IntPtr pFilter);
+        void GetResults(out IntPtr ppenum);
+        void GetSelectedItems(out IntPtr ppsai);
+    }
+
+    [DllImport("ole32.dll", ExactSpelling = true)]
+    private static extern int OleInitialize(IntPtr pvReserved);
+
+    [DllImport("ole32.dll", ExactSpelling = true)]
+    private static extern void OleUninitialize();
+
+    [DllImport("ole32.dll", ExactSpelling = true)]
+    private static extern int CoCreateInstance(
+        [In] ref Guid rclsid,
+        IntPtr pUnkOuter,
+        uint dwClsContext,
+        [In] ref Guid riid,
+        [Out, MarshalAs(UnmanagedType.Interface)] out IFileOpenDialog ppv);
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode, PreserveSig = true)]
+    private static extern int SHCreateItemFromParsingName(
+        [MarshalAs(UnmanagedType.LPWStr)] string pszPath,
+        IntPtr pbc,
+        [In] ref Guid riid,
+        [Out, MarshalAs(UnmanagedType.Interface)] out IShellItem ppv);
+
+    private const uint BIF_RETURNONLYFSDIRS = 0x0001;
+    private const uint BIF_NEWDIALOGSTYLE = 0x0040;
+    private const uint BIF_EDITBOX = 0x0010;
+    private const uint BFFM_INITIALIZED = 1;
+    private const uint BFFM_SETSELECTIONW = 0x0400 + 103;
+
+    private delegate int BrowseCallbackProc(IntPtr hwnd, uint uMsg, IntPtr lParam, IntPtr lpData);
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    private struct BROWSEINFO
+    {
+        public IntPtr hwndOwner;
+        public IntPtr pidlRoot;
+        public IntPtr pszDisplayName;
+        public string lpszTitle;
+        public uint ulFlags;
+        public BrowseCallbackProc? lpfn;
+        public IntPtr lParam;
+        public int iImage;
+    }
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+    private static extern IntPtr SHBrowseForFolderW(ref BROWSEINFO lpbi);
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    private static extern bool SHGetPathFromIDListW(IntPtr pidl, StringBuilder pszPath);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    private static extern IntPtr SendMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+    #endregion
+
+    #endregion
+
+    #region macOS Implementation
+
     private static string? OpenMacFolderBrowser(string initialDirectory)
     {
         try
         {
-            var escaped = initialDirectory.Replace("\"", "\\\"");
+            string script;
-            var script = $"POSIX path of (choose folder with prompt \"Select Output Directory\" default location \"{escaped}\")";
+            if (!string.IsNullOrEmpty(initialDirectory) && Directory.Exists(initialDirectory))
+            {
+                var escaped = initialDirectory.Replace("\\", "\\\\").Replace("\"", "\\\"");
+                script = $"POSIX path of (choose folder with prompt \"Select Output Directory\" default location (POSIX file \"{escaped}\"))";
+            }
+            else
+            {
+                script = "POSIX path of (choose folder with prompt \"Select Output Directory\")";
+            }
 
             var startInfo = new ProcessStartInfo
             {
@@ -119,12 +530,17 @@ if ($f.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) {{
 
             return !string.IsNullOrEmpty(output) && Directory.Exists(output) ? output : null;
         }
-        catch
+        catch (Exception ex)
         {
+            MelonLogger.Warning($"[FolderDialogUtil] Mac folder dialog error: {ex.Message}");
             return null;
         }
     }
 
+    #endregion
+
+    #region Linux Implementation
+
     private static string? OpenLinuxFolderBrowser(string initialDirectory)
     {
         try
@@ -145,17 +561,55 @@ if ($f.ShowDialog() -eq [System.Windows.Forms.DialogResult]::OK) {{
                 startInfo.ArgumentList.Add($"--filename={initialDirectory}");
             }
 
-            using var process = Process.Start(startInfo);
+            try
-            if (process == null) return null;
+            {
+                using var process = Process.Start(startInfo);
+                if (process != null)
+                {
+                    var output = process.StandardOutput.ReadToEnd().Trim();
+                    process.WaitForExit();
 
-            var output = process.StandardOutput.ReadToEnd().Trim();
+                    if (process.ExitCode == 0 && !string.IsNullOrEmpty(output) && Directory.Exists(output))
-            process.WaitForExit();
+                    {
+                        return output;
+                    }
+                }
+            }
+            catch
+            {
+                // Fallback to kdialog if zenity fails to start
+            }
 
-            return !string.IsNullOrEmpty(output) && Directory.Exists(output) ? output : null;
+            var kdialogInfo = new ProcessStartInfo
+            {
+                FileName = "kdialog",
+                CreateNoWindow = true,
+                UseShellExecute = false,
+                RedirectStandardOutput = true,
+                WindowStyle = ProcessWindowStyle.Hidden
+            };
+            kdialogInfo.ArgumentList.Add("--getexistingdirectory");
+            if (!string.IsNullOrEmpty(initialDirectory) && Directory.Exists(initialDirectory))
+            {
+                kdialogInfo.ArgumentList.Add(initialDirectory);
+            }
+            kdialogInfo.ArgumentList.Add("--title");
+            kdialogInfo.ArgumentList.Add("Select Output Directory");
+
+            using var kdialogProcess = Process.Start(kdialogInfo);
+            if (kdialogProcess == null) return null;
+
+            var koutput = kdialogProcess.StandardOutput.ReadToEnd().Trim();
+            kdialogProcess.WaitForExit();
+
+            return !string.IsNullOrEmpty(koutput) && Directory.Exists(koutput) ? koutput : null;
         }
-        catch
+        catch (Exception ex)
         {
+            MelonLogger.Warning($"[FolderDialogUtil] Linux folder dialog error: {ex.Message}");
             return null;
         }
     }
+
+    #endregion
 }

Util/RegistryUtil.cs

@@ -63,6 +63,7 @@ namespace ADOFAIRenderer.Util
             }
         }
 
+        // ReSharper disable once InconsistentNaming
         public static string[]? GetHKLMSubKeyNames(string parentKeyPath)
         {
             if (RegistryKeyType == null || OpenBaseKeyMethod == null || OpenSubKeyMethod == null || GetSubKeyNamesMethod == null)
@@ -94,6 +95,7 @@ namespace ADOFAIRenderer.Util
             }
         }
 
+        // ReSharper disable once InconsistentNaming
         public static string? GetHKLMValue(string keyPath, string valueName)
         {
             if (RegistryKeyType == null || OpenBaseKeyMethod == null || OpenSubKeyMethod == null || GetValueMethod == null)