mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[misc] try to support folks who use a symlink for their temp dir
* Microsoft's WIM mounting APIs can't use symlinked directories and some folks want to use a symlinked temp dir... * Closes #2084
This commit is contained in:
parent
71e99add76
commit
3e81b38c2d
4 changed files with 42 additions and 6 deletions
|
@ -1104,7 +1104,7 @@ out:
|
||||||
// Extract all of the isolinux.bin files we found to identify their versions
|
// Extract all of the isolinux.bin files we found to identify their versions
|
||||||
for (i=0; i<isolinux_path.Index; i++) {
|
for (i=0; i<isolinux_path.Index; i++) {
|
||||||
char isolinux_tmp[MAX_PATH];
|
char isolinux_tmp[MAX_PATH];
|
||||||
static_sprintf(isolinux_tmp, "%s\\isolinux.tmp", temp_dir);
|
static_sprintf(isolinux_tmp, "%sisolinux.tmp", temp_dir);
|
||||||
size = (size_t)ExtractISOFile(src_iso, isolinux_path.String[i], isolinux_tmp, FILE_ATTRIBUTE_NORMAL);
|
size = (size_t)ExtractISOFile(src_iso, isolinux_path.String[i], isolinux_tmp, FILE_ATTRIBUTE_NORMAL);
|
||||||
if (size == 0) {
|
if (size == 0) {
|
||||||
uprintf(" Could not access %s", isolinux_path.String[i]);
|
uprintf(" Could not access %s", isolinux_path.String[i]);
|
||||||
|
|
|
@ -724,6 +724,21 @@ static __inline DWORD GetModuleFileNameExU(HANDLE hProcess, HMODULE hModule, cha
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static __inline DWORD GetFinalPathNameByHandleU(HANDLE hFile, char* lpszFilePath, DWORD cchFilePath, DWORD dwFlags)
|
||||||
|
{
|
||||||
|
DWORD ret = 0, err = ERROR_INVALID_DATA;
|
||||||
|
walloc(lpszFilePath, cchFilePath);
|
||||||
|
ret = GetFinalPathNameByHandleW(hFile, wlpszFilePath, cchFilePath, dwFlags);
|
||||||
|
err = GetLastError();
|
||||||
|
if ((ret != 0)
|
||||||
|
&& ((ret = wchar_to_utf8_no_alloc(wlpszFilePath, lpszFilePath, cchFilePath)) == 0)) {
|
||||||
|
err = GetLastError();
|
||||||
|
}
|
||||||
|
wfree(lpszFilePath);
|
||||||
|
SetLastError(err);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
static __inline DWORD GetFileVersionInfoSizeU(const char* lpFileName, LPDWORD lpdwHandle)
|
static __inline DWORD GetFileVersionInfoSizeU(const char* lpFileName, LPDWORD lpdwHandle)
|
||||||
{
|
{
|
||||||
DWORD ret = 0, err = ERROR_INVALID_DATA;
|
DWORD ret = 0, err = ERROR_INVALID_DATA;
|
||||||
|
|
21
src/rufus.c
21
src/rufus.c
|
@ -3398,9 +3398,30 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
|
||||||
uprintf("Could not get system directory: %s", WindowsErrorString());
|
uprintf("Could not get system directory: %s", WindowsErrorString());
|
||||||
static_strcpy(system_dir, "C:\\Windows\\System32");
|
static_strcpy(system_dir, "C:\\Windows\\System32");
|
||||||
}
|
}
|
||||||
|
// Per documentation, the returned string ends with a backslash
|
||||||
if (GetTempPathU(sizeof(temp_dir), temp_dir) == 0) {
|
if (GetTempPathU(sizeof(temp_dir), temp_dir) == 0) {
|
||||||
uprintf("Could not get temp directory: %s", WindowsErrorString());
|
uprintf("Could not get temp directory: %s", WindowsErrorString());
|
||||||
static_strcpy(temp_dir, ".\\");
|
static_strcpy(temp_dir, ".\\");
|
||||||
|
} else {
|
||||||
|
// Some folks have found nothing better than configure their Windows installation to use
|
||||||
|
// a symlink for their temp dir, and it so happens that the Windows WIM mounting facility,
|
||||||
|
// which we need for applying the WUE options, can't handle symlinked directories. So we
|
||||||
|
// *attempt* to resolve the actual symlinked temp dir for this super limited number of
|
||||||
|
// users, with the hope that doing so is not going to break stuff elsewhere...
|
||||||
|
HANDLE handle = CreateFileU(temp_dir, GENERIC_READ, FILE_SHARE_READ, NULL,
|
||||||
|
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
|
||||||
|
// GetFinalPathNameByHandle returns a UNC path, which should be prefixed by '\\?\' or '\\.\'
|
||||||
|
if ((GetFinalPathNameByHandleU(handle, temp_dir, sizeof(temp_dir), FILE_NAME_OPENED) == 0) ||
|
||||||
|
((strstr(temp_dir, "\\\\?\\") != temp_dir) && (strstr(temp_dir, "\\\\.\\") != temp_dir))) {
|
||||||
|
uprintf("Could not get actual temp directory: %s", WindowsErrorString());
|
||||||
|
static_strcpy(temp_dir, ".\\");
|
||||||
|
} else {
|
||||||
|
// Need to remove the '\\?\' prefix or else we'll get issues with the Fido icon
|
||||||
|
strcpy(temp_dir, &temp_dir[4]);
|
||||||
|
// And me must re-append the '\' that gets removed by GetFinalPathNameByHandle()
|
||||||
|
static_strcat(temp_dir, "\\");
|
||||||
|
}
|
||||||
|
CloseHandle(handle);
|
||||||
}
|
}
|
||||||
if (!SHGetSpecialFolderPathU(NULL, app_data_dir, CSIDL_LOCAL_APPDATA, FALSE)) {
|
if (!SHGetSpecialFolderPathU(NULL, app_data_dir, CSIDL_LOCAL_APPDATA, FALSE)) {
|
||||||
uprintf("Could not get app data directory: %s", WindowsErrorString());
|
uprintf("Could not get app data directory: %s", WindowsErrorString());
|
||||||
|
|
10
src/rufus.rc
10
src/rufus.rc
|
@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||||
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
IDD_DIALOG DIALOGEX 12, 12, 232, 326
|
||||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||||
EXSTYLE WS_EX_ACCEPTFILES
|
EXSTYLE WS_EX_ACCEPTFILES
|
||||||
CAPTION "Rufus 4.2.2046"
|
CAPTION "Rufus 4.2.2047"
|
||||||
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
|
||||||
BEGIN
|
BEGIN
|
||||||
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
|
||||||
|
@ -392,8 +392,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 4,2,2046,0
|
FILEVERSION 4,2,2047,0
|
||||||
PRODUCTVERSION 4,2,2046,0
|
PRODUCTVERSION 4,2,2047,0
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -411,13 +411,13 @@ BEGIN
|
||||||
VALUE "Comments", "https://rufus.ie"
|
VALUE "Comments", "https://rufus.ie"
|
||||||
VALUE "CompanyName", "Akeo Consulting"
|
VALUE "CompanyName", "Akeo Consulting"
|
||||||
VALUE "FileDescription", "Rufus"
|
VALUE "FileDescription", "Rufus"
|
||||||
VALUE "FileVersion", "4.2.2046"
|
VALUE "FileVersion", "4.2.2047"
|
||||||
VALUE "InternalName", "Rufus"
|
VALUE "InternalName", "Rufus"
|
||||||
VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
|
VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
|
||||||
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||||
VALUE "OriginalFilename", "rufus-4.2.exe"
|
VALUE "OriginalFilename", "rufus-4.2.exe"
|
||||||
VALUE "ProductName", "Rufus"
|
VALUE "ProductName", "Rufus"
|
||||||
VALUE "ProductVersion", "4.2.2046"
|
VALUE "ProductVersion", "4.2.2047"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
Loading…
Reference in a new issue