Make errors in option parsing actually _do_ something in interactive mode.
[sgt/puzzles] / windows.c
index 08513d8..0185f01 100644 (file)
--- a/windows.c
+++ b/windows.c
@@ -4,6 +4,9 @@
 
 #include <windows.h>
 #include <commctrl.h>
+#ifndef NO_HTMLHELP
+#include <htmlhelp.h>
+#endif /* NO_HTMLHELP */
 
 #include <stdio.h>
 #include <assert.h>
 #define IDM_ABOUT     0x00D0
 #define IDM_SAVE      0x00E0
 #define IDM_LOAD      0x00F0
-#define IDM_PRESETS   0x0100
+#define IDM_PRINT     0x0100
+#define IDM_PRESETS   0x0110
 
 #define HELP_FILE_NAME  "puzzles.hlp"
 #define HELP_CNT_NAME   "puzzles.cnt"
+#ifndef NO_HTMLHELP
+#define CHM_FILE_NAME   "puzzles.chm"
+#endif /* NO_HTMLHELP */
+
+#ifndef NO_HTMLHELP
+typedef HWND (CALLBACK *htmlhelp_t)(HWND, LPCSTR, UINT, DWORD);
+static DWORD html_help_cookie;
+static htmlhelp_t htmlhelp;
+static HINSTANCE hh_dll;
+#endif /* NO_HTMLHELP */
+enum { NONE, HLP, CHM } help_type;
+char *help_path;
+const char *help_topic;
+int help_has_contents;
 
 #ifdef DEBUGGING
 static FILE *debug_fp = NULL;
@@ -73,6 +91,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;
@@ -89,12 +112,14 @@ struct blitter {
     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;
@@ -109,9 +134,18 @@ struct frontend {
     struct cfg_aux *cfgaux;
     int cfg_which, dlg_done;
     HFONT cfgfont;
-    char *help_path;
-    int help_has_contents;
-    char *laststatus;
+    HBRUSH oldbr;
+    HPEN oldpen;
+    int help_running;
+    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, ...)
@@ -128,6 +162,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);
@@ -136,19 +192,14 @@ 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);
 }
 
-blitter *blitter_new(int w, int h)
+static blitter *win_blitter_new(void *handle, int w, int h)
 {
     blitter *bl = snew(blitter);
 
@@ -160,7 +211,7 @@ blitter *blitter_new(int w, int h)
     return bl;
 }
 
-void blitter_free(blitter *bl)
+static void win_blitter_free(void *handle, blitter *bl)
 {
     if (bl->bitmap) DeleteObject(bl->bitmap);
     sfree(bl);
@@ -175,11 +226,14 @@ static void blitter_mkbitmap(frontend *fe, blitter *bl)
 
 /* BitBlt(dstDC, dstX, dstY, dstW, dstH, srcDC, srcX, srcY, dType) */
 
-void blitter_save(frontend *fe, blitter *bl, int x, int y)
+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;
@@ -193,7 +247,7 @@ void blitter_save(frontend *fe, blitter *bl, int x, int y)
         fatal("SelectObject for hdc_main failed: 0x%x", GetLastError());
 
     if (!BitBlt(hdc_blit, 0, 0, bl->w, bl->h,
-                fe->hdc_bm, x, y, SRCCOPY))
+                fe->hdc, x, y, SRCCOPY))
         fatal("BitBlt failed: 0x%x", GetLastError());
 
     SelectObject(hdc_blit, prev_blit);
@@ -201,11 +255,14 @@ void blitter_save(frontend *fe, blitter *bl, int x, int y)
     ReleaseDC(fe->hwnd, hdc_win);
 }
 
-void blitter_load(frontend *fe, blitter *bl, int x, int y)
+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;
@@ -216,7 +273,7 @@ void blitter_load(frontend *fe, blitter *bl, int x, int y)
 
     prev_blit = SelectObject(hdc_blit, bl->bitmap);
 
-    BitBlt(fe->hdc_bm, x, y, bl->w, bl->h,
+    BitBlt(fe->hdc, x, y, bl->w, bl->h,
            hdc_blit, 0, 0, SRCCOPY);
 
     SelectObject(hdc_blit, prev_blit);
@@ -233,25 +290,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)
+{
+    HBRUSH br;
+
+    assert(fe->drawstatus != NOTHING);
+
+    br = SelectObject(fe->hdc, fe->oldbr);
+    if (fe->drawstatus == PRINTING)
+       DeleteObject(br);
+}
+
+static void win_set_pen(frontend *fe, int colour, int thin)
+{
+    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);
+}
+
+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)
 {
-    IntersectClipRect(fe->hdc_bm, x, y, x+w, y+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);
 }
 
-void unclip(frontend *fe)
+static void win_unclip(void *handle)
 {
-    SelectClipRgn(fe->hdc_bm, NULL);
+    frontend *fe = (frontend *)handle;
+
+    if (fe->drawstatus == NOTHING)
+       return;
+
+    SelectClipRgn(fe->hdc, NULL);
 }
 
-void draw_text(frontend *fe, int x, int y, int fonttype, int fontsize,
-               int align, int colour, char *text)
+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;
 
@@ -266,7 +461,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,
@@ -284,119 +480,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)
 {
-    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;
+
+    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);
 }
 
-void draw_circle(frontend *fe, int cx, int cy, int radius,
-                 int fillcolour, int outlinecolour)
+static void win_draw_circle(void *handle, int cx, int cy, int radius,
+                           int fillcolour, int outlinecolour)
 {
+    frontend *fe = (frontend *)handle;
+    POINT p, q, r;
+
     assert(outlinecolour >= 0);
 
+    if (fe->drawstatus == NOTHING)
+       return;
+
     if (fillcolour >= 0) {
-       HBRUSH oldbrush = SelectObject(fe->hdc_bm, fe->brushes[fillcolour]);
-       HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[outlinecolour]);
-       Ellipse(fe->hdc_bm, cx - radius, cy - radius,
-               cx + radius + 1, cy + radius + 1);
-       SelectObject(fe->hdc_bm, oldbrush);
-       SelectObject(fe->hdc_bm, oldpen);
+       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 {
-       HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[outlinecolour]);
-       Arc(fe->hdc_bm, cx - radius, cy - radius,
-           cx + radius + 1, cy + radius + 1,
-           cx - radius, cy, cx - radius, cy);
-       SelectObject(fe->hdc_bm, oldpen);
+       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 fillcolour, int outlinecolour)
+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]);
     }
 
     assert(outlinecolour >= 0);
 
     if (fillcolour >= 0) {
-       HBRUSH oldbrush = SelectObject(fe->hdc_bm, fe->brushes[fillcolour]);
-       HPEN oldpen = SelectObject(fe->hdc_bm, fe->pens[outlinecolour]);
-       Polygon(fe->hdc_bm, pts, npoints);
-       SelectObject(fe->hdc_bm, oldbrush);
-       SelectObject(fe->hdc_bm, oldpen);
+       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[outlinecolour]);
-       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;
@@ -405,24 +640,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();
@@ -477,32 +997,159 @@ void write_clip(HWND hwnd, char *data)
 }
 
 /*
- * See if we can find a help file.
+ * Set up Help and see if we can find a help file.
  */
-static void find_help_file(frontend *fe)
+static void init_help(void)
 {
     char b[2048], *p, *q, *r;
     FILE *fp;
-    if (!fe->help_path) {
-        GetModuleFileName(NULL, b, sizeof(b) - 1);
-        r = b;
-        p = strrchr(b, '\\');
-        if (p && p >= r) r = p+1;
-        q = strrchr(b, ':');
-        if (q && q >= r) r = q+1;
-        strcpy(r, HELP_FILE_NAME);
-        if ( (fp = fopen(b, "r")) != NULL) {
-            fe->help_path = dupstr(b);
-            fclose(fp);
-        } else
-            fe->help_path = NULL;
-        strcpy(r, HELP_CNT_NAME);
-        if ( (fp = fopen(b, "r")) != NULL) {
-            fe->help_has_contents = TRUE;
-            fclose(fp);
-        } else
-            fe->help_has_contents = FALSE;
+
+    /*
+     * Find the executable file path, so we can look alongside
+     * it for help files. Trim the filename off the end.
+     */
+    GetModuleFileName(NULL, b, sizeof(b) - 1);
+    r = b;
+    p = strrchr(b, '\\');
+    if (p && p >= r) r = p+1;
+    q = strrchr(b, ':');
+    if (q && q >= r) r = q+1;
+
+#ifndef NO_HTMLHELP
+    /*
+     * Try HTML Help first.
+     */
+    strcpy(r, CHM_FILE_NAME);
+    if ( (fp = fopen(b, "r")) != NULL) {
+       fclose(fp);
+
+       /*
+        * We have a .CHM. See if we can use it.
+        */
+       hh_dll = LoadLibrary("hhctrl.ocx");
+       if (hh_dll) {
+           htmlhelp = (htmlhelp_t)GetProcAddress(hh_dll, "HtmlHelpA");
+           if (!htmlhelp)
+               FreeLibrary(hh_dll);
+       }
+       if (htmlhelp) {
+           htmlhelp(NULL, NULL, HH_INITIALIZE, (DWORD)&html_help_cookie);
+           help_path = dupstr(b);
+           help_type = CHM;
+           help_topic = thegame.htmlhelp_topic;
+           return;
+       }
+    }
+#endif /* NO_HTMLHELP */
+
+    /*
+     * Now try old-style .HLP.
+     */
+    strcpy(r, HELP_FILE_NAME);
+    if ( (fp = fopen(b, "r")) != NULL) {
+       fclose(fp);
+
+       help_path = dupstr(b);
+       help_type = HLP;
+
+       help_topic = thegame.winhelp_topic;
+
+       /*
+        * See if there's a .CNT file alongside it.
+        */
+       strcpy(r, HELP_CNT_NAME);
+       if ( (fp = fopen(b, "r")) != NULL) {
+           fclose(fp);
+           help_has_contents = TRUE;
+       } else
+           help_has_contents = FALSE;
+
+       return;
     }
+
+    help_type = NONE;         /* didn't find any */
+}
+
+/*
+ * Start Help.
+ */
+static void start_help(frontend *fe, const char *topic)
+{
+    char *str = NULL;
+    int cmd;
+
+    switch (help_type) {
+      case HLP:
+       assert(help_path);
+       if (topic) {
+           str = snewn(10+strlen(topic), char);
+           sprintf(str, "JI(`',`%s')", topic);
+           cmd = HELP_COMMAND;
+       } else if (help_has_contents) {
+           cmd = HELP_FINDER;
+       } else {
+           cmd = HELP_CONTENTS;
+       }
+       WinHelp(fe->hwnd, help_path, cmd, (DWORD)str);
+       fe->help_running = TRUE;
+       break;
+      case CHM:
+#ifndef NO_HTMLHELP
+       assert(help_path);
+       assert(htmlhelp);
+       if (topic) {
+           str = snewn(20 + strlen(topic) + strlen(help_path), char);
+           sprintf(str, "%s::/%s.html>main", help_path, topic);
+       } else {
+           str = dupstr(help_path);
+       }
+       htmlhelp(fe->hwnd, str, HH_DISPLAY_TOPIC, 0);
+       fe->help_running = TRUE;
+       break;
+#endif /* NO_HTMLHELP */
+      case NONE:
+       assert(!"This shouldn't happen");
+       break;
+    }
+
+    sfree(str);
+}
+
+/*
+ * Stop Help on window cleanup.
+ */
+static void stop_help(frontend *fe)
+{
+    if (fe->help_running) {
+       switch (help_type) {
+         case HLP:
+           WinHelp(fe->hwnd, help_path, HELP_QUIT, 0);
+           break;
+         case CHM:
+#ifndef NO_HTMLHELP
+           assert(htmlhelp);
+           htmlhelp(NULL, NULL, HH_CLOSE_ALL, 0);
+           break;
+#endif /* NO_HTMLHELP */
+         case NONE:
+           assert(!"This shouldn't happen");
+           break;
+       }
+       fe->help_running = FALSE;
+    }
+}
+
+/*
+ * Terminate Help on process exit.
+ */
+static void cleanup_help(void)
+{
+#ifndef NO_HTMLHELP
+    if (help_type == CHM) {
+       assert(htmlhelp);
+       htmlhelp(NULL, NULL, HH_UNINITIALIZE, html_help_cookie);
+    }
+#endif /* NO_HTMLHELP */
 }
 
 static void check_window_size(frontend *fe, int *px, int *py)
@@ -534,9 +1181,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);
     }
@@ -551,16 +1196,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);
@@ -571,19 +1239,22 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
         }
     }
 
-    fe->help_path = NULL;
-    find_help_file(fe);
-
     fe->inst = inst;
-    midend_new_game(fe->me);
 
     fe->timer = 0;
+    fe->hwnd = NULL;
+
+    fe->help_running = FALSE;
+
+    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;
@@ -601,17 +1272,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 &~
@@ -622,6 +1300,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 */
@@ -679,6 +1358,10 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
        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) {
@@ -694,10 +1377,10 @@ static frontend *new_window(HINSTANCE inst, char *game_id, char **error)
        menu = CreateMenu();
        AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)menu, "Help");
        AppendMenu(menu, MF_ENABLED, IDM_ABOUT, "About");
-        if (fe->help_path) {
+        if (help_type != NONE) {
            AppendMenu(menu, MF_SEPARATOR, 0, 0);
             AppendMenu(menu, MF_ENABLED, IDM_HELPC, "Contents");
-            if (thegame.winhelp_topic) {
+            if (help_topic) {
                 char *item;
                 assert(thegame.name);
                 item = snewn(9+strlen(thegame.name), char); /*ick*/
@@ -709,12 +1392,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);
@@ -749,6 +1430,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)
 {
@@ -768,7 +1549,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",
@@ -1031,7 +1812,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;
 
     /*
@@ -1229,16 +2010,13 @@ static void new_game_size(frontend *fe)
     HDC hdc;
     int x, y;
 
-    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);
@@ -1256,7 +2034,7 @@ static void new_game_size(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);
@@ -1361,6 +2139,10 @@ 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;
@@ -1451,19 +2233,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 
            break;
           case IDM_HELPC:
-            assert(fe->help_path);
-            WinHelp(hwnd, fe->help_path,
-                    fe->help_has_contents ? HELP_FINDER : HELP_CONTENTS, 0);
-            break;
+           start_help(fe, NULL);
+           break;
           case IDM_GAMEHELP:
-            assert(fe->help_path);
-            assert(thegame.winhelp_topic);
-            {
-                char *cmd = snewn(10+strlen(thegame.winhelp_topic), char);
-                sprintf(cmd, "JI(`',`%s')", thegame.winhelp_topic);
-                WinHelp(hwnd, fe->help_path, HELP_COMMAND, (DWORD)cmd);
-                sfree(cmd);
-            }
+           start_help(fe, help_topic);
             break;
          default:
            {
@@ -1478,6 +2251,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
        }
        break;
       case WM_DESTROY:
+       stop_help(fe);
        PostQuitMessage(0);
        return 0;
       case WM_PAINT:
@@ -1681,7 +2455,9 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        wndclass.cbClsExtra = 0;
        wndclass.cbWndExtra = 0;
        wndclass.hInstance = inst;
-       wndclass.hIcon = LoadIcon(inst, IDI_APPLICATION);
+       wndclass.hIcon = LoadIcon(inst, MAKEINTRESOURCE(200));
+       if (!wndclass.hIcon)           /* in case resource file is absent */
+           wndclass.hIcon = LoadIcon(inst, IDI_APPLICATION);
        wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
        wndclass.hbrBackground = NULL;
        wndclass.lpszMenuName = NULL;
@@ -1693,6 +2469,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     while (*cmdline && isspace((unsigned char)*cmdline))
        cmdline++;
 
+    init_help();
+
     if (!new_window(inst, *cmdline ? cmdline : NULL, &error)) {
        char buf[128];
        sprintf(buf, "%.100s Error", thegame.name);
@@ -1704,5 +2482,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
        DispatchMessage(&msg);
     }
 
+    cleanup_help();
+
     return msg.wParam;
 }