~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite of Unix sk_newlistener() which should fix any possible
[sgt/putty]
/
windows
/
windlg.c
diff --git
a/windows/windlg.c
b/windows/windlg.c
index
65018b1
..
3bad7c3
100644
(file)
--- a/
windows/windlg.c
+++ b/
windows/windlg.c
@@
-300,7
+300,7
@@
static void create_controls(HWND hwnd, char *path)
* Otherwise, we're creating the controls for a particular
* panel.
*/
* Otherwise, we're creating the controls for a particular
* panel.
*/
- ctlposinit(&cp, hwnd,
8
0, 3, 13);
+ ctlposinit(&cp, hwnd,
10
0, 3, 13);
wc = &ctrls_panel;
base_id = IDCX_PANELBASE;
}
wc = &ctrls_panel;
base_id = IDCX_PANELBASE;
}
@@
-361,7
+361,7
@@
static int CALLBACK GenericMainDlgProc(HWND hwnd, UINT msg,
HWND tvstatic;
r.left = 3;
HWND tvstatic;
r.left = 3;
- r.right = r.left +
7
5;
+ r.right = r.left +
9
5;
r.top = 3;
r.bottom = r.top + 10;
MapDialogRect(hwnd, &r);
r.top = 3;
r.bottom = r.top + 10;
MapDialogRect(hwnd, &r);
@@
-375,7
+375,7
@@
static int CALLBACK GenericMainDlgProc(HWND hwnd, UINT msg,
SendMessage(tvstatic, WM_SETFONT, font, MAKELPARAM(TRUE, 0));
r.left = 3;
SendMessage(tvstatic, WM_SETFONT, font, MAKELPARAM(TRUE, 0));
r.left = 3;
- r.right = r.left +
7
5;
+ r.right = r.left +
9
5;
r.top = 13;
r.bottom = r.top + 219;
MapDialogRect(hwnd, &r);
r.top = 13;
r.bottom = r.top + 219;
MapDialogRect(hwnd, &r);
@@
-598,7
+598,7
@@
int do_config(void)
int ret;
ctrlbox = ctrl_new_box();
int ret;
ctrlbox = ctrl_new_box();
- setup_config_box(ctrlbox, &sesslist, FALSE, 0);
+ setup_config_box(ctrlbox, &sesslist, FALSE, 0
, 0
);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), FALSE);
dp_init(&dp);
winctrl_init(&ctrls_base);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), FALSE);
dp_init(&dp);
winctrl_init(&ctrls_base);
@@
-624,7
+624,7
@@
int do_config(void)
return ret;
}
return ret;
}
-int do_reconfig(HWND hwnd)
+int do_reconfig(HWND hwnd
, int protcfginfo
)
{
Config backup_cfg;
int ret;
{
Config backup_cfg;
int ret;
@@
-632,7
+632,7
@@
int do_reconfig(HWND hwnd)
backup_cfg = cfg; /* structure copy */
ctrlbox = ctrl_new_box();
backup_cfg = cfg; /* structure copy */
ctrlbox = ctrl_new_box();
- setup_config_box(ctrlbox,
NULL, TRUE, cfg.protocol
);
+ setup_config_box(ctrlbox,
&sesslist, TRUE, cfg.protocol, protcfginfo
);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), TRUE);
dp_init(&dp);
winctrl_init(&ctrls_base);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), TRUE);
dp_init(&dp);
winctrl_init(&ctrls_base);
@@
-661,7
+661,7
@@
int do_reconfig(HWND hwnd)
void logevent(void *frontend, const char *string)
{
char timebuf[40];
void logevent(void *frontend, const char *string)
{
char timebuf[40];
-
time_t t
;
+
struct tm tm
;
log_eventlog(logctx, string);
log_eventlog(logctx, string);
@@
-670,9
+670,8
@@
void logevent(void *frontend, const char *string)
events = sresize(events, negsize, char *);
}
events = sresize(events, negsize, char *);
}
- time(&t);
- strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t",
- localtime(&t));
+ tm=ltime();
+ strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t", &tm);
events[nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
strcpy(events[nevents], timebuf);
events[nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
strcpy(events[nevents], timebuf);