]> git.unchartedbackwaters.co.uk Git - francis/winuae.git/commitdiff
imported winuaesrc2020b10.zip
authorToni Wilen <twilen@winuae.net>
Thu, 11 Feb 2010 15:07:39 +0000 (17:07 +0200)
committerToni Wilen <twilen@winuae.net>
Mon, 22 Feb 2010 19:51:17 +0000 (21:51 +0200)
36 files changed:
archivers/dms/pfile.c
archivers/dms/pfile.h
blitter.c
cia.c
custom.c
drawing.c
include/cpu_prefetch.h
include/events.h
newcpu.c
od-win32/build68k_msvc/build68k_msvc.vcxproj
od-win32/build68k_msvc/build68k_msvc.vcxproj.filters
od-win32/dinput.c
od-win32/genblitter_msvc/genblitter_msvc.vcxproj
od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters
od-win32/gencomp_msvc/gencomp_msvc.vcxproj
od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters
od-win32/gencpu_msvc/gencpu_msvc.vcxproj
od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters
od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj
od-win32/prowizard/prowizard.vcxproj [new file with mode: 0644]
od-win32/prowizard/prowizard.vcxproj.filters [new file with mode: 0644]
od-win32/sounddep/sound.c
od-win32/srcrelease.cmd
od-win32/sysconfig.h
od-win32/uaeunp/uaeunp.vcxproj
od-win32/uaeunp/uaeunp.vcxproj.filters
od-win32/win32.c
od-win32/win32.h
od-win32/win32_uaenet.c
od-win32/winuae_msvc/winuae_msvc.vcproj
od-win32/winuae_msvc10/winuae_msvc.vcproj [new file with mode: 0644]
od-win32/winuae_msvc10/winuae_msvc.vcxproj [new file with mode: 0644]
od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters [new file with mode: 0644]
od-win32/winuaechangelog.txt
uaeunp.c
zfile.c

index fcfd473f5556838af06a62d8018092a3814ce065..e892c84b1be962924886e4316cb7690e8096cf15 100644 (file)
@@ -38,7 +38,7 @@ static int dolog = 0;
 #define DMSFLAG_ENCRYPTED 2
 #define DMSFLAG_HD 16
 
-static USHORT Process_Track(struct zfile *, struct zfile *, UCHAR *, UCHAR *, USHORT, USHORT, int);
+static USHORT Process_Track(struct zfile *, struct zfile *, UCHAR *, UCHAR *, USHORT, USHORT, int, struct zfile **extra);
 static USHORT Unpack_Track(UCHAR *, UCHAR *, USHORT, USHORT, UCHAR, UCHAR, USHORT, USHORT, USHORT, int);
 static void printbandiz(UCHAR *, USHORT);
 
@@ -54,14 +54,34 @@ static void log_error(int track)
        write_log (L"DMS: Ignored error on track %d!\n", track);
 }
 
-USHORT DMS_Process_File(struct zfile *fi, struct zfile *fo, USHORT cmd, USHORT opt, USHORT PCRC, USHORT pwd, int part)
+static void addextra(TCHAR *name, struct zfile **extra, uae_u8 *p, int size)
+{
+       int i;
+       struct zfile *zf = NULL;
+
+       if (!extra)
+               return;
+       for (i = 0; i < DMS_EXTRA_SIZE; i++) {
+               if (!extra[i])
+                       break;
+       }
+       if (i == DMS_EXTRA_SIZE)
+               return;
+       zf = zfile_fopen_empty (NULL, name, size);
+       if (!zf)
+               return;
+       zfile_fwrite (p, size, 1, zf);
+       zfile_fseek (zf, 0, SEEK_SET);
+       extra[i] = zf;
+}
+
+USHORT DMS_Process_File(struct zfile *fi, struct zfile *fo, USHORT cmd, USHORT opt, USHORT PCRC, USHORT pwd, int part, struct zfile **extra)
 {
        USHORT from, to, geninfo, c_version, cmode, hcrc, disktype, pv, ret;
        ULONG pkfsize, unpkfsize;
        UCHAR *b1, *b2;
        time_t date;
 
-
        passfound = 0;
        passretries = 2;
        b1 = (UCHAR *)calloc((size_t)TRACK_BUFFER_LEN,1);
@@ -220,11 +240,11 @@ USHORT DMS_Process_File(struct zfile *fi, struct zfile *fo, USHORT cmd, USHORT o
 
        if (cmd != CMD_VIEW) {
                if (cmd == CMD_SHOWBANNER) /*  Banner is in the first track  */
-                       ret = Process_Track(fi,NULL,b1,b2,cmd,opt,geninfo);
+                       ret = Process_Track(fi,NULL,b1,b2,cmd,opt,geninfo,extra);
                else {
                        for (;;) {
                                int ok = 0;
-                               ret = Process_Track(fi,fo,b1,b2,cmd,opt,geninfo);
+                               ret = Process_Track(fi,fo,b1,b2,cmd,opt,geninfo,extra);
                                if (ret == DMS_FILE_END)
                                        break;
                                if (ret == NO_PROBLEM)
@@ -275,9 +295,7 @@ USHORT DMS_Process_File(struct zfile *fi, struct zfile *fo, USHORT cmd, USHORT o
        return ret;
 }
 
-
-
-static USHORT Process_Track(struct zfile *fi, struct zfile *fo, UCHAR *b1, UCHAR *b2, USHORT cmd, USHORT opt, int dmsflags){
+static USHORT Process_Track(struct zfile *fi, struct zfile *fo, UCHAR *b1, UCHAR *b2, USHORT cmd, USHORT opt, int dmsflags, struct zfile **extra){
        USHORT hcrc, dcrc, usum, number, pklen1, pklen2, unpklen, l;
        UCHAR cmode, flags;
        int crcerr = 0;
@@ -343,22 +361,38 @@ static USHORT Process_Track(struct zfile *fi, struct zfile *fo, UCHAR *b1, UCHAR
                memset(b2, 0, unpklen);
                if (!crcerr)
                        Unpack_Track(b1, b2, pklen2, unpklen, cmode, flags, number, pklen1, usum, dmsflags & DMSFLAG_ENCRYPTED);
+               if (number == 0 && zfile_ftell (fo) == 512 * 22) {
+                       // did we have another cylinder 0 already?
+                       uae_u8 *p;
+                       zfile_fseek (fo, 0, SEEK_SET);
+                       p = xcalloc (512 * 22, 1);
+                       zfile_fread (p, 512 * 22, 1, fo);
+                       addextra(L"BigFakeBootBlock", extra, p, 512 * 22);
+                       xfree (p);
+               }
                zfile_fseek (fo, number * 512 * 22 * ((dmsflags & DMSFLAG_HD) ? 2 : 1), SEEK_SET);
                if (zfile_fwrite(b2,1,(size_t)unpklen,fo) != unpklen)
                        return ERR_CANTWRITE;
+       } else if (number == 0 && unpklen == 1024) {
+               memset(b2, 0, unpklen);
+               if (!crcerr)
+                       Unpack_Track(b1, b2, pklen2, unpklen, cmode, flags, number, pklen1, usum, dmsflags & DMSFLAG_ENCRYPTED);
+               addextra(L"FakeBootBlock", extra, b2, unpklen);
        }
 
        if (crcerr)
                return NO_PROBLEM;
 
-       if ((cmd == CMD_SHOWBANNER) && (number == 0xffff)){
+       if (number == 0xffff && extra){
                Unpack_Track(b1, b2, pklen2, unpklen, cmode, flags, number, pklen1, usum, dmsflags & DMSFLAG_ENCRYPTED);
-               printbandiz(b2,unpklen);
+               addextra(L"Banner", extra, b2, unpklen);
+               //printbandiz(b2,unpklen);
        }
 
-       if ((cmd == CMD_SHOWDIZ) && (number == 80)) {
+       if (number == 80 && extra) {
                Unpack_Track(b1, b2, pklen2, unpklen, cmode, flags, number, pklen1, usum, dmsflags & DMSFLAG_ENCRYPTED);
-               printbandiz(b2,unpklen);
+               addextra(L"FILEID.DIZ", extra, b2, unpklen);
+               //printbandiz(b2,unpklen);
        }
 
        return NO_PROBLEM;
index ae5c8ac7cbf1862754c9e2fb7e26afe3479a348c..c2d4e7ba292301471fb8f9268526362ad7070311 100644 (file)
@@ -38,6 +38,7 @@
 #define OPT_VERBOSE 1
 #define OPT_QUIET 2
 
+#define DMS_EXTRA_SIZE 10
 
-USHORT DMS_Process_File(struct zfile *, struct zfile *, USHORT, USHORT, USHORT, USHORT, int);
+USHORT DMS_Process_File(struct zfile *, struct zfile *, USHORT, USHORT, USHORT, USHORT, int, struct zfile **extra);
 
index 444b413c046ee3b5d821e2d44ef371a2f734a397..db251073b0299a6cc86d1c70b7d0469b02c2cac1 100644 (file)
--- a/blitter.c
+++ b/blitter.c
@@ -300,7 +300,7 @@ static void blitter_interrupt (int hpos, int done)
        if (!done && (!currprefs.blitter_cycle_exact || (currprefs.chipset_mask & CSMASK_AGA)))
                return;
        blit_interrupt = 1;
-       send_interrupt (6, 0);
+       send_interrupt (6, 3);
        if (debug_dma)
                record_dma_event (DMA_EVENT_BLITIRQ, hpos, vpos);
 }
diff --git a/cia.c b/cia.c
index b9187cfc728b8f58fc8e19d731e7bf058f26bb87..08a11d652a8ea6c984985fd5e7ceb749610371f8 100644 (file)
--- a/cia.c
+++ b/cia.c
@@ -89,7 +89,7 @@ static void RethinkICRA (void)
 {
        if (ciaaimask & ciaaicr) {
                ciaaicr |= 0x80;
-               send_interrupt (3, 0);
+               send_interrupt (3, 3);
        }
 }
 
@@ -97,7 +97,7 @@ static void RethinkICRB (void)
 {
        if (ciabimask & ciabicr) {
                ciabicr |= 0x80;
-               send_interrupt (13, 0);
+               send_interrupt (13, 3);
        }
 }
 
index 5f5138f6ad3143586d2af45d7684351821fdfcb2..35e6c0076fedf9063197f55a8f9110e53c6c3496 100644 (file)
--- a/custom.c
+++ b/custom.c
@@ -3001,7 +3001,10 @@ STATIC_INLINE int GETHPOS (void)
        return islightpentriggered () ? hpos_lpen : (issyncstopped () ? hpos_previous : current_hpos ());
 }
 
-#define HPOS_OFFSET 4
+
+// DFF006 = 0.W must be valid result
+
+#define HPOS_OFFSET 3
 
 STATIC_INLINE uae_u16 VPOSR (void)
 {
@@ -3317,21 +3320,27 @@ static void MISC_handler (void)
 STATIC_INLINE void event2_newevent_xx (int no, evt t, uae_u32 data, evfunc2 func)
 {
        evt et;
+       static int next = ev2_misc;
 
        et = t + get_cycles ();
        if (no < 0) {
-               for (no = ev2_misc; no < ev2_max; no++) {
+               no = next;
+               for (;;) {
                        if (!eventtab2[no].active)
                                break;
                        if (eventtab2[no].evtime == et && eventtab2[no].handler == func) {
                                eventtab2[no].handler (eventtab2[no].data);
                                break;
                        }
+                       no++;
+                       if (no == ev2_max)
+                               no = ev2_misc;
+                       if (no == next) {
+                               write_log (L"out of event2's! PC=%x\n", M68K_GETPC);
+                               return;
+                       }
                }
-               if (no == ev2_max) {
-                       write_log (L"out of event2's! PC=%x\n", M68K_GETPC);
-                       return;
-               }
+               next = no;
        }
        eventtab2[no].active = 1;
        eventtab2[no].evtime = et;
@@ -3392,10 +3401,16 @@ int intlev (void)
        return -1;
 }
 
-#define INT_PROCESSING_DELAY 3
-STATIC_INLINE int use_eventmode (void)
+#define INT_PROCESSING_DELAY 1
+STATIC_INLINE int use_eventmode (uae_u16 v)
 {
-       return currprefs.cpu_cycle_exact != 0 && currprefs.cpu_model == 68000;
+       if (!currprefs.cpu_cycle_exact)
+               return 0;
+       if (currprefs.cpu_cycle_exact && currprefs.cpu_model == 68000)
+               return 1;
+       if (v & 0x8000)
+               return 1;
+       return 0;
 }
 
 static void send_interrupt_do (uae_u32 v)
@@ -3405,7 +3420,7 @@ static void send_interrupt_do (uae_u32 v)
 
 void send_interrupt (int num, int delay)
 {
-       if (use_eventmode () && delay > 0) {
+       if (use_eventmode (0x8000) && delay > 0) {
                if (!(intreq & (1 << num)))
                        event2_newevent_xx (-1, delay * CYCLE_UNIT, num, send_interrupt_do);
        } else {
@@ -3429,7 +3444,12 @@ static void INTENA (uae_u16 v)
        uae_u16 old = intena;
        setclr (&intena, v);
 
-       if (use_eventmode ())
+       if (old == intena) {
+               doint ();
+               return;
+       }
+
+       if (use_eventmode (v))
                event2_newevent_xx (-1, INT_PROCESSING_DELAY * CYCLE_UNIT, intena, send_intena_do);
        else
                send_intena_do (intena);
@@ -3447,7 +3467,11 @@ void INTREQ_0 (uae_u16 v)
        if (v & (0x0080 | 0x0100 | 0x0200 | 0x0400))
                audio_update_irq (v);
 
-       if (use_eventmode ())
+       if (old == intreq) {
+               doint ();
+               return;
+       }
+       if (use_eventmode (v))
                event2_newevent_xx (-1, INT_PROCESSING_DELAY * CYCLE_UNIT, intreq, send_intreq_do);
        else
                send_intreq_do (intreq);
@@ -4261,6 +4285,11 @@ static int customdelay[]= {
        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 };
 
+static void copper_write (uae_u32 v)
+{
+       custom_wput_copper (current_hpos (), v >> 16, v & 0xffff, 0);
+}
+
 static void update_copper (int until_hpos)
 {
        int vp = vpos & (((cop_state.saved_i2 >> 8) & 0x7F) | 0x80);
@@ -4423,6 +4452,9 @@ static void update_copper (int until_hpos)
                                        cop_state.strobe = 2;
                                        cop_state.state = COP_strobe_delay1;
                                } else {
+#if 0
+                                       event2_newevent2 (1, (reg << 16) | data, copper_write);
+#else
                                        // FIX: all copper writes happen 1 cycle later than CPU writes
                                        if (customdelay[reg / 2]) {
                                                cop_state.moveaddr = reg;
@@ -4436,6 +4468,7 @@ static void update_copper (int until_hpos)
                                                        do_sprites (hpos2);
                                                }
                                        }
+#endif
                                }
 #ifdef DEBUGGER
                                if (debug_copper)
@@ -5438,10 +5471,10 @@ static void hsync_handler (void)
        // DIP Agnus (8361): vblank interrupt is triggered on line 1!
        if (currprefs.cs_dipagnus) {
                if (vpos == 1)
-                       send_interrupt (5, 0);
+                       send_interrupt (5, 1);
        } else {
                if (vpos == 0)
-                       send_interrupt (5, 0);
+                       send_interrupt (5, 1);
        }
 
 #ifdef CPUEMU_12
@@ -5694,6 +5727,7 @@ void customreset (int hardreset)
                nr_armed = 0;
 
                dmacon = 0;
+               intreq_internal = 0;
                intena = intena_internal = 0;
 
                copcon = 0;
@@ -6496,7 +6530,10 @@ uae_u8 *restore_custom (uae_u8 *src)
        dmacon = RW & ~(0x2000|0x4000); /* 096 DMACON */
        CLXCON (RW);                    /* 098 CLXCON */
        intena = intena_internal = RW;  /* 09A INTENA */
-       intreq = intreq_internal = RW | 0x20; /* 09C INTREQ */
+       intreq = RW;                    /* 09C INTREQ */
+       if (!currprefs.cs_dipagnus)
+               intreq |= 0x20;
+       intreq_internal = intreq;
        adkcon = RW;                    /* 09E ADKCON */
        for (i = 0; i < 8; i++)
                bplptx[i] = bplpt[i] = RL;
@@ -6872,22 +6909,8 @@ STATIC_INLINE void decide_fetch_ce (int hpos)
                decide_fetch (hpos);
 }
 
-STATIC_INLINE void ipl_check (void)
-{
-       if (debug_dma) {
-               if (regs.ipl == regs.ipl_pin)
-                       return;
-               regs.ipl = regs.ipl_pin;
-               record_dma_event (DMA_EVENT_INTREQ, current_hpos (), vpos);
-       } else {
-               regs.ipl = regs.ipl_pin;
-       }
-}
-
 #define BLIT_NASTY 4
 
-static int ipl_checked;
-
 // blitter not in nasty mode = CPU gets one cycle if it has been waiting
 // at least 4 cycles (all DMA cycles count, not just blitter cycles, even
 // blitter idle cycles do count!)
@@ -6921,9 +6944,6 @@ STATIC_INLINE int dma_cycle (void)
                }
                regs.ce020memcycles -= CYCLE_UNIT;
                do_cycles (1 * CYCLE_UNIT);
-               if (!ipl_checked)
-                       ipl_check ();
-               ipl_checked = 1;
                /* bus was allocated to dma channel, wait for next cycle.. */
        }
        return hpos_old;
@@ -6941,11 +6961,8 @@ uae_u32 wait_cpu_cycle_read (uaecptr addr, int mode)
        int hpos;
        struct dma_rec *dr;
 
-       ipl_checked = 0;
        hpos = dma_cycle ();
        do_cycles_ce (CYCLE_UNIT);
-       if (!ipl_checked)
-               ipl_check ();
 
 #ifdef DEBUGGER
        if (debug_dma) {
@@ -7018,11 +7035,8 @@ void wait_cpu_cycle_write (uaecptr addr, int mode, uae_u32 v)
 {
        int hpos;
 
-       ipl_checked = 0;
        hpos = dma_cycle ();
        do_cycles_ce (CYCLE_UNIT);
-       if (!ipl_checked)
-               ipl_check ();
 
 #ifdef DEBUGGER
        if (debug_dma) {
index 4135e3761ef4874652f125e6c9918190e53abbce..31de0d04941f6b6d602252985ab8466a2b2f8d23 100644 (file)
--- a/drawing.c
+++ b/drawing.c
@@ -350,7 +350,7 @@ int get_custom_limits (int *pw, int *ph, int *pdx, int *pdy)
                ret = -1;
 
        if (doublescan <= 0) {
-               int min = coord_diw_to_window_x (116);
+               int min = coord_diw_to_window_x (94);
                int max = coord_diw_to_window_x (460);
                if (diwfirstword_total < min)
                        diwfirstword_total = min;
index 0b0f4ef087093c502a1f9451821ce72826bf9c68..cd402ee1e1e1366168955828ab817e2b57f73102 100644 (file)
@@ -277,9 +277,7 @@ STATIC_INLINE uae_u32 mem_access_delay_word_read (uaecptr addr)
                return wait_cpu_cycle_read (addr, 1);
        case CE_MEMBANK_FAST:
        case CE_MEMBANK_FAST16BIT:
-               do_cycles_ce000 (2);
-               regs.ipl = regs.ipl_pin;
-               do_cycles_ce000 (2);
+               do_cycles_ce000 (4);
                break;
        }
        return get_word (addr);
@@ -291,9 +289,7 @@ STATIC_INLINE uae_u32 mem_access_delay_wordi_read (uaecptr addr)
        case CE_MEMBANK_CHIP:
                return wait_cpu_cycle_read (addr, 1);
        case CE_MEMBANK_FAST:
-               do_cycles_ce000 (2);
-               regs.ipl = regs.ipl_pin;
-               do_cycles_ce000 (2);
+               do_cycles_ce000 (4);
                break;
        }
        return get_wordi (addr);
@@ -306,9 +302,7 @@ STATIC_INLINE uae_u32 mem_access_delay_byte_read (uaecptr addr)
        case CE_MEMBANK_CHIP:
                return wait_cpu_cycle_read (addr, 0);
        case CE_MEMBANK_FAST:
-               do_cycles_ce000 (2);
-               regs.ipl = regs.ipl_pin;
-               do_cycles_ce000 (2);
+               do_cycles_ce000 (4);
                break;
 
        }
@@ -322,9 +316,7 @@ STATIC_INLINE void mem_access_delay_byte_write (uaecptr addr, uae_u32 v)
                wait_cpu_cycle_write (addr, 0, v);
                return;
        case CE_MEMBANK_FAST:
-               do_cycles_ce000 (2);
-               regs.ipl = regs.ipl_pin;
-               do_cycles_ce000 (2);
+               do_cycles_ce000 (4);
                break;
        }
        put_byte (addr, v);
@@ -338,9 +330,7 @@ STATIC_INLINE void mem_access_delay_word_write (uaecptr addr, uae_u32 v)
                return;
                break;
        case CE_MEMBANK_FAST:
-               do_cycles_ce000 (2);
-               regs.ipl = regs.ipl_pin;
-               do_cycles_ce000 (2);
+               do_cycles_ce000 (4);
                break;
        }
        put_word (addr, v);
index f3c5be4fb359df08069a3e78fa80f509f1b1408a..154e35f9bb550b63d67ab3a90b8c303fc5e30d8a 100644 (file)
@@ -57,7 +57,7 @@ enum {
 
 enum {
     ev2_blitter, ev2_disk, ev2_misc,
-    ev2_max = 8
+    ev2_max = 12
 };
 
 extern struct ev eventtab[ev_max];
index 882dd5cced37a08cd031fa62440c5006aff7e5d8..1b4226bde10b35f33390829bf69153b3669f7863 100644 (file)
--- a/newcpu.c
+++ b/newcpu.c
@@ -2590,10 +2590,7 @@ STATIC_INLINE int time_for_interrupt (void)
 void doint (void)
 {
        if (currprefs.cpu_cycle_exact) {
-               int newipl = intlev ();
-               regs.ipl_pin = newipl;
-               if (currprefs.cpu_model != 68000)
-                       regs.ipl = regs.ipl_pin;
+               regs.ipl_pin = intlev ();
                set_special (SPCFLAG_INT);
                return;
        }
@@ -2867,6 +2864,7 @@ static void m68k_run_1 (void)
                        if (do_specialties (cpu_cycles))
                                return;
                }
+               regs.ipl = regs.ipl_pin;
                if (!currprefs.cpu_compatible || (currprefs.cpu_cycle_exact && currprefs.cpu_model == 68000))
                        return;
        }
@@ -2888,6 +2886,7 @@ static void m68k_run_1_ce (void)
 {
        struct regstruct *r = &regs;
 
+       regs.ipl = regs.ipl_pin;
        for (;;) {
                uae_u32 opcode = r->ir;
                (*cpufunctbl[opcode])(opcode);
@@ -2895,6 +2894,7 @@ static void m68k_run_1_ce (void)
                        if (do_specialties (0))
                                return;
                }
+               regs.ipl = regs.ipl_pin;
                if (!currprefs.cpu_cycle_exact || currprefs.cpu_model > 68000)
                        return;
        }
@@ -3089,6 +3089,7 @@ static void m68k_run_2ce (void)
        struct regstruct *r = &regs;
        int tmpcycles = MAX68020CYCLES;
 
+       regs.ipl = regs.ipl_pin;
        for (;;) {
                uae_u32 opcode = get_word_ce020_prefetch (0);
                (*cpufunctbl[opcode])(opcode);
@@ -3106,6 +3107,7 @@ static void m68k_run_2ce (void)
                        do_cycles_ce (1 * CYCLE_UNIT);
                        tmpcycles = CYCLE_UNIT * MAX68020CYCLES;;
                }
+               regs.ipl = regs.ipl_pin;
        }
 }
 
@@ -3851,6 +3853,7 @@ void restore_cpu_finish (void)
        init_m68k ();
        m68k_setpc (regs.pc);
        set_cpu_caches ();
+       doint ();
 }
 
 uae_u8 *save_cpu (int *len, uae_u8 *dstptr)
index 2eb2fb870d6ca92d65133e6cd7ed194e71f75b9e..e0f6b0dabc481e4441c1fd5794bcbefa604cf577 100644 (file)
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
index 1542feb623d528de5c8f05f1adafc32f273b05cb..47fe46b37c5a271fcc3d364e8f8268caa87e19d6 100644 (file)
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{f5d9c253-f595-45f1-ad29-be4ff9a46bc1}</UniqueIdentifier>
+      <UniqueIdentifier>{3133564f-b672-41da-b189-9631304a07d0}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
   </ItemGroup>
index 2c8853d5ff284b7434556ad0e0a6ff12f6e3f6da..913106fcc79447c0b2f9903b3a72daf4ff7368a6 100644 (file)
@@ -1352,7 +1352,7 @@ static void trimws (TCHAR *s)
                s[--len] = '\0';
 }
 
-static BOOL CALLBACK di_enumcallback (LPCDIDEVICEINSTANCE lpddi, LPVOID *dd)
+static BOOL di_enumcallback2 (LPCDIDEVICEINSTANCE lpddi, int joy)
 {
        struct didata *did;
        int len, type;
@@ -1363,8 +1363,8 @@ static BOOL CALLBACK di_enumcallback (LPCDIDEVICEINSTANCE lpddi, LPVOID *dd)
        if (type == DI8DEVTYPE_MOUSE || type == DI8DEVTYPE_SCREENPOINTER) {
                did = di_mouse;
                typetxt = L"Mouse";
-       } else if (type == DI8DEVTYPE_GAMEPAD  || type == DI8DEVTYPE_JOYSTICK ||
-               type == DI8DEVTYPE_FLIGHT || type == DI8DEVTYPE_DRIVING || type == DI8DEVTYPE_1STPERSON) {
+       } else if ((type == DI8DEVTYPE_GAMEPAD  || type == DI8DEVTYPE_JOYSTICK || type == DI8DEVTYPE_SUPPLEMENTAL ||
+               type == DI8DEVTYPE_FLIGHT || type == DI8DEVTYPE_DRIVING || type == DI8DEVTYPE_1STPERSON) || joy) {
                        did = di_joystick;
                        typetxt = L"Game controller";
        } else if (type == DI8DEVTYPE_KEYBOARD) {
@@ -1431,6 +1431,15 @@ static BOOL CALLBACK di_enumcallback (LPCDIDEVICEINSTANCE lpddi, LPVOID *dd)
        return DIENUM_CONTINUE;
 }
 
+static BOOL CALLBACK di_enumcallback (LPCDIDEVICEINSTANCE lpddi, LPVOID *dd)
+{
+       return di_enumcallback2 (lpddi, 0);
+}
+static BOOL CALLBACK di_enumcallbackj (LPCDIDEVICEINSTANCE lpddi, LPVOID *dd)
+{
+       return di_enumcallback2 (lpddi, 1);
+}
+
 extern HINSTANCE hInst;
 static LPDIRECTINPUT8 g_lpdi;
 
@@ -1474,7 +1483,7 @@ static int di_do_init (void)
                write_log (L"DirectInput enumeration.. Pointing devices..\n");
                IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_POINTER, di_enumcallback, 0, DIEDFL_ATTACHEDONLY);
                write_log (L"DirectInput enumeration.. Game controllers..\n");
-               IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_GAMECTRL, di_enumcallback, 0, DIEDFL_ATTACHEDONLY);
+               IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_GAMECTRL, di_enumcallbackj, 0, DIEDFL_ATTACHEDONLY);
        }
        write_log (L"RawInput enumeration..\n");
        initialize_rawinput ();
index 4451aee46d5654ed418e77ab45cfce4fa74ae27a..f59602ce7f82c973dd8fbbacdd66e7feed854cdf 100644 (file)
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
index 29f0050ec294e6dfdc69915de188004449365a72..e8d1afe0b6e2a9d00ebc14c06d8cc4cfa051246d 100644 (file)
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{ec0cc585-13bf-4a0e-a027-9fe8f6ef15a4}</UniqueIdentifier>
+      <UniqueIdentifier>{decdb3b3-1173-4d69-8b51-8be056924551}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
   </ItemGroup>
index 1b7c8c80e7ba9190332936c198a31ce471597326..40f2b3fd19bf2b2c6863bf7f722a36b5bbdb5a96 100644 (file)
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
index 0e4dc681ecc234019da9f3a3c74cb35cdba94836..dc77363cb0401f86b4edadf5a309fb923b9dffd9 100644 (file)
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{9735a950-7202-4e6b-a989-fc2b5974ef43}</UniqueIdentifier>
+      <UniqueIdentifier>{6025a959-4cf1-4916-b403-90e54a13dc9e}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
   </ItemGroup>
index d0b1e2fd977466a2d67d03a259fa48d5edecc75c..4cddf6115efc88c77e3db1c93efffce1e5ffae7d 100644 (file)
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='TestRelease|Win32'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
index 16538dff8b18de28623991b6481b25e120478455..c707f41dce2fd95344e62f7821199b115541d316 100644 (file)
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{99e68131-2a40-4811-8a24-ee35d73a5526}</UniqueIdentifier>
+      <UniqueIdentifier>{e03ab946-4d92-4f82-9bfd-f808b6304cd0}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
   </ItemGroup>
index f414ed1490b7c359b48435dbdfddd13a163432dc..3ed1075c6da41decd1ad9c8acb1bd85b0d9aa19d 100644 (file)
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30128.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)'=='FullRelease|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
diff --git a/od-win32/prowizard/prowizard.vcxproj b/od-win32/prowizard/prowizard.vcxproj
new file mode 100644 (file)
index 0000000..fd38fe8
--- /dev/null
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8627DA33-98D1-4F60-B404-ECCEE0EE7BF9}</ProjectGuid>
+    <RootNamespace>prowizard</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>c:\dev\lib\prowizard.lib</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ExportNamedFunctions>prowizard_search;%(ExportNamedFunctions)</ExportNamedFunctions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Lib>
+      <OutputFile>c:\dev\lib\x64\prowizard.lib</OutputFile>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ExportNamedFunctions>prowizard_search;%(ExportNamedFunctions)</ExportNamedFunctions>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\prowizard\misc\misc.c" />
+    <ClCompile Include="..\..\prowizard\prowiz.c" />
+    <ClCompile Include="..\..\prowizard\misc\testbag.c" />
+    <ClCompile Include="..\..\prowizard\rippers\AC1D_packer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\AMOS-MusicBank.c" />
+    <ClCompile Include="..\..\prowizard\rippers\AMOS-PowerPackerBank.c" />
+    <ClCompile Include="..\..\prowizard\rippers\BP-Soundmonitor.c" />
+    <ClCompile Include="..\..\prowizard\rippers\BSI-FutureComposer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Bytekiller.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ChipTracker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Crunchmania-Address.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Crunchmania-Simple.c" />
+    <ClCompile Include="..\..\prowizard\rippers\datacrunchers.c" />
+    <ClCompile Include="..\..\prowizard\rippers\DefjamCruncher32-pro.c" />
+    <ClCompile Include="..\..\prowizard\rippers\DigiBooster17.c" />
+    <ClCompile Include="..\..\prowizard\rippers\DigitalIllusion.c" />
+    <ClCompile Include="..\..\prowizard\rippers\DoubleAction.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Dragpack100.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Dragpack252.c" />
+    <ClCompile Include="..\..\prowizard\rippers\EurekaPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\FastTracker2.c" />
+    <ClCompile Include="..\..\prowizard\rippers\FC-M-Packer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\FuchsTracker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\FutureComposer13.c" />
+    <ClCompile Include="..\..\prowizard\rippers\FutureComposer14.c" />
+    <ClCompile Include="..\..\prowizard\rippers\FuzzacPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\GameMusicCreator.c" />
+    <ClCompile Include="..\..\prowizard\rippers\GNUPacker12.c" />
+    <ClCompile Include="..\..\prowizard\rippers\GnuPlayer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\GPMO.c" />
+    <ClCompile Include="..\..\prowizard\rippers\HeatseekerMC10.c" />
+    <ClCompile Include="..\..\prowizard\rippers\HornetPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\HQC2.c" />
+    <ClCompile Include="..\..\prowizard\rippers\JamCracker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\KefrensSoundMachine.c" />
+    <ClCompile Include="..\..\prowizard\rippers\MasterCruncher30-Address.c" />
+    <ClCompile Include="..\..\prowizard\rippers\MaxPacker12.c" />
+    <ClCompile Include="..\..\prowizard\rippers\MED-Octamed.c" />
+    <ClCompile Include="..\..\prowizard\rippers\MegaCruncher-Object.c" />
+    <ClCompile Include="..\..\prowizard\rippers\MegaCruncher.c" />
+    <ClCompile Include="..\..\prowizard\rippers\MOD-compatible.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ModuleProtector.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Mugician.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Newtron.c" />
+    <ClCompile Include="..\..\prowizard\rippers\NewtronOld.c" />
+    <ClCompile Include="..\..\prowizard\rippers\NoiseFromHeaven.c" />
+    <ClCompile Include="..\..\prowizard\rippers\NoisePacker1.c" />
+    <ClCompile Include="..\..\prowizard\rippers\NoisePacker2.c" />
+    <ClCompile Include="..\..\prowizard\rippers\NoisePacker3.c" />
+    <ClCompile Include="..\..\prowizard\rippers\NoiseRunner.c" />
+    <ClCompile Include="..\..\prowizard\rippers\NovoTrade.c" />
+    <ClCompile Include="..\..\prowizard\rippers\PhaPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\PolkaPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\PowerMusic.c" />
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker23.c" />
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker30.c" />
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker40-library.c" />
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker40.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Promizer01.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Promizer10c.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Promizer18a.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Promizer20.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Promizer40.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ProPacker10.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ProPacker21.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ProPacker30.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Prorunner10.c" />
+    <ClCompile Include="..\..\prowizard\rippers\Prorunner20.c" />
+    <ClCompile Include="..\..\prowizard\rippers\QuadraComposer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\RelokIt10.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SGT-Packer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\skizzo.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SkytPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SoundFX.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SoundTracker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SoundTracker26.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SpikeCruncher.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StartrekkerPack.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StimPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StoneArtsPlayer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker270.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker299.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker299b.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker299d.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker300.c" />
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker310.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SuperCruncher27.c" />
+    <ClCompile Include="..\..\prowizard\rippers\SyncroPacker46.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TetraPack102.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TetraPack21.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TetraPack22.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TheDarkDemon.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer22a.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer30a.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer40.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer41a.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer50a.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer60a.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer61a.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TimeCruncher17.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TitanicsPlayer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TMK.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TNMCruncher.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TrackerPacker1.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TrackerPacker2.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TrackerPacker3.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TryItCruncher101.c" />
+    <ClCompile Include="..\..\prowizard\rippers\TurboSqueezer61.c" />
+    <ClCompile Include="..\..\prowizard\rippers\UnicTracker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\UnicTracker2.c" />
+    <ClCompile Include="..\..\prowizard\rippers\WantonPacker.c" />
+    <ClCompile Include="..\..\prowizard\rippers\XannPlayer.c" />
+    <ClCompile Include="..\..\prowizard\rippers\ZenPacker.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/prowizard/prowizard.vcxproj.filters b/od-win32/prowizard/prowizard.vcxproj.filters
new file mode 100644 (file)
index 0000000..2ae6d6e
--- /dev/null
@@ -0,0 +1,361 @@
+<?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>
+    <Filter Include="Source Files\Rippers">
+      <UniqueIdentifier>{ad43e6ea-ae64-4d38-b4ee-830628011061}</UniqueIdentifier>
+    </Filter>
+    <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>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\prowizard\misc\misc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\prowiz.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\misc\testbag.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\AC1D_packer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\AMOS-MusicBank.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\AMOS-PowerPackerBank.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\BP-Soundmonitor.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\BSI-FutureComposer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Bytekiller.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ChipTracker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Crunchmania-Address.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Crunchmania-Simple.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\datacrunchers.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\DefjamCruncher32-pro.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\DigiBooster17.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\DigitalIllusion.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\DoubleAction.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Dragpack100.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Dragpack252.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\EurekaPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\FastTracker2.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\FC-M-Packer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\FuchsTracker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\FutureComposer13.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\FutureComposer14.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\FuzzacPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\GameMusicCreator.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\GNUPacker12.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\GnuPlayer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\GPMO.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\HeatseekerMC10.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\HornetPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\HQC2.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\JamCracker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\KefrensSoundMachine.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\MasterCruncher30-Address.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\MaxPacker12.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\MED-Octamed.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\MegaCruncher-Object.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\MegaCruncher.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\MOD-compatible.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ModuleProtector.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Mugician.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Newtron.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\NewtronOld.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\NoiseFromHeaven.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\NoisePacker1.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\NoisePacker2.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\NoisePacker3.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\NoiseRunner.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\NovoTrade.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\PhaPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\PolkaPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\PowerMusic.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker23.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker30.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker40-library.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\PowerPacker40.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Promizer01.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Promizer10c.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Promizer18a.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Promizer20.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Promizer40.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ProPacker10.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ProPacker21.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ProPacker30.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Prorunner10.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\Prorunner20.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\QuadraComposer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\RelokIt10.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SGT-Packer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\skizzo.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SkytPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SoundFX.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SoundTracker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SoundTracker26.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SpikeCruncher.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StartrekkerPack.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StimPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StoneArtsPlayer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker270.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker299.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker299b.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker299d.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker300.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\StoneCracker310.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SuperCruncher27.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\SyncroPacker46.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TetraPack102.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TetraPack21.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TetraPack22.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TheDarkDemon.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer22a.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer30a.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer40.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer41a.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer50a.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer60a.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ThePlayer61a.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TimeCruncher17.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TitanicsPlayer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TMK.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TNMCruncher.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TrackerPacker1.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TrackerPacker2.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TrackerPacker3.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TryItCruncher101.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\TurboSqueezer61.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\UnicTracker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\UnicTracker2.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\WantonPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\XannPlayer.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\prowizard\rippers\ZenPacker.c">
+      <Filter>Source Files\Rippers</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
index d654d746e28fbfb70d889711b8d3eb51c280865a..8c491bad6171f0000b57cd7f06445b4d8fe75e10 100644 (file)
@@ -2027,36 +2027,6 @@ static void OpenALEnumerate (struct sound_device *sds, const char *pDeviceNames,
                        pDeviceNames += strlen (pDeviceNames) + 1;
        }
 }
-
-static int isdllversion (const TCHAR *name, int version, int revision, int subver, int subrev)
-{
-       DWORD  dwVersionHandle, dwFileVersionInfoSize;
-       LPVOID lpFileVersionData = NULL;
-       int ok = 0;
-
-       dwFileVersionInfoSize = GetFileVersionInfoSize (name, &dwVersionHandle);
-       if (dwFileVersionInfoSize) {
-               if (lpFileVersionData = xcalloc (1, dwFileVersionInfoSize)) {
-                       if (GetFileVersionInfo (name, dwVersionHandle, dwFileVersionInfoSize, lpFileVersionData)) {
-                               VS_FIXEDFILEINFO *vsFileInfo = NULL;
-                               UINT uLen;
-                               if (VerQueryValue (lpFileVersionData, TEXT("\\"), (void **)&vsFileInfo, &uLen)) {
-                                       if (vsFileInfo) {
-                                               uae_u64 v1 = ((uae_u64)vsFileInfo->dwProductVersionMS << 32) | vsFileInfo->dwProductVersionLS;
-                                               uae_u64 v2 = ((uae_u64)version << 48) | ((uae_u64)revision << 32) | (subver << 16) | (subrev << 0);
-                                               write_log (L"%s %d.%d.%d.%d\n", name,
-                                                       HIWORD (vsFileInfo->dwProductVersionMS), LOWORD (vsFileInfo->dwProductVersionMS),
-                                                       HIWORD (vsFileInfo->dwProductVersionLS), LOWORD (vsFileInfo->dwProductVersionLS));
-                                               if (v1 >= v2)
-                                                       ok = 1;
-                                       }
-                               }
-                       }
-                       xfree (lpFileVersionData);
-               }
-       }
-       return ok;
-}
 #define PORTAUDIO 1
 #if PORTAUDIO
 static void PortAudioEnumerate (struct sound_device *sds)
index b8a53399d3ef79f145a4229e294993a89d7d9668..398106692f41a4115992ea349686b5f0e7870182 100644 (file)
@@ -82,20 +82,20 @@ rm -rf fullrelease
 cd ..
 
 cd winuae_msvc
-rm -f winuae_msvc.plg
-rm -f winuae_msvc.8.plg
 rm -f winuae_msvc.ncb
-rm -f winuae_msvc.8.ncb
 rm -rf debug
 rm -rf release
-rm -rf debug64
-rm -rf release64
-rm -rf x64
 rm -rf fullrelease
-rm -rf _UpgradeReport_Files
 cd ..
 
-rm -rf winuae_msvc10
+cd winuae_msvc10
+rm -f winuae_msvc.ncb
+rm -f winuae_msvc.sdf
+rm -rf debug
+rm -rf release
+rm -rf fullrelease
+rm -rf ipch
+cd ..
 
 cd soundcheck
 rm -rf debug
index 39811815f7e509e5d4a70f54bb6ec95907e64392..b158afbbc8d0619bcecd755f12549c76a2f8c73a 100644 (file)
@@ -1,6 +1,7 @@
 
 #pragma warning (disable : 4761)
 #pragma warning (disable : 4996)
+#pragma warning (disable : 4018)
 
 #define DIRECTINPUT_VERSION  0x0800
 #define DIRECT3D_VERSION 0x0900
index 160ba9c63e348ccda93766d55840d91ceef49e28..b45efcfb45e67726a07970bf516efd0c43cce6bb 100644 (file)
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.21006.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.30128.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>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -69,7 +63,6 @@
       <SubSystem>Console</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <TargetMachine>MachineX86</TargetMachine>
-      <DelayLoadDLLs>wininet.dll</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     </ClCompile>
     <Link>
       <AdditionalDependencies>zlibstat.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <DelayLoadDLLs>wininet.dll</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
index 0ec464361562ed5414d5e01b79da9d98d132719f..bec54a4af0e187fc088158887dd418b8432eb5c5 100644 (file)
@@ -1,85 +1,67 @@
 ï»¿<?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>{74332802-0dea-481d-8688-6ea8ca3894c9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\decompressors\7z">
-      <UniqueIdentifier>{1d6748ee-1e71-4481-b70b-48abbd6579e1}</UniqueIdentifier>
+      <UniqueIdentifier>{025b82fd-637e-4580-b73d-e9cb2b1704f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\decompressors\dms">
-      <UniqueIdentifier>{9a350565-10e0-4d98-af19-c89cf863c69d}</UniqueIdentifier>
+      <UniqueIdentifier>{f793e865-aaaa-4a92-ab71-042c6df63370}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\decompressors\7z">
+      <UniqueIdentifier>{30815150-3af4-4642-a7b0-2f0a84e9184b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\decompressors\lha">
-      <UniqueIdentifier>{7b5944b8-15c4-46bf-b99c-24b604e0a523}</UniqueIdentifier>
+      <UniqueIdentifier>{26e2cd32-bb63-4be1-8ce7-17a2670fbe68}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\decompressors\lzx">
-      <UniqueIdentifier>{3b89358e-ed9f-42d8-a330-90ad0878add0}</UniqueIdentifier>
+    <Filter Include="Source Files\decompressors\zip">
+      <UniqueIdentifier>{02dd9255-7ba8-4931-8ed9-382100420cd3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\decompressors\wrp">
-      <UniqueIdentifier>{43f24f87-b713-4df6-aeac-884f63457258}</UniqueIdentifier>
+    <Filter Include="Source Files\decompressors\lzx">
+      <UniqueIdentifier>{9744d4a4-039b-43f0-a43b-2a3911cf429b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\decompressors\xfd">
-      <UniqueIdentifier>{0f91f71a-54cd-4ee8-b2d2-71e72654b6f7}</UniqueIdentifier>
+      <UniqueIdentifier>{7a6a4d5c-b3f7-40e3-922d-ebf5ed25ac7f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\decompressors\zip">
-      <UniqueIdentifier>{c14490cb-e12c-4dea-9399-f34fd8d6cf23}</UniqueIdentifier>
+    <Filter Include="Source Files\decompressors\wrp">
+      <UniqueIdentifier>{e74cec8e-0727-401b-bea6-57f78b869c7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files\win32">
-      <UniqueIdentifier>{9656c755-8b1f-4d77-b6ce-ef9f7c8405e2}</UniqueIdentifier>
+      <UniqueIdentifier>{1227b1a8-96c7-40ea-961b-03ac23a184bf}</UniqueIdentifier>
+    </Filter>
+    <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>
   </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 Include="..\..\crc32.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zIn.c">
-      <Filter>Source Files\decompressors\7z</Filter>
+    <ClCompile Include="..\..\diskutil.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zItem.c">
-      <Filter>Source Files\decompressors\7z</Filter>
+    <ClCompile Include="..\..\fdi2raw.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\archivers\7z\Bcj2.c">
-      <Filter>Source Files\decompressors\7z</Filter>
+    <ClCompile Include="..\..\missing.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\archivers\7z\Bra.c">
-      <Filter>Source Files\decompressors\7z</Filter>
+    <ClCompile Include="..\..\uaeunp.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\archivers\7z\Bra86.c">
-      <Filter>Source Files\decompressors\7z</Filter>
+    <ClCompile Include="..\..\zfile.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\archivers\7z\LzmaDec.c">
-      <Filter>Source Files\decompressors\7z</Filter>
+    <ClCompile Include="..\..\zfile_archive.c">
+      <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\archivers\dms\crc_csum.c">
       <Filter>Source Files\decompressors\dms</Filter>
     <ClCompile Include="..\..\archivers\dms\u_rle.c">
       <Filter>Source Files\decompressors\dms</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zAlloc.c">
+      <Filter>Source Files\decompressors\7z</Filter>
+    </ClCompile>
+    <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\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\7zStream.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\lha\crcio.c">
       <Filter>Source Files\decompressors\lha</Filter>
     </ClCompile>
     <ClCompile Include="..\..\archivers\lha\util.c">
       <Filter>Source Files\decompressors\lha</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\archivers\zip\unzip.c">
+      <Filter>Source Files\decompressors\zip</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>
index f033b5874697d4a5dc6cb427701490c66a23a87c..68ffccbc366bf61a285b4b6b30db4e971bc4b618 100644 (file)
@@ -4805,6 +4805,35 @@ HMODULE WIN32_LoadLibrary2 (const TCHAR *name)
        return m;
 }
 
+int isdllversion (const TCHAR *name, int version, int revision, int subver, int subrev)
+{
+       DWORD  dwVersionHandle, dwFileVersionInfoSize;
+       LPVOID lpFileVersionData = NULL;
+       int ok = 0;
+
+       dwFileVersionInfoSize = GetFileVersionInfoSize (name, &dwVersionHandle);
+       if (dwFileVersionInfoSize) {
+               if (lpFileVersionData = xcalloc (1, dwFileVersionInfoSize)) {
+                       if (GetFileVersionInfo (name, dwVersionHandle, dwFileVersionInfoSize, lpFileVersionData)) {
+                               VS_FIXEDFILEINFO *vsFileInfo = NULL;
+                               UINT uLen;
+                               if (VerQueryValue (lpFileVersionData, TEXT("\\"), (void **)&vsFileInfo, &uLen)) {
+                                       if (vsFileInfo) {
+                                               uae_u64 v1 = ((uae_u64)vsFileInfo->dwProductVersionMS << 32) | vsFileInfo->dwProductVersionLS;
+                                               uae_u64 v2 = ((uae_u64)version << 48) | ((uae_u64)revision << 32) | (subver << 16) | (subrev << 0);
+                                               write_log (L"%s %d.%d.%d.%d\n", name,
+                                                       HIWORD (vsFileInfo->dwProductVersionMS), LOWORD (vsFileInfo->dwProductVersionMS),
+                                                       HIWORD (vsFileInfo->dwProductVersionLS), LOWORD (vsFileInfo->dwProductVersionLS));
+                                               if (v1 >= v2)
+                                                       ok = 1;
+                                       }
+                               }
+                       }
+                       xfree (lpFileVersionData);
+               }
+       }
+       return ok;
+}
 
 int get_guid_target (uae_u8 *out)
 {
index 2a094c5bfa57b33f9802639128418631d428542b..0b20ff39694ccc45770f06862f4a3727b9b71aa1 100644 (file)
@@ -18,8 +18,8 @@
 #define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
 
-#define WINUAEBETA L"9"
-#define WINUAEDATE MAKEBD(2010, 2, 7)
+#define WINUAEBETA L"10"
+#define WINUAEDATE MAKEBD(2010, 2, 10)
 #define WINUAEEXTRA L""
 #define WINUAEREV L""
 
@@ -134,6 +134,7 @@ void associate_file_extensions (void);
 #define WIN32_PLUGINDIR L"plugins\\"
 HMODULE WIN32_LoadLibrary (const TCHAR *);
 HMODULE WIN32_LoadLibrary2 (const TCHAR *);
+int isdllversion (const TCHAR *name, int version, int revision, int subver, int subrev);
 
 extern int screenshot_prepare (void);
 extern void screenshot_free (void);
index e59d9f889710c3b0e154fc18946f87bb69a9106b..0354ac9d9e88e562fcb9b58007bf015071170c6c 100644 (file)
@@ -333,6 +333,11 @@ struct netdriverdata *uaenet_enumerate (struct netdriverdata **out, const TCHAR
                return NULL;
        }
        FreeLibrary (hm);
+       if (!isdllversion (L"wpcap.dll", 4, 0, 0, 0)) {
+               write_log (L"uaenet: too old winpcap, v4 or newer required\n");
+               return NULL;
+       }
+
        ss = au (pcap_lib_version ());
        if (!done)
                write_log (L"uaenet: %s\n", ss);
index b59c515ed263729878bb31f3a9005663df8dcab6..6997bfbff21cd96c1d80483ad4b608430259b1a7 100644 (file)
@@ -93,6 +93,7 @@
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                GenerateManifest="false"
+                               IgnoreDefaultLibraryNames="LIBCMT"
                                DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile=".\Debug/winuae.pdb"
                                AdditionalLibraryDirectories=""
                                GenerateManifest="false"
                                AdditionalManifestDependencies=""
+                               IgnoreDefaultLibraryNames=""
                                DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;wininet.dll"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile=".\Release/winuae.pdb"
                                AdditionalLibraryDirectories=""
                                GenerateManifest="false"
                                AdditionalManifestDependencies=""
+                               IgnoreDefaultLibraryNames=""
                                DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;wininet.dll"
                                GenerateDebugInformation="true"
                                ProgramDatabaseFile=".\FullRelease/winuae.pdb"
diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcproj b/od-win32/winuae_msvc10/winuae_msvc.vcproj
new file mode 100644 (file)
index 0000000..6997bfb
--- /dev/null
@@ -0,0 +1,1815 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9,00"
+       Name="winuae"
+       ProjectGUID="{4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}"
+       RootNamespace="winuae"
+       TargetFrameworkVersion="131072"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+               <Platform
+                       Name="x64"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include,..\tun"
+                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO"
+                               GeneratePreprocessedFile="0"
+                               KeepComments="false"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               BufferSecurityCheck="true"
+                               RuntimeTypeInfo="false"
+                               PrecompiledHeaderFile=".\Debug/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Debug/"
+                               ObjectFile=".\Debug/"
+                               ProgramDataBaseFileName=".\Debug/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               Detect64BitPortabilityProblems="false"
+                               DebugInformationFormat="4"
+                               CallingConvention="2"
+                               CompileAs="0"
+                               DisableSpecificWarnings="4996"
+                               EnablePREfast="false"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalOptions="/MACHINE:I386"
+                               AdditionalDependencies="ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib dxerr.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib wpcap.lib packet.lib openal32.lib wintab32.lib portaudio_x86.lib freetype.lib vfw32.lib wtsapi32.lib avrt.lib wininet.lib enet.lib prowizard.lib"
+                               ShowProgress="0"
+                               OutputFile="d:\amiga\winuae.exe"
+                               LinkIncremental="2"
+                               SuppressStartupBanner="true"
+                               GenerateManifest="false"
+                               IgnoreDefaultLibraryNames="LIBCMT"
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\Debug/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="2621440"
+                               StackCommitSize="2621440"
+                               LargeAddressAware="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae.exe.manifest"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Debug|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\Debug/winuae_msvc.tlb"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               AdditionalOptions=""
+                               Optimization="0"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include,..\tun"
+                               PreprocessorDefinitions="WINVER=0x0500,_DEBUG,WIN32_IE=0x0700;WIN32;WIN64;CINTERFACE;COBJMACROS;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="1"
+                               BufferSecurityCheck="true"
+                               RuntimeTypeInfo="true"
+                               PrecompiledHeaderFile=".\Debug64/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Debug/"
+                               ObjectFile=".\Debug/"
+                               ProgramDataBaseFileName=".\Debug/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               Detect64BitPortabilityProblems="true"
+                               DebugInformationFormat="3"
+                               CallingConvention="2"
+                               CompileAs="0"
+                               DisableSpecificWarnings="4996"
+                               EnablePREfast="false"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="_DEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib setupapi.lib wininet.lib dxerr.lib shlwapi.lib zlibstat.lib portaudio_x64.lib packet.lib wpcap.lib openal32.lib libpng.lib lglcd.lib wtsapi32.lib wntab32x.lib enet_x64.lib prowizard.lib"
+                               OutputFile="d:\amiga\winuae64.exe"
+                               LinkIncremental="2"
+                               SuppressStartupBanner="true"
+                               GenerateManifest="false"
+                               IgnoreDefaultLibraryNames="MSVCRT.lib"
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\Debug/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="2621440"
+                               StackCommitSize="2621440"
+                               LargeAddressAware="2"
+                               RandomizedBaseAddress="1"
+                               DataExecutionPrevention="0"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae64.exe.manifest"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\Release/winuae_msvc.tlb"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="3"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               FavorSizeOrSpeed="1"
+                               OmitFramePointers="true"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include"
+                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS"
+                               StringPooling="true"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="0"
+                               BufferSecurityCheck="false"
+                               EnableFunctionLevelLinking="false"
+                               EnableEnhancedInstructionSet="0"
+                               FloatingPointModel="0"
+                               TreatWChar_tAsBuiltInType="false"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Release/"
+                               ObjectFile=".\Release/"
+                               ProgramDataBaseFileName=".\Release/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               CallingConvention="2"
+                               CompileAs="0"
+                               DisableSpecificWarnings="4996"
+                               ForcedIncludeFiles=""
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib dxerr.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib wpcap.lib packet.lib openal32.lib wintab32.lib portaudio_x86.lib freetype.lib vfw32.lib wtsapi32.lib avrt.lib wininet.lib enet.lib prowizard.lib"
+                               OutputFile="d:\amiga\winuae.exe"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
+                               GenerateManifest="false"
+                               AdditionalManifestDependencies=""
+                               IgnoreDefaultLibraryNames=""
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;wininet.dll"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\Release/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="2621440"
+                               StackCommitSize="2621440"
+                               LargeAddressAware="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               OptimizeForWindows98="0"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="2"
+                               FixedBaseAddress="1"
+                               DataExecutionPrevention="2"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae9.exe.manifest"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\Release/winuae_msvc.tlb"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="3"
+                               InlineFunctionExpansion="1"
+                               EnableIntrinsicFunctions="true"
+                               FavorSizeOrSpeed="1"
+                               OmitFramePointers="true"
+                               WholeProgramOptimization="false"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
+                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;CINTERFACE;COBJMACROS"
+                               StringPooling="true"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="0"
+                               BufferSecurityCheck="false"
+                               EnableFunctionLevelLinking="true"
+                               EnableEnhancedInstructionSet="0"
+                               FloatingPointModel="0"
+                               TreatWChar_tAsBuiltInType="false"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\Release/winuae_msvc.pch"
+                               AssemblerListingLocation=".\Release/"
+                               ObjectFile=".\Release/"
+                               ProgramDataBaseFileName=".\Release/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               CallingConvention="2"
+                               CompileAs="0"
+                               DisableSpecificWarnings="4996"
+                               ForcedIncludeFiles=""
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib setupapi.lib wininet.lib dxerr.lib shlwapi.lib zlibstat.lib portaudio_x64.lib packet.lib wpcap.lib openal32.lib libpng.lib lglcd.lib wtsapi32.lib wntab32x.lib enet_x64.lib prowizard.lib"
+                               ShowProgress="0"
+                               OutputFile="d:\amiga\winuae64.exe"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
+                               GenerateManifest="true"
+                               IgnoreDefaultLibraryNames="MSVCRT.lib"
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\Release/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="0"
+                               StackCommitSize="0"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               OptimizeForWindows98="0"
+                               LinkTimeCodeGeneration="0"
+                               RandomizedBaseAddress="2"
+                               FixedBaseAddress="1"
+                               DataExecutionPrevention="2"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae64.exe.manifest"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="FullRelease|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="1"
+                               TypeLibraryName=".\Release/winuae_msvc.tlb"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="3"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               FavorSizeOrSpeed="1"
+                               OmitFramePointers="true"
+                               WholeProgramOptimization="true"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep,..\..\prowizard\include"
+                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS"
+                               StringPooling="true"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="0"
+                               BufferSecurityCheck="false"
+                               EnableFunctionLevelLinking="true"
+                               EnableEnhancedInstructionSet="0"
+                               FloatingPointModel="0"
+                               TreatWChar_tAsBuiltInType="false"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\FullRelease/winuae_msvc.pch"
+                               AssemblerListingLocation=".\FullRelease/"
+                               ObjectFile=".\FullRelease/"
+                               ProgramDataBaseFileName=".\FullRelease/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               CallingConvention="2"
+                               CompileAs="0"
+                               DisableSpecificWarnings="4996"
+                               ForcedIncludeFiles=""
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib winio.lib setupapi.lib wininet.lib dxerr.lib shlwapi.lib zlibstat.lib libpng.lib lglcd.lib wpcap.lib packet.lib openal32.lib wintab32.lib portaudio_x86.lib freetype.lib vfw32.lib wtsapi32.lib avrt.lib wininet.lib enet.lib prowizard.lib"
+                               OutputFile="d:\amiga\winuae.exe"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
+                               GenerateManifest="false"
+                               AdditionalManifestDependencies=""
+                               IgnoreDefaultLibraryNames=""
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;wininet.dll"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\FullRelease/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="2621440"
+                               StackCommitSize="2621440"
+                               LargeAddressAware="2"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               OptimizeForWindows98="0"
+                               LinkTimeCodeGeneration="1"
+                               RandomizedBaseAddress="2"
+                               FixedBaseAddress="1"
+                               DataExecutionPrevention="2"
+                               TargetMachine="1"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae9.exe.manifest"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="FullRelease|x64"
+                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+                       ConfigurationType="1"
+                       UseOfMFC="0"
+                       ATLMinimizesCRunTimeLibraryUsage="false"
+                       CharacterSet="1"
+                       WholeProgramOptimization="1"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               MkTypLibCompatible="true"
+                               SuppressStartupBanner="true"
+                               TargetEnvironment="3"
+                               TypeLibraryName=".\Release/winuae_msvc.tlb"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="3"
+                               InlineFunctionExpansion="2"
+                               EnableIntrinsicFunctions="true"
+                               FavorSizeOrSpeed="1"
+                               OmitFramePointers="true"
+                               WholeProgramOptimization="true"
+                               AdditionalIncludeDirectories="..\..\include,..\..,..\,..\resources,..\osdep,..\sounddep"
+                               PreprocessorDefinitions="WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;CINTERFACE;COBJMACROS"
+                               StringPooling="true"
+                               ExceptionHandling="0"
+                               BasicRuntimeChecks="0"
+                               RuntimeLibrary="0"
+                               BufferSecurityCheck="false"
+                               EnableFunctionLevelLinking="true"
+                               EnableEnhancedInstructionSet="0"
+                               FloatingPointModel="0"
+                               TreatWChar_tAsBuiltInType="false"
+                               RuntimeTypeInfo="false"
+                               UsePrecompiledHeader="0"
+                               PrecompiledHeaderFile=".\FullRelease/winuae_msvc.pch"
+                               AssemblerListingLocation=".\FullRelease/"
+                               ObjectFile=".\FullRelease/"
+                               ProgramDataBaseFileName=".\FullRelease/"
+                               WarningLevel="3"
+                               SuppressStartupBanner="true"
+                               CallingConvention="2"
+                               CompileAs="0"
+                               DisableSpecificWarnings="4996"
+                               ForcedIncludeFiles=""
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                               PreprocessorDefinitions="NDEBUG"
+                               Culture="1033"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLinkerTool"
+                               AdditionalDependencies="ws2_32.lib ddraw.lib dxguid.lib winmm.lib comctl32.lib version.lib vfw32.lib msacm32.lib dsound.lib dinput8.lib d3d9.lib d3dx9.lib setupapi.lib wininet.lib dxerr.lib shlwapi.lib zlibstat.lib portaudio_x64.lib packet.lib wpcap.lib openal32.lib libpng.lib lglcd.lib wtsapi32.lib wntab32x.lib enet_x64.lib prowizard.lib"
+                               ShowProgress="0"
+                               OutputFile="d:\amiga\winuae64.exe"
+                               LinkIncremental="1"
+                               SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
+                               GenerateManifest="false"
+                               IgnoreDefaultLibraryNames="MSVCRT.lib"
+                               DelayLoadDLLs="wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll"
+                               GenerateDebugInformation="true"
+                               ProgramDatabaseFile=".\FullRelease/winuae.pdb"
+                               SubSystem="2"
+                               StackReserveSize="0"
+                               StackCommitSize="0"
+                               OptimizeReferences="2"
+                               EnableCOMDATFolding="2"
+                               OptimizeForWindows98="0"
+                               LinkTimeCodeGeneration="1"
+                               RandomizedBaseAddress="2"
+                               FixedBaseAddress="1"
+                               DataExecutionPrevention="2"
+                               TargetMachine="17"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCManifestTool"
+                               AdditionalManifestFiles="..\resources\winuae64.exe.manifest"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCAppVerifierTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="win32"
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                       >
+                       <File
+                               RelativePath="..\ahidsound_dsonly.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\ahidsound_new.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\avioutput.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\blkdev_win32_aspi.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\blkdev_win32_ioctl.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\blkdev_win32_spti.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\bsdsock.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\caps\caps_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\clipboard_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\debug_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\dinput.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\direct3d.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\driveclick_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\dxwrap.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\fsdb_mywin32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\fsdb_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\hardfile_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\hq2x_d3d.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\ioport.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\keyboard_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\lcd.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\midi.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\mman.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\parser.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\picasso96_win.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\posixemu.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\registry.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\cloanto\RetroPlatformGuestIPC.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\rp.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\scaler.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\scaler_more.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\screenshot.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\serial_win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\sounddep\sound.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\unicode.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\win32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\win32_scale2x.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\win32_uaenet.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\win32gfx.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\win32gui.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\win32gui_extra.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\writelog.c"
+                               >
+                       </File>
+                       <Filter
+                               Name="Resource Files"
+                               Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+                               >
+                               <File
+                                       RelativePath="..\resources\35floppy.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\amigainfo.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\avioutput.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\chip.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\configfile.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\configfile.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\cpu.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\diskimage.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\diskimage.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\Drive.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\expansion.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\expansion.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\file.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\file.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\folder.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\h_arrow.cur"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\icon3.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\joystick.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\lcd.bmp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\misc.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\move_dow.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\move_up.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\paths.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\port.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath=".\port.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\quickstart.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\root.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\screen.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\sound.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\winuae.ico"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\resources\winuae.rc"
+                                       >
+                                       <FileConfiguration
+                                               Name="Debug|Win32"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="Debug|x64"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="Release|Win32"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="Release|x64"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="FullRelease|Win32"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="FullRelease|x64"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="TestRelease|x64"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="Release64|x64"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="Debug64|Win32"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="Debug64|x64"
+                                               >
+                                               <Tool
+                                                       Name="VCResourceCompilerTool"
+                                                       AdditionalIncludeDirectories="\projects\winuae\src\od-win32\resources;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                               </File>
+                               <File
+                                       RelativePath="..\resources\xarcade-winuae.bmp"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="common"
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                       >
+                       <File
+                               RelativePath="..\..\a2065.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\a2091.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\akiko.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\amax.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\ar.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\arcadia.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\audio.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\autoconf.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\blitfunc.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\blittable.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\blitter.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\blkdev.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\blkdev_cdimage.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\bsdsocket.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\catweasel.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cd32_fmv.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cdrom.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cdtv.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cfgfile.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cia.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\consolehook.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpudefs.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpuemu_0.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpuemu_11.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpuemu_12.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpuemu_20.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpuemu_31.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpummu.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cpustbl.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\crc32.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\custom.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\debug.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\disk.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\diskutil.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\dongle.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\drawing.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\driveclick.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\enforcer.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\epsonprinter.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\ersatz.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\expansion.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\fdi2raw.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\filesys.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\fpp.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\fsdb.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\fsusage.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\gayle.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\gfxutil.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\hardfile.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\identify.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\inputdevice.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\keybuf.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\main.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\memory.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\missing.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\native2amiga.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\ncr_scsi.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\newcpu.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\readcpu.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\rommgr.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sampler.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\sana2.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\savestate.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\scsi.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\scsiemul.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\traps.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\uaeexe.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\uaeipc.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\uaelib.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\uaeresource.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\uaeserial.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\zfile.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\zfile_archive.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="jit"
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                       >
+                       <File
+                               RelativePath="..\..\jit\compemu.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\jit\compemu_fpp.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\jit\compemu_support.c"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\jit\compstbl.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="prowizard"
+                       >
+                       <File
+                               RelativePath="..\..\moduleripper.c"
+                               >
+                       </File>
+               </Filter>
+               <Filter
+                       Name="decompressors"
+                       >
+                       <Filter
+                               Name="dms"
+                               >
+                               <File
+                                       RelativePath="..\..\archivers\dms\crc_csum.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\getbits.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\maketbl.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\pfile.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\tables.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\u_deep.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\u_heavy.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\u_init.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\u_medium.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\u_quick.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\dms\u_rle.c"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="7z"
+                               >
+                               <File
+                                       RelativePath="..\..\archivers\7z\Archive\7z\7zAlloc.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\7zBuf.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\7zCrc.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Archive\7z\7zDecode.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Archive\7z\7zExtract.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Archive\7z\7zHeader.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Archive\7z\7zIn.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Archive\7z\7zItem.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\7zStream.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Bcj2.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Bra.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\Bra86.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\7z\LzmaDec.c"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="lha"
+                               >
+                               <File
+                                       RelativePath="..\..\archivers\lha\crcio.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\dhuf.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\header.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\huf.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\larc.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\lhamaketbl.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\lharc.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\shuf.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\slide.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\uae_lha.c"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\archivers\lha\util.c"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="zip"
+                               >
+                               <File
+                                       RelativePath="..\..\archivers\zip\unzip.c"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="lzx"
+                               >
+                               <File
+                                       RelativePath="..\..\archivers\lzx\unlzx.c"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="xfd"
+                               >
+                       </Filter>
+                       <Filter
+                               Name="wrp"
+                               >
+                               <File
+                                       RelativePath="..\..\archivers\wrp\warp.c"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <File
+                       RelativePath="..\resources\drive_click.wav"
+                       >
+               </File>
+               <File
+                       RelativePath="..\resources\drive_snatch.wav"
+                       >
+               </File>
+               <File
+                       RelativePath="..\resources\drive_spin.wav"
+                       >
+               </File>
+               <File
+                       RelativePath="..\resources\drive_spinnd.wav"
+                       >
+               </File>
+               <File
+                       RelativePath="..\resources\drive_startup.wav"
+                       >
+               </File>
+               <File
+                       RelativePath="..\hq2x16.obj"
+                       >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="FullRelease|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\hq2x32.obj"
+                       >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="FullRelease|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\hq3x16.obj"
+                       >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="FullRelease|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\hq3x32.obj"
+                       >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="FullRelease|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\hq4x16.obj"
+                       >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="FullRelease|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\hq4x32.obj"
+                       >
+                       <FileConfiguration
+                               Name="Debug|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="Release|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+                       <FileConfiguration
+                               Name="FullRelease|x64"
+                               ExcludedFromBuild="true"
+                               >
+                               <Tool
+                                       Name="VCCustomBuildTool"
+                               />
+                       </FileConfiguration>
+               </File>
+               <File
+                       RelativePath="..\resources\resource"
+                       >
+               </File>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>
diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj b/od-win32/winuae_msvc10/winuae_msvc.vcxproj
new file mode 100644 (file)
index 0000000..1a6d314
--- /dev/null
@@ -0,0 +1,765 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FullRelease|Win32">
+      <Configuration>FullRelease</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="FullRelease|x64">
+      <Configuration>FullRelease</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>winuae</ProjectName>
+    <ProjectGuid>{4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA}</ProjectGuid>
+    <RootNamespace>winuae</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30128.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>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <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>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">d:\amiga\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">true</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/winuae_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <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;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessToFile>false</PreprocessToFile>
+      <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
+      <PreprocessKeepComments>false</PreprocessKeepComments>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeaderOutputFile>.\Debug/winuae_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;wintab32.lib;portaudio_x86.lib;freetype.lib;vfw32.lib;wtsapi32.lib;avrt.lib;wininet.lib;enet.lib;prowizard.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>d:\amiga\winuae.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/winuae.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>2621440</StackReserveSize>
+      <StackCommitSize>2621440</StackCommitSize>
+      <LargeAddressAware>true</LargeAddressAware>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>..\resources\winuae.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Debug/winuae_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;..\tun;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;CINTERFACE;COBJMACROS;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeaderOutputFile>.\Debug64/winuae_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
+      <ObjectFileName>.\Debug/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <EnablePREfast>false</EnablePREfast>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>d:\amiga\winuae64.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Debug/winuae.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>2621440</StackReserveSize>
+      <StackCommitSize>2621440</StackCommitSize>
+      <LargeAddressAware>true</LargeAddressAware>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/winuae_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/winuae_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;wintab32.lib;portaudio_x86.lib;freetype.lib;vfw32.lib;wtsapi32.lib;avrt.lib;wininet.lib;enet.lib;prowizard.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>d:\amiga\winuae.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalManifestDependencies>%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Release/winuae.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>2621440</StackReserveSize>
+      <StackCommitSize>2621440</StackCommitSize>
+      <LargeAddressAware>true</LargeAddressAware>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>..\resources\winuae.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Release/winuae_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\Release/winuae_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>d:\amiga\winuae64.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\Release/winuae.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>0</StackReserveSize>
+      <StackCommitSize>0</StackCommitSize>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>
+      </LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/winuae_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;..\..\prowizard\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\FullRelease/winuae_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\FullRelease/</AssemblerListingLocation>
+      <ObjectFileName>.\FullRelease/</ObjectFileName>
+      <ProgramDataBaseFileName>.\FullRelease/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;winio.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;libpng.lib;lglcd.lib;wpcap.lib;packet.lib;openal32.lib;wintab32.lib;portaudio_x86.lib;freetype.lib;vfw32.lib;wtsapi32.lib;avrt.lib;wininet.lib;enet.lib;prowizard.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>d:\amiga\winuae.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalManifestDependencies>%(AdditionalManifestDependencies)</AdditionalManifestDependencies>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x86.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;wininet.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\FullRelease/winuae.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>2621440</StackReserveSize>
+      <StackCommitSize>2621440</StackCommitSize>
+      <LargeAddressAware>true</LargeAddressAware>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>..\resources\winuae9.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\Release/winuae_msvc.tlb</TypeLibraryName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalIncludeDirectories>..\..\include;..\..;..\;..\resources;..\osdep;..\sounddep;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WINVER=0x0500;NDEBUG;_WIN32_IE=0x0700;WIN32;WIN64;CINTERFACE;COBJMACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <ExceptionHandling>
+      </ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
+      <FloatingPointModel>Precise</FloatingPointModel>
+      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\FullRelease/winuae_msvc.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\FullRelease/</AssemblerListingLocation>
+      <ObjectFileName>.\FullRelease/</ObjectFileName>
+      <ProgramDataBaseFileName>.\FullRelease/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <ForcedIncludeFiles>%(ForcedIncludeFiles)</ForcedIncludeFiles>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;ddraw.lib;dxguid.lib;winmm.lib;comctl32.lib;version.lib;vfw32.lib;msacm32.lib;dsound.lib;dinput8.lib;d3d9.lib;d3dx9.lib;setupapi.lib;wininet.lib;dxerr.lib;shlwapi.lib;zlibstat.lib;portaudio_x64.lib;packet.lib;wpcap.lib;openal32.lib;libpng.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ShowProgress>NotSet</ShowProgress>
+      <OutputFile>d:\amiga\winuae64.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>MSVCRT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;freetype6.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\FullRelease/winuae.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <StackReserveSize>0</StackReserveSize>
+      <StackCommitSize>0</StackCommitSize>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <DataExecutionPrevention>true</DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+    <Manifest>
+      <AdditionalManifestFiles>..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
+    </Manifest>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\ahidsound_dsonly.c" />
+    <ClCompile Include="..\ahidsound_new.c" />
+    <ClCompile Include="..\avioutput.c" />
+    <ClCompile Include="..\blkdev_win32_aspi.c" />
+    <ClCompile Include="..\blkdev_win32_ioctl.c" />
+    <ClCompile Include="..\blkdev_win32_spti.c" />
+    <ClCompile Include="..\bsdsock.c" />
+    <ClCompile Include="..\caps\caps_win32.c" />
+    <ClCompile Include="..\clipboard_win32.c" />
+    <ClCompile Include="..\debug_win32.c" />
+    <ClCompile Include="..\dinput.c" />
+    <ClCompile Include="..\direct3d.cpp" />
+    <ClCompile Include="..\driveclick_win32.c" />
+    <ClCompile Include="..\dxwrap.c" />
+    <ClCompile Include="..\fsdb_mywin32.c" />
+    <ClCompile Include="..\fsdb_win32.c" />
+    <ClCompile Include="..\hardfile_win32.c" />
+    <ClCompile Include="..\hq2x_d3d.c" />
+    <ClCompile Include="..\ioport.c" />
+    <ClCompile Include="..\keyboard_win32.c" />
+    <ClCompile Include="..\lcd.c" />
+    <ClCompile Include="..\midi.c" />
+    <ClCompile Include="..\mman.c" />
+    <ClCompile Include="..\parser.c" />
+    <ClCompile Include="..\picasso96_win.c" />
+    <ClCompile Include="..\posixemu.c" />
+    <ClCompile Include="..\registry.c" />
+    <ClCompile Include="..\cloanto\RetroPlatformGuestIPC.c" />
+    <ClCompile Include="..\rp.c" />
+    <ClCompile Include="..\scaler.c" />
+    <ClCompile Include="..\scaler_more.c" />
+    <ClCompile Include="..\screenshot.c" />
+    <ClCompile Include="..\serial_win32.c" />
+    <ClCompile Include="..\sounddep\sound.c" />
+    <ClCompile Include="..\unicode.c" />
+    <ClCompile Include="..\win32.c" />
+    <ClCompile Include="..\win32_scale2x.c" />
+    <ClCompile Include="..\win32_uaenet.c" />
+    <ClCompile Include="..\win32gfx.c" />
+    <ClCompile Include="..\win32gui.c" />
+    <ClCompile Include="..\win32gui_extra.c" />
+    <ClCompile Include="..\writelog.c" />
+    <ClCompile Include="..\..\a2065.c" />
+    <ClCompile Include="..\..\a2091.c" />
+    <ClCompile Include="..\..\akiko.c" />
+    <ClCompile Include="..\..\amax.c" />
+    <ClCompile Include="..\..\ar.c" />
+    <ClCompile Include="..\..\arcadia.c" />
+    <ClCompile Include="..\..\audio.c" />
+    <ClCompile Include="..\..\autoconf.c" />
+    <ClCompile Include="..\..\blitfunc.c" />
+    <ClCompile Include="..\..\blittable.c" />
+    <ClCompile Include="..\..\blitter.c" />
+    <ClCompile Include="..\..\blkdev.c" />
+    <ClCompile Include="..\..\blkdev_cdimage.c" />
+    <ClCompile Include="..\..\bsdsocket.c" />
+    <ClCompile Include="..\..\catweasel.c" />
+    <ClCompile Include="..\..\cd32_fmv.c" />
+    <ClCompile Include="..\..\cdrom.c" />
+    <ClCompile Include="..\..\cdtv.c" />
+    <ClCompile Include="..\..\cfgfile.c" />
+    <ClCompile Include="..\..\cia.c" />
+    <ClCompile Include="..\..\consolehook.c" />
+    <ClCompile Include="..\..\cpudefs.c" />
+    <ClCompile Include="..\..\cpuemu_0.c" />
+    <ClCompile Include="..\..\cpuemu_11.c" />
+    <ClCompile Include="..\..\cpuemu_12.c" />
+    <ClCompile Include="..\..\cpuemu_20.c" />
+    <ClCompile Include="..\..\cpuemu_31.c" />
+    <ClCompile Include="..\..\cpummu.c" />
+    <ClCompile Include="..\..\cpustbl.c" />
+    <ClCompile Include="..\..\crc32.c" />
+    <ClCompile Include="..\..\custom.c" />
+    <ClCompile Include="..\..\debug.c" />
+    <ClCompile Include="..\..\disk.c" />
+    <ClCompile Include="..\..\diskutil.c" />
+    <ClCompile Include="..\..\dongle.c" />
+    <ClCompile Include="..\..\drawing.c" />
+    <ClCompile Include="..\..\driveclick.c" />
+    <ClCompile Include="..\..\enforcer.c" />
+    <ClCompile Include="..\..\epsonprinter.c" />
+    <ClCompile Include="..\..\ersatz.c" />
+    <ClCompile Include="..\..\expansion.c" />
+    <ClCompile Include="..\..\fdi2raw.c" />
+    <ClCompile Include="..\..\filesys.c" />
+    <ClCompile Include="..\..\fpp.c" />
+    <ClCompile Include="..\..\fsdb.c" />
+    <ClCompile Include="..\..\fsusage.c" />
+    <ClCompile Include="..\..\gayle.c" />
+    <ClCompile Include="..\..\gfxutil.c" />
+    <ClCompile Include="..\..\hardfile.c" />
+    <ClCompile Include="..\..\identify.c" />
+    <ClCompile Include="..\..\inputdevice.c" />
+    <ClCompile Include="..\..\keybuf.c" />
+    <ClCompile Include="..\..\main.c" />
+    <ClCompile Include="..\..\memory.c" />
+    <ClCompile Include="..\..\missing.c" />
+    <ClCompile Include="..\..\native2amiga.c" />
+    <ClCompile Include="..\..\ncr_scsi.c" />
+    <ClCompile Include="..\..\newcpu.c" />
+    <ClCompile Include="..\..\readcpu.c" />
+    <ClCompile Include="..\..\rommgr.c" />
+    <ClCompile Include="..\..\sampler.c" />
+    <ClCompile Include="..\..\sana2.c" />
+    <ClCompile Include="..\..\savestate.c" />
+    <ClCompile Include="..\..\scsi.c" />
+    <ClCompile Include="..\..\scsiemul.c" />
+    <ClCompile Include="..\..\traps.c" />
+    <ClCompile Include="..\..\uaeexe.c" />
+    <ClCompile Include="..\..\uaeipc.c" />
+    <ClCompile Include="..\..\uaelib.c" />
+    <ClCompile Include="..\..\uaeresource.c" />
+    <ClCompile Include="..\..\uaeserial.c" />
+    <ClCompile Include="..\..\zfile.c" />
+    <ClCompile Include="..\..\zfile_archive.c" />
+    <ClCompile Include="..\..\jit\compemu.c" />
+    <ClCompile Include="..\..\jit\compemu_fpp.c" />
+    <ClCompile Include="..\..\jit\compemu_support.c" />
+    <ClCompile Include="..\..\jit\compstbl.c" />
+    <ClCompile Include="..\..\moduleripper.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\7z\Archive\7z\7zAlloc.c" />
+    <ClCompile Include="..\..\archivers\7z\7zBuf.c" />
+    <ClCompile Include="..\..\archivers\7z\7zCrc.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\7zStream.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\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\zip\unzip.c" />
+    <ClCompile Include="..\..\archivers\lzx\unlzx.c" />
+    <ClCompile Include="..\..\archivers\wrp\warp.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\resources\35floppy.ico" />
+    <None Include="..\resources\amigainfo.ico" />
+    <None Include="..\resources\avioutput.ico" />
+    <None Include="..\resources\chip.ico" />
+    <None Include="..\resources\configfile.ico" />
+    <None Include="configfile.ico" />
+    <None Include="..\resources\cpu.ico" />
+    <None Include="diskimage.ico" />
+    <None Include="..\resources\diskimage.ico" />
+    <None Include="..\resources\Drive.ico" />
+    <None Include="..\resources\expansion.ico" />
+    <None Include="expansion.ico" />
+    <None Include="..\resources\file.ico" />
+    <None Include="file.ico" />
+    <None Include="..\resources\folder.ico" />
+    <None Include="..\resources\h_arrow.cur" />
+    <None Include="..\resources\icon3.ico" />
+    <None Include="..\resources\joystick.ico" />
+    <None Include="..\resources\lcd.bmp" />
+    <None Include="..\resources\misc.ico" />
+    <None Include="..\resources\move_dow.ico" />
+    <None Include="..\resources\move_up.ico" />
+    <None Include="..\resources\paths.ico" />
+    <None Include="..\resources\port.ico" />
+    <None Include="port.ico" />
+    <None Include="..\resources\quickstart.ico" />
+    <None Include="..\resources\root.ico" />
+    <None Include="..\resources\screen.ico" />
+    <None Include="..\resources\sound.ico" />
+    <None Include="..\resources\winuae.ico" />
+    <None Include="..\resources\xarcade-winuae.bmp" />
+    <None Include="..\resources\drive_click.wav" />
+    <None Include="..\resources\drive_snatch.wav" />
+    <None Include="..\resources\drive_spin.wav" />
+    <None Include="..\resources\drive_spinnd.wav" />
+    <None Include="..\resources\drive_startup.wav" />
+    <None Include="..\resources\resource" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\resources\winuae.rc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\projects\winuae\src\od-win32\resources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\projects\winuae\src\od-win32\resources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">\projects\winuae\src\od-win32\resources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">\projects\winuae\src\od-win32\resources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\projects\winuae\src\od-win32\resources</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\projects\winuae\src\od-win32\resources</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\hq2x16.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <FileType>Document</FileType>
+    </Library>
+    <Library Include="..\hq2x32.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <FileType>Document</FileType>
+    </Library>
+    <Library Include="..\hq3x16.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <FileType>Document</FileType>
+    </Library>
+    <Library Include="..\hq3x32.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <FileType>Document</FileType>
+    </Library>
+    <Library Include="..\hq4x16.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <FileType>Document</FileType>
+    </Library>
+    <Library Include="..\hq4x32.obj">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <FileType>Document</FileType>
+    </Library>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc10/winuae_msvc.vcxproj.filters
new file mode 100644 (file)
index 0000000..e940433
--- /dev/null
@@ -0,0 +1,638 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="win32">
+      <UniqueIdentifier>{86cfeeb5-a9b0-4c06-bd94-69c258884a66}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="win32\Resource Files">
+      <UniqueIdentifier>{5c4c971a-37b6-4c1e-82f1-d225ebb12808}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+    <Filter Include="common">
+      <UniqueIdentifier>{c0e78831-47fa-48a0-a34e-8c3c4410c34b}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="jit">
+      <UniqueIdentifier>{e76a708a-933c-4af4-bad2-0820d79b6a78}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="prowizard">
+      <UniqueIdentifier>{dab2f6c7-d741-4002-b0c9-566a1536642a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors">
+      <UniqueIdentifier>{f3ce6c07-bb5c-47dc-9e59-5e4acd06ff0d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors\dms">
+      <UniqueIdentifier>{ae0450a0-e0ff-442b-8896-a21eb8769fae}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors\7z">
+      <UniqueIdentifier>{c52448a0-4965-449e-bbdd-e8cb8bf9227a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors\lha">
+      <UniqueIdentifier>{492ad99e-6cf0-486b-8e97-083a9e50bb7c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors\zip">
+      <UniqueIdentifier>{d030c158-bae4-4025-9d74-bfe643846c44}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors\lzx">
+      <UniqueIdentifier>{4abb311e-366e-4c88-bb5f-0086611a1145}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors\xfd">
+      <UniqueIdentifier>{4c157cd6-e04e-4dfa-ad84-a5e9f8abc1ed}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="decompressors\wrp">
+      <UniqueIdentifier>{43856f2f-e043-4cfe-aa2a-a767858d8ea4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\ahidsound_dsonly.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ahidsound_new.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\avioutput.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\blkdev_win32_aspi.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\blkdev_win32_ioctl.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\blkdev_win32_spti.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\bsdsock.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\caps\caps_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\clipboard_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debug_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dinput.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\direct3d.cpp">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\driveclick_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\dxwrap.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\fsdb_mywin32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\fsdb_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\hardfile_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\hq2x_d3d.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ioport.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\keyboard_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lcd.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\midi.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\mman.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\parser.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\picasso96_win.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\posixemu.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\registry.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\cloanto\RetroPlatformGuestIPC.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\rp.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\scaler.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\scaler_more.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\screenshot.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\serial_win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\sounddep\sound.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\unicode.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32_scale2x.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32_uaenet.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32gfx.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32gui.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\win32gui_extra.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\writelog.c">
+      <Filter>win32</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\a2065.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\a2091.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\akiko.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\amax.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ar.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\arcadia.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\audio.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\autoconf.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\blitfunc.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\blittable.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\blitter.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\blkdev.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\blkdev_cdimage.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\bsdsocket.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\catweasel.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cd32_fmv.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cdrom.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cdtv.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cfgfile.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cia.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\consolehook.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpudefs.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpuemu_0.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpuemu_11.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpuemu_12.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpuemu_20.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpuemu_31.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpummu.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\cpustbl.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\crc32.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\custom.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\debug.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\disk.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\diskutil.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\dongle.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\drawing.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\driveclick.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\enforcer.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\epsonprinter.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ersatz.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\expansion.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fdi2raw.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\filesys.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fpp.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fsdb.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\fsusage.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gayle.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gfxutil.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\hardfile.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\identify.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\inputdevice.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\keybuf.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\main.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\memory.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\missing.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\native2amiga.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ncr_scsi.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\newcpu.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\readcpu.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\rommgr.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sampler.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\sana2.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\savestate.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scsi.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\scsiemul.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\traps.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\uaeexe.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\uaeipc.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\uaelib.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\uaeresource.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\uaeserial.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zfile.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\zfile_archive.c">
+      <Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jit\compemu.c">
+      <Filter>jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jit\compemu_fpp.c">
+      <Filter>jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jit\compemu_support.c">
+      <Filter>jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\jit\compstbl.c">
+      <Filter>jit</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\moduleripper.c">
+      <Filter>prowizard</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\crc_csum.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\getbits.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\maketbl.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\pfile.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\tables.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_deep.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_heavy.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_init.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_medium.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_quick.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\dms\u_rle.c">
+      <Filter>decompressors\dms</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zAlloc.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\7zBuf.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\7zCrc.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zDecode.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zExtract.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zHeader.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zIn.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Archive\7z\7zItem.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\7zStream.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Bcj2.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Bra.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\Bra86.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\7z\LzmaDec.c">
+      <Filter>decompressors\7z</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\crcio.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\dhuf.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\header.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\huf.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\larc.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\lhamaketbl.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\lharc.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\shuf.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\slide.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\uae_lha.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lha\util.c">
+      <Filter>decompressors\lha</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\zip\unzip.c">
+      <Filter>decompressors\zip</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\lzx\unlzx.c">
+      <Filter>decompressors\lzx</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\archivers\wrp\warp.c">
+      <Filter>decompressors\wrp</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\resources\35floppy.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\amigainfo.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\avioutput.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\chip.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\configfile.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="configfile.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\cpu.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="diskimage.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\diskimage.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\Drive.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\expansion.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="expansion.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\file.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="file.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\folder.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\h_arrow.cur">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\icon3.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\joystick.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\lcd.bmp">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\misc.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\move_dow.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\move_up.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\paths.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\port.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="port.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\quickstart.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\root.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\screen.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\sound.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\winuae.ico">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\xarcade-winuae.bmp">
+      <Filter>win32\Resource Files</Filter>
+    </None>
+    <None Include="..\resources\drive_click.wav" />
+    <None Include="..\resources\drive_snatch.wav" />
+    <None Include="..\resources\drive_spin.wav" />
+    <None Include="..\resources\drive_spinnd.wav" />
+    <None Include="..\resources\drive_startup.wav" />
+    <None Include="..\resources\resource" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\resources\winuae.rc">
+      <Filter>win32\Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Library Include="..\hq2x16.obj" />
+    <Library Include="..\hq2x32.obj" />
+    <Library Include="..\hq3x16.obj" />
+    <Library Include="..\hq3x32.obj" />
+    <Library Include="..\hq4x16.obj" />
+    <Library Include="..\hq4x32.obj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
index 0411a3fd2b7c1683afbf73608a3bd211b6aaddae..30340c20c53cb04b2e7a70336386831d8a417f6e 100644 (file)
@@ -1,4 +1,16 @@
 
+- hpos "offset" was accidentally changed (cmp.w #0,$dff006 is possible)
+
+Beta 10:
+
+- CE interrupt handling timing rewrite, again, to better match real
+  behavior (still not good enough but better than previously)
+- only accept winpcap version 4 or newer
+- match autoscale left position to WB max overscan size (maybe in
+  future there will be "TV"-option that restricts to 1990s TV overscan)
+- accept all kinds of DI8DEVCLASS_GAMECTRL devices, not just those that
+  have gamecontroller-like device type
+
 Beta 9:
 
 - CE 68000 interrupt handling update, Spectre Party Demo /
index 2d50bc5c78153898433790e893884b8e1c9fc198..4029c6569dfffab033cb270e55af20d7f0fb256b 100644 (file)
--- a/uaeunp.c
+++ b/uaeunp.c
@@ -724,6 +724,11 @@ int wmain (int argc, wchar_t *argv[], wchar_t *envp[])
 
 /*
 
+0.8b:
+
+- DMS full cylinder 0 BBS ADs skipped when extracting
+- DMS BBS AD extraction support
+
 0.8:
 
 - tar archive support
diff --git a/zfile.c b/zfile.c
index dc20de92d634684904504a9abf293ddf319857b0..af9c8cc2a051ed5d356179bcc333f2dd1cbf8892 100644 (file)
--- a/zfile.c
+++ b/zfile.c
@@ -1028,7 +1028,7 @@ static struct zfile *wrp (struct zfile *z)
        return unwarp (z);
 }
 
-static struct zfile *dms (struct zfile *z)
+static struct zfile *dms (struct zfile *z, int index, int *retcode)
 {
        int ret;
        struct zfile *zo;
@@ -1036,6 +1036,8 @@ static struct zfile *dms (struct zfile *z)
        TCHAR *ext = _tcsrchr (orgname, '.');
        TCHAR newname[MAX_DPATH];
        static int recursive;
+       int i;
+       struct zfile *zextra[DMS_EXTRA_SIZE] = { 0 };
 
        if (recursive)
                return NULL;
@@ -1049,7 +1051,7 @@ static struct zfile *dms (struct zfile *z)
        zo = zfile_fopen_empty (z, newname, 1760 * 512);
        if (!zo)
                return NULL;
-       ret = DMS_Process_File (z, zo, CMD_UNPACK, OPT_VERBOSE, 0, 0, 0);
+       ret = DMS_Process_File (z, zo, CMD_UNPACK, OPT_VERBOSE, 0, 0, 0, zextra);
        if (ret == NO_PROBLEM || ret == DMS_FILE_END) {
                int off = zfile_ftell (zo);
                if (off >= 1760 * 512 / 3 && off <= 1760 * 512 * 3 / 4) { // possible split dms?
@@ -1063,18 +1065,36 @@ static struct zfile *dms (struct zfile *z)
                                        z2 = zfile_fopen (fn2, L"rb", z->zfdmask);
                                        recursive--;
                                        if (z2) {
-                                               ret = DMS_Process_File (z2, zo, CMD_UNPACK, OPT_VERBOSE, 0, 0, 1);
+                                               ret = DMS_Process_File (z2, zo, CMD_UNPACK, OPT_VERBOSE, 0, 0, 1, NULL);
                                                zfile_fclose (z2);
                                        }
                                        xfree (fn2);
                                }
                        }
                }
-               zfile_fclose (z);
                zfile_fseek (zo, 0, SEEK_SET);
-               return zo;
+               if (index > 0) {
+                       zfile_fclose (zo);
+                       zo = NULL;
+                       for (i = 0; i < zextra[i]; i++);
+                       if (index > i)
+                               goto end;
+                       zo = zextra[index - 1];
+                       zextra[index - 1] = NULL;
+               }
+               if (retcode)
+                       *retcode = 1;
+               zfile_fclose (z);
+               z = NULL;
+
+       } else {
+               zfile_fclose (zo);
+               zo = NULL;
        }
-       return NULL;
+end:
+       for (i = 0; i < DMS_EXTRA_SIZE; i++)
+               zfile_fclose (zextra[i]);
+       return zo;
 }
 
 const TCHAR *uae_ignoreextensions[] =
@@ -1257,11 +1277,11 @@ struct zfile *zuncompress (struct znode *parent, struct zfile *z, int dodefault,
                                        return zfile_gunzip (z);
                                if (strcasecmp (ext, L"hdz") == 0)
                                        return zfile_gunzip (z);
-                               if (strcasecmp (ext, L"dms") == 0)
-                                       return dms (z);
                                if (strcasecmp (ext, L"wrp") == 0)
                                        return wrp (z);
                        }
+                       if (strcasecmp (ext, L"dms") == 0)
+                               return dms (z, index, retcode);
                }
                if (mask & ZFD_RAWDISK) {
 #ifdef CAPS
@@ -1296,11 +1316,11 @@ struct zfile *zuncompress (struct znode *parent, struct zfile *z, int dodefault,
                if (index == 0) {
                        if (header[0] == 0x1f && header[1] == 0x8b)
                                return zfile_gunzip (z);
-                       if (header[0] == 'D' && header[1] == 'M' && header[2] == 'S' && header[3] == '!')
-                               return dms (z);
                        if (header[0] == 'P' && header[1] == 'K' && header[2] == 'D')
                                return dsq (z, 0);
                }
+               if (header[0] == 'D' && header[1] == 'M' && header[2] == 'S' && header[3] == '!')
+                       return dms (z, index, retcode);
        }
        if (mask & ZFD_RAWDISK) {
 #ifdef CAPS