projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remember to initialise p->nphases to zero in progress report structure.
[u/mdw/putty]
/
puttygen.c
diff --git
a/puttygen.c
b/puttygen.c
index
6d134c4
..
4ac0fef
100644
(file)
--- a/
puttygen.c
+++ b/
puttygen.c
@@
-44,6
+44,9
@@
static void progress_update(void *param, int action, int phase, int iprogress)
if (action < PROGFN_READY && p->nphases < phase)
p->nphases = phase;
switch (action) {
if (action < PROGFN_READY && p->nphases < phase)
p->nphases = phase;
switch (action) {
+ case PROGFN_INITIALISE:
+ p->nphases = 0;
+ break;
case PROGFN_LIN_PHASE:
p->phases[phase-1].exponential = 0;
p->phases[phase-1].mult = p->phases[phase].total / progress;
case PROGFN_LIN_PHASE:
p->phases[phase-1].exponential = 0;
p->phases[phase-1].mult = p->phases[phase].total / progress;
@@
-302,6
+305,8
@@
static DWORD WINAPI generate_rsa_key_thread(void *param)
struct progress prog;
prog.progbar = params->progressbar;
struct progress prog;
prog.progbar = params->progressbar;
+ progress_update(&prog, PROGFN_INITIALISE, 0, 0);
+
if (params->is_dsa)
dsa_generate(params->dsskey, params->keysize, progress_update, &prog);
else
if (params->is_dsa)
dsa_generate(params->dsskey, params->keysize, progress_update, &prog);
else