projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduced wrapper macros snew(), snewn() and sresize() for the
[u/mdw/putty]
/
puttygen.c
diff --git
a/puttygen.c
b/puttygen.c
index
d7094a3
..
e16b4f3
100644
(file)
--- a/
puttygen.c
+++ b/
puttygen.c
@@
-297,7
+297,7
@@
static int CALLBACK AboutProc(HWND hwnd, UINT msg,
return 0;
case 101:
EnableWindow(hwnd, 0);
return 0;
case 101:
EnableWindow(hwnd, 0);
- DialogBox(hinst, MAKEINTRESOURCE(214),
NULL
, LicenceProc);
+ DialogBox(hinst, MAKEINTRESOURCE(214),
hwnd
, LicenceProc);
EnableWindow(hwnd, 1);
SetActiveWindow(hwnd);
return 0;
EnableWindow(hwnd, 1);
SetActiveWindow(hwnd);
return 0;
@@
-389,8
+389,8
@@
static void setupbigedit2(HWND hwnd, int id, int idstatic,
int i;
pub_blob = key->alg->public_blob(key->data, &pub_len);
int i;
pub_blob = key->alg->public_blob(key->data, &pub_len);
- buffer = s
malloc
(strlen(key->alg->name) + 4 * ((pub_len + 2) / 3) +
-
strlen(key->comment) + 3
);
+ buffer = s
newn
(strlen(key->alg->name) + 4 * ((pub_len + 2) / 3) +
+
strlen(key->comment) + 3, char
);
strcpy(buffer, key->alg->name);
p = buffer + strlen(buffer);
*p++ = ' ';
strcpy(buffer, key->alg->name);
p = buffer + strlen(buffer);
*p++ = ' ';
@@
-820,7
+820,7
@@
static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
SendMessage(hwnd, WM_SETICON, (WPARAM) ICON_BIG,
(LPARAM) LoadIcon(hinst, MAKEINTRESOURCE(200)));
SendMessage(hwnd, WM_SETICON, (WPARAM) ICON_BIG,
(LPARAM) LoadIcon(hinst, MAKEINTRESOURCE(200)));
- state = s
malloc(sizeof(*state)
);
+ state = s
new(struct MainDlgState
);
state->generation_thread_exists = FALSE;
state->collecting_entropy = FALSE;
state->entropy = NULL;
state->generation_thread_exists = FALSE;
state->collecting_entropy = FALSE;
state->entropy = NULL;
@@
-974,7
+974,7
@@
static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
MAKELPARAM(0, PROGRESSRANGE));
SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, 0, 0);
MAKELPARAM(0, PROGRESSRANGE));
SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, 0, 0);
- params = s
malloc(sizeof(*params)
);
+ params = s
new(struct rsa_key_thread_params
);
params->progressbar = GetDlgItem(hwnd, IDC_PROGRESS);
params->dialog = hwnd;
params->keysize = state->keysize;
params->progressbar = GetDlgItem(hwnd, IDC_PROGRESS);
params->dialog = hwnd;
params->keysize = state->keysize;
@@
-1021,7
+1021,7
@@
static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
int len = GetWindowTextLength(editctl);
if (*state->commentptr)
sfree(*state->commentptr);
int len = GetWindowTextLength(editctl);
if (*state->commentptr)
sfree(*state->commentptr);
- *state->commentptr = s
malloc(len + 1
);
+ *state->commentptr = s
newn(len + 1, char
);
GetWindowText(editctl, *state->commentptr, len + 1);
if (state->ssh2) {
setupbigedit2(hwnd, IDC_KEYDISPLAY, IDC_PKSTATIC,
GetWindowText(editctl, *state->commentptr, len + 1);
if (state->ssh2) {
setupbigedit2(hwnd, IDC_KEYDISPLAY, IDC_PKSTATIC,
@@
-1035,7
+1035,7
@@
static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
break;
case IDC_ABOUT:
EnableWindow(hwnd, 0);
break;
case IDC_ABOUT:
EnableWindow(hwnd, 0);
- DialogBox(hinst, MAKEINTRESOURCE(213),
NULL
, AboutProc);
+ DialogBox(hinst, MAKEINTRESOURCE(213),
hwnd
, AboutProc);
EnableWindow(hwnd, 1);
SetActiveWindow(hwnd);
return 0;
EnableWindow(hwnd, 1);
SetActiveWindow(hwnd);
return 0;
@@
-1050,6
+1050,9
@@
static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
}
return 0;
case IDC_GENERATE:
}
return 0;
case IDC_GENERATE:
+ if (HIWORD(wParam) != BN_CLICKED &&
+ HIWORD(wParam) != BN_DOUBLECLICKED)
+ break;
state =
(struct MainDlgState *) GetWindowLong(hwnd, GWL_USERDATA);
if (!state->generation_thread_exists) {
state =
(struct MainDlgState *) GetWindowLong(hwnd, GWL_USERDATA);
if (!state->generation_thread_exists) {
@@
-1093,8
+1096,8
@@
static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
state->entropy_required = (state->keysize / 2) * 2;
state->entropy_got = 0;
state->entropy_size = (state->entropy_required *
state->entropy_required = (state->keysize / 2) * 2;
state->entropy_got = 0;
state->entropy_size = (state->entropy_required *
- sizeof(
*state->entropy
));
- state->entropy = s
malloc(state->entropy_size
);
+ sizeof(
unsigned
));
+ state->entropy = s
newn(state->entropy_required, unsigned
);
SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0,
MAKELPARAM(0, state->entropy_required));
SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0,
MAKELPARAM(0, state->entropy_required));
@@
-1267,7
+1270,7
@@
static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
* the user will immediately want to change it, which is
* what we want :-)
*/
* the user will immediately want to change it, which is
* what we want :-)
*/
- *state->commentptr = s
malloc(30
);
+ *state->commentptr = s
newn(30, char
);
{
time_t t;
struct tm *tm;
{
time_t t;
struct tm *tm;