2330b7

diff --git a/a2091.cpp b/a2091.cpp
index 7782959d2885b80034e66a10ec52bdd9866eedfe..c7d6126122e250cbe5da956800e9ae15c17f4a22 100644 (file)
--- a/a2091.cpp
+++ b/a2091.cpp
@@ -941,7 +941,7 @@ static uae_u32 REGPARAM2 dmac_wgeti (uaecptr addr)
 }
 static uae_u32 REGPARAM2 dmac_lgeti (uaecptr addr)
 {
-       uae_u32 v = 0xffff;
+       uae_u32 v;
 #ifdef JIT
        special_mem |= S_READ;
 #endif
@@ -957,6 +957,7 @@ static int REGPARAM2 dmac_check (uaecptr addr, uae_u32 size)
 
 static uae_u8 *REGPARAM2 dmac_xlate (uaecptr addr)
 {
+       write_log (L"%x ", addr);
        addr &= rom_mask;
        addr += rombank * rom_size;
        return rom + addr;

diff --git a/custom.cpp b/custom.cpp
index 4701602c854eadb36f313d83363cba7a450f8446..a1a91c1e05d46cf9fb6dc32abe5925ca010617ac 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -2551,7 +2551,6 @@ static void finish_decisions (void)
        decide_diw (hpos);
        decide_line (hpos);
        decide_fetch (hpos);
-       finish_final_fetch (hpos, fetchmode);
 
        record_color_change2 (hsyncstartpos, 0xffff, 0);
        if (thisline_decision.plfleft != -1 && thisline_decision.plflinelen == -1) {

diff --git a/disk.cpp b/disk.cpp
index 3ee2bcff9986f94ff3e6d3897789891325b8f58a..95e76e2b458a5f183895e66316b6f24817b42b74 100644 (file)
--- a/disk.cpp
+++ b/disk.cpp
@@ -1081,7 +1081,7 @@ static int drive_insert (drive * drv, struct uae_prefs *p, int dnum, const TCHAR
 
                /* High-density or diskspare disk? */
                drv->num_tracks = 0;
-               if (size > 160 * 11 * 512) { // larger than standard adf?
+               if (size > 160 * 11 * 512 + 511) { // larger than standard adf?
                        for (i = 80; i <= 83; i++) {
                                if (size == i * 22 * 512 * 2) { // HD
                                        drv->ddhd = 2;
@@ -3561,8 +3561,10 @@ void restore_disk_finish (void)
        currprefs.nr_floppies = changed_prefs.nr_floppies = cnt;
        DISK_check_change ();
        setamax ();
+#if 0
        if (dskdmaen)
                dumpdisk ();
+#endif
 }
 
 uae_u8 *restore_disk (int num,uae_u8 *src)

diff --git a/drawing.cpp b/drawing.cpp
index f622dfee13ca0774581eaeecf35d05567c08c210..f0591305a44caecfbee124641f70ff5cfc9dd560 100644 (file)
--- a/drawing.cpp
+++ b/drawing.cpp
@@ -873,12 +873,16 @@ STATIC_INLINE uae_u8 render_sprites (int pos, int dualpf, uae_u8 apixel, int aga
 STATIC_INLINE uae_u32 shsprite (int dpix, uae_u32 spix_val, uae_u32 v, int spr)
 {
        uae_u8 sprcol;
+       uae_u16 scol;
        if (!spr)
                return v;
        sprcol = render_sprites (dpix, 0, spix_val, 0);
-       if (sprcol)
-               return colors_for_drawing.color_regs_ecs[sprcol];
-       return v;
+       if (!sprcol)
+               return v;
+       /* good enough for now.. */ 
+       scol = colors_for_drawing.color_regs_ecs[sprcol] & 0xccc;
+       scol |= scol >> 2;
+       return xcolors[scol];
 }
 
 static int NOINLINE linetoscr_16_sh (int spix, int dpix, int stoppos, int spr)

diff --git a/epsonprinter.cpp b/epsonprinter.cpp
index 4f9f2ff5a210e6ca88fb930ddb257b187d2007cb..a73516cf00a8a31933be4fc2298c94e7abaf4743 100644 (file)
--- a/epsonprinter.cpp
+++ b/epsonprinter.cpp
@@ -1198,7 +1198,7 @@ static void setupBitImage(Bit8u dens, Bit16u numCols, int pin9)
        if (pins == 9) {
                if (pin9) {
                        bitGraph.pin9 = true;
-                       bitGraph.bytesColumn = 2;
+                       bitGraph.bytesColumn = 1;
                }       
                bitGraph.vertDens = 72;
        }

diff --git a/inputdevice.cpp b/inputdevice.cpp
index 2f771d436c79a790fbbe3015c3dc8d4470fd879f..858dd564b7c38d803fcf2667e50d410bf8473255 100644 (file)
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -2966,10 +2966,15 @@ static int handle_input_event (int nr, int state, int max, int autofire, bool ca
 
 static void inputdevice_checkconfig (void)
 {
-       if (currprefs.jports[0].id != changed_prefs.jports[0].id ||
+       if (
+               currprefs.jports[0].id != changed_prefs.jports[0].id ||
                currprefs.jports[1].id != changed_prefs.jports[1].id ||
                currprefs.jports[2].id != changed_prefs.jports[2].id ||
                currprefs.jports[3].id != changed_prefs.jports[3].id ||
+               currprefs.jports[0].mode != changed_prefs.jports[0].mode ||
+               currprefs.jports[1].mode != changed_prefs.jports[1].mode ||
+               currprefs.jports[2].mode != changed_prefs.jports[2].mode ||
+               currprefs.jports[3].mode != changed_prefs.jports[3].mode ||
                currprefs.input_selected_setting != changed_prefs.input_selected_setting ||
                currprefs.input_joymouse_multiplier != changed_prefs.input_joymouse_multiplier ||
                currprefs.input_joymouse_deadzone != changed_prefs.input_joymouse_deadzone ||

diff --git a/od-win32/rp.cpp b/od-win32/rp.cpp
index 7371c37107ec53c592d1590810c1b58c4c02a42c..ec0e94071da84f52d8ca38f0623e0945a5d46191 100644 (file)
--- a/od-win32/rp.cpp
+++ b/od-win32/rp.cpp
@@ -673,6 +673,8 @@ static LRESULT CALLBACK RPHostMsgFunction2 (UINT uMessage, WPARAM wParam, LPARAM
                                break;
                        case RP_DEVICE_INPUTPORT:
                                ok = port_insert (num, dc->dwInputDevice, dc->dwFlags, n);
+                               if (ok)
+                                       inputdevice_updateconfig (&currprefs);
                                break;
                        case RP_DEVICE_CD:
                                ok = cd_insert (num, n);
@@ -863,6 +865,8 @@ static void sendenum (void)
                        _tcscpy (desc.szHostInputName, p1);
                        desc.dwHostInputType= RP_HOSTINPUT_KEYJOY_MAP1 + cnt;
                        desc.dwInputDeviceFeatures = RP_FEATURE_INPUTDEVICE_JOYSTICK;
+                       if (cnt == 0)
+                               desc.dwInputDeviceFeatures |= RP_FEATURE_INPUTDEVICE_JOYPAD;
                        if (log_rp)
                                write_log(L"Enum%d: '%s' '%s'\n", cnt, desc.szHostInputName, desc.szHostInputID);
                        RPSendMessagex (RPIPCGM_INPUTDEVICE, 0, 0, &desc, sizeof desc, &guestinfo, NULL);
@@ -1045,8 +1049,8 @@ void rp_input_change (int num)
        } else if (m >= 0) {
                _tcscpy (name, inputdevice_get_device_unique_name (IDTYPE_MOUSE, m));
        }
-       mode = 0;
-       for (int i = 0; i < inputdevmode[i * 2]; i++) {
+       mode = RP_INPUTDEVICE_EMPTY;
+       for (int i = 0; inputdevmode[i * 2]; i++) {
                if (inputdevmode[i * 2 + 1] == currprefs.jports[num].mode) {
                        mode = inputdevmode[i * 2 + 0];
                        break;

diff --git a/od-win32/win32.cpp b/od-win32/win32.cpp
index 6df4e8a0c13b2006948923e0f5df9bec78ad8412..67b02736cf0cd820c1838e0da4b9b3a648944e87 100644 (file)
--- a/od-win32/win32.cpp
+++ b/od-win32/win32.cpp
@@ -1112,7 +1112,7 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
                        mx -= mouseposx;
                        my -= mouseposy;
 
-                       //write_log (L"%d %d %d %d %d %d %d\n", wm, mouseactive, focus, mx, my, mouseposx, mouseposy);
+                       //write_log (L"%d %d %d %d %d %d %dx%d %dx%d\n", wm, mouseactive, focus, showcursor, recapture, isfullscreen (), mx, my, mouseposx, mouseposy);
                        if (recapture && isfullscreen () <= 0) {
                                setmouseactive (1);
                                return 0;

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 9446865ea43b3f1ac2cf416741f3c7d12216964f..9cf9c6611cee5615abac6c66172af95734cd8555 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -19,8 +19,8 @@
 #define LANG_DLL 1
 
 //#define WINUAEBETA L""
-#define WINUAEBETA L"Beta 6"
-#define WINUAEDATE MAKEBD(2011, 8, 31)
+#define WINUAEBETA L"Beta 7"
+#define WINUAEDATE MAKEBD(2011, 9, 14)
 #define WINUAEEXTRA L""
 #define WINUAEREV L""
 

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 70fad6497c1a2cb903ac867af30dfb4374b46e6c..3e6fea110d83dee774b42a432b9ef579bc531c27 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -5630,7 +5630,7 @@ static void display_fromselect (int val, int *fs, int *vsync, int p96)
 
 static void values_to_displaydlg (HWND hDlg)
 {
-       TCHAR buffer[MAX_DPATH], buffer2[MAX_DPATH];
+       TCHAR buffer[MAX_DPATH];
        int rates[MAX_CHIPSET_REFRESH_TOTAL];
        int v;
        double d;
@@ -5714,8 +5714,7 @@ static void values_to_displaydlg (HWND hDlg)
        SendDlgItemMessage(hDlg, IDC_SCREENMODE_RTG2, CB_ADDSTRING, 0, (LPARAM)L"-");
        WIN32GUI_LoadUIString(IDS_SCREEN_VSYNC, buffer, sizeof buffer / sizeof (TCHAR));
        SendDlgItemMessage(hDlg, IDC_SCREENMODE_RTG2, CB_ADDSTRING, 0, (LPARAM)buffer);
-       WIN32GUI_LoadUIString(IDS_SCREEN_VSYNC, buffer, sizeof buffer / sizeof (TCHAR));
-       _tcscat (buffer, buffer2);
+       WIN32GUI_LoadUIString(IDS_SCREEN_VSYNC_AUTOSWITCH, buffer, sizeof buffer / sizeof (TCHAR));
        SendDlgItemMessage(hDlg, IDC_SCREENMODE_RTG2, CB_ADDSTRING, 0, (LPARAM)buffer);
 
        SendDlgItemMessage(hDlg, IDC_SCREENMODE_RTG, CB_SETCURSEL,

diff --git a/od-win32/winuae_msvc10/winuae_msvc.sln b/od-win32/winuae_msvc10/winuae_msvc.sln
index d00f879ab2e647242ee9bc27295e8d6b1ce58027..6c33be6f5ee1539f421020931356f179d7847784 100644 (file)
--- a/od-win32/winuae_msvc10/winuae_msvc.sln
+++ b/od-win32/winuae_msvc10/winuae_msvc.sln
@@ -118,7 +118,6 @@ Global
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|Win32.ActiveCfg = Release|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.FullRelease|x64.ActiveCfg = Release|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.ActiveCfg = Release|Win32
-               {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|Win32.Build.0 = Release|Win32
                {6181E50C-5F32-42DC-BEF6-827AA8A5429D}.Release|x64.ActiveCfg = Release|Win32
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|Win32.ActiveCfg = Debug|Win32
                {2C44DD04-F5D6-4CC3-B0D6-1F4E51A0D962}.Debug|x64.ActiveCfg = Debug|Win32

diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
index 8daad961ead64ed45faf8ea80d5cfa5ccd3e73a8..9b7a71befea0ecdda61a635ee3be64a9156b4eac 100644 (file)
--- a/od-win32/winuae_msvc10/winuae_msvc.vcxproj
+++ b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
@@ -114,6 +114,8 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">winuae64</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">winuae64</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">winuae64</TargetName>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;C:\dev\WinDDK\7600.16385.1\lib\win7\i386;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 03b844c7616908a39298eb02de3a9461adc2b0af..6267c3a980902ba84c74ad91db69ca158e9852d0 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,8 @@
 
+- do not misdetect standard adf images that have small amount of garbage data appended at the end of file
+- forgotten experimental code removed. (b1, broke Sequential 18Frames! part)
+- ECS superhires sprite color fixed (Didn't handle "color scrambling")
+
 Beta 6:
 
 - added "statefile_name" configuration file entry, sets default statefile name (normally "default.uss")