From ce2c614b781a10b66137b784d947cfdedd05b170 Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 9 Nov 2008 14:26:01 +0200 Subject: [PATCH] imported winuaesrc1530.zip --- od-win32/WinUAE_Install.nsi | 2 +- od-win32/resources/winuae_minimal.rc | 87 +++++++++++++++------------- od-win32/win32.h | 4 +- od-win32/winuaechangelog.txt | 12 +++- 4 files changed, 59 insertions(+), 46 deletions(-) diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi index 64b6d095..38a4af23 100755 --- a/od-win32/WinUAE_Install.nsi +++ b/od-win32/WinUAE_Install.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "WinUAE" -!define PRODUCT_VERSION "1.5.2" +!define PRODUCT_VERSION "1.5.3" !define PRODUCT_PUBLISHER "Arabuusimiehet" !define PRODUCT_WEB_SITE "http://www.winuae.net/" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\winuae.exe" diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index a23d595c..c7116698 100755 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource." +#include "resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -151,14 +151,16 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,128,162,10 CONTROL "Match host and RTG color depth if possible",IDC_RTG_MATCH_DEPTH, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,116,163,10 - COMBOBOX IDC_RTG_8BIT,211,107,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_RTG_16BIT,211,123,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_RTG_24BIT,211,139,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_RTG_32BIT,211,155,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RTG_8BIT,211,91,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RTG_16BIT,211,106,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RTG_24BIT,211,121,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_RTG_32BIT,211,136,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CONTROL "Always scale in windowed mode",IDC_RTG_SCALE_ALLOW, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,140,162,10 - COMBOBOX IDC_RTG_SCALE_ASPECTRATIO,131,155,57,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - RTEXT "Scale aspect ratio",-1,24,156,99,10,SS_CENTERIMAGE + COMBOBOX IDC_RTG_SCALE_ASPECTRATIO,211,155,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "Aspect ratio:",-1,153,156,52,10,SS_CENTERIMAGE + RTEXT "Refresh rate:",-1,22,157,51,10,SS_CENTERIMAGE + COMBOBOX IDC_RTG_VBLANKRATE,77,155,68,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP END IDD_CPU DIALOGEX 0, 0, 300, 226 @@ -720,7 +722,7 @@ BEGIN RTEXT "HD Controller:",IDC_STATIC,42,51,52,10,SS_CENTERIMAGE END -IDD_MISC2 DIALOGEX 0, 0, 300, 92 +IDD_MISC2 DIALOGEX 0, 0, 300, 244 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -737,6 +739,10 @@ BEGIN COMBOBOX IDC_MINIMIZED_PRIORITY,207,29,76,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Pause emulation",IDC_MINIMIZED_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,50,69,10 CONTROL "Disable sound",IDC_MINIMIZED_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,207,63,79,10 + CONTROL "",IDC_ASSOCIATELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,19,94,164,100 + GROUPBOX "File Extension Associations",IDC_STATIC,8,83,186,138 + PUSHBUTTON "Deassociate all",IDC_ASSOCIATE_OFF,108,200,75,14 + PUSHBUTTON "Associate all",IDC_ASSOCIATE_ON,19,200,75,14 END IDD_DISK DIALOGEX 0, 0, 300, 242 @@ -766,34 +772,34 @@ BEGIN PUSHBUTTON "Restart",IDC_RESTARTEMU,109,259,47,14,NOT WS_VISIBLE END -IDD_PATHS DIALOGEX 0, 0, 300, 237 +IDD_PATHS DIALOGEX 0, 0, 300, 243 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "System ROMs:",IDC_PATHS_ROML,14,9,260,8,SS_CENTERIMAGE - EDITTEXT IDC_PATHS_ROM,14,22,261,15,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_PATHS_ROMS,281,22,11,15 - LTEXT "Configuration files:",IDC_PATHS_CONFIGL,14,40,121,8,SS_CENTERIMAGE - EDITTEXT IDC_PATHS_CONFIG,14,52,261,15,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_PATHS_CONFIGS,281,52,11,15 - LTEXT "Screenshots:",IDC_PATHS_SCREENSHOTL,14,71,260,8,SS_CENTERIMAGE - EDITTEXT IDC_PATHS_SCREENSHOT,14,83,261,15,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_PATHS_SCREENSHOTS,281,83,11,15 - LTEXT "State files:",IDC_PATHS_STATEFILEL,14,102,260,8,SS_CENTERIMAGE - EDITTEXT IDC_PATHS_SAVESTATE,14,114,261,15,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_PATHS_SAVESTATES,281,114,11,15 - LTEXT "Videos:",IDC_PATHS_AVIOUTPUTL,14,132,260,8,SS_CENTERIMAGE - EDITTEXT IDC_PATHS_AVIOUTPUT,14,144,261,15,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_PATHS_AVIOUTPUTS,281,144,11,15 - LTEXT "Saveimages:",IDC_PATHS_SAVEIMAGEL,14,163,260,8,SS_CENTERIMAGE - EDITTEXT IDC_PATHS_SAVEIMAGE,14,175,261,15,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_PATHS_SAVEIMAGES,281,175,11,15 - PUSHBUTTON "Reset to defaults",IDC_PATHS_DEFAULT,14,199,92,14 - PUSHBUTTON "Rescan ROMs",IDC_ROM_RESCAN,14,218,92,14 - PUSHBUTTON "Clear registry",IDC_RESETREGISTRY,112,218,77,14 - COMBOBOX IDC_PATHS_DEFAULTTYPE,112,199,163,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Clear disk history",IDC_RESETDISKHISTORY,198,218,77,14 - CONTROL "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,40,117,10 + LTEXT "System ROMs:",IDC_PATHS_ROML,14,4,260,8,SS_CENTERIMAGE + EDITTEXT IDC_PATHS_ROM,14,16,261,15,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_PATHS_ROMS,281,16,11,15 + LTEXT "Configuration files:",IDC_PATHS_CONFIGL,14,34,121,8,SS_CENTERIMAGE + EDITTEXT IDC_PATHS_CONFIG,14,45,261,15,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_PATHS_CONFIGS,281,45,11,15 + LTEXT "Screenshots:",IDC_PATHS_SCREENSHOTL,14,63,260,8,SS_CENTERIMAGE + EDITTEXT IDC_PATHS_SCREENSHOT,14,74,261,15,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_PATHS_SCREENSHOTS,281,74,11,15 + LTEXT "State files:",IDC_PATHS_STATEFILEL,14,92,260,8,SS_CENTERIMAGE + EDITTEXT IDC_PATHS_SAVESTATE,14,104,261,15,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_PATHS_SAVESTATES,281,104,11,15 + LTEXT "Videos:",IDC_PATHS_AVIOUTPUTL,14,122,260,8,SS_CENTERIMAGE + EDITTEXT IDC_PATHS_AVIOUTPUT,14,134,261,15,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_PATHS_AVIOUTPUTS,281,134,11,15 + LTEXT "Saveimages:",IDC_PATHS_SAVEIMAGEL,14,152,261,8,SS_CENTERIMAGE + EDITTEXT IDC_PATHS_SAVEIMAGE,14,163,261,15,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_PATHS_SAVEIMAGES,281,163,11,15 + PUSHBUTTON "Reset to defaults",IDC_PATHS_DEFAULT,14,184,92,14 + PUSHBUTTON "Rescan ROMs",IDC_ROM_RESCAN,14,200,92,14 + PUSHBUTTON "Clear registry",IDC_RESETREGISTRY,111,200,92,14 + COMBOBOX IDC_PATHS_DEFAULTTYPE,112,184,163,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Clear disk history",IDC_RESETDISKHISTORY,14,216,92,14 + CONTROL "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,34,117,10 END IDD_QUICKSTART DIALOGEX 0, 0, 300, 242 @@ -941,8 +947,8 @@ IDI_PATHS ICON "paths.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,1,0 - PRODUCTVERSION 1,5,1,0 + FILEVERSION 1,5,3,0 + PRODUCTVERSION 1,5,3,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -958,12 +964,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "1.5.1" + VALUE "FileVersion", "1.5.3" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2008 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "1.5.1" + VALUE "ProductVersion", "1.5.3" END END BLOCK "VarFileInfo" @@ -1054,6 +1060,7 @@ BEGIN END END + ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -1069,8 +1076,8 @@ BEGIN IDS_ABOUT "About" IDS_LOADSAVE "Configurations" IDS_AVIOUTPUT "Output" - IDS_PORTS "Game & I/O ports" - IDS_MISC1 "Misc" + IDS_PORTS "Game & IO ports" + IDS_MISC1 "Miscellaneous" IDS_MEMORY "RAM" IDS_CPU "CPU and FPU" IDS_CHIPSET "Chipset" @@ -1080,7 +1087,7 @@ END STRINGTABLE BEGIN - IDS_MISC2 "Priority" + IDS_MISC2 "Pri. & Extensions" IDS_PATHS "Paths" IDS_QUICKSTART "Quickstart" IDS_FRONTEND "Frontend" diff --git a/od-win32/win32.h b/od-win32/win32.h index 5347ffd9..93e3d83c 100755 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,9 +15,9 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEPUBLICBETA 1 +#define WINUAEPUBLICBETA 0 -#define WINUAEBETA "8" +#define WINUAEBETA "" #define WINUAEDATE MAKEBD(2008, 11, 9) #define WINUAEEXTRA "" #define WINUAEREV "" diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt index 673bb9f0..836bb6ec 100755 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,12 +1,18 @@ 1.5.3 -- delay sync clock enable until 10s from reset +Beta 8: + +- delay sync clock enable until 10s from reset (do not confuse + KS delay calibration routine) - real PCMCIA SRAM re-insert detection really really does work now (Thanks to Eclipse for donating PCMCIA SRAM card) Vista note: Vista does not come with generic PCMCIA SRAM drivers - anymore but XP built-in drivers work after force-installing them.. - (only need memcard.sys and memcard.inf) 32-bit tested only. + anymore but XP built-in drivers do work, only need memcard.sys and + memcard.inf from XP install. 32-bit Vista tested only. +- vblank interrupt was not working in RTG vsync mode +- fixed wrong colors after 16-bit fullscreen RTG to 32-bit desktop + switch Beta 7: -- 2.47.3