X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/37ca32ed18b3e104c1056713f5112b90c6547e89..a460b361fe6734325bead016ef2dd39e4da302f4:/window.c

diff --git a/window.c b/window.c
index b1fb5fee..326d19c9 100644
--- a/window.c
+++ b/window.c
@@ -600,7 +600,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     {
 	char *bits;
 	int size = (font_width + 15) / 16 * 2 * font_height;
-	bits = smalloc(size);
+	bits = snewn(size, char);
 	memset(bits, 0, size);
 	caretbm = CreateBitmap(font_width, font_height, 1, 1, bits);
 	sfree(bits);
@@ -788,9 +788,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    if (pending_netevent) {
 		enact_pending_netevent();
 
-		/* Force the cursor blink on */
-		term_blink(term, 1);
-
 		if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
 		    continue;
 	    }
@@ -999,6 +996,10 @@ static void init_palette(void)
     HDC hdc = GetDC(hwnd);
     if (hdc) {
 	if (cfg.try_palette && GetDeviceCaps(hdc, RASTERCAPS) & RC_PALETTE) {
+	    /*
+	     * This is a genuine case where we must use smalloc
+	     * because the snew macros can't cope.
+	     */
 	    logpal = smalloc(sizeof(*logpal)
 			     - sizeof(logpal->palPalEntry)
 			     + NCOLOURS * sizeof(PALETTEENTRY));
@@ -1062,7 +1063,7 @@ static void init_fonts(int pick_width, int pick_height)
     bold_mode = cfg.bold_colour ? BOLD_COLOURS : BOLD_FONT;
     und_mode = UND_FONT;
 
-    if (cfg.fontisbold) {
+    if (cfg.font.isbold) {
 	fw_dontcare = FW_BOLD;
 	fw_bold = FW_HEAVY;
     } else {
@@ -1075,7 +1076,7 @@ static void init_fonts(int pick_width, int pick_height)
     if (pick_height)
 	font_height = pick_height;
     else {
-	font_height = cfg.fontheight;
+	font_height = cfg.font.height;
 	if (font_height > 0) {
 	    font_height =
 		-MulDiv(font_height, GetDeviceCaps(hdc, LOGPIXELSY), 72);
@@ -1087,9 +1088,9 @@ static void init_fonts(int pick_width, int pick_height)
     fonts[i] = CreateFont (font_height, font_width, 0, 0, w, FALSE, u, FALSE, \
 			   c, OUT_DEFAULT_PRECIS, \
 		           CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, \
-			   FIXED_PITCH | FF_DONTCARE, cfg.font)
+			   FIXED_PITCH | FF_DONTCARE, cfg.font.name)
 
-    f(FONT_NORMAL, cfg.fontcharset, fw_dontcare, FALSE);
+    f(FONT_NORMAL, cfg.font.charset, fw_dontcare, FALSE);
 
     lfont.lfHeight = font_height;
     lfont.lfWidth = font_width;
@@ -1099,12 +1100,12 @@ static void init_fonts(int pick_width, int pick_height)
     lfont.lfItalic = FALSE;
     lfont.lfUnderline = FALSE;
     lfont.lfStrikeOut = FALSE;
-    lfont.lfCharSet = cfg.fontcharset;
+    lfont.lfCharSet = cfg.font.charset;
     lfont.lfOutPrecision = OUT_DEFAULT_PRECIS;
     lfont.lfClipPrecision = CLIP_DEFAULT_PRECIS;
     lfont.lfQuality = DEFAULT_QUALITY;
     lfont.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
-    strncpy(lfont.lfFaceName, cfg.font, LF_FACESIZE);
+    strncpy(lfont.lfFaceName, cfg.font.name, LF_FACESIZE);
 
     SelectObject(hdc, fonts[FONT_NORMAL]);
     GetTextMetrics(hdc, &tm);
@@ -1138,7 +1139,7 @@ static void init_fonts(int pick_width, int pick_height)
 	ucsdata.dbcs_screenfont = (cpinfo.MaxCharSize > 1);
     }
 
-    f(FONT_UNDERLINE, cfg.fontcharset, fw_dontcare, TRUE);
+    f(FONT_UNDERLINE, cfg.font.charset, fw_dontcare, TRUE);
 
     /*
      * Some fonts, e.g. 9-pt Courier, draw their underlines
@@ -1189,7 +1190,7 @@ static void init_fonts(int pick_width, int pick_height)
     }
 
     if (bold_mode == BOLD_FONT) {
-	f(FONT_BOLD, cfg.fontcharset, fw_bold, FALSE);
+	f(FONT_BOLD, cfg.font.charset, fw_bold, FALSE);
     }
 #undef f
 
@@ -1240,7 +1241,7 @@ static void another_font(int fontno)
     if (basefont != fontno && !fontflag[basefont])
 	another_font(basefont);
 
-    if (cfg.fontisbold) {
+    if (cfg.font.isbold) {
 	fw_dontcare = FW_BOLD;
 	fw_bold = FW_HEAVY;
     } else {
@@ -1248,10 +1249,10 @@ static void another_font(int fontno)
 	fw_bold = FW_BOLD;
     }
 
-    c = cfg.fontcharset;
+    c = cfg.font.charset;
     w = fw_dontcare;
     u = FALSE;
-    s = cfg.font;
+    s = cfg.font.name;
     x = font_width;
 
     if (fontno & FONT_WIDE)
@@ -1723,7 +1724,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		    if ((lParam - IDM_SAVED_MIN) / 16 < sesslist.nsessions) {
 			char *session =
 			    sesslist.sessions[(lParam - IDM_SAVED_MIN) / 16];
-			cl = smalloc(16 + strlen(session));
+			cl = snewn(16 + strlen(session), char);
 				       /* 8, but play safe */
 			if (!cl)
 			    cl = NULL;    
@@ -1878,11 +1879,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 				  icon_name);
 		}
 
-		if (strcmp(cfg.font, prev_cfg.font) != 0 ||
+		if (strcmp(cfg.font.name, prev_cfg.font.name) != 0 ||
 		    strcmp(cfg.line_codepage, prev_cfg.line_codepage) != 0 ||
-		    cfg.fontisbold != prev_cfg.fontisbold ||
-		    cfg.fontheight != prev_cfg.fontheight ||
-		    cfg.fontcharset != prev_cfg.fontcharset ||
+		    cfg.font.isbold != prev_cfg.font.isbold ||
+		    cfg.font.height != prev_cfg.font.height ||
+		    cfg.font.charset != prev_cfg.font.charset ||
 		    cfg.vtmode != prev_cfg.vtmode ||
 		    cfg.bold_colour != prev_cfg.bold_colour ||
 		    cfg.resize_action == RESIZE_DISABLED ||
@@ -2531,7 +2532,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 
 	    if (n > 0) {
 		int i;
-		buff = (char*) smalloc(n);
+		buff = snewn(n, char);
 		ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, buff, n);
 		/*
 		 * Jaeyoun Chung reports that Korean character
@@ -2719,7 +2720,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	int i;
 	if (len > IpDxLEN) {
 	    sfree(IpDx);
-	    IpDx = smalloc((len + 16) * sizeof(int));
+	    IpDx = snewn(len + 16, int);
 	    IpDxLEN = (len + 16);
 	}
 	for (i = 0; i < IpDxLEN; i++)
@@ -2850,7 +2851,8 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	int nlen, mptr;
 	if (len > uni_len) {
 	    sfree(uni_buf);
-	    uni_buf = smalloc((uni_len = len) * sizeof(wchar_t));
+	    uni_len = len;
+	    uni_buf = snewn(uni_len, wchar_t);
 	}
 
 	for(nlen = mptr = 0; mptr<len; mptr++) {
@@ -2910,7 +2912,7 @@ void do_text(Context ctx, int x, int y, char *text, int len,
 	if (wlen < len) {
 	    sfree(wbuf);
 	    wlen = len;
-	    wbuf = smalloc(wlen * sizeof(WCHAR));
+	    wbuf = snewn(wlen, WCHAR);
 	}
 	for (i = 0; i < len; i++)
 	    wbuf[i] = (WCHAR) ((attr & CSET_MASK) + (text[i] & CHAR_MASK));
@@ -3920,7 +3922,7 @@ void request_paste(void *frontend)
 void set_title(void *frontend, char *title)
 {
     sfree(window_name);
-    window_name = smalloc(1 + strlen(title));
+    window_name = snewn(1 + strlen(title), char);
     strcpy(window_name, title);
     if (cfg.win_name_always || !IsIconic(hwnd))
 	SetWindowText(hwnd, title);
@@ -3929,7 +3931,7 @@ void set_title(void *frontend, char *title)
 void set_icon(void *frontend, char *title)
 {
     sfree(icon_name);
-    icon_name = smalloc(1 + strlen(title));
+    icon_name = snewn(1 + strlen(title), char);
     strcpy(icon_name, title);
     if (!cfg.win_name_always && IsIconic(hwnd))
 	SetWindowText(hwnd, title);
@@ -4099,10 +4101,10 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
 
 	get_unitab(CP_ACP, unitab, 0);
 
-	rtfsize = 100 + strlen(cfg.font);
-	rtf = smalloc(rtfsize);
+	rtfsize = 100 + strlen(cfg.font.name);
+	rtf = snewn(rtfsize, char);
 	sprintf(rtf, "{\\rtf1\\ansi%d{\\fonttbl\\f0\\fmodern %s;}\\f0",
-		GetACP(), cfg.font);
+		GetACP(), cfg.font.name);
 	rtflen = strlen(rtf);
 
 	/*
@@ -4165,7 +4167,7 @@ void write_clip(void *frontend, wchar_t * data, int len, int must_deselect)
 
 	    if (rtfsize < rtflen + totallen + 3) {
 		rtfsize = rtflen + totallen + 512;
-		rtf = srealloc(rtf, rtfsize);
+		rtf = sresize(rtf, rtfsize, char);
 	    }
 
 	    strcpy(rtf + rtflen, before); rtflen += blen;
@@ -4253,7 +4255,7 @@ void get_clip(void *frontend, wchar_t ** p, int *len)
 	    CloseClipboard();
 	    s = GlobalLock(clipdata);
 	    i = MultiByteToWideChar(CP_ACP, 0, s, strlen(s) + 1, 0, 0);
-	    *p = converted = smalloc(i * sizeof(wchar_t));
+	    *p = converted = snewn(i, wchar_t);
 	    MultiByteToWideChar(CP_ACP, 0, s, strlen(s) + 1, converted, i);
 	    *len = i - 1;
 	    return;
@@ -4378,7 +4380,8 @@ void beep(void *frontend, int mode)
 	 */
 	lastbeep = GetTickCount();
     } else if (mode == BELL_WAVEFILE) {
-	if (!PlaySound(cfg.bell_wavefile, NULL, SND_ASYNC | SND_FILENAME)) {
+	if (!PlaySound(cfg.bell_wavefile.path, NULL,
+		       SND_ASYNC | SND_FILENAME)) {
 	    char buf[sizeof(cfg.bell_wavefile) + 80];
 	    sprintf(buf, "Unable to play sound file\n%s\n"
 		    "Using default sound instead", cfg.bell_wavefile);