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

[wue] add TimeZone to regional options replication

Browse source 
* Closes #2499.
This commit is contained in:
Pete Batard 2024-07-08 13:56:15 +01:00
parent 83b1e73062
commit 10d33c6658
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/rufus.rc
View file

@ -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.6.2186" CAPTION "Rufus 4.6.2187"
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
@ -397,8 +397,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,6,2186,0 FILEVERSION 4,6,2187,0
PRODUCTVERSION 4,6,2186,0 PRODUCTVERSION 4,6,2187,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -416,13 +416,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.6.2186" VALUE "FileVersion", "4.6.2187"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "<22> 2011-2024 Pete Batard (GPL v3)" VALUE "LegalCopyright", "<22> 2011-2024 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.6.exe" VALUE "OriginalFilename", "rufus-4.6.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "4.6.2186" VALUE "ProductVersion", "4.6.2187"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

6
src/wue.c
View file

@ -31,6 +31,7 @@
#include "resource.h" #include "resource.h"
#include "registry.h" #include "registry.h"
#include "msapi_utf8.h" #include "msapi_utf8.h"
#include "timezoneapi.h"
#include "localization.h" #include "localization.h"
/* Memory leaks detection - define _CRTDBG_MAP_ALLOC as preprocessor macro */ /* Memory leaks detection - define _CRTDBG_MAP_ALLOC as preprocessor macro */
@ -64,6 +65,7 @@ char* CreateUnattendXml(int arch, int flags)
const static char* unallowed_account_names[] = { "Administrator", "Guest", "KRBTGT", "Local" }; const static char* unallowed_account_names[] = { "Administrator", "Guest", "KRBTGT", "Local" };
static char path[MAX_PATH]; static char path[MAX_PATH];
FILE* fd; FILE* fd;
TIME_ZONE_INFORMATION tz_info;
int i, order; int i, order;
unattend_xml_flags = flags; unattend_xml_flags = flags;
if (arch < ARCH_X86_32 || arch > ARCH_ARM_64 || flags == 0) { if (arch < ARCH_X86_32 || arch > ARCH_ARM_64 || flags == 0) {
@ -199,6 +201,10 @@ char* CreateUnattendXml(int arch, int flags)
ReadRegistryKeyStr(REGKEY_HKCU, "Keyboard Layout\\Preload\\1")); ReadRegistryKeyStr(REGKEY_HKCU, "Keyboard Layout\\Preload\\1"));
fprintf(fd, " <SystemLocale>%s</SystemLocale>\n", ToLocaleName(GetSystemDefaultLCID())); fprintf(fd, " <SystemLocale>%s</SystemLocale>\n", ToLocaleName(GetSystemDefaultLCID()));
fprintf(fd, " <UserLocale>%s</UserLocale>\n", ToLocaleName(GetUserDefaultLCID())); fprintf(fd, " <UserLocale>%s</UserLocale>\n", ToLocaleName(GetUserDefaultLCID()));
if (GetTimeZoneInformation(&tz_info) == TIME_ZONE_ID_INVALID)
uprintf("WARNING: Could not retrieve current timezone: %s", WindowsErrorString());
else
fprintf(fd, " <TimeZone>%S</TimeZone>\n", tz_info.StandardName);
fprintf(fd, " <UILanguage>%s</UILanguage>\n", ToLocaleName(GetUserDefaultUILanguage())); fprintf(fd, " <UILanguage>%s</UILanguage>\n", ToLocaleName(GetUserDefaultUILanguage()));
fprintf(fd, " <UILanguageFallback>%s</UILanguageFallback>\n", fprintf(fd, " <UILanguageFallback>%s</UILanguageFallback>\n",
// NB: Officially, this is a REG_MULTI_SZ string // NB: Officially, this is a REG_MULTI_SZ string