mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[misc] add '.wic' to the list of default image extensions
* '.wic' are DD images used by the Yocto project. * Why Yocto chose to use their own extension instead of using the de-facto '.img' is beyond me but hey... * Also update GitHub Actions dependencies to latest. * Closes #2319.
This commit is contained in:
		
							parent
							
								
									98725a0d5f
								
							
						
					
					
						commit
						99bffe8364
					
				
					 6 changed files with 12 additions and 12 deletions
				
			
		
							
								
								
									
										4
									
								
								.github/workflows/codeql.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/codeql.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -40,7 +40,7 @@ jobs: | ||||||
| 
 | 
 | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout repository |     - name: Checkout repository | ||||||
|       uses: actions/checkout@v3 |       uses: actions/checkout@v4 | ||||||
| 
 | 
 | ||||||
|     - name: Initialize CodeQL |     - name: Initialize CodeQL | ||||||
|       uses: github/codeql-action/init@v2 |       uses: github/codeql-action/init@v2 | ||||||
|  | @ -48,7 +48,7 @@ jobs: | ||||||
|         languages: cpp |         languages: cpp | ||||||
| 
 | 
 | ||||||
|     - name: Add MSBuild to PATH |     - name: Add MSBuild to PATH | ||||||
|       uses: microsoft/setup-msbuild@v1 |       uses: microsoft/setup-msbuild@v1.1 | ||||||
|       with: |       with: | ||||||
|         msbuild-architecture: x64 |         msbuild-architecture: x64 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								.github/workflows/coverity.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/coverity.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -27,7 +27,7 @@ jobs: | ||||||
| 
 | 
 | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout repository |     - name: Checkout repository | ||||||
|       uses: actions/checkout@v3 |       uses: actions/checkout@v4 | ||||||
|       with: |       with: | ||||||
|         fetch-depth: 0 |         fetch-depth: 0 | ||||||
|         submodules: recursive |         submodules: recursive | ||||||
|  | @ -44,7 +44,7 @@ jobs: | ||||||
|       run: echo "${{github.workspace}}/cov-analysis-win64/bin" >> $GITHUB_PATH |       run: echo "${{github.workspace}}/cov-analysis-win64/bin" >> $GITHUB_PATH | ||||||
| 
 | 
 | ||||||
|     - name: Add MSBuild to PATH |     - name: Add MSBuild to PATH | ||||||
|       uses: microsoft/setup-msbuild@v1 |       uses: microsoft/setup-msbuild@v1.1 | ||||||
| 
 | 
 | ||||||
|     - name: Build with Coverity |     - name: Build with Coverity | ||||||
|       run: |  |       run: |  | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								.github/workflows/mingw.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/mingw.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -53,7 +53,7 @@ jobs: | ||||||
|           upx |           upx | ||||||
| 
 | 
 | ||||||
|     - name: Checkout repository |     - name: Checkout repository | ||||||
|       uses: actions/checkout@v3 |       uses: actions/checkout@v4 | ||||||
|       with: |       with: | ||||||
|         fetch-depth: 0 |         fetch-depth: 0 | ||||||
|         submodules: recursive |         submodules: recursive | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								.github/workflows/vs2022.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/vs2022.yml
									
										
									
									
										vendored
									
									
								
							|  | @ -39,7 +39,7 @@ jobs: | ||||||
| 
 | 
 | ||||||
|     steps: |     steps: | ||||||
|     - name: Checkout repository |     - name: Checkout repository | ||||||
|       uses: actions/checkout@v3 |       uses: actions/checkout@v4 | ||||||
|       with: |       with: | ||||||
|         fetch-depth: 0 |         fetch-depth: 0 | ||||||
|         submodules: recursive |         submodules: recursive | ||||||
|  |  | ||||||
|  | @ -2600,7 +2600,7 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA | ||||||
| 					img_provided = FALSE;	// One off thing...
 | 					img_provided = FALSE;	// One off thing...
 | ||||||
| 				} else { | 				} else { | ||||||
| 					char* old_image_path = image_path; | 					char* old_image_path = image_path; | ||||||
| 					char extensions[128] = "*.iso;*.img;*.vhd;*.vhdx;*.usb;*.bz2;*.bzip2;*.gz;*.lzma;*.xz;*.Z;*.zip;*.wim;*.esd;*.vtsi"; | 					char extensions[128] = "*.iso;*.img;*.vhd;*.vhdx;*.usb;*.bz2;*.bzip2;*.gz;*.lzma;*.xz;*.Z;*.zip;*.wic;*.wim;*.esd;*.vtsi"; | ||||||
| 					if (has_ffu_support) | 					if (has_ffu_support) | ||||||
| 						strcat(extensions, ";*.ffu"); | 						strcat(extensions, ";*.ffu"); | ||||||
| 					// If declared globaly, lmprintf(MSG_280) would be called on each message...
 | 					// If declared globaly, lmprintf(MSG_280) would be called on each message...
 | ||||||
|  |  | ||||||
							
								
								
									
										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.3.2081" | CAPTION "Rufus 4.3.2082" | ||||||
| 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,3,2081,0 |  FILEVERSION 4,3,2082,0 | ||||||
|  PRODUCTVERSION 4,3,2081,0 |  PRODUCTVERSION 4,3,2082,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.3.2081" |             VALUE "FileVersion", "4.3.2082" | ||||||
|             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.3.exe" |             VALUE "OriginalFilename", "rufus-4.3.exe" | ||||||
|             VALUE "ProductName", "Rufus" |             VALUE "ProductName", "Rufus" | ||||||
|             VALUE "ProductVersion", "4.3.2081" |             VALUE "ProductVersion", "4.3.2082" | ||||||
|         END |         END | ||||||
|     END |     END | ||||||
|     BLOCK "VarFileInfo" |     BLOCK "VarFileInfo" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue