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

[ui] better bad blocks reports

Browse source 
* improved status bar printout (priority messages with timeout)
* report with abort/retry/cancel on bad block detection
* also MinGW warning fixes
This commit is contained in:
Pete Batard 2011-12-08 00:22:13 +00:00
parent f93a85ab83
commit b006e6a837
8 changed files with 85 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/stdio.c
View file

@ -122,24 +122,46 @@ static char err_string[256];
return err_string;
}
void PrintStatus(const char *format, ...)
/*
* Display a message on the status bar. If duration is non zero, ensures that message
* is displayed for at least duration ms regardless, regardless of any other incoming
* message
*/
static BOOL bStatusTimerArmed = FALSE;
static char szStatusMessage[256] = { 0 };
static void CALLBACK PrintStatusTimeout(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
{
char buf[256], *p = buf;
bStatusTimerArmed = FALSE;
// potentially display lower priority message that was overridden
SetDlgItemTextU(hMainDialog, IDC_STATUS, szStatusMessage);
KillTimer(hMainDialog, PRINTSTATUS_TIMER_ID);
}
void PrintStatus(unsigned int duration, const char *format, ...)
{
char *p = szStatusMessage;
va_list args;
int n;
va_start(args, format);
n = safe_vsnprintf(p, sizeof(buf)-1, format, args); // room for NUL
n = safe_vsnprintf(p, sizeof(szStatusMessage)-1, format, args); // room for NUL
va_end(args);
p += (n < 0)?sizeof(buf)-1:n;
p += (n < 0)?sizeof(szStatusMessage)-1:n;
while((p>buf) && (isspace(p[-1])))
while((p>szStatusMessage) && (isspace(p[-1])))
*--p = '\0';
*p = '\0';
SetDlgItemTextU(hMainDialog, IDC_STATUS, buf);
if ((duration) || (!bStatusTimerArmed)) {
SetDlgItemTextU(hMainDialog, IDC_STATUS, szStatusMessage);
}
if (duration) {
SetTimer(hMainDialog, PRINTSTATUS_TIMER_ID, duration, PrintStatusTimeout);
bStatusTimerArmed = TRUE;
}
}
const char* StrError(DWORD error_code)