mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-31 14:58:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ui] hint that UEFI/CSM is used when BIOS+UEFI is selected for target system

Browse source 
* Also drop "Computer" from all languages (except Japanese as I think it would be incorrect)
* Also rename the manifest
This commit is contained in:
Pete Batard 2015-05-02 14:41:46 +01:00
parent 629cfa68ad
commit d4b663b222
7 changed files with 111 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/.msvc/rufus.vcxproj
View file

@ -220,7 +220,7 @@
<ClInclude Include="..\usb.h" />
</ItemGroup>
<ItemGroup>
<Manifest Include="..\common_controls_and_elevation.manifest" />
<Manifest Include="..\rufus.manifest" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\res\down.ico" />

2
src/.msvc/rufus.vcxproj.filters
View file

@ -144,7 +144,7 @@
</None>
</ItemGroup>
<ItemGroup>
<Manifest Include="..\common_controls_and_elevation.manifest">
<Manifest Include="..\rufus.manifest">
<Filter>Resource Files</Filter>
</Manifest>
</ItemGroup>

2
src/.msvc/rufus_sources
View file

@ -29,7 +29,7 @@ TARGETLIBS=$(SDK_LIB_PATH)\kernel32.lib \
.\getopt\getopt.lib
# http://jpassing.com/2008/02/01/how-to-use-manifests-with-buildexe/
SXS_APPLICATION_MANIFEST=..\common_controls_and_elevation.manifest
SXS_APPLICATION_MANIFEST=..\rufus.manifest
SOURCES=rufus.c \
format.c \

0
src/common_controls_and_elevation.manifest → src/rufus.manifest
View file

20
src/rufus.rc
View file

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 2.2.655"
CAPTION "Rufus 2.2.656"
FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -156,7 +156,7 @@ END
IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 2.2.655"
CAPTION "Rufus 2.2.656"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -281,7 +281,7 @@ END
IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 2.2.655"
CAPTION "Rufus 2.2.656"
FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -412,7 +412,7 @@ END
IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
CAPTION "Rufus 2.2.655"
CAPTION "Rufus 2.2.656"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -614,7 +614,7 @@ BEGIN
"// Must reference a manifest for visual styles and elevation\r\n"
"// Oh, and it must happen at the end, or MinGW will ignore it!\r\n"
"#if defined(__GNUC__)\r\n"
"CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""common_controls_and_elevation.manifest""\r\n"
"CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""rufus.manifest""\r\n"
"#endif\r\n"
"\0"
END
@ -667,8 +667,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,655,0
PRODUCTVERSION 2,2,655,0
FILEVERSION 2,2,656,0
PRODUCTVERSION 2,2,656,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -685,13 +685,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.2.655"
VALUE "FileVersion", "2.2.656"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.2.655"
VALUE "ProductVersion", "2.2.656"
END
END
BLOCK "VarFileInfo"
@ -769,7 +769,7 @@ IDR_TOGO_UNATTEND_XML RCDATA "../res/togo/unattend.xml"
// Must reference a manifest for visual styles and elevation
// Oh, and it must happen at the end, or MinGW will ignore it!
#if defined(__GNUC__)
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "common_controls_and_elevation.manifest"
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "rufus.manifest"
#endif
/////////////////////////////////////////////////////////////////////////////

4
src/stdfn.c
View file

@ -277,8 +277,6 @@ void GetWindowsVersion(void)
ws = (vi.wProductType <= VER_NT_WORKSTATION);
nWindowsVersion = vi.dwMajorVersion << 4 | vi.dwMinorVersion;
switch (nWindowsVersion) {
case 0x50: w = "2000";
break;
case 0x51: w = "XP";
break;
case 0x52: w = (!GetSystemMetrics(89)?"2003":"2003_R2");
@ -297,7 +295,7 @@ void GetWindowsVersion(void)
case 0xA0: w = (ws?"10":"Server 10");
break;
default:
if (nWindowsVersion < 0x50)
if (nWindowsVersion < 0x51)
nWindowsVersion = WINDOWS_UNSUPPORTED;
else
w = "11 or later";