From d18ea7d6997be90f91d979008c09ebabb8aa108f Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 19 Dec 2004 11:55:38 +0200 Subject: [PATCH] imported winuaesrc0992b8.zip --- custom.c | 61 ++++----- main.c | 6 +- od-win32/resources/winuae.rc | 26 +--- od-win32/resources/winuae_minimal.rc | 187 +++++++++++++++------------ od-win32/win32.c | 2 +- od-win32/win32.h | 4 +- od-win32/win32gui.c | 14 +- 7 files changed, 161 insertions(+), 139 deletions(-) diff --git a/custom.c b/custom.c index 716c09cc..c6196c86 100755 --- a/custom.c +++ b/custom.c @@ -543,6 +543,32 @@ static void decide_diw (int hpos) last_diw_pix_hpos = pix_hpos; } +static int fetchmode; +static int maxplanes_ocs[]={ 6,4,0,0 }; +static int maxplanes_ecs[]={ 6,4,2,0 }; +static int maxplanes_aga[]={ 8,4,2,0, 8,8,4,0, 8,8,8,0 }; + +static int get_maxplanes (int res) +{ + int *planes; + if (currprefs.chipset_mask & CSMASK_AGA) + planes = maxplanes_aga; + else if (! (currprefs.chipset_mask & CSMASK_ECS_DENISE)) + planes = maxplanes_ocs; + else + planes = maxplanes_ecs; + return planes[fetchmode * 4 + res]; +} + +/* Disable bitplane DMA if planes > maxplanes. This is needed e.g. by the + Sanity WOC demo (at the "Party Effect"). */ +STATIC_INLINE int GET_PLANES_LIMIT (uae_u16 v) +{ + if (GET_PLANES(v) > get_maxplanes (GET_RES(v))) + v &= ~0x7010; + return GET_PLANES (v); +} + /* The HRM says 0xD8, but that can't work... */ #define HARD_DDF_STOP 0xd4 #define HARD_DDF_START 0x18 @@ -561,7 +587,7 @@ static void add_modulos (void) m2 = bpl2mod; } - switch (GET_PLANES (bplcon0)) { + switch (GET_PLANES_LIMIT (bplcon0)) { #ifdef AGA case 8: bplpt[7] += m2; case 7: bplpt[6] += m1; @@ -604,8 +630,6 @@ static void finish_playfield_line (void) thisline_changed = 1; } -static int fetchmode; - /* The fetch unit mainly controls ddf stop. It's the number of cycles that are contained in an indivisible block during which ddf is active. E.g. if DDF starts at 0x30, and fetchunit is 8, then possible DDF stops are @@ -771,13 +795,9 @@ static void expand_fmodes (void) fetchstart_mask = fetchstart - 1; fm_maxplane_shift = fm_maxplanes[fm * 4 + res]; fm_maxplane = 1 << fm_maxplane_shift; - curr_diagram = cycle_diagram_table[fm][res][GET_PLANES (bplcon0)]; + curr_diagram = cycle_diagram_table[fm][res][GET_PLANES_LIMIT (bplcon0)]; } -static int maxplanes_ocs[]={ 6,4,0,0 }; -static int maxplanes_ecs[]={ 6,4,2,0 }; -static int maxplanes_aga[]={ 8,4,2,0, 8,8,4,0, 8,8,8,0 }; - /* Expand bplcon0/bplcon1 into the toscr_xxx variables. */ static void compute_toscr_delay_1 (void) { @@ -793,27 +813,10 @@ static void compute_toscr_delay_1 (void) toscr_delay2x = (delay2 & delaymask) << toscr_res; } -static int get_maxplanes (int res) -{ - int *planes; - if (currprefs.chipset_mask & CSMASK_AGA) - planes = maxplanes_aga; - else if (! (currprefs.chipset_mask & CSMASK_ECS_DENISE)) - planes = maxplanes_ocs; - else - planes = maxplanes_ecs; - return planes[fetchmode * 4 + res]; -} - static void compute_toscr_delay (int hpos) { - int v = bplcon0; - /* Disable bitplane DMA if planes > maxplanes. This is needed e.g. by the - Sanity WOC demo (at the "Party Effect"). */ - if (GET_PLANES(v) > get_maxplanes (GET_RES(v))) - v &= ~0x7010; - toscr_res = GET_RES (v); - toscr_nr_planes = GET_PLANES (v); + toscr_res = GET_RES (bplcon0); + toscr_nr_planes = GET_PLANES_LIMIT (bplcon0); compute_toscr_delay_1 (); } @@ -4440,8 +4443,8 @@ static void hsync_handler (void) if (!currprefs.blitter_cycle_exact && bltstate != BLT_done && dmaen (DMA_BITPLANE) && diwstate == DIW_waiting_stop) blitter_slowdown (thisline_decision.plfleft, thisline_decision.plfright - (16 << fetchmode), - cycle_diagram_total_cycles[fmode][GET_RES (bplcon0)][GET_PLANES (bplcon0)], - cycle_diagram_free_cycles[fmode][GET_RES (bplcon0)][GET_PLANES (bplcon0)]); + cycle_diagram_total_cycles[fmode][GET_RES (bplcon0)][GET_PLANES_LIMIT (bplcon0)], + cycle_diagram_free_cycles[fmode][GET_RES (bplcon0)][GET_PLANES_LIMIT (bplcon0)]); if (currprefs.produce_sound) audio_hsync (1); diff --git a/main.c b/main.c index 76f4bd40..07538192 100755 --- a/main.c +++ b/main.c @@ -306,8 +306,10 @@ void fixup_prefs (struct uae_prefs *p) p->scsi = 0; p->win32_aspi = 0; #endif - - +#if defined(CPUEMU_6) + if (p->cpu_cycle_exact) + p->gfx_framerate = 1; +#endif if (err) write_log ("Please use \"uae -h\" to get usage information.\n"); } diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc index c838ec69..725ca54c 100755 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -1176,6 +1176,13 @@ IDR_DRIVE_SPINND_A500_1 WAVE "drive_spinnd.wav" 1 RT_MANIFEST "winuae.exe.manifest" +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + +IDB_XARCADE BITMAP "xarcade-winuae.bmp" + ///////////////////////////////////////////////////////////////////////////// // // String Table @@ -1447,25 +1454,6 @@ END ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// Finnish resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN) -#ifdef _WIN32 -LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT -#pragma code_page(1252) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_XARCADE BITMAP "xarcade-winuae.bmp" -#endif // Finnish resources -///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc index dee88872..d0701f8f 100755 --- a/od-win32/resources/winuae_minimal.rc +++ b/od-win32/resources/winuae_minimal.rc @@ -57,11 +57,11 @@ BEGIN CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "...",IDC_CARTCHOOSER,280,90,10,15 RTEXT "Flash RAM File:",IDC_FLASHTEXT,8,112,75,10 - EDITTEXT IDC_FLASHFILE,89,110,185,15,ES_AUTOHSCROLL + EDITTEXT IDC_FLASHFILE,89,110,185,13,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_FLASHCHOOSER,280,110,10,15 END -IDD_DISPLAY DIALOGEX 0, 0, 300, 194 +IDD_DISPLAY DIALOGEX 0, 0, 300, 202 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN @@ -79,7 +79,7 @@ BEGIN EDITTEXT IDC_YSIZE,103,48,35,12,ES_NUMBER CONTROL "VSync",IDC_VSYNC,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,145,49,54,10 - GROUPBOX "Settings",IDC_SETTINGSTEXT,12,77,199,73 + GROUPBOX "Settings",IDC_SETTINGSTEXT,12,77,199,89 CONTROL "Full Screen",IDC_AFULLSCREEN,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,35,89,90,10 CONTROL "Full Screen RTG",IDC_PFULLSCREEN,"Button", @@ -105,13 +105,17 @@ BEGIN BS_LEFT | WS_TABSTOP,233,105,41,10 CONTROL "Scanline",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,233,121,40,10 - COMBOBOX IDC_DA_MODE,35,163,58,150,CBS_DROPDOWNLIST | + COMBOBOX IDC_DA_MODE,35,183,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | - TBS_TOP | NOT WS_VISIBLE | WS_TABSTOP,97,161,101,20 - PUSHBUTTON "Detect pixel format",IDC_TEST16BIT,210,161,73,14,0,0, + TBS_TOP | NOT WS_VISIBLE | WS_TABSTOP,99,179,101,20 + PUSHBUTTON "Detect pixel format",IDC_TEST16BIT,210,181,73,14,0,0, HIDC_TEST16BIT + LTEXT "FPS Adj.",IDC_REFRESH2TEXT,18,149,28,8 + CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | + TBS_TOP | WS_TABSTOP,46,144,127,20 + EDITTEXT IDC_RATE2TEXT,177,148,26,12,ES_CENTER | ES_READONLY END IDD_MEMORY DIALOGEX 0, 0, 300, 175 @@ -285,14 +289,12 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN CONTROL "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,5,260,185 - PUSHBUTTON "",IDC_UP,270,52,25,15,BS_ICON - PUSHBUTTON "",IDC_DOWN,270,132,25,15,BS_ICON + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,5,290,185 PUSHBUTTON "Add &Directory...",IDC_NEW_FS,5,196,60,15 PUSHBUTTON "Add &Hardfile...",IDC_NEW_HF,70,196,60,15 PUSHBUTTON "Add Ha&rddrive...",IDC_NEW_HD,135,196,60,15 - PUSHBUTTON "Remove",IDC_REMOVE,135,218,60,15 - PUSHBUTTON "&Properties",IDC_EDIT,200,218,60,15 + PUSHBUTTON "Remove",IDC_REMOVE,235,196,60,15 + PUSHBUTTON "&Properties",IDC_EDIT,235,217,60,15 CONTROL "Add PC Drives at Startup",IDC_MAPDRIVES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,5,216,105,10,0, HIDC_MAPDRIVES @@ -396,60 +398,78 @@ BEGIN PUSHBUTTON "Delete",IDC_DELETE,255,225,40,15 END -IDD_PORTS DIALOGEX 0, 0, 300, 194 +IDD_PORTS DIALOGEX 0, 0, 300, 242 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Serial and Parallel",IDC_SERPARFRAME,4,2,291,46 - RTEXT "Serial:",IDC_STATIC,20,15,25,15,SS_CENTERIMAGE - COMBOBOX IDC_SERIAL,50,15,95,65,CBS_DROPDOWNLIST | WS_VSCROLL | + GROUPBOX "Parallel Port",IDC_SERPARFRAME,5,2,291,68 + RTEXT "Printer:",IDC_STATIC,12,15,25,15,SS_CENTERIMAGE + COMBOBOX IDC_PRINTERLIST,49,15,153,134,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Flush print job",IDC_FLUSHPRINTER,220,14,58,12 + CONTROL "PostScript detection",IDC_PSPRINTERDETECT,"Button", + BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,11,33,78,12 + CONTROL "PostScript printer emulation",IDC_PSPRINTER,"Button", + BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,93,33,100,12 + RTEXT "Autoflush timeout []Time in seconds after pending print job is automatically flushed.", + IDC_PRINTERAUTOFLUSHTXT,202,32,57,15,SS_CENTERIMAGE + EDITTEXT IDC_PRINTERAUTOFLUSH,263,33,25,12,ES_NUMBER + RTEXT "Ghostscript extra parameters:",IDC_STATIC,12,49,91,15, + SS_CENTERIMAGE + EDITTEXT IDC_PS_PARAMS,120,50,169,12,ES_AUTOHSCROLL + GROUPBOX "Serial Port",IDC_SERIALFRAME,4,72,292,29 + COMBOBOX IDC_SERIAL,19,83,95,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Shared",IDC_SHARED,"Button",BS_AUTOCHECKBOX | - BS_VCENTER | WS_TABSTOP,33,32,37,12 + BS_VCENTER | WS_TABSTOP,132,83,48,13 CONTROL "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | - BS_VCENTER | WS_TABSTOP,77,32,44,12 + BS_VCENTER | WS_TABSTOP,185,83,53,12 CONTROL "Direct",IDC_SERIAL_DIRECT,"Button",BS_AUTOCHECKBOX | - BS_VCENTER | WS_TABSTOP,128,32,40,12 - RTEXT "Printer:",IDC_STATIC,155,15,25,15,SS_CENTERIMAGE - COMBOBOX IDC_PRINTERLIST,185,15,95,134,CBS_DROPDOWNLIST | + BS_VCENTER | WS_TABSTOP,243,83,46,12 + GROUPBOX "MIDI",IDC_MIDIFRAME,4,104,292,33 + RTEXT "Out:",IDC_MIDI,10,115,34,15,SS_CENTERIMAGE + COMBOBOX IDC_MIDIOUTLIST,50,115,95,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Flush print job",IDC_FLUSHPRINTER,199,31,58,12 - GROUPBOX "MIDI",IDC_MIDIFRAME,4,50,292,36 - RTEXT "Out:",IDC_MIDI,10,64,34,15,SS_CENTERIMAGE - COMBOBOX IDC_MIDIOUTLIST,50,64,95,130,CBS_DROPDOWNLIST | + RTEXT "In:",IDC_MIDI2,150,115,29,15,SS_CENTERIMAGE + COMBOBOX IDC_MIDIINLIST,185,115,95,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - RTEXT "In:",IDC_MIDI2,150,64,29,15,SS_CENTERIMAGE - COMBOBOX IDC_MIDIINLIST,185,64,95,134,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - GROUPBOX "Amiga Mouse/Joystick Port 0",IDC_PORT0,4,92,141,78 + GROUPBOX "Amiga Mouse/Joystick Port 0",IDC_PORT0,4,139,142,97 CONTROL "",IDC_PORT0_JOYSC,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,10,107,9,11 + WS_GROUP | WS_TABSTOP,10,156,9,11 CONTROL "Keyboard Layout ""A"" []Numeric keypad, 0 and 5 = fire", IDC_PORT0_KBDA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 10,127,90,10 + 10,173,90,10 CONTROL "Keyboard Layout ""B"" []Cursor keys, right CTRL and ALT = fire", IDC_PORT0_KBDB,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 10,142,90,10 + 10,186,90,10 CONTROL "Keyboard Layout ""C"" []T = up, B = down, F = left, H = right, left ALT = fire", IDC_PORT0_KBDC,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 10,156,90,10 - COMBOBOX IDC_PORT0_JOYS,23,106,117,130,CBS_DROPDOWNLIST | + 10,198,90,10 + CONTROL "X-Arcade (left) []#1",IDC_PORT0_KBDD,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,10,210,90,10 + CONTROL "X-Arcade (right) []#1",IDC_PORT0_KBDE,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,10,222,90,10 + COMBOBOX IDC_PORT0_JOYS,23,153,117,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Amiga Joystick/Mouse Port 1",IDC_PORT1,150,92,146,78 + GROUPBOX "Amiga Joystick/Mouse Port 1",IDC_PORT1,150,139,146,98 CONTROL "",IDC_PORT1_JOYSC,"Button",BS_AUTORADIOBUTTON | - WS_GROUP | WS_TABSTOP,155,107,9,11 + WS_GROUP | WS_TABSTOP,155,156,9,11 CONTROL "Keyboard Layout ""A"" []Numeric keypad, 0 and 5 = fire", IDC_PORT1_KBDA,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 155,127,90,10 + 155,173,90,10 CONTROL "Keyboard Layout ""B"" []Cursor keys, right CTRL and ALT = fire", IDC_PORT1_KBDB,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 155,142,90,10 + 155,186,90,10 CONTROL "Keyboard Layout ""C"" []T = up, B = down, F = left, H = right, left ALT = fire", IDC_PORT1_KBDC,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP, - 155,156,90,10 - COMBOBOX IDC_PORT1_JOYS,168,106,123,130,CBS_DROPDOWNLIST | + 155,198,90,10 + CONTROL "X-Arcade (left) []#1",IDC_PORT1_KBDD,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,155,210,90,10 + CONTROL "X-Arcade (right) []#1",IDC_PORT1_KBDE,"Button", + BS_AUTORADIOBUTTON | WS_TABSTOP,155,222,90,10 + COMBOBOX IDC_PORT1_JOYS,168,153,123,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Swap ports",IDC_SWAP,119,176,54,14 + PUSHBUTTON "Swap",IDC_SWAP,256,213,33,14 END IDD_CONTRIBUTORS DIALOGEX 0, 0, 411, 242 @@ -509,7 +529,7 @@ IDD_MISC1 DIALOGEX 0, 0, 300, 223 STYLE DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - GROUPBOX "Advanced:",IDC_STATIC,8,4,285,90 + GROUPBOX "Advanced:",IDC_STATIC,8,4,285,103 CONTROL "Middle-Mouse-Button --> ALT-TAB",IDC_JULIAN,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,29,21,120,10 CONTROL "Show GUI on startup",IDC_SHOWGUI,"Button", @@ -530,51 +550,53 @@ BEGIN WS_TABSTOP,159,66,115,10 CONTROL "Syncronize clock",IDC_CLOCKSYNC,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,159,80,115,10 - GROUPBOX "Keyboard LEDs:",IDC_STATIC,7,99,85,73 - COMBOBOX IDC_KBLED1,22,112,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | + GROUPBOX "Keyboard LEDs:",IDC_STATIC,7,110,85,73 + COMBOBOX IDC_KBLED1,22,123,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_KBLED2,22,131,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_KBLED2,22,142,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_KBLED3,22,151,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | + COMBOBOX IDC_KBLED3,22,162,56,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Logging:",IDC_STATIC,97,99,195,25 + GROUPBOX "Logging:",IDC_STATIC,97,110,195,25 CONTROL "Create log file",IDC_CREATELOGFILE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,109,72,10,0, + BS_AUTOCHECKBOX | WS_TABSTOP,107,120,72,10,0, HIDC_CREATELOGFILE CONTROL "Illegal mem accesses",IDC_ILLEGAL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,189,109,80,10 - GROUPBOX "State files:",IDC_STATIC,98,126,195,83 - PUSHBUTTON "Load state...",IDC_DOLOADSTATE,105,145,49,14 - PUSHBUTTON "Save state...",IDC_DOSAVESTATE,106,171,49,14 + BS_AUTOCHECKBOX | WS_TABSTOP,189,120,80,10 + GROUPBOX "State files:",IDC_STATIC,98,137,195,83 + PUSHBUTTON "Load state...",IDC_DOLOADSTATE,105,156,49,14 + PUSHBUTTON "Save state...",IDC_DOSAVESTATE,106,182,49,14 CONTROL "Enable state recording",IDC_STATE_CAPTURE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,188,144,88,10 - RTEXT "Recording rate (seconds)",IDC_STATE_RATE_TEXT,157,162, + BS_AUTOCHECKBOX | WS_TABSTOP,188,155,88,10 + RTEXT "Recording rate (seconds)",IDC_STATE_RATE_TEXT,157,173, 86,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_RATE,248,160,38,65,CBS_DROPDOWN | WS_VSCROLL | + COMBOBOX IDC_STATE_RATE,248,171,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP RTEXT "Recording buffer (MB)",IDC_STATE_BUFFERSIZE_TEXT,157, - 182,83,10,SS_CENTERIMAGE | WS_TABSTOP - COMBOBOX IDC_STATE_BUFFERSIZE,248,180,38,65,CBS_DROPDOWN | + 193,83,10,SS_CENTERIMAGE | WS_TABSTOP + COMBOBOX IDC_STATE_BUFFERSIZE,248,191,38,65,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + CONTROL "Always on top",IDC_ALWAYSONTOP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,29,94,117,10 END -IDD_HARDFILE DIALOGEX 0, 0, 299, 180 +IDD_HARDFILE DIALOGEX 0, 0, 299, 212 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardfile Settings" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN GROUPBOX "Hard File Settings",IDC_STATIC,10,5,280,113 - RTEXT "Path:",IDC_HARDFILE_DIR_TEXT,19,21,22,10 - EDITTEXT IDC_PATH_NAME,44,15,222,15,ES_AUTOHSCROLL + RTEXT "Path:",IDC_HARDFILE_DIR_TEXT,26,18,22,10 + EDITTEXT IDC_PATH_NAME,52,15,213,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_SELECTOR,271,15,11,15 - RTEXT "FileSys:",IDC_HARDFILE_FILESYS_TEXT,16,36,26,10 - EDITTEXT IDC_PATH_FILESYS,44,34,221,15,ES_AUTOHSCROLL + RTEXT "Filesystem:",IDC_HARDFILE_FILESYS_TEXT,14,37,34,10 + EDITTEXT IDC_PATH_FILESYS,52,34,213,15,ES_AUTOHSCROLL PUSHBUTTON "...",IDC_FILESYS_SELECTOR,271,34,11,15 - RTEXT "Device:",IDC_HARDFILE_DEVICE_TEXT,16,58,25,10 - EDITTEXT IDC_HARDFILE_DEVICE,44,54,40,15,ES_AUTOHSCROLL - RTEXT "BootPri:",IDC_HARDFILE_BOOTPRI_TEXT,11,80,30,8 - EDITTEXT IDC_HARDFILE_BOOTPRI,44,75,40,15 + RTEXT "Device:",IDC_HARDFILE_DEVICE_TEXT,17,58,31,10 + EDITTEXT IDC_HARDFILE_DEVICE,52,54,40,15,ES_AUTOHSCROLL + RTEXT "BootPri:",IDC_HARDFILE_BOOTPRI_TEXT,18,79,30,8 + EDITTEXT IDC_HARDFILE_BOOTPRI,52,75,40,15 CONTROL "Read/Write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,57,50,10 PUSHBUTTON "Enable RDB-mode",IDC_HDF_RDB,192,55,92,14 @@ -586,12 +608,17 @@ BEGIN EDITTEXT IDC_SECTORS,147,96,35,15,ES_NUMBER RTEXT "Block-Size:",IDC_BLOCKSIZE_TEXT,197,101,35,10 EDITTEXT IDC_BLOCKSIZE,237,96,35,15,ES_NUMBER - GROUPBOX "New Hard File",IDC_STATIC,10,120,280,35 - PUSHBUTTON "Create",IDC_CREATEHF,40,135,85,14 - EDITTEXT IDC_HFSIZE,141,135,61,15,ES_NUMBER - LTEXT "MB",IDC_RESERVED_TEXT2,214,138,39,9,NOT WS_GROUP - PUSHBUTTON "OK",IDOK,102,161,50,14 - PUSHBUTTON "Cancel",IDCANCEL,158,161,50,14 + GROUPBOX "New Hard File",IDC_STATIC,10,120,280,62 + PUSHBUTTON "Create",IDC_HF_CREATE,50,135,80,14 + EDITTEXT IDC_HF_SIZE,146,135,61,15,ES_NUMBER + PUSHBUTTON "OK",IDOK,102,191,50,14 + PUSHBUTTON "Cancel",IDCANCEL,158,191,50,14 + EDITTEXT IDC_HF_DOSTYPE,146,158,61,15 + COMBOBOX IDC_HF_TYPE,50,158,80,150,CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + RTEXT "DosType",IDC_STATIC,212,160,30,10,SS_CENTERIMAGE + RTEXT "Megabytes",IDC_STATIC,212,138,35,10,SS_CENTERIMAGE + RTEXT "Type:",IDC_STATIC,18,160,25,10,SS_CENTERIMAGE END IDD_FILESYS DIALOGEX 15, 25, 299, 111 @@ -846,10 +873,8 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN CONTROL "",IDC_DISKLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | - LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,6,262,211 - PUSHBUTTON "",IDC_UP,270,66,25,15,BS_ICON - PUSHBUTTON "",IDC_DOWN,270,146,25,15,BS_ICON - PUSHBUTTON "Remove disk image",IDC_DISKLISTREMOVE,94,223,93,15 + LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,6,292,211 + PUSHBUTTON "Remove disk image",IDC_DISKLISTREMOVE,98,223,93,15 END IDD_PANEL DIALOGEX 0, 0, 420, 278 @@ -1016,8 +1041,8 @@ IDI_PATHS ICON "paths.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,9,91,0 - PRODUCTVERSION 0,9,91,0 + FILEVERSION 0,9,92,0 + PRODUCTVERSION 0,9,92,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -1033,12 +1058,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "FileDescription", "WinUAE" - VALUE "FileVersion", "0.9.91" + VALUE "FileVersion", "0.9.92" VALUE "InternalName", "WinUAE" VALUE "LegalCopyright", "© 1996-2004 under the GNU Public License (GPL)" VALUE "OriginalFilename", "WinUAE.exe" VALUE "ProductName", "WinUAE" - VALUE "ProductVersion", "0.9.91" + VALUE "ProductVersion", "0.9.92" END END BLOCK "VarFileInfo" @@ -1212,7 +1237,7 @@ BEGIN IDS_SELECTFILESYSROOT "Please select your file-system root directory..." IDS_DEFAULTMIDIOUT "Default MIDI-Out Device" IDS_CONTRIBUTORS1 "Bernd Schmidt - The Grand-Master\nSam Jordan - Custom-chip, floppy-DMA, etc.\nMathias Ortmann - Original WinUAE Main Guy, BSD Socket support\nBrian King - Picasso96 Support, Integrated GUI for WinUAE, previous WinUAE Main Guy\nToni Wilen - Core updates, WinUAE Main Guy\nGustavo Goedert/Peter Remmers/Michael Sontheimer/Tomi Hakala/Tim Gunn/Nemo Pohle - DOS Port Stuff\nSamuel Devulder/Olaf Barthel/Sam Jordan - Amiga Ports\nKrister Bergman - XFree86 and OS/2 Port\nA. Blanchard/Ernesto Corvi - MacOS Port\nChristian Bauer - BeOS Port\nIan Stephenson - NextStep Port\nPeter Teichmann - Acorn/RiscOS Port\nStefan Reinauer - ZorroII/III AutoConfig, Serial Support\nChristian Schmitt/Chris Hames - Serial Support\nHerman ten Brugge - 68020/68881 Emulation Code\nTauno Taipaleenmaki - Various UAE-Control/UAE-Library Support\nBrett Eden/Tim Gunn/Paolo Besser/Nemo Pohle - Various Docs and Web-Sites\nGeorg Veichtlbauer - Help File coordinator, German GUI\nFulvio Leonardi - Italian translator for WinUAE\n" - IDS_CONTRIBUTORS2 "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\n" + IDS_CONTRIBUTORS2 "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing." IDS_INVALIDPRTPORT "The printer you have in this configuration is not valid on this machine.\n" IDS_RESTOREUSS "Restore a UAE Snap-Shot File" IDS_USS "UAE Snap-Shot Files" @@ -1344,6 +1369,8 @@ BEGIN IDS_NOHARDDRIVES "No Amiga formatted or completely empty harddrives detected." IDS_DEFAULT_HOST "Default Configuration" IDS_SOUND_4CHANNEL "4 Channels" + IDS_HF_FS_CUSTOM "Custom" + IDS_SELECTFS "Select filesystem handler (FastFileSystem, SmartFilesystem,...)" END STRINGTABLE diff --git a/od-win32/win32.c b/od-win32/win32.c index 7e4190a8..34605077 100755 --- a/od-win32/win32.c +++ b/od-win32/win32.c @@ -1264,7 +1264,7 @@ static HMODULE LoadGUI( void ) if (pGetUserDefaultUILanguage) language = pGetUserDefaultUILanguage(); language &= 0x3ff; // low 9-bits form the primary-language ID - +language = LANG_GERMAN; switch( language ) { case LANG_AFRIKAANS: diff --git a/od-win32/win32.h b/od-win32/win32.h index 6a1032a0..0f90c9fc 100755 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -21,8 +21,8 @@ extern int manual_painting_needed; extern int manual_palette_refresh_needed; extern int mouseactive, focus; extern int ignore_messages_all; -#define WINUAEBETA 1 -#define WINUAEBETASTR " Beta 7" +#define WINUAEBETA 0 +#define WINUAEBETASTR "" extern void my_kbd_handler (int, int, int); extern void clearallkeys(void); diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c index f18c09f4..e1e4a9c3 100755 --- a/od-win32/win32gui.c +++ b/od-win32/win32gui.c @@ -3111,6 +3111,7 @@ static void enable_for_displaydlg (HWND hDlg) EnableWindow (GetDlgItem (hDlg, IDC_LM_SCANLINES), TRUE); } EnableWindow (GetDlgItem (hDlg, IDC_FRAMERATE2), !workprefs.gfx_vsync); + EnableWindow (GetDlgItem (hDlg, IDC_FRAMERATE), !workprefs.cpu_cycle_exact); } static void enable_for_chipsetdlg (HWND hDlg) @@ -3394,20 +3395,22 @@ static void values_to_displaydlg (HWND hDlg) SetDlgItemInt (hDlg, IDC_XSIZE, workprefs.gfx_width_win, FALSE); SetDlgItemInt (hDlg, IDC_YSIZE, workprefs.gfx_height_win, FALSE); - SendDlgItemMessage (hDlg, IDC_FRAMERATE, TBM_SETPOS, TRUE, workprefs.gfx_framerate); v = workprefs.chipset_refreshrate; if (v == 0) v = currprefs.ntscmode ? 60 : 50; - SendDlgItemMessage (hDlg, IDC_FRAMERATE2, TBM_SETPOS, TRUE, v); + sprintf (buffer, "%d", v); + SetDlgItemText (hDlg, IDC_RATE2TEXT, buffer); + v = workprefs.cpu_cycle_exact ? 1 : workprefs.gfx_framerate; + SendDlgItemMessage (hDlg, IDC_FRAMERATE, TBM_SETPOS, TRUE, v); WIN32GUI_LoadUIString( IDS_FRAMERATE, buffer, MAX_FRAMERATE_LENGTH ); - LoadNthString( workprefs.gfx_framerate - 1, Nth, MAX_NTH_LENGTH ); + LoadNthString (v - 1, Nth, MAX_NTH_LENGTH); if( FormatMessage( FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_ALLOCATE_BUFFER, buffer, 0, 0, (LPTSTR)&string, MAX_FRAMERATE_LENGTH + MAX_NTH_LENGTH, (va_list *)blah ) == 0 ) { DWORD dwLastError = GetLastError(); - sprintf (buffer, "Every %s Frame", nth[workprefs.gfx_framerate - 1]); + sprintf (buffer, "Every %s Frame", nth[v - 1]); SetDlgItemText( hDlg, IDC_RATETEXT, buffer ); } else @@ -3415,8 +3418,6 @@ static void values_to_displaydlg (HWND hDlg) SetDlgItemText( hDlg, IDC_RATETEXT, string ); LocalFree( string ); } - sprintf (buffer, "%d", v); - SetDlgItemText (hDlg, IDC_RATE2TEXT, buffer); CheckRadioButton( hDlg, IDC_LM_NORMAL, IDC_LM_SCANLINES, IDC_LM_NORMAL + workprefs.gfx_linedbl ); CheckDlgButton (hDlg, IDC_AFULLSCREEN, workprefs.gfx_afullscreen); @@ -3708,6 +3709,7 @@ static void values_from_chipsetdlg (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l } workprefs.immediate_blits = 0; workprefs.fast_copper = 0; + workprefs.gfx_framerate = 1; } } workprefs.collision_level = IsDlgButtonChecked (hDlg, IDC_COLLISION0) ? 0 -- 2.47.3