1 files changed, 222 insertions, 585 deletions

diff --git a/apps/plugins/puzzles/src/windows.c b/apps/plugins/puzzles/src/windows.c
index 38559c5454..5273e17842 100644
--- a/apps/plugins/puzzles/src/windows.c
+++ b/apps/plugins/puzzles/src/windows.c
@@ -7,11 +7,7 @@
 #ifndef NO_HTMLHELP
 #include <htmlhelp.h>
 #endif /* NO_HTMLHELP */
-
-#ifdef _WIN32_WCE
-#include <commdlg.h>
-#include <aygshell.h>
-#endif
+#include <io.h>
 
 #include <stdio.h>
 #include <assert.h>
@@ -23,10 +19,6 @@
 
 #include "puzzles.h"
 
-#ifdef _WIN32_WCE
-#include "resource.h"
-#endif
-
 #define IDM_NEW       0x0010
 #define IDM_RESTART   0x0020
 #define IDM_UNDO      0x0030
@@ -43,10 +35,14 @@
 #define IDM_SAVE      0x00E0
 #define IDM_LOAD      0x00F0
 #define IDM_PRINT     0x0100
-#define IDM_PRESETS   0x0110
-#define IDM_GAMES     0x0300
+#define IDM_PREFS     0x0110
 
-#define IDM_KEYEMUL   0x0400
+/* Menu items for preset game_params go up from IDM_PRESET_BASE in
+ * steps of MENUITEM_STEP = 0x20. Menu items for selecting different
+ * games (in -DCOMBINED mode) go up from IDM_GAME_BASE similarly. */
+#define IDM_PRESET_BASE   0x0120
+#define IDM_GAME_BASE     0x0130
+#define MENUITEM_STEP     0x0020
 
 #define HELP_FILE_NAME  "puzzles.hlp"
 #define HELP_CNT_NAME   "puzzles.cnt"
@@ -77,56 +73,12 @@ bool help_has_contents;
 #define CLASSNAME thegame.name
 #endif
 
-#ifdef _WIN32_WCE
-
-/*
- * Wrapper implementations of functions not supplied by the
- * PocketPC API.
- */
-
-#define SHGetSubMenu(hWndMB,ID_MENU) (HMENU)SendMessage((hWndMB), SHCMBM_GETSUBMENU, (WPARAM)0, (LPARAM)ID_MENU)
-
-#undef MessageBox
-
-int MessageBox(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType)
-{
-    TCHAR wText[2048];
-    TCHAR wCaption[2048];
-
-    MultiByteToWideChar (CP_ACP, 0, lpText,    -1, wText,    2048);
-    MultiByteToWideChar (CP_ACP, 0, lpCaption, -1, wCaption, 2048);
-
-    return MessageBoxW (hWnd, wText, wCaption, uType);
-}
-
-BOOL SetDlgItemTextA(HWND hDlg, int nIDDlgItem, LPCSTR lpString)
-{
-    TCHAR wText[256];
-
-    MultiByteToWideChar (CP_ACP, 0, lpString, -1, wText, 256);
-    return SetDlgItemTextW(hDlg, nIDDlgItem, wText);
-}
-
-LPCSTR getenv(LPCSTR buf)
-{
-    return NULL;
-}
-
-BOOL GetKeyboardState(PBYTE pb)
-{
-  return false;
-}
-
-static TCHAR wClassName[256], wGameName[256];
-
-#endif
-
 #ifdef DEBUGGING
 static FILE *debug_fp = NULL;
 static HANDLE debug_hdl = INVALID_HANDLE_VALUE;
 static int debug_got_console = 0;
 
-void dputs(char *buf)
+static void dputs(char *buf)
 {
     /*DWORD dw;
 
@@ -144,8 +96,8 @@ void dputs(char *buf)
         WriteFile(debug_hdl, buf, strlen(buf), &dw, NULL);
     }
     if (debug_fp) {
-      fputs(buf, debug_fp);
-      fflush(debug_fp);
+        fputs(buf, debug_fp);
+        fflush(debug_fp);
     }*/
     OutputDebugString(buf);
 }
@@ -157,7 +109,7 @@ void debug_printf(const char *fmt, ...)
     static int debugging = -1;
 
     if (debugging == -1)
-        debugging = getenv("DEBUG_PUZZLES") ? 1 : 0;
+        debugging = getenv_bool("DEBUG_PUZZLES", false);
 
     if (debugging) {
         va_start(ap, fmt);
@@ -168,14 +120,12 @@ void debug_printf(const char *fmt, ...)
 }
 #endif
 
-#ifndef _WIN32_WCE
 #define WINFLAGS (WS_OVERLAPPEDWINDOW &~ \
                       (WS_MAXIMIZEBOX | WS_OVERLAPPED))
-#else
-#define WINFLAGS (WS_CAPTION | WS_SYSMENU)
-#endif
 
 static void new_game_size(frontend *fe, float scale);
+static void load_prefs(midend *me);
+static char *save_prefs(midend *me);
 
 struct font {
     HFONT font;
@@ -204,9 +154,6 @@ struct frontend {
     const game *game;
     midend *me;
     HWND hwnd, statusbar, cfgbox;
-#ifdef _WIN32_WCE
-    HWND numpad;  /* window handle for the numeric pad */
-#endif
     HINSTANCE inst;
     HBITMAP bitmap, prevbm;
     RECT bitmapPosition;  /* game bitmap position within game window */
@@ -308,19 +255,9 @@ void get_random_seed(void **randseed, int *randseedsize)
 
 static void win_status_bar(void *handle, const char *text)
 {
-#ifdef _WIN32_WCE
-    TCHAR wText[255];
-#endif
     frontend *fe = (frontend *)handle;
 
-#ifdef _WIN32_WCE
-    MultiByteToWideChar (CP_ACP, 0, text, -1, wText, 255);
-    SendMessage(fe->statusbar, SB_SETTEXT,
-                (WPARAM) 255 | SBT_NOBORDERS,
-                (LPARAM) wText);
-#else
     SetWindowText(fe->statusbar, text);
-#endif
 }
 
 static blitter *win_blitter_new(void *handle, int w, int h)
@@ -464,13 +401,6 @@ static void win_set_brush(frontend *fe, int colour)
         if (hatch < 0) {
             br = CreateSolidBrush(RGB(r * 255, g * 255, b * 255));
         } else {
-#ifdef _WIN32_WCE
-            /*
-             * This is only ever required during printing, and the
-             * PocketPC port doesn't support printing.
-             */
-            fatal("CreateHatchBrush not supported");
-#else
             br = CreateHatchBrush(hatch == HATCH_BACKSLASH ? HS_FDIAGONAL :
                                   hatch == HATCH_SLASH ? HS_BDIAGONAL :
                                   hatch == HATCH_HORIZ ? HS_HORIZONTAL :
@@ -478,7 +408,6 @@ static void win_set_brush(frontend *fe, int colour)
                                   hatch == HATCH_PLUS ? HS_CROSS :
                                   /* hatch == HATCH_X ? */ HS_DIAGCROSS,
                                   RGB(0,0,0));
-#endif
         }
     } else {
         br = fe->brushes[colour];
@@ -602,9 +531,6 @@ static void win_draw_text(void *handle, int x, int y, int fonttype,
         lf.lfPitchAndFamily = (fonttype == FONT_FIXED ?
                                FIXED_PITCH | FF_DONTCARE :
                                VARIABLE_PITCH | FF_SWISS);
-#ifdef _WIN32_WCE
-        wcscpy(lf.lfFaceName, TEXT("Tahoma"));
-#endif
 
         fe->fonts[i].font = CreateFontIndirect(&lf);
     }
@@ -708,7 +634,7 @@ static void win_draw_circle(void *handle, int cx, int cy, int radius,
     win_reset_pen(fe);
 }
 
-static void win_draw_polygon(void *handle, int *coords, int npoints,
+static void win_draw_polygon(void *handle, const int *coords, int npoints,
                              int fillcolour, int outlinecolour)
 {
     frontend *fe = (frontend *)handle;
@@ -754,9 +680,7 @@ static void win_start_draw(void *handle)
     fe->prevbm = SelectObject(fe->hdc, fe->bitmap);
     ReleaseDC(fe->hwnd, hdc_win);
     fe->clip = NULL;
-#ifndef _WIN32_WCE
     SetMapMode(fe->hdc, MM_TEXT);
-#endif
     fe->drawstatus = DRAWING;
 }
 
@@ -999,7 +923,6 @@ const struct drawing_api win_drawing = {
 
 void print(frontend *fe)
 {
-#ifndef _WIN32_WCE
     PRINTDLG pd;
     char doctitle[256];
     document *doc;
@@ -1019,6 +942,7 @@ void print(frontend *fe)
                 game_params *params;
 
                 nme = midend_new(NULL, fe->game, NULL, NULL);
+                load_prefs(nme);
 
                 /*
                  * Set the non-interactive mid-end to have the same
@@ -1090,7 +1014,6 @@ void print(frontend *fe)
 
     DeleteDC(pd.hDC);
     document_free(doc);
-#endif
 }
 
 void deactivate_timer(frontend *fe)
@@ -1168,7 +1091,6 @@ void write_clip(HWND hwnd, char *data)
  */
 static void init_help(void)
 {
-#ifndef _WIN32_WCE
     char b[2048], *p, *q, *r;
     FILE *fp;
 
@@ -1232,11 +1154,8 @@ static void init_help(void)
     }
 
     help_type = NONE;          /* didn't find any */
-#endif
 }
 
-#ifndef _WIN32_WCE
-
 /*
  * Start Help.
  */
@@ -1257,7 +1176,7 @@ static void start_help(frontend *fe, const char *topic)
         } else {
             cmd = HELP_CONTENTS;
         }
-        WinHelp(fe->hwnd, help_path, cmd, (DWORD)str);
+        WinHelp(fe->hwnd, help_path, cmd, (ULONG_PTR)str);
         fe->help_running = true;
         break;
       case CHM:
@@ -1306,8 +1225,6 @@ static void stop_help(frontend *fe)
     }
 }
 
-#endif
-
 /*
  * Terminate Help on process exit.
  */
@@ -1338,10 +1255,8 @@ static void adjust_statusbar(frontend *fe, RECT *r)
     if (!fe->statusbar) return;
 
     sy = get_statusbar_height(fe);
-#ifndef _WIN32_WCE
     SetWindowPos(fe->statusbar, NULL, 0, r->bottom-r->top-sy, r->right-r->left,
                  sy, SWP_NOZORDER);
-#endif
 }
 
 static void get_menu_size(HWND wh, RECT *r)
@@ -1378,7 +1293,7 @@ static bool check_window_resize(frontend *fe, int cx, int cy,
      * See if we actually got the window size we wanted, and adjust
      * the puzzle size if not.
      */
-    midend_size(fe->me, &x, &y, true);
+    midend_size(fe->me, &x, &y, true, 1.0);
     if (x != cx || y != cy) {
         /*
          * Resize the window, now we know what size we _really_
@@ -1416,13 +1331,8 @@ static void check_window_size(frontend *fe, int *px, int *py)
     cx = r.right - r.left;
     cy = r.bottom - r.top;
 
-    if (check_window_resize(fe, cx, cy, px, py, &wx, &wy)) {
-#ifdef _WIN32_WCE
-        SetWindowPos(fe->hwnd, NULL, 0, 0, wx, wy,
-                     SWP_NOMOVE | SWP_NOZORDER);
-#endif
-        ;
-    }
+    if (check_window_resize(fe, cx, cy, px, py, &wx, &wy))
+        SetWindowPos(fe->hwnd, NULL, 0, 0, wx, wy, SWP_NOMOVE | SWP_NOZORDER);
 
     GetClientRect(fe->hwnd, &r);
     adjust_statusbar(fe, &r);
@@ -1452,23 +1362,6 @@ static void get_max_puzzle_size(frontend *fe, int *x, int *y)
     }
 }
 
-#ifdef _WIN32_WCE
-/* Toolbar buttons on the numeric pad */
-static TBBUTTON tbNumpadButtons[] =
-{
-    {0, IDM_KEYEMUL + '1', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {1, IDM_KEYEMUL + '2', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {2, IDM_KEYEMUL + '3', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {3, IDM_KEYEMUL + '4', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {4, IDM_KEYEMUL + '5', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {5, IDM_KEYEMUL + '6', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {6, IDM_KEYEMUL + '7', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {7, IDM_KEYEMUL + '8', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {8, IDM_KEYEMUL + '9', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {9, IDM_KEYEMUL + ' ', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1}
-};
-#endif
-
 /*
  * Allocate a new frontend structure and create its main window.
  */
@@ -1502,34 +1395,6 @@ static frontend *frontend_new(HINSTANCE inst)
 
     fe->puzz_scale = 1.0;
 
-    #ifdef _WIN32_WCE
-    MultiByteToWideChar (CP_ACP, 0, nogame, -1, wGameName, 256);
-    fe->hwnd = CreateWindowEx(0, wClassName, wGameName,
-                              WS_VISIBLE,
-                              CW_USEDEFAULT, CW_USEDEFAULT,
-                              CW_USEDEFAULT, CW_USEDEFAULT,
-                              NULL, NULL, inst, NULL);
-
-    {
-        SHMENUBARINFO mbi;
-        RECT rc, rcBar, rcTB, rcClient;
-
-        memset (&mbi, 0, sizeof(SHMENUBARINFO));
-        mbi.cbSize     = sizeof(SHMENUBARINFO);
-        mbi.hwndParent = fe->hwnd;
-        mbi.nToolBarId = IDR_MENUBAR1;
-        mbi.hInstRes   = inst;
-
-        SHCreateMenuBar(&mbi);
-
-        GetWindowRect(fe->hwnd, &rc);
-        GetWindowRect(mbi.hwndMB, &rcBar);
-        rc.bottom -= rcBar.bottom - rcBar.top;
-        MoveWindow(fe->hwnd, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, false);
-
-        fe->numpad = NULL;
-    }
-#else
     fe->hwnd = CreateWindowEx(0, CLASSNAME, nogame,
                               WS_OVERLAPPEDWINDOW &~
                               (WS_MAXIMIZEBOX),
@@ -1540,7 +1405,6 @@ static frontend *frontend_new(HINSTANCE inst)
         DWORD lerr = GetLastError();
         printf("no window: 0x%x\n", (unsigned)lerr);
     }
-#endif
 
     fe->gamemenu = NULL;
     fe->preset_menu = NULL;
@@ -1586,6 +1450,7 @@ static midend *midend_for_new_game(frontend *fe, const game *cgame,
     if (!arg) {
         if (me) midend_free(me);
         me = midend_new(fe, cgame, &win_drawing, fe);
+        load_prefs(me);
         midend_new_game(me);
     } else {
         FILE *fp;
@@ -1626,6 +1491,7 @@ static midend *midend_for_new_game(frontend *fe, const game *cgame,
             if (!err_load) {
                 if (me) midend_free(me);
                 me = midend_new(fe, loadgame, &win_drawing, fe);
+                load_prefs(me);
                 err_load = midend_deserialise(me, savefile_read, fp);
             }
         } else {
@@ -1638,6 +1504,7 @@ static midend *midend_for_new_game(frontend *fe, const game *cgame,
              */
             if (me) midend_free(me);
             me = midend_new(fe, cgame, &win_drawing, fe);
+            load_prefs(me);
             err_param = midend_game_id(me, arg);
             if (!err_param) {
                 midend_new_game(me);
@@ -1676,7 +1543,8 @@ static void populate_preset_menu(frontend *fe,
         UINT flags = MF_ENABLED;
 
         if (entry->params) {
-            id_or_sub = (UINT_PTR)(IDM_PRESETS + 0x10 * entry->id);
+            id_or_sub = (UINT_PTR)(
+                IDM_PRESET_BASE + MENUITEM_STEP * entry->id);
 
             fe->preset_menuitems[entry->id].which_menu = winmenu;
             fe->preset_menuitems[entry->id].item_index =
@@ -1694,15 +1562,7 @@ static void populate_preset_menu(frontend *fe,
          * here.
          */
 
-#ifndef _WIN32_WCE
         AppendMenu(winmenu, flags, id_or_sub, entry->title);
-#else
-        {
-            TCHAR wName[255];
-            MultiByteToWideChar(CP_ACP, 0, entry->title, -1, wName, 255);
-            AppendMenu(winmenu, flags, id_or_sub, wName);
-        }
-#endif
     }
 }
 
@@ -1763,41 +1623,14 @@ static int fe_set_midend(frontend *fe, midend *me)
         fe->statusbar = NULL;
 
     get_max_puzzle_size(fe, &x, &y);
-    midend_size(fe->me, &x, &y, false);
+    midend_size(fe->me, &x, &y, false, 1.0);
 
     r.left = r.top = 0;
     r.right = x;
     r.bottom = y;
     AdjustWindowRectEx(&r, WINFLAGS, true, 0);
 
-#ifdef _WIN32_WCE
-    if (fe->numpad)
-        DestroyWindow(fe->numpad);
-    if (fe->game->flags & REQUIRE_NUMPAD)
-    {
-        fe->numpad = CreateToolbarEx (fe->hwnd,
-                                      WS_VISIBLE | WS_CHILD | CCS_NOPARENTALIGN | TBSTYLE_FLAT,
-                                      0, 10, fe->inst, IDR_PADTOOLBAR,
-                                      tbNumpadButtons, sizeof (tbNumpadButtons) / sizeof (TBBUTTON),
-                                      0, 0, 14, 15, sizeof (TBBUTTON));
-        GetWindowRect(fe->numpad, &rcTB);
-        GetClientRect(fe->hwnd, &rcClient);
-        MoveWindow(fe->numpad, 
-                   0, 
-                   rcClient.bottom - (rcTB.bottom - rcTB.top) - 1,
-                   rcClient.right,
-                   rcTB.bottom - rcTB.top,
-                   false);
-        SendMessage(fe->numpad, TB_SETINDENT, (rcClient.right - (10 * 21)) / 2, 0);
-    }
-    else {
-        fe->numpad = NULL;
-    }
-    MultiByteToWideChar (CP_ACP, 0, fe->game->name, -1, wGameName, 256);
-    SetWindowText(fe->hwnd, wGameName);
-#else
     SetWindowText(fe->hwnd, fe->game->name);
-#endif
 
     if (fe->statusbar)
         DestroyWindow(fe->statusbar);
@@ -1807,24 +1640,15 @@ static int fe_set_midend(frontend *fe, midend *me)
                                        WS_CHILD | WS_VISIBLE,
                                        0, 0, 0, 0, /* status bar does these */
                                        fe->hwnd, NULL, fe->inst, NULL);
-#ifdef _WIN32_WCE
-        /* Flat status bar looks better on the Pocket PC */
-        SendMessage(fe->statusbar, SB_SIMPLE, (WPARAM) true, 0);
-        SendMessage(fe->statusbar, SB_SETTEXT,
-                                (WPARAM) 255 | SBT_NOBORDERS,
-                                (LPARAM) L"");
-#endif
 
         /*
          * Now resize the window to take account of the status bar.
          */
         GetWindowRect(fe->statusbar, &sr);
         GetWindowRect(fe->hwnd, &r);
-#ifndef _WIN32_WCE
         SetWindowPos(fe->hwnd, NULL, 0, 0, r.right - r.left,
                      r.bottom - r.top + sr.bottom - sr.top,
                      SWP_NOMOVE | SWP_NOZORDER);
-#endif
     } else {
         fe->statusbar = NULL;
     }
@@ -1832,24 +1656,17 @@ static int fe_set_midend(frontend *fe, midend *me)
     {
         HMENU oldmenu = GetMenu(fe->hwnd);
 
-#ifndef _WIN32_WCE
         HMENU bar = CreateMenu();
         HMENU menu = CreateMenu();
         RECT menusize;
 
-        AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)menu, "&Game");
-#else
-        HMENU menu = SHGetSubMenu(SHFindMenuBar(fe->hwnd), ID_GAME);
-        DeleteMenu(menu, 0, MF_BYPOSITION);
-#endif
+        AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT_PTR)menu, "&Game");
         fe->gamemenu = menu;
         AppendMenu(menu, MF_ENABLED, IDM_NEW, TEXT("&New"));
         AppendMenu(menu, MF_ENABLED, IDM_RESTART, TEXT("&Restart"));
-#ifndef _WIN32_WCE
         /* ...here I run out of sensible accelerator characters. */
         AppendMenu(menu, MF_ENABLED, IDM_DESC, TEXT("Speci&fic..."));
         AppendMenu(menu, MF_ENABLED, IDM_SEED, TEXT("Rando&m Seed..."));
-#endif
 
         assert(!fe->preset_menu);
 
@@ -1863,14 +1680,9 @@ static int fe_set_midend(frontend *fe, midend *me)
                 fe->preset_menuitems[i].which_menu = NULL;
         }
         if (fe->preset_menu->n_entries > 0 || fe->game->can_configure) {
-#ifndef _WIN32_WCE
             HMENU sub = CreateMenu();
 
-            AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)sub, "&Type");
-#else
-            HMENU sub = SHGetSubMenu(SHFindMenuBar(fe->hwnd), ID_TYPE);
-            DeleteMenu(sub, 0, MF_BYPOSITION);
-#endif
+            AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT_PTR)sub, "&Type");
 
             populate_preset_menu(fe, fe->preset_menu, sub);
 
@@ -1884,27 +1696,25 @@ static int fe_set_midend(frontend *fe, midend *me)
         }
 
 #ifdef COMBINED
-#ifdef _WIN32_WCE
-#error Windows CE does not support COMBINED build.
-#endif
         {
             HMENU games = CreateMenu();
             int i;
 
             AppendMenu(menu, MF_SEPARATOR, 0, 0);
-            AppendMenu(menu, MF_ENABLED|MF_POPUP, (UINT)games, "&Other");
+            AppendMenu(menu, MF_ENABLED|MF_POPUP, (UINT_PTR)games, "&Other");
             for (i = 0; i < gamecount; i++) {
                 if (strcmp(gamelist[i]->name, fe->game->name) != 0) {
                     /* only include those games that aren't the same as the
                      * game we're currently playing. */
-                    AppendMenu(games, MF_ENABLED, IDM_GAMES + i, gamelist[i]->name);
+                    AppendMenu(games, MF_ENABLED,
+                               IDM_GAME_BASE + MENUITEM_STEP * i,
+                               gamelist[i]->name);
                 }
             }
         }
 #endif
 
         AppendMenu(menu, MF_SEPARATOR, 0, 0);
-#ifndef _WIN32_WCE
         AppendMenu(menu, MF_ENABLED, IDM_LOAD, TEXT("&Load..."));
         AppendMenu(menu, MF_ENABLED, IDM_SAVE, TEXT("&Save..."));
         AppendMenu(menu, MF_SEPARATOR, 0, 0);
@@ -1912,27 +1722,23 @@ static int fe_set_midend(frontend *fe, midend *me)
             AppendMenu(menu, MF_ENABLED, IDM_PRINT, TEXT("&Print..."));
             AppendMenu(menu, MF_SEPARATOR, 0, 0);
         }
-#endif
         AppendMenu(menu, MF_ENABLED, IDM_UNDO, TEXT("Undo"));
         AppendMenu(menu, MF_ENABLED, IDM_REDO, TEXT("Redo"));
-#ifndef _WIN32_WCE
         if (fe->game->can_format_as_text_ever) {
             AppendMenu(menu, MF_SEPARATOR, 0, 0);
             AppendMenu(menu, MF_ENABLED, IDM_COPY, TEXT("&Copy"));
         }
-#endif
         if (fe->game->can_solve) {
             AppendMenu(menu, MF_SEPARATOR, 0, 0);
             AppendMenu(menu, MF_ENABLED, IDM_SOLVE, TEXT("Sol&ve"));
         }
         AppendMenu(menu, MF_SEPARATOR, 0, 0);
-#ifndef _WIN32_WCE
+        AppendMenu(menu, MF_ENABLED, IDM_PREFS, TEXT("Pre&ferences"));
+        AppendMenu(menu, MF_SEPARATOR, 0, 0);
         AppendMenu(menu, MF_ENABLED, IDM_QUIT, TEXT("E&xit"));
         menu = CreateMenu();
-        AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)menu, TEXT("&Help"));
-#endif
+        AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT_PTR)menu, TEXT("&Help"));
         AppendMenu(menu, MF_ENABLED, IDM_ABOUT, TEXT("&About"));
-#ifndef _WIN32_WCE
         if (help_type != NONE) {
             char *item;
             AppendMenu(menu, MF_SEPARATOR, 0, 0);
@@ -1947,7 +1753,6 @@ static int fe_set_midend(frontend *fe, midend *me)
         SetMenu(fe->hwnd, bar);
         get_menu_size(fe->hwnd, &menusize);
         fe->xmin = (menusize.right - menusize.left) + 25;
-#endif
     }
 
     if (fe->bitmap) DeleteObject(fe->bitmap);
@@ -1968,36 +1773,6 @@ static void show_window(frontend *fe)
     midend_redraw(fe->me);
 }
 
-#ifdef _WIN32_WCE
-static HFONT dialog_title_font()
-{
-    static HFONT hf = NULL;
-    LOGFONT lf;
-
-    if (hf)
-        return hf;
-
-    memset (&lf, 0, sizeof(LOGFONT));
-    lf.lfHeight = -11; /* - ((8 * GetDeviceCaps(hdc, LOGPIXELSY)) / 72) */
-    lf.lfWeight = FW_BOLD;
-    wcscpy(lf.lfFaceName, TEXT("Tahoma"));
-
-    return hf = CreateFontIndirect(&lf);
-}
-
-static void make_dialog_full_screen(HWND hwnd)
-{
-    SHINITDLGINFO shidi;
-
-    /* Make dialog full screen */
-    shidi.dwMask = SHIDIM_FLAGS;
-    shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIZEDLGFULLSCREEN |
-                    SHIDIF_EMPTYMENU;
-    shidi.hDlg = hwnd;
-    SHInitDialog(&shidi);
-}
-#endif
-
 static int CALLBACK AboutDlgProc(HWND hwnd, UINT msg,
                                  WPARAM wParam, LPARAM lParam)
 {
@@ -2005,39 +1780,15 @@ static int CALLBACK AboutDlgProc(HWND hwnd, UINT msg,
 
     switch (msg) {
       case WM_INITDIALOG:
-#ifdef _WIN32_WCE
-        {
-            char title[256];
-
-            make_dialog_full_screen(hwnd);
-
-            sprintf(title, "About %.250s", fe->game->name);
-            SetDlgItemTextA(hwnd, IDC_ABOUT_CAPTION, title);
-
-            SendDlgItemMessage(hwnd, IDC_ABOUT_CAPTION, WM_SETFONT,
-                               (WPARAM) dialog_title_font(), 0);
-
-            SetDlgItemTextA(hwnd, IDC_ABOUT_GAME, fe->game->name);
-            SetDlgItemTextA(hwnd, IDC_ABOUT_VERSION, ver);
-        }
-#endif
         return 1;
 
       case WM_COMMAND:
         if (LOWORD(wParam) == IDOK)
-#ifdef _WIN32_WCE
-            EndDialog(hwnd, 1);
-#else
             fe->dlg_done = 1;
-#endif
         return 0;
 
       case WM_CLOSE:
-#ifdef _WIN32_WCE
-        EndDialog(hwnd, 1);
-#else
         fe->dlg_done = 1;
-#endif
         return 0;
     }
 
@@ -2137,119 +1888,6 @@ static const char *frontend_set_config(
     }
 }
 
-#ifdef _WIN32_WCE
-/* Separate version of mkctrl function for the Pocket PC. */
-/* Control coordinates should be specified in dialog units. */
-HWND mkctrl(frontend *fe, int x1, int x2, int y1, int y2,
-            LPCTSTR wclass, int wstyle,
-            int exstyle, const char *wtext, INT_PTR wid)
-{
-    RECT rc;
-    TCHAR wwtext[256];
-
-    /* Convert dialog units into pixels */
-    rc.left = x1;  rc.right  = x2;
-    rc.top  = y1;  rc.bottom = y2;
-    MapDialogRect(fe->cfgbox, &rc);
-
-    MultiByteToWideChar (CP_ACP, 0, wtext, -1, wwtext, 256);
-
-    return CreateWindowEx(exstyle, wclass, wwtext,
-                          wstyle | WS_CHILD | WS_VISIBLE,
-                          rc.left, rc.top,
-                          rc.right - rc.left, rc.bottom - rc.top,
-                          fe->cfgbox, (HMENU) wid, fe->inst, NULL);
-}
-
-static void create_config_controls(frontend * fe)
-{
-    int id, nctrls;
-    int col1l, col1r, col2l, col2r, y;
-    config_item *i;
-    struct cfg_aux *j;
-    HWND ctl;
-
-    /* Control placement done in dialog units */
-    col1l = 4;   col1r = 96;   /* Label column */
-    col2l = 100; col2r = 154;  /* Input column (edit boxes and combo boxes) */
-
-    /*
-     * Count the controls so we can allocate cfgaux.
-     */
-    for (nctrls = 0, i = fe->cfg; i->type != C_END; i++)
-        nctrls++;
-    fe->cfgaux = snewn(nctrls, struct cfg_aux);
-
-    id = 1000;
-    y = 22; /* Leave some room for the dialog title */
-    for (i = fe->cfg, j = fe->cfgaux; i->type != C_END; i++, j++) {
-        switch (i->type) {
-          case C_STRING:
-            /*
-             * Edit box with a label beside it.
-             */
-            mkctrl(fe, col1l, col1r, y + 1, y + 11,
-                   TEXT("Static"), SS_LEFTNOWORDWRAP, 0, i->name, id++);
-            mkctrl(fe, col2l, col2r, y, y + 12,
-                   TEXT("EDIT"), WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL,
-                   0, "", (j->ctlid = id++));
-            SetDlgItemTextA(fe->cfgbox, j->ctlid, i->u.string.sval);
-            break;
-
-          case C_BOOLEAN:
-            /*
-             * Simple checkbox.
-             */
-            mkctrl(fe, col1l, col2r, y + 1, y + 11, TEXT("BUTTON"),
-                   BS_NOTIFY | BS_AUTOCHECKBOX | WS_TABSTOP,
-                   0, i->name, (j->ctlid = id++));
-            CheckDlgButton(fe->cfgbox, j->ctlid, (i->u.boolean.bval != 0));
-            break;
-
-          case C_CHOICES:
-            /*
-             * Drop-down list with a label beside it.
-             */
-            mkctrl(fe, col1l, col1r, y + 1, y + 11,
-                   TEXT("STATIC"), SS_LEFTNOWORDWRAP, 0, i->name, id++);
-            ctl = mkctrl(fe, col2l, col2r, y, y + 48,
-                         TEXT("COMBOBOX"), WS_BORDER | WS_TABSTOP |
-                         CBS_DROPDOWNLIST | CBS_HASSTRINGS,
-                         0, "", (j->ctlid = id++));
-            {
-                char c;
-                const char *p, *q;
-                char *str;
-
-                p = i->u.choices.choicenames;
-                c = *p++;
-                while (*p) {
-                    q = p;
-                    while (*q && *q != c) q++;
-                    str = snewn(q-p+1, char);
-                    strncpy(str, p, q-p);
-                    str[q-p] = '\0';
-                    {
-                        TCHAR ws[50];
-                        MultiByteToWideChar (CP_ACP, 0, str, -1, ws, 50);
-                        SendMessage(ctl, CB_ADDSTRING, 0, (LPARAM)ws);
-                    }
-                    
-                    sfree(str);
-                    if (*q) q++;
-                    p = q;
-                }
-            }
-            SendMessage(ctl, CB_SETCURSEL, i->u.choices.selected, 0);
-            break;
-        }
-
-        y += 15;
-    }
-
-}
-#endif
-
 static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
                                   WPARAM wParam, LPARAM lParam)
 {
@@ -2259,25 +1897,6 @@ static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
 
     switch (msg) {
       case WM_INITDIALOG:
-#ifdef _WIN32_WCE
-        {
-            char *title;
-
-            fe = (frontend *) lParam;
-            SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
-            fe->cfgbox = hwnd;
-
-            fe->cfg = frontend_get_config(fe, fe->cfg_which, &title);
-
-            make_dialog_full_screen(hwnd);
-
-            SetDlgItemTextA(hwnd, IDC_CONFIG_CAPTION, title);
-            SendDlgItemMessage(hwnd, IDC_CONFIG_CAPTION, WM_SETFONT,
-                               (WPARAM) dialog_title_font(), 0);
-
-            create_config_controls(fe);
-        }
-#endif
         return 1;
 
       case WM_COMMAND:
@@ -2293,18 +1912,10 @@ static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
                     MessageBox(hwnd, err, "Validation error",
                                MB_ICONERROR | MB_OK);
                 } else {
-#ifdef _WIN32_WCE
-                    EndDialog(hwnd, 2);
-#else
                     fe->dlg_done = 2;
-#endif
                 }
             } else {
-#ifdef _WIN32_WCE
-                EndDialog(hwnd, 1);
-#else
                 fe->dlg_done = 1;
-#endif
             }
             return 0;
         }
@@ -2321,13 +1932,7 @@ static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
 
         if (i->type == C_STRING && HIWORD(wParam) == EN_CHANGE) {
             char buffer[4096];
-#ifdef _WIN32_WCE
-            TCHAR wBuffer[4096];
-            GetDlgItemText(fe->cfgbox, j->ctlid, wBuffer, 4096);
-            WideCharToMultiByte(CP_ACP, 0, wBuffer, -1, buffer, 4096, NULL, NULL);
-#else
             GetDlgItemText(fe->cfgbox, j->ctlid, buffer, lenof(buffer));
-#endif
             buffer[lenof(buffer)-1] = '\0';
             sfree(i->u.string.sval);
             i->u.string.sval = dupstr(buffer);
@@ -2351,7 +1956,6 @@ static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
     return 0;
 }
 
-#ifndef _WIN32_WCE
 HWND mkctrl(frontend *fe, int x1, int x2, int y1, int y2,
             char *wclass, int wstyle,
             int exstyle, const char *wtext, INT_PTR wid)
@@ -2363,13 +1967,9 @@ HWND mkctrl(frontend *fe, int x1, int x2, int y1, int y2,
     SendMessage(ret, WM_SETFONT, (WPARAM)fe->cfgfont, MAKELPARAM(true, 0));
     return ret;
 }
-#endif
 
 static void about(frontend *fe)
 {
-#ifdef _WIN32_WCE
-    DialogBox(fe->inst, MAKEINTRESOURCE(IDD_ABOUT), fe->hwnd, AboutDlgProc);
-#else
     int i;
     WNDCLASS wc;
     MSG msg;
@@ -2518,19 +2118,10 @@ static void about(frontend *fe)
     SetForegroundWindow(fe->hwnd);
     DestroyWindow(fe->cfgbox);
     DeleteObject(fe->cfgfont);
-#endif
 }
 
 static bool get_config(frontend *fe, int which)
 {
-#ifdef _WIN32_WCE
-    fe->cfg_which = which;
-
-    return DialogBoxParam(fe->inst,
-                          MAKEINTRESOURCE(IDD_CONFIG),
-                          fe->hwnd, ConfigDlgProc,
-                          (LPARAM) fe) == 2;
-#else
     config_item *i;
     struct cfg_aux *j;
     char *title;
@@ -2770,38 +2361,8 @@ static bool get_config(frontend *fe, int which)
     sfree(fe->cfgaux);
 
     return (fe->dlg_done == 2);
-#endif
 }
 
-#ifdef _WIN32_WCE
-static void calculate_bitmap_position(frontend *fe, int x, int y)
-{
-    /* Pocket PC - center the game in the full screen window */
-    int yMargin;
-    RECT rcClient;
-
-    GetClientRect(fe->hwnd, &rcClient);
-    fe->bitmapPosition.left = (rcClient.right  - x) / 2;
-    yMargin = rcClient.bottom - y;
-
-    if (fe->numpad != NULL) {
-        RECT rcPad;
-        GetWindowRect(fe->numpad, &rcPad);
-        yMargin -= rcPad.bottom - rcPad.top;
-    }
-
-    if (fe->statusbar != NULL) {
-        RECT rcStatus;
-        GetWindowRect(fe->statusbar, &rcStatus);
-        yMargin -= rcStatus.bottom - rcStatus.top;
-    }
-
-    fe->bitmapPosition.top = yMargin / 2;
-
-    fe->bitmapPosition.right  = fe->bitmapPosition.left + x;
-    fe->bitmapPosition.bottom = fe->bitmapPosition.top  + y;
-}
-#else
 static void calculate_bitmap_position(frontend *fe, int x, int y)
 {
     /* Plain Windows - position the game in the upper-left corner */
@@ -2810,7 +2371,6 @@ static void calculate_bitmap_position(frontend *fe, int x, int y)
     fe->bitmapPosition.right  = fe->bitmapPosition.left + x;
     fe->bitmapPosition.bottom = fe->bitmapPosition.top  + y;
 }
-#endif
 
 static void new_bitmap(frontend *fe, int x, int y)
 {
@@ -2830,12 +2390,12 @@ static void new_game_size(frontend *fe, float scale)
     int x, y;
 
     get_max_puzzle_size(fe, &x, &y);
-    midend_size(fe->me, &x, &y, false);
+    midend_size(fe->me, &x, &y, false, 1.0);
 
     if (scale != 1.0) {
-      x = (int)((float)x * fe->puzz_scale);
-      y = (int)((float)y * fe->puzz_scale);
-      midend_size(fe->me, &x, &y, true);
+        x = (int)((float)x * fe->puzz_scale);
+        y = (int)((float)y * fe->puzz_scale);
+        midend_size(fe->me, &x, &y, true, 1.0);
     }
     fe->ymin = (fe->xmin * y) / x;
 
@@ -2849,26 +2409,19 @@ static void new_game_size(frontend *fe, float scale)
     } else {
         sr.left = sr.right = sr.top = sr.bottom = 0;
     }
-#ifndef _WIN32_WCE
     SetWindowPos(fe->hwnd, NULL, 0, 0,
                  r.right - r.left,
                  r.bottom - r.top + sr.bottom - sr.top,
                  SWP_NOMOVE | SWP_NOZORDER);
-#endif
 
     check_window_size(fe, &x, &y);
 
-#ifndef _WIN32_WCE
     if (fe->statusbar != NULL)
         SetWindowPos(fe->statusbar, NULL, 0, y, x,
                      sr.bottom - sr.top, SWP_NOZORDER);
-#endif
 
     new_bitmap(fe, x, y);
 
-#ifdef _WIN32_WCE
-    InvalidateRect(fe->hwnd, NULL, true);
-#endif
     midend_redraw(fe->me);
 }
 
@@ -2895,13 +2448,13 @@ static void adjust_game_size(frontend *fe, RECT *proposed, bool isedge,
     ydiff = (proposed->bottom - proposed->top) - (wr.bottom - wr.top);
 
     if (isedge) {
-      /* These next four lines work around the fact that midend_size
-       * is happy to shrink _but not grow_ if you change one dimension
-       * but not the other. */
-      if (xdiff > 0 && ydiff == 0)
-        ydiff = (xdiff * (wr.right - wr.left)) / (wr.bottom - wr.top);
-      if (xdiff == 0 && ydiff > 0)
-        xdiff = (ydiff * (wr.bottom - wr.top)) / (wr.right - wr.left);
+        /* These next four lines work around the fact that midend_size
+         * is happy to shrink _but not grow_ if you change one dimension
+         * but not the other. */
+        if (xdiff > 0 && ydiff == 0)
+            ydiff = (xdiff * (wr.right - wr.left)) / (wr.bottom - wr.top);
+        if (xdiff == 0 && ydiff > 0)
+            xdiff = (ydiff * (wr.bottom - wr.top)) / (wr.right - wr.left);
     }
 
     if (check_window_resize(fe,
@@ -2951,6 +2504,138 @@ static void update_type_menu_tick(frontend *fe)
     DrawMenuBar(fe->hwnd);
 }
 
+static char *prefs_dir(void)
+{
+    const char *var;
+    if ((var = getenv("APPDATA")) != NULL) {
+        size_t size = strlen(var) + 80;
+        char *dir = snewn(size, char);
+        sprintf(dir, "%s\\Simon Tatham's Portable Puzzle Collection", var);
+        return dir;
+    }
+    return NULL;
+}
+
+static char *prefs_path_general(const game *game, const char *suffix)
+{
+    char *dir, *path;
+
+    dir = prefs_dir();
+    if (!dir)
+        return NULL;
+
+    path = make_prefs_path(dir, "\\", game, suffix);
+
+    sfree(dir);
+    return path;
+}
+
+static char *prefs_path(const game *game)
+{
+    return prefs_path_general(game, ".conf");
+}
+
+static char *prefs_tmp_path(const game *game)
+{
+    return prefs_path_general(game, ".tmp");
+}
+
+static void load_prefs(midend *me)
+{
+    const game *game = midend_which_game(me);
+    char *path = prefs_path(game);
+    if (!path)
+        return;
+    FILE *fp = fopen(path, "r");
+    if (!fp)
+        return;
+    const char *err = midend_load_prefs(me, savefile_read, fp);
+    fclose(fp);
+    if (err)
+        fprintf(stderr, "Unable to load preferences file %s:\n%s\n",
+                path, err);
+    sfree(path);
+}
+
+static char *save_prefs(midend *me)
+{
+    const game *game = midend_which_game(me);
+    char *dir_path = prefs_dir();
+    char *file_path = prefs_path(game);
+    char *tmp_path = prefs_tmp_path(game);
+    HANDLE fh;
+    FILE *fp;
+    bool cleanup_dir = false, cleanup_tmpfile = false;
+    char *err = NULL;
+
+    if (!dir_path || !file_path || !tmp_path) {
+        sprintf(err = snewn(256, char),
+                "Unable to save preferences:\n"
+                "Could not determine pathname for configuration files");
+        goto out;
+    }
+
+    if (!CreateDirectory(dir_path, NULL)) {
+        /* Ignore errors while trying to make the directory. It may
+         * well already exist, and even if we got some error code
+         * other than EEXIST, it's still worth at least _trying_ to
+         * make the file inside it, and see if that goes wrong. */
+    } else {
+        cleanup_dir = true;
+    }
+
+    fh = CreateFile(tmp_path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
+                    FILE_ATTRIBUTE_NORMAL, NULL);
+    if (fh == INVALID_HANDLE_VALUE) {
+        char *os_err = geterrstr();
+        sprintf(err = snewn(256 + strlen(tmp_path) + strlen(os_err), char),
+                "Unable to save preferences:\n"
+                "Unable to create file '%s':\n%s", tmp_path, os_err);
+        sfree(os_err);
+        goto out;
+    } else {
+        cleanup_tmpfile = true;
+    }
+
+    fp = _fdopen(_open_osfhandle((intptr_t)fh, 0), "w");
+    SetLastError(0);
+    midend_save_prefs(me, savefile_write, fp);
+    fclose(fp);
+    if (GetLastError()) {
+        char *os_err = geterrstr();
+        sprintf(err = snewn(80 + strlen(tmp_path) + strlen(os_err), char),
+                "Unable to write file '%s':\n%s", tmp_path, os_err);
+        sfree(os_err);
+        goto out;
+    }
+
+    if (MoveFileEx(tmp_path, file_path, MOVEFILE_REPLACE_EXISTING) < 0) {
+        char *os_err = geterrstr();
+        sprintf(err = snewn(256 + strlen(tmp_path) + strlen(file_path) +
+                            strlen(os_err), char),
+                "Unable to save preferences:\n"
+                "Unable to rename '%s' to '%s':\n%s", tmp_path, file_path,
+                os_err);
+        sfree(os_err);
+        goto out;
+    } else {
+        cleanup_dir = false;
+        cleanup_tmpfile = false;
+    }
+
+  out:
+    if (cleanup_tmpfile) {
+        if (!DeleteFile(tmp_path)) { /* can't do anything about this */ }
+    }
+    if (cleanup_dir) {
+        if (!RemoveDirectory(dir_path)) { /* can't do anything about this */ }
+    }
+    sfree(dir_path);
+    sfree(file_path);
+    sfree(tmp_path);
+    return err;
+}
+
 static void update_copy_menu_greying(frontend *fe)
 {
     UINT enable = (midend_can_format_as_text_now(fe->me) ?
@@ -2990,28 +2675,21 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
         DestroyWindow(hwnd);
         return 0;
       case WM_COMMAND:
-#ifdef _WIN32_WCE
-        /* Numeric pad sends WM_COMMAND messages */
-        if ((wParam >= IDM_KEYEMUL) && (wParam < IDM_KEYEMUL + 256))
-        {
-            midend_process_key(fe->me, 0, 0, wParam - IDM_KEYEMUL);
-        }
-#endif
         cmd = wParam & ~0xF;           /* low 4 bits reserved to Windows */
         switch (cmd) {
           case IDM_NEW:
-            if (!midend_process_key(fe->me, 0, 0, UI_NEWGAME))
+            if (midend_process_key(fe->me, 0, 0, UI_NEWGAME) == PKR_QUIT)
                 PostQuitMessage(0);
             break;
           case IDM_RESTART:
             midend_restart_game(fe->me);
             break;
           case IDM_UNDO:
-            if (!midend_process_key(fe->me, 0, 0, UI_UNDO))
+            if (midend_process_key(fe->me, 0, 0, UI_UNDO) == PKR_QUIT)
                 PostQuitMessage(0);
             break;
           case IDM_REDO:
-            if (!midend_process_key(fe->me, 0, 0, UI_REDO))
+            if (midend_process_key(fe->me, 0, 0, UI_REDO) == PKR_QUIT)
                 PostQuitMessage(0);
             break;
           case IDM_COPY:
@@ -3033,7 +2711,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             }
             break;
           case IDM_QUIT:
-            if (!midend_process_key(fe->me, 0, 0, UI_QUIT))
+            if (midend_process_key(fe->me, 0, 0, UI_QUIT) == PKR_QUIT)
                 PostQuitMessage(0);
             break;
           case IDM_CONFIG:
@@ -3052,6 +2730,16 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             if (get_config(fe, CFG_PRINT))
                 print(fe);
             break;
+          case IDM_PREFS:
+            if (get_config(fe, CFG_PREFS)) {
+                char *prefs_err = save_prefs(fe->me);
+                if (prefs_err) {
+                    MessageBox(fe->hwnd, prefs_err, "Error saving preferences",
+                               MB_ICONERROR | MB_OK);
+                    sfree(prefs_err);
+                }
+            }
+            break;
           case IDM_ABOUT:
             about(fe);
             break;
@@ -3173,7 +2861,6 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             }
 
             break;
-#ifndef _WIN32_WCE
           case IDM_HELPC:
             start_help(fe, NULL);
             break;
@@ -3182,34 +2869,38 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             start_help(fe, help_type == CHM ?
                        fe->game->htmlhelp_topic : fe->game->winhelp_topic);
             break;
-#endif
-          default:
+          default: {
+            unsigned n;
+
 #ifdef COMBINED
-            if (wParam >= IDM_GAMES && wParam < (IDM_GAMES + (WPARAM)gamecount)) {
-                int p = wParam - IDM_GAMES;
+            n = (wParam - IDM_GAME_BASE) / MENUITEM_STEP;
+            if (n < gamecount && wParam == IDM_GAME_BASE + MENUITEM_STEP * n) {
                 char *error = NULL;
-                fe_set_midend(fe, midend_for_new_game(fe, gamelist[p], NULL,
+                fe_set_midend(fe, midend_for_new_game(fe, gamelist[n], NULL,
                                                       false, false, &error));
                 sfree(error);
-            } else
+                break;
+            }
 #endif
-            {
+
+            n = (wParam - IDM_PRESET_BASE) / MENUITEM_STEP;
+            if (wParam == IDM_PRESET_BASE + MENUITEM_STEP * n) {
                 game_params *preset = preset_menu_lookup_by_id(
-                    fe->preset_menu,
-                    ((wParam &~ 0xF) - IDM_PRESETS) / 0x10);
+                    fe->preset_menu, n);
 
                 if (preset) {
                     midend_set_params(fe->me, preset);
                     new_game_type(fe);
+                    break;
                 }
             }
-            break;
+
+            break;
+          }
         }
         break;
       case WM_DESTROY:
-#ifndef _WIN32_WCE
         stop_help(fe);
-#endif
         frontend_free(fe);
         PostQuitMessage(0);
         return 0;
@@ -3223,9 +2914,6 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             hdc = BeginPaint(hwnd, &p);
             hdc2 = CreateCompatibleDC(hdc);
             prevbm = SelectObject(hdc2, fe->bitmap);
-#ifdef _WIN32_WCE
-            FillRect(hdc, &(p.rcPaint), (HBRUSH) GetStockObject(WHITE_BRUSH));
-#endif
             IntersectRect(&rcDest, &(fe->bitmapPosition), &(p.rcPaint));
             BitBlt(hdc,
                    rcDest.left, rcDest.top,
@@ -3310,7 +2998,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             }
 
             if (key != -1) {
-                if (!midend_process_key(fe->me, 0, 0, key))
+                if (midend_process_key(fe->me, 0, 0, key) == PKR_QUIT)
                     PostQuitMessage(0);
             } else {
                 MSG m;
@@ -3338,32 +3026,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             else if (message == WM_RBUTTONDOWN || is_alt_pressed())
                 button = RIGHT_BUTTON;
             else
-#ifndef _WIN32_WCE
                 button = LEFT_BUTTON;
-#else
-                if ((fe->game->flags & REQUIRE_RBUTTON) == 0)
-                    button = LEFT_BUTTON;
-                else
-                {
-                    SHRGINFO shrgi;
-
-                    shrgi.cbSize     = sizeof(SHRGINFO);
-                    shrgi.hwndClient = hwnd;
-                    shrgi.ptDown.x   = (signed short)LOWORD(lParam);
-                    shrgi.ptDown.y   = (signed short)HIWORD(lParam);
-                    shrgi.dwFlags    = SHRG_RETURNCMD;
-
-                    if (GN_CONTEXTMENU == SHRecognizeGesture(&shrgi))
-                        button = RIGHT_BUTTON;
-                    else
-                        button = LEFT_BUTTON;
-                }
-#endif
 
-            if (!midend_process_key(fe->me,
-                                    (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
-                                    (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
-                                    button))
+            if (midend_process_key(fe->me,
+                                   (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
+                                   (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
+                                    button) == PKR_QUIT)
                 PostQuitMessage(0);
 
             SetCapture(hwnd);
@@ -3387,10 +3055,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             else
                 button = LEFT_RELEASE;
 
-            if (!midend_process_key(fe->me,
-                                    (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
-                                    (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
-                                    button))
+            if (midend_process_key(fe->me,
+                                   (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
+                                   (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
+                                    button) == PKR_QUIT)
                 PostQuitMessage(0);
 
             ReleaseCapture();
@@ -3407,10 +3075,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             else
                 button = LEFT_DRAG;
             
-            if (!midend_process_key(fe->me,
-                                    (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
-                                    (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
-                                    button))
+            if (midend_process_key(fe->me,
+                                   (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
+                                   (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
+                                   button) == PKR_QUIT)
                 PostQuitMessage(0);
         }
         break;
@@ -3424,7 +3092,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                     (keystate[VK_CONTROL] & 0x80))
                     key = UI_REDO;
             }
-            if (!midend_process_key(fe->me, 0, 0, key))
+            if (midend_process_key(fe->me, 0, 0, key) == PKR_QUIT)
                 PostQuitMessage(0);
         }
         return 0;
@@ -3436,7 +3104,6 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             fe->timer_last_tickcount = now;
         }
         return 0;
-#ifndef _WIN32_WCE
       case WM_SIZING:
         {
             RECT *sr = (RECT *)lParam;
@@ -3468,29 +3135,11 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
             return true;
         }
         break;
-#endif
     }
 
     return DefWindowProc(hwnd, message, wParam, lParam);
 }
 
-#ifdef _WIN32_WCE
-static int FindPreviousInstance()
-{
-    /* Check if application is running. If it's running then focus on the window */
-    HWND hOtherWnd = NULL;
-
-    hOtherWnd = FindWindow (wGameName, wGameName);
-    if (hOtherWnd)
-    {
-        SetForegroundWindow (hOtherWnd);
-        return true;
-    }
-
-    return false;
-}
-#endif
-
 /*
  * Split a complete command line into argc/argv, attempting to do it
  * exactly the same way the Visual Studio C library would do it (so
@@ -3723,12 +3372,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
     split_into_argv(cmdline, &argc, &argv, NULL);
 
-#ifdef _WIN32_WCE
-    MultiByteToWideChar (CP_ACP, 0, CLASSNAME, -1, wClassName, 256);
-    if (FindPreviousInstance ())
-        return 0;
-#endif
-
     InitCommonControls();
 
     if (!prev) {
@@ -3740,18 +3383,12 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
         wndclass.cbWndExtra = 0;
         wndclass.hInstance = inst;
         wndclass.hIcon = LoadIcon(inst, MAKEINTRESOURCE(200));
-#ifndef _WIN32_WCE
         if (!wndclass.hIcon)           /* in case resource file is absent */
             wndclass.hIcon = LoadIcon(inst, IDI_APPLICATION);
-#endif
         wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
         wndclass.hbrBackground = NULL;
         wndclass.lpszMenuName = NULL;
-#ifdef _WIN32_WCE
-        wndclass.lpszClassName = wClassName;
-#else
         wndclass.lpszClassName = CLASSNAME;
-#endif
 
         RegisterClass(&wndclass);
     }