From 3bbdd6624eb1fa52c6a488f970667619aa1f5925 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 10 Jul 2025 10:52:17 +0100
Subject: [PATCH] [wue] cd to wrapper directory before looking for setup.dll

* Closes #2757.
---
 res/setup/setup.c |  7 +++++++
 src/rufus.rc      | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/res/setup/setup.c b/res/setup/setup.c
index a58ef474..c81d29c0 100644
--- a/res/setup/setup.c
+++ b/res/setup/setup.c
@@ -98,6 +98,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 	STARTUPINFOA si = { 0 };
 	PROCESS_INFORMATION pi = { 0 };
 	SECURITY_ATTRIBUTES sa = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
+	WCHAR *wc, wPath[MAX_PATH] = { 0 };
+
+	// If invoked from a different directory, cd to where this executable resides
+	if (GetModuleFileName(NULL, wPath, ARRAYSIZE(wPath)) != 0 && (wc = wcsrchr(wPath, L'\\')) != NULL) {
+		*wc = L'\0';
+		SetCurrentDirectory(wPath);
+	}
 
 	// Make sure we have 'setup.dll' in the same directory
 	dwAttrib = GetFileAttributesA("setup.dll");
diff --git a/src/rufus.rc b/src/rufus.rc
index bc24a87f..e547cc6d 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 4.10.2265"
+CAPTION "Rufus 4.10.2266"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -407,8 +407,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,10,2265,0
- PRODUCTVERSION 4,10,2265,0
+ FILEVERSION 4,10,2266,0
+ PRODUCTVERSION 4,10,2266,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -426,13 +426,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.10.2265"
+            VALUE "FileVersion", "4.10.2266"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2025 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.10.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.10.2265"
+            VALUE "ProductVersion", "4.10.2266"
         END
     END
     BLOCK "VarFileInfo"