2100b23

diff --git a/od-win32/resources/resource b/od-win32/resources/resource
index f8dc8b3f48014e25f4c4dd4366fbaf6a68dece21..5a71c61f8076079a610cd2162a8700ad92aa7ed7 100644 (file)
--- a/od-win32/resources/resource
+++ b/od-win32/resources/resource
@@ -257,6 +257,9 @@
 #define IDD_GAMEPORTS                   263
 #define IDS_INPUTTOGGLE                 263
 #define IDS_NETDISCONNECTED             264
+#define IDS_QS_CD                       265
+#define IDS_QS_CD_AUTO                  266
+#define IDS_QS_CD_IMAGE                 267
 #define IDS_NUMSG_NEEDEXT2              300
 #define IDS_NUMSG_NOROMKEY              301
 #define IDS_NUMSG_KSROMCRCERROR         302
@@ -327,7 +330,6 @@
 #define IDS_PRINTER_EPSON48             359
 #define IDS_SELECTCD                    360
 #define IDS_CD                          361
-#define IDS_PS_FX_10                    363
 #define IDS_QS_MODELS                   1000
 #define IDS_QS_MODEL_A500               1001
 #define IDS_QS_MODEL_A500P              1002

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 9c2899f0cb83d8ce3539f4d7359273989e2d1247..c052d085b6ac3181fb80b70ea06e19dc2ad257ba 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1329,6 +1329,9 @@ BEGIN
     IDS_ALL                 "All"\r
     IDS_INPUTTOGGLE         "Toggle"\r
     IDS_NETDISCONNECTED     "Cable disconnected"\r
+    IDS_QS_CD               "CD"\r
+    IDS_QS_CD_AUTO          "Autodetect"\r
+    IDS_QS_CD_IMAGE         "Image file"\r
 END\r
 \r
 STRINGTABLE\r

diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp
index f5caa750a4a1712b604ab84924b897a6d91dd9ef..ace8772f64c213584c8e57c27a7a1ff9e922ca9d 100644 (file)
--- a/od-win32/rp.cpp
+++ b/od-win32/rp.cpp
@@ -272,6 +272,12 @@ static int winok (void)
 
 static void fixup_size (struct uae_prefs *prefs)
 {
+       static int done;
+
+       if (done)
+               return;
+       done = 1;
+
        if (prefs->gfx_xcenter_size > 0) {
                int hres = prefs->gfx_resolution;
                if (prefs->gfx_filter) {
@@ -765,9 +771,11 @@ void rp_fixup_options (struct uae_prefs *p)
 
        write_log (L"rp_fixup_options(escapekey=%d,escapeholdtime=%d,screenmode=%d,inputmode=%d)\n",
                rp_rpescapekey, rp_rpescapeholdtime, rp_screenmode, rp_inputmode);
-       write_log (L"w=%dx%d fs=%dx%d\n",
+       write_log (L"w=%dx%d fs=%dx%d pos=%dx%d %dx%d\n",
                p->gfx_size_win.width, p->gfx_size_win.height,
-               p->gfx_size_fs.width, p->gfx_size_fs.height);
+               p->gfx_size_fs.width, p->gfx_size_fs.height,
+               p->gfx_xcenter_pos, p->gfx_ycenter_pos,
+               p->gfx_xcenter_size, p->gfx_ycenter_size);
 
        max_horiz_dbl = currprefs.gfx_max_horizontal;
        max_vert_dbl = currprefs.gfx_max_vertical;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index a8da19603ac246c323f29ab8d7776c505566883f..ca29cf01073a04aeae8c7ba1ffabef3998e6638f 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,12 +15,12 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 
-#define WINUAEBETA L"22"
-#define WINUAEDATE MAKEBD(2010, 4, 14)
-#define WINUAEEXTRA L""
+#define WINUAEBETA L"23"
+#define WINUAEDATE MAKEBD(2010, 4, 20)
+#define WINUAEEXTRA L"RC1"
 #define WINUAEREV L""
 
 #define IHF_WINDOWHIDDEN 6

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 512f08d046c9f5d6d94e2eec827369d486e832d6..130ba1d61705094c35a7699006f3f0829ad894fe 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -9064,6 +9064,7 @@ static void addfloppytype (HWND hDlg, int n)
 
        text = workprefs.df[n];
        if (currentpage == QUICKSTART_ID) {
+               TCHAR tmp[MAX_DPATH];
                f_text = floppybuttonsq[n][0];
                f_drive = floppybuttonsq[n][1];
                f_type = -1;
@@ -9079,10 +9080,13 @@ static void addfloppytype (HWND hDlg, int n)
                        hide (hDlg, f_wp, 1);
                        hide (hDlg, f_wptext, 1);
                        ew (hDlg, f_enable, FALSE);
-                       SetWindowText (GetDlgItem (hDlg, f_enable), L"CD");
+                       WIN32GUI_LoadUIString (IDS_QS_CD, tmp, sizeof tmp / sizeof (TCHAR));
+                       SetWindowText (GetDlgItem (hDlg, f_enable), tmp);
                        SendDlgItemMessage (hDlg, IDC_CD0Q_TYPE, CB_RESETCONTENT, 0, 0L);
-                       SendDlgItemMessage (hDlg, IDC_CD0Q_TYPE, CB_ADDSTRING, 0, (LPARAM)L"Autodetect");
-                       SendDlgItemMessage (hDlg, IDC_CD0Q_TYPE, CB_ADDSTRING, 0, (LPARAM)L"Image file");
+                       WIN32GUI_LoadUIString (IDS_QS_CD_AUTO, tmp, sizeof tmp / sizeof (TCHAR));
+                       SendDlgItemMessage (hDlg, IDC_CD0Q_TYPE, CB_ADDSTRING, 0, (LPARAM)tmp);
+                       WIN32GUI_LoadUIString (IDS_QS_CD_IMAGE, tmp, sizeof tmp / sizeof (TCHAR));
+                       SendDlgItemMessage (hDlg, IDC_CD0Q_TYPE, CB_ADDSTRING, 0, (LPARAM)tmp);
                        if (workprefs.cdimagefile[0])
                                quickstart_cdtype = 1;
                        SendDlgItemMessage (hDlg, IDC_CD0Q_TYPE, CB_SETCURSEL, quickstart_cdtype, 0);
@@ -9094,8 +9098,11 @@ static void addfloppytype (HWND hDlg, int n)
                }
        }
        if (!showcd && f_enable > 0 && n == 1 && currentpage == QUICKSTART_ID) {
+               static TCHAR drivedf1[MAX_DPATH];
+               if (drivedf1[0] == 0)
+                       GetDlgItemText(hDlg, f_enable, drivedf1, sizeof drivedf1 / sizeof (TCHAR));
                ew (hDlg, f_enable, TRUE);
-               SetWindowText (GetDlgItem (hDlg, f_enable), L"Floppy drive DF1:");
+               SetWindowText (GetDlgItem (hDlg, f_enable), drivedf1);
                hide (hDlg, IDC_CD0Q_TYPE, 1);
        }