From: Toni Wilen Date: Wed, 17 Jun 2009 11:43:47 +0000 (+0300) Subject: imported winuaesrc1610b5.zip X-Git-Tag: 2100~75 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=cb97f1fa96b5527b9c2fb659f9333dc35e584bdb;p=francis%2Fwinuae.git imported winuaesrc1610b5.zip --- diff --git a/disk.c b/disk.c index dec1869a..e9b18e48 100644 --- 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 1c0bfef2..ff60de9c 100644 --- 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 33cd61fd..e095b8d2 100644 --- 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 1bace4ff..626b2731 100644 --- 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 d44bf287..1909da78 100644 --- 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 8746e43f..5030a65b 100644 --- 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 7993c255..064fa897 100644 --- 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 92ed436d..1d2a8c9d 100644 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 52d09a93..c8a8c603 100644 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 index 00000000..037da912 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 2e790a54..cfe68e22 100644 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 b966b99b..295d624a 100644 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 c1661ad2..ffea4b2c 100644 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 ae42edc7..b7f17172 100644 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 index f1282c69..00000000 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 fbbfe9a6..dd0a1829 100644 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 index 00000000..35db6b9d 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 df673484..f8385721 100644 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 7632b674..f6d63703 100644 --- 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 98dc8522..cdd9375c 100644 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 975b10e5..9c91e886 100644 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -12,14 +12,47 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// English (Neutral) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL #pragma code_page(1252) #endif //_WIN32 +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APPICON ICON "winuae.ico" +IDI_FLOPPY ICON "35floppy.ico" +IDI_ABOUT ICON "amigainfo.ico" +IDI_HARDDISK ICON "Drive.ico" +IDI_CPU ICON "cpu.ico" +IDI_GAMEPORTS ICON "joystick.ico" +IDI_IOPORTS ICON "joystick.ico" +IDI_INPUT ICON "joystick.ico" +IDI_MISC1 ICON "misc.ico" +IDI_MISC2 ICON "misc.ico" +IDI_MOVE_UP ICON "move_up.ico" +IDI_MOVE_DOWN ICON "move_dow.ico" +IDI_AVIOUTPUT ICON "avioutput.ico" +IDI_DISK ICON "Drive.ico" +IDI_FOLDER ICON "folder.ico" +IDI_SOUND ICON "sound.ico" +IDI_DISPLAY ICON "screen.ico" +IDI_ROOT ICON "root.ico" +IDI_MEMORY ICON "chip.ico" +IDI_QUICKSTART ICON "quickstart.ico" +IDI_PATHS ICON "paths.ico" +IDI_DISKIMAGE ICON "diskimage.ico" +IDI_PORTS ICON "port.ico" +IDI_CONFIGFILE ICON "configfile.ico" +IDI_FILE ICON "file.ico" + ///////////////////////////////////////////////////////////////////////////// // // Accelerator @@ -936,36 +969,6 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_APPICON ICON "winuae.ico" -IDI_FLOPPY ICON "35floppy.ico" -IDI_ABOUT ICON "amigainfo.ico" -IDI_HARDDISK ICON "Drive.ico" -IDI_CPU ICON "cpu.ico" -IDI_GAMEPORTS ICON "joystick.ico" -IDI_IOPORTS ICON "joystick.ico" -IDI_INPUT ICON "joystick.ico" -IDI_MISC1 ICON "misc.ico" -IDI_MISC2 ICON "misc.ico" -IDI_MOVE_UP ICON "move_up.ico" -IDI_MOVE_DOWN ICON "move_dow.ico" -IDI_AVIOUTPUT ICON "avioutput.ico" -IDI_DISK ICON "Drive.ico" -IDI_CONFIGFILE ICON "file.ico" -IDI_FOLDER ICON "folder.ico" -IDI_SOUND ICON "sound.ico" -IDI_DISPLAY ICON "screen.ico" -IDI_ROOT ICON "root.ico" -IDI_MEMORY ICON "chip.ico" -IDI_QUICKSTART ICON "quickstart.ico" -IDI_PATHS ICON "paths.ico" - ///////////////////////////////////////////////////////////////////////////// // // Version @@ -1460,7 +1463,7 @@ BEGIN IDS_RES_SUPERHIRES "SuperHires" END -#endif // English (U.S.) resources +#endif // English (Neutral) resources ///////////////////////////////////////////////////////////////////////////// @@ -1473,15 +1476,6 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT #pragma code_page(1252) #endif //_WIN32 -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_DISKIMAGE ICON "diskimage.ico" - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // diff --git a/od-win32/win32.c b/od-win32/win32.c index b8302d8d..71a4de40 100644 --- 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 320b094b..432c4c85 100644 --- 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 3c24cdeb..8c69a6fe 100644 --- 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 be8a85f7..c2457bff 100644 --- 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 4c9d7d61..2ff518f6 100644 --- a/od-win32/winuae_msvc/winuae_msvc.vcproj +++ b/od-win32/winuae_msvc/winuae_msvc.vcproj @@ -127,13 +127,13 @@ /> @@ -467,14 +523,13 @@ /> + + + + @@ -1468,6 +1476,10 @@ RelativePath="..\resources\file.ico" > + + @@ -1476,6 +1488,10 @@ RelativePath="..\resources\h_arrow.cur" > + + @@ -1500,6 +1516,14 @@ RelativePath="..\resources\paths.ico" > + + + + @@ -1532,7 +1556,7 @@ /> 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) {