X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/puzzles/blobdiff_plain/3fee7a57faa025c2785c79625075761e91e98dba..550742c19aa64ef9033f2b796c5ecd7fa135962d:/windows.c

diff --git a/windows.c b/windows.c
index b93847d..f4cbfe4 100644
--- a/windows.c
+++ b/windows.c
@@ -1,14 +1,5 @@
 /*
  * windows.c: Windows front end for my puzzle collection.
- * 
- * TODO:
- * 
- *  - Figure out what to do if a puzzle requests a size bigger than
- *    the screen will take. In principle we could put scrollbars in
- *    the window, although that would be pretty horrid. Another
- *    option is to detect in advance that this will be a problem -
- *    we can probably tell this using midend_size() before actually
- *    generating the puzzle - and simply refuse to do it.
  */
 
 #include <windows.h>
@@ -37,12 +28,15 @@
 #define IDM_HELPC     0x00B0
 #define IDM_GAMEHELP  0x00C0
 #define IDM_ABOUT     0x00D0
-#define IDM_PRESETS   0x0100
+#define IDM_SAVE      0x00E0
+#define IDM_LOAD      0x00F0
+#define IDM_PRINT     0x0100
+#define IDM_PRESETS   0x0110
 
 #define HELP_FILE_NAME  "puzzles.hlp"
 #define HELP_CNT_NAME   "puzzles.cnt"
 
-#ifdef DEBUG
+#ifdef DEBUGGING
 static FILE *debug_fp = NULL;
 static HANDLE debug_hdl = INVALID_HANDLE_VALUE;
 static int debug_got_console = 0;
@@ -80,6 +74,11 @@ void debug_printf(char *fmt, ...)
 }
 #endif
 
+#define WINFLAGS (WS_OVERLAPPEDWINDOW &~ \
+		      (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED))
+
+static void new_game_size(frontend *fe);
+
 struct font {
     HFONT font;
     int type;
@@ -90,12 +89,20 @@ struct cfg_aux {
     int ctlid;
 };
 
+struct blitter {
+    HBITMAP bitmap;
+    frontend *fe;
+    int x, y, w, h;
+};
+
+enum { CFG_PRINT = CFG_FRONTEND_SPECIFIC };
+
 struct frontend {
-    midend_data *me;
+    midend *me;
     HWND hwnd, statusbar, cfgbox;
     HINSTANCE inst;
     HBITMAP bitmap, prevbm;
-    HDC hdc_bm;
+    HDC hdc;
     COLORREF *colours;
     HBRUSH *brushes;
     HPEN *pens;
@@ -110,9 +117,19 @@ struct frontend {
     struct cfg_aux *cfgaux;
     int cfg_which, dlg_done;
     HFONT cfgfont;
+    HBRUSH oldbr;
+    HPEN oldpen;
     char *help_path;
     int help_has_contents;
-    char *laststatus;
+    enum { DRAWING, PRINTING, NOTHING } drawstatus;
+    DOCINFO di;
+    int printcount, printw, printh, printsolns, printcurr, printcolour;
+    float printscale;
+    int printoffsetx, printoffsety;
+    float printpixelscale;
+    int fontstart;
+    int linewidth;
+    drawing *dr;
 };
 
 void fatal(char *fmt, ...)
@@ -129,6 +146,28 @@ void fatal(char *fmt, ...)
     exit(1);
 }
 
+char *geterrstr(void)
+{
+    LPVOID lpMsgBuf;
+    DWORD dw = GetLastError();
+    char *ret;
+
+    FormatMessage(
+        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
+        FORMAT_MESSAGE_FROM_SYSTEM,
+        NULL,
+        dw,
+        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+        (LPTSTR) &lpMsgBuf,
+        0, NULL );
+
+    ret = dupstr(lpMsgBuf);
+
+    LocalFree(lpMsgBuf);
+
+    return ret;
+}
+
 void get_random_seed(void **randseed, int *randseedsize)
 {
     time_t *tp = snew(time_t);
@@ -137,16 +176,93 @@ void get_random_seed(void **randseed, int *randseedsize)
     *randseedsize = sizeof(time_t);
 }
 
-void status_bar(frontend *fe, char *text)
+static void win_status_bar(void *handle, char *text)
 {
-    char *rewritten = midend_rewrite_statusbar(fe->me, text);
-    if (!fe->laststatus || strcmp(rewritten, fe->laststatus)) {
-	SetWindowText(fe->statusbar, rewritten);
-	sfree(fe->laststatus);
-	fe->laststatus = rewritten;
-    } else {
-	sfree(rewritten);
-    }
+    frontend *fe = (frontend *)handle;
+
+    SetWindowText(fe->statusbar, text);
+}
+
+static blitter *win_blitter_new(void *handle, int w, int h)
+{
+    blitter *bl = snew(blitter);
+
+    memset(bl, 0, sizeof(blitter));
+    bl->w = w;
+    bl->h = h;
+    bl->bitmap = 0;
+
+    return bl;
+}
+
+static void win_blitter_free(void *handle, blitter *bl)
+{
+    if (bl->bitmap) DeleteObject(bl->bitmap);
+    sfree(bl);
+}
+
+static void blitter_mkbitmap(frontend *fe, blitter *bl)
+{
+    HDC hdc = GetDC(fe->hwnd);
+    bl->bitmap = CreateCompatibleBitmap(hdc, bl->w, bl->h);
+    ReleaseDC(fe->hwnd, hdc);
+}
+
+/* BitBlt(dstDC, dstX, dstY, dstW, dstH, srcDC, srcX, srcY, dType) */
+
+static void win_blitter_save(void *handle, blitter *bl, int x, int y)
+{
+    frontend *fe = (frontend *)handle;
+    HDC hdc_win, hdc_blit;
+    HBITMAP prev_blit;
+
+    assert(fe->drawstatus == DRAWING);
+
+    if (!bl->bitmap) blitter_mkbitmap(fe, bl);
+
+    bl->x = x; bl->y = y;
+
+    hdc_win = GetDC(fe->hwnd);
+    hdc_blit = CreateCompatibleDC(hdc_win);
+    if (!hdc_blit) fatal("hdc_blit failed: 0x%x", GetLastError());
+
+    prev_blit = SelectObject(hdc_blit, bl->bitmap);
+    if (prev_blit == NULL || prev_blit == HGDI_ERROR)
+        fatal("SelectObject for hdc_main failed: 0x%x", GetLastError());
+
+    if (!BitBlt(hdc_blit, 0, 0, bl->w, bl->h,
+                fe->hdc, x, y, SRCCOPY))
+        fatal("BitBlt failed: 0x%x", GetLastError());
+
+    SelectObject(hdc_blit, prev_blit);
+    DeleteDC(hdc_blit);
+    ReleaseDC(fe->hwnd, hdc_win);
+}
+
+static void win_blitter_load(void *handle, blitter *bl, int x, int y)
+{
+    frontend *fe = (frontend *)handle;
+    HDC hdc_win, hdc_blit;
+    HBITMAP prev_blit;
+
+    assert(fe->drawstatus == DRAWING);
+
+    assert(bl->bitmap); /* we should always have saved before loading */
+
+    if (x == BLITTER_FROMSAVED) x = bl->x;
+    if (y == BLITTER_FROMSAVED) y = bl->y;
+
+    hdc_win = GetDC(fe->hwnd);
+    hdc_blit = CreateCompatibleDC(hdc_win);
+
+    prev_blit = SelectObject(hdc_blit, bl->bitmap);
+
+    BitBlt(fe->hdc, x, y, bl->w, bl->h,
+           hdc_blit, 0, 0, SRCCOPY);
+
+    SelectObject(hdc_blit, prev_blit);
+    DeleteDC(hdc_blit);
+    ReleaseDC(fe->hwnd, hdc_win);
 }
 
 void frontend_default_colour(frontend *fe, float *output)
@@ -158,25 +274,163 @@ void frontend_default_colour(frontend *fe, float *output)
     output[2] = (float)(GetBValue(c) / 255.0);
 }
 
-void clip(frontend *fe, int x, int y, int w, int h)
+static POINT win_transform_point(frontend *fe, int x, int y)
+{
+    POINT ret;
+
+    assert(fe->drawstatus != NOTHING);
+
+    if (fe->drawstatus == PRINTING) {
+	ret.x = (int)(fe->printoffsetx + fe->printpixelscale * x);
+	ret.y = (int)(fe->printoffsety + fe->printpixelscale * y);
+    } else {
+	ret.x = x;
+	ret.y = y;
+    }
+
+    return ret;
+}
+
+static void win_text_colour(frontend *fe, int colour)
+{
+    assert(fe->drawstatus != NOTHING);
+
+    if (fe->drawstatus == PRINTING) {
+	int hatch;
+	float r, g, b;
+	print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
+	if (fe->printcolour)
+	    SetTextColor(fe->hdc, RGB(r * 255, g * 255, b * 255));
+	else
+	    SetTextColor(fe->hdc,
+			 hatch == HATCH_CLEAR ? RGB(255,255,255) : RGB(0,0,0));
+    } else {
+	SetTextColor(fe->hdc, fe->colours[colour]);
+    }
+}
+
+static void win_set_brush(frontend *fe, int colour)
+{
+    HBRUSH br;
+    assert(fe->drawstatus != NOTHING);
+
+    if (fe->drawstatus == PRINTING) {
+	int hatch;
+	float r, g, b;
+	print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
+
+	if (fe->printcolour)
+	    br = CreateSolidBrush(RGB(r * 255, g * 255, b * 255));
+	else if (hatch == HATCH_SOLID)
+	    br = CreateSolidBrush(RGB(0,0,0));
+	else if (hatch == HATCH_CLEAR)
+	    br = CreateSolidBrush(RGB(255,255,255));
+	else
+	    br = CreateHatchBrush(hatch == HATCH_BACKSLASH ? HS_FDIAGONAL :
+				  hatch == HATCH_SLASH ? HS_BDIAGONAL :
+				  hatch == HATCH_HORIZ ? HS_HORIZONTAL :
+				  hatch == HATCH_VERT ? HS_VERTICAL :
+				  hatch == HATCH_PLUS ? HS_CROSS :
+				  /* hatch == HATCH_X ? */ HS_DIAGCROSS,
+				  RGB(0,0,0));
+    } else {
+	br = fe->brushes[colour];
+    }
+    fe->oldbr = SelectObject(fe->hdc, br);
+}
+
+static void win_reset_brush(frontend *fe)
 {
-    IntersectClipRect(fe->hdc_bm, x, y, x+w, y+h);
+    HBRUSH br;
+
+    assert(fe->drawstatus != NOTHING);
+
+    br = SelectObject(fe->hdc, fe->oldbr);
+    if (fe->drawstatus == PRINTING)
+	DeleteObject(br);
 }
 
-void unclip(frontend *fe)
+static void win_set_pen(frontend *fe, int colour, int thin)
 {
-    SelectClipRgn(fe->hdc_bm, NULL);
+    HPEN pen;
+    assert(fe->drawstatus != NOTHING);
+
+    if (fe->drawstatus == PRINTING) {
+	int hatch;
+	float r, g, b;
+	int width = thin ? 0 : fe->linewidth;
+
+	print_get_colour(fe->dr, colour, &hatch, &r, &g, &b);
+	if (fe->printcolour)
+	    pen = CreatePen(PS_SOLID, width,
+			    RGB(r * 255, g * 255, b * 255));
+	else if (hatch == HATCH_SOLID)
+	    pen = CreatePen(PS_SOLID, width, RGB(0, 0, 0));
+	else if (hatch == HATCH_CLEAR)
+	    pen = CreatePen(PS_SOLID, width, RGB(255,255,255));
+	else {
+	    assert(!"This shouldn't happen");
+	    pen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0));
+	}
+    } else {
+	pen = fe->pens[colour];
+    }
+    fe->oldpen = SelectObject(fe->hdc, pen);
 }
 
-void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
-               int align, int colour, char *text)
+static void win_reset_pen(frontend *fe)
 {
+    HPEN pen;
+
+    assert(fe->drawstatus != NOTHING);
+
+    pen = SelectObject(fe->hdc, fe->oldpen);
+    if (fe->drawstatus == PRINTING)
+	DeleteObject(pen);
+}
+
+static void win_clip(void *handle, int x, int y, int w, int h)
+{
+    frontend *fe = (frontend *)handle;
+    POINT p, q;
+
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    p = win_transform_point(fe, x, y);
+    q = win_transform_point(fe, x+w, y+h);
+    IntersectClipRect(fe->hdc, p.x, p.y, q.x, q.y);
+}
+
+static void win_unclip(void *handle)
+{
+    frontend *fe = (frontend *)handle;
+
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    SelectClipRgn(fe->hdc, NULL);
+}
+
+static void win_draw_text(void *handle, int x, int y, int fonttype,
+			  int fontsize, int align, int colour, char *text)
+{
+    frontend *fe = (frontend *)handle;
+    POINT xy;
     int i;
 
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    if (fe->drawstatus == PRINTING)
+	fontsize = (int)(fontsize * fe->printpixelscale);
+
+    xy = win_transform_point(fe, x, y);
+
     /*
      * Find or create the font.
      */
-    for (i = 0; i < fe->nfonts; i++)
+    for (i = fe->fontstart; i < fe->nfonts; i++)
         if (fe->fonts[i].type == fonttype && fe->fonts[i].size == fontsize)
             break;
 
@@ -191,7 +445,8 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
         fe->fonts[i].type = fonttype;
         fe->fonts[i].size = fontsize;
 
-        fe->fonts[i].font = CreateFont(-fontsize, 0, 0, 0, FW_BOLD,
+        fe->fonts[i].font = CreateFont(-fontsize, 0, 0, 0,
+				       fe->drawstatus == PRINTING ? 0 : FW_BOLD,
 				       FALSE, FALSE, FALSE, DEFAULT_CHARSET,
 				       OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
 				       DEFAULT_QUALITY,
@@ -209,96 +464,158 @@ void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
 	TEXTMETRIC tm;
 	SIZE size;
 
-	oldfont = SelectObject(fe->hdc_bm, fe->fonts[i].font);
-	if (GetTextMetrics(fe->hdc_bm, &tm)) {
+	oldfont = SelectObject(fe->hdc, fe->fonts[i].font);
+	if (GetTextMetrics(fe->hdc, &tm)) {
 	    if (align & ALIGN_VCENTRE)
-		y -= (tm.tmAscent+tm.tmDescent)/2;
+		xy.y -= (tm.tmAscent+tm.tmDescent)/2;
 	    else
-		y -= tm.tmAscent;
+		xy.y -= tm.tmAscent;
 	}
-	if (GetTextExtentPoint32(fe->hdc_bm, text, strlen(text), &size)) {
+	if (GetTextExtentPoint32(fe->hdc, text, strlen(text), &size)) {
 	    if (align & ALIGN_HCENTRE)
-		x -= size.cx / 2;
+		xy.x -= size.cx / 2;
 	    else if (align & ALIGN_HRIGHT)
-		x -= size.cx;
+		xy.x -= size.cx;
 	}
-	SetBkMode(fe->hdc_bm, TRANSPARENT);
-	SetTextColor(fe->hdc_bm, fe->colours[colour]);
-	TextOut(fe->hdc_bm, x, y, text, strlen(text));
-	SelectObject(fe->hdc_bm, oldfont);
+	SetBkMode(fe->hdc, TRANSPARENT);
+	win_text_colour(fe, colour);
+	TextOut(fe->hdc, xy.x, xy.y, text, strlen(text));
+	SelectObject(fe->hdc, oldfont);
     }
 }
 
-void draw_rect(frontend *fe, int x, int y, int w, int h, int colour)
+static void win_draw_rect(void *handle, int x, int y, int w, int h, int colour)
 {
-    if (w == 1 && h == 1) {
+    frontend *fe = (frontend *)handle;
+    POINT p, q;
+
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    if (fe->drawstatus == DRAWING && w == 1 && h == 1) {
 	/*
 	 * Rectangle() appears to get uppity if asked to draw a 1x1
 	 * rectangle, presumably on the grounds that that's beneath
 	 * its dignity and you ought to be using SetPixel instead.
 	 * So I will.
 	 */
-	SetPixel(fe->hdc_bm, x, y, fe->colours[colour]);
+	SetPixel(fe->hdc, x, y, fe->colours[colour]);
     } else {
-	HBRUSH oldbrush = SelectObject(fe->hdc_bm, fe->brushes[colour]);
-	HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[colour]);
-	Rectangle(fe->hdc_bm, x, y, x+w, y+h);
-	SelectObject(fe->hdc_bm, oldbrush);
-	SelectObject(fe->hdc_bm, oldpen);
+	win_set_brush(fe, colour);
+	win_set_pen(fe, colour, TRUE);
+	p = win_transform_point(fe, x, y);
+	q = win_transform_point(fe, x+w, y+h);
+	Rectangle(fe->hdc, p.x, p.y, q.x, q.y);
+	win_reset_brush(fe);
+	win_reset_pen(fe);
     }
 }
 
-void draw_line(frontend *fe, int x1, int y1, int x2, int y2, int colour)
+static void win_draw_line(void *handle, int x1, int y1, int x2, int y2, int colour)
+{
+    frontend *fe = (frontend *)handle;
+    POINT p, q;
+
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    win_set_pen(fe, colour, FALSE);
+    p = win_transform_point(fe, x1, y1);
+    q = win_transform_point(fe, x2, y2);
+    MoveToEx(fe->hdc, p.x, p.y, NULL);
+    LineTo(fe->hdc, q.x, q.y);
+    if (fe->drawstatus == DRAWING)
+	SetPixel(fe->hdc, q.x, q.y, fe->colours[colour]);
+    win_reset_pen(fe);
+}
+
+static void win_draw_circle(void *handle, int cx, int cy, int radius,
+			    int fillcolour, int outlinecolour)
 {
-    HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[colour]);
-    MoveToEx(fe->hdc_bm, x1, y1, NULL);
-    LineTo(fe->hdc_bm, x2, y2);
-    SetPixel(fe->hdc_bm, x2, y2, fe->colours[colour]);
-    SelectObject(fe->hdc_bm, oldpen);
+    frontend *fe = (frontend *)handle;
+    POINT p, q, r;
+
+    assert(outlinecolour >= 0);
+
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    if (fillcolour >= 0) {
+	win_set_brush(fe, fillcolour);
+	win_set_pen(fe, outlinecolour, FALSE);
+	p = win_transform_point(fe, cx - radius, cy - radius);
+	q = win_transform_point(fe, cx + radius, cy + radius);
+	Ellipse(fe->hdc, p.x, p.y, q.x+1, q.y+1);
+	win_reset_brush(fe);
+	win_reset_pen(fe);
+    } else {
+	win_set_pen(fe, outlinecolour, FALSE);
+	p = win_transform_point(fe, cx - radius, cy - radius);
+	q = win_transform_point(fe, cx + radius, cy + radius);
+	r = win_transform_point(fe, cx - radius, cy);
+	Arc(fe->hdc, p.x, p.y, q.x+1, q.y+1, r.x, r.y, r.x, r.y);
+	win_reset_pen(fe);
+    }
 }
 
-void draw_polygon(frontend *fe, int *coords, int npoints,
-                  int fill, int colour)
+static void win_draw_polygon(void *handle, int *coords, int npoints,
+			     int fillcolour, int outlinecolour)
 {
-    POINT *pts = snewn(npoints+1, POINT);
+    frontend *fe = (frontend *)handle;
+    POINT *pts;
     int i;
 
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    pts = snewn(npoints+1, POINT);
+
     for (i = 0; i <= npoints; i++) {
 	int j = (i < npoints ? i : 0);
-	pts[i].x = coords[j*2];
-	pts[i].y = coords[j*2+1];
+	pts[i] = win_transform_point(fe, coords[j*2], coords[j*2+1]);
     }
 
-    if (fill) {
-	HBRUSH oldbrush = SelectObject(fe->hdc_bm, fe->brushes[colour]);
-	HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[colour]);
-	Polygon(fe->hdc_bm, pts, npoints);
-	SelectObject(fe->hdc_bm, oldbrush);
-	SelectObject(fe->hdc_bm, oldpen);
+    assert(outlinecolour >= 0);
+
+    if (fillcolour >= 0) {
+	win_set_brush(fe, fillcolour);
+	win_set_pen(fe, outlinecolour, FALSE);
+	Polygon(fe->hdc, pts, npoints);
+	win_reset_brush(fe);
+	win_reset_pen(fe);
     } else {
-	HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[colour]);
-	Polyline(fe->hdc_bm, pts, npoints+1);
-	SelectObject(fe->hdc_bm, oldpen);
+	win_set_pen(fe, outlinecolour, FALSE);
+	Polyline(fe->hdc, pts, npoints+1);
+	win_reset_pen(fe);
     }
 
     sfree(pts);
 }
 
-void start_draw(frontend *fe)
+static void win_start_draw(void *handle)
 {
+    frontend *fe = (frontend *)handle;
     HDC hdc_win;
+
+    assert(fe->drawstatus == NOTHING);
+
     hdc_win = GetDC(fe->hwnd);
-    fe->hdc_bm = CreateCompatibleDC(hdc_win);
-    fe->prevbm = SelectObject(fe->hdc_bm, fe->bitmap);
+    fe->hdc = CreateCompatibleDC(hdc_win);
+    fe->prevbm = SelectObject(fe->hdc, fe->bitmap);
     ReleaseDC(fe->hwnd, hdc_win);
     fe->clip = NULL;
-    SetMapMode(fe->hdc_bm, MM_TEXT);
+    SetMapMode(fe->hdc, MM_TEXT);
+    fe->drawstatus = DRAWING;
 }
 
-void draw_update(frontend *fe, int x, int y, int w, int h)
+static void win_draw_update(void *handle, int x, int y, int w, int h)
 {
+    frontend *fe = (frontend *)handle;
     RECT r;
 
+    if (fe->drawstatus != DRAWING)
+	return;
+
     r.left = x;
     r.top = y;
     r.right = x + w;
@@ -307,24 +624,309 @@ void draw_update(frontend *fe, int x, int y, int w, int h)
     InvalidateRect(fe->hwnd, &r, FALSE);
 }
 
-void end_draw(frontend *fe)
+static void win_end_draw(void *handle)
 {
-    SelectObject(fe->hdc_bm, fe->prevbm);
-    DeleteDC(fe->hdc_bm);
+    frontend *fe = (frontend *)handle;
+    assert(fe->drawstatus == DRAWING);
+    SelectObject(fe->hdc, fe->prevbm);
+    DeleteDC(fe->hdc);
     if (fe->clip) {
 	DeleteObject(fe->clip);
 	fe->clip = NULL;
     }
+    fe->drawstatus = NOTHING;
+}
+
+static void win_line_width(void *handle, float width)
+{
+    frontend *fe = (frontend *)handle;
+
+    assert(fe->drawstatus != DRAWING);
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    fe->linewidth = (int)(width * fe->printpixelscale);
+}
+
+static void win_begin_doc(void *handle, int pages)
+{
+    frontend *fe = (frontend *)handle;
+
+    assert(fe->drawstatus != DRAWING);
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    if (StartDoc(fe->hdc, &fe->di) <= 0) {
+	char *e = geterrstr();
+	MessageBox(fe->hwnd, e, "Error starting to print",
+		   MB_ICONERROR | MB_OK);
+	sfree(e);
+	fe->drawstatus = NOTHING;
+    }
+
+    /*
+     * Push a marker on the font stack so that we won't use the
+     * same fonts for printing and drawing. (This is because
+     * drawing seems to look generally better in bold, but printing
+     * is better not in bold.)
+     */
+    fe->fontstart = fe->nfonts;
+}
+
+static void win_begin_page(void *handle, int number)
+{
+    frontend *fe = (frontend *)handle;
+
+    assert(fe->drawstatus != DRAWING);
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    if (StartPage(fe->hdc) <= 0) {
+	char *e = geterrstr();
+	MessageBox(fe->hwnd, e, "Error starting a page",
+		   MB_ICONERROR | MB_OK);
+	sfree(e);
+	fe->drawstatus = NOTHING;
+    }
+}
+
+static void win_begin_puzzle(void *handle, float xm, float xc,
+			     float ym, float yc, int pw, int ph, float wmm)
+{
+    frontend *fe = (frontend *)handle;
+    int ppw, pph, pox, poy;
+    float mmpw, mmph, mmox, mmoy;
+    float scale;
+
+    assert(fe->drawstatus != DRAWING);
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    ppw = GetDeviceCaps(fe->hdc, HORZRES);
+    pph = GetDeviceCaps(fe->hdc, VERTRES);
+    mmpw = (float)GetDeviceCaps(fe->hdc, HORZSIZE);
+    mmph = (float)GetDeviceCaps(fe->hdc, VERTSIZE);
+
+    /*
+     * Compute the puzzle's position on the logical page.
+     */
+    mmox = xm * mmpw + xc;
+    mmoy = ym * mmph + yc;
+
+    /*
+     * Work out what that comes to in pixels.
+     */
+    pox = (int)(mmox * (float)ppw / mmpw);
+    poy = (int)(mmoy * (float)ppw / mmpw);
+
+    /*
+     * And determine the scale.
+     * 
+     * I need a scale such that the maximum puzzle-coordinate
+     * extent of the rectangle (pw * scale) is equal to the pixel
+     * equivalent of the puzzle's millimetre width (wmm * ppw /
+     * mmpw).
+     */
+    scale = (wmm * ppw) / (mmpw * pw);
+
+    /*
+     * Now store pox, poy and scale for use in the main drawing
+     * functions.
+     */
+    fe->printoffsetx = pox;
+    fe->printoffsety = poy;
+    fe->printpixelscale = scale;
+
+    fe->linewidth = 1;
+}
+
+static void win_end_puzzle(void *handle)
+{
+    /* Nothing needs to be done here. */
+}
+
+static void win_end_page(void *handle, int number)
+{
+    frontend *fe = (frontend *)handle;
+
+    assert(fe->drawstatus != DRAWING);
+
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    if (EndPage(fe->hdc) <= 0) {
+	char *e = geterrstr();
+	MessageBox(fe->hwnd, e, "Error finishing a page",
+		   MB_ICONERROR | MB_OK);
+	sfree(e);
+	fe->drawstatus = NOTHING;
+    }
+}
+
+static void win_end_doc(void *handle)
+{
+    frontend *fe = (frontend *)handle;
+
+    assert(fe->drawstatus != DRAWING);
+
+    /*
+     * Free all the fonts created since we began printing.
+     */
+    while (fe->nfonts > fe->fontstart) {
+	fe->nfonts--;
+	DeleteObject(fe->fonts[fe->nfonts].font);
+    }
+    fe->fontstart = 0;
+
+    /*
+     * The MSDN web site sample code doesn't bother to call EndDoc
+     * if an error occurs half way through printing. I expect doing
+     * so would cause the erroneous document to actually be
+     * printed, or something equally undesirable.
+     */
+    if (fe->drawstatus == NOTHING)
+	return;
+
+    if (EndDoc(fe->hdc) <= 0) {
+	char *e = geterrstr();
+	MessageBox(fe->hwnd, e, "Error finishing printing",
+		   MB_ICONERROR | MB_OK);
+	sfree(e);
+	fe->drawstatus = NOTHING;
+    }
+}
+
+const struct drawing_api win_drawing = {
+    win_draw_text,
+    win_draw_rect,
+    win_draw_line,
+    win_draw_polygon,
+    win_draw_circle,
+    win_draw_update,
+    win_clip,
+    win_unclip,
+    win_start_draw,
+    win_end_draw,
+    win_status_bar,
+    win_blitter_new,
+    win_blitter_free,
+    win_blitter_save,
+    win_blitter_load,
+    win_begin_doc,
+    win_begin_page,
+    win_begin_puzzle,
+    win_end_puzzle,
+    win_end_page,
+    win_end_doc,
+    win_line_width,
+};
+
+void print(frontend *fe)
+{
+    PRINTDLG pd;
+    char doctitle[256];
+    document *doc;
+    midend *nme = NULL;  /* non-interactive midend for bulk puzzle generation */
+    int i;
+    char *err = NULL;
+
+    /*
+     * Create our document structure and fill it up with puzzles.
+     */
+    doc = document_new(fe->printw, fe->printh, fe->printscale / 100.0F);
+    for (i = 0; i < fe->printcount; i++) {
+	if (i == 0 && fe->printcurr) {
+	    err = midend_print_puzzle(fe->me, doc, fe->printsolns);
+	} else {
+	    if (!nme) {
+		game_params *params;
+
+		nme = midend_new(NULL, &thegame, NULL, NULL);
+
+		/*
+		 * Set the non-interactive mid-end to have the same
+		 * parameters as the standard one.
+		 */
+		params = midend_get_params(fe->me);
+		midend_set_params(nme, params);
+		thegame.free_params(params);
+	    }
+
+	    midend_new_game(nme);
+	    err = midend_print_puzzle(nme, doc, fe->printsolns);
+	}
+	if (err)
+	    break;
+    }
+    if (nme)
+	midend_free(nme);
+
+    if (err) {
+	MessageBox(fe->hwnd, err, "Error preparing puzzles for printing",
+		   MB_ICONERROR | MB_OK);
+	document_free(doc);
+	return;
+    }
+
+    memset(&pd, 0, sizeof(pd));
+    pd.lStructSize = sizeof(pd);
+    pd.hwndOwner = fe->hwnd;
+    pd.hDevMode = NULL;
+    pd.hDevNames = NULL;
+    pd.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC |
+	PD_NOPAGENUMS | PD_NOSELECTION;
+    pd.nCopies = 1;
+    pd.nFromPage = pd.nToPage = 0xFFFF;
+    pd.nMinPage = pd.nMaxPage = 1;
+
+    if (!PrintDlg(&pd)) {
+	document_free(doc);
+	return;
+    }
+
+    /*
+     * Now pd.hDC is a device context for the printer.
+     */
+
+    /*
+     * FIXME: IWBNI we put up an Abort box here.
+     */
+
+    memset(&fe->di, 0, sizeof(fe->di));
+    fe->di.cbSize = sizeof(fe->di);
+    sprintf(doctitle, "Printed puzzles from %s (from Simon Tatham's"
+	    " Portable Puzzle Collection)", thegame.name);
+    fe->di.lpszDocName = doctitle;
+    fe->di.lpszOutput = NULL;
+    fe->di.lpszDatatype = NULL;
+    fe->di.fwType = 0;
+
+    fe->drawstatus = PRINTING;
+    fe->hdc = pd.hDC;
+
+    fe->dr = drawing_new(&win_drawing, NULL, fe);
+    document_print(doc, fe->dr);
+    drawing_free(fe->dr);
+    fe->dr = NULL;
+
+    fe->drawstatus = NOTHING;
+
+    DeleteDC(pd.hDC);
+    document_free(doc);
 }
 
 void deactivate_timer(frontend *fe)
 {
-    KillTimer(fe->hwnd, fe->timer);
+    if (!fe)
+	return;			       /* for non-interactive midend */
+    if (fe->hwnd) KillTimer(fe->hwnd, fe->timer);
     fe->timer = 0;
 }
 
 void activate_timer(frontend *fe)
 {
+    if (!fe)
+	return;			       /* for non-interactive midend */
     if (!fe->timer) {
 	fe->timer = SetTimer(fe->hwnd, fe->timer, 20, NULL);
 	fe->timer_last_tickcount = GetTickCount();
@@ -436,9 +1038,7 @@ static void check_window_size(frontend *fe, int *px, int *py)
 	r.left = r.top = 0;
 	r.right = x;
 	r.bottom = y + sy;
-	AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~
-			   (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED),
-			   TRUE, 0);
+	AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
 	SetWindowPos(fe->hwnd, NULL, 0, 0, r.right - r.left, r.bottom - r.top,
 		     SWP_NOMOVE | SWP_NOZORDER);
     }
@@ -453,16 +1053,39 @@ static void check_window_size(frontend *fe, int *px, int *py)
     *py = y;
 }
 
+static void get_max_puzzle_size(frontend *fe, int *x, int *y)
+{
+    RECT r, sr;
+
+    if (SystemParametersInfo(SPI_GETWORKAREA, 0, &sr, FALSE)) {
+	*x = sr.right - sr.left;
+	*y = sr.bottom - sr.top;
+	r.left = 100;
+	r.right = 200;
+	r.top = 100;
+	r.bottom = 200;
+	AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
+	*x -= r.right - r.left - 100;
+	*y -= r.bottom - r.top - 100;
+    } else {
+	*x = *y = INT_MAX;
+    }
+
+    if (fe->statusbar != NULL) {
+	GetWindowRect(fe->statusbar, &sr);
+	*y -= sr.bottom - sr.top;
+    }
+}
+
 static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 {
     frontend *fe;
     int x, y;
     RECT r;
-    HDC hdc;
 
     fe = snew(frontend);
 
-    fe->me = midend_new(fe, &thegame);
+    fe->me = midend_new(fe, &thegame, &win_drawing, fe);
 
     if (game_id) {
         *error = midend_game_id(fe->me, game_id);
@@ -477,15 +1100,19 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
     find_help_file(fe);
 
     fe->inst = inst;
-    midend_new_game(fe->me);
 
     fe->timer = 0;
+    fe->hwnd = NULL;
+
+    fe->drawstatus = NOTHING;
+    fe->dr = NULL;
+    fe->fontstart = 0;
+
+    midend_new_game(fe->me);
 
     fe->fonts = NULL;
     fe->nfonts = fe->fontsize = 0;
 
-    fe->laststatus = NULL;
-
     {
 	int i, ncolours;
         float *colours;
@@ -503,17 +1130,24 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 	    fe->brushes[i] = CreateSolidBrush(fe->colours[i]);
 	    fe->pens[i] = CreatePen(PS_SOLID, 1, fe->colours[i]);
 	}
+        sfree(colours);
     }
 
-    x = y = INT_MAX;		       /* find puzzle's preferred size */
+    if (midend_wants_statusbar(fe->me)) {
+	fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME, "ooh",
+				       WS_CHILD | WS_VISIBLE,
+				       0, 0, 0, 0, /* status bar does these */
+				       NULL, NULL, inst, NULL);
+    } else
+        fe->statusbar = NULL;
+
+    get_max_puzzle_size(fe, &x, &y);
     midend_size(fe->me, &x, &y, FALSE);
 
     r.left = r.top = 0;
     r.right = x;
     r.bottom = y;
-    AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~
-		       (WS_THICKFRAME | WS_MAXIMIZEBOX | WS_OVERLAPPED),
-		       TRUE, 0);
+    AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
 
     fe->hwnd = CreateWindowEx(0, thegame.name, thegame.name,
 			      WS_OVERLAPPEDWINDOW &~
@@ -524,6 +1158,7 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 
     if (midend_wants_statusbar(fe->me)) {
 	RECT sr;
+	DestroyWindow(fe->statusbar);
 	fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME, "ooh",
 				       WS_CHILD | WS_VISIBLE,
 				       0, 0, 0, 0, /* status bar does these */
@@ -578,6 +1213,13 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 	}
 
 	AppendMenu(menu, MF_SEPARATOR, 0, 0);
+	AppendMenu(menu, MF_ENABLED, IDM_LOAD, "Load");
+	AppendMenu(menu, MF_ENABLED, IDM_SAVE, "Save");
+	AppendMenu(menu, MF_SEPARATOR, 0, 0);
+	if (thegame.can_print) {
+	    AppendMenu(menu, MF_ENABLED, IDM_PRINT, "Print");
+	    AppendMenu(menu, MF_SEPARATOR, 0, 0);
+	}
 	AppendMenu(menu, MF_ENABLED, IDM_UNDO, "Undo");
 	AppendMenu(menu, MF_ENABLED, IDM_REDO, "Redo");
 	if (thegame.can_format_as_text) {
@@ -608,12 +1250,10 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
 	SetMenu(fe->hwnd, bar);
     }
 
+    fe->bitmap = NULL;
+    new_game_size(fe); /* initialises fe->bitmap */
     check_window_size(fe, &x, &y);
 
-    hdc = GetDC(fe->hwnd);
-    fe->bitmap = CreateCompatibleBitmap(hdc, x, y);
-    ReleaseDC(fe->hwnd, hdc);
-
     SetWindowLong(fe->hwnd, GWL_USERDATA, (LONG)fe);
 
     ShowWindow(fe->hwnd, SW_NORMAL);
@@ -648,6 +1288,106 @@ static int CALLBACK AboutDlgProc(HWND hwnd, UINT msg,
     return 0;
 }
 
+/*
+ * Wrappers on midend_{get,set}_config, which extend the CFG_*
+ * enumeration to add CFG_PRINT.
+ */
+static config_item *frontend_get_config(frontend *fe, int which,
+					char **wintitle)
+{
+    if (which < CFG_FRONTEND_SPECIFIC) {
+	return midend_get_config(fe->me, which, wintitle);
+    } else if (which == CFG_PRINT) {
+	config_item *ret;
+	int i;
+
+	*wintitle = snewn(40 + strlen(thegame.name), char);
+	sprintf(*wintitle, "%s print setup", thegame.name);
+
+	ret = snewn(8, config_item);
+
+	i = 0;
+
+	ret[i].name = "Number of puzzles to print";
+	ret[i].type = C_STRING;
+	ret[i].sval = dupstr("1");
+	ret[i].ival = 0;
+	i++;
+
+	ret[i].name = "Number of puzzles across the page";
+	ret[i].type = C_STRING;
+	ret[i].sval = dupstr("1");
+	ret[i].ival = 0;
+	i++;
+
+	ret[i].name = "Number of puzzles down the page";
+	ret[i].type = C_STRING;
+	ret[i].sval = dupstr("1");
+	ret[i].ival = 0;
+	i++;
+
+	ret[i].name = "Percentage of standard size";
+	ret[i].type = C_STRING;
+	ret[i].sval = dupstr("100.0");
+	ret[i].ival = 0;
+	i++;
+
+	ret[i].name = "Include currently shown puzzle";
+	ret[i].type = C_BOOLEAN;
+	ret[i].sval = NULL;
+	ret[i].ival = TRUE;
+	i++;
+
+	ret[i].name = "Print solutions";
+	ret[i].type = C_BOOLEAN;
+	ret[i].sval = NULL;
+	ret[i].ival = FALSE;
+	i++;
+
+	if (thegame.can_print_in_colour) {
+	    ret[i].name = "Print in colour";
+	    ret[i].type = C_BOOLEAN;
+	    ret[i].sval = NULL;
+	    ret[i].ival = FALSE;
+	    i++;
+	}
+
+	ret[i].name = NULL;
+	ret[i].type = C_END;
+	ret[i].sval = NULL;
+	ret[i].ival = 0;
+	i++;
+
+	return ret;
+    } else {
+	assert(!"We should never get here");
+	return NULL;
+    }
+}
+
+static char *frontend_set_config(frontend *fe, int which, config_item *cfg)
+{
+    if (which < CFG_FRONTEND_SPECIFIC) {
+	return midend_set_config(fe->me, which, cfg);
+    } else if (which == CFG_PRINT) {
+	if ((fe->printcount = atoi(cfg[0].sval)) <= 0)
+	    return "Number of puzzles to print should be at least one";
+	if ((fe->printw = atoi(cfg[1].sval)) <= 0)
+	    return "Number of puzzles across the page should be at least one";
+	if ((fe->printh = atoi(cfg[2].sval)) <= 0)
+	    return "Number of puzzles down the page should be at least one";
+	if ((fe->printscale = (float)atof(cfg[3].sval)) <= 0)
+	    return "Print size should be positive";
+	fe->printcurr = cfg[4].ival;
+	fe->printsolns = cfg[5].ival;
+	fe->printcolour = thegame.can_print_in_colour && cfg[6].ival;
+	return NULL;
+    } else {
+	assert(!"We should never get here");
+	return "Internal error";
+    }
+}
+
 static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
 				  WPARAM wParam, LPARAM lParam)
 {
@@ -667,7 +1407,7 @@ static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
 	     HIWORD(wParam) == BN_DOUBLECLICKED) &&
 	    (LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)) {
 	    if (LOWORD(wParam) == IDOK) {
-		char *err = midend_set_config(fe->me, fe->cfg_which, fe->cfg);
+		char *err = frontend_set_config(fe, fe->cfg_which, fe->cfg);
 
 		if (err) {
 		    MessageBox(hwnd, err, "Validation error",
@@ -930,7 +1670,7 @@ static int get_config(frontend *fe, int which)
 	height = width = 30;
     }
 
-    fe->cfg = midend_get_config(fe->me, which, &title);
+    fe->cfg = frontend_get_config(fe, which, &title);
     fe->cfg_which = which;
 
     /*
@@ -1122,23 +1862,19 @@ static int get_config(frontend *fe, int which)
     return (fe->dlg_done == 2);
 }
 
-static void new_game_type(frontend *fe)
+static void new_game_size(frontend *fe)
 {
     RECT r, sr;
     HDC hdc;
     int x, y;
 
-    midend_new_game(fe->me);
-    x = y = INT_MAX;
+    get_max_puzzle_size(fe, &x, &y);
     midend_size(fe->me, &x, &y, FALSE);
 
     r.left = r.top = 0;
     r.right = x;
     r.bottom = y;
-    AdjustWindowRectEx(&r, WS_OVERLAPPEDWINDOW &~
-		       (WS_THICKFRAME | WS_MAXIMIZEBOX |
-			WS_OVERLAPPED),
-		       TRUE, 0);
+    AdjustWindowRectEx(&r, WINFLAGS, TRUE, 0);
 
     if (fe->statusbar != NULL) {
 	GetWindowRect(fe->statusbar, &sr);
@@ -1156,7 +1892,7 @@ static void new_game_type(frontend *fe)
 	SetWindowPos(fe->statusbar, NULL, 0, y, x,
 		     sr.bottom - sr.top, SWP_NOZORDER);
 
-    DeleteObject(fe->bitmap);
+    if (fe->bitmap) DeleteObject(fe->bitmap);
 
     hdc = GetDC(fe->hwnd);
     fe->bitmap = CreateCompatibleBitmap(hdc, x, y);
@@ -1165,6 +1901,12 @@ static void new_game_type(frontend *fe)
     midend_redraw(fe->me);
 }
 
+static void new_game_type(frontend *fe)
+{
+    midend_new_game(fe->me);
+    new_game_size(fe);
+}
+
 static int is_alt_pressed(void)
 {
     BYTE keystate[256];
@@ -1178,17 +1920,34 @@ static int is_alt_pressed(void)
     return FALSE;
 }
 
+static void savefile_write(void *wctx, void *buf, int len)
+{
+    FILE *fp = (FILE *)wctx;
+    fwrite(buf, 1, len, fp);
+}
+
+static int savefile_read(void *wctx, void *buf, int len)
+{
+    FILE *fp = (FILE *)wctx;
+    int ret;
+
+    ret = fread(buf, 1, len, fp);
+    return (ret == len);
+}
+
 static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 				WPARAM wParam, LPARAM lParam)
 {
     frontend *fe = (frontend *)GetWindowLong(hwnd, GWL_USERDATA);
+    int cmd;
 
     switch (message) {
       case WM_CLOSE:
 	DestroyWindow(hwnd);
 	return 0;
       case WM_COMMAND:
-	switch (wParam & ~0xF) {       /* low 4 bits reserved to Windows */
+	cmd = wParam & ~0xF;	       /* low 4 bits reserved to Windows */
+	switch (cmd) {
 	  case IDM_NEW:
 	    if (!midend_process_key(fe->me, 0, 0, 'n'))
 		PostQuitMessage(0);
@@ -1238,9 +1997,99 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    if (get_config(fe, CFG_DESC))
 		new_game_type(fe);
 	    break;
+	  case IDM_PRINT:
+	    if (get_config(fe, CFG_PRINT))
+		print(fe);
+	    break;
           case IDM_ABOUT:
 	    about(fe);
             break;
+	  case IDM_LOAD:
+	  case IDM_SAVE:
+	    {
+		OPENFILENAME of;
+		char filename[FILENAME_MAX];
+		int ret;
+
+		memset(&of, 0, sizeof(of));
+		of.hwndOwner = hwnd;
+		of.lpstrFilter = "All Files (*.*)\0*\0\0\0";
+		of.lpstrCustomFilter = NULL;
+		of.nFilterIndex = 1;
+		of.lpstrFile = filename;
+		filename[0] = '\0';
+		of.nMaxFile = lenof(filename);
+		of.lpstrFileTitle = NULL;
+		of.lpstrTitle = (cmd == IDM_SAVE ?
+				 "Enter name of game file to save" :
+				 "Enter name of saved game file to load");
+		of.Flags = 0;
+#ifdef OPENFILENAME_SIZE_VERSION_400
+		of.lStructSize = OPENFILENAME_SIZE_VERSION_400;
+#else
+		of.lStructSize = sizeof(of);
+#endif
+		of.lpstrInitialDir = NULL;
+
+		if (cmd == IDM_SAVE)
+		    ret = GetSaveFileName(&of);
+		else
+		    ret = GetOpenFileName(&of);
+
+		if (ret) {
+		    if (cmd == IDM_SAVE) {
+			FILE *fp;
+
+			if ((fp = fopen(filename, "r")) != NULL) {
+			    char buf[256 + FILENAME_MAX];
+			    fclose(fp);
+			    /* file exists */
+
+			    sprintf(buf, "Are you sure you want to overwrite"
+				    " the file \"%.*s\"?",
+				    FILENAME_MAX, filename);
+			    if (MessageBox(hwnd, buf, "Question",
+					   MB_YESNO | MB_ICONQUESTION)
+				!= IDYES)
+				break;
+			}
+
+			fp = fopen(filename, "w");
+
+			if (!fp) {
+			    MessageBox(hwnd, "Unable to open save file",
+				       "Error", MB_ICONERROR | MB_OK);
+			    break;
+			}
+
+			midend_serialise(fe->me, savefile_write, fp);
+
+			fclose(fp);
+		    } else {
+			FILE *fp = fopen(filename, "r");
+			char *err;
+
+			if (!fp) {
+			    MessageBox(hwnd, "Unable to open saved game file",
+				       "Error", MB_ICONERROR | MB_OK);
+			    break;
+			}
+
+			err = midend_deserialise(fe->me, savefile_read, fp);
+
+			fclose(fp);
+
+			if (err) {
+			    MessageBox(hwnd, err, "Error", MB_ICONERROR|MB_OK);
+			    break;
+			}
+
+			new_game_size(fe);
+		    }
+		}
+	    }
+
+	    break;
           case IDM_HELPC:
             assert(fe->help_path);
             WinHelp(hwnd, fe->help_path,
@@ -1481,7 +2330,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 	RegisterClass(&wndclass);
     }
 
-    while (*cmdline && isspace(*cmdline))
+    while (*cmdline && isspace((unsigned char)*cmdline))
 	cmdline++;
 
     if (!new_window(inst, *cmdline ? cmdline : NULL, &error)) {