mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[iso] add bypass of Windows 11 restrictions for in-place upgrades
This commit is contained in:
		
							parent
							
								
									23e79ad907
								
							
						
					
					
						commit
						209fb18b1c
					
				
					 2 changed files with 19 additions and 5 deletions
				
			
		
							
								
								
									
										14
									
								
								src/format.c
									
										
									
									
									
								
							
							
						
						
									
										14
									
								
								src/format.c
									
										
									
									
									
								
							|  | @ -1870,6 +1870,8 @@ DWORD WINAPI FormatThread(void* param) | ||||||
| 	char drive_letters[27], fs_name[32], label[64]; | 	char drive_letters[27], fs_name[32], label[64]; | ||||||
| 	char logfile[MAX_PATH], *userdir; | 	char logfile[MAX_PATH], *userdir; | ||||||
| 	char efi_dst[] = "?:\\efi\\boot\\bootx64.efi"; | 	char efi_dst[] = "?:\\efi\\boot\\bootx64.efi"; | ||||||
|  | 	char appraiserres_dll_src[] = "?:\\sources\\appraiserres.dll"; | ||||||
|  | 	char appraiserres_dll_dst[] = "?:\\sources\\appraiserres.bak"; | ||||||
| 	char kolibri_dst[] = "?:\\MTLD_F32"; | 	char kolibri_dst[] = "?:\\MTLD_F32"; | ||||||
| 	char grub4dos_dst[] = "?:\\grldr"; | 	char grub4dos_dst[] = "?:\\grldr"; | ||||||
| 
 | 
 | ||||||
|  | @ -2358,6 +2360,18 @@ DWORD WINAPI FormatThread(void* param) | ||||||
| 						FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_CANT_PATCH); | 						FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_CANT_PATCH); | ||||||
| 				} | 				} | ||||||
| 				if (ComboBox_GetCurItemData(hImageOption) == IMOP_WIN_EXTENDED) { | 				if (ComboBox_GetCurItemData(hImageOption) == IMOP_WIN_EXTENDED) { | ||||||
|  | 					// Create a backup of sources\appraiserres.dll and then create an empty file to
 | ||||||
|  | 					// allow in-place upgrades without TPM/SB. Note that we need to create an empty,
 | ||||||
|  | 					// appraiserres.dll otherwise setup.exe extracts its own.
 | ||||||
|  | 					appraiserres_dll_src[0] = drive_name[0]; | ||||||
|  | 					appraiserres_dll_dst[0] = drive_name[0]; | ||||||
|  | 					uprintf("Renaming: '%s' → '%s'", appraiserres_dll_src, appraiserres_dll_dst); | ||||||
|  | 					if (!MoveFileExU(appraiserres_dll_src, appraiserres_dll_dst, MOVEFILE_REPLACE_EXISTING)) | ||||||
|  | 						uprintf("  Rename failed: %s", WindowsErrorString()); | ||||||
|  | 					else | ||||||
|  | 						CloseHandle(CreateFileU(appraiserres_dll_src, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, | ||||||
|  | 							NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL)); | ||||||
|  | 					// Now patch for boot-time TPM/SB checks.
 | ||||||
| 					if (!RemoveWindows11Restrictions(drive_name[0])) | 					if (!RemoveWindows11Restrictions(drive_name[0])) | ||||||
| 						FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_CANT_PATCH); | 						FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | APPERR(ERROR_CANT_PATCH); | ||||||
| 				} | 				} | ||||||
|  |  | ||||||
							
								
								
									
										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 3.18.1870" | CAPTION "Rufus 3.18.1871" | ||||||
| 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 | ||||||
|  | @ -395,8 +395,8 @@ END | ||||||
| // | // | ||||||
| 
 | 
 | ||||||
| VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||||
|  FILEVERSION 3,18,1870,0 |  FILEVERSION 3,18,1871,0 | ||||||
|  PRODUCTVERSION 3,18,1870,0 |  PRODUCTVERSION 3,18,1871,0 | ||||||
|  FILEFLAGSMASK 0x3fL |  FILEFLAGSMASK 0x3fL | ||||||
| #ifdef _DEBUG | #ifdef _DEBUG | ||||||
|  FILEFLAGS 0x1L |  FILEFLAGS 0x1L | ||||||
|  | @ -414,13 +414,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", "3.18.1870" |             VALUE "FileVersion", "3.18.1871" | ||||||
|             VALUE "InternalName", "Rufus" |             VALUE "InternalName", "Rufus" | ||||||
|             VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" |             VALUE "LegalCopyright", "© 2011-2022 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-3.18.exe" |             VALUE "OriginalFilename", "rufus-3.18.exe" | ||||||
|             VALUE "ProductName", "Rufus" |             VALUE "ProductName", "Rufus" | ||||||
|             VALUE "ProductVersion", "3.18.1870" |             VALUE "ProductVersion", "3.18.1871" | ||||||
|         END |         END | ||||||
|     END |     END | ||||||
|     BLOCK "VarFileInfo" |     BLOCK "VarFileInfo" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue