X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0bd8d76d08b2f222bc624a9b85e482a6e2629710..7440fd4419acfc9c784f142fb9dee3e64c9a18c2:/winctrls.c

diff --git a/winctrls.c b/winctrls.c
index 05c8f0d3..4a35cb6b 100644
--- a/winctrls.c
+++ b/winctrls.c
@@ -13,17 +13,14 @@
  *    button.
  */
 
-#include <windows.h>
-#include <commctrl.h>
 #include <assert.h>
 #include <ctype.h>
 
-#include "winstuff.h"
+#include "putty.h"
 #include "misc.h"
 #include "dialog.h"
-#include "puttymem.h"
 
-#include "putty.h"
+#include <commctrl.h>
 
 #define GAPBETWEEN 3
 #define GAPWITHIN 1
@@ -287,9 +284,10 @@ void radioline(struct ctlpos *cp, char *text, int id, int nacross, ...)
 	if (!btext)
 	    break;
 	bid = va_arg(ap, int);
+	nbuttons++;
     }
     va_end(ap);
-    buttons = smalloc(nbuttons * sizeof(struct radio));
+    buttons = snewn(nbuttons, struct radio);
     va_start(ap, nacross);
     for (i = 0; i < nbuttons; i++) {
 	buttons[i].text = va_arg(ap, char *);
@@ -320,7 +318,7 @@ void bareradioline(struct ctlpos *cp, int nacross, ...)
 	bid = va_arg(ap, int);
     }
     va_end(ap);
-    buttons = smalloc(nbuttons * sizeof(struct radio));
+    buttons = snewn(nbuttons, struct radio);
     va_start(ap, nacross);
     for (i = 0; i < nbuttons; i++) {
 	buttons[i].text = va_arg(ap, char *);
@@ -351,7 +349,7 @@ void radiobig(struct ctlpos *cp, char *text, int id, ...)
 	bid = va_arg(ap, int);
     }
     va_end(ap);
-    buttons = smalloc(nbuttons * sizeof(struct radio));
+    buttons = snewn(nbuttons, struct radio);
     va_start(ap, id);
     for (i = 0; i < nbuttons; i++) {
 	buttons[i].text = va_arg(ap, char *);
@@ -395,10 +393,10 @@ char *staticwrap(struct ctlpos *cp, HWND hwnd, char *text, int *lines)
     RECT r;
     HFONT oldfont, newfont;
 
-    ret = smalloc(1+strlen(text));
+    ret = snewn(1+strlen(text), char);
     p = text;
     q = ret;
-    pwidths = smalloc(sizeof(INT)*(1+strlen(text)));
+    pwidths = snewn(1+strlen(text), INT);
 
     /*
      * Work out the width the text will need to fit in, by doing
@@ -973,7 +971,7 @@ static void pl_moveitem(HWND hwnd, int listid, int src, int dst)
     char *txt;
     /* Get the item's data. */
     tlen = SendDlgItemMessage (hwnd, listid, LB_GETTEXTLEN, src, 0);
-    txt = smalloc(tlen+1);
+    txt = snewn(tlen+1, char);
     SendDlgItemMessage (hwnd, listid, LB_GETTEXT, src, (LPARAM) txt);
     val = SendDlgItemMessage (hwnd, listid, LB_GETITEMDATA, src, 0);
     /* Deselect old location. */
@@ -1176,7 +1174,7 @@ static char *shortcut_escape(char *text, char shortcut)
     if (!text)
 	return NULL;		       /* sfree won't choke on this */
 
-    ret = smalloc(2*strlen(text)+1);   /* size potentially doubles! */
+    ret = snewn(2*strlen(text)+1, char);   /* size potentially doubles! */
     shortcut = tolower((unsigned char)shortcut);
 
     p = text;
@@ -1338,7 +1336,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
 
     /* Start a containing box, if we have a boxname. */
     if (s->boxname && *s->boxname) {
-	struct winctrl *c = smalloc(sizeof(struct winctrl));
+	struct winctrl *c = snew(struct winctrl);
     	c->ctrl = NULL;
 	c->base_id = base_id;
 	c->num_ids = 1;
@@ -1351,7 +1349,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
 
     /* Draw a title, if we have one. */
     if (!s->boxname && s->boxtitle) {
-	struct winctrl *c = smalloc(sizeof(struct winctrl));
+	struct winctrl *c = snew(struct winctrl);
     	c->ctrl = NULL;
 	c->base_id = base_id;
 	c->num_ids = 1;
@@ -1534,7 +1532,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
 					  ctrl->radio.shortcut);
 		shortcuts[nshortcuts++] = ctrl->radio.shortcut;
 
-		buttons = smalloc(ctrl->radio.nbuttons * sizeof(struct radio));
+		buttons = snewn(ctrl->radio.nbuttons, struct radio);
 
 		for (i = 0; i < ctrl->radio.nbuttons; i++) {
 		    buttons[i].text =
@@ -1584,7 +1582,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
 				      ctrl->listbox.shortcut);
 	    shortcuts[nshortcuts++] = ctrl->listbox.shortcut;
 	    if (ctrl->listbox.draglist) {
-		data = smalloc(sizeof(struct prefslist));
+		data = snew(struct prefslist);
 		num_ids = 4;
 		prefslist(data, &pos, ctrl->listbox.height, escaped,
 			  base_id, base_id+1, base_id+2, base_id+3);
@@ -1616,7 +1614,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
 		int *tabarray;
 		int i, percent;
 
-		tabarray = smalloc((ctrl->listbox.ncols-1) * sizeof(int));
+		tabarray = snewn(ctrl->listbox.ncols-1, int);
 		percent = 0;
 		for (i = 0; i < ctrl->listbox.ncols-1; i++) {
 		    percent += ctrl->listbox.percentages[i];
@@ -1646,7 +1644,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
 	    statictext(&pos, escaped, 1, base_id);
 	    staticbtn(&pos, "", base_id+1, "Change...", base_id+2);
 	    sfree(escaped);
-	    data = smalloc(sizeof(FontSpec));
+	    data = snew(FontSpec);
 	    break;
 	  default:
 	    assert(!"Can't happen");
@@ -1660,7 +1658,7 @@ void winctrl_layout(struct dlgparam *dp, struct winctrls *wc,
 	 * (and isn't tabdelayed).
 	 */
 	if (pos.hwnd) {
-	    struct winctrl *c = smalloc(sizeof(struct winctrl));
+	    struct winctrl *c = snew(struct winctrl);
 
 	    c->ctrl = ctrl;
 	    c->base_id = actual_base_id;
@@ -1814,7 +1812,7 @@ int winctrl_handle_command(struct dlgparam *dp, UINT msg,
 					   CB_GETCURSEL, 0, 0);
 		len = SendDlgItemMessage(dp->hwnd, c->base_id+1,
 					 CB_GETLBTEXTLEN, index, 0);
-		text = smalloc(len+1);
+		text = snewn(len+1, char);
 		SendDlgItemMessage(dp->hwnd, c->base_id+1, CB_GETLBTEXT,
 				   index, (LPARAM)text);
 		SetDlgItemText(dp->hwnd, c->base_id+1, text);
@@ -1899,6 +1897,8 @@ int winctrl_handle_command(struct dlgparam *dp, UINT msg,
 	if (msg == WM_COMMAND && id == 2 &&
 	    (HIWORD(wParam) == BN_SETFOCUS || HIWORD(wParam) == BN_KILLFOCUS))
 	    winctrl_set_focus(ctrl, dp, HIWORD(wParam) == BN_SETFOCUS);
+	if (msg == WM_COMMAND && id == 1 && HIWORD(wParam) == EN_CHANGE)
+	    ctrl->generic.handler(ctrl, dp, dp->data, EVENT_VALCHANGE);
 	if (id == 2 &&
 	    (msg == WM_COMMAND &&
 	     (HIWORD(wParam) == BN_CLICKED ||
@@ -2177,8 +2177,8 @@ void dlg_listbox_add(union control *ctrl, void *dlg, char const *text)
  * strings in any listbox then you MUST not assign them different
  * IDs and expect to get meaningful results back.
  */
-void dlg_listbox_addwithindex(union control *ctrl, void *dlg,
-			      char const *text, int id)
+void dlg_listbox_addwithid(union control *ctrl, void *dlg,
+			   char const *text, int id)
 {
     struct dlgparam *dp = (struct dlgparam *)dlg;
     struct winctrl *c = dlg_findbyctrl(dp, ctrl);
@@ -2456,7 +2456,7 @@ void dp_init(struct dlgparam *dp)
     dp->focused = dp->lastfocused = NULL;
     memset(dp->shortcuts, 0, sizeof(dp->shortcuts));
     dp->hwnd = NULL;
-    dp->errtitle = NULL;
+    dp->wintitle = dp->errtitle = NULL;
     dp->privdata = newtree234(perctrl_privdata_cmp);
 }
 
@@ -2480,6 +2480,8 @@ void dp_cleanup(struct dlgparam *dp)
 	freetree234(dp->privdata);
 	dp->privdata = NULL;
     }
+    sfree(dp->wintitle);
+    sfree(dp->errtitle);
 }
 
 void *dlg_get_privdata(union control *ctrl, void *dlg)
@@ -2501,7 +2503,7 @@ void dlg_set_privdata(union control *ctrl, void *dlg, void *ptr)
     tmp.ctrl = ctrl;
     p = find234(dp->privdata, &tmp, NULL);
     if (!p) {
-	p = smalloc(sizeof(struct perctrl_privdata));
+	p = snew(struct perctrl_privdata);
 	p->ctrl = ctrl;
 	p->needs_free = FALSE;
 	add234(dp->privdata, p);
@@ -2516,13 +2518,17 @@ void *dlg_alloc_privdata(union control *ctrl, void *dlg, size_t size)
     tmp.ctrl = ctrl;
     p = find234(dp->privdata, &tmp, NULL);
     if (!p) {
-	p = smalloc(sizeof(struct perctrl_privdata));
+	p = snew(struct perctrl_privdata);
 	p->ctrl = ctrl;
 	p->needs_free = FALSE;
 	add234(dp->privdata, p);
     }
     assert(!p->needs_free);
     p->needs_free = TRUE;
+    /*
+     * This is an internal allocation routine, so it's allowed to
+     * use smalloc directly.
+     */
     p->data = smalloc(size);
     return p->data;
 }