X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/4a693cfc5c3ee0e639bbee0215345e921715ab04..691b58ac4403cf73a1d71c6c2bbd5d8246d95699:/windows/window.c

diff --git a/windows/window.c b/windows/window.c
index 908c1f68..d558cc95 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -445,7 +445,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	    HANDLE filemap;
 	    void *cp;
 	    unsigned cpsize;
-	    if (sscanf(p + 1, "%p:%u", &filemap, &cpsize) == 1 &&
+	    if (sscanf(p + 1, "%p:%u", &filemap, &cpsize) == 2 &&
 		(cp = MapViewOfFile(filemap, FILE_MAP_READ,
 				    0, 0, cpsize)) != NULL) {
 		conf_deserialise(conf, cp, cpsize);
@@ -1433,7 +1433,7 @@ static void init_fonts(int pick_width, int pick_height)
 #define f(i,c,w,u) \
     fonts[i] = CreateFont (font_height, font_width, 0, 0, w, FALSE, u, FALSE, \
 			   c, OUT_DEFAULT_PRECIS, \
-		           CLIP_DEFAULT_PRECIS, quality, \
+		           CLIP_DEFAULT_PRECIS, FONT_QUALITY(quality), \
 			   FIXED_PITCH | FF_DONTCARE, font->name)
 
     f(FONT_NORMAL, font->charset, fw_dontcare, FALSE);
@@ -2934,7 +2934,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                      */
 		    need_backend_resize = TRUE;
 		    conf_set_int(conf, CONF_height, h);
-		    conf_set_int(conf, CONF_height, w);
+		    conf_set_int(conf, CONF_width, w);
                 } else {
                     term_size(term, h, w, conf_get_int(conf, CONF_savelines));
                 }
@@ -3594,8 +3594,8 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
 	    dec = dec * 2 - font_height;
 
 	oldpen = SelectObject(hdc, CreatePen(PS_SOLID, 0, fg));
-	MoveToEx(hdc, x, y + dec, NULL);
-	LineTo(hdc, x + len * char_width, y + dec);
+	MoveToEx(hdc, line_box.left, line_box.top + dec, NULL);
+	LineTo(hdc, line_box.right, line_box.top + dec);
 	oldpen = SelectObject(hdc, oldpen);
 	DeleteObject(oldpen);
     }