imported winuaesrc1610b5.zip

diff --git a/disk.c b/disk.c
index dec1869a7944a8b7cf3dc6634113a4c4b02fb5a5..e9b18e48de51691c871d624e101fccf841d67a27 100644 (file)
--- a/disk.c
+++ b/disk.c
@@ -656,14 +656,14 @@ struct zfile *DISK_validate_filename (const TCHAR *fname, int leave_open, int *w
     if (crc32)
        *crc32 = 0;
     if (leave_open) {
-       struct zfile *f = zfile_fopen (fname, L"r+b", ZFD_NORMAL);
+       struct zfile *f = zfile_fopen (fname, L"r+b", ZFD_NORMAL | ZFD_DISKHISTORY);
        if (f) {
            if (wrprot)
                *wrprot = 0;
        } else {
            if (wrprot)
                *wrprot = 1;
-           f = zfile_fopen (fname, L"rb", ZFD_NORMAL);
+           f = zfile_fopen (fname, L"rb", ZFD_NORMAL | ZFD_DISKHISTORY);
        }
        if (f && crc32)
            *crc32 = zfile_crc32 (f);
@@ -673,7 +673,7 @@ struct zfile *DISK_validate_filename (const TCHAR *fname, int leave_open, int *w
            if (wrprot)
                *wrprot = 0;
            if (crc32) {
-               struct zfile *f = zfile_fopen (fname, L"rb", ZFD_NORMAL);
+               struct zfile *f = zfile_fopen (fname, L"rb", ZFD_NORMAL | ZFD_DISKHISTORY);
                if (f)
                    *crc32 = zfile_crc32 (f);
                zfile_fclose (f);
@@ -2068,7 +2068,7 @@ void disk_creatediskfile (TCHAR *name, int type, drive_type adftype, TCHAR *disk
     xfree (chunk);
     zfile_fclose (f);
     if (f)
-       DISK_history_add (name, -1);
+       DISK_history_add (name, -1, 0);
 
 }
 
@@ -2160,7 +2160,7 @@ void disk_eject (int num)
     update_drive_gui (num);
 }
 
-int DISK_history_add (const TCHAR *name, int idx)
+int DISK_history_add (const TCHAR *name, int idx, int donotcheck)
 {
     int i;
 
@@ -2172,8 +2172,10 @@ int DISK_history_add (const TCHAR *name, int idx)
     }
     if (name[0] == 0)
        return 0;
-    if (!zfile_exists (name))
-       return 0;
+    if (!donotcheck) {
+       if (!zfile_exists (name))
+           return 0;
+    }
     if (idx >= 0) {
        if (idx >= MAX_PREVIOUS_FLOPPIES)
            return 0;
@@ -2220,7 +2222,7 @@ static void disk_insert_2 (int num, const TCHAR *name, int forced)
        return;
     _tcscpy (drv->newname, name);
     _tcscpy (currprefs.df[num], name);
-    DISK_history_add (name, -1);
+    DISK_history_add (name, -1, 0);
     if (name[0] == 0) {
        disk_eject (num);
     } else if (!drive_empty(drv) || drv->dskchange_time > 0) {

diff --git a/gayle.c b/gayle.c
index 1c0bfef23ca984d46b41e52b35521b6efdb53908..ff60de9cad751566e9decf5845ba413895da4f5f 100644 (file)
--- a/gayle.c
+++ b/gayle.c
@@ -7,7 +7,7 @@
   */
 
 #define GAYLE_LOG 0
-#define IDE_LOG 0
+#define IDE_LOG 1
 #define MBRES_LOG 0
 #define PCMCIA_LOG 1
 

diff --git a/include/disk.h b/include/disk.h
index 33cd61fd41b2f21166fa116bca63c262ddd28189..e095b8d2926acd2bdc97033564fc94e05272f191 100644 (file)
--- a/include/disk.h
+++ b/include/disk.h
@@ -26,7 +26,7 @@ extern int disk_getwriteprotect (const TCHAR *name);
 extern int disk_setwriteprotect (int num, const TCHAR *name, int protect);
 extern void disk_creatediskfile (TCHAR *name, int type, drive_type adftype, TCHAR *disk_name);
 extern void dumpdisk (void);
-extern int DISK_history_add (const TCHAR *name, int idx);
+extern int DISK_history_add (const TCHAR *name, int idx, int donotcheck);
 extern TCHAR *DISK_history_get (int idx);
 int DISK_examine_image (struct uae_prefs *p, int num, uae_u32 *crc32);
 extern TCHAR *DISK_get_saveimagepath (const TCHAR *name);

diff --git a/include/zfile.h b/include/zfile.h
index 1bace4ff4573ebece0039fc7361bb67ca0593e89..626b2731395be8a4eb0a3847b24180d003ebbc31 100644 (file)
--- a/include/zfile.h
+++ b/include/zfile.h
@@ -41,7 +41,7 @@ extern TCHAR *zfile_getfilename (struct zfile *f);
 extern uae_u32 zfile_crc32 (struct zfile *f);
 extern struct zfile *zfile_dup (struct zfile *f);
 extern struct zfile *zfile_gunzip (struct zfile *z);
-extern int zfile_isdiskimage (const TCHAR *name);
+extern int zfile_is_diskimage (const TCHAR *name);
 extern int iszip (struct zfile *z);
 extern int zfile_convertimage (const TCHAR *src, const TCHAR *dst);
 extern struct zfile *zuncompress (struct znode*, struct zfile *z, int dodefault, int mask, int *retcode);
@@ -54,6 +54,8 @@ extern TCHAR *zfile_geterror (void);
 #define ZFD_HD 4 //rdb/hdf
 #define ZFD_UNPACK 8 //gzip,dms
 #define ZFD_RAWDISK 16  //fdi->adf,ipf->adf etc..
+#define ZFD_DISKHISTORY 0x100 //allow diskhistory (if disk image)
+#define ZFD_CHECKONLY 0x200 //file exists checkc
 #define ZFD_NORMAL (ZFD_ARCHIVE|ZFD_UNPACK)
 #define ZFD_ALL 0x0000ffff
 

diff --git a/jit/compemu_support.c b/jit/compemu_support.c
index d44bf2875210e819dd70701b1cd0e4d62181e254..1909da785d37135cea6e284a38682ad0b23acf31 100644 (file)
--- a/jit/compemu_support.c
+++ b/jit/compemu_support.c
@@ -450,6 +450,16 @@ int check_prefs_changed_comp (void)
     currprefs.fpu_strict = changed_prefs.fpu_strict;
 
     if (currprefs.cachesize != changed_prefs.cachesize) {
+       if (currprefs.cachesize && !changed_prefs.cachesize) {
+           cachesize_prev = currprefs.cachesize;
+           comptrust_prev = currprefs.comptrustbyte;
+           canbang_prev = canbang;
+       } else if (!currprefs.cachesize && changed_prefs.cachesize == cachesize_prev) {
+           changed_prefs.comptrustbyte = currprefs.comptrustbyte = comptrust_prev;
+           changed_prefs.comptrustword = currprefs.comptrustword = comptrust_prev;
+           changed_prefs.comptrustlong = currprefs.comptrustlong = comptrust_prev;
+           changed_prefs.comptrustnaddr = currprefs.comptrustnaddr = comptrust_prev;
+       }
        currprefs.cachesize = changed_prefs.cachesize;
        alloc_cache();
        changed = 1;

diff --git a/od-win32/dinput.c b/od-win32/dinput.c
index 8746e43f3ae3d0b9b5db654a37392ab1a57486d4..5030a65b1bfd34754409d2aa6ce2bda2bf623673 100644 (file)
--- a/od-win32/dinput.c
+++ b/od-win32/dinput.c
@@ -998,7 +998,7 @@ static void handle_rawinput_2 (RAWINPUT *raw)
        if (num == num_mouse)
            return;
 
-       if (isfocus ()) {
+       if (isfocus () > 0) {
            for (i = 0; i < (5 > did->buttons ? did->buttons : 5); i++) {
                if (rm->usButtonFlags & (3 << (i * 2)))
                    setmousebuttonstate (num, i, (rm->usButtonFlags & (1 << (i * 2))) ? 1 : 0);
@@ -1702,7 +1702,7 @@ static void read_mouse (void)
 #ifdef DI_DEBUG2
                write_log (L"MOUSE: %d OFF=%d DATA=%d STATE=%d\n", i, dimofs, data, state);
 #endif
-               if (istest || isfocus ()) {
+               if (istest || isfocus () > 0) {
                    for (k = 0; k < did->axles; k++) {
                        if (did->axismappings[k] == dimofs)
                            setmousestate (i, k, data, 0);

diff --git a/od-win32/dxwrap.c b/od-win32/dxwrap.c
index 7993c25502e69fdcd0aea06ab302de25876b2279..064fa89739e38edb7b6c13a8d032ff299272d720 100644 (file)
--- a/od-win32/dxwrap.c
+++ b/od-win32/dxwrap.c
@@ -438,8 +438,8 @@ HRESULT DirectDraw_CreateMainSurface (int width, int height)
     } else {
        ddrval = DD_FALSE;
     }
-    write_log (L"DDRAW: primary surface %p, secondary %p (%dx%dx%d)\n",
-       dxdata.primary, surf, width, height, dxdata.native.ddpfPixelFormat.dwRGBBitCount);
+    write_log (L"DDRAW: primary surface %p, secondary %p (%dx%dx%d) bb=%d\n",
+       dxdata.primary, surf, width, height, dxdata.native.ddpfPixelFormat.dwRGBBitCount, dxdata.backbuffers);
     return ddrval;
 }
 

diff --git a/od-win32/resources/amigainfo.ico b/od-win32/resources/amigainfo.ico
index 92ed436d9e1eb017e482fae867d5f030783dfe73..1d2a8c9d7e6f4f082974f655bb946a44ef0efd84 100644 (file)
Binary files a/od-win32/resources/amigainfo.ico and b/od-win32/resources/amigainfo.ico differ

diff --git a/od-win32/resources/chip.ico b/od-win32/resources/chip.ico
index 52d09a93c6e266b8e3afedd83ace43d5d95e6f8a..c8a8c6033bd0428065a5c1bd2e422f0f3640ed71 100644 (file)
Binary files a/od-win32/resources/chip.ico and b/od-win32/resources/chip.ico differ

diff --git a/od-win32/resources/configfile.ico b/od-win32/resources/configfile.ico
new file mode 100644 (file)
index 0000000..037da91
Binary files /dev/null and b/od-win32/resources/configfile.ico differ

diff --git a/od-win32/resources/cpu.ico b/od-win32/resources/cpu.ico
index 2e790a54fc31e0eda10e7a460f2dea1ed69a79a2..cfe68e2268cd4f22f53dcf0cab3c944ff2b07a05 100644 (file)
Binary files a/od-win32/resources/cpu.ico and b/od-win32/resources/cpu.ico differ

diff --git a/od-win32/resources/diskimage.ico b/od-win32/resources/diskimage.ico
index b966b99b93cc5f1fbc9b27c55e0f3fd4c098372e..295d624aa54a5fab2ef4029036640ccde689ee70 100644 (file)
Binary files a/od-win32/resources/diskimage.ico and b/od-win32/resources/diskimage.ico differ

diff --git a/od-win32/resources/file.ico b/od-win32/resources/file.ico
index c1661ad2c1f9ca029f054d12f8da60349f21a13d..ffea4b2c30de3e04730bc4ef7683bad320e72d05 100644 (file)
Binary files a/od-win32/resources/file.ico and b/od-win32/resources/file.ico differ

diff --git a/od-win32/resources/folder.ico b/od-win32/resources/folder.ico
index ae42edc747472daae76e43b7cf9b3c21de440463..b7f171724bfb946d4e8bcca7805ee64c26faa833 100644 (file)
Binary files a/od-win32/resources/folder.ico and b/od-win32/resources/folder.ico differ

diff --git a/od-win32/resources/icon3.ico b/od-win32/resources/icon3.ico
deleted file mode 100644 (file)
index f1282c6..0000000
Binary files a/od-win32/resources/icon3.ico and /dev/null differ

diff --git a/od-win32/resources/paths.ico b/od-win32/resources/paths.ico
index fbbfe9a644d3f554b34bdd740ee59a5a010407b3..dd0a1829c945628f025fde52ce55989dfc3a3805 100644 (file)
Binary files a/od-win32/resources/paths.ico and b/od-win32/resources/paths.ico differ

diff --git a/od-win32/resources/port.ico b/od-win32/resources/port.ico
new file mode 100644 (file)
index 0000000..35db6b9
Binary files /dev/null and b/od-win32/resources/port.ico differ

diff --git a/od-win32/resources/quickstart.ico b/od-win32/resources/quickstart.ico
index df673484c4b848d35d59d648bfc99b86d2d81b19..f838572160c2f118c08e84b9fac8197f81e1a6b2 100644 (file)
Binary files a/od-win32/resources/quickstart.ico and b/od-win32/resources/quickstart.ico differ

diff --git a/od-win32/resources/resource b/od-win32/resources/resource
index 7632b6748d6d6e3ca6e9370dc35f5e2cd496a9a7..f6d637037645d3d2cf03bd769eefb22867fc197b 100644 (file)
--- a/od-win32/resources/resource
+++ b/od-win32/resources/resource
@@ -310,8 +310,11 @@
 #define IDI_DISKIMAGE                   345
 #define IDS_TABLET_NATIVE_CURSOR        346
 #define IDS_TABLET_HOST_CURSOR          347
+#define IDI_PORTS                       347
 #define IDS_AUTOSCALE_DISABLED          348
 #define IDS_AUTOSCALE_SCALING           349
+#define IDI_ICON3                       349
+#define IDI_FILE                        349
 #define IDS_AUTOSCALE_RESIZE            350
 #define IDS_PRINTER_ASCII               351
 #define IDS_PRINTER_EPSON               352
@@ -1039,7 +1042,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        346
+#define _APS_NEXT_RESOURCE_VALUE        350
 #define _APS_NEXT_COMMAND_VALUE         40045
 #define _APS_NEXT_CONTROL_VALUE         1790
 #define _APS_NEXT_SYMED_VALUE           101

diff --git a/od-win32/resources/root.ico b/od-win32/resources/root.ico
index 98dc8522f64e8c30dff733103d5435dc61a90f6b..cdd9375c6162d27169c7ee0beb1afc0f9e24cac0 100644 (file)
Binary files a/od-win32/resources/root.ico and b/od-win32/resources/root.ico differ

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 975b10e56c07b3872d2370c643f74b9c81438f07..9c91e88608a4be18233f704182bc9665e6f68bee 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -12,14 +12,47 @@
 #undef APSTUDIO_READONLY_SYMBOLS\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
-// English (U.S.) resources\r
+// English (Neutral) resources\r
 \r
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
 #ifdef _WIN32\r
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
+LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL\r
 #pragma code_page(1252)\r
 #endif //_WIN32\r
 \r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Icon\r
+//\r
+\r
+// Icon with lowest ID value placed first to ensure application icon\r
+// remains consistent on all systems.\r
+IDI_APPICON             ICON                    "winuae.ico"\r
+IDI_FLOPPY              ICON                    "35floppy.ico"\r
+IDI_ABOUT               ICON                    "amigainfo.ico"\r
+IDI_HARDDISK            ICON                    "Drive.ico"\r
+IDI_CPU                 ICON                    "cpu.ico"\r
+IDI_GAMEPORTS           ICON                    "joystick.ico"\r
+IDI_IOPORTS             ICON                    "joystick.ico"\r
+IDI_INPUT               ICON                    "joystick.ico"\r
+IDI_MISC1               ICON                    "misc.ico"\r
+IDI_MISC2               ICON                    "misc.ico"\r
+IDI_MOVE_UP             ICON                    "move_up.ico"\r
+IDI_MOVE_DOWN           ICON                    "move_dow.ico"\r
+IDI_AVIOUTPUT           ICON                    "avioutput.ico"\r
+IDI_DISK                ICON                    "Drive.ico"\r
+IDI_FOLDER              ICON                    "folder.ico"\r
+IDI_SOUND               ICON                    "sound.ico"\r
+IDI_DISPLAY             ICON                    "screen.ico"\r
+IDI_ROOT                ICON                    "root.ico"\r
+IDI_MEMORY              ICON                    "chip.ico"\r
+IDI_QUICKSTART          ICON                    "quickstart.ico"\r
+IDI_PATHS               ICON                    "paths.ico"\r
+IDI_DISKIMAGE           ICON                    "diskimage.ico"\r
+IDI_PORTS               ICON                    "port.ico"\r
+IDI_CONFIGFILE          ICON                    "configfile.ico"\r
+IDI_FILE                ICON                    "file.ico"\r
+\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Accelerator\r
@@ -936,36 +969,6 @@ BEGIN
 END\r
 \r
 \r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Icon\r
-//\r
-\r
-// Icon with lowest ID value placed first to ensure application icon\r
-// remains consistent on all systems.\r
-IDI_APPICON             ICON                    "winuae.ico"\r
-IDI_FLOPPY              ICON                    "35floppy.ico"\r
-IDI_ABOUT               ICON                    "amigainfo.ico"\r
-IDI_HARDDISK            ICON                    "Drive.ico"\r
-IDI_CPU                 ICON                    "cpu.ico"\r
-IDI_GAMEPORTS           ICON                    "joystick.ico"\r
-IDI_IOPORTS             ICON                    "joystick.ico"\r
-IDI_INPUT               ICON                    "joystick.ico"\r
-IDI_MISC1               ICON                    "misc.ico"\r
-IDI_MISC2               ICON                    "misc.ico"\r
-IDI_MOVE_UP             ICON                    "move_up.ico"\r
-IDI_MOVE_DOWN           ICON                    "move_dow.ico"\r
-IDI_AVIOUTPUT           ICON                    "avioutput.ico"\r
-IDI_DISK                ICON                    "Drive.ico"\r
-IDI_CONFIGFILE          ICON                    "file.ico"\r
-IDI_FOLDER              ICON                    "folder.ico"\r
-IDI_SOUND               ICON                    "sound.ico"\r
-IDI_DISPLAY             ICON                    "screen.ico"\r
-IDI_ROOT                ICON                    "root.ico"\r
-IDI_MEMORY              ICON                    "chip.ico"\r
-IDI_QUICKSTART          ICON                    "quickstart.ico"\r
-IDI_PATHS               ICON                    "paths.ico"\r
-\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Version\r
@@ -1460,7 +1463,7 @@ BEGIN
     IDS_RES_SUPERHIRES      "SuperHires"\r
 END\r
 \r
-#endif    // English (U.S.) resources\r
+#endif    // English (Neutral) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
 \r
@@ -1473,15 +1476,6 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 #pragma code_page(1252)\r
 #endif //_WIN32\r
 \r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// Icon\r
-//\r
-\r
-// Icon with lowest ID value placed first to ensure application icon\r
-// remains consistent on all systems.\r
-IDI_DISKIMAGE           ICON                    "diskimage.ico"\r
-\r
 #ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r

diff --git a/od-win32/win32.c b/od-win32/win32.c
index b8302d8d13e9c83da2dd811484043275b2cfa4b0..71a4de402c1037f11815dd3c21baf6df6cba5228 100644 (file)
--- a/od-win32/win32.c
+++ b/od-win32/win32.c
@@ -194,13 +194,13 @@ static int init_mmtimer (void)
     int i;
 
     mm_timerres = 0;
-    if (timeGetDevCaps(&tc, sizeof(TIMECAPS)) != TIMERR_NOERROR)
+    if (timeGetDevCaps (&tc, sizeof(TIMECAPS)) != TIMERR_NOERROR)
        return 0;
     mm_timerres = min (max (tc.wPeriodMin, 1), tc.wPeriodMax);
     sleep_resolution = 1000 / mm_timerres;
     for (i = 0; i < MAX_TIMEHANDLES; i++)
        timehandle[i] = CreateEvent (NULL, TRUE, FALSE, NULL);
-    InitializeCriticalSection(&cs_time);
+    InitializeCriticalSection (&cs_time);
     timehandlecounter = 0;
     return 1;
 }
@@ -522,7 +522,7 @@ void setmouseactive (int active)
     if (mouseactive == active && active >= 0)
        return;
 
-    if (active > 0) {
+    if (active == 1 && !currprefs.input_magic_mouse) {
        HANDLE c = GetCursor ();
        if (c != normalcursor)
            return;
@@ -535,7 +535,6 @@ void setmouseactive (int active)
     if (active < 0)
        active = 1;
 
-
     mouseactive = active;
 
     mouseposx = mouseposy = 0;
@@ -566,7 +565,7 @@ void setmouseactive (int active)
                if (SetForegroundWindow (w1) == FALSE) {
                    if (w3 == NULL || SetForegroundWindow (w3) == FALSE) {
                        donotfocus = 1;
-                       write_log (L"wanted focus but SetforegroundWindow() failed\n");
+                       write_log (L"wanted focus but SetForegroundWindow() failed\n");
                    }
                }
            }
@@ -805,7 +804,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
     case WM_LBUTTONDOWN:
     case WM_LBUTTONDBLCLK:
        if (!mouseactive && isfullscreen() <= 0 && !gui_active && (!mousehack_alive () || currprefs.input_tablet != TABLET_MOUSEHACK)) {
-           setmouseactive (1);
+           setmouseactive (message == WM_LBUTTONDBLCLK ? 2 : 1);
        } else if (dinput_winmouse () >= 0 && isfocus ()) {
            setmousebuttonstate (dinput_winmouse (), 0, 1);
        }
@@ -963,7 +962,6 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
        break;
     }
 
-
     case WM_MOUSEMOVE:
     {
        int wm = dinput_winmouse ();
@@ -1039,6 +1037,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
            SHNOTIFYSTRUCT *shns = (SHNOTIFYSTRUCT*)wParam;
            if (SHGetPathFromIDList ((struct _ITEMIDLIST *)(shns->dwItem1), path)) {
                int inserted = lParam == SHCNE_MEDIAINSERTED ? 1 : 0;
+               UINT errormode = SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
                write_log (L"Shell Notification %d '%s'\n", inserted, path);
                if (!win32_hardfile_media_change (path, inserted)) {    
                    if ((inserted && CheckRM (path)) || !inserted) {
@@ -1050,6 +1049,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                        filesys_media_change (path, inserted, NULL);
                    }
                }
+               SetErrorMode (errormode);
            }
        }
     }
@@ -1078,6 +1078,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                if (pBVol->dbcv_unitmask) {
                    int inserted, i;
                    TCHAR drive;
+                   UINT errormode = SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
                    for (i = 0; i <= 'Z'-'A'; i++) {
                        if (pBVol->dbcv_unitmask & (1 << i)) {
                            TCHAR drvname[10];
@@ -1109,6 +1110,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                            }
                        }
                    }
+                   SetErrorMode (errormode);
                }
            }
        }
@@ -1117,36 +1119,35 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
     return TRUE;
 
     case WM_SYSCOMMAND:
-           switch (wParam & 0xfff0) // Check System Calls
+       switch (wParam & 0xfff0) // Check System Calls
+       {
+           case SC_SCREENSAVE: // Screensaver Trying To Start?
+           case SC_MONITORPOWER: // Monitor Trying To Enter Powersave?
+           if (!manual_painting_needed && focus && currprefs.win32_powersavedisabled)
+               return 0; // Prevent From Happening
+           break;
+           default:
            {
-               case SC_SCREENSAVE: // Screensaver Trying To Start?
-               case SC_MONITORPOWER: // Monitor Trying To Enter Powersave?
-               if (!manual_painting_needed && focus && currprefs.win32_powersavedisabled) {
-                   return 0; // Prevent From Happening
-               break;
-               default:
-               {
-                   LRESULT lr;
+               LRESULT lr;
                    
 #ifdef RETROPLATFORM
-                   if ((wParam & 0xfff0) == SC_CLOSE) {
-                       if (rp_close ())
-                           return 0;
-                   }
+               if ((wParam & 0xfff0) == SC_CLOSE) {
+                   if (rp_close ())
+                       return 0;
+               }
 #endif
-                   lr = DefWindowProc (hWnd, message, wParam, lParam);
-                   switch (wParam & 0xfff0)
-                   {
-                       case SC_MINIMIZE:
-                       break;
-                       case SC_RESTORE:
-                       break;
-                       case SC_CLOSE:
-                           PostQuitMessage (0);
-                       break;
-                   }
-                   return lr;
+               lr = DefWindowProc (hWnd, message, wParam, lParam);
+               switch (wParam & 0xfff0)
+               {
+                   case SC_MINIMIZE:
+                   break;
+                   case SC_RESTORE:
+                   break;
+                   case SC_CLOSE:
+                       PostQuitMessage (0);
+                   break;
                }
+               return lr;
            }
        }
     break;
@@ -2809,7 +2810,7 @@ static int shell_associate_is (const TCHAR *extension)
 }
 
 struct assext exts[] = {
-    { L".uae", L"-f \"%1\"", L"WinUAE configuration file", IDI_APPICON },
+    { L".uae", L"-f \"%1\"", L"WinUAE configuration file", IDI_CONFIGFILE },
     { L".adf", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE },
     { L".adz", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE },
     { L".dms", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE },
@@ -2828,6 +2829,8 @@ static void associate_init_extensions (void)
        if (shell_associate_is (exts[i].ext))
            exts[i].enabled = 1;
     }
+    if (rp_param)
+       return;
     // associate .uae by default when running for the first time
     if (!regexiststree (NULL, L"FileAssociations")) {
        UAEREG *fkey;
@@ -2915,6 +2918,8 @@ void associate_file_extensions (void)
     int i;
     int modified = 0;
 
+    if (rp_param)
+       return;
     for (i = 0; exts[i].ext; i++) {
        int already = shell_associate_is (exts[i].ext);
        if (exts[i].enabled == 0 && already) {

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 320b094b1f07461dd6fd821460745a4fd1f3458f..432c4c853939305b4e962ac6cf35d425e5204f44 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -17,8 +17,8 @@
 
 #define WINUAEPUBLICBETA 1
 
-#define WINUAEBETA L"Beta 4"
-#define WINUAEDATE MAKEBD(2009, 6, 14)
+#define WINUAEBETA L"Beta 5"
+#define WINUAEDATE MAKEBD(2009, 6, 17)
 #define WINUAEEXTRA L""
 #define WINUAEREV L""
 

diff --git a/od-win32/win32gfx.c b/od-win32/win32gfx.c
index 3c24cdeb35d8096209e3f22d7373abdfa65d545b..8c69a6febab2ca5b0bbaeac0a5a019de8716c48d 100644 (file)
--- a/od-win32/win32gfx.c
+++ b/od-win32/win32gfx.c
@@ -53,8 +53,8 @@
 #include "rp.h"
 #endif
 
-#define AMIGA_WIDTH_MAX 752
-#define AMIGA_HEIGHT_MAX 568
+#define AMIGA_WIDTH_MAX (752 / 2)
+#define AMIGA_HEIGHT_MAX (568 / 2)
 
 #define DM_DX_FULLSCREEN 1
 #define DM_W_FULLSCREEN 2
@@ -2357,12 +2357,8 @@ static BOOL doInit (void)
            currentmode->native_depth = currentmode->current_depth;
 #if defined (GFXFILTER)
            if (currentmode->flags & (DM_OPENGL | DM_D3D | DM_SWSCALE)) {
-               currentmode->amiga_width = AMIGA_WIDTH_MAX;
-               currentmode->amiga_height = AMIGA_HEIGHT_MAX >> (currprefs.gfx_linedbl ? 0 : 1);
-               if (currprefs.gfx_resolution == 0)
-                   currentmode->amiga_width >>= 1;
-               else if (currprefs.gfx_resolution > 1)
-                   currentmode->amiga_width <<= 1;
+               currentmode->amiga_width = AMIGA_WIDTH_MAX << currprefs.gfx_resolution;
+               currentmode->amiga_height = AMIGA_HEIGHT_MAX << (currprefs.gfx_linedbl ? 1 : 0);
                if (usedfilter) {
                    if (usedfilter->x[0]) {
                        currentmode->current_depth = (currprefs.gfx_filter_filtermode / 2) ? 32 : 16;

diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c
index be8a85f7f195741ec7455bc7da2006711e518b6c..c2457bffad011387ba598964070162b69512384a 100644 (file)
--- a/od-win32/win32gui.c
+++ b/od-win32/win32gui.c
@@ -418,7 +418,7 @@ void reset_disk_history (void)
     int i;
 
     for (i = 0; i < MAX_PREVIOUS_FLOPPIES; i++)
-       DISK_history_add (NULL, i);
+       DISK_history_add (NULL, i, 0);
     write_disk_history ();
 }
 
@@ -445,7 +445,7 @@ UAEREG *read_disk_history (void)
        if (_tcslen (tmp) == 7) {
            idx2 = _tstol (tmp + 5) - 1;
            if (idx2 >= 0)
-               DISK_history_add (tmp2, idx2);
+               DISK_history_add (tmp2, idx2, 0);
        }
        idx++;
     }
@@ -1771,26 +1771,26 @@ int DiskSelection_2 (HWND hDlg, WPARAM wParam, int flag, struct uae_prefs *prefs
        case IDC_DF0QQ:
            SetDlgItemText (hDlg, IDC_DF0TEXT, full_path);
            _tcscpy(prefs->df[0], full_path);
-           DISK_history_add (full_path, -1);
+           DISK_history_add (full_path, -1, 0);
            next = IDC_DF1;
            break;
        case IDC_DF1:
        case IDC_DF1QQ:
            SetDlgItemText (hDlg, IDC_DF1TEXT, full_path);
            _tcscpy(prefs->df[1], full_path);
-           DISK_history_add (full_path, -1);
+           DISK_history_add (full_path, -1, 0);
            next = IDC_DF2;
            break;
        case IDC_DF2:
            SetDlgItemText (hDlg, IDC_DF2TEXT, full_path);
            _tcscpy(prefs->df[2], full_path);
-           DISK_history_add (full_path, -1);
+           DISK_history_add (full_path, -1, 0);
            next = IDC_DF3;
            break;
        case IDC_DF3:
            SetDlgItemText (hDlg, IDC_DF3TEXT, full_path);
            _tcscpy (prefs->df[3], full_path);
-           DISK_history_add (full_path, -1);
+           DISK_history_add (full_path, -1, 0);
            break;
        case IDC_DOSAVESTATE:
        case IDC_DOLOADSTATE:
@@ -2838,6 +2838,7 @@ void InitializeListView (HWND hDlg)
        _tcscpy (column_heading[0], L"Extension");
        _tcscpy (column_heading[1], L"");
        list = GetDlgItem (hDlg, IDC_ASSOCIATELIST);
+
     } else {
 
        listview_num_columns = DISK_COLUMNS;
@@ -3317,7 +3318,7 @@ static HTREEITEM InitializeConfigTreeView (HWND hDlg)
        HICON icon;
        icon = LoadIcon (hInst, (LPCWSTR)MAKEINTRESOURCE(IDI_FOLDER));
        ImageList_AddIcon (himl, icon);
-       icon = LoadIcon (hInst, (LPCWSTR)MAKEINTRESOURCE(IDI_CONFIGFILE));
+       icon = LoadIcon (hInst, (LPCWSTR)MAKEINTRESOURCE(IDI_FILE));
        ImageList_AddIcon (himl, icon);
        icon = LoadIcon (hInst, (LPCWSTR)MAKEINTRESOURCE(IDI_ROOT));
        ImageList_AddIcon (himl, icon);
@@ -6247,6 +6248,9 @@ static void enable_for_miscdlg (HWND hDlg)
        ew (hDlg, IDC_STATE_RATE, workprefs.statecapture ? TRUE : FALSE);
        ew (hDlg, IDC_STATE_BUFFERSIZE, workprefs.statecapture ? TRUE : FALSE);
     }
+    ew (hDlg, IDC_ASSOCIATELIST, !rp_isactive ());
+    ew (hDlg, IDC_ASSOCIATE_ON, !rp_isactive ());
+    ew (hDlg, IDC_ASSOCIATE_OFF, !rp_isactive ());
 }
 
 static void misc_kbled (HWND hDlg, int v, int nv)
@@ -6336,7 +6340,7 @@ static void misc_lang(HWND hDlg)
     }
     SendDlgItemMessage (hDlg, IDC_LANGUAGE, CB_SETCURSEL, idx, 0);
 }
-static void misc_setlang(int v)
+static void misc_setlang (int v)
 {
     int i;
     WORD langid = 0;
@@ -6832,7 +6836,7 @@ static void values_from_cpudlg (HWND hDlg)
 #ifdef JIT
     oldcache = workprefs.cachesize;
     jitena = IsDlgButtonChecked (hDlg, IDC_JITENABLE) ? 1 : 0;
-    workprefs.cachesize = SendMessage (GetDlgItem(hDlg, IDC_CACHE), TBM_GETPOS, 0, 0) * 1024;
+    workprefs.cachesize = SendMessage (GetDlgItem (hDlg, IDC_CACHE), TBM_GETPOS, 0, 0) * 1024;
     if (!jitena) {
        cachesize_prev = workprefs.cachesize;
        trust_prev = workprefs.comptrustbyte;
@@ -8479,7 +8483,7 @@ static int getfloppybox (HWND hDlg, int f_text, TCHAR *out, int maxlen)
     i = 0;
     while ((p = DISK_history_get (i))) {
        if (!_tcscmp (p, out)) {
-           DISK_history_add (out, -1);
+           DISK_history_add (out, -1, 0);
            break;
        }
        i++;
@@ -12171,7 +12175,7 @@ static int GetSettings (int all_options, HWND hwnd)
     if (!init_called) {
        first = 1;
        panelresource = getresource (IDD_PANEL);
-       LOADSAVE_ID = init_page (IDD_LOADSAVE, IDI_CONFIGFILE, IDS_LOADSAVE, LoadSaveDlgProc, NULL, L"gui/configurations.htm");
+       LOADSAVE_ID = init_page (IDD_LOADSAVE, IDI_FILE, IDS_LOADSAVE, LoadSaveDlgProc, NULL, L"gui/configurations.htm");
        MEMORY_ID = init_page (IDD_MEMORY, IDI_MEMORY, IDS_MEMORY, MemoryDlgProc, NULL, L"gui/ram.htm");
        KICKSTART_ID = init_page (IDD_KICKSTART, IDI_MEMORY, IDS_KICKSTART, KickstartDlgProc, NULL, L"gui/rom.htm");
        CPU_ID = init_page (IDD_CPU, IDI_CPU, IDS_CPU, CPUDlgProc, NULL, L"gui/cpu.htm");
@@ -12188,7 +12192,7 @@ static int GetSettings (int all_options, HWND hwnd)
        HARDDISK_ID = init_page (IDD_HARDDISK, IDI_HARDDISK, IDS_HARDDISK, HarddiskDlgProc, HarddiskAccel, L"gui/hard-drives.htm");
 #endif
        GAMEPORTS_ID = init_page (IDD_GAMEPORTS, IDI_GAMEPORTS, IDS_GAMEPORTS, GamePortsDlgProc, NULL, L"gui/gameports.htm");
-       IOPORTS_ID = init_page (IDD_IOPORTS, IDI_IOPORTS, IDS_IOPORTS, IOPortsDlgProc, NULL, L"gui/ioports.htm");
+       IOPORTS_ID = init_page (IDD_IOPORTS, IDI_PORTS, IDS_IOPORTS, IOPortsDlgProc, NULL, L"gui/ioports.htm");
        INPUT_ID = init_page (IDD_INPUT, IDI_INPUT, IDS_INPUT, InputDlgProc, NULL, L"gui/input.htm");
        MISC1_ID = init_page (IDD_MISC1, IDI_MISC1, IDS_MISC1, MiscDlgProc1, NULL, L"gui/misc.htm");
        MISC2_ID = init_page (IDD_MISC2, IDI_MISC2, IDS_MISC2, MiscDlgProc2, NULL, L"gui/misc2.htm");

diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj
index 4c9d7d61af3c632e5fce12b5446bff1aaa474029..2ff518f69b5815b424125ad0278bccb220b163b9 100644 (file)
--- a/od-win32/winuae_msvc/winuae_msvc.vcproj
+++ b/od-win32/winuae_msvc/winuae_msvc.vcproj
@@ -127,13 +127,13 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory="d:\amiga"
-                       IntermediateDirectory=".\Release"
+                       Name="Debug|x64"
+                       OutputDirectory="x64\$(ConfigurationName)"
+                       IntermediateDirectory="x64\$(ConfigurationName)"
                        ConfigurationType="1"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -149,50 +149,41 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\Release/winuae_msvc.tlb"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="3"
-                               InlineFunctionExpansion="2"
-                               EnableIntrinsicFunctions="true"
-                               FavorSizeOrSpeed="1"
-                               OmitFramePointers="true"
-                               WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include"
-                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS"
-                               StringPooling="true"
+                               AdditionalOptions=""
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
+                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32,_WINDOWS,ZLIB_DLL,OPENGL_SUPPORT,_WIN32_IE 0x0500,UNIX;WIN64"
                                ExceptionHandling="0"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="0"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="false"
-                               EnableEnhancedInstructionSet="0"
-                               FloatingPointModel="0"
-                               TreatWChar_tAsBuiltInType="false"
-                               RuntimeTypeInfo="false"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               BufferSecurityCheck="true"
+                               RuntimeTypeInfo="true"
+                               PrecompiledHeaderFile=".\Debug/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Debug/"
+                               ObjectFile=".\Debug/"
+                               ProgramDataBaseFileName=".\Debug/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               CallingConvention="2"
-                               CompileAs="1"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="3"
+                               CompileAs="0"
                                DisableSpecificWarnings="4996"
-                               ForcedIncludeFiles=""
+                               EnablePREfast="false"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
@@ -200,34 +191,26 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib dxerr9.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib wpcap.lib packet.lib openal32.lib wintab32.lib portaudio_x86.lib freetype.lib"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zlib1.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
                                OutputFile="d:\amiga\winuae.exe"
-                               LinkIncremental="1"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
-                               GenerateManifest="true"
-                               AdditionalManifestDependencies=""
-                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_41.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll"
+                               GenerateManifest="false"
+                               DelayLoadDLLs="setupapi.dll"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\Release/winuae.pdb"
+                               ProgramDatabaseFile=".\Debug/winuae.pdb"
                                SubSystem="2"
                                StackReserveSize="2621440"
                                StackCommitSize="2621440"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               OptimizeForWindows98="0"
-                               LinkTimeCodeGeneration="0"
-                               RandomizedBaseAddress="2"
-                               FixedBaseAddress="1"
-                               DataExecutionPrevention="2"
-                               TargetMachine="1"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCManifestTool"
-                               AdditionalManifestFiles="..\resources\winuae9.exe.manifest"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
@@ -246,9 +229,13 @@
                        />
                </Configuration>
                <Configuration
-                       Name="TestRelease|Win32"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       Name="Release|Win32"
+                       OutputDirectory="d:\amiga"
+                       IntermediateDirectory=".\Release"
                        ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -264,29 +251,85 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\Release/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="3"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               FavorSizeOrSpeed="1"
+                               OmitFramePointers="true"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include"
+                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS"
+                               StringPooling="true"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="0"
+                               BufferSecurityCheck="false"
+                               EnableFunctionLevelLinking="false"
+                               EnableEnhancedInstructionSet="0"
+                               FloatingPointModel="0"
+                               TreatWChar_tAsBuiltInType="false"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Release/"
+                               ObjectFile=".\Release/"
+                               ProgramDataBaseFileName=".\Release/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               CallingConvention="2"
+                               CompileAs="1"
+                               DisableSpecificWarnings="4996"
+                               ForcedIncludeFiles=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib dxerr9.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib wpcap.lib packet.lib openal32.lib wintab32.lib portaudio_x86.lib freetype.lib"
+                               OutputFile="d:\amiga\winuae.exe"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
+                               GenerateManifest="true"
+                               AdditionalManifestDependencies=""
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_41.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\Release/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="2621440"
+                               StackCommitSize="2621440"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               OptimizeForWindows98="0"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="2"
+                               FixedBaseAddress="1"
+                               DataExecutionPrevention="2"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae9.exe.manifest"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
@@ -305,10 +348,13 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release64|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)x64\$(ConfigurationName)"
+                       IntermediateDirectory="x64\$(ConfigurationName)"
                        ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -324,23 +370,76 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\Release/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
+                               Optimization="3"
+                               InlineFunctionExpansion="1"
+                               EnableIntrinsicFunctions="true"
+                               FavorSizeOrSpeed="1"
+                               OmitFramePointers="true"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
+                               PreprocessorDefinitions="WINVER=0x0500,WIN32,NDEBUG,_WINDOWS,ZLIB_DLL,_WIN32_IE 0x0500,WIN64,_WIN64,UNIX"
+                               StringPooling="true"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="0"
+                               BufferSecurityCheck="false"
+                               EnableFunctionLevelLinking="true"
+                               EnableEnhancedInstructionSet="0"
+                               FloatingPointModel="0"
+                               TreatWChar_tAsBuiltInType="false"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Release/"
+                               ObjectFile=".\Release/"
+                               ProgramDataBaseFileName=".\Release/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               CompileAs="1"
+                               DisableSpecificWarnings="4996"
+                               ForcedIncludeFiles=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib setupapi.lib wininet.lib dxerr8.lib shlwapi.lib"
+                               ShowProgress="0"
+                               OutputFile="d:\amiga\winuae64.exe"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
+                               GenerateManifest="true"
+                               DelayLoadDLLs=""
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\Release/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="0"
+                               StackCommitSize="0"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               OptimizeForWindows98="0"
+                               LinkTimeCodeGeneration="0"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -365,13 +464,9 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug64|Win32"
-                       OutputDirectory="$(ConfigurationName)"
+                       Name="TestRelease|Win32"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -387,60 +482,21 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               MkTypLibCompatible="true"
-                               SuppressStartupBanner="true"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=""
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
-                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32,_WINDOWS,ZLIB_DLL,OPENGL_SUPPORT,_WIN32_IE 0x0500,UNIX"
-                               ExceptionHandling="0"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               PrecompiledHeaderFile=".\Debug/winuae_msvc.pch"
-                               AssemblerListingLocation=".\Debug/"
-                               ObjectFile=".\Debug/"
-                               ProgramDataBaseFileName=".\Debug/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
-                               CompileAs="0"
-                               DisableSpecificWarnings="4996"
-                               EnablePREfast="false"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zdll.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
-                               OutputFile="d:\amiga\winuae.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               GenerateManifest="false"
-                               DelayLoadDLLs="setupapi.dll"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\Debug/winuae.pdb"
-                               SubSystem="2"
-                               StackReserveSize="2621440"
-                               StackCommitSize="2621440"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                        />
@@ -467,14 +523,13 @@
                        />
                </Configuration>
                <Configuration
-                       Name="FullRelease|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
+                       Name="TestRelease|x64"
+                       OutputDirectory="$(SolutionDir)x64\$(ConfigurationName)"
+                       IntermediateDirectory="x64\$(ConfigurationName)"
                        ConfigurationType="1"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="1"
-                       WholeProgramOptimization="1"
+                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -493,39 +548,35 @@
                                PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="1"
+                               TargetEnvironment="3"
                                TypeLibraryName=".\Release/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="3"
-                               InlineFunctionExpansion="2"
+                               AdditionalOptions="/Oy-"
+                               Optimization="0"
+                               InlineFunctionExpansion="1"
                                EnableIntrinsicFunctions="true"
-                               FavorSizeOrSpeed="1"
-                               OmitFramePointers="true"
-                               WholeProgramOptimization="true"
-                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include"
-                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS"
+                               FavorSizeOrSpeed="0"
+                               OmitFramePointers="false"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
+                               PreprocessorDefinitions="WINVER=0x0500,WIN32,NDEBUG,_WINDOWS,ZLIB_DLL,_WIN32_IE 0x0500,UNIX;WIN64"
                                StringPooling="true"
                                ExceptionHandling="0"
-                               BasicRuntimeChecks="0"
                                RuntimeLibrary="0"
                                BufferSecurityCheck="false"
                                EnableFunctionLevelLinking="true"
                                EnableEnhancedInstructionSet="0"
-                               FloatingPointModel="0"
                                TreatWChar_tAsBuiltInType="false"
                                RuntimeTypeInfo="false"
                                UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\FullRelease/winuae_msvc.pch"
-                               AssemblerListingLocation=".\FullRelease/"
-                               ObjectFile=".\FullRelease/"
-                               ProgramDataBaseFileName=".\FullRelease/"
+                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
+                               AssemblerListingLocation=".\TestRelease/"
+                               ObjectFile=".\TestRelease/"
+                               ProgramDataBaseFileName=".\TestRelease/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               CallingConvention="2"
                                CompileAs="1"
-                               DisableSpecificWarnings="4996"
                                ForcedIncludeFiles=""
                        />
                        <Tool
@@ -541,35 +592,28 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib dxerr9.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib wpcap.lib packet.lib openal32.lib wintab32.lib portaudio_x86.lib freetype.lib"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zlib1.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
                                OutputFile="d:\amiga\winuae.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
-                               GenerateManifest="true"
-                               AdditionalManifestDependencies=""
-                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_41.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll"
+                               DelayLoadDLLs="setupapi.dll"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\FullRelease/winuae.pdb"
+                               ProgramDatabaseFile=".\Release/winuae.pdb"
                                SubSystem="2"
-                               StackReserveSize="0"
-                               StackCommitSize="0"
-                               LargeAddressAware="1"
+                               StackReserveSize="2621440"
+                               StackCommitSize="2621440"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
                                OptimizeForWindows98="0"
-                               LinkTimeCodeGeneration="1"
-                               RandomizedBaseAddress="2"
-                               FixedBaseAddress="1"
-                               DataExecutionPrevention="2"
-                               TargetMachine="1"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCManifestTool"
-                               AdditionalManifestFiles="..\resources\winuae9.exe.manifest"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
@@ -588,13 +632,10 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug|x64"
-                       OutputDirectory="x64\$(ConfigurationName)"
-                       IntermediateDirectory="x64\$(ConfigurationName)"
+                       Name="Release64|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -610,62 +651,23 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               MkTypLibCompatible="true"
-                               SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=""
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
-                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32,_WINDOWS,ZLIB_DLL,OPENGL_SUPPORT,_WIN32_IE 0x0500,UNIX;WIN64"
-                               ExceptionHandling="0"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               BufferSecurityCheck="true"
-                               RuntimeTypeInfo="true"
-                               PrecompiledHeaderFile=".\Debug/winuae_msvc.pch"
-                               AssemblerListingLocation=".\Debug/"
-                               ObjectFile=".\Debug/"
-                               ProgramDataBaseFileName=".\Debug/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
-                               DisableSpecificWarnings="4996"
-                               EnablePREfast="false"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zlib1.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
-                               OutputFile="d:\amiga\winuae.exe"
-                               LinkIncremental="2"
-                               SuppressStartupBanner="true"
-                               GenerateManifest="false"
-                               DelayLoadDLLs="setupapi.dll"
-                               GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\Debug/winuae.pdb"
-                               SubSystem="2"
-                               StackReserveSize="2621440"
-                               StackCommitSize="2621440"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -690,7 +692,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release|x64"
+                       Name="Release64|x64"
                        OutputDirectory="$(SolutionDir)x64\$(ConfigurationName)"
                        IntermediateDirectory="x64\$(ConfigurationName)"
                        ConfigurationType="1"
@@ -727,24 +729,25 @@
                                OmitFramePointers="true"
                                WholeProgramOptimization="false"
                                AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
-                               PreprocessorDefinitions="WINVER=0x0500,WIN32,NDEBUG,_WINDOWS,ZLIB_DLL,_WIN32_IE 0x0500,WIN64,_WIN64,UNIX"
+                               PreprocessorDefinitions="WINVER=0x0500,WIN32,NDEBUG,_WINDOWS,_WIN32_IE 0x0500,UNIX;WIN64"
                                StringPooling="true"
                                ExceptionHandling="0"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="0"
                                BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
+                               EnableFunctionLevelLinking="false"
                                EnableEnhancedInstructionSet="0"
                                FloatingPointModel="0"
                                TreatWChar_tAsBuiltInType="false"
-                               RuntimeTypeInfo="false"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\Release64/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Release64/"
+                               ObjectFile=".\Release64/"
+                               ProgramDataBaseFileName=".\Release64/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
+                               Detect64BitPortabilityProblems="true"
                                CompileAs="1"
                                DisableSpecificWarnings="4996"
                                ForcedIncludeFiles=""
@@ -762,8 +765,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib setupapi.lib wininet.lib dxerr8.lib shlwapi.lib"
-                               ShowProgress="0"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib setupapi.lib wininet.lib dxerr8.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib"
                                OutputFile="d:\amiga\winuae64.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
@@ -771,10 +773,8 @@
                                GenerateManifest="true"
                                DelayLoadDLLs=""
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\Release/winuae.pdb"
+                               ProgramDatabaseFile=".\Release64/winuae.pdb"
                                SubSystem="2"
-                               StackReserveSize="0"
-                               StackCommitSize="0"
                                OptimizeReferences="2"
                                EnableCOMDATFolding="2"
                                OptimizeForWindows98="0"
@@ -788,6 +788,7 @@
                        />
                        <Tool
                                Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae.exe.manifest"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
@@ -806,9 +807,9 @@
                        />
                </Configuration>
                <Configuration
-                       Name="TestRelease|x64"
-                       OutputDirectory="$(SolutionDir)x64\$(ConfigurationName)"
-                       IntermediateDirectory="x64\$(ConfigurationName)"
+                       Name="Debug64|Win32"
+                       OutputDirectory="$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
@@ -828,46 +829,41 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\Release/winuae_msvc.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions="/Oy-"
+                               AdditionalOptions=""
                                Optimization="0"
-                               InlineFunctionExpansion="1"
-                               EnableIntrinsicFunctions="true"
-                               FavorSizeOrSpeed="0"
-                               OmitFramePointers="false"
                                AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
-                               PreprocessorDefinitions="WINVER=0x0500,WIN32,NDEBUG,_WINDOWS,ZLIB_DLL,_WIN32_IE 0x0500,UNIX;WIN64"
-                               StringPooling="true"
+                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32,_WINDOWS,ZLIB_DLL,OPENGL_SUPPORT,_WIN32_IE 0x0500,UNIX"
                                ExceptionHandling="0"
-                               RuntimeLibrary="0"
-                               BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="true"
-                               EnableEnhancedInstructionSet="0"
-                               TreatWChar_tAsBuiltInType="false"
-                               RuntimeTypeInfo="false"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
-                               AssemblerListingLocation=".\TestRelease/"
-                               ObjectFile=".\TestRelease/"
-                               ProgramDataBaseFileName=".\TestRelease/"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               BufferSecurityCheck="true"
+                               RuntimeTypeInfo="true"
+                               PrecompiledHeaderFile=".\Debug/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Debug/"
+                               ObjectFile=".\Debug/"
+                               ProgramDataBaseFileName=".\Debug/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               CompileAs="1"
-                               ForcedIncludeFiles=""
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="4"
+                               CompileAs="0"
+                               DisableSpecificWarnings="4996"
+                               EnablePREfast="false"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
@@ -875,22 +871,20 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zlib1.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
+                               AdditionalOptions="/MACHINE:I386"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zdll.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
                                OutputFile="d:\amiga\winuae.exe"
-                               LinkIncremental="1"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
+                               GenerateManifest="false"
                                DelayLoadDLLs="setupapi.dll"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\Release/winuae.pdb"
+                               ProgramDatabaseFile=".\Debug/winuae.pdb"
                                SubSystem="2"
                                StackReserveSize="2621440"
                                StackCommitSize="2621440"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               OptimizeForWindows98="0"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
-                               TargetMachine="17"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -915,7 +909,7 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Release64|x64"
+                       Name="Debug64|x64"
                        OutputDirectory="$(SolutionDir)x64\$(ConfigurationName)"
                        IntermediateDirectory="x64\$(ConfigurationName)"
                        ConfigurationType="1"
@@ -937,50 +931,41 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
                                TargetEnvironment="3"
-                               TypeLibraryName=".\Release/winuae_msvc.tlb"
+                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               Optimization="3"
-                               InlineFunctionExpansion="1"
-                               EnableIntrinsicFunctions="true"
-                               FavorSizeOrSpeed="1"
-                               OmitFramePointers="true"
-                               WholeProgramOptimization="false"
+                               AdditionalOptions=""
+                               Optimization="0"
                                AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
-                               PreprocessorDefinitions="WINVER=0x0500,WIN32,NDEBUG,_WINDOWS,_WIN32_IE 0x0500,UNIX;WIN64"
-                               StringPooling="true"
+                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32,_WINDOWS,_WIN32_IE 0x0500,UNIX,WIN64"
                                ExceptionHandling="0"
-                               BasicRuntimeChecks="0"
-                               RuntimeLibrary="0"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
                                BufferSecurityCheck="false"
-                               EnableFunctionLevelLinking="false"
-                               EnableEnhancedInstructionSet="0"
-                               FloatingPointModel="0"
-                               TreatWChar_tAsBuiltInType="false"
-                               RuntimeTypeInfo="false"
-                               UsePrecompiledHeader="0"
-                               PrecompiledHeaderFile=".\Release64/winuae_msvc.pch"
-                               AssemblerListingLocation=".\Release64/"
-                               ObjectFile=".\Release64/"
-                               ProgramDataBaseFileName=".\Release64/"
+                               RuntimeTypeInfo="true"
+                               PrecompiledHeaderFile=".\Debug64/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Debug64/"
+                               ObjectFile=".\Debug64/"
+                               ProgramDataBaseFileName=".\Debug64/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
                                Detect64BitPortabilityProblems="true"
-                               CompileAs="1"
+                               DebugInformationFormat="3"
+                               CompileAs="0"
                                DisableSpecificWarnings="4996"
-                               ForcedIncludeFiles=""
+                               EnablePREfast="false"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
+                               PreprocessorDefinitions="_DEBUG"
                                Culture="1033"
                        />
                        <Tool
@@ -988,20 +973,17 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib setupapi.lib wininet.lib dxerr8.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zlib.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
                                OutputFile="d:\amiga\winuae64.exe"
-                               LinkIncremental="1"
+                               LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories=""
                                GenerateManifest="true"
                                DelayLoadDLLs=""
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\Release64/winuae.pdb"
+                               ProgramDatabaseFile=".\Debug64/winuae.pdb"
                                SubSystem="2"
-                               OptimizeReferences="2"
-                               EnableCOMDATFolding="2"
-                               OptimizeForWindows98="0"
-                               LinkTimeCodeGeneration="0"
+                               StackReserveSize="2621440"
+                               StackCommitSize="2621440"
                                RandomizedBaseAddress="1"
                                DataExecutionPrevention="0"
                                TargetMachine="17"
@@ -1030,13 +1012,14 @@
                        />
                </Configuration>
                <Configuration
-                       Name="Debug64|x64"
-                       OutputDirectory="$(SolutionDir)x64\$(ConfigurationName)"
-                       IntermediateDirectory="x64\$(ConfigurationName)"
+                       Name="FullRelease|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
                        UseOfMFC="0"
                        ATLMinimizesCRunTimeLibraryUsage="false"
-                       CharacterSet="2"
+                       CharacterSet="1"
+                       WholeProgramOptimization="1"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -1052,41 +1035,50 @@
                        />
                        <Tool
                                Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                MkTypLibCompatible="true"
                                SuppressStartupBanner="true"
-                               TargetEnvironment="3"
-                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\Release/winuae_msvc.tlb"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalOptions=""
-                               Optimization="0"
-                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
-                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32,_WINDOWS,_WIN32_IE 0x0500,UNIX,WIN64"
+                               Optimization="3"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               FavorSizeOrSpeed="1"
+                               OmitFramePointers="true"
+                               WholeProgramOptimization="true"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include"
+                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS"
+                               StringPooling="true"
                                ExceptionHandling="0"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="0"
                                BufferSecurityCheck="false"
-                               RuntimeTypeInfo="true"
-                               PrecompiledHeaderFile=".\Debug64/winuae_msvc.pch"
-                               AssemblerListingLocation=".\Debug64/"
-                               ObjectFile=".\Debug64/"
-                               ProgramDataBaseFileName=".\Debug64/"
+                               EnableFunctionLevelLinking="true"
+                               EnableEnhancedInstructionSet="0"
+                               FloatingPointModel="0"
+                               TreatWChar_tAsBuiltInType="false"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\FullRelease/winuae_msvc.pch"
+                               AssemblerListingLocation=".\FullRelease/"
+                               ObjectFile=".\FullRelease/"
+                               ProgramDataBaseFileName=".\FullRelease/"
                                WarningLevel="3"
                                SuppressStartupBanner="true"
-                               Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="3"
-                               CompileAs="0"
+                               CallingConvention="2"
+                               CompileAs="1"
                                DisableSpecificWarnings="4996"
-                               EnablePREfast="false"
+                               ForcedIncludeFiles=""
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                        />
                        <Tool
                                Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
+                               PreprocessorDefinitions="NDEBUG"
                                Culture="1033"
                        />
                        <Tool
@@ -1094,27 +1086,35 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib zlib.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib capsimg.lib dxerr8.lib shlwapi.lib"
-                               OutputFile="d:\amiga\winuae64.exe"
-                               LinkIncremental="2"
+                               AdditionalDependencies="opengl32.lib glu32.lib ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib dxerr9.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib wpcap.lib packet.lib openal32.lib wintab32.lib portaudio_x86.lib freetype.lib"
+                               OutputFile="d:\amiga\winuae.exe"
+                               LinkIncremental="1"
                                SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
                                GenerateManifest="true"
-                               DelayLoadDLLs=""
+                               AdditionalManifestDependencies=""
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_41.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll"
                                GenerateDebugInformation="true"
-                               ProgramDatabaseFile=".\Debug64/winuae.pdb"
+                               ProgramDatabaseFile=".\FullRelease/winuae.pdb"
                                SubSystem="2"
-                               StackReserveSize="2621440"
-                               StackCommitSize="2621440"
-                               RandomizedBaseAddress="1"
-                               DataExecutionPrevention="0"
-                               TargetMachine="17"
+                               StackReserveSize="0"
+                               StackCommitSize="0"
+                               LargeAddressAware="1"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               OptimizeForWindows98="0"
+                               LinkTimeCodeGeneration="1"
+                               RandomizedBaseAddress="2"
+                               FixedBaseAddress="1"
+                               DataExecutionPrevention="2"
+                               TargetMachine="1"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCManifestTool"
-                               AdditionalManifestFiles="..\resources\winuae.exe.manifest"
+                               AdditionalManifestFiles="..\resources\winuae9.exe.manifest"
                        />
                        <Tool
                                Name="VCXDCMakeTool"
@@ -1449,17 +1449,25 @@
                                        >
                                </File>
                                <File
-                                       RelativePath="..\resources\cpu.ico"
+                                       RelativePath="..\resources\configfile.ico"
                                        >
                                </File>
                                <File
-                                       RelativePath=".\diskimage.ico"
+                                       RelativePath=".\configfile.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\cpu.ico"
                                        >
                                </File>
                                <File
                                        RelativePath="..\resources\diskimage.ico"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\diskimage.ico"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\resources\Drive.ico"
                                        >
@@ -1468,6 +1476,10 @@
                                        RelativePath="..\resources\file.ico"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\file.ico"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\resources\folder.ico"
                                        >
@@ -1476,6 +1488,10 @@
                                        RelativePath="..\resources\h_arrow.cur"
                                        >
                                </File>
+                               <File
+                                       RelativePath="..\resources\icon3.ico"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\resources\joystick.ico"
                                        >
@@ -1500,6 +1516,14 @@
                                        RelativePath="..\resources\paths.ico"
                                        >
                                </File>
+                               <File
+                                       RelativePath=".\port.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\port.ico"
+                                       >
+                               </File>
                                <File
                                        RelativePath="..\resources\quickstart.ico"
                                        >
@@ -1532,7 +1556,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|Win32"
+                                               Name="Debug|x64"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"
@@ -1540,7 +1564,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug64|Win32"
+                                               Name="Release|Win32"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"
@@ -1548,7 +1572,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="FullRelease|Win32"
+                                               Name="Release|x64"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"
@@ -1556,7 +1580,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug|x64"
+                                               Name="TestRelease|x64"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"
@@ -1564,7 +1588,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release|x64"
+                                               Name="Release64|x64"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"
@@ -1572,7 +1596,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="TestRelease|x64"
+                                               Name="Debug64|Win32"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"
@@ -1580,7 +1604,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Release64|x64"
+                                               Name="Debug64|x64"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"
@@ -1588,7 +1612,7 @@
                                                />
                                        </FileConfiguration>
                                        <FileConfiguration
-                                               Name="Debug64|x64"
+                                               Name="FullRelease|Win32"
                                                >
                                                <Tool
                                                        Name="VCResourceCompilerTool"

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 3dfa2ec0abb9c9497ad7a4678f5f26b8dc267048..f3dbf18d565f4d4bf4827e1cd86448934a7c6077 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,17 @@
 
+Beta 5: (1.6.1 RC)
+
+- JIT indirect/direct state is remembered when JIT is switched off and
+  later restored when JIT is switched back on (uae-configuration etc..)
+- inhibit "no disk" Windows dialogs when connecting some USB memory
+  card readers without media
+- do not add disk images to disk history if they are inside archive
+  that was mounted as a harddrive
+- fixed infinite archive recursion introduced in previous betas
+- magic mouse automatic mouse capture didn't work reliably (160b7)
+- Ports/About GUI icons and file association icons updated (JW)
+- language identifier changed to english (neutral) (was english, US)
+
 Beta 4:
 
 - mixed disk swapper panel id and number of input panel columns..

diff --git a/zfile.c b/zfile.c
index 2e003c21645e35f39ec7f88466d69b3117df7685..c1a7882f3f13eb97036ce98a6bf0ca4ae0f9a443 100644 (file)
--- a/zfile.c
+++ b/zfile.c
@@ -575,7 +575,7 @@ int zfile_is_ignore_ext (const TCHAR *name)
     return 0;
 }
 
-int zfile_isdiskimage (const TCHAR *name)
+int zfile_is_diskimage (const TCHAR *name)
 {
     int i;
 
@@ -1065,7 +1065,7 @@ int zfile_exists (const TCHAR *name)
 
     if (my_existsfile (name))
        return 1;
-    z = zfile_fopen (name, L"rb", ZFD_NORMAL);
+    z = zfile_fopen (name, L"rb", ZFD_NORMAL | ZFD_CHECKONLY);
     if (!z)
        return 0;
     zfile_fclose (z);

diff --git a/zfile_archive.c b/zfile_archive.c
index 43fbea9bbe52cf7430e6eeb5984682b9d576869f..2e8c1040b40f404f5e2c07d08b5b9dacb55fcf13 100644 (file)
--- a/zfile_archive.c
+++ b/zfile_archive.c
@@ -131,6 +131,7 @@ struct zfile *archive_access_select (struct znode *parent, struct zfile *zf, uns
     TCHAR tmphist[MAX_DPATH];
     struct zfile *z = NULL;
     int we_have_file;
+    int canhistory = (zf->zfdmask & ZFD_DISKHISTORY) && !(zf->zfdmask & ZFD_CHECKONLY);
 
     if (retcode)
        *retcode = 0;
@@ -143,27 +144,31 @@ struct zfile *archive_access_select (struct znode *parent, struct zfile *zf, uns
     first = 1;
     zn = &zv->root;
     while (zn) {
-       int isok = 1;
+       int isok = 1, diskimg = 0;
 
        if (zn->type != ZNODE_FILE)
            isok = 0;
        if (zfile_is_ignore_ext (zn->fullname))
            isok = 0;
+       if (zfile_is_diskimage (zn->fullname))
+           diskimg = 1;
        if (isok) {
            if (tmphist[0]) {
 #ifndef _CONSOLE
-               DISK_history_add (tmphist, -1);
+               if (diskimg && canhistory)
+                   DISK_history_add (tmphist, -1, 1);
 #endif
                tmphist[0] = 0;
                first = 0;
            }
            if (first) {
-               if (zfile_isdiskimage (zn->fullname))
+               if (diskimg)
                    _tcscpy (tmphist, zn->fullname);
            } else {
                _tcscpy (tmphist, zn->fullname);
 #ifndef _CONSOLE
-               DISK_history_add (tmphist, -1);
+               if (diskimg && canhistory)
+                   DISK_history_add (tmphist, -1, 1);
 #endif
                tmphist[0] = 0;
            }
@@ -190,8 +195,8 @@ struct zfile *archive_access_select (struct znode *parent, struct zfile *zf, uns
        zn = zn->next;
     }
 #ifndef _CONSOLE
-    if (first && tmphist[0])
-       DISK_history_add (zfile_getname(zf), -1);
+    if (zfile_is_diskimage (zfile_getname (zf)) && first && tmphist[0] && canhistory)
+       DISK_history_add (zfile_getname (zf), -1, 1);
 #endif
     zfile_fclose_archive (zv);
     if (z) {