]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
imported winuaesrc1600.zip
authorToni Wilen <twilen@winuae.net>
Thu, 21 May 2009 10:47:14 +0000 (13:47 +0300)
committerToni Wilen <twilen@winuae.net>
Mon, 22 Feb 2010 19:46:28 +0000 (21:46 +0200)
35 files changed:
cfgfile.c
cia.c
include/autoconf.h
od-win32/WinUAE_Install.nsi
od-win32/ahidsound_dsonly.c
od-win32/blkdev_win32_aspi.c
od-win32/blkdev_win32_ioctl.c
od-win32/blkdev_win32_spti.c
od-win32/build68k_msvc/build68k_msvc.vcxproj [new file with mode: 0644]
od-win32/build68k_msvc/build68k_msvc.vcxproj.filters [new file with mode: 0644]
od-win32/cloanto/RetroPlatformGuestIPC.c
od-win32/direct3d.c
od-win32/genblitter_msvc/genblitter_msvc.vcxproj [new file with mode: 0644]
od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters [new file with mode: 0644]
od-win32/gencomp_msvc/gencomp_msvc.vcxproj [new file with mode: 0644]
od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters [new file with mode: 0644]
od-win32/gencpu_msvc/gencpu_msvc.vcxproj [new file with mode: 0644]
od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters [new file with mode: 0644]
od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj [new file with mode: 0644]
od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj.filters [new file with mode: 0644]
od-win32/resources/d/resource [deleted file]
od-win32/resources/d/resource.h [deleted file]
od-win32/resources/resource
od-win32/resources/winuae.rc
od-win32/resources/winuae_minimal.rc
od-win32/srcrelease.cmd
od-win32/uaeunp/uaeunp.vcxproj [new file with mode: 0644]
od-win32/uaeunp/uaeunp.vcxproj.filters [new file with mode: 0644]
od-win32/win32.c
od-win32/win32.h
od-win32/win32_scale2x.c
od-win32/win32gfx.c
od-win32/win32gui.c
od-win32/winuaechangelog.txt
uaelib.c

index aae925a2f2112361a1581d7ebd4a1645e6ec910b..0c1aca1ea663bfd201c103d4015228e0816df767 100644 (file)
--- a/cfgfile.c
+++ b/cfgfile.c
@@ -165,7 +165,8 @@ static const TCHAR *abspointers[] = { L"none", L"mousehack", L"tablet", 0 };
 static const TCHAR *magiccursors[] = { L"both", L"native", L"host", 0 };
 static const TCHAR *autoscale[] = { L"none", L"scale", L"resize", 0 };
 static const TCHAR *joyportmodes[] = { NULL, L"mouse", L"djoy", L"ajoy", L"cdtvjoy", L"cd32joy", L"lightpen", 0 };
-static const TCHAR *epsonprinter[] = { L"none", L"ascii", L"epson_matrix" };
+static const TCHAR *epsonprinter[] = { L"none", L"ascii", L"epson_matrix", 0 };
+static const TCHAR *aspects[] = { L"none", L"vga", L"tv", 0 };
 
 static const TCHAR *obsolete[] = {
     L"accuracy", L"gfx_opengl", L"gfx_32bit_blits", L"32bit_blits",
@@ -681,7 +682,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
     cfgfile_dwrite (f, L"gfx_filter_gamma", L"%d", p->gfx_filter_gamma);
     cfgfile_dwrite (f, L"gfx_filter_blur", L"%d", p->gfx_filter_blur);
     cfgfile_dwrite (f, L"gfx_filter_noise", L"%d", p->gfx_filter_noise);
-    cfgfile_dwrite_bool (f, L"gfx_filter_keep_aspect", p->gfx_filter_keep_aspect);
+    cfgfile_dwrite_str (f, L"gfx_filter_keep_aspect", aspects[p->gfx_filter_keep_aspect]);
     cfgfile_dwrite_str (f, L"gfx_filter_autoscale", autoscale[p->gfx_filter_autoscale]);
     cfgfile_dwrite (f, L"gfx_filter_aspect_ratio", L"%d:%d",
        p->gfx_filter_aspect >= 0 ? (p->gfx_filter_aspect >> 8) : -1,
@@ -1006,7 +1007,6 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
        || cfgfile_intval (option, value, L"gfx_filter_gamma", &p->gfx_filter_gamma, 1)
        || cfgfile_intval (option, value, L"gfx_filter_blur", &p->gfx_filter_blur, 1)
        || cfgfile_intval (option, value, L"gfx_filter_noise", &p->gfx_filter_noise, 1)
-       || cfgfile_yesno  (option, value, L"gfx_filter_keep_aspect", &p->gfx_filter_keep_aspect)
        || cfgfile_intval (option, value, L"gfx_luminance", &p->gfx_luminance, 1)
        || cfgfile_intval (option, value, L"gfx_contrast", &p->gfx_contrast, 1)
        || cfgfile_intval (option, value, L"gfx_gamma", &p->gfx_gamma, 1)
@@ -1074,6 +1074,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
        || cfgfile_strval (option, value, L"gfx_max_vertical", &p->gfx_max_vertical, maxvert, 0)
        || cfgfile_strval (option, value, L"gfx_filter_autoscale", &p->gfx_filter_autoscale, autoscale, 0)
        || cfgfile_strval (option, value, L"magic_mousecursor", &p->input_magic_mouse_cursor, magiccursors, 0)
+       || cfgfile_strval (option, value, L"gfx_filter_keep_aspect", &p->gfx_filter_keep_aspect, aspects, 0)
        || cfgfile_strval (option, value, L"absolute_mouse", &p->input_tablet, abspointers, 0))
            return 1;
 
diff --git a/cia.c b/cia.c
index c12cc2217bf1af0aae9844c900d544d15a660657..0817bc459d89766839f1d121cf9019c11d4e0e2c 100644 (file)
--- a/cia.c
+++ b/cia.c
@@ -88,8 +88,6 @@ static void RethinkICRA (void)
     if (ciaaimask & ciaaicr) {
        ciaaicr |= 0x80;
        INTREQ_0 (0x8000 | 0x0008);
-    } else {
-       ciaaicr &= 0x7F;
     }
 }
 
@@ -98,8 +96,6 @@ static void RethinkICRB (void)
     if (ciabimask & ciabicr) {
        ciabicr |= 0x80;
        INTREQ_0 (0x8000 | 0x2000);
-    } else {
-       ciabicr &= 0x7F;
     }
 }
 
@@ -1087,7 +1083,7 @@ static void WriteCIAB (uae_u16 addr,uae_u8 val)
        CIA_calctimers ();
        break;
     case 13:
-       setclr(&ciabimask,val);
+       setclr (&ciabimask,val);
        break;
     case 14:
        CIA_update ();
index f979f7be0dc7fa62d39c21285655db5581360f91..48ca4ad01e808d40bf167d29e929c8486374a240 100644 (file)
@@ -89,3 +89,5 @@ extern void expansion_cleanup (void);
 extern void expansion_clear (void);
 
 extern void uaegfx_install_code (void);
+
+extern uae_u32 emulib_target_getcpurate (uae_u32, uae_u32*);
index 38a4af23fc0711dc145d002e69fadb8ff96f2297..47fab6c61a53f355b634dfaadb56dda35598d0d2 100644 (file)
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME "WinUAE"
-!define PRODUCT_VERSION "1.5.3"
+!define PRODUCT_VERSION "1.6.0"
 !define PRODUCT_PUBLISHER "Arabuusimiehet"
 !define PRODUCT_WEB_SITE "http://www.winuae.net/"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\winuae.exe"
@@ -99,6 +99,7 @@ Section "Host-Configurations" secExConfig
  ;-- Copy Example Host Configurations
   File "${DISTPATH}\Configurations\Host\Fullscreen (640x480).uae"
   File "${DISTPATH}\Configurations\Host\Fullscreen (800x600).uae"
+  File "${DISTPATH}\Configurations\Host\FullwindowD3D.uae"
   File "${DISTPATH}\Configurations\Host\Windowed.uae"
 SectionEnd
 
@@ -148,9 +149,7 @@ SubSection "Additional files" secAdditionalFiles
   File "${DISTPATH}\Amiga Programs\german_KeyMap_new.zip"
   File "${DISTPATH}\Amiga Programs\amigaprog.txt"
   File "${DISTPATH}\Amiga Programs\ahidriver.zip"
-  File "${DISTPATH}\Amiga Programs\sources\p96refresh.ab2"
-  File "${DISTPATH}\Amiga Programs\sources\uae-configuration.s"
-  File "${DISTPATH}\Amiga Programs\sources\uae-configuration.c"
+  File "${DISTPATH}\Amiga Programs\sources.zip"
  SectionEnd
 SubSectionEnd
 
@@ -266,8 +265,10 @@ Section Uninstall
   Delete "$INSTDIR\Amiga Programs\sources\uae-configuration.s"
   Delete "$INSTDIR\Amiga Programs\sources\uae-configuration.c"
   Delete "$INSTDIR\Amiga Programs\sources\picasso96fix.lha"
+  Delete "$INSTDIR\Amiga Programs\sources.zip"
   Delete "$INSTDIR\Configurations\Host\Fullscreen (640x480).uae"
   Delete "$INSTDIR\Configurations\Host\Fullscreen (800x600).uae"
+  Delete "$INSTDIR\Configurations\Host\FullwindowD3D.uae"
   Delete "$INSTDIR\Configurations\Host\Windowed.uae"
   Delete "$INSTDIR\winuaebootlog.txt"
   Delete "$INSTDIR\winuaelog.txt"
index 45881e13629075394bf37d5d7b71a6ced907f8a3..b3a2a8d8dfeeb62a92229ffc2fb3b0329a64eb3f 100644 (file)
@@ -555,7 +555,7 @@ uae_u32 REGPARAM2 ahi_demux (TrapContext *context)
        case 10:
 #if 1
            if (OpenClipboard (0)) {
-               clipdat = GetClipboardData (CF_TEXT);
+               clipdat = GetClipboardData (CF_UNICODETEXT);
                if (clipdat) {
                    clipsize = _tcslen (clipdat);
                    clipsize++;
@@ -568,9 +568,15 @@ uae_u32 REGPARAM2 ahi_demux (TrapContext *context)
        case 11:
        {
 #if 1
-           int i;
-           for (i = 0; i < clipsize; i++)
-               put_byte (m68k_areg (&context->regs, 0) + i, clipdat[i]);
+           put_byte (m68k_areg (&context->regs, 0), 0);
+           if (clipdat) {
+               char *tmp = ua (clipdat);
+               int i;
+               for (i = 0; i < clipsize && i < strlen (tmp); i++)
+                   put_byte (m68k_areg (&context->regs, 0) + i, tmp[i]);
+               put_byte (m68k_areg (&context->regs, 0) + clipsize - 1, 0);
+               xfree (tmp);
+           }
            CloseClipboard ();
 #endif
        }
@@ -594,7 +600,7 @@ uae_u32 REGPARAM2 ahi_demux (TrapContext *context)
                    if (p2) {
                        _tcscpy (p2, s);
                        GlobalUnlock (p);
-                       SetClipboardData (CF_TEXT, p);
+                       SetClipboardData (CF_UNICODETEXT, p);
                    }
                }
                CloseClipboard ();
index 07176536864de8179f3b4eb46e00026db2a23997..e74773a873407eb980e0d5f79f76e78d52250737 100644 (file)
@@ -156,9 +156,14 @@ static int ha_inquiry (SCSI *scgp, int id, SRB_HAInquiry *ip)
     ip->SRB_Hdr_Rsvd = 0;
 
     Status = pfnSendASPI32Command((LPSRB)ip);
-    if (log_scsi)
+    if (log_scsi) {
+       TCHAR *s1 = au (ip->HA_ManagerId);
+       TCHAR *s2 = au (ip->HA_Identifier);
        write_log (L"ASPI: S=%d ha=%d, ID=%d, M='%s', Id='%s'\n",
-           Status, ip->HA_Count, ip->HA_SCSI_ID, ip->HA_ManagerId, ip->HA_Identifier);
+           Status, ip->HA_Count, ip->HA_SCSI_ID, s1, s2);
+       xfree (s2);
+       xfree (s1);
+    }
     if (ip->SRB_Status != SS_COMP)
        return -1;
     return 0;
@@ -678,10 +683,21 @@ static void scan_scsi_bus (SCSI *scgp, int flags)
                continue;
            for (scgp->addr.lun=0; scgp->addr.lun < 8; scgp->addr.lun++) {
                if (!inquiry (scgp, &inq, sizeof(inq))) {
-                   write_log (L"ASPI: %d:%d:%d ", scgp->addr.scsibus,scgp->addr.target,scgp->addr.lun);
-                   write_log (L"'%.8s' ", inq.vendor_info);
-                   write_log (L"'%.16s' ", inq.prod_ident);
-                   write_log (L"'%.4s' ", inq.prod_revision);
+                   TCHAR *vend, *prod, *rev;
+                   char tmp[20];
+
+                   memcpy (tmp, inq.vendor_info, 8);
+                   tmp[8] = 0;
+                   vend = au (tmp);
+                   memcpy (tmp, inq.prod_ident, 16);
+                   tmp[16] = 0;
+                   prod = au (tmp);
+                   memcpy (tmp, inq.prod_revision, 4);
+                   tmp[4] = 0;
+                   rev = au (tmp);
+
+                   write_log (L"ASPI: %d:%d:%d '%s' '%s' '%s",
+                       scgp->addr.scsibus,scgp->addr.target,scgp->addr.lun, vend, prod, rev);
                    if (unitcnt < MAX_TOTAL_DEVICES) {
                        struct scsi_info *cis = &si[unitcnt];
                        int use = 0;
@@ -709,10 +725,14 @@ static void scan_scsi_bus (SCSI *scgp, int flags)
                            cis->lun = scgp->addr.lun;
                            cis->type = inq.type;
                            cis->removable = inq.removable;
-                           _stprintf (cis->label, L"%.8s %.16s %.4s", inq.vendor_info, inq.prod_ident, inq.prod_revision);
+                           _stprintf (cis->label, L"%s %s %s", vend, prod, rev);
                        }
                    }
                    write_log (L"\n");
+
+                   xfree (rev);
+                   xfree (prod);
+                   xfree (vend);
                }
            }
        }
@@ -848,7 +868,7 @@ static int open_scsi_device (int unitnum)
     if (si[unitnum].handle)
        si[unitnum].mediainserted = mediacheck (unitnum);
     if (log_scsi)
-       write_log (L"unit %d: %s\n", unitnum, si[unitnum].mediainserted ? "CD inserted" : "Drive empty");
+       write_log (L"unit %d: %s\n", unitnum, si[unitnum].mediainserted ? L"CD inserted" : L"Drive empty");
     return si[unitnum].handle ? 1 : 0;
 }
 
index 1b0446ef8bc0cf80b068aa2d6757987fc385e258..b339c9782fca808087cd47d9574c80e946dd69ba 100644 (file)
@@ -175,13 +175,13 @@ static int open_createfile (int unitnum, int fullaccess)
                }
            }
            if (closed)
-               write_log (L"IOCTL: failed to re-open '%s', err=%d\n", ciw->devname, GetLastError());
+               write_log (L"IOCTL: failed to re-open '%s', err=%d\n", ciw->devname, GetLastError ());
            return 0;
        }
        break;
     }
     if (!DeviceIoControl (ciw->h, FSCTL_ALLOW_EXTENDED_DASD_IO, NULL, 0, NULL, 0, &len, NULL))
-       write_log (L"IOCTL: FSCTL_ALLOW_EXTENDED_DASD_IO returned %d\n", GetLastError());
+       write_log (L"IOCTL: FSCTL_ALLOW_EXTENDED_DASD_IO returned %d\n", GetLastError ());
     if (log_scsi)
        write_log (L"IOCTL: IOCTL open completed\n");
     return 1;
index 7a16acd9f17b2cf1898789ab01b5bcb8d8cf7ec3..cc82994eb7c4c001cf72521e5f3131944e7958ea 100644 (file)
@@ -316,9 +316,21 @@ static int inquiry (int unitnum, struct dev_info_spti *di, uae_u8 *inquirydata)
        di->isatapi = 1;
     memcpy (inquirydata, p, inqlen);
     if (log_scsi) {
-       if (outlen >= INQUIRY_SIZE)
-           write_log (L"SPTI: INQUIRY: %02X%02X%02X %d '%-8s' '%-16s'\n",
-           p[0], p[1], p[2], di->isatapi, p + 8, p + 16);
+       if (outlen >= INQUIRY_SIZE) {
+           char tmp[20];
+           TCHAR *s1, *s2;
+
+           memcpy (tmp, p + 8, 8);
+           tmp[8] = 0;
+           s1 = au (tmp);
+           memcpy (tmp, p + 16, 16);
+           tmp[16] = 0;
+           s2 = au (tmp);
+           write_log (L"SPTI: INQUIRY: %02X%02X%02X %d '%s' '%s'\n",
+           p[0], p[1], p[2], di->isatapi, s1, s2);
+           xfree (s2);
+           xfree (s1);
+       }
     }
     return inqlen;
 }
@@ -389,7 +401,7 @@ int open_scsi_device (int unitnum)
     h = CreateFile(dev,GENERIC_READ|GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,NULL,OPEN_EXISTING,0,NULL);
     di->handle = h;
     if (h == INVALID_HANDLE_VALUE) {
-       write_log (L"SPTI: failed to open unit %d err=%d ('%s')\n", unitnum, GetLastError(), dev);
+       write_log (L"SPTI: failed to open unit %d err=%d ('%s')\n", unitnum, GetLastError (), dev);
     } else {
        uae_u8 inqdata[INQUIRY_SIZE + 1] = { 0 };
        checkcapabilities (unitnum);
diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj
new file mode 100644 (file)
index 0000000..ade2421
--- /dev/null
@@ -0,0 +1,254 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FullRelease|Win32">
+      <Configuration>FullRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="TestRelease|Win32">
+      <Configuration>TestRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>build68k</ProjectName>
+    <ProjectGUID>{AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C}</ProjectGUID>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">build68k</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">build68k</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">build68k</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">build68k</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/build68k_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/build68k_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting cpudefs.c</Message>
+      <Command>del ..\..\cpudefs.c</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/build68k.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>creating cpudefs.c</Message>
+      <Command>build68k.exe &gt;..\..\cpudefs.c &lt;..\..\table68k</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/build68k_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/build68k_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting cpudefs.c</Message>
+      <Command>del ..\..\cpudefs.c</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/build68k.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>creating cpudefs.c</Message>
+      <Command>build68k.exe &gt;..\..\cpudefs.c &lt;..\..\table68k</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/build68k_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/build68k_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting cpudefs.c</Message>
+      <Command>del ..\..\cpudefs.c</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/build68k.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>creating cpudefs.c</Message>
+      <Command>build68k.exe &gt;..\..\cpudefs.c &lt;..\..\table68k</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/build68k_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/build68k_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting cpudefs.c</Message>
+      <Command>del ..\..\cpudefs.c</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/build68k.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>creating cpudefs.c</Message>
+      <Command>build68k.exe &gt;..\..\cpudefs.c &lt;..\..\table68k</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\build68k.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj.filters b/od-win32/build68k_msvc/build68k_msvc.vcxproj.filters
new file mode 100644 (file)
index 0000000..08ccd05
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{95d84b91-1707-44ec-a2c7-4c54318c8beb}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\build68k.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
index 278b13df98e09bd85aad2bee541146dfd4a1b936..e4e0eb78e20e17efe115a99f12cfb1d79de38af7 100644 (file)
@@ -2,12 +2,13 @@
  Name    : RetroPlatformGuestIPC.c
  Project : RetroPlatform Player
  Client  : Cloanto Italia srl
- Legal   : Copyright 2007, 2008 Cloanto Italia srl - All rights reserved. This
+ Support : http://www.retroplatform.com
+ Legal   : Copyright 2007-2009 Cloanto Italia srl - All rights reserved. This
          : file is made available under the terms of the GNU General Public
          : License version 2 as published by the Free Software Foundation.
  Authors : os, mcb
  Created : 2007-08-24 15:28:48
- Updated : 2008-06-10 13:42:00
+ Updated : 2009-05-14 10:12:43
  Comment : RP Player interprocess communication functions (guest side)
  Note    : Can be compiled both in Unicode and Multibyte projects
  *****************************************************************************/
@@ -58,7 +59,7 @@ HRESULT RPInitializeGuest(RPGUESTINFO *pInfo, HINSTANCE hInstance, LPCTSTR pszHo
 
        // find the host message window
        //
-       pszHostClass = (_TCHAR *)LocalAlloc(LMEM_FIXED, (_tcslen(g_szHostWndClass) + _tcslen(pszHostInfo) + 1) * sizeof (_TCHAR));
+       pszHostClass = (_TCHAR *)LocalAlloc(LMEM_FIXED, (_tcslen(g_szHostWndClass) + _tcslen(pszHostInfo) + 1) * sizeof(_TCHAR));
        if (!pszHostClass)
                return E_OUTOFMEMORY;
        wsprintf(pszHostClass, g_szHostWndClass, pszHostInfo);
@@ -178,11 +179,11 @@ BOOL RPSendMessage(UINT uMessage, WPARAM wParam, LPARAM lParam,
 
 /*****************************************************************************
  Name      : RPPostMessage
- Arguments : UINT uMessage            - 
-           : WPARAM wParam            - 
-           : LPARAM lParam            - 
-           : const RPGUESTINFO *pInfo - 
- Return    : BOOL                     - 
+ Arguments : UINT uMessage            -
+           : WPARAM wParam            -
+           : LPARAM lParam            -
+           : const RPGUESTINFO *pInfo -
+ Return    : BOOL                     -
  Authors   : os
  Created   : 2008-06-10 13:30:34
  Comment   : the guest calls this function to post messages to the host
index e2bffc09db5f1876399c17e7461fe4fa80939111..7424c43166ae15617443eede880e150cb49804dd 100644 (file)
@@ -51,6 +51,7 @@ static int t_depth;
 static int required_sl_texture_w, required_sl_texture_h;
 static int vsync2, guimode;
 static int needclear;
+static int resetcount;
 
 #define D3DFVF_TLVERTEX D3DFVF_XYZ|D3DFVF_DIFFUSE|D3DFVF_TEX1
 struct TLVERTEX {
@@ -1006,6 +1007,7 @@ void D3D_free (void)
     d3d_enabled = 0;
     psPreProcess = 0;
     psActive = 0;
+    resetcount = 0;
 }
 
 const TCHAR *D3D_init (HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int depth)
@@ -1214,9 +1216,11 @@ int D3D_needreset (void)
        hr = IDirect3DDevice9_Reset (d3ddev, &dpp);
        if (FAILED (hr)) {
            write_log (L"D3D: Reset failed %s\n", D3D_ErrorString (hr));
-           changed_prefs.gfx_filter = 0;
-           return 1;
+           resetcount++;
+           if (resetcount > 2)
+               changed_prefs.gfx_filter = 0;
        }
+       return 1;
     }
     return 0;
 }
diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj
new file mode 100644 (file)
index 0000000..647ca2e
--- /dev/null
@@ -0,0 +1,287 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FullRelease|Win32">
+      <Configuration>FullRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="TestRelease|Win32">
+      <Configuration>TestRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>genblitter</ProjectName>
+    <ProjectGUID>{765B0AF0-B8D3-4998-89AF-D6F939E1CD18}</ProjectGUID>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">genblitter</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">genblitter</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">genblitter</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">genblitter</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/genblitter_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/genblitter_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting blitter files</Message>
+      <Command>del ..\..\blit.h
+del ..\..\blitfunc.c
+del ..\..\blitfunc.h
+del ..\..\blittable.c
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/genblitter.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating blitter files</Message>
+      <Command>genblitter.exe i &gt;..\..\blit.h
+genblitter.exe f &gt;..\..\blitfunc.c
+genblitter.exe h &gt;..\..\blitfunc.h
+genblitter.exe t &gt;..\..\blittable.c
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/genblitter_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\Debug/genblitter_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting blitter files</Message>
+      <Command>del ..\..\blit.h
+del ..\..\blitfunc.c
+del ..\..\blitfunc.h
+del ..\..\blittable.c
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/genblitter.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating blitter files</Message>
+      <Command>genblitter.exe i &gt;..\..\blit.h
+genblitter.exe f &gt;..\..\blitfunc.c
+genblitter.exe h &gt;..\..\blitfunc.h
+genblitter.exe t &gt;..\..\blittable.c
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/genblitter_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/genblitter_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting blitter files</Message>
+      <Command>del ..\..\blit.h
+del ..\..\blitfunc.c
+del ..\..\blitfunc.h
+del ..\..\blittable.c
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/genblitter.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating blitter files</Message>
+      <Command>genblitter.exe i &gt;..\..\blit.h
+genblitter.exe f &gt;..\..\blitfunc.c
+genblitter.exe h &gt;..\..\blitfunc.h
+genblitter.exe t &gt;..\..\blittable.c
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/genblitter_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/genblitter_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting blitter files</Message>
+      <Command>del ..\..\blit.h
+del ..\..\blitfunc.c
+del ..\..\blitfunc.h
+del ..\..\blittable.c
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/genblitter.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating blitter files</Message>
+      <Command>genblitter.exe i &gt;..\..\blit.h
+genblitter.exe f &gt;..\..\blitfunc.c
+genblitter.exe h &gt;..\..\blitfunc.h
+genblitter.exe t &gt;..\..\blittable.c
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\blitops.c" />
+    <ClCompile Include="..\..\genblitter.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters
new file mode 100644 (file)
index 0000000..8789c57
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4ac60c7e-24cc-4a5e-96b9-0495bbc92ee6}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\blitops.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\genblitter.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj
new file mode 100644 (file)
index 0000000..a5dc813
--- /dev/null
@@ -0,0 +1,252 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FullRelease|Win32">
+      <Configuration>FullRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="TestRelease|Win32">
+      <Configuration>TestRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>gencomp</ProjectName>
+    <ProjectGUID>{54197DFF-9CAA-4A9F-B9C2-2881EA04EACB}</ProjectGUID>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <UseOfAtl>false</UseOfAtl>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gencomp</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gencomp</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">gencomp</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">gencomp</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/gencomp_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/gencomp_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/gencomp.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencomp files</Message>
+      <Command>cd ..\..
+od-win32\gencomp_msvc\gencomp.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/gencomp_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/gencomp_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/gencomp.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencomp files</Message>
+      <Command>cd ..\..
+od-win32\gencomp_msvc\gencomp.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/gencomp_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/gencomp_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/gencomp.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencomp files</Message>
+      <Command>cd ..\..
+od-win32\gencomp_msvc\gencomp.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/gencomp_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/gencomp_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/gencomp.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencomp files</Message>
+      <Command>cd ..\..
+od-win32\gencomp_msvc\gencomp.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\cpudefs.c" />
+    <ClCompile Include="..\..\jit\gencomp.c" />
+    <ClCompile Include="..\..\missing.c" />
+    <ClCompile Include="..\..\readcpu.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters
new file mode 100644 (file)
index 0000000..01ff745
--- /dev/null
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{d5d3910b-2ecf-47a9-9de5-e584e3872e8f}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\cpudefs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jit\gencomp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\missing.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\readcpu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj
new file mode 100644 (file)
index 0000000..48b8fe7
--- /dev/null
@@ -0,0 +1,277 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FullRelease|Win32">
+      <Configuration>FullRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="TestRelease|Win32">
+      <Configuration>TestRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>gencpu</ProjectName>
+    <ProjectGUID>{DEF7ACF7-050E-4069-BB99-5B5D93F60521}</ProjectGUID>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gencpu</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gencpu</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">gencpu</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">gencpu</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/gencpu_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;__STDC__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Debug/gencpu_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting gencpu files</Message>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/gencpu.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencpu files</Message>
+      <Command>cd ..\..
+od-win32\gencpu_msvc\gencpu.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/gencpu_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/gencpu_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting gencpu files</Message>
+      <Command>del ..\..\cputbl.h
+del ..\..\cpustbl.c
+del ..\..\cpuemu.c
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/gencpu.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencpu files</Message>
+      <Command>cd ..\..
+od-win32\gencpu_msvc\gencpu.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/gencpu_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/gencpu_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting gencpu files</Message>
+      <Command>del ..\..\cputbl.h
+del ..\..\cpustbl.c
+del ..\..\cpuemu.c
+</Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/gencpu.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencpu files</Message>
+      <Command>cd ..\..
+od-win32\gencpu_msvc\gencpu.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/gencpu_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/gencpu_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>Default</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <PreLinkEvent>
+      <Message>deleting gencpu files</Message>
+      <Command>
+      </Command>
+    </PreLinkEvent>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ProgramDatabaseFile>.\Release/gencpu.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating gencpu files</Message>
+      <Command>cd ..\..
+od-win32\gencpu_msvc\gencpu.exe
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\cpudefs.c" />
+    <ClCompile Include="..\..\gencpu.c" />
+    <ClCompile Include="..\..\missing.c" />
+    <ClCompile Include="..\..\readcpu.c" />
+    <ClCompile Include="..\unicode.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters
new file mode 100644 (file)
index 0000000..0f0dfbe
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{716280c1-4e3f-408c-966e-614a25731317}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\cpudefs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gencpu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\missing.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\readcpu.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\unicode.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj
new file mode 100644 (file)
index 0000000..d5f31ab
--- /dev/null
@@ -0,0 +1,153 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FullRelease|Win32">
+      <Configuration>FullRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>genlinetoscr</ProjectName>
+    <ProjectGUID>{E9F73E11-A463-45C6-A733-2BED75852BA1}</ProjectGUID>
+    <RootNamespace>genlinetoscr_msvc</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">genlinetoscr</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    </OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">genlinetoscr</TargetName>
+    <TargetExt Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">.exe</TargetExt>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>deleteing linetoscr.c</Message>
+      <Command>del ..\..\linetoscr.c</Command>
+    </PreLinkEvent>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating linetoscr.c</Message>
+      <Command>genlinetoscr.exe &gt;..\..\linetoscr.c</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <PreLinkEvent>
+      <Message>deleteing linetoscr.c</Message>
+      <Command>del ..\..\linetoscr.c</Command>
+    </PreLinkEvent>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <PostBuildEvent>
+      <Message>generating linetoscr.c</Message>
+      <Command>genlinetoscr.exe &gt;..\..\linetoscr.c</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\genlinetoscr.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj.filters b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj.filters
new file mode 100644 (file)
index 0000000..7f375d7
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\genlinetoscr.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/resources/d/resource b/od-win32/resources/d/resource
deleted file mode 100644 (file)
index 2c83455..0000000
+++ /dev/null
@@ -1,1003 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by winuae.rc
-//
-#define IDS_KICKSTART                   1
-#define IDS_DISK                        2
-#define IDS_DISPLAY                     3
-#define IDC_HARDDRIVE_IMAGE             3
-#define IDS_HARDDISK                    4
-#define IDS_FLOPPY                      5
-#define IDS_ABOUT                       6
-#define IDS_LOADSAVE                    7
-#define IDS_AVIOUTPUT                   8
-#define IDS_PORTS                       9
-#define IDS_MISC1                       10
-#define IDS_MEMORY                      11
-#define IDS_CPU                         12
-#define IDS_CHIPSET                     13
-#define IDS_INPUT                       14
-#define IDS_OPENGL                      15
-#define IDS_FILTER                      15
-#define IDS_MISC2                       16
-#define IDS_PATHS                       17
-#define IDS_QUICKSTART                  18
-#define IDS_FRONTEND                    19
-#define IDS_CHIPSET2                    20
-#define IDS_EXTTEXT                     100
-#define IDS_EXTACTUAL                   101
-#define IDS_SOUND                       102
-#define IDS_CDROM                       103
-#define IDS_FRAMERATE                   104
-#define IDS_SECOND                      105
-#define IDS_THIRD                       106
-#define IDD_KICKSTART                   107
-#define IDS_FOURTH                      107
-#define IDD_DISPLAY                     108
-#define IDS_FIFTH                       108
-#define IDD_MEMORY                      109
-#define IDS_SIXTH                       109
-#define IDD_FLOPPY                      110
-#define IDS_SEVENTH                     110
-#define IDD_CPU                         111
-#define IDS_EIGHTH                      111
-#define IDD_ABOUT                       112
-#define IDS_NINTH                       112
-#define IDD_HARDDISK                    113
-#define IDS_TENTH                       113
-#define IDS_SELECTADF                   114
-#define IDS_ADF                         115
-#define IDS_CHOOSEBLANK                 116
-#define IDS_SELECTHDF                   117
-#define IDS_HDF                         118
-#define IDS_SELECTUAE                   119
-#define IDS_UAE                         120
-#define IDS_SELECTROM                   121
-#define IDD_SOUND                       122
-#define IDS_ROM                         122
-#define IDI_APPICON                     123
-#define IDS_SELECTKEY                   123
-#define IDI_CPU                         124
-#define IDS_KEY                         124
-#define IDI_ABOUT                       125
-#define IDS_SELECTINFO                  125
-#define IDS_NONE                        126
-#define IDS_VOLUME                      127
-#define IDI_HARDDISK                    128
-#define IDS_PATH                        128
-#define IDS_RW                          129
-#define IDI_SOUND                       130
-#define IDS_SECTORS                     130
-#define IDS_SURFACES                    131
-#define IDS_RESERVED                    132
-#define IDS_BLOCKSIZE                   133
-#define IDI_FLOPPY                      134
-#define IDS_NAME                        134
-#define IDD_LOADSAVE                    135
-#define IDS_DESCRIPTION                 135
-#define IDS_ONEINSTANCE                 136
-#define IDI_PORTS                       137
-#define IDS_INSTALLDIRECTX              137
-#define IDD_PORTS                       138
-#define IDS_REGKEYCREATEFAILED          138
-#define IDS_COULDNOTLOADCONFIG          139
-#define IDD_CONTRIBUTORS                140
-#define IDS_NOHELP                      140
-#define IDD_MISC1                       141
-#define IDS_MUSTSELECTCONFIG            141
-#define IDD_HARDFILE                    142
-#define IDS_NOAGA                       142
-#define IDD_FILESYS                     143
-#define IDS_INVALIDCOMPORT              143
-#define IDS_WSOCK2NEEDED                144
-#define IDD_MISC2                       144
-#define IDS_UNSUPPORTEDPIXELFORMAT      145
-#define IDS_WAVEOUTOPENFAILURE          146
-#define IDS_MUSTENTERNAME               147
-#define IDS_MUSTSELECTCONFIGFORDELETE   148
-#define IDS_DELETECONFIGCONFIRMATION    149
-#define IDI_MISC1                       150
-#define IDS_DELETECONFIGTITLE           150
-#define IDC_MYHAND                      151
-#define IDS_GFXCARDCHECK                151
-#define IDD_DIALOG1                     152
-#define IDS_GFXCARDTITLE                152
-#define IDD_DEBUGGER                    152
-#define IDD_SETINFO                     153
-#define IDS_MUSTSELECTPATH              153
-#define IDI_ICON1                       153
-#define IDS_SETTINGSERROR               154
-#define IDD_CHIPSET                     154
-#define IDS_MUSTSELECTNAME              155
-#define IDI_MOVE_UP                     155
-#define IDD_CHIPSET2                    155
-#define IDS_MUSTSELECTFILE              156
-#define IDI_MOVE_DOWN                   156
-#define IDS_FAILEDHARDFILECREATION      157
-#define IDD_AVIOUTPUT                   157
-#define IDS_CREATIONERROR               158
-#define IDI_AVIOUTPUT                   158
-#define IDS_ERRORTITLE                  159
-#define IDS_SELECTFILESYSROOT           160
-#define IDD_OPENGL                      160
-#define IDD_FILTER                      160
-#define IDS_DEFAULTMIDIOUT              161
-#define IDS_DEFAULTMIDIIN               162
-#define IDS_CONTRIBUTORS1               163
-#define IDD_HARDDRIVE                   163
-#define IDS_CONTRIBUTORS2               164
-#define IDS_INVALIDPRTPORT              165
-#define IDS_SELECTUSS                   166
-#define IDS_RESTOREUSS                  166
-#define IDS_USS                         167
-#define IDS_WRONGOSVERSION              168
-#define IDR_DRIVE_STARTUP_A500_1        168
-#define IDS_SELECTFLASH                 169
-#define IDR_DRIVE_CLICK_A500_1          169
-#define IDS_FLASH                       170
-#define IDR_DRIVE_SPIN_A500_1           170
-#define IDD_INPUT                       171
-#define IDS_INPUTHOSTWIDGET             171
-#define IDI_INPUT                       172
-#define IDS_INPUTAMIGAEVENT             172
-#define IDD_DISK                        172
-#define IDS_INPUTAUTOFIRE               173
-#define IDS_SAVEUSS                     174
-#define IDS_MIDIOVERFLOW                175
-#define IDS_HFDSIZE                     176
-#define IDS_DEVICE                      177
-#define IDS_BOOTPRI                     178
-#define IDS_WRONGDXVERSION              179
-#define IDI_MISC2                       180
-#define IDS_FLOPPY_COMPATIBLE           180
-#define IDR_DRIVE_SNATCH_A500_1         181
-#define IDS_FLOPPY_TURBO                181
-#define IDI_DISK                        182
-#define IDR_DRIVE_SPINND_A500_1         182
-#define IDS_YES                         182
-#define IDD_PANEL                       183
-#define IDS_NO                          183
-#define IDD_PATHS                       184
-#define IDS_PRI_ABOVENORMAL             184
-#define IDI_CONFIGFILE                  185
-#define IDD_QUICKSTART                  185
-#define IDS_PRI_NORMAL                  185
-#define IDM_SYSTRAY                     186
-#define IDS_PRI_BELOWNORMAL             186
-#define IDS_PRI_LOW                     187
-#define IDI_FOLDER                      188
-#define IDS_OLDRTGLIBRARY               188
-#define IDS_DEFAULT_AF2005              189
-#define IDI_DISPLAY                     190
-#define IDS_DEFAULT_AF                  190
-#define IDS_DEFAULT_WINUAE              191
-#define IDI_ROOT                        192
-#define IDS_INP                         192
-#define IDS_RESTOREINP                  193
-#define IDI_ICON2                       194
-#define IDI_MEMORY                      194
-#define IDS_SAVEINP                     194
-#define IDS_SCREEN_WINDOWED             195
-#define IDS_SCREEN_FULLSCREEN           196
-#define IDS_SCREEN_FULLWINDOW           197
-#define IDS_SCREEN_VSYNC                198
-#define IDS_SOUND_MONO                  200
-#define IDS_SOUND_MIXED                 201
-#define IDI_QUICKSTART                  201
-#define IDS_SOUND_STEREO                202
-#define IDS_SOUND_INTERPOL_DISABLED     203
-#define IDS_DISABLED                    203
-#define IDS_SOUND_INTERPOL_RH           204
-#define IDI_PATHS                       204
-#define IDS_SOUND_INTERPOL_CRUX         205
-#define IDS_SOUND_FILTER_OFF            206
-#define IDS_SOUND_FILTER_EMULATED       207
-#define IDS_SOUND_FILTER_EMULATED_E     208
-#define IDS_INPUT_COMPATIBILITY         209
-#define IDS_INPUT_CUSTOM                210
-#define IDS_INPUT_COPY_DEFAULT          211
-#define IDS_INPUT_COPY_CUSTOM           212
-#define IDS_3D_NO_FILTER                213
-#define IDS_3D_BILINEAR                 214
-#define IDS_VSYNC_DEFAULT               215
-#define IDS_DRIVESOUND_NONE             216
-#define IDS_DRIVESOUND_DEFAULT_A500     217
-#define IDS_AVIOUTPUT_NOCODEC           218
-#define IDS_DISK_IMAGENAME              219
-#define IDS_DISK_DRIVENAME              220
-#define IDS_AGA8BIT                     221
-#define IDS_UNSUPPORTEDSCREENMODE       222
-#define IDS_UNSUPPORTEDSCREENMODE_1     223
-#define IDS_UNSUPPORTEDSCREENMODE_2     224
-#define IDS_UNSUPPORTEDSCREENMODE_3     225
-#define IDS_UNSUPPORTEDSCREENMODE_4     226
-#define IDS_FLOPPYTYPE35DD              227
-#define IDS_FLOPPYTYPE35HD              228
-#define IDS_FLOPPYTYPE525SD             229
-#define IDS_FLOPPYTYPEDISABLED          230
-#define IDS_STMENUNOFLOPPY              231
-#define IDS_TREEVIEW_HARDWARE           232
-#define IDS_TREEVIEW_HOST               233
-#define IDS_TREEVIEW_MISC               234
-#define IDS_TREEVIEW_SETTINGS           235
-#define IDS_WINUAETITLE_MMB             236
-#define IDS_WINUAETITLE_NORMAL          237
-#define IDS_STARTEMULATION              238
-#define IDS_TREEVIEW_ABOUT              239
-#define IDS_NOHARDDRIVES                240
-#define IDS_DEFAULT_HOST                241
-#define IDS_SOUND_4CHANNEL              242
-#define IDS_HF_FS_CUSTOM                243
-#define IDS_SELECTFS                    244
-#define IDS_KEYJOY                      245
-#define IDB_XARCADE                     246
-#define IDS_STATEFILE_UNCOMPRESSED      246
-#define IDS_STATEFILE_RAMDUMP           247
-#define IDS_STATEFILE_WAVE              248
-#define IDD_FRONTEND                    249
-#define IDS_SOUND_SWAP_PAULA            249
-#define IDS_SOUND_SWAP_AHI              250
-#define IDD_PROGRESSBAR                 250
-#define IDS_SOUND_SWAP_BOTH             251
-#define IDD_STRINGBOX                   251
-#define IDB_BITMAP1                     252
-#define IDB_LCD160X43                   252
-#define IDS_SOUND_FILTER_ON_AGA         252
-#define IDS_SOUND_FILTER_ON             253
-#define IDS_SOUND_FILTER_ON_A500        253
-#define IDS_DRIVESOUND_PC_FLOPPY        254
-#define IDS_FLOPPYTYPE35DDESCOM         255
-#define IDS_SOUND_STEREO2               256
-#define IDS_INPUT_CUSTOMEVENT           257
-#define IDS_DEFAULT_NEWWINUAE           258
-#define IDS_SOUND_CLONED51              259
-#define IDS_SOUND_51                    260
-#define IDS_AUTOMATIC                   261
-#define IDS_NUMSG_NEEDEXT2              300
-#define IDS_NUMSG_NOROMKEY              301
-#define IDS_NUMSG_KSROMCRCERROR         302
-#define IDS_NUMSG_KSROMREADERROR        303
-#define IDS_NUMSG_NOEXTROM              304
-#define IDS_NUMSG_MODRIP_NOTFOUND       305
-#define IDS_NUMSG_MODRIP_FINISHED       306
-#define IDS_NUMSG_MODRIP_SAVE           307
-#define IDS_NUMSG_KS68020               308
-#define IDS_NUMSG_ROMNEED               309
-#define IDS_NUMSG_NOZLIB                310
-#define IDS_NUMSG_STATEHD               311
-#define IDS_NUMSG_NOCAPS                312
-#define IDS_NUMSG_OLDCAPS               313
-#define IDS_IMGCHK_BOOTBLOCKCRCERROR    314
-#define IDS_IMGCHK_BOOTBLOCKNO          315
-#define IDS_IMGCHK_DAMAGED              316
-#define IDS_IMGCHK_KS2                  317
-#define IDS_IMGCHK_KS3                  318
-#define IDS_ROMSCANEND                  319
-#define IDS_ROM_AVAILABLE               320
-#define IDS_ROM_UNAVAILABLE             321
-#define IDS_HARDDRIVESAFETYWARNING1     322
-#define IDS_NUMSG_KS68EC020             323
-#define IDS_ROMSCANNOROMS               324
-#define IDS_NUMSG_KICKREP               325
-#define IDS_NUMSG_KICKREPNO             326
-#define IDS_NUMSG_NOROM                 327
-#define IDS_HDCLONE_OK                  328
-#define IDS_HDCLONE_FAIL                329
-#define IDR_DBGACCEL                    330
-#define IDS_NUMSG_KS68030               331
-#define IDS_NUMSG_EXPROMNEED            332
-#define IDS_HARDDRIVESAFETYWARNING2     333
-#define IDM_DBGCONTEXTMENU              334
-#define IDS_SB_FAVORITENAME             334
-#define IDD_DBGMEMINPUT                 335
-#define IDS_SB_CUSTOMEVENT              335
-#define IDS_QS_MODELS                   1000
-#define IDS_QS_MODEL_A500               1001
-#define IDS_QS_MODEL_A500P              1002
-#define IDS_QS_MODEL_A600               1003
-#define IDS_QS_MODEL_A1000              1004
-#define IDS_QS_MODEL_A1200              1005
-#define IDS_QS_MODEL_CD32               1006
-#define IDS_QS_MODEL_CDTV               1007
-#define IDS_QS_MODEL_UAE                1008
-#define IDS_QS_MODEL_ARCADIA            1009
-#define IDS_QS_MODEL_A3000              1010
-#define IDS_QS_MODEL_A4000              1011
-#define IDS_QS_MODEL_A4000T             1012
-#define IDC_RESOLUTION                  1021
-#define IDC_SERIAL                      1022
-#define IDC_REFRESHRATE                 1022
-#define IDC_ILLEGAL                     1023
-#define IDC_MIDILIST                    1023
-#define IDC_MIDIOUTLIST                 1023
-#define IDC_DA_MODE                     1023
-#define IDC_SHOWGUI                     1024
-#define IDC_MIDIINLIST                  1024
-#define IDC_RESOLUTION2                 1024
-#define IDC_DISPLAYSELECT               1024
-#define IDC_AUTOCONFIG                  1025
-#define IDC_PRINTERLIST                 1025
-#define IDC_RESOLUTION3                 1025
-#define IDC_RESOLUTIONDEPTH             1025
-#define IDC_CHIPMEM                     1026
-#define IDC_CREATELOGFILE               1026
-#define IDC_PORT0_JOYS                  1026
-#define IDC_SCREENMODE_NATIVE           1026
-#define IDC_FASTMEM                     1027
-#define IDC_SHOWLEDS                    1027
-#define IDC_PORT1_JOYS                  1027
-#define IDC_SCREENMODE_RTG              1027
-#define IDC_MBMEM1                      1028
-#define IDC_SLOWMEM                     1030
-#define IDC_MBMEM2                      1031
-#define IDC_PARALLEL                    1033
-#define IDC_JULIAN                      1040
-#define IDC_FASTTEXT                    1043
-#define IDC_FASTRAM                     1044
-#define IDC_CHIPRAM                     1045
-#define IDC_SLOWRAM                     1046
-#define IDC_Z3TEXT                      1047
-#define IDC_Z3FASTRAM                   1048
-#define IDC_Z3FASTMEM                   1049
-#define IDC_MBRAM1                      1050
-#define IDC_MBRAM2                      1051
-#define IDC_UAEHOME                     1070
-#define IDC_PICASSOHOME                 1071
-#define IDC_AMIGAHOME                   1072
-#define IDC_WINUAEHOME                  1073
-#define IDC_AIABHOME                    1074
-#define IDC_CLOANTOHOME                 1075
-#define IDC_THEROOTS                    1076
-#define IDC_CAPS                        1077
-#define IDC_ABIME                       1078
-#define IDC_AMIGASYS                    1079
-#define IDC_AMIKIT                      1080
-#define IDC_RICHEDIT1                   1091
-#define IDC_RICHEDIT2                   1092
-#define IDC_CONTRIBUTORS                1124
-#define IDC_ASPECT                      1170
-#define IDC_BLIT32                      1173
-#define IDC_BLITIMM                     1174
-#define IDC_LORES                       1176
-#define IDC_LORES_SMOOTHED              1179
-#define IDC_FRAMERATE                   1185
-#define IDC_RATETEXT                    1186
-#define IDC_XSIZE                       1187
-#define IDC_YSIZE                       1188
-#define IDC_INPUTAUTOFIRERATE           1188
-#define IDC_LM_NORMAL                   1189
-#define IDC_INPUTSPEEDD                 1189
-#define IDC_LM_DOUBLED                  1190
-#define IDC_INPUTSPEEDA                 1190
-#define IDC_GFXCARDTEXT                 1191
-#define IDC_LM_SCANLINES                1191
-#define IDC_INPUTSPEEDM                 1191
-#define IDC_P96RAM                      1192
-#define IDC_P96MEM                      1193
-#define IDC_DA_SLIDER                   1193
-#define IDC_FRAMERATE2                  1194
-#define IDC_RATE2TEXT                   1195
-#define IDC_CPU0                        1200
-#define IDC_CPU1                        1201
-#define IDC_CPU2                        1202
-#define IDC_CPU3                        1203
-#define IDC_CPU4                        1204
-#define IDC_CPU5                        1205
-#define IDC_CS_HOST                     1209
-#define IDC_CS_68000                    1210
-#define IDC_CS_ADJUSTABLE               1211
-#define IDC_CS_CPU_TEXT                 1212
-#define IDC_CS_CHIPSET_TEXT             1213
-#define IDC_COMPATIBLE                  1214
-#define IDC_TRUST0                      1215
-#define IDC_TRUST1                      1216
-#define IDC_CACHE                       1218
-#define IDC_CYCLEEXACT                  1219
-#define IDC_CS_CPU_TEXT2                1219
-#define IDC_CPUIDLE                     1220
-#define IDC_GENLOCK                     1220
-#define IDC_COMPATIBLE_FPU              1221
-#define IDC_FASTERRTG                   1221
-#define IDC_COMPATIBLE24                1222
-#define IDC_SPEED                       1223
-#define IDC_FPU0                        1224
-#define IDC_FPU1                        1225
-#define IDC_FPU2                        1226
-#define IDC_FPU3                        1227
-#define IDC_SOUNDSETTINGS               1229
-#define IDC_8BIT                        1230
-#define IDC_16BIT                       1231
-#define IDC_11KHZ                       1232
-#define IDC_22KHZ                       1233
-#define IDC_44KHZ                       1234
-#define IDC_48KHZ                       1235
-#define IDC_SOUNDSIZE                   1236
-#define IDC_FREQUENCY                   1237
-#define IDC_SOUND0                      1238
-#define IDC_SOUND1                      1239
-#define IDC_SOUND2                      1240
-#define IDC_SOUND3                      1241
-#define IDC_SOUNDSTYLE                  1242
-#define IDC_SOUNDSTYLE0                 1243
-#define IDC_STEREO                      1244
-#define IDC_SOUNDSTYLE1                 1245
-#define IDC_SOUNDINTERPOLATION          1248
-#define IDC_INTERPOLATION0              1249
-#define IDC_INTERPOLATION1              1250
-#define IDC_INTERPOLATION2              1251
-#define IDC_STEREOMODE                  1252
-#define IDC_SOUNDINTERPOLATION2         1252
-#define IDC_STEREOMODE0                 1253
-#define IDC_STEREOMODE1                 1254
-#define IDC_STEREOMODE2                 1255
-#define IDC_SOUNDINTERPOLATION3         1256
-#define IDC_DF0TEXT                     1270
-#define IDC_DF1TEXT                     1271
-#define IDC_DF2TEXT                     1272
-#define IDC_DF3TEXT                     1273
-#define IDC_EJECT0                      1274
-#define IDC_EJECT1                      1275
-#define IDC_EJECT2                      1276
-#define IDC_EJECT3                      1277
-#define IDC_DF0                         1278
-#define IDC_DF1                         1279
-#define IDC_DF2                         1280
-#define IDC_DF3                         1281
-#define IDC_CREATE                      1282
-#define IDC_CREATE_RAW                  1283
-#define IDC_SNAPSHOTNAME                1284
-#define IDC_SNAPSHOT                    1285
-#define IDC_SAVEIMAGE0                  1285
-#define IDC_DOSAVESTATE                 1286
-#define IDC_SAVEIMAGE1                  1286
-#define IDC_DOLOADSTATE                 1287
-#define IDC_SAVEIMAGE2                  1287
-#define IDC_PROWIZARD                   1288
-#define IDC_SAVEIMAGE3                  1288
-#define IDC_PORT0_JOYSC                 1302
-#define IDC_PORT0_KBDA                  1303
-#define IDC_PORT0_KBDB                  1304
-#define IDC_PORT0_KBDC                  1305
-#define IDC_PORT0_KBDD                  1306
-#define IDC_PORT0_KBDE                  1307
-#define IDC_PORT1_JOYSC                 1308
-#define IDC_PORT1_KBDA                  1309
-#define IDC_PORT1_KBDB                  1310
-#define IDC_PORT1_KBDC                  1311
-#define IDC_PORT1_KBDD                  1312
-#define IDC_PORT1_KBDE                  1313
-#define IDC_MIDIFRAME                   1314
-#define IDC_SERPARFRAME                 1315
-#define IDC_SERIALFRAME                 1316
-#define IDC_EDIT                        1334
-#define IDC_REMOVE                      1335
-#define IDC_VOLUMELIST                  1336
-#define IDC_UP                          1337
-#define IDC_DOWN                        1338
-#define IDC_NEW_FS                      1339
-#define IDC_NEW_HF                      1340
-#define IDC_NEW_HD                      1341
-#define IDC_PORT0                       1342
-#define IDC_NEW_FSARCH                  1342
-#define IDC_PORT1                       1343
-#define IDC_PATH_NAME                   1362
-#define IDC_SELECTOR                    1363
-#define IDC_VOLUME_NAME                 1364
-#define IDC_HARDFILE_DEVICE             1364
-#define IDC_SECTORS                     1365
-#define IDC_VOLUME_DEVICE               1365
-#define IDC_HEADS                       1366
-#define IDC_RESERVED                    1367
-#define IDC_BLOCKSIZE                   1368
-#define IDC_HARDFILE_BOOTPRI            1369
-#define IDC_SECTORS_TEXT                1370
-#define IDC_SURFACES_TEXT               1371
-#define IDC_RESERVED_TEXT               1372
-#define IDC_RESERVED_TEXT2              1373
-#define IDC_BLOCKSIZE_TEXT              1374
-#define ID_OK                           1375
-#define IDC_HARDFILE_BOOTPRI_TEXT       1375
-#define IDC_PATH_FILESYS                1376
-#define IDC_HARDFILE_DIR_TEXT           1377
-#define IDC_HARDFILE_DEVICE_TEXT        1378
-#define IDC_HFRDB                       1380
-#define IDC_RDB                         1380
-#define IDC_HARDFILE_FILESYS_TEXT       1380
-#define IDC_FS_AUTOBOOT                 1380
-#define IDC_FILESYS_SELECTOR            1381
-#define IDC_HDF_AUTOBOOT                1382
-#define IDC_HDF_DONOTMOUNT              1383
-#define IDC_ROMFILE                     1390
-#define IDC_KEYFILE                     1391
-#define IDC_KICKCHOOSER                 1392
-#define IDC_KEYCHOOSER                  1393
-#define IDC_ROMFILE2                    1394
-#define IDC_ROMCHOOSER2                 1395
-#define IDC_FLASHCHOOSER                1396
-#define IDC_FLASHFILE                   1397
-#define IDC_CARTFILE                    1398
-#define IDC_CARTCHOOSER                 1399
-#define IDC_SAVE                        1400
-#define IDC_LOAD                        1401
-#define IDC_DELETE                      1403
-#define IDC_CONFIGLIST                  1404
-#define IDC_EDITNAME                    1405
-#define IDC_EDITDESCRIPTION             1406
-#define IDC_QUICKSAVE                   1408
-#define IDC_QUICKLOAD                   1409
-#define IDC_EXIT                        1410
-#define IDC_EDITPATH                    1410
-#define IDC_HDF_RDB                     1500
-#define IDC_HFSIZE                      1501
-#define IDC_HF_SIZE                     1501
-#define IDC_LINEMODE                    1502
-#define IDC_CREATEHF                    1502
-#define IDC_HF_CREATE                   1502
-#define IDC_SOCKETS                     1503
-#define IDC_HF_DOSTYPE                  1503
-#define IDC_HDF_CONTROLLER              1504
-#define IDC_RESETAMIGA                  1504
-#define IDC_QUITEMU                     1505
-#define IDC_MAPDRIVES                   1507
-#define IDC_CPUTEXT                     1508
-#define IDC_MAPDRIVES_NET               1508
-#define IDC_RESTARTEMU                  1508
-#define IDC_SWAP                        1509
-#define IDC_CACHETEXT                   1509
-#define IDC_MAPDRIVES_CD                1509
-#define IDC_SELECTRESTEXT               1510
-#define IDC_FLUSHPRINTER                1510
-#define IDC_SCREENRESTEXT               1511
-#define IDC_MAPDRIVES_AUTO              1511
-#define IDC_WIDTHTEXT                   1512
-#define IDC_WINDOWEDTEXT                1512
-#define IDC_HEIGHTTEXT                  1513
-#define IDC_SETTINGSTEXT                1514
-#define IDC_REFRESHTEXT                 1515
-#define IDC_SETTINGSTEXT2               1515
-#define IDC_DISABLE1                    1516
-#define IDC_DF1WP                       1516
-#define IDC_QUICKSTART_COMPA            1516
-#define IDC_REFRESH2TEXT                1516
-#define IDC_DISABLE2                    1517
-#define IDC_DF2WP                       1517
-#define IDC_QUICKSTART_DF               1517
-#define IDC_DISABLE3                    1518
-#define IDC_XCENTER                     1518
-#define IDC_DF3WP                       1518
-#define IDC_DF1WP2                      1518
-#define IDC_QUICKSTART_HOST             1518
-#define IDC_YCENTER                     1519
-#define IDC_DISABLE0                    1519
-#define IDC_DF0WP                       1519
-#define IDC_OCS                         1520
-#define IDC_HDFLOPPY                    1520
-#define IDC_ECS_AGNUS                   1521
-#define IDC_ECS_DENISE                  1522
-#define IDC_ECS                         1523
-#define IDC_AGA                         1524
-#define IDC_NTSC                        1525
-#define IDC_NOSPEED                     1527
-#define IDC_NOSOUND                     1528
-#define IDC_INACTIVE_NOSOUND            1528
-#define IDC_MIDI                        1529
-#define IDC_NOSPEEDPAUSE                1529
-#define IDC_INACTIVE_PAUSE              1529
-#define IDC_KICKSHIFTER                 1530
-#define IDC_MIDI2                       1530
-#define IDC_HIGHPRIORITY                1530
-#define IDC_MINIMIZED_NOSOUND           1530
-#define IDC_MINIMIZED_PAUSE             1531
-#define IDC_STATE_CAPTURE               1532
-#define IDC_KBLED_USB                   1533
-#define IDC_SER_SHARED                  1553
-#define IDC_SER_CTSRTS                  1554
-#define IDC_SER_DIRECT                  1555
-#define IDC_PSPRINTER                   1556
-#define IDC_PSPRINTERDETECT             1557
-#define IDC_UAESERIAL                   1558
-#define IDC_VIEWINFO                    1568
-#define IDC_SETINFO                     1569
-#define IDC_FLOPPYSLIDER                1570
-#define IDC_FLOPPYSLIDERTEXT            1571
-#define IDC_FLOPPYSPEED                 1572
-#define IDC_FLOPPYSPD                   1572
-#define IDC_GUILANGUAGE_LIST            1573
-#define IDC_SOUNDBUFFERRAM              1574
-#define IDC_SOUNDADJUST                 1575
-#define IDC_SOUNDBUFFERTEXT             1576
-#define IDC_SOUNDVOLUME                 1576
-#define IDC_SOUNDBUFFERMEM              1577
-#define IDC_HARDFLUSH                   1578
-#define IDC_SOUNDADJUSTNUM              1578
-#define IDC_CONSTJUMP                   1579
-#define IDC_SOUNDDRIVEVOLUME            1579
-#define IDC_JITFPU                      1580
-#define IDC_SOUNDVOLUME2                1580
-#define IDC_NOFLAGS                     1581
-#define IDC_SOUNDDRIVEVOLUME2           1581
-#define IDC_CS_CACHE_TEXT               1582
-#define IDC_COLLISIONS                  1584
-#define IDC_JITENABLE                   1584
-#define IDC_DISASSEMBLY                 1585
-#define IDC_CTRLF11                     1586
-#define IDC_FASTCOPPER                  1588
-#define IDC_COLLISION0                  1589
-#define IDC_COLLISION1                  1590
-#define IDC_AUDIOSYNC                   1590
-#define IDC_COLLISION2                  1591
-#define IDC_COLLISION3                  1592
-#define IDC_SOUNDLAGSLIDER              1592
-#define IDC_SOUNDLAGCAPTION             1594
-#define IDC_FLOPPYTYPE                  1594
-#define IDC_SYNCPARAMS                  1595
-#define IDC_DF0TYPE                     1595
-#define IDC_SOUNDLAGTEXT                1596
-#define IDC_DF1TYPE                     1596
-#define IDC_DF2TYPE                     1597
-#define IDC_SOUNDSPEEDSLIDER            1598
-#define IDC_DF0TYPE4                    1598
-#define IDC_DF3TYPE                     1598
-#define IDC_SOUNDSPEEDTEXT              1599
-#define IDC_SOUNDSPEEDCAPTION           1600
-#define IDC_RTGMATCHDEPTH               1601
-#define IDC_ROMFILE2TEXT                1602
-#define IDC_ROMTEXT                     1603
-#define IDC_KEYTEXT                     1604
-#define IDC_CD32                        1605
-#define IDC_AKIKOC2P                    1605
-#define IDC_FLASHTEXT                   1605
-#define IDC_SCSIDEVICE                  1606
-#define IDC_FLASHTEXT2                  1606
-#define IDC_AVIOUTPUT_PAL               1607
-#define IDC_INPUTTYPE                   1607
-#define IDC_AVIOUTPUT_NTSC              1608
-#define IDC_INPUTSELECTTEXT             1608
-#define IDC_NOUAEFSDB                   1608
-#define IDC_NOTASKBARBUTTON             1608
-#define IDC_CLOCKSYNC                   1609
-#define IDC_AVIOUTPUT_FPS               1609
-#define IDC_INPUTDEVICE                 1609
-#define IDC_MAPROM                      1609
-#define IDC_NORECYCLEBIN                1609
-#define IDC_AVIOUTPUT_FILETEXT          1610
-#define IDC_INPUTDEVICETEXT             1610
-#define IDC_ALWAYSONTOP                 1610
-#define IDC_AVIOUTPUT_FILE              1611
-#define IDC_INPUTLIST                   1611
-#define IDC_CATWEASEL                   1611
-#define IDC_AVIOUTPUT_FPS_STATIC        1612
-#define IDC_INPUTAMIGA                  1612
-#define IDC_ALWAYSONTOP2                1612
-#define IDC_BORDERLESS                  1612
-#define IDC_POWERSAVE                   1612
-#define IDC_AVIOUTPUT_VIDEO             1613
-#define IDC_INPUTAUTOFIRE               1613
-#define IDC_MOUSETRICK                  1613
-#define IDC_AVIOUTPUT_AUDIO             1614
-#define IDC_INPUTCOPYFROM               1614
-#define IDC_SANA2                       1614
-#define IDC_AVIOUTPUT_VIDEO_CODEC       1615
-#define IDC_INPUTDEVICEDISABLE          1615
-#define IDC_AVIOUTPUT_ACTIVATED         1615
-#define IDC_FILTERENABLE                1615
-#define IDC_AVIOUTPUT_AUDIO_CODEC       1616
-#define IDC_INPUTAMIGACNT               1616
-#define IDC_FILTERHZ                    1616
-#define IDC_SAMPLERIPPER_ACTIVATED      1616
-#define IDC_AVIOUTPUT_BORDER_TRIM       1617
-#define IDC_FILTERVZ                    1617
-#define IDC_INPREC_RECORD               1617
-#define IDC_AVIOUTPUT_AUDIO_STATIC      1618
-#define IDC_FILTERHO                    1618
-#define IDC_AVIOUTPUT_VIDEO_STATIC      1619
-#define IDC_FILTERVO                    1619
-#define IDC_AVIOUTPUT_8BIT              1620
-#define IDC_INPREC_PLAY                 1620
-#define IDC_FILTERASPECT                1620
-#define IDC_AVIOUTPUT_24BIT             1621
-#define IDC_AVIOUTPUT_WIDTH             1622
-#define IDC_AVIOUTPUT_HEIGHT            1623
-#define IDC_AVIOUTPUT_FRAME             1624
-#define IDC_FILTERXL                    1624
-#define IDC_FILTERSLR                   1625
-#define IDC_FILTERHZMULT                1626
-#define IDC_FILTERMODE                  1627
-#define IDC_FILTERFILTER                1628
-#define IDC_FILTERDEFAULT               1629
-#define IDC_FILTERXTRA                  1630
-#define IDC_INPUTDEADZONE               1630
-#define IDC_INPUTCOPY                   1631
-#define IDC_FILTERPRESETS               1631
-#define IDC_SCREENSHOT                  1632
-#define IDC_INPUTSWAP                   1632
-#define IDC_FILTERPRESETLOAD            1632
-#define IDC_FLOPPYSPDTEXT               1633
-#define IDC_FILTERPRESETSAVE            1633
-#define IDC_FLOPPYSPD_TEXT              1634
-#define IDC_FILTERPRESETDELETE          1634
-#define IDC_HARDDRIVE                   1635
-#define IDC_INACTIVE_PRI                1635
-#define IDC_FILTERVZMULT                1635
-#define IDC_SOUNDPRIMARY                1636
-#define IDC_MINIMIZED_PRI               1636
-#define IDC_VOLUME_BOOTPRI_TEXT         1637
-#define IDC_VOLUME_BOOTPRI              1638
-#define IDC_KBLED1                      1639
-#define IDC_KBLED2                      1640
-#define IDC_SOUNDFILTER                 1640
-#define IDC_KBLED3                      1641
-#define IDC_SOUNDCALIBRATE              1641
-#define IDC_ACTIVE_PRIORITY             1642
-#define IDC_SOUNDDRIVE                  1642
-#define IDC_INACTIVE_PRIORITY           1643
-#define IDC_ACTIVE_PRI                  1644
-#define IDC_MINIMIZED_PRIORITY          1645
-#define IDC_AVIOUTPUT_FRAMELIMITER      1645
-#define IDC_STATE_RATE                  1646
-#define IDC_INPREC_PLAYMODE             1646
-#define IDC_STATE_BUFFERSIZE            1647
-#define IDC_SOUNDDRIVESELECT            1647
-#define IDC_PANELTREE                   1647
-#define IDC_AVIOUTPUT_FRAMELIMITER2     1647
-#define IDC_AVIOUTPUT_NOSOUNDOUTPUT     1647
-#define IDC_AVIOUTPUT_DIMENSIONS_STATIC 1648
-#define IDC_STATE_BUFFERSIZE_TEXT       1648
-#define IDC_CONFIGTREE                  1648
-#define IDC_AVIOUTPUT_OPTIONS           1649
-#define IDC_STATE_RATE_TEXT             1649
-#define IDC_DISKLISTREMOVE              1649
-#define IDC_DF0QENABLE                  1649
-#define IDC_SOUNDCARD                   1650
-#define IDC_CS_SOUND0                   1650
-#define IDC_UPBM                        1650
-#define IDC_DISKLISTREMOVE2             1650
-#define IDC_DISKLISTINSERT              1650
-#define IDC_DF1QENABLE                  1650
-#define IDC_SOUNDCARDLIST               1651
-#define IDC_CS_SOUND1                   1651
-#define IDC_SOUNDFREQ                   1652
-#define IDC_CS_SOUND2                   1652
-#define IDC_SOUNDCARD2                  1653
-#define IDC_SOUNDFREQTXT                1653
-#define IDC_PANEL_FRAME                 1653
-#define IDC_SOUNDFILTERTXT              1654
-#define IDC_PANEL_FRAME_OUTER           1654
-#define IDC_SOUNDSTEREO                 1655
-#define IDC_CONFIGTYPE                  1655
-#define IDC_SOUNDDRIVETXT               1656
-#define IDC_PATHS_ROM                   1656
-#define IDC_SOUNDSTEREOSEP              1656
-#define IDC_SOUNDSTEREOTXT              1657
-#define IDC_PATHS_CONFIG                1657
-#define IDC_SOUNDINTERPOLATIONTXT       1658
-#define IDC_PATHS_SCREENSHOT            1658
-#define IDC_DISK                        1659
-#define IDC_DISKLIST                    1659
-#define IDC_PATHS_SAVEIMAGE             1659
-#define IDC_SOUNDSTEREOSEPTXT           1659
-#define IDC_PATHS_SAVESTATE             1660
-#define IDC_SOUNDSTEREOMIXTXT           1660
-#define IDC_PATHS_ROMS                  1661
-#define IDC_SOUNDSTEREOMIX              1661
-#define IDC_PATHS_CONFIGS               1662
-#define IDC_SOUNDSWAP                   1662
-#define IDC_PATHS_SCREENSHOTS           1663
-#define IDC_PATHS_SAVESTATES            1664
-#define IDC_SOUNDSTEREOSWAPTXT          1664
-#define IDC_SOUNDSWAPTXT                1664
-#define IDC_PATHS_SAVEIMAGES            1665
-#define IDC_PATHS_ROML                  1666
-#define IDC_PATHS_CONFIGL               1667
-#define IDC_PATHS_SCREENSHOTL           1668
-#define IDC_PATHS_STATEFILEL            1669
-#define IDC_PATHS_SAVEIMAGEL            1670
-#define IDC_PATHS_DEFAULT               1671
-#define IDC_ROM_RESCAN                  1672
-#define IDC_QUICKSTARTMODE              1673
-#define IDC_RESETREGISTRY               1673
-#define IDC_QUICKSTART_MODEL            1674
-#define IDC_PATHS_AVIOUTPUTL            1674
-#define IDC_QUICKSTART_CONFIGURATION    1675
-#define IDC_PATHS_AVIOUTPUT             1675
-#define IDC_QUICKSTART_COMPATIBILITY    1676
-#define IDC_PATHS_AVIOUTPUTS            1676
-#define IDC_QUICKSTART_CONFIG           1677
-#define IDC_RESETDISKHISTORY            1677
-#define IDC_DF0Q                        1678
-#define IDC_DF0QQ                       1678
-#define IDC_DF1Q                        1679
-#define IDC_QUICKSTART_HOSTCONFIG       1679
-#define IDC_DF1QQ                       1680
-#define IDC_QUICKSTART_SETCONFIG        1681
-#define IDC_CONFIGAUTO                  1682
-#define IDC_DF0TEXTQ                    1683
-#define IDC_CONFIGNOLINK                1683
-#define IDC_DF0WPQ                      1684
-#define IDC_EJECT0Q                     1685
-#define IDC_DF1WPQ                      1686
-#define IDC_EJECT1Q                     1687
-#define IDC_DF1TEXTQ                    1688
-#define IDC_FILTERXLV                   1692
-#define IDC_FILTERVOV                   1693
-#define IDC_FILTERHOV                   1694
-#define IDC_CONFIGLINK                  1694
-#define IDC_FILTERVZV                   1695
-#define IDC_PS_PARAMS                   1695
-#define IDC_FILTERHZV                   1696
-#define IDC_HF_TYPE                     1696
-#define IDC_PRINTERAUTOFLUSH            1697
-#define IDC_PRINTERAUTOFLUSHTXT         1698
-#define IDC_DISKTEXT                    1699
-#define IDC_FE_LIST                     1700
-#define IDC_FE_INFO                     1701
-#define IDC_FE_INFO2                    1702
-#define IDC_FE_SCREENSHOT               1702
-#define IDC_PATHS_DEFAULTTYPE           1704
-#define IDC_SCSIMODE                    1705
-#define IDC_PROGRESS1                   1705
-#define IDC_PROGRESSBAR                 1705
-#define IDC_PROGRESSBAR_TEXT            1706
-#define IDC_SCSIMODE2                   1706
-#define IDC_LANGUAGE                    1706
-#define IDC_CREATE_NAME                 1707
-#define IDC_FILTERAUTORES               1708
-#define IDC_SOUND_AUTO                  1709
-#define IDC_FILTERKEEPASPECT            1709
-#define IDC_CS_RTC                      1710
-#define IDC_CS_CIAA_TOD1                1711
-#define IDC_CS_CIAA_TOD2                1712
-#define IDC_CS_EXT                      1712
-#define IDC_CS_CIAA_TOD3                1713
-#define IDC_CS_COMPATIBLE               1714
-#define IDC_CS_RAMSEYREV                1715
-#define IDC_CS_KSMIRROR_E0              1716
-#define IDC_STRINGBOXEDIT               1716
-#define IDC_CS_CD32CD                   1717
-#define IDC_CS_CD32C2P                  1718
-#define IDC_CS_CD32NVRAM                1719
-#define IDC_CS_CDTVCD                   1720
-#define IDC_CS_CDTVRAM                  1721
-#define IDC_CS_IDE1                     1722
-#define IDC_CS_IDE2                     1723
-#define IDC_CS_IDE3                     1724
-#define IDC_CS_A1000RAM                 1724
-#define IDC_CS_RAMSEY                   1725
-#define IDC_CS_GARY                     1726
-#define IDC_CS_FATGARY                  1726
-#define IDC_CS_DMAC                     1727
-#define IDC_CS_RTCADJUST                1728
-#define IDC_CS_RAMSEYREV3               1729
-#define IDC_CS_FATGARYREV               1729
-#define IDC_CS_CDTVRAMEXP               1730
-#define IDC_CS_RTC1                     1731
-#define IDC_CS_RTC2                     1732
-#define IDC_CS_RTC3                     1733
-#define IDC_CS_IDE4                     1734
-#define IDC_CS_DF0IDHW                  1734
-#define IDC_CS_AGNUS                    1735
-#define IDC_CS_AGNUSREV                 1736
-#define IDC_CS_DENISE                   1737
-#define IDC_CS_AGNUSREV2                1738
-#define IDC_CS_DENISEREV                1738
-#define IDC_DBG_OUTPUT1                 1739
-#define IDC_CS_PCMCIA                   1739
-#define IDC_CS_SLOWISFAST               1740
-#define IDC_DBG_HELP                    1740
-#define IDC_DBG_INPUT                   1741
-#define IDC_CS_KSMIRROR_A8              1741
-#define IDC_DBG_DREG                    1742
-#define IDC_CS_CIAOVERLAY               1742
-#define IDC_DBG_AREG                    1743
-#define IDC_CS_RESETWARNING             1743
-#define IDC_DBG_CCR                     1744
-#define IDC_CS_NOEHB                    1744
-#define IDC_DBG_AMEM                    1745
-#define IDC_CS_BLITTERBUG               1745
-#define IDC_DBG_SP_VBR                  1746
-#define IDC_DBG_MMISC                   1747
-#define IDC_DBG_PC                      1748
-#define IDC_DBG_PREFETCH                1749
-#define IDC_DBG_FPREG                   1750
-#define IDC_DBG_FPSR                    1751
-#define IDC_DBG_OUTPUT2                 1752
-#define IDC_DBG_MEMINPUT                1753
-#define IDC_DBG_MEMDOWN                 1754
-#define IDC_DBG_MEMUP                   1755
-#define IDC_DBG_MEM                     1756
-#define IDC_DBG_DASM                    1757
-#define IDC_DBG_MEMDOWNFAST             1758
-#define IDC_DBG_MEMTOPC                 1759
-#define IDC_DBG_MEMUPFAST               1760
-#define IDC_DA_RESET                    1761
-#define IDC_DBG_STATUS                  1762
-#define IDC_DBG_BRKPTS                  1763
-#define IDC_DBG_MCUSTOM                 1764
-#define IDC_DBG_MISC                    1765
-#define IDC_DBG_CUSTOM                  1766
-#define IDC_DBG_MISCCPU                 1767
-#define IDC_CS_A2091                    1768
-#define IDC_CS_DMAC2                    1769
-#define IDC_CS_A4091                    1770
-#define IDC_CS_CDTVSCSI                 1771
-#define IDC_CS_SCSIMODE                 1772
-#define IDC_DF0ENABLE                   1773
-#define IDC_DF1ENABLE                   1774
-#define IDC_FS_SELECT_DIR               1774
-#define IDC_FS_SELECT_FILE              1775
-#define IDC_DF2ENABLE                   1776
-#define IDC_FS_SELECT_EJECT             1776
-#define IDC_FS_RW                       1777
-#define IDC_DF3ENABLE                   1778
-#define IDC_HDF_RW                      1778
-#define IDC_HDFINFO                     1779
-#define IDC_DBG_AUTOSET                 1780
-#define IDC_HF_SPARSE                   1780
-#define IDC_DBG_DASM2                   1781
-#define IDC_HF_DYNAMIC                  1781
-#define IDC_DBG_MEM2                    1782
-#define IDC_DBG_MEMINPUT2               1783
-#define IDC_DBG_ADDRINPUTTXT            1784
-#define IDC_RTG_SCALE                   1785
-#define IDC_RTG_MATCH_DEPTH             1786
-#define IDC_RTG_8BIT                    1787
-#define IDC_RTG_16BIT                   1788
-#define IDC_PATHS_CONFIGCACHE           1788
-#define IDC_RTG_24BIT                   1789
-#define IDC_ASSOCIATELIST               1789
-#define IDC_RTG_32BIT                   1790
-#define IDC_ASSOCIATE_OFF               1790
-#define IDC_DD_SURFACETYPE              1791
-#define IDC_RTG_SCALE_ALLOW             1791
-#define IDC_RTG_SCALE_ASPECTRATIO       1792
-#define IDC_ASSOCIATE_ON                1792
-#define IDC_RTG_VBLANKRATE              1793
-#define ID__FLOPPYDRIVES                40004
-#define ID_FLOPPYDRIVES_DF0             40005
-#define ID_ST_CONFIGURATION             40010
-#define ID_ST_HELP                      40011
-#define ID_ST_QUIT                      40012
-#define ID_ST_EJECTALL                  40013
-#define ID_ST_DF0                       40014
-#define ID_ST_DF1                       40015
-#define ID_ST_DF2                       40016
-#define ID_ST_DF3                       40017
-#define ID_ST_RESET                     40019
-#define ID_DBG_PAGE1                    40020
-#define ID_DBG_PAGE2                    40021
-#define ID_DBG_PAGE3                    40022
-#define ID_DBG_PAGE4                    40023
-#define ID_DBG_PAGE5                    40024
-#define ID_DBG_PAGE6                    40025
-#define ID_DBG_PAGE7                    40026
-#define ID_DBG_PAGE8                    40027
-#define ID_DBG_PAGE9                    40028
-#define ID_DBG_STEP_OVER                40029
-#define ID_DBG_STEP_INTO                40030
-#define ID_DBG_SETTOA0                  40031
-#define ID_DBG_SETTOA1                  40032
-#define ID_DBG_SETTOA2                  40033
-#define ID_DBG_SETTOA3                  40034
-#define ID_DBG_SETTOA4                  40035
-#define ID_DBG_SETTOA5                  40036
-#define ID_DBG_SETTOA6                  40037
-#define ID_DBG_SETTOA7                  40038
-#define ID_DBG_ENTERADDR                40039
-#define ID_DBG_COPYLBLINE               40040
-#define ID_DBG_COPYLB                   40041
-#define ID_DBG_TOGGLEBP                 40042
-#define ID_DBG_DELETEBPS                40043
-#define ID_DBG_SETTOPC                  40044
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        335
-#define _APS_NEXT_COMMAND_VALUE         40045
-#define _APS_NEXT_CONTROL_VALUE         1789
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/od-win32/resources/d/resource.h b/od-win32/resources/d/resource.h
deleted file mode 100644 (file)
index 357c325..0000000
+++ /dev/null
@@ -1,1006 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by winuae.rc
-//
-#define IDS_KICKSTART                   1
-#define IDS_DISK                        2
-#define IDS_DISPLAY                     3
-#define IDC_HARDDRIVE_IMAGE             3
-#define IDS_HARDDISK                    4
-#define IDS_FLOPPY                      5
-#define IDS_ABOUT                       6
-#define IDS_LOADSAVE                    7
-#define IDS_AVIOUTPUT                   8
-#define IDS_IOPORTS                     9
-#define IDS_MISC1                       10
-#define IDS_MEMORY                      11
-#define IDS_CPU                         12
-#define IDS_CHIPSET                     13
-#define IDS_INPUT                       14
-#define IDS_OPENGL                      15
-#define IDS_FILTER                      15
-#define IDS_MISC2                       16
-#define IDS_PATHS                       17
-#define IDS_QUICKSTART                  18
-#define IDS_FRONTEND                    19
-#define IDS_CHIPSET2                    20
-#define IDS_GAMEPORTS                   21
-#define IDS_EXTTEXT                     100
-#define IDS_EXTACTUAL                   101
-#define IDS_SOUND                       102
-#define IDS_CDROM                       103
-#define IDS_FRAMERATE                   104
-#define IDS_SECOND                      105
-#define IDS_THIRD                       106
-#define IDD_KICKSTART                   107
-#define IDS_FOURTH                      107
-#define IDD_DISPLAY                     108
-#define IDS_FIFTH                       108
-#define IDD_MEMORY                      109
-#define IDS_SIXTH                       109
-#define IDD_FLOPPY                      110
-#define IDS_SEVENTH                     110
-#define IDD_CPU                         111
-#define IDS_EIGHTH                      111
-#define IDD_ABOUT                       112
-#define IDS_NINTH                       112
-#define IDD_HARDDISK                    113
-#define IDS_TENTH                       113
-#define IDS_SELECTADF                   114
-#define IDS_ADF                         115
-#define IDS_CHOOSEBLANK                 116
-#define IDS_SELECTHDF                   117
-#define IDS_HDF                         118
-#define IDS_SELECTUAE                   119
-#define IDS_UAE                         120
-#define IDS_SELECTROM                   121
-#define IDD_SOUND                       122
-#define IDS_ROM                         122
-#define IDI_APPICON                     123
-#define IDS_SELECTKEY                   123
-#define IDI_CPU                         124
-#define IDS_KEY                         124
-#define IDI_ABOUT                       125
-#define IDS_SELECTINFO                  125
-#define IDS_NONE                        126
-#define IDS_VOLUME                      127
-#define IDI_HARDDISK                    128
-#define IDS_PATH                        128
-#define IDS_RW                          129
-#define IDI_SOUND                       130
-#define IDS_SECTORS                     130
-#define IDS_SURFACES                    131
-#define IDS_RESERVED                    132
-#define IDS_BLOCKSIZE                   133
-#define IDI_FLOPPY                      134
-#define IDS_NAME                        134
-#define IDD_LOADSAVE                    135
-#define IDS_DESCRIPTION                 135
-#define IDS_ONEINSTANCE                 136
-#define IDI_IOPORTS                     137
-#define IDS_INSTALLDIRECTX              137
-#define IDD_IOPORTS                     138
-#define IDS_REGKEYCREATEFAILED          138
-#define IDS_COULDNOTLOADCONFIG          139
-#define IDD_CONTRIBUTORS                140
-#define IDS_NOHELP                      140
-#define IDD_MISC1                       141
-#define IDS_MUSTSELECTCONFIG            141
-#define IDD_HARDFILE                    142
-#define IDS_NOAGA                       142
-#define IDD_FILESYS                     143
-#define IDS_INVALIDCOMPORT              143
-#define IDS_WSOCK2NEEDED                144
-#define IDD_MISC2                       144
-#define IDS_UNSUPPORTEDPIXELFORMAT      145
-#define IDS_WAVEOUTOPENFAILURE          146
-#define IDS_MUSTENTERNAME               147
-#define IDS_MUSTSELECTCONFIGFORDELETE   148
-#define IDS_DELETECONFIGCONFIRMATION    149
-#define IDI_MISC1                       150
-#define IDS_DELETECONFIGTITLE           150
-#define IDC_MYHAND                      151
-#define IDS_GFXCARDCHECK                151
-#define IDD_DIALOG1                     152
-#define IDS_GFXCARDTITLE                152
-#define IDD_DEBUGGER                    152
-#define IDD_SETINFO                     153
-#define IDS_MUSTSELECTPATH              153
-#define IDI_ICON1                       153
-#define IDS_SETTINGSERROR               154
-#define IDD_CHIPSET                     154
-#define IDS_MUSTSELECTNAME              155
-#define IDI_MOVE_UP                     155
-#define IDD_CHIPSET2                    155
-#define IDS_MUSTSELECTFILE              156
-#define IDI_MOVE_DOWN                   156
-#define IDS_FAILEDHARDFILECREATION      157
-#define IDD_AVIOUTPUT                   157
-#define IDS_CREATIONERROR               158
-#define IDI_AVIOUTPUT                   158
-#define IDS_ERRORTITLE                  159
-#define IDS_SELECTFILESYSROOT           160
-#define IDD_OPENGL                      160
-#define IDD_FILTER                      160
-#define IDS_DEFAULTMIDIOUT              161
-#define IDS_DEFAULTMIDIIN               162
-#define IDS_CONTRIBUTORS1               163
-#define IDD_HARDDRIVE                   163
-#define IDS_CONTRIBUTORS2               164
-#define IDS_INVALIDPRTPORT              165
-#define IDS_SELECTUSS                   166
-#define IDS_RESTOREUSS                  166
-#define IDS_USS                         167
-#define IDS_WRONGOSVERSION              168
-#define IDR_DRIVE_STARTUP_A500_1        168
-#define IDS_SELECTFLASH                 169
-#define IDR_DRIVE_CLICK_A500_1          169
-#define IDS_FLASH                       170
-#define IDR_DRIVE_SPIN_A500_1           170
-#define IDD_INPUT                       171
-#define IDS_INPUTHOSTWIDGET             171
-#define IDI_INPUT                       172
-#define IDS_INPUTAMIGAEVENT             172
-#define IDD_DISK                        172
-#define IDS_INPUTAUTOFIRE               173
-#define IDS_SAVEUSS                     174
-#define IDS_MIDIOVERFLOW                175
-#define IDS_HFDSIZE                     176
-#define IDS_DEVICE                      177
-#define IDS_BOOTPRI                     178
-#define IDS_WRONGDXVERSION              179
-#define IDI_MISC2                       180
-#define IDS_FLOPPY_COMPATIBLE           180
-#define IDR_DRIVE_SNATCH_A500_1         181
-#define IDS_FLOPPY_TURBO                181
-#define IDI_DISK                        182
-#define IDR_DRIVE_SPINND_A500_1         182
-#define IDS_YES                         182
-#define IDD_PANEL                       183
-#define IDS_NO                          183
-#define IDD_PATHS                       184
-#define IDS_PRI_ABOVENORMAL             184
-#define IDI_CONFIGFILE                  185
-#define IDD_QUICKSTART                  185
-#define IDS_PRI_NORMAL                  185
-#define IDM_SYSTRAY                     186
-#define IDS_PRI_BELOWNORMAL             186
-#define IDS_PRI_LOW                     187
-#define IDI_FOLDER                      188
-#define IDS_OLDRTGLIBRARY               188
-#define IDS_DEFAULT_AF2005              189
-#define IDI_DISPLAY                     190
-#define IDS_DEFAULT_AF                  190
-#define IDS_DEFAULT_WINUAE              191
-#define IDI_ROOT                        192
-#define IDS_INP                         192
-#define IDS_RESTOREINP                  193
-#define IDI_ICON2                       194
-#define IDI_MEMORY                      194
-#define IDS_SAVEINP                     194
-#define IDS_SCREEN_WINDOWED             195
-#define IDS_SCREEN_FULLSCREEN           196
-#define IDS_SCREEN_FULLWINDOW           197
-#define IDS_SCREEN_VSYNC                198
-#define IDS_SOUND_MONO                  200
-#define IDS_SOUND_MIXED                 201
-#define IDI_QUICKSTART                  201
-#define IDS_SOUND_STEREO                202
-#define IDS_SOUND_INTERPOL_DISABLED     203
-#define IDS_DISABLED                    203
-#define IDS_SOUND_INTERPOL_RH           204
-#define IDI_PATHS                       204
-#define IDS_SOUND_INTERPOL_CRUX         205
-#define IDS_SOUND_FILTER_OFF            206
-#define IDS_SOUND_FILTER_EMULATED       207
-#define IDS_SOUND_FILTER_EMULATED_E     208
-#define IDS_INPUT_COMPATIBILITY         209
-#define IDS_INPUT_CUSTOM                210
-#define IDS_INPUT_COPY_DEFAULT          211
-#define IDS_INPUT_COPY_CUSTOM           212
-#define IDS_3D_NO_FILTER                213
-#define IDS_3D_BILINEAR                 214
-#define IDS_VSYNC_DEFAULT               215
-#define IDS_DRIVESOUND_NONE             216
-#define IDS_DRIVESOUND_DEFAULT_A500     217
-#define IDS_AVIOUTPUT_NOCODEC           218
-#define IDS_DISK_IMAGENAME              219
-#define IDS_DISK_DRIVENAME              220
-#define IDS_AGA8BIT                     221
-#define IDS_UNSUPPORTEDSCREENMODE       222
-#define IDS_UNSUPPORTEDSCREENMODE_1     223
-#define IDS_UNSUPPORTEDSCREENMODE_2     224
-#define IDS_UNSUPPORTEDSCREENMODE_3     225
-#define IDS_UNSUPPORTEDSCREENMODE_4     226
-#define IDS_FLOPPYTYPE35DD              227
-#define IDS_FLOPPYTYPE35HD              228
-#define IDS_FLOPPYTYPE525SD             229
-#define IDS_FLOPPYTYPEDISABLED          230
-#define IDS_STMENUNOFLOPPY              231
-#define IDS_TREEVIEW_HARDWARE           232
-#define IDS_TREEVIEW_HOST               233
-#define IDS_TREEVIEW_MISC               234
-#define IDS_TREEVIEW_SETTINGS           235
-#define IDS_WINUAETITLE_MMB             236
-#define IDS_WINUAETITLE_NORMAL          237
-#define IDS_STARTEMULATION              238
-#define IDS_TREEVIEW_ABOUT              239
-#define IDS_NOHARDDRIVES                240
-#define IDS_DEFAULT_HOST                241
-#define IDS_SOUND_4CHANNEL              242
-#define IDS_HF_FS_CUSTOM                243
-#define IDS_SELECTFS                    244
-#define IDS_KEYJOY                      245
-#define IDB_XARCADE                     246
-#define IDS_STATEFILE_UNCOMPRESSED      246
-#define IDS_STATEFILE_RAMDUMP           247
-#define IDS_STATEFILE_WAVE              248
-#define IDD_FRONTEND                    249
-#define IDS_SOUND_SWAP_PAULA            249
-#define IDS_SOUND_SWAP_AHI              250
-#define IDD_PROGRESSBAR                 250
-#define IDS_SOUND_SWAP_BOTH             251
-#define IDD_STRINGBOX                   251
-#define IDB_BITMAP1                     252
-#define IDB_LCD160X43                   252
-#define IDS_SOUND_FILTER_ON_AGA         252
-#define IDS_SOUND_FILTER_ON             253
-#define IDS_SOUND_FILTER_ON_A500        253
-#define IDS_DRIVESOUND_PC_FLOPPY        254
-#define IDS_FLOPPYTYPE35DDESCOM         255
-#define IDS_SOUND_STEREO2               256
-#define IDS_INPUT_CUSTOMEVENT           257
-#define IDS_DEFAULT_NEWWINUAE           258
-#define IDS_SOUND_CLONED51              259
-#define IDS_SOUND_51                    260
-#define IDS_AUTOMATIC                   261
-#define IDI_GAMEPORTS                   262
-#define IDD_GAMEPORTS                   263
-#define IDS_NUMSG_NEEDEXT2              300
-#define IDS_NUMSG_NOROMKEY              301
-#define IDS_NUMSG_KSROMCRCERROR         302
-#define IDS_NUMSG_KSROMREADERROR        303
-#define IDS_NUMSG_NOEXTROM              304
-#define IDS_NUMSG_MODRIP_NOTFOUND       305
-#define IDS_NUMSG_MODRIP_FINISHED       306
-#define IDS_NUMSG_MODRIP_SAVE           307
-#define IDS_NUMSG_KS68020               308
-#define IDS_NUMSG_ROMNEED               309
-#define IDS_NUMSG_NOZLIB                310
-#define IDS_NUMSG_STATEHD               311
-#define IDS_NUMSG_NOCAPS                312
-#define IDS_NUMSG_OLDCAPS               313
-#define IDS_IMGCHK_BOOTBLOCKCRCERROR    314
-#define IDS_IMGCHK_BOOTBLOCKNO          315
-#define IDS_IMGCHK_DAMAGED              316
-#define IDS_IMGCHK_KS2                  317
-#define IDS_IMGCHK_KS3                  318
-#define IDS_ROMSCANEND                  319
-#define IDS_ROM_AVAILABLE               320
-#define IDS_ROM_UNAVAILABLE             321
-#define IDS_HARDDRIVESAFETYWARNING1     322
-#define IDS_NUMSG_KS68EC020             323
-#define IDS_ROMSCANNOROMS               324
-#define IDS_NUMSG_KICKREP               325
-#define IDS_NUMSG_KICKREPNO             326
-#define IDS_NUMSG_NOROM                 327
-#define IDS_HDCLONE_OK                  328
-#define IDS_HDCLONE_FAIL                329
-#define IDR_DBGACCEL                    330
-#define IDS_NUMSG_KS68030               331
-#define IDS_NUMSG_EXPROMNEED            332
-#define IDS_HARDDRIVESAFETYWARNING2     333
-#define IDM_DBGCONTEXTMENU              334
-#define IDS_SB_FAVORITENAME             334
-#define IDD_DBGMEMINPUT                 335
-#define IDS_SB_CUSTOMEVENT              335
-#define IDS_QS_MODELS                   1000
-#define IDS_QS_MODEL_A500               1001
-#define IDS_QS_MODEL_A500P              1002
-#define IDS_QS_MODEL_A600               1003
-#define IDS_QS_MODEL_A1000              1004
-#define IDS_QS_MODEL_A1200              1005
-#define IDS_QS_MODEL_CD32               1006
-#define IDS_QS_MODEL_CDTV               1007
-#define IDS_QS_MODEL_UAE                1008
-#define IDS_QS_MODEL_ARCADIA            1009
-#define IDS_QS_MODEL_A3000              1010
-#define IDS_QS_MODEL_A4000              1011
-#define IDS_QS_MODEL_A4000T             1012
-#define IDC_RESOLUTION                  1021
-#define IDC_SERIAL                      1022
-#define IDC_REFRESHRATE                 1022
-#define IDC_ILLEGAL                     1023
-#define IDC_MIDILIST                    1023
-#define IDC_MIDIOUTLIST                 1023
-#define IDC_DA_MODE                     1023
-#define IDC_SHOWGUI                     1024
-#define IDC_MIDIINLIST                  1024
-#define IDC_RESOLUTION2                 1024
-#define IDC_DISPLAYSELECT               1024
-#define IDC_AUTOCONFIG                  1025
-#define IDC_PRINTERLIST                 1025
-#define IDC_RESOLUTION3                 1025
-#define IDC_RESOLUTIONDEPTH             1025
-#define IDC_CHIPMEM                     1026
-#define IDC_CREATELOGFILE               1026
-#define IDC_PORT0_JOYS                  1026
-#define IDC_SCREENMODE_NATIVE           1026
-#define IDC_FASTMEM                     1027
-#define IDC_SHOWLEDS                    1027
-#define IDC_PORT1_JOYS                  1027
-#define IDC_SCREENMODE_RTG              1027
-#define IDC_MBMEM1                      1028
-#define IDC_SLOWMEM                     1030
-#define IDC_MBMEM2                      1031
-#define IDC_PARALLEL                    1033
-#define IDC_JULIAN                      1040
-#define IDC_FASTTEXT                    1043
-#define IDC_FASTRAM                     1044
-#define IDC_CHIPRAM                     1045
-#define IDC_SLOWRAM                     1046
-#define IDC_Z3TEXT                      1047
-#define IDC_Z3FASTRAM                   1048
-#define IDC_Z3FASTMEM                   1049
-#define IDC_MBRAM1                      1050
-#define IDC_MBRAM2                      1051
-#define IDC_UAEHOME                     1070
-#define IDC_PICASSOHOME                 1071
-#define IDC_AMIGAHOME                   1072
-#define IDC_WINUAEHOME                  1073
-#define IDC_AIABHOME                    1074
-#define IDC_CLOANTOHOME                 1075
-#define IDC_THEROOTS                    1076
-#define IDC_CAPS                        1077
-#define IDC_ABIME                       1078
-#define IDC_AMIGASYS                    1079
-#define IDC_AMIKIT                      1080
-#define IDC_RICHEDIT1                   1091
-#define IDC_RICHEDIT2                   1092
-#define IDC_CONTRIBUTORS                1124
-#define IDC_ASPECT                      1170
-#define IDC_BLIT32                      1173
-#define IDC_BLITIMM                     1174
-#define IDC_LORES                       1176
-#define IDC_LORES_SMOOTHED              1179
-#define IDC_FRAMERATE                   1185
-#define IDC_RATETEXT                    1186
-#define IDC_XSIZE                       1187
-#define IDC_YSIZE                       1188
-#define IDC_INPUTAUTOFIRERATE           1188
-#define IDC_LM_NORMAL                   1189
-#define IDC_INPUTSPEEDD                 1189
-#define IDC_LM_DOUBLED                  1190
-#define IDC_INPUTSPEEDA                 1190
-#define IDC_GFXCARDTEXT                 1191
-#define IDC_LM_SCANLINES                1191
-#define IDC_INPUTSPEEDM                 1191
-#define IDC_P96RAM                      1192
-#define IDC_P96MEM                      1193
-#define IDC_DA_SLIDER                   1193
-#define IDC_FRAMERATE2                  1194
-#define IDC_RATE2TEXT                   1195
-#define IDC_CPU0                        1200
-#define IDC_CPU1                        1201
-#define IDC_CPU2                        1202
-#define IDC_CPU3                        1203
-#define IDC_CPU4                        1204
-#define IDC_CPU5                        1205
-#define IDC_CS_HOST                     1209
-#define IDC_CS_68000                    1210
-#define IDC_CS_ADJUSTABLE               1211
-#define IDC_CS_CPU_TEXT                 1212
-#define IDC_CS_CHIPSET_TEXT             1213
-#define IDC_COMPATIBLE                  1214
-#define IDC_TRUST0                      1215
-#define IDC_TRUST1                      1216
-#define IDC_CACHE                       1218
-#define IDC_CYCLEEXACT                  1219
-#define IDC_CS_CPU_TEXT2                1219
-#define IDC_CPUIDLE                     1220
-#define IDC_GENLOCK                     1220
-#define IDC_COMPATIBLE_FPU              1221
-#define IDC_FASTERRTG                   1221
-#define IDC_COMPATIBLE24                1222
-#define IDC_SPEED                       1223
-#define IDC_FPU0                        1224
-#define IDC_FPU1                        1225
-#define IDC_FPU2                        1226
-#define IDC_FPU3                        1227
-#define IDC_SOUNDSETTINGS               1229
-#define IDC_8BIT                        1230
-#define IDC_16BIT                       1231
-#define IDC_11KHZ                       1232
-#define IDC_22KHZ                       1233
-#define IDC_44KHZ                       1234
-#define IDC_48KHZ                       1235
-#define IDC_SOUNDSIZE                   1236
-#define IDC_FREQUENCY                   1237
-#define IDC_SOUND0                      1238
-#define IDC_SOUND1                      1239
-#define IDC_SOUND2                      1240
-#define IDC_SOUND3                      1241
-#define IDC_SOUNDSTYLE                  1242
-#define IDC_SOUNDSTYLE0                 1243
-#define IDC_STEREO                      1244
-#define IDC_SOUNDSTYLE1                 1245
-#define IDC_SOUNDINTERPOLATION          1248
-#define IDC_INTERPOLATION0              1249
-#define IDC_INTERPOLATION1              1250
-#define IDC_INTERPOLATION2              1251
-#define IDC_STEREOMODE                  1252
-#define IDC_SOUNDINTERPOLATION2         1252
-#define IDC_STEREOMODE0                 1253
-#define IDC_STEREOMODE1                 1254
-#define IDC_STEREOMODE2                 1255
-#define IDC_SOUNDINTERPOLATION3         1256
-#define IDC_DF0TEXT                     1270
-#define IDC_DF1TEXT                     1271
-#define IDC_DF2TEXT                     1272
-#define IDC_DF3TEXT                     1273
-#define IDC_EJECT0                      1274
-#define IDC_EJECT1                      1275
-#define IDC_EJECT2                      1276
-#define IDC_EJECT3                      1277
-#define IDC_DF0                         1278
-#define IDC_DF1                         1279
-#define IDC_DF2                         1280
-#define IDC_DF3                         1281
-#define IDC_CREATE                      1282
-#define IDC_CREATE_RAW                  1283
-#define IDC_SNAPSHOTNAME                1284
-#define IDC_SNAPSHOT                    1285
-#define IDC_SAVEIMAGE0                  1285
-#define IDC_DOSAVESTATE                 1286
-#define IDC_SAVEIMAGE1                  1286
-#define IDC_DOLOADSTATE                 1287
-#define IDC_SAVEIMAGE2                  1287
-#define IDC_PROWIZARD                   1288
-#define IDC_SAVEIMAGE3                  1288
-#define IDC_PORT0_JOYSC                 1302
-#define IDC_PORT0_KBDA                  1303
-#define IDC_PORT0_KBDB                  1304
-#define IDC_PORT0_KBDC                  1305
-#define IDC_PORT0_KBDD                  1306
-#define IDC_PORT0_KBDE                  1307
-#define IDC_PORT1_JOYSC                 1308
-#define IDC_PORT1_KBDA                  1309
-#define IDC_PORT1_KBDB                  1310
-#define IDC_PORT1_KBDC                  1311
-#define IDC_PORT1_KBDD                  1312
-#define IDC_PORT1_KBDE                  1313
-#define IDC_MIDIFRAME                   1314
-#define IDC_SERPARFRAME                 1315
-#define IDC_SERIALFRAME                 1316
-#define IDC_EDIT                        1334
-#define IDC_REMOVE                      1335
-#define IDC_VOLUMELIST                  1336
-#define IDC_UP                          1337
-#define IDC_DOWN                        1338
-#define IDC_NEW_FS                      1339
-#define IDC_NEW_HF                      1340
-#define IDC_NEW_HD                      1341
-#define IDC_PORT0                       1342
-#define IDC_NEW_FSARCH                  1342
-#define IDC_PORT1                       1343
-#define IDC_PATH_NAME                   1362
-#define IDC_SELECTOR                    1363
-#define IDC_VOLUME_NAME                 1364
-#define IDC_HARDFILE_DEVICE             1364
-#define IDC_SECTORS                     1365
-#define IDC_VOLUME_DEVICE               1365
-#define IDC_HEADS                       1366
-#define IDC_RESERVED                    1367
-#define IDC_BLOCKSIZE                   1368
-#define IDC_HARDFILE_BOOTPRI            1369
-#define IDC_SECTORS_TEXT                1370
-#define IDC_SURFACES_TEXT               1371
-#define IDC_RESERVED_TEXT               1372
-#define IDC_RESERVED_TEXT2              1373
-#define IDC_BLOCKSIZE_TEXT              1374
-#define ID_OK                           1375
-#define IDC_HARDFILE_BOOTPRI_TEXT       1375
-#define IDC_PATH_FILESYS                1376
-#define IDC_HARDFILE_DIR_TEXT           1377
-#define IDC_HARDFILE_DEVICE_TEXT        1378
-#define IDC_HFRDB                       1380
-#define IDC_RDB                         1380
-#define IDC_HARDFILE_FILESYS_TEXT       1380
-#define IDC_FS_AUTOBOOT                 1380
-#define IDC_FILESYS_SELECTOR            1381
-#define IDC_HDF_AUTOBOOT                1382
-#define IDC_HDF_DONOTMOUNT              1383
-#define IDC_ROMFILE                     1390
-#define IDC_KEYFILE                     1391
-#define IDC_KICKCHOOSER                 1392
-#define IDC_KEYCHOOSER                  1393
-#define IDC_ROMFILE2                    1394
-#define IDC_ROMCHOOSER2                 1395
-#define IDC_FLASHCHOOSER                1396
-#define IDC_FLASHFILE                   1397
-#define IDC_CARTFILE                    1398
-#define IDC_CARTCHOOSER                 1399
-#define IDC_SAVE                        1400
-#define IDC_LOAD                        1401
-#define IDC_DELETE                      1403
-#define IDC_CONFIGLIST                  1404
-#define IDC_EDITNAME                    1405
-#define IDC_EDITDESCRIPTION             1406
-#define IDC_QUICKSAVE                   1408
-#define IDC_QUICKLOAD                   1409
-#define IDC_EXIT                        1410
-#define IDC_EDITPATH                    1410
-#define IDC_HDF_RDB                     1500
-#define IDC_HFSIZE                      1501
-#define IDC_HF_SIZE                     1501
-#define IDC_LINEMODE                    1502
-#define IDC_CREATEHF                    1502
-#define IDC_HF_CREATE                   1502
-#define IDC_SOCKETS                     1503
-#define IDC_HF_DOSTYPE                  1503
-#define IDC_HDF_CONTROLLER              1504
-#define IDC_RESETAMIGA                  1504
-#define IDC_QUITEMU                     1505
-#define IDC_MAPDRIVES                   1507
-#define IDC_CPUTEXT                     1508
-#define IDC_MAPDRIVES_NET               1508
-#define IDC_RESTARTEMU                  1508
-#define IDC_SWAP                        1509
-#define IDC_CACHETEXT                   1509
-#define IDC_MAPDRIVES_CD                1509
-#define IDC_SELECTRESTEXT               1510
-#define IDC_FLUSHPRINTER                1510
-#define IDC_SCREENRESTEXT               1511
-#define IDC_MAPDRIVES_AUTO              1511
-#define IDC_WIDTHTEXT                   1512
-#define IDC_WINDOWEDTEXT                1512
-#define IDC_HEIGHTTEXT                  1513
-#define IDC_SETTINGSTEXT                1514
-#define IDC_REFRESHTEXT                 1515
-#define IDC_SETTINGSTEXT2               1515
-#define IDC_DISABLE1                    1516
-#define IDC_DF1WP                       1516
-#define IDC_QUICKSTART_COMPA            1516
-#define IDC_REFRESH2TEXT                1516
-#define IDC_DISABLE2                    1517
-#define IDC_DF2WP                       1517
-#define IDC_QUICKSTART_DF               1517
-#define IDC_DISABLE3                    1518
-#define IDC_XCENTER                     1518
-#define IDC_DF3WP                       1518
-#define IDC_DF1WP2                      1518
-#define IDC_QUICKSTART_HOST             1518
-#define IDC_YCENTER                     1519
-#define IDC_DISABLE0                    1519
-#define IDC_DF0WP                       1519
-#define IDC_OCS                         1520
-#define IDC_HDFLOPPY                    1520
-#define IDC_ECS_AGNUS                   1521
-#define IDC_ECS_DENISE                  1522
-#define IDC_ECS                         1523
-#define IDC_AGA                         1524
-#define IDC_NTSC                        1525
-#define IDC_NOSPEED                     1527
-#define IDC_NOSOUND                     1528
-#define IDC_INACTIVE_NOSOUND            1528
-#define IDC_MIDI                        1529
-#define IDC_NOSPEEDPAUSE                1529
-#define IDC_INACTIVE_PAUSE              1529
-#define IDC_KICKSHIFTER                 1530
-#define IDC_MIDI2                       1530
-#define IDC_HIGHPRIORITY                1530
-#define IDC_MINIMIZED_NOSOUND           1530
-#define IDC_MINIMIZED_PAUSE             1531
-#define IDC_STATE_CAPTURE               1532
-#define IDC_KBLED_USB                   1533
-#define IDC_SER_SHARED                  1553
-#define IDC_SER_CTSRTS                  1554
-#define IDC_SER_DIRECT                  1555
-#define IDC_PSPRINTER                   1556
-#define IDC_PSPRINTERDETECT             1557
-#define IDC_UAESERIAL                   1558
-#define IDC_VIEWINFO                    1568
-#define IDC_SETINFO                     1569
-#define IDC_FLOPPYSLIDER                1570
-#define IDC_FLOPPYSLIDERTEXT            1571
-#define IDC_FLOPPYSPEED                 1572
-#define IDC_FLOPPYSPD                   1572
-#define IDC_GUILANGUAGE_LIST            1573
-#define IDC_SOUNDBUFFERRAM              1574
-#define IDC_SOUNDADJUST                 1575
-#define IDC_SOUNDBUFFERTEXT             1576
-#define IDC_SOUNDVOLUME                 1576
-#define IDC_SOUNDBUFFERMEM              1577
-#define IDC_HARDFLUSH                   1578
-#define IDC_SOUNDADJUSTNUM              1578
-#define IDC_CONSTJUMP                   1579
-#define IDC_SOUNDDRIVEVOLUME            1579
-#define IDC_JITFPU                      1580
-#define IDC_SOUNDVOLUME2                1580
-#define IDC_NOFLAGS                     1581
-#define IDC_SOUNDDRIVEVOLUME2           1581
-#define IDC_CS_CACHE_TEXT               1582
-#define IDC_COLLISIONS                  1584
-#define IDC_JITENABLE                   1584
-#define IDC_DISASSEMBLY                 1585
-#define IDC_CTRLF11                     1586
-#define IDC_FASTCOPPER                  1588
-#define IDC_COLLISION0                  1589
-#define IDC_COLLISION1                  1590
-#define IDC_AUDIOSYNC                   1590
-#define IDC_COLLISION2                  1591
-#define IDC_COLLISION3                  1592
-#define IDC_SOUNDLAGSLIDER              1592
-#define IDC_SOUNDLAGCAPTION             1594
-#define IDC_FLOPPYTYPE                  1594
-#define IDC_SYNCPARAMS                  1595
-#define IDC_DF0TYPE                     1595
-#define IDC_SOUNDLAGTEXT                1596
-#define IDC_DF1TYPE                     1596
-#define IDC_DF2TYPE                     1597
-#define IDC_SOUNDSPEEDSLIDER            1598
-#define IDC_DF0TYPE4                    1598
-#define IDC_DF3TYPE                     1598
-#define IDC_SOUNDSPEEDTEXT              1599
-#define IDC_SOUNDSPEEDCAPTION           1600
-#define IDC_RTGMATCHDEPTH               1601
-#define IDC_ROMFILE2TEXT                1602
-#define IDC_ROMTEXT                     1603
-#define IDC_KEYTEXT                     1604
-#define IDC_CD32                        1605
-#define IDC_AKIKOC2P                    1605
-#define IDC_FLASHTEXT                   1605
-#define IDC_SCSIDEVICE                  1606
-#define IDC_FLASHTEXT2                  1606
-#define IDC_AVIOUTPUT_PAL               1607
-#define IDC_INPUTTYPE                   1607
-#define IDC_AVIOUTPUT_NTSC              1608
-#define IDC_INPUTSELECTTEXT             1608
-#define IDC_NOUAEFSDB                   1608
-#define IDC_NOTASKBARBUTTON             1608
-#define IDC_CLOCKSYNC                   1609
-#define IDC_AVIOUTPUT_FPS               1609
-#define IDC_INPUTDEVICE                 1609
-#define IDC_MAPROM                      1609
-#define IDC_NORECYCLEBIN                1609
-#define IDC_AVIOUTPUT_FILETEXT          1610
-#define IDC_INPUTDEVICETEXT             1610
-#define IDC_ALWAYSONTOP                 1610
-#define IDC_AVIOUTPUT_FILE              1611
-#define IDC_INPUTLIST                   1611
-#define IDC_CATWEASEL                   1611
-#define IDC_AVIOUTPUT_FPS_STATIC        1612
-#define IDC_INPUTAMIGA                  1612
-#define IDC_ALWAYSONTOP2                1612
-#define IDC_BORDERLESS                  1612
-#define IDC_POWERSAVE                   1612
-#define IDC_AVIOUTPUT_VIDEO             1613
-#define IDC_INPUTAUTOFIRE               1613
-#define IDC_MOUSETRICK                  1613
-#define IDC_AVIOUTPUT_AUDIO             1614
-#define IDC_INPUTCOPYFROM               1614
-#define IDC_SANA2                       1614
-#define IDC_AVIOUTPUT_VIDEO_CODEC       1615
-#define IDC_INPUTDEVICEDISABLE          1615
-#define IDC_AVIOUTPUT_ACTIVATED         1615
-#define IDC_FILTERENABLE                1615
-#define IDC_AVIOUTPUT_AUDIO_CODEC       1616
-#define IDC_INPUTAMIGACNT               1616
-#define IDC_FILTERHZ                    1616
-#define IDC_SAMPLERIPPER_ACTIVATED      1616
-#define IDC_AVIOUTPUT_BORDER_TRIM       1617
-#define IDC_FILTERVZ                    1617
-#define IDC_INPREC_RECORD               1617
-#define IDC_AVIOUTPUT_AUDIO_STATIC      1618
-#define IDC_FILTERHO                    1618
-#define IDC_AVIOUTPUT_VIDEO_STATIC      1619
-#define IDC_FILTERVO                    1619
-#define IDC_AVIOUTPUT_8BIT              1620
-#define IDC_INPREC_PLAY                 1620
-#define IDC_FILTERASPECT                1620
-#define IDC_AVIOUTPUT_24BIT             1621
-#define IDC_AVIOUTPUT_WIDTH             1622
-#define IDC_AVIOUTPUT_HEIGHT            1623
-#define IDC_AVIOUTPUT_FRAME             1624
-#define IDC_FILTERXL                    1624
-#define IDC_FILTERSLR                   1625
-#define IDC_FILTERHZMULT                1626
-#define IDC_FILTERMODE                  1627
-#define IDC_FILTERFILTER                1628
-#define IDC_FILTERDEFAULT               1629
-#define IDC_FILTERXTRA                  1630
-#define IDC_INPUTDEADZONE               1630
-#define IDC_INPUTCOPY                   1631
-#define IDC_FILTERPRESETS               1631
-#define IDC_SCREENSHOT                  1632
-#define IDC_INPUTSWAP                   1632
-#define IDC_FILTERPRESETLOAD            1632
-#define IDC_FLOPPYSPDTEXT               1633
-#define IDC_FILTERPRESETSAVE            1633
-#define IDC_FLOPPYSPD_TEXT              1634
-#define IDC_FILTERPRESETDELETE          1634
-#define IDC_HARDDRIVE                   1635
-#define IDC_INACTIVE_PRI                1635
-#define IDC_FILTERVZMULT                1635
-#define IDC_SOUNDPRIMARY                1636
-#define IDC_MINIMIZED_PRI               1636
-#define IDC_VOLUME_BOOTPRI_TEXT         1637
-#define IDC_VOLUME_BOOTPRI              1638
-#define IDC_KBLED1                      1639
-#define IDC_KBLED2                      1640
-#define IDC_SOUNDFILTER                 1640
-#define IDC_KBLED3                      1641
-#define IDC_SOUNDCALIBRATE              1641
-#define IDC_ACTIVE_PRIORITY             1642
-#define IDC_SOUNDDRIVE                  1642
-#define IDC_INACTIVE_PRIORITY           1643
-#define IDC_ACTIVE_PRI                  1644
-#define IDC_MINIMIZED_PRIORITY          1645
-#define IDC_AVIOUTPUT_FRAMELIMITER      1645
-#define IDC_STATE_RATE                  1646
-#define IDC_INPREC_PLAYMODE             1646
-#define IDC_STATE_BUFFERSIZE            1647
-#define IDC_SOUNDDRIVESELECT            1647
-#define IDC_PANELTREE                   1647
-#define IDC_AVIOUTPUT_FRAMELIMITER2     1647
-#define IDC_AVIOUTPUT_NOSOUNDOUTPUT     1647
-#define IDC_AVIOUTPUT_DIMENSIONS_STATIC 1648
-#define IDC_STATE_BUFFERSIZE_TEXT       1648
-#define IDC_CONFIGTREE                  1648
-#define IDC_AVIOUTPUT_OPTIONS           1649
-#define IDC_STATE_RATE_TEXT             1649
-#define IDC_DISKLISTREMOVE              1649
-#define IDC_DF0QENABLE                  1649
-#define IDC_SOUNDCARD                   1650
-#define IDC_CS_SOUND0                   1650
-#define IDC_UPBM                        1650
-#define IDC_DISKLISTREMOVE2             1650
-#define IDC_DISKLISTINSERT              1650
-#define IDC_DF1QENABLE                  1650
-#define IDC_SOUNDCARDLIST               1651
-#define IDC_CS_SOUND1                   1651
-#define IDC_SOUNDFREQ                   1652
-#define IDC_CS_SOUND2                   1652
-#define IDC_SOUNDCARD2                  1653
-#define IDC_SOUNDFREQTXT                1653
-#define IDC_PANEL_FRAME                 1653
-#define IDC_SOUNDFILTERTXT              1654
-#define IDC_PANEL_FRAME_OUTER           1654
-#define IDC_SOUNDSTEREO                 1655
-#define IDC_CONFIGTYPE                  1655
-#define IDC_SOUNDDRIVETXT               1656
-#define IDC_PATHS_ROM                   1656
-#define IDC_SOUNDSTEREOSEP              1656
-#define IDC_SOUNDSTEREOTXT              1657
-#define IDC_PATHS_CONFIG                1657
-#define IDC_SOUNDINTERPOLATIONTXT       1658
-#define IDC_PATHS_SCREENSHOT            1658
-#define IDC_DISK                        1659
-#define IDC_DISKLIST                    1659
-#define IDC_PATHS_SAVEIMAGE             1659
-#define IDC_SOUNDSTEREOSEPTXT           1659
-#define IDC_PATHS_SAVESTATE             1660
-#define IDC_SOUNDSTEREOMIXTXT           1660
-#define IDC_PATHS_ROMS                  1661
-#define IDC_SOUNDSTEREOMIX              1661
-#define IDC_PATHS_CONFIGS               1662
-#define IDC_SOUNDSWAP                   1662
-#define IDC_PATHS_SCREENSHOTS           1663
-#define IDC_PATHS_SAVESTATES            1664
-#define IDC_SOUNDSTEREOSWAPTXT          1664
-#define IDC_SOUNDSWAPTXT                1664
-#define IDC_PATHS_SAVEIMAGES            1665
-#define IDC_PATHS_ROML                  1666
-#define IDC_PATHS_CONFIGL               1667
-#define IDC_PATHS_SCREENSHOTL           1668
-#define IDC_PATHS_STATEFILEL            1669
-#define IDC_PATHS_SAVEIMAGEL            1670
-#define IDC_PATHS_DEFAULT               1671
-#define IDC_ROM_RESCAN                  1672
-#define IDC_QUICKSTARTMODE              1673
-#define IDC_RESETREGISTRY               1673
-#define IDC_QUICKSTART_MODEL            1674
-#define IDC_PATHS_AVIOUTPUTL            1674
-#define IDC_QUICKSTART_CONFIGURATION    1675
-#define IDC_PATHS_AVIOUTPUT             1675
-#define IDC_QUICKSTART_COMPATIBILITY    1676
-#define IDC_PATHS_AVIOUTPUTS            1676
-#define IDC_QUICKSTART_CONFIG           1677
-#define IDC_RESETDISKHISTORY            1677
-#define IDC_DF0Q                        1678
-#define IDC_DF0QQ                       1678
-#define IDC_DF1Q                        1679
-#define IDC_QUICKSTART_HOSTCONFIG       1679
-#define IDC_DF1QQ                       1680
-#define IDC_QUICKSTART_SETCONFIG        1681
-#define IDC_CONFIGAUTO                  1682
-#define IDC_DF0TEXTQ                    1683
-#define IDC_CONFIGNOLINK                1683
-#define IDC_DF0WPQ                      1684
-#define IDC_EJECT0Q                     1685
-#define IDC_DF1WPQ                      1686
-#define IDC_EJECT1Q                     1687
-#define IDC_DF1TEXTQ                    1688
-#define IDC_FILTERXLV                   1692
-#define IDC_FILTERVOV                   1693
-#define IDC_FILTERHOV                   1694
-#define IDC_CONFIGLINK                  1694
-#define IDC_FILTERVZV                   1695
-#define IDC_PS_PARAMS                   1695
-#define IDC_FILTERHZV                   1696
-#define IDC_HF_TYPE                     1696
-#define IDC_PRINTERAUTOFLUSH            1697
-#define IDC_PRINTERAUTOFLUSHTXT         1698
-#define IDC_DISKTEXT                    1699
-#define IDC_FE_LIST                     1700
-#define IDC_FE_INFO                     1701
-#define IDC_FE_INFO2                    1702
-#define IDC_FE_SCREENSHOT               1702
-#define IDC_PATHS_DEFAULTTYPE           1704
-#define IDC_SCSIMODE                    1705
-#define IDC_PROGRESS1                   1705
-#define IDC_PROGRESSBAR                 1705
-#define IDC_PROGRESSBAR_TEXT            1706
-#define IDC_SCSIMODE2                   1706
-#define IDC_LANGUAGE                    1706
-#define IDC_CREATE_NAME                 1707
-#define IDC_FILTERAUTORES               1708
-#define IDC_SOUND_AUTO                  1709
-#define IDC_FILTERKEEPASPECT            1709
-#define IDC_CS_RTC                      1710
-#define IDC_CS_CIAA_TOD1                1711
-#define IDC_CS_CIAA_TOD2                1712
-#define IDC_CS_EXT                      1712
-#define IDC_CS_CIAA_TOD3                1713
-#define IDC_CS_COMPATIBLE               1714
-#define IDC_CS_RAMSEYREV                1715
-#define IDC_CS_KSMIRROR_E0              1716
-#define IDC_STRINGBOXEDIT               1716
-#define IDC_CS_CD32CD                   1717
-#define IDC_CS_CD32C2P                  1718
-#define IDC_CS_CD32NVRAM                1719
-#define IDC_CS_CDTVCD                   1720
-#define IDC_CS_CDTVRAM                  1721
-#define IDC_CS_IDE1                     1722
-#define IDC_CS_IDE2                     1723
-#define IDC_CS_IDE3                     1724
-#define IDC_CS_A1000RAM                 1724
-#define IDC_CS_RAMSEY                   1725
-#define IDC_CS_GARY                     1726
-#define IDC_CS_FATGARY                  1726
-#define IDC_CS_DMAC                     1727
-#define IDC_CS_RTCADJUST                1728
-#define IDC_CS_RAMSEYREV3               1729
-#define IDC_CS_FATGARYREV               1729
-#define IDC_CS_CDTVRAMEXP               1730
-#define IDC_CS_RTC1                     1731
-#define IDC_CS_RTC2                     1732
-#define IDC_CS_RTC3                     1733
-#define IDC_CS_IDE4                     1734
-#define IDC_CS_DF0IDHW                  1734
-#define IDC_CS_AGNUS                    1735
-#define IDC_CS_AGNUSREV                 1736
-#define IDC_CS_DENISE                   1737
-#define IDC_CS_AGNUSREV2                1738
-#define IDC_CS_DENISEREV                1738
-#define IDC_DBG_OUTPUT1                 1739
-#define IDC_CS_PCMCIA                   1739
-#define IDC_CS_SLOWISFAST               1740
-#define IDC_DBG_HELP                    1740
-#define IDC_DBG_INPUT                   1741
-#define IDC_CS_KSMIRROR_A8              1741
-#define IDC_DBG_DREG                    1742
-#define IDC_CS_CIAOVERLAY               1742
-#define IDC_DBG_AREG                    1743
-#define IDC_CS_RESETWARNING             1743
-#define IDC_DBG_CCR                     1744
-#define IDC_CS_NOEHB                    1744
-#define IDC_DBG_AMEM                    1745
-#define IDC_CS_BLITTERBUG               1745
-#define IDC_DBG_SP_VBR                  1746
-#define IDC_DBG_MMISC                   1747
-#define IDC_DBG_PC                      1748
-#define IDC_DBG_PREFETCH                1749
-#define IDC_DBG_FPREG                   1750
-#define IDC_DBG_FPSR                    1751
-#define IDC_DBG_OUTPUT2                 1752
-#define IDC_DBG_MEMINPUT                1753
-#define IDC_DBG_MEMDOWN                 1754
-#define IDC_DBG_MEMUP                   1755
-#define IDC_DBG_MEM                     1756
-#define IDC_DBG_DASM                    1757
-#define IDC_DBG_MEMDOWNFAST             1758
-#define IDC_DBG_MEMTOPC                 1759
-#define IDC_DBG_MEMUPFAST               1760
-#define IDC_DA_RESET                    1761
-#define IDC_DBG_STATUS                  1762
-#define IDC_DBG_BRKPTS                  1763
-#define IDC_DBG_MCUSTOM                 1764
-#define IDC_DBG_MISC                    1765
-#define IDC_DBG_CUSTOM                  1766
-#define IDC_DBG_MISCCPU                 1767
-#define IDC_CS_A2091                    1768
-#define IDC_CS_DMAC2                    1769
-#define IDC_CS_A4091                    1770
-#define IDC_CS_CDTVSCSI                 1771
-#define IDC_CS_SCSIMODE                 1772
-#define IDC_DF0ENABLE                   1773
-#define IDC_DF1ENABLE                   1774
-#define IDC_FS_SELECT_DIR               1774
-#define IDC_FS_SELECT_FILE              1775
-#define IDC_DF2ENABLE                   1776
-#define IDC_FS_SELECT_EJECT             1776
-#define IDC_FS_RW                       1777
-#define IDC_DF3ENABLE                   1778
-#define IDC_HDF_RW                      1778
-#define IDC_HDFINFO                     1779
-#define IDC_DBG_AUTOSET                 1780
-#define IDC_HF_SPARSE                   1780
-#define IDC_DBG_DASM2                   1781
-#define IDC_HF_DYNAMIC                  1781
-#define IDC_DBG_MEM2                    1782
-#define IDC_DBG_MEMINPUT2               1783
-#define IDC_DBG_ADDRINPUTTXT            1784
-#define IDC_RTG_SCALE                   1785
-#define IDC_RTG_MATCH_DEPTH             1786
-#define IDC_RTG_8BIT                    1787
-#define IDC_RTG_16BIT                   1788
-#define IDC_PATHS_CONFIGCACHE           1788
-#define IDC_RTG_24BIT                   1789
-#define IDC_ASSOCIATELIST               1789
-#define IDC_RTG_32BIT                   1790
-#define IDC_ASSOCIATE_OFF               1790
-#define IDC_DD_SURFACETYPE              1791
-#define IDC_RTG_SCALE_ALLOW             1791
-#define IDC_RTG_SCALE_ASPECTRATIO       1792
-#define IDC_ASSOCIATE_ON                1792
-#define IDC_RTG_VBLANKRATE              1793
-#define ID__FLOPPYDRIVES                40004
-#define ID_FLOPPYDRIVES_DF0             40005
-#define ID_ST_CONFIGURATION             40010
-#define ID_ST_HELP                      40011
-#define ID_ST_QUIT                      40012
-#define ID_ST_EJECTALL                  40013
-#define ID_ST_DF0                       40014
-#define ID_ST_DF1                       40015
-#define ID_ST_DF2                       40016
-#define ID_ST_DF3                       40017
-#define ID_ST_RESET                     40019
-#define ID_DBG_PAGE1                    40020
-#define ID_DBG_PAGE2                    40021
-#define ID_DBG_PAGE3                    40022
-#define ID_DBG_PAGE4                    40023
-#define ID_DBG_PAGE5                    40024
-#define ID_DBG_PAGE6                    40025
-#define ID_DBG_PAGE7                    40026
-#define ID_DBG_PAGE8                    40027
-#define ID_DBG_PAGE9                    40028
-#define ID_DBG_STEP_OVER                40029
-#define ID_DBG_STEP_INTO                40030
-#define ID_DBG_SETTOA0                  40031
-#define ID_DBG_SETTOA1                  40032
-#define ID_DBG_SETTOA2                  40033
-#define ID_DBG_SETTOA3                  40034
-#define ID_DBG_SETTOA4                  40035
-#define ID_DBG_SETTOA5                  40036
-#define ID_DBG_SETTOA6                  40037
-#define ID_DBG_SETTOA7                  40038
-#define ID_DBG_ENTERADDR                40039
-#define ID_DBG_COPYLBLINE               40040
-#define ID_DBG_COPYLB                   40041
-#define ID_DBG_TOGGLEBP                 40042
-#define ID_DBG_DELETEBPS                40043
-#define ID_DBG_SETTOPC                  40044
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC                     1
-#define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        335
-#define _APS_NEXT_COMMAND_VALUE         40045
-#define _APS_NEXT_CONTROL_VALUE         1789
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
index 76fc7791a2dc59062ea3ab5be8a8ab1f575fcb36..1610e1aff6acdf1113f8b362601c58154cccd2f7 100644 (file)
 #define IDC_LORES                       1176
 #define IDC_LORES_SMOOTHED              1179
 #define IDC_FLICKERFIXER                1180
-#define IDC_LORES_SMOOTHED2             1181
-#define IDC_DISPLAY_UNSUPPORTED         1181
 #define IDC_FRAMERATE                   1185
 #define IDC_RATETEXT                    1186
 #define IDC_XSIZE                       1187
 #define IDC_INPREC_PLAY                 1620
 #define IDC_FILTERASPECT                1620
 #define IDC_AVIOUTPUT_24BIT             1621
+#define IDC_FILTERASPECT2               1621
 #define IDC_AVIOUTPUT_WIDTH             1622
 #define IDC_AVIOUTPUT_HEIGHT            1623
 #define IDC_AVIOUTPUT_FRAME             1624
index d5665f1ff623974157651c8c35abe67d76686542..1278564db2e380e2778e46c7f716108332b886df 100644 (file)
@@ -708,7 +708,7 @@ BEGIN
     RTEXT           "Vert. position:",-1,5,120,55,10,SS_CENTERIMAGE\r
     CONTROL         "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,114,151,19\r
     EDITTEXT        IDC_FILTERVOV,253,116,34,12,ES_CENTER | ES_READONLY\r
-    RTEXT           "Extra settings:",-1,27,154,57,10,SS_CENTERIMAGE\r
+    RTEXT           "Extra settings:",-1,105,135,57,10,SS_CENTERIMAGE\r
     CONTROL         "Slider1",IDC_FILTERXL,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,174,151,19\r
     EDITTEXT        IDC_FILTERXLV,253,176,34,12,ES_CENTER | ES_READONLY\r
     COMBOBOX        IDC_FILTERSLR,253,151,33,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
@@ -720,10 +720,11 @@ BEGIN
     COMBOBOX        IDC_FILTERHZMULT,59,60,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     COMBOBOX        IDC_FILTERVZMULT,59,80,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     COMBOBOX        IDC_FILTERXTRA,105,151,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_FILTERASPECT,20,135,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,170,85,10\r
+    COMBOBOX        IDC_FILTERASPECT,14,151,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,168,85,10\r
     RTEXT           "Automatic scaling:",-1,9,38,79,10,SS_CENTERIMAGE\r
     COMBOBOX        IDC_FILTERAUTOSCALE,105,36,140,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FILTERASPECT2,14,180,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
 END\r
 \r
 IDD_HARDDRIVE DIALOGEX 0, 0, 380, 76\r
index c711669867f477e82f62788ef9c40e4890774dda..760379348eee6a4fbc522b5d1235ec1add133c86 100644 (file)
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.
 //
-#include "resource.h"
+#include "resource."
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -83,39 +83,40 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     GROUPBOX        "Screen",IDC_SCREENRESTEXT,12,0,270,67,BS_LEFT
-    RTEXT           "Full screen:",IDC_SELECTRESTEXT,15,17,40,15,SS_CENTERIMAGE
     COMBOBOX        IDC_DISPLAYSELECT,59,10,215,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_RESOLUTION,59,27,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_REFRESHRATE,187,27,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_XSIZE,59,48,48,12,ES_NUMBER
     EDITTEXT        IDC_YSIZE,114,48,47,12,ES_NUMBER
-    GROUPBOX        "Settings",IDC_SETTINGSTEXT,12,73,199,125
-    CONTROL         "Correct aspect ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,19,126,92,10
-    LTEXT           "Refresh:",IDC_REFRESHTEXT,18,162,28,8
-    CONTROL         "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,157,75,20
-    EDITTEXT        IDC_RATETEXT,124,161,77,12,ES_CENTER | ES_READONLY
+    GROUPBOX        "Settings",IDC_SETTINGSTEXT,12,73,199,137
+    CONTROL         "Blacker than black",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,19,125,92,10
+    LTEXT           "Refresh:",IDC_REFRESHTEXT,18,173,28,8
+    CONTROL         "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,168,75,20
+    EDITTEXT        IDC_RATETEXT,124,172,77,12,ES_CENTER | ES_READONLY
     GROUPBOX        "Centering",IDC_STATIC,221,73,61,49
     CONTROL         "Horizontal",IDC_XCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,87,49,10
     CONTROL         "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,103,49,10
-    GROUPBOX        "Line Mode",IDC_LINEMODE,222,126,61,73
-    CONTROL         "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,231,142,44,10
-    CONTROL         "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,158,45,10
-    CONTROL         "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,174,46,10
-    COMBOBOX        IDC_DA_MODE,20,211,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,84,207,101,20
-    LTEXT           "FPS adj.:",IDC_REFRESH2TEXT,16,182,32,8
-    CONTROL         "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,177,127,20
-    EDITTEXT        IDC_RATE2TEXT,175,181,26,12,ES_CENTER | ES_READONLY
+    GROUPBOX        "Line Mode",IDC_LINEMODE,222,126,61,84
+    CONTROL         "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,231,148,44,10
+    CONTROL         "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,164,45,10
+    CONTROL         "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,180,46,10
+    COMBOBOX        IDC_DA_MODE,20,218,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,84,214,101,20
+    LTEXT           "FPS adj.:",IDC_REFRESH2TEXT,16,193,32,8
+    CONTROL         "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,188,127,20
+    EDITTEXT        IDC_RATE2TEXT,175,192,26,12,ES_CENTER | ES_READONLY
     COMBOBOX        IDC_RESOLUTIONDEPTH,134,27,46,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,126,89,10
+    CONTROL         "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,125,89,10
     COMBOBOX        IDC_SCREENMODE_NATIVE,100,85,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_SCREENMODE_RTG,100,103,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Native mode:",IDC_STATIC,19,85,59,15,SS_CENTERIMAGE
-    RTEXT           "Windowed:",IDC_WINDOWEDTEXT,15,51,40,8
     RTEXT           "RTG mode:",IDC_STATIC,19,101,59,15,SS_CENTERIMAGE
-    PUSHBUTTON      "Reset to defaults",IDC_DA_RESET,212,211,73,14
-    RTEXT           "Resolution:",IDC_STATIC,27,140,59,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_LORES,100,140,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Reset to defaults",IDC_DA_RESET,212,218,73,14
+    RTEXT           "Resolution:",IDC_STATIC,27,152,59,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_LORES,100,152,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Remove interlace artifacts",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,139,99,10
+    RTEXT           "Windowed:",IDC_STATIC,18,46,38,15,SS_CENTERIMAGE
+    RTEXT           "Fullscreen:",IDC_STATIC,17,19,38,15,SS_CENTERIMAGE
 END
 
 IDD_MEMORY DIALOGEX 0, 0, 300, 239
@@ -139,11 +140,11 @@ BEGIN
     RTEXT           "Memory: [] Graphics card memory. Required for RTG (Picasso96) emulation.",IDC_GFXCARDTEXT,25,98,53,10,SS_NOTIFY | SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_P96MEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,88,94,60,20
     EDITTEXT        IDC_P96RAM,152,97,34,12,ES_CENTER | ES_READONLY
-    GROUPBOX        "Advanced Memory Settings",-1,13,179,275,57
-    RTEXT           "Motherboard RAM (Low area):",-1,39,194,129,10,SS_CENTERIMAGE
+    GROUPBOX        "A3000/A4000 Advanced Memory Settings",-1,13,179,275,57
+    RTEXT           "Motherboard Fast RAM:",-1,39,194,129,10,SS_CENTERIMAGE
     CONTROL         "",IDC_MBMEM1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,180,190,59,20
     EDITTEXT        IDC_MBRAM1,243,193,34,12,ES_CENTER | ES_READONLY
-    RTEXT           "Motherboard RAM (High area):",-1,39,217,129,10,SS_CENTERIMAGE
+    RTEXT           "Prosessor Slot Fast RAM:",-1,39,217,129,10,SS_CENTERIMAGE
     CONTROL         "",IDC_MBMEM2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,180,213,59,20
     EDITTEXT        IDC_MBRAM2,243,216,34,12,ES_CENTER | ES_READONLY
     GROUPBOX        "RTG Graphics Card Settings",-1,14,81,275,95
@@ -238,9 +239,9 @@ BEGIN
     PUSHBUTTON      "Eject",IDC_EJECT3,253,110,30,15
     PUSHBUTTON      "...",IDC_DF3,287,109,10,15
     GROUPBOX        "New Floppy Disk Image",IDC_SETTINGSTEXT,5,183,289,49
-    COMBOBOX        IDC_FLOPPYTYPE,16,197,51,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Create Standard Disk [] Creates a standard 880 or 1760 KB ADF disk image.",IDC_CREATE,77,196,97,15
-    PUSHBUTTON      "Create Custom Disk [] Creates a low level (MFM) ADF disk image (about 2MB). Useful for programs that use non-standard disk formats (for example some save disks or DOS-formatted floppies)",IDC_CREATE_RAW,183,196,101,15
+    COMBOBOX        IDC_FLOPPYTYPE,12,197,64,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Create Standard Disk [] Creates a standard 880 or 1760 KB ADF disk image.",IDC_CREATE,81,196,97,15
+    PUSHBUTTON      "Create Custom Disk [] Creates a low level (MFM) ADF disk image (about 2MB). Useful for programs that use non-standard disk formats (for example some save disks or DOS-formatted floppies)",IDC_CREATE_RAW,187,196,101,15
     GROUPBOX        "Floppy Drive Emulation Speed",IDC_SETTINGSTEXT2,5,144,289,35
     CONTROL         "",IDC_FLOPPYSPD,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,32,154,116,20
     EDITTEXT        IDC_FLOPPYSPDTEXT,183,157,101,12,ES_CENTER | ES_READONLY
@@ -248,7 +249,7 @@ BEGIN
     PUSHBUTTON      "Delete save image",IDC_SAVEIMAGE1,43,40,70,15,NOT WS_VISIBLE
     PUSHBUTTON      "Delete save image",IDC_SAVEIMAGE2,43,75,70,15,NOT WS_VISIBLE
     PUSHBUTTON      "Delete save image",IDC_SAVEIMAGE3,43,110,70,15,NOT WS_VISIBLE
-    EDITTEXT        IDC_CREATE_NAME,77,215,97,13,ES_AUTOHSCROLL
+    EDITTEXT        IDC_CREATE_NAME,81,215,97,13,ES_AUTOHSCROLL
     RTEXT           "Disk label:",IDC_STATIC,15,216,52,10,SS_CENTERIMAGE
     CONTROL         "DF0:",IDC_DF0ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,3,6,34,15
     CONTROL         "DF1:",IDC_DF1ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,3,41,34,15
@@ -261,26 +262,27 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTEXTHELP
 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,0,290,176
-    PUSHBUTTON      "Add &Directory or Archive...",IDC_NEW_FS,10,179,103,15
-    PUSHBUTTON      "Add &Hardfile...",IDC_NEW_HF,130,179,74,15
-    PUSHBUTTON      "Add Ha&rd Drive...",IDC_NEW_HD,220,179,75,15
-    PUSHBUTTON      "Remove",IDC_REMOVE,235,203,60,15
-    PUSHBUTTON      "&Properties",IDC_EDIT,235,220,60,15
-    CONTROL         "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,202,100,10
-    CONTROL         "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,202,119,10
-    CONTROL         "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,213,121,10
-    CONTROL         "Include network drives..",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,225,101,10
-    CONTROL         "Include CD/DVD drives..",IDC_MAPDRIVES_CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,213,100,10
-    CONTROL         "Automount removable drives",IDC_MAPDRIVES_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,225,115,10
+    CONTROL         "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,0,290,167
+    PUSHBUTTON      "Add &Directory or Archive...",IDC_NEW_FS,10,171,103,15
+    PUSHBUTTON      "Add &Hardfile...",IDC_NEW_HF,130,171,74,15
+    PUSHBUTTON      "Add Ha&rd Drive...",IDC_NEW_HD,220,171,75,15
+    PUSHBUTTON      "Remove",IDC_REMOVE,235,193,60,15
+    PUSHBUTTON      "&Properties",IDC_EDIT,235,210,60,15
+    CONTROL         "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,192,100,10
+    CONTROL         "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,192,119,10
+    CONTROL         "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,203,121,10
+    CONTROL         "Include network drives..",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,226,101,10
+    CONTROL         "Include CD/DVD drives..",IDC_MAPDRIVES_CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,215,100,10
+    CONTROL         "Automount removable drives",IDC_MAPDRIVES_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,215,115,10
+    CONTROL         "Include removable drives..",IDC_MAPDRIVES_REMOVABLE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,203,100,10
 END
 
 IDD_SOUND DIALOGEX 0, 0, 300, 231
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    RTEXT           "Sound device:",IDC_SOUNDCARD,8,9,51,13,SS_CENTERIMAGE
-    COMBOBOX        IDC_SOUNDCARDLIST,64,9,229,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SOUNDCARDLIST,5,9,291,50,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Sound Emulation",IDC_SOUNDSETTINGS,5,30,120,81
     CONTROL         "Disabled",IDC_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,45,101,10
     CONTROL         "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,57,102,10
@@ -339,39 +341,59 @@ BEGIN
     PUSHBUTTON      "Save As...",IDC_SAVE,175,225,44,15
 END
 
-IDD_PORTS DIALOGEX 0, 0, 300, 238
+IDD_IOPORTS DIALOGEX 0, 0, 300, 208
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Parallel Port",IDC_SERPARFRAME,5,2,291,68
+    GROUPBOX        "Parallel Port",IDC_SERPARFRAME,5,2,291,86
     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,15,58,12
-    CONTROL         "PostScript detection",IDC_PSPRINTERDETECT,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,11,33,79,12
-    CONTROL         "PostScript printer emulation",IDC_PSPRINTER,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,95,33,110,12
-    RTEXT           "Autoflush [] Time in seconds after a pending print job is automatically flushed.",IDC_PRINTERAUTOFLUSHTXT,202,32,57,15,SS_NOTIFY | SS_CENTERIMAGE
-    EDITTEXT        IDC_PRINTERAUTOFLUSH,263,33,25,12,ES_NUMBER
-    RTEXT           "Ghostscript extra parameters:",IDC_STATIC,12,49,102,15,SS_CENTERIMAGE
-    EDITTEXT        IDC_PS_PARAMS,124,50,165,12,ES_AUTOHSCROLL
-    GROUPBOX        "Serial Port",IDC_SERIALFRAME,4,72,292,48
-    COMBOBOX        IDC_SERIAL,49,84,232,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,15,103,48,12
-    CONTROL         "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,75,103,55,12
-    GROUPBOX        "MIDI",IDC_MIDIFRAME,4,123,292,33
-    RTEXT           "Out:",IDC_MIDI,10,134,34,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MIDIOUTLIST,50,134,95,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "In:",IDC_MIDI2,150,134,29,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MIDIINLIST,185,134,95,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Mouse/Joystick Ports",IDC_PORT0,4,158,292,75
-    COMBOBOX        IDC_PORT0_JOYS,45,174,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_PORT1_JOYS,45,195,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Swap ports",IDC_SWAP,211,214,75,14
-    RTEXT           "Port 0:",IDC_STATIC,11,173,25,15,SS_CENTERIMAGE
-    RTEXT           "Port 1:",IDC_STATIC,11,194,25,15,SS_CENTERIMAGE
-    LTEXT           "X-Arcade layout information []#1",IDC_STATIC,16,213,106,15,SS_NOTIFY | SS_CENTERIMAGE
+    COMBOBOX        IDC_PRINTERLIST,49,15,232,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Flush print job",IDC_FLUSHPRINTER,114,51,58,12
+    RTEXT           "Autoflush [] Time in seconds after a pending print job is automatically flushed.",IDC_PRINTERAUTOFLUSHTXT,176,49,76,15,SS_NOTIFY | SS_CENTERIMAGE
+    EDITTEXT        IDC_PRINTERAUTOFLUSH,255,50,25,12,ES_NUMBER
+    RTEXT           "Type:",IDC_STATIC,15,33,21,15,SS_CENTERIMAGE
+    EDITTEXT        IDC_PS_PARAMS,114,67,167,12,ES_AUTOHSCROLL
+    GROUPBOX        "Serial Port",IDC_SERIALFRAME,4,92,292,48
+    COMBOBOX        IDC_SERIAL,49,104,232,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Shared",IDC_SER_SHARED,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,15,123,48,12
+    CONTROL         "RTS/CTS",IDC_SER_CTSRTS,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,75,123,55,12
+    GROUPBOX        "MIDI",IDC_MIDIFRAME,4,143,292,50
+    RTEXT           "Out:",IDC_MIDI,10,154,34,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MIDIOUTLIST,49,154,232,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "In:",IDC_MIDI2,10,174,29,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MIDIINLIST,49,174,232,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Direct []Use when emulating serial-link games on two PCs running WinUAE",IDC_SER_DIRECT,
-                    "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,135,103,65,12
-    CONTROL         "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,200,103,78,12
+                    "Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,135,123,65,12
+    CONTROL         "uaeserial.device",IDC_UAESERIAL,"Button",BS_AUTOCHECKBOX | BS_VCENTER | WS_TABSTOP,200,123,78,12
+    COMBOBOX        IDC_PRINTERTYPELIST,49,33,232,134,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Ghostscript extra parameters:",IDC_STATIC,10,66,102,15,SS_CENTERIMAGE
+END
+
+IDD_GAMEPORTS DIALOGEX 0, 0, 300, 236
+STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    COMBOBOX        IDC_PORT0_JOYS,45,29,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT1_JOYS,45,65,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Swap port 0 and 1",IDC_SWAP,194,101,93,14
+    RTEXT           "Port 0:",IDC_STATIC,11,28,25,15,SS_CENTERIMAGE
+    RTEXT           "Port 1:",IDC_STATIC,11,64,25,15,SS_CENTERIMAGE
+    LTEXT           "X-Arcade layout information []#1",IDC_STATIC,64,87,106,15,SS_NOTIFY | SS_CENTERIMAGE
+    GROUPBOX        "Mouse and Joystick settings",IDC_STATIC,4,15,292,148
+    GROUPBOX        "Mouse extra settings",IDC_STATIC,4,165,292,69
+    RTEXT           "Mouse speed:",IDC_STATIC,17,180,56,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_INPUTSPEEDM,87,180,25,12,ES_NUMBER
+    CONTROL         "Install virtual mouse driver",IDC_PORT_TABLET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,187,120,10
+    CONTROL         "Full tablet input emulation",IDC_PORT_TABLET_FULL,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,220,121,10
+    CONTROL         "Magic Mouse",IDC_PORT_MOUSETRICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,167,175,119,10
+    COMBOBOX        IDC_PORT_TABLET_CURSOR,167,201,119,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Magic Mouse cursor mode:",IDC_STATIC,17,204,138,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_PORT0_JOYSMODE,195,47,91,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT1_JOYSMODE,195,82,91,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_PORT2_JOYS,45,125,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Parallel port joystick adapter",IDC_STATIC,10,105,147,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_PORT3_JOYS,45,143,241,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_CONTRIBUTORS DIALOGEX 0, 0, 411, 242
@@ -438,8 +460,7 @@ BEGIN
     COMBOBOX        IDC_LANGUAGE,103,121,179,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Language",IDC_STATIC,7,113,285,25
     CONTROL         "Disable powersaving features",IDC_POWERSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,92,120,10
-    CONTROL         "Magic Mouse",IDC_MOUSETRICK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,66,119,10
-    CONTROL         "uaenet.device",IDC_SANA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,79,94,10
+    CONTROL         "uaenet.device",IDC_SANA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,66,94,10
     COMBOBOX        IDC_DD_SURFACETYPE,217,93,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Display buffer:",IDC_STATIC,159,94,52,10,SS_CENTERIMAGE
 END
@@ -484,7 +505,8 @@ BEGIN
     CONTROL         "Bootable",IDC_HDF_AUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,74,53,10
     CONTROL         "Do not mount",IDC_HDF_DONOTMOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,217,74,67,10
     EDITTEXT        IDC_HDFINFO,16,131,268,12,ES_CENTER | ES_READONLY
-    CONTROL         "Sparse file",IDC_HF_SPARSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,174,62,10
+    CONTROL         "Sparse file",IDC_HF_SPARSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,168,62,10
+    CONTROL         "Dynamic HDF",IDC_HF_DYNAMIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,180,62,10
 END
 
 IDD_FILESYS DIALOGEX 15, 25, 299, 111
@@ -661,49 +683,48 @@ BEGIN
     EDITTEXT        IDC_INPUTSPEEDD,215,195,25,12,ES_NUMBER
     RTEXT           "Analog joy-mouse speed:",-1,120,212,88,10,SS_CENTERIMAGE
     EDITTEXT        IDC_INPUTSPEEDA,215,211,25,12,ES_NUMBER
-    RTEXT           "Mouse speed:",-1,132,228,76,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_INPUTSPEEDM,215,227,25,12,ES_NUMBER
     PUSHBUTTON      "Copy from:",IDC_INPUTCOPY,249,195,45,14
     COMBOBOX        IDC_INPUTCOPYFROM,249,211,45,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Swap 1<>2",IDC_INPUTSWAP,249,226,45,14
 END
 
-IDD_FILTER DIALOGEX 0, 0, 296, 224
+IDD_FILTER DIALOGEX 0, 0, 296, 241
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Filter Settings",-1,0,0,294,186
-    CONTROL         "Enable",IDC_FILTERENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,16,40,11
-    COMBOBOX        IDC_FILTERMODE,53,15,83,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FILTERFILTER,142,15,74,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Filter Settings",-1,0,1,294,199
+    COMBOBOX        IDC_FILTERMODE,20,15,103,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERFILTER,132,15,83,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Reset to defaults",IDC_FILTERDEFAULT,221,15,67,14
-    RTEXT           "Horiz. size:",-1,7,44,54,10,SS_CENTERIMAGE
-    CONTROL         "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,37,152,19
-    EDITTEXT        IDC_FILTERHZV,253,39,34,12,ES_CENTER | ES_READONLY
-    RTEXT           "Vert. size:",-1,7,64,54,10,SS_CENTERIMAGE
-    CONTROL         "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,57,152,19
-    EDITTEXT        IDC_FILTERVZV,253,59,34,12,ES_CENTER | ES_READONLY
-    RTEXT           "Horiz. position:",-1,5,84,55,10,SS_CENTERIMAGE
-    CONTROL         "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,77,151,19
-    EDITTEXT        IDC_FILTERHOV,253,79,34,12,ES_CENTER | ES_READONLY
-    RTEXT           "Vert. position:",-1,5,103,55,10,SS_CENTERIMAGE
-    CONTROL         "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,97,151,19
-    EDITTEXT        IDC_FILTERVOV,253,99,34,12,ES_CENTER | ES_READONLY
-    RTEXT           "Extra settings:",-1,27,137,57,10,SS_CENTERIMAGE
-    CONTROL         "Slider1",IDC_FILTERXL,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,157,151,19
-    EDITTEXT        IDC_FILTERXLV,253,159,34,12,ES_CENTER | ES_READONLY
-    COMBOBOX        IDC_FILTERSLR,253,134,33,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Presets",-1,0,187,296,36
-    COMBOBOX        IDC_FILTERPRESETS,8,201,119,150,CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Load",IDC_FILTERPRESETLOAD,132,200,47,14
-    PUSHBUTTON      "Save",IDC_FILTERPRESETSAVE,184,200,47,14
-    PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,236,200,47,14
-    COMBOBOX        IDC_FILTERHZMULT,67,43,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FILTERVZMULT,67,63,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Autoscale",IDC_FILTERAUTORES,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,168,83,10
-    COMBOBOX        IDC_FILTERXTRA,105,134,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FILTERASPECT,21,118,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,153,85,10
+    RTEXT           "Horiz. size:",-1,7,61,46,10,SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,54,152,19
+    EDITTEXT        IDC_FILTERHZV,253,56,34,12,ES_CENTER | ES_READONLY
+    RTEXT           "Vert. size:",-1,7,81,46,10,SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,74,152,19
+    EDITTEXT        IDC_FILTERVZV,253,76,34,12,ES_CENTER | ES_READONLY
+    RTEXT           "Horiz. position:",-1,5,101,55,10,SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_FILTERHO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,94,151,19
+    EDITTEXT        IDC_FILTERHOV,253,96,34,12,ES_CENTER | ES_READONLY
+    RTEXT           "Vert. position:",-1,5,120,55,10,SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_FILTERVO,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,114,151,19
+    EDITTEXT        IDC_FILTERVOV,253,116,34,12,ES_CENTER | ES_READONLY
+    RTEXT           "Extra settings:",-1,105,135,57,10,SS_CENTERIMAGE
+    CONTROL         "Slider1",IDC_FILTERXL,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,174,151,19
+    EDITTEXT        IDC_FILTERXLV,253,176,34,12,ES_CENTER | ES_READONLY
+    COMBOBOX        IDC_FILTERSLR,253,151,33,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Presets",-1,0,203,296,36
+    COMBOBOX        IDC_FILTERPRESETS,8,217,119,150,CBS_DROPDOWN | CBS_SORT | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Load",IDC_FILTERPRESETLOAD,132,216,47,14
+    PUSHBUTTON      "Save",IDC_FILTERPRESETSAVE,184,216,47,14
+    PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,236,216,47,14
+    COMBOBOX        IDC_FILTERHZMULT,59,60,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERVZMULT,59,80,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERXTRA,105,151,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERASPECT,14,151,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,14,168,85,10
+    RTEXT           "Automatic scaling:",-1,9,38,79,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_FILTERAUTOSCALE,105,36,140,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERASPECT2,14,180,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_HARDDRIVE DIALOGEX 0, 0, 380, 76
@@ -777,29 +798,32 @@ 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,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
+    EDITTEXT        IDC_PATHS_ROM,14,15,261,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_ROMS,281,15,11,15
+    LTEXT           "Configuration files:",IDC_PATHS_CONFIGL,14,32,121,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_CONFIG,14,42,261,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_CONFIGS,281,42,11,15
+    LTEXT           "Screenshots:",IDC_PATHS_SCREENSHOTL,14,59,260,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_SCREENSHOT,14,69,261,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_SCREENSHOTS,281,69,11,15
+    LTEXT           "State files:",IDC_PATHS_STATEFILEL,14,86,260,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_SAVESTATE,14,96,261,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_SAVESTATES,281,96,11,15
+    LTEXT           "Videos:",IDC_PATHS_AVIOUTPUTL,14,113,260,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_AVIOUTPUT,14,123,261,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_AVIOUTPUTS,281,123,11,15
+    LTEXT           "Saveimages:",IDC_PATHS_SAVEIMAGEL,14,140,261,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_SAVEIMAGE,14,151,261,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_SAVEIMAGES,281,151,11,15
+    PUSHBUTTON      "Reset to defaults",IDC_PATHS_DEFAULT,14,196,92,14
+    PUSHBUTTON      "Rescan ROMs",IDC_ROM_RESCAN,14,212,92,14
+    PUSHBUTTON      "Clear registry",IDC_RESETREGISTRY,111,212,92,14
+    COMBOBOX        IDC_PATHS_DEFAULTTYPE,111,197,163,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Clear disk history",IDC_RESETDISKHISTORY,14,228,92,14
+    CONTROL         "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,32,97,10
+    LTEXT           "Rips:",IDC_PATHS_RIPSL,13,168,261,8,SS_CENTERIMAGE
+    EDITTEXT        IDC_PATHS_RIP,13,178,261,15,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_PATHS_RIPS,280,178,11,15
 END
 
 IDD_QUICKSTART DIALOGEX 0, 0, 300, 242
@@ -924,7 +948,8 @@ IDI_FLOPPY              ICON                    "35floppy.ico"
 IDI_ABOUT               ICON                    "amigainfo.ico"
 IDI_HARDDISK            ICON                    "Drive.ico"
 IDI_CPU                 ICON                    "cpu.ico"
-IDI_PORTS               ICON                    "joystick.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"
@@ -947,8 +972,8 @@ IDI_PATHS               ICON                    "paths.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,3,0
- PRODUCTVERSION 1,5,3,0
+ FILEVERSION 1,6,0,0
+ PRODUCTVERSION 1,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -964,12 +989,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "1.5.3"
+            VALUE "FileVersion", "1.6.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2008 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2009 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "1.5.3"
+            VALUE "ProductVersion", "1.6.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1060,6 +1085,21 @@ BEGIN
     END
 END
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO 
+BEGIN
+    IDD_FILTER, DIALOG
+    BEGIN
+        BOTTOMMARGIN, 237
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -1076,7 +1116,7 @@ BEGIN
     IDS_ABOUT               "About"
     IDS_LOADSAVE            "Configurations"
     IDS_AVIOUTPUT           "Output"
-    IDS_PORTS               "Game & IO ports"
+    IDS_IOPORTS             "IO ports"
     IDS_MISC1               "Miscellaneous"
     IDS_MEMORY              "RAM"
     IDS_CPU                 "CPU and FPU"
@@ -1092,6 +1132,7 @@ BEGIN
     IDS_QUICKSTART          "Quickstart"
     IDS_FRONTEND            "Frontend"
     IDS_CHIPSET2            "Adv. Chipset"
+    IDS_GAMEPORTS           "Game ports"
 END
 
 STRINGTABLE 
@@ -1192,6 +1233,7 @@ BEGIN
     IDS_SOUND_CLONED51      "Cloned Stereo (5.1)"
     IDS_SOUND_51            "5.1 Channels"
     IDS_AUTOMATIC           "Automatic"
+    IDS_ALL                 "All"
 END
 
 STRINGTABLE 
@@ -1365,6 +1407,38 @@ BEGIN
     IDS_QS_MODEL_A4000T     "A4000T (test)\nA4000T"
 END
 
+STRINGTABLE 
+BEGIN
+    IDS_FLOPPYTYPE35DDPC    "3.5"" DD (PC)"
+    IDS_FLOPPYTYPE35HDPC    "3.5"" HD (PC)"
+    IDS_JOYMODE_DEFAULT     "Default"
+    IDS_JOYMODE_MOUSE       "Mouse"
+    IDS_JOYMODE_JOYSTICK    "Joystick"
+    IDS_JOYMODE_JOYSTICKANALOG "Analog joystick"
+    IDS_JOYMODE_LIGHTPEN    "Light pen"
+    IDS_JOYMODE_MOUSE_CDTV  "CDTV remote mouse"
+    IDS_JOYMODE_JOYSTICK_CD32 "CD32 pad"
+    IDS_TABLET_BOTH_CURSORS "Show both cursors"
+    IDS_TABLET_NATIVE_CURSOR "Show native cursor only"
+    IDS_TABLET_HOST_CURSOR  "Show host cursor only"
+    IDS_AUTOSCALE_DISABLED  "Disabled"
+    IDS_AUTOSCALE_SCALING   "Automatic scaling"
+    IDS_AUTOSCALE_RESIZE    "Automatic resize"
+    IDS_PRINTER_ASCII       "ASCII-Only"
+END
+
+STRINGTABLE 
+BEGIN
+    IDS_PRINTER_EPSON       "Epson Matrix Printer Emulation (beta, FreeType required)"
+    IDS_PRINTER_POSTSCRIPT_DETECTION "PostScript (Passthrough)"
+    IDS_PRINTER_POSTSCRIPT_EMULATION 
+                            "PostScript (Emulation, GhostScript required)"
+    IDS_PRINTER_PASSTHROUGH "Passthrough"
+    IDS_RES_LORES           "Lores"
+    IDS_RES_HIRES           "Hires (normal)"
+    IDS_RES_SUPERHIRES      "SuperHires"
+END
+
 #endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
index ae4d1d5eb11a4694934d123a2a1db015d1b07eef..fb4ccf7a323caf315ca9d8bf89a6e7f5dd45fa0e 100644 (file)
@@ -35,41 +35,48 @@ cd od-win32
 cd ipctester
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd spsutil
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd genlinetoscr_msvc
 rm -f genlinetoscr.exe
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd build68k_msvc
 rm -f build68k.exe
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd genblitter_msvc
 rm -f genblitter.exe 
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd gencomp_msvc
 rm -f gencomp.exe
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd gencpu_msvc
 rm -f gencpu.exe
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd winuae_msvc
@@ -86,29 +93,42 @@ rm -rf fullrelease
 rm -rf _UpgradeReport_Files
 cd ..
 
+rm -rf winuae_msvc10
+
 cd soundcheck
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd singlefilehelper
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd resourcedll
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd fdrawcmd
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd uaeunp
 rm -rf debug
 rm -rf release
+rm -rf fullrelease
+cd ..
+
+cd decompress
+rm -rf debug
+rm -rf release
+rm -rf fullrelease
 cd ..
 
 cd ..
diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj
new file mode 100644 (file)
index 0000000..d42faf1
--- /dev/null
@@ -0,0 +1,142 @@
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGUID>{6181E50C-5F32-42DC-BEF6-827AA8A5429D}</ProjectGUID>
+    <RootNamespace>uaeunp</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(LocalAppData)\Microsoft\VisualStudio\10.0\Microsoft.Cpp.$(Platform).user.props')" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.20506.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">d:\amiga\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">d:\amiga\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS;_CRT_SECURE_NO_WARNINGS;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsCpp</CompileAs>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\archivers\7z\7zBuf.c" />
+    <ClCompile Include="..\..\archivers\7z\7zCrc.c" />
+    <ClCompile Include="..\..\archivers\7z\7zStream.c" />
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zAlloc.c" />
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zDecode.c" />
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zExtract.c" />
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zHeader.c" />
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zIn.c" />
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zItem.c" />
+    <ClCompile Include="..\..\archivers\7z\Bcj2.c" />
+    <ClCompile Include="..\..\archivers\7z\Bra.c" />
+    <ClCompile Include="..\..\archivers\7z\Bra86.c" />
+    <ClCompile Include="..\..\archivers\7z\LzmaDec.c" />
+    <ClCompile Include="..\..\archivers\dms\crc_csum.c" />
+    <ClCompile Include="..\..\archivers\dms\getbits.c" />
+    <ClCompile Include="..\..\archivers\dms\maketbl.c" />
+    <ClCompile Include="..\..\archivers\dms\pfile.c" />
+    <ClCompile Include="..\..\archivers\dms\tables.c" />
+    <ClCompile Include="..\..\archivers\dms\u_deep.c" />
+    <ClCompile Include="..\..\archivers\dms\u_heavy.c" />
+    <ClCompile Include="..\..\archivers\dms\u_init.c" />
+    <ClCompile Include="..\..\archivers\dms\u_medium.c" />
+    <ClCompile Include="..\..\archivers\dms\u_quick.c" />
+    <ClCompile Include="..\..\archivers\dms\u_rle.c" />
+    <ClCompile Include="..\..\archivers\lha\crcio.c" />
+    <ClCompile Include="..\..\archivers\lha\dhuf.c" />
+    <ClCompile Include="..\..\archivers\lha\header.c" />
+    <ClCompile Include="..\..\archivers\lha\huf.c" />
+    <ClCompile Include="..\..\archivers\lha\larc.c" />
+    <ClCompile Include="..\..\archivers\lha\lhamaketbl.c" />
+    <ClCompile Include="..\..\archivers\lha\lharc.c" />
+    <ClCompile Include="..\..\archivers\lha\shuf.c" />
+    <ClCompile Include="..\..\archivers\lha\slide.c" />
+    <ClCompile Include="..\..\archivers\lha\uae_lha.c" />
+    <ClCompile Include="..\..\archivers\lha\util.c" />
+    <ClCompile Include="..\..\archivers\lzx\unlzx.c" />
+    <ClCompile Include="..\..\archivers\wrp\warp.c" />
+    <ClCompile Include="..\..\archivers\zip\unzip.c" />
+    <ClCompile Include="..\..\crc32.c" />
+    <ClCompile Include="..\..\diskutil.c" />
+    <ClCompile Include="..\..\fdi2raw.c" />
+    <ClCompile Include="..\..\missing.c" />
+    <ClCompile Include="..\..\uaeunp.c" />
+    <ClCompile Include="..\..\zfile.c" />
+    <ClCompile Include="..\..\zfile_archive.c" />
+    <ClCompile Include="..\caps\caps_win32.c" />
+    <ClCompile Include="..\fsdb_mywin32.c" />
+    <ClCompile Include="..\posixemu.c" />
+    <ClCompile Include="..\uaeunp_win32.c" />
+    <ClCompile Include="..\unicode.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/uaeunp/uaeunp.vcxproj.filters b/od-win32/uaeunp/uaeunp.vcxproj.filters
new file mode 100644 (file)
index 0000000..3309a31
--- /dev/null
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Source Files\decompressors">
+      <UniqueIdentifier>{ca0293dc-074a-4abd-a3e4-d5e0073cf020}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\7z">
+      <UniqueIdentifier>{0672cade-bb56-4711-b392-347640e8262d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\dms">
+      <UniqueIdentifier>{a1cca94f-8e58-4e1b-8db2-e1edc73cd5bb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\lha">
+      <UniqueIdentifier>{8d6365e3-4612-4fb8-8bd4-ffa4704bbb3b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\lzx">
+      <UniqueIdentifier>{e221241b-fb65-47f9-a202-bfcb00e61e63}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\wrp">
+      <UniqueIdentifier>{fcf52458-bcf3-411a-b732-dbd936599ae1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\xfd">
+      <UniqueIdentifier>{50925ec6-0d6f-4b8f-b0bb-3719bf0cee8e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\zip">
+      <UniqueIdentifier>{b7bcc77a-4dbe-4a62-b593-5ce995fb31d9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\win32">
+      <UniqueIdentifier>{1cf030c6-ec59-44fc-b272-6d40bb977515}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\archivers\7z\7zBuf.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\7zCrc.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\7zStream.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zAlloc.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zDecode.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zExtract.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zHeader.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zIn.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zItem.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Bcj2.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Bra.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Bra86.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\LzmaDec.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\crc_csum.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\getbits.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\maketbl.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\pfile.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\tables.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_deep.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_heavy.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_init.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_medium.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_quick.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_rle.c">
+      <Filter>Source Files\decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\crcio.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\dhuf.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\header.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\huf.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\larc.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\lhamaketbl.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\lharc.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\shuf.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\slide.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\uae_lha.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\util.c">
+      <Filter>Source Files\decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lzx\unlzx.c">
+      <Filter>Source Files\decompressors\lzx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\wrp\warp.c">
+      <Filter>Source Files\decompressors\wrp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\zip\unzip.c">
+      <Filter>Source Files\decompressors\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\crc32.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\diskutil.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fdi2raw.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\missing.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\uaeunp.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zfile.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zfile_archive.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\caps\caps_win32.c">
+      <Filter>Source Files\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\fsdb_mywin32.c">
+      <Filter>Source Files\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\posixemu.c">
+      <Filter>Source Files\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\uaeunp_win32.c">
+      <Filter>Source Files\win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\unicode.c">
+      <Filter>Source Files\win32</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
index 7aac0c22dccfb40c893f0850644d197cf7e63661..97a132fd2bf25a4e2ac59c22feeb61c2c933431a 100644 (file)
@@ -4372,6 +4372,26 @@ void target_reset (void)
     clipboard_reset ();
 }
 
+uae_u32 emulib_target_getcpurate (uae_u32 v, uae_u32 *low)
+{
+    *low = 0;
+    if (v == 1) {
+        LARGE_INTEGER pf;
+        pf.QuadPart = 0;
+        QueryPerformanceFrequency (&pf);
+        *low = pf.LowPart;
+        return pf.HighPart;
+    } else if (v == 2) {
+        LARGE_INTEGER pf;
+        pf.QuadPart = 0;
+        QueryPerformanceCounter (&pf);
+        *low = pf.LowPart;
+        return pf.HighPart;
+    }
+    return 0;
+}
+
+
 typedef BOOL (CALLBACK* SETPROCESSDPIAWARE)(void);
 typedef BOOL (CALLBACK* CHANGEWINDOWMESSAGEFILTER)(UINT, DWORD);
 
index 86d0dc6fbe7c0e9880625e311de135004e1fa648..3ecc7f7a069135db94fc867ccb206e336509b7e4 100644 (file)
@@ -17,9 +17,9 @@
 
 #define WINUAEPUBLICBETA 0
 
-#define WINUAEBETA L"29"
-#define WINUAEDATE MAKEBD(2009, 5, 16)
-#define WINUAEEXTRA L"RC2"
+#define WINUAEBETA L""
+#define WINUAEDATE MAKEBD(2009, 5, 21)
+#define WINUAEEXTRA L""
 #define WINUAEREV L""
 
 #define IHF_WINDOWHIDDEN 6
index 198c944836dd0958ded98ff17d054c6f77e6e450..f5fb8cbf3d648cdac6add5843c07a33bacaf8bf8 100644 (file)
@@ -100,6 +100,12 @@ static int vblscale2 (int v)
     v = v * maxvpos / MAXVPOS_PAL;
     return v;
 }
+static int ispal (void)
+{
+    if (beamcon0 & 0x80)
+       return currprefs.ntscmode == 0;
+    return maxvpos >= MAXVPOS_NTSC + (MAXVPOS_PAL - MAXVPOS_NTSC) / 2;
+}
 
 uae_u8 *getfilterrect1 (RECT *sr, RECT *dr, int dst_depth, int aw, int ah, int scale, int temp_width, int temp_height, uae_u8 *dptr, int pitch)
 {
@@ -169,8 +175,11 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
     srcratio = 4.0 / 3.0;
     if (currprefs.gfx_filter_aspect > 0) {
         dstratio = (currprefs.gfx_filter_aspect >> 8) * 1.0 / (currprefs.gfx_filter_aspect & 0xff);
-    } else if (currprefs.gfx_filter_aspect < 0 && deskw > 0 && deskh > 0) {
-        dstratio = 1.0 * deskw / deskh;
+    } else if (currprefs.gfx_filter_aspect < 0) {
+       if (isfullscreen () && deskw > 0 && deskh > 0)
+           dstratio = 1.0 * deskw / deskh;
+       else
+           dstratio = 1.0 * dst_width / dst_height;
     } else {
         dstratio = srcratio;
     }
@@ -267,8 +276,18 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
 
                if (currprefs.gfx_filter_keep_aspect) {
                    dstratio = dstratio * (aws * 1.0 / ahs2) / (cw * 1.0 / ch);
-                   if (currprefs.ntscmode)
-                       dstratio = dstratio * 1.2;
+                   if (currprefs.ntscmode) {
+                       dstratio = dstratio * 1.21;
+                       if (currprefs.gfx_filter_keep_aspect == 2 && ispal ())
+                           dstratio = dstratio * 0.93;
+                       else if (currprefs.gfx_filter_keep_aspect == 1 && !ispal ())
+                           dstratio = dstratio * 0.98;
+                   } else {
+                       if (currprefs.gfx_filter_keep_aspect == 2 && ispal ())
+                           dstratio = dstratio * 0.95;
+                       else if (currprefs.gfx_filter_keep_aspect == 1 && !ispal ())
+                           dstratio = dstratio * 0.95;
+                   }
                }
 
                if (srcratio > dstratio) {
@@ -315,31 +334,39 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
 
     }
 
-    if (xmult <= 0.01 || ymult <= 0.01) {
-
-       if (xmult <= 0.01)
-           xmult = aws * 1000 / dst_width;
-       else
-           xmult = xmult + xmult * currprefs.gfx_filter_horiz_zoom / 2000;
-       if (ymult <= 0.01)
-           ymult = ahs * 1000 / dst_height;
-       else
-           ymult = ymult + ymult * currprefs.gfx_filter_vert_zoom / 2000;
-
+    if (currprefs.ntscmode) {
+        if (currprefs.gfx_filter_keep_aspect == 2 && ispal ())
+           dstratio = dstratio * 0.93;
+       else if (currprefs.gfx_filter_keep_aspect == 1 && !ispal ())
+           dstratio = dstratio * 0.98;
+    } else {
+       if (currprefs.gfx_filter_keep_aspect == 2 && ispal ())
+           dstratio = dstratio * 0.95;
+       else if (currprefs.gfx_filter_keep_aspect == 1 && !ispal ())
+           dstratio = dstratio * 0.95;
     }
 
-    if (currprefs.gfx_filter_aspect != 0) {
-       if (srcratio > dstratio) {
-           ymult = ymult * srcratio / dstratio;
-       } else {
-           xmult = xmult * dstratio / srcratio;
-       }
+    if (srcratio > dstratio) {
+        ymult = ymult * srcratio / dstratio;
+    } else {
+        xmult = xmult * dstratio / srcratio;
     }
 
-    if (!currprefs.gfx_filter_horiz_zoom_mult && !currprefs.gfx_filter_vert_zoom_mult && currprefs.ntscmode) {
-       int v = vblscale2 (ahs);
-       ymult /= 1.2;
-       OffsetRect (dr, 0, (v - ahs2) / 2);
+    if (xmult <= 0.01)
+        xmult = aws * 1000 / dst_width;
+    else
+        xmult = xmult + xmult * currprefs.gfx_filter_horiz_zoom / 2000;
+    if (ymult <= 0.01)
+        ymult = ahs * 1000 / dst_height;
+    else
+        ymult = ymult + ymult * currprefs.gfx_filter_vert_zoom / 2000;
+
+    if (!currprefs.gfx_filter_horiz_zoom_mult && !currprefs.gfx_filter_vert_zoom_mult) {
+       if (currprefs.ntscmode) {
+           int v = vblscale2 (ahs);
+           ymult /= 1.21;
+           OffsetRect (dr, 0, (v - ahs2) / 2);
+       }
     }
 
 
index f09b88f416599afcaca9ba6e915917b8ab0df683..bbbef30adf73e93888f8853018f49a432d30c44f 100644 (file)
@@ -682,7 +682,7 @@ void sortdisplays (void)
                            if (freq < 10)
                                freq = 0;
                        }
-                       if (freq < 75) {
+                       if (freq < 75 && dm.dmPelsWidth <= maxw && dm.dmPelsHeight <= maxh) {
                            if ((dm.dmFields & DM_PELSWIDTH) && (dm.dmFields & DM_PELSHEIGHT) && (dm.dmFields & DM_BITSPERPEL))
                                addmode (md1, dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, freq, 1);
                        }
index 031b6691489d8854d3bff3407e6373bed0b5a09a..98b43ef69184f50c617a9ed4c000c60803acf712 100644 (file)
@@ -9049,6 +9049,7 @@ static void enable_for_gameportsdlg (HWND hDlg)
     ew (hDlg, IDC_PORT_TABLET_FULL, v && is_tablet () && workprefs.input_tablet > 0);
     ew (hDlg, IDC_PORT_MOUSETRICK, v);
     ew (hDlg, IDC_PORT_TABLET_CURSOR, v && workprefs.input_tablet > 0);
+    ew (hDlg, IDC_PORT_TABLET, v);
 }
 
 static void enable_for_portsdlg (HWND hDlg)
@@ -10163,6 +10164,7 @@ static void enable_for_hw3ddlg (HWND hDlg)
     ew (hDlg, IDC_FILTERFILTER, vv);
     ew (hDlg, IDC_FILTERKEEPASPECT, v);
     ew (hDlg, IDC_FILTERASPECT, v);
+    ew (hDlg, IDC_FILTERASPECT2, v && workprefs.gfx_filter_keep_aspect);
 
     ew (hDlg, IDC_FILTERPRESETSAVE, filterpreset_builtin < 0);
     ew (hDlg, IDC_FILTERPRESETLOAD, filterpreset_selected > 0);
@@ -10311,7 +10313,6 @@ static void values_to_hw3ddlg (HWND hDlg)
     struct uae_filter *uf;
     UAEREG *fkey;
 
-    CheckDlgButton (hDlg, IDC_FILTERKEEPASPECT, workprefs.gfx_filter_keep_aspect);
     SendDlgItemMessage (hDlg, IDC_FILTERASPECT, CB_SETCURSEL,
        (workprefs.gfx_filter_aspect == 0) ? 0 :
        (workprefs.gfx_filter_aspect < 0) ? 1 :
@@ -10321,6 +10322,11 @@ static void values_to_hw3ddlg (HWND hDlg)
        (workprefs.gfx_filter_aspect == 16 * 256 + 9) ? 5 :
        (workprefs.gfx_filter_aspect == 16 * 256 + 10) ? 6 : 0, 0);
 
+    CheckDlgButton (hDlg, IDC_FILTERKEEPASPECT, workprefs.gfx_filter_keep_aspect);
+
+    SendDlgItemMessage (hDlg, IDC_FILTERASPECT2, CB_SETCURSEL,
+       workprefs.gfx_filter_keep_aspect, 0);
+
     SendDlgItemMessage (hDlg, IDC_FILTERAUTOSCALE, CB_RESETCONTENT, 0, 0L);
     WIN32GUI_LoadUIString (IDS_AUTOSCALE_DISABLED, txt, sizeof (txt) / sizeof (TCHAR));
     SendDlgItemMessage (hDlg, IDC_FILTERAUTOSCALE, CB_ADDSTRING, 0, (LPARAM)txt);
@@ -10665,6 +10671,13 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
            SendDlgItemMessage (hDlg, IDC_FILTERASPECT, CB_ADDSTRING, 0, (LPARAM)L"15:9");
            SendDlgItemMessage (hDlg, IDC_FILTERASPECT, CB_ADDSTRING, 0, (LPARAM)L"16:9");
            SendDlgItemMessage (hDlg, IDC_FILTERASPECT, CB_ADDSTRING, 0, (LPARAM)L"16:10");
+
+           SendDlgItemMessage (hDlg, IDC_FILTERASPECT2, CB_RESETCONTENT, 0, 0);
+           WIN32GUI_LoadUIString (IDS_DISABLED, tmp, sizeof tmp / sizeof (TCHAR));
+           SendDlgItemMessage (hDlg, IDC_FILTERASPECT2, CB_ADDSTRING, 0, (LPARAM)tmp);
+           SendDlgItemMessage (hDlg, IDC_FILTERASPECT2, CB_ADDSTRING, 0, (LPARAM)L"VGA");
+           SendDlgItemMessage (hDlg, IDC_FILTERASPECT2, CB_ADDSTRING, 0, (LPARAM)L"TV");
+
            enable_for_hw3ddlg (hDlg);
 
        case WM_USER:
@@ -10698,9 +10711,16 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
                recursive++;
                break;
                case IDC_FILTERKEEPASPECT:
-               currprefs.gfx_filter_keep_aspect = workprefs.gfx_filter_keep_aspect = IsDlgButtonChecked (hDlg, IDC_FILTERKEEPASPECT);
-               updatedisplayarea ();
-               WIN32GFX_WindowMove ();
+               {
+                   if (IsDlgButtonChecked (hDlg, IDC_FILTERKEEPASPECT))
+                       currprefs.gfx_filter_keep_aspect = workprefs.gfx_filter_keep_aspect = 1;
+                   else
+                       currprefs.gfx_filter_keep_aspect = workprefs.gfx_filter_keep_aspect = 0;
+                   enable_for_hw3ddlg (hDlg);
+                   values_to_hw3ddlg (hDlg);
+                   updatedisplayarea ();
+                   WIN32GFX_WindowMove ();
+               }
                break;
                default:
                if (HIWORD (wParam) == CBN_SELCHANGE || HIWORD (wParam) == CBN_KILLFOCUS)  {
@@ -10775,6 +10795,16 @@ static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM
                            WIN32GFX_WindowMove ();
                        }
                        break;
+                       case IDC_FILTERASPECT2:
+                       {
+                           int v = SendDlgItemMessage (hDlg, IDC_FILTERASPECT2, CB_GETCURSEL, 0, 0L);
+                           if (v != CB_ERR)
+                               currprefs.gfx_filter_keep_aspect = workprefs.gfx_filter_keep_aspect = v;
+                           updatedisplayarea ();
+                           WIN32GFX_WindowMove ();
+                       }
+                       break;
+
                    }
                }
                break;
index 66d72b6b50e81bb3537c430fb8ee5fcb7abc287a..b42b5cec70b22fb1fb9b129fa961ca20bd443bde 100644 (file)
@@ -1,13 +1,28 @@
 
-Beat 29: (RC2, beta dialog removed)
-
-- Pang hack fixed, it was wrong and caused side-effects..
+Final 1.6.0
+
+- filter mode PAL aspect ratio corrected (~5% difference) if keep
+  aspect ratio checked. (it includes now non-square pixel ratio)
+  Does basically same as long time ago removed aspect ratio option.
+  Because it can look ugly and it isn't exactly required feature,
+  it is only enabled in FS or autoscale modes (they need scaling
+  even without aspect ratio correction)
+- ASPI SCSI unicode conversion bugs fixed (random crashes..)
+- "Ignore modes that have larger resolution than largest supported
+  mode". Now it really does this.
+- D3D fall back to non-filtered if IDirect3DDevice9_Reset failed
+  (instead of closing and reopening the screen and trying again)
+- filter scaling sliders didn't work in normal (1x+ mode)
+
+Beta 29: (RC2, beta dialog removed)
+
+- Pang hack side-effects fixed
 - autoscale/keep aspect ratio combination fixed
 - NTSC hardware in PAL mode: shrink display (fit PAL display in NTSC
-  space) Previously NTSC was always streched but I think it is better
+  space) Previously NTSC was always stretched but I think it is better
   to make "base" hardware PAL/NTSC mode non-scaled. Note that PAL/NTSC
   vertical streching/shrinking is only supported in filter modes
-- screenshots didn't work in windowed D3D modes
+- screenshots never worked in windowed D3D modes
 - screenshot size was wrong in full-window mode
 - 100% stereo separation was only about 95% stereo separation
 
index 48145d7f57101c548a253ce07d10c34f6a1ee672..93167cd0d37a24ee1552ea20ed84a82f429c3135 100644 (file)
--- a/uaelib.c
+++ b/uaelib.c
@@ -379,41 +379,49 @@ static uae_u32 REGPARAM2 uaelib_demux2 (TrapContext *context)
 
     switch (ARG0)
     {
-     case 0: return emulib_GetVersion ();
-     case 1: return emulib_GetUaeConfig (ARG1);
-     case 2: return emulib_SetUaeConfig (ARG1);
-     case 3: return emulib_HardReset ();
-     case 4: return emulib_Reset ();
-     case 5: return emulib_InsertDisk (ARG1, ARG2);
-     case 6: return emulib_EnableSound (ARG1);
-     case 7: return emulib_EnableJoystick (ARG1);
-     case 8: return emulib_SetFrameRate (ARG1);
-     case 9: return emulib_ChgCMemSize (&context->regs, ARG1);
-     case 10: return emulib_ChgSMemSize (&context->regs, ARG1);
-     case 11: return emulib_ChgFMemSize (&context->regs, ARG1);
-     case 12: return emulib_ChangeLanguage (ARG1);
+    case 0: return emulib_GetVersion ();
+    case 1: return emulib_GetUaeConfig (ARG1);
+    case 2: return emulib_SetUaeConfig (ARG1);
+    case 3: return emulib_HardReset ();
+    case 4: return emulib_Reset ();
+    case 5: return emulib_InsertDisk (ARG1, ARG2);
+    case 6: return emulib_EnableSound (ARG1);
+    case 7: return emulib_EnableJoystick (ARG1);
+    case 8: return emulib_SetFrameRate (ARG1);
+    case 9: return emulib_ChgCMemSize (&context->regs, ARG1);
+    case 10: return emulib_ChgSMemSize (&context->regs, ARG1);
+    case 11: return emulib_ChgFMemSize (&context->regs, ARG1);
+    case 12: return emulib_ChangeLanguage (ARG1);
        /* The next call brings bad luck */
-     case 13: return emulib_ExitEmu ();
-     case 14: return emulib_GetDisk (ARG1, ARG2);
-     case 15: return emulib_Debug ();
+    case 13: return emulib_ExitEmu ();
+    case 14: return emulib_GetDisk (ARG1, ARG2);
+    case 15: return emulib_Debug ();
 
-     case 68: return emulib_Minimize ();
-     case 69: return emulib_ExecuteNativeCode (&context->regs);
+    case 68: return emulib_Minimize ();
+    case 69: return emulib_ExecuteNativeCode (&context->regs);
 
-     case 70: return 0; /* RESERVED. Something uses this.. */
+    case 70: return 0; /* RESERVED. Something uses this.. */
 
-     case 80: return currprefs.maprom ? currprefs.maprom : 0xffffffff;
-     case 81: return cfgfile_uaelib (ARG1, ARG2, ARG3, ARG4);
-     case 82: return cfgfile_uaelib_modify (ARG1, ARG2, ARG3, ARG4, ARG5);
-     case 83: currprefs.mmkeyboard = ARG1 ? 1 : 0; return currprefs.mmkeyboard;
+    case 80: return currprefs.maprom ? currprefs.maprom : 0xffffffff;
+    case 81: return cfgfile_uaelib (ARG1, ARG2, ARG3, ARG4);
+    case 82: return cfgfile_uaelib_modify (ARG1, ARG2, ARG3, ARG4, ARG5);
+    case 83: currprefs.mmkeyboard = ARG1 ? 1 : 0; return currprefs.mmkeyboard;
 #ifdef DEBUGGER
-     case 84: return mmu_init (ARG1, ARG2, ARG3);
+    case 84: return mmu_init (ARG1, ARG2, ARG3);
 #endif
-     case 85: return native_dos_op (ARG1, ARG2, ARG3, ARG4);
-     case 86:
+    case 85: return native_dos_op (ARG1, ARG2, ARG3, ARG4);
+    case 86:
         if (valid_address (ARG1, 1))
            write_log (L"DBG: %s\n", get_real_address (ARG1));
         return 1;
+    case 87:
+       {
+           uae_u32 d0, d1;
+           d0 = emulib_target_getcpurate (ARG1, &d1);
+           m68k_dreg (&context->regs, 1) = d1;
+           return d0;
+       }
+
     }
     return 0;
 }