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

[loc] drop GetMuiString() and use formal loc data instead

Browse source 
* Relying on system MUIs was too brittle and provides us with no guarantee
  that the translated messages we need will actually be there.
* Also fix space before question mark in French translation.
This commit is contained in:
Pete Batard 2019-01-09 15:53:44 +00:00
parent 78d0cb892e
commit 336e24c8c7
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
6 changed files with 73 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/rufus.c
View file

@ -1788,7 +1788,7 @@ static BOOL CheckDriveAccess(DWORD dwTimeOut)
BYTE access_mask;
char *PhysicalPath = NULL, DevPath[MAX_PATH];
char drive_letter[27], drive_name[] = "?:";
char *message, title[128];
char title[128];
uint64_t cur_time, end_time = GetTickCount64() + dwTimeOut;
// Get the current selected device
@ -1835,16 +1835,8 @@ static BOOL CheckDriveAccess(DWORD dwTimeOut)
// Prompt the user if we detected blocking processes
if (!proceed) {
// We'll use a system translated string instead of one from rufus.loc
message = GetMuiString("shell32.dll", 28701); // "This drive is in use (...) Do you want to format it anyway?"
if (message != NULL) {
ComboBox_GetTextU(hDeviceList, title, sizeof(title));
proceed = Notification(MSG_WARNING_QUESTION, NULL, NULL, title, message);
free(message);
} else {
proceed = Notification(MSG_WARNING_QUESTION, NULL, NULL, title,
"This drive is in use. Do you want to format it anyway?");
}
ComboBox_GetTextU(hDeviceList, title, sizeof(title));
proceed = Notification(MSG_WARNING_QUESTION, NULL, NULL, title, lmprintf(MSG_132));
}
ret = proceed;