mirror of
https://github.com/LIV2/WinUAE.git
synced 2025-12-06 00:12:52 +00:00
2500b15
This commit is contained in:
Toni Wilen
parent
9366cc64ae
commit
c2cb65a785
12
blitter.cpp
12
blitter.cpp
@ -719,7 +719,7 @@ static void decide_blitter_line (int hsync, int hpos)
|
||||
if (c == 3) {
|
||||
|
||||
blitter_read ();
|
||||
alloc_cycle_blitter (last_blitter_hpos, &bltcpt);
|
||||
alloc_cycle_blitter (last_blitter_hpos, &bltcpt, 3);
|
||||
record_dma_blit (0x70, blt_info.bltcdat, bltcpt, last_blitter_hpos);
|
||||
|
||||
} else if (c == 5) {
|
||||
@ -737,7 +737,7 @@ static void decide_blitter_line (int hsync, int hpos)
|
||||
/* onedot mode and no pixel = bus write access is skipped */
|
||||
if (blitlinepixel) {
|
||||
blitter_write ();
|
||||
alloc_cycle_blitter (last_blitter_hpos, &bltdpt);
|
||||
alloc_cycle_blitter (last_blitter_hpos, &bltdpt, 4);
|
||||
record_dma_blit (0x00, blt_info.bltddat, bltdpt, last_blitter_hpos);
|
||||
blitlinepixel = 0;
|
||||
}
|
||||
@ -892,7 +892,7 @@ STATIC_INLINE void blitter_doddma (int hpos)
|
||||
record_dma_blit (0x00, d, bltdpt, hpos);
|
||||
last_custom_value1 = d;
|
||||
chipmem_agnus_wput2 (bltdpt, d);
|
||||
alloc_cycle_blitter (hpos, &bltdpt);
|
||||
alloc_cycle_blitter (hpos, &bltdpt, 4);
|
||||
bltdpt += blit_add;
|
||||
blitter_hcounter2++;
|
||||
if (blitter_hcounter2 == blt_info.hblitsize) {
|
||||
@ -919,7 +919,7 @@ STATIC_INLINE void blitter_dodma (int ch, int hpos)
|
||||
addr = bltapt;
|
||||
bltapt += blit_add;
|
||||
reg = 0x74;
|
||||
alloc_cycle_blitter (hpos, &bltapt);
|
||||
alloc_cycle_blitter (hpos, &bltapt, 1);
|
||||
break;
|
||||
case 2:
|
||||
blt_info.bltbdat = dat = chipmem_wget_indirect (bltbpt);
|
||||
@ -932,7 +932,7 @@ STATIC_INLINE void blitter_dodma (int ch, int hpos)
|
||||
blt_info.bltbhold = (((uae_u32)prevb << 16) | blt_info.bltbdat) >> blt_info.blitbshift;
|
||||
prevb = blt_info.bltbdat;
|
||||
reg = 0x72;
|
||||
alloc_cycle_blitter (hpos, &bltbpt);
|
||||
alloc_cycle_blitter (hpos, &bltbpt, 2);
|
||||
break;
|
||||
case 3:
|
||||
blt_info.bltcdat = dat = chipmem_wget_indirect (bltcpt);
|
||||
@ -940,7 +940,7 @@ STATIC_INLINE void blitter_dodma (int ch, int hpos)
|
||||
addr = bltcpt;
|
||||
bltcpt += blit_add;
|
||||
reg = 0x70;
|
||||
alloc_cycle_blitter (hpos, &bltcpt);
|
||||
alloc_cycle_blitter (hpos, &bltcpt, 3);
|
||||
break;
|
||||
default:
|
||||
abort ();
|
||||
|
||||
25
custom.cpp
25
custom.cpp
@ -156,7 +156,7 @@ static int lof_togglecnt_lace, lof_togglecnt_nlace, lof_previous, nlace_cnt;
|
||||
*/
|
||||
static int vpos_previous, hpos_previous;
|
||||
static int vpos_lpen, hpos_lpen, lightpen_triggered;
|
||||
int lightpen_x, lightpen_y, lightpen_cx, lightpen_cy;
|
||||
int lightpen_x = -1, lightpen_y = -1, lightpen_cx, lightpen_cy, lightpen_active;
|
||||
|
||||
static uae_u32 sprtaba[256],sprtabb[256];
|
||||
static uae_u32 sprite_ab_merge[256];
|
||||
@ -296,6 +296,7 @@ static unsigned int clxdat, clxcon, clxcon2, clxcon_bpl_enable, clxcon_bpl_match
|
||||
|
||||
enum copper_states {
|
||||
COP_stop,
|
||||
COP_waitforever,
|
||||
COP_read1,
|
||||
COP_read2,
|
||||
COP_bltwait,
|
||||
@ -464,17 +465,17 @@ void alloc_cycle_ext (int hpos, int type)
|
||||
alloc_cycle (hpos, type);
|
||||
}
|
||||
|
||||
void alloc_cycle_blitter (int hpos, uaecptr *ptr)
|
||||
void alloc_cycle_blitter (int hpos, uaecptr *ptr, int chnum)
|
||||
{
|
||||
if (cycle_line[hpos] & CYCLE_COPPER_SPECIAL) {
|
||||
static int warned = 100;
|
||||
uaecptr srcptr = cop_state.strobe == 1 ? cop1lc : cop2lc;
|
||||
if (warned > 0) {
|
||||
write_log (_T("buggy copper cycle conflict with blitter %08x <- %08x\n"), *ptr, srcptr);
|
||||
write_log (_T("buggy copper cycle conflict with blitter ch %c %08x <- %08x PC=%08x\n"), 'A' + (chnum - 1), *ptr, srcptr, m68k_getpc ());
|
||||
warned--;
|
||||
}
|
||||
if (currprefs.cpu_model == 68000)
|
||||
*ptr = srcptr;
|
||||
// if (currprefs.cpu_model == 68000)
|
||||
// *ptr = srcptr;
|
||||
}
|
||||
alloc_cycle (hpos, CYCLE_BLITTER);
|
||||
}
|
||||
@ -3543,7 +3544,7 @@ static void COPJMP (int num, int vblank)
|
||||
cop_state.ignore_next = 0;
|
||||
if (!oldstrobe)
|
||||
cop_state.state_prev = cop_state.state;
|
||||
if ((cop_state.state == COP_wait || cop_state.state == COP_stop) && !vblank) {
|
||||
if ((cop_state.state == COP_wait || cop_state.state == COP_waitforever) && !vblank) {
|
||||
cop_state.state = COP_strobe_delay1x;
|
||||
} else {
|
||||
cop_state.state = vblank ? COP_start_delay : (copper_access ? COP_strobe_delay1 : COP_strobe_extra);
|
||||
@ -4719,13 +4720,13 @@ static void update_copper (int until_hpos)
|
||||
// Cycle can be free and copper won't allocate it.
|
||||
// If Blitter uses this cycle = Copper's address gets copied blitter DMA pointer..
|
||||
cop_state.state = COP_strobe_delay2x;
|
||||
cycle_line[old_hpos] |= CYCLE_COPPER_SPECIAL;
|
||||
break;
|
||||
case COP_strobe_delay2x:
|
||||
// Second cycle fetches following word and tosses it away. Must be free cycle.
|
||||
// Second cycle fetches following word and tosses it away. Must be free cycle
|
||||
// but is not allocated, blitter or cpu can still use it.
|
||||
if (copper_cant_read (old_hpos, 1))
|
||||
continue;
|
||||
alloc_cycle (old_hpos, CYCLE_COPPER);
|
||||
cycle_line[old_hpos] |= CYCLE_COPPER_SPECIAL;
|
||||
if (debug_dma)
|
||||
record_dma (0x1fe, chipmem_wget_indirect (cop_state.ip), cop_state.ip, old_hpos, vpos, DMARECORD_COPPER);
|
||||
cop_state.state = COP_read1;
|
||||
@ -4865,7 +4866,7 @@ static void update_copper (int until_hpos)
|
||||
vp = vpos & (((cop_state.saved_i2 >> 8) & 0x7F) | 0x80);
|
||||
|
||||
if (cop_state.saved_i1 == 0xFFFF && cop_state.saved_i2 == 0xFFFE) {
|
||||
cop_state.state = COP_stop;
|
||||
cop_state.state = COP_waitforever;
|
||||
copper_enabled_thisline = 0;
|
||||
unset_special (SPCFLAG_COPPER);
|
||||
goto out;
|
||||
@ -4959,7 +4960,7 @@ static void compute_spcflag_copper (int hpos)
|
||||
|
||||
copper_enabled_thisline = 0;
|
||||
unset_special (SPCFLAG_COPPER);
|
||||
if (!dmaen (DMA_COPPER) || cop_state.state == COP_stop || cop_state.state == COP_bltwait || nocustom ())
|
||||
if (!dmaen (DMA_COPPER) || cop_state.state == COP_stop || cop_state.state == COP_waitforever || cop_state.state == COP_bltwait || nocustom ())
|
||||
return;
|
||||
|
||||
if (cop_state.state == COP_wait) {
|
||||
@ -6572,7 +6573,7 @@ void custom_reset (int hardreset)
|
||||
write_log (_T("Reset at %08X\n"), M68K_GETPC);
|
||||
memory_map_dump ();
|
||||
|
||||
lightpen_x = lightpen_y = -1;
|
||||
lightpen_active = -1;
|
||||
lightpen_triggered = 0;
|
||||
lightpen_cx = lightpen_cy = -1;
|
||||
if (!savestate_state) {
|
||||
|
||||
@ -2661,12 +2661,16 @@ static void lightpen_update (struct vidbuffer *vb)
|
||||
for (i = 0; i < LIGHTPEN_HEIGHT; i++) {
|
||||
int line = lightpen_y + i - LIGHTPEN_HEIGHT / 2;
|
||||
if (line >= 0 || line < max_ypos_thisframe) {
|
||||
draw_lightpen_cursor(lightpen_x, i, line, lightpen_cx > 0);
|
||||
if (lightpen_active > 0)
|
||||
draw_lightpen_cursor (lightpen_x, i, line, lightpen_cx > 0);
|
||||
flush_line (vb, line);
|
||||
}
|
||||
}
|
||||
lightpen_y1 = lightpen_y - LIGHTPEN_HEIGHT / 2 - 1 + min_ypos_for_screen;
|
||||
lightpen_y2 = lightpen_y1 + LIGHTPEN_HEIGHT + 2;
|
||||
|
||||
if (lightpen_active < 0)
|
||||
lightpen_active = 0;
|
||||
}
|
||||
|
||||
void finish_drawing_frame (void)
|
||||
@ -2745,7 +2749,7 @@ void finish_drawing_frame (void)
|
||||
}
|
||||
}
|
||||
|
||||
if (lightpen_x > 0 || lightpen_y > 0)
|
||||
if (lightpen_active)
|
||||
lightpen_update (vb);
|
||||
|
||||
if (currprefs.monitoremu && gfxvidinfo.tempbuffer.bufmem_allocated) {
|
||||
|
||||
7
fpp.cpp
7
fpp.cpp
@ -132,8 +132,11 @@ static __inline__ void native_set_fpucw (uae_u32 m68k_cw)
|
||||
if (m68k_cw & (0x1000))
|
||||
ex |= _EM_OVERFLOW;
|
||||
#endif
|
||||
|
||||
_control87(ex | fp87_round[(m68k_cw >> 4) & 3] | fp87_prec[(m68k_cw >> 6) & 3], _MCW_RC | _MCW_PC);
|
||||
#ifdef WIN64
|
||||
_controlfp (ex | fp87_round[(m68k_cw >> 4) & 3], _MCW_RC);
|
||||
#else
|
||||
_control87 (ex | fp87_round[(m68k_cw >> 4) & 3] | fp87_prec[(m68k_cw >> 6) & 3], _MCW_RC | _MCW_PC);
|
||||
#endif
|
||||
#else
|
||||
static uae_u16 x87_cw_tab[] = {
|
||||
0x137f, 0x1f7f, 0x177f, 0x1b7f, /* Extended */
|
||||
|
||||
@ -207,7 +207,7 @@ STATIC_INLINE int GET_PLANES(uae_u16 bplcon0)
|
||||
|
||||
extern void fpscounter_reset (void);
|
||||
extern unsigned long idletime;
|
||||
extern int lightpen_x, lightpen_y, lightpen_cx, lightpen_cy;
|
||||
extern int lightpen_x, lightpen_y, lightpen_cx, lightpen_cy, lightpen_active;
|
||||
|
||||
struct customhack {
|
||||
uae_u16 v;
|
||||
@ -216,7 +216,7 @@ struct customhack {
|
||||
void customhack_put (struct customhack *ch, uae_u16 v, int hpos);
|
||||
uae_u16 customhack_get (struct customhack *ch, int hpos);
|
||||
extern void alloc_cycle_ext (int, int);
|
||||
extern void alloc_cycle_blitter (int hpos, uaecptr *ptr);
|
||||
extern void alloc_cycle_blitter (int hpos, uaecptr *ptr, int);
|
||||
extern bool ispal (void);
|
||||
extern int current_maxvpos (void);
|
||||
extern struct chipset_refresh *get_chipset_refresh (void);
|
||||
|
||||
@ -226,6 +226,7 @@ static uae_u8 pot_dat[NORMAL_JPORTS][2];
|
||||
static int pot_dat_act[NORMAL_JPORTS][2];
|
||||
static int analog_port[NORMAL_JPORTS][2];
|
||||
static int digital_port[NORMAL_JPORTS][2];
|
||||
static int lightpen;
|
||||
#define POTDAT_DELAY_PAL 8
|
||||
#define POTDAT_DELAY_NTSC 7
|
||||
|
||||
@ -1223,10 +1224,12 @@ int input_mousehack_status (int mode, uaecptr diminfo, uaecptr dispinfo, uaecptr
|
||||
mousehack_address = m68k_dreg (regs, 0);
|
||||
mousehack_enable ();
|
||||
} else if (mode == 0) {
|
||||
uae_u8 v = get_byte (mousehack_address + MH_E);
|
||||
v |= 0x40;
|
||||
put_byte (mousehack_address + MH_E, v);
|
||||
write_log (_T("Tablet driver running (%08x,%02x)\n"), mousehack_address, v);
|
||||
if (mousehack_address) {
|
||||
uae_u8 v = get_byte (mousehack_address + MH_E);
|
||||
v |= 0x40;
|
||||
put_byte (mousehack_address + MH_E, v);
|
||||
write_log (_T("Tablet driver running (%08x,%02x)\n"), mousehack_address, v);
|
||||
}
|
||||
} else if (mode == 1) {
|
||||
int x1 = -1, y1 = -1, x2 = -1, y2 = -1;
|
||||
uae_u32 props = 0;
|
||||
@ -1280,7 +1283,7 @@ void inputdevice_tablet (int x, int y, int z, int pressure, uae_u32 buttonbits,
|
||||
uae_u8 tmp[MH_END];
|
||||
|
||||
mousehack_enable ();
|
||||
if (inputdevice_is_tablet () <= 0)
|
||||
if (inputdevice_is_tablet () <= 0 || !mousehack_address)
|
||||
return;
|
||||
//write_log (_T("%d %d %d %d %08X %d %d %d %d\n"), x, y, z, pressure, buttonbits, inproximity, ax, ay, az);
|
||||
p = get_real_address (mousehack_address);
|
||||
@ -1370,7 +1373,7 @@ void inputdevice_tablet_info (int maxx, int maxy, int maxz, int maxax, int maxay
|
||||
{
|
||||
uae_u8 *p;
|
||||
|
||||
if (!uae_boot_rom)
|
||||
if (!uae_boot_rom || !mousehack_address)
|
||||
return;
|
||||
p = get_real_address (mousehack_address);
|
||||
|
||||
@ -2236,6 +2239,7 @@ static int handle_custom_event (const TCHAR *custom)
|
||||
|
||||
if (custom == NULL)
|
||||
return 0;
|
||||
config_changed = 1;
|
||||
write_log (_T("%s\n"), custom);
|
||||
p = buf = my_strdup (custom);
|
||||
while (p && *p) {
|
||||
@ -2253,11 +2257,16 @@ static int handle_custom_event (const TCHAR *custom)
|
||||
nextp++;
|
||||
}
|
||||
//write_log (L"-> '%s'\n", p);
|
||||
cfgfile_parse_line (&changed_prefs, p, 0);
|
||||
if (!_tcsicmp (p, _T("no_config_check"))) {
|
||||
config_changed = 0;
|
||||
} else if (!_tcsicmp (p, _T("do_config_check"))) {
|
||||
config_changed = 1;
|
||||
} else {
|
||||
cfgfile_parse_line (&changed_prefs, p, 0);
|
||||
}
|
||||
p = nextp;
|
||||
}
|
||||
xfree (buf);
|
||||
config_changed = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -2844,10 +2853,11 @@ static int handle_input_event (int nr, int state, int max, int autofire, bool ca
|
||||
{
|
||||
case 5: /* lightpen/gun */
|
||||
{
|
||||
if (lightpen_x < 0 && lightpen_y < 0) {
|
||||
if (!lightpen_active) {
|
||||
lightpen_x = gfxvidinfo.outbuffer->outwidth / 2;
|
||||
lightpen_y = gfxvidinfo.outbuffer->outheight / 2;
|
||||
}
|
||||
lightpen_active = true;
|
||||
if (ie->type == 0) {
|
||||
int delta = 0;
|
||||
if (max == 0)
|
||||
@ -3716,6 +3726,15 @@ static int isdigitalbutton (int ei)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int islightpen (int ei)
|
||||
{
|
||||
if (ei >= INPUTEVENT_LIGHTPEN_FIRST && ei < INPUTEVENT_LIGHTPEN_LAST) {
|
||||
lightpen = 1;
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void isqualifier (int ei)
|
||||
{
|
||||
}
|
||||
@ -3739,6 +3758,9 @@ static void scanevents (struct uae_prefs *p)
|
||||
joydirpot[i][j] = 128 / (312 * 100 / currprefs.input_analog_joystick_mult) + (128 * currprefs.input_analog_joystick_mult / 100) + currprefs.input_analog_joystick_offset;
|
||||
}
|
||||
}
|
||||
lightpen = 0;
|
||||
if (lightpen_active > 0)
|
||||
lightpen_active = -1;
|
||||
|
||||
for (i = 0; i < MAX_INPUT_DEVICES; i++) {
|
||||
use_joysticks[i] = 0;
|
||||
@ -3754,6 +3776,7 @@ static void scanevents (struct uae_prefs *p)
|
||||
ismouse (ei);
|
||||
isdigitalbutton (ei);
|
||||
isqualifier (ei);
|
||||
islightpen (ei);
|
||||
if (joysticks[i].eventid[ID_BUTTON_OFFSET + j][k] > 0)
|
||||
use_joysticks[i] = 1;
|
||||
}
|
||||
@ -3765,6 +3788,7 @@ static void scanevents (struct uae_prefs *p)
|
||||
ismouse (ei);
|
||||
isdigitalbutton (ei);
|
||||
isqualifier (ei);
|
||||
islightpen (ei);
|
||||
if (mice[i].eventid[ID_BUTTON_OFFSET + j][k] > 0)
|
||||
use_mice[i] = 1;
|
||||
}
|
||||
@ -3781,6 +3805,7 @@ static void scanevents (struct uae_prefs *p)
|
||||
isanalog (ei);
|
||||
isdigitalbutton (ei);
|
||||
isqualifier (ei);
|
||||
islightpen (ei);
|
||||
if (ei > 0)
|
||||
use_joysticks[i] = 1;
|
||||
}
|
||||
@ -3792,6 +3817,7 @@ static void scanevents (struct uae_prefs *p)
|
||||
isanalog (ei);
|
||||
isdigitalbutton (ei);
|
||||
isqualifier (ei);
|
||||
islightpen (ei);
|
||||
if (ei > 0)
|
||||
use_mice[i] = 1;
|
||||
}
|
||||
@ -3812,6 +3838,7 @@ static void scanevents (struct uae_prefs *p)
|
||||
ismouse (ei);
|
||||
isdigitalbutton (ei);
|
||||
isqualifier (ei);
|
||||
islightpen (ei);
|
||||
if (ei > 0)
|
||||
scancodeused[i][keyboards[i].extra[j]] = ei;
|
||||
}
|
||||
@ -5459,13 +5486,12 @@ static int put_event_data (const struct inputdevice_functions *id, int devnum, i
|
||||
if ((flags & (mask1 | mask2)) == (mask1 | mask2))
|
||||
flags &= ~mask2;
|
||||
}
|
||||
if (custom && custom[0] == 0) {
|
||||
if (custom && custom[0] == 0)
|
||||
custom = NULL;
|
||||
if (custom)
|
||||
eventid = 0;
|
||||
}
|
||||
if (eventid <= 0 && !custom) {
|
||||
if (eventid <= 0 && !custom)
|
||||
flags = 0;
|
||||
}
|
||||
|
||||
ret = -1;
|
||||
if (type == IDEV_WIDGET_BUTTON || type == IDEV_WIDGET_BUTTONAXIS) {
|
||||
|
||||
@ -94,6 +94,8 @@ DEFEVENT(JOY2_CD32_YELLOW,_T("Joy2 CD32 Yellow"),AM_K,4,2,JOYBUTTON_CD32_YELLOW)
|
||||
DEFEVENT(JOY2_CD32_RED,_T("Joy2 CD32 Red"),AM_K,4,2,JOYBUTTON_CD32_RED)
|
||||
DEFEVENT(JOY2_CD32_BLUE,_T("Joy2 CD32 Blue"),AM_K,4,2,JOYBUTTON_CD32_BLUE)
|
||||
|
||||
DEFEVENT(LIGHTPEN_FIRST, _T(""), AM_DUMMY, 0,0,0)
|
||||
|
||||
DEFEVENT(LIGHTPEN_HORIZ,_T("Lightpen Horizontal"),AM_MOUSE_AXIS|AM_JOY_AXIS,0,5,0)
|
||||
DEFEVENT(LIGHTPEN_VERT,_T("Lightpen Vertical"),AM_MOUSE_AXIS|AM_JOY_AXIS,0,5,1)
|
||||
DEFEVENT(LIGHTPEN_LEFT,_T("Lightpen Left"),AM_K,1,5,DIR_LEFT)
|
||||
@ -101,6 +103,8 @@ DEFEVENT(LIGHTPEN_RIGHT,_T("Lightpen Right"),AM_K,1,5,DIR_RIGHT)
|
||||
DEFEVENT(LIGHTPEN_UP,_T("Lightpen Up"),AM_K,1,5,DIR_UP)
|
||||
DEFEVENT(LIGHTPEN_DOWN,_T("Lightpen Down"),AM_K,1,5,DIR_DOWN)
|
||||
|
||||
DEFEVENT(LIGHTPEN_LAST, _T(""), AM_DUMMY, 0,0,0)
|
||||
|
||||
/* parallel port joystick adapter */
|
||||
|
||||
DEFEVENT(PAR_JOY1_START, _T("[Parallel port joystick adapter]"), AM_INFO, 0,3,0)
|
||||
|
||||
@ -21,7 +21,7 @@ Copyright(c) 2001 - 2002;
|
||||
#include "sysconfig.h"
|
||||
#include "sysdeps.h"
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#include "options.h"
|
||||
#include "audio.h"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
#if defined(BSDSOCKET)
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#include <stddef.h>
|
||||
#include <process.h>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
#include <windowsx.h>
|
||||
#include <commctrl.h>
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#include "options.h"
|
||||
#include "memory.h"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
#include <windows.h>
|
||||
#include <resource>
|
||||
#include "resource.h"
|
||||
|
||||
#include "sysconfig.h"
|
||||
#include "sysdeps.h"
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
#include <shellapi.h>
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#include "threaddep/thread.h"
|
||||
#include "options.h"
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
#if defined(LOGITECHLCD)
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
#include "gui.h"
|
||||
#include "lcd.h"
|
||||
|
||||
|
||||
Binary file not shown.
@ -29,7 +29,7 @@
|
||||
|
||||
#include "sysdeps.h"
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#include "options.h"
|
||||
#include "parser.h"
|
||||
|
||||
@ -136,8 +136,13 @@ bool preinit_shm (void)
|
||||
|
||||
GetSystemInfo (&si);
|
||||
max_allowed_mman = 512;
|
||||
if (os_64bit)
|
||||
if (os_64bit) {
|
||||
#ifdef WIN64
|
||||
max_allowed_mman = 3072;
|
||||
#else
|
||||
max_allowed_mman = 2048;
|
||||
#endif
|
||||
}
|
||||
|
||||
memstats.dwLength = sizeof(memstats);
|
||||
GlobalMemoryStatus(&memstats);
|
||||
@ -168,19 +173,33 @@ bool preinit_shm (void)
|
||||
if (max_allowed_mman * 1024 * 1024 > size64)
|
||||
max_allowed_mman = size64 / (1024 * 1024);
|
||||
|
||||
natmem_size = max_allowed_mman * 1024 * 1024;
|
||||
natmem_size = (max_allowed_mman + 1) * 1024 * 1024;
|
||||
if (natmem_size < 256 * 1024 * 1024)
|
||||
natmem_size = 256 * 1024 * 1024;
|
||||
|
||||
write_log (_T("Total physical RAM %lluM. Attempting to reserve: %uM.\n"), totalphys64 >> 20, natmem_size >> 20);
|
||||
for (;;) {
|
||||
natmem_offset = (uae_u8*)VirtualAlloc (NULL, natmem_size, MEM_RESERVE | (VAMODE == 1 ? MEM_WRITE_WATCH : 0), PAGE_READWRITE);
|
||||
if (natmem_offset)
|
||||
break;
|
||||
natmem_size -= 128 * 1024 * 1024;
|
||||
if (!natmem_size) {
|
||||
write_log (_T("Can't allocate 256M of virtual address space!?\n"));
|
||||
return false;
|
||||
natmem_offset = 0;
|
||||
if (natmem_size <= 640 * 1024 * 1024) {
|
||||
uae_u32 p = 0x78000000 - natmem_size;
|
||||
for (;;) {
|
||||
natmem_offset = (uae_u8*)VirtualAlloc ((void*)p, natmem_size, MEM_RESERVE | (VAMODE == 1 ? MEM_WRITE_WATCH : 0), PAGE_READWRITE);
|
||||
if (natmem_offset)
|
||||
break;
|
||||
p -= 256 * 1024 * 1024;
|
||||
if (p <= 256 * 1024 * 1024)
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!natmem_offset) {
|
||||
for (;;) {
|
||||
natmem_offset = (uae_u8*)VirtualAlloc (NULL, natmem_size, MEM_RESERVE | (VAMODE == 1 ? MEM_WRITE_WATCH : 0), PAGE_READWRITE);
|
||||
if (natmem_offset)
|
||||
break;
|
||||
natmem_size -= 128 * 1024 * 1024;
|
||||
if (!natmem_size) {
|
||||
write_log (_T("Can't allocate 256M of virtual address space!?\n"));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
max_z3fastmem = natmem_size;
|
||||
@ -830,6 +849,8 @@ void protect_roms (bool protect)
|
||||
shm = &shmids[i];
|
||||
if (shm->mode != PAGE_READONLY)
|
||||
continue;
|
||||
if (!shm->attached || !shm->rosize)
|
||||
continue;
|
||||
if (!VirtualProtect (shm->attached, shm->rosize, protect ? PAGE_READONLY : PAGE_READWRITE, &old)) {
|
||||
write_log (_T("VP %08X - %08X %x (%dk) failed %d\n"),
|
||||
(uae_u8*)shm->attached - natmem_offset, (uae_u8*)shm->attached - natmem_offset + shm->size,
|
||||
|
||||
@ -167,7 +167,7 @@ typedef enum {
|
||||
} BLIT_OPCODE;
|
||||
|
||||
#include "win32gui.h"
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#define UAE_RTG_LIBRARY_VERSION 40
|
||||
#define UAE_RTG_LIBRARY_REVISION 3994
|
||||
|
||||
@ -142,7 +142,7 @@
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
<AdditionalIncludeDirectories>..\..\prowizard\include;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<PrecompiledHeader>
|
||||
|
||||
1153
od-win32/resources/resource.h
Normal file
1153
od-win32/resources/resource.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity type="win32"
|
||||
@ -7,20 +8,25 @@
|
||||
version="6.0.0.0"
|
||||
processorArchitecture="*"
|
||||
publicKeyToken="6595b64144ccf1df"
|
||||
language="*"
|
||||
/>
|
||||
language="*">
|
||||
</assemblyIdentity>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<asmv3:application>
|
||||
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
|
||||
<dpiAware>true</dpiAware>
|
||||
</asmv3:windowsSettings>
|
||||
</asmv3:application>
|
||||
</assembly>
|
||||
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||
</application>
|
||||
</compatibility>
|
||||
|
||||
</assembly>
|
||||
@ -1,6 +1,6 @@
|
||||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "resource."
|
||||
#include "resource.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@ -125,11 +125,11 @@ BEGIN
|
||||
COMBOBOX IDC_REFRESHRATE,266,33,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
COMBOBOX IDC_DISPLAY_BUFFERCNT,266,56,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
GROUPBOX "Settings",IDC_SETTINGSTEXT,1,86,283,144
|
||||
RTEXT "Native:",IDC_STATIC,9,98,56,15,SS_CENTERIMAGE
|
||||
COMBOBOX IDC_SCREENMODE_NATIVE,69,98,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
RTEXT "Native:",IDC_STATIC,9,98,48,15,SS_CENTERIMAGE
|
||||
COMBOBOX IDC_SCREENMODE_NATIVE,61,98,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
COMBOBOX IDC_SCREENMODE_NATIVE2,142,98,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
RTEXT "RTG:",IDC_STATIC,8,115,57,15,SS_CENTERIMAGE
|
||||
COMBOBOX IDC_SCREENMODE_RTG,69,118,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
RTEXT "RTG:",IDC_STATIC,8,115,49,15,SS_CENTERIMAGE
|
||||
COMBOBOX IDC_SCREENMODE_RTG,61,118,71,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
COMBOBOX IDC_SCREENMODE_RTG2,142,118,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Blacker than black",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,11,140,142,10
|
||||
CONTROL "Remove interlace artifacts",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,154,142,10
|
||||
@ -1800,7 +1800,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
|
||||
|
||||
1 TEXTINCLUDE
|
||||
BEGIN
|
||||
"resource.\0"
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity type="win32"
|
||||
@ -7,15 +8,25 @@
|
||||
version="6.0.0.0"
|
||||
processorArchitecture="*"
|
||||
publicKeyToken="6595b64144ccf1df"
|
||||
language="*"
|
||||
/>
|
||||
language="*">
|
||||
</assemblyIdentity>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
</assembly>
|
||||
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges>
|
||||
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||
</application>
|
||||
</compatibility>
|
||||
|
||||
</assembly>
|
||||
@ -31,7 +31,7 @@
|
||||
#include "registry.h"
|
||||
#include "win32gui.h"
|
||||
#include "drawing.h"
|
||||
#include <resource>
|
||||
#include "resource.h"
|
||||
|
||||
static int initialized;
|
||||
static RPGUESTINFO guestinfo;
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
#include <WtsApi32.h>
|
||||
#include <Avrt.h>
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#include <wintab.h>
|
||||
#include "wintablet.h"
|
||||
@ -5915,6 +5915,7 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdL
|
||||
#endif
|
||||
#endif
|
||||
SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
|
||||
currprefs.win32_filesystem_mangle_reserved_names = true;
|
||||
SetDllDirectory (_T(""));
|
||||
/* Make sure we do an InitCommonControls() to get some advanced controls */
|
||||
InitCommonControls ();
|
||||
|
||||
@ -19,8 +19,8 @@
|
||||
#define LANG_DLL 1
|
||||
|
||||
//#define WINUAEBETA _T("")
|
||||
#define WINUAEBETA _T("14")
|
||||
#define WINUAEDATE MAKEBD(2012, 8, 30)
|
||||
#define WINUAEBETA _T("15")
|
||||
#define WINUAEDATE MAKEBD(2012, 9, 2)
|
||||
#define WINUAEEXTRA _T("")
|
||||
//#define WINUAEEXTRA _T("AmiKit Preview")
|
||||
#define WINUAEREV _T("")
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
#include "sysdeps.h"
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
|
||||
#include "options.h"
|
||||
#include "audio.h"
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
#include <shobjidl.h>
|
||||
#include <dbt.h>
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
#include "sysconfig.h"
|
||||
#include "sysdeps.h"
|
||||
#include "gui.h"
|
||||
@ -1151,7 +1151,8 @@ static HWND cachedlist = NULL;
|
||||
#define MIN_SLOW_MEM 0
|
||||
#define MAX_SLOW_MEM 4
|
||||
#define MIN_Z3_MEM 0
|
||||
#define MAX_Z3_MEM ((max_z3fastmem >> 20) < 512 ? 12 : ((max_z3fastmem >> 20) < 1024 ? 13 : ((max_z3fastmem >> 20) < 2048) ? 14 : ((max_z3fastmem >> 20) < 2560) ? 15 : ((max_z3fastmem >> 20) < 3072) ? 16 : 17))
|
||||
//#define MAX_Z3_MEM ((max_z3fastmem >> 20) < 512 ? 12 : ((max_z3fastmem >> 20) < 1024 ? 13 : ((max_z3fastmem >> 20) < 2048) ? 14 : ((max_z3fastmem >> 20) < 2560) ? 15 : ((max_z3fastmem >> 20) < 3072) ? 16 : 17))
|
||||
#define MAX_Z3_MEM ((max_z3fastmem >> 20) < 512 ? 12 : ((max_z3fastmem >> 20) < 1024 ? 13 : ((max_z3fastmem >> 20) < 2048) ? 14 : 15))
|
||||
#define MAX_Z3_CHIPMEM 7
|
||||
#define MIN_P96_MEM 0
|
||||
#define MAX_P96_MEM_Z3 ((max_z3fastmem >> 20) < 512 ? 8 : ((max_z3fastmem >> 20) < 1024 ? 9 : ((max_z3fastmem >> 20) < 2048) ? 10 : 11))
|
||||
@ -15231,7 +15232,7 @@ static int GetSettings (int all_options, HWND hwnd)
|
||||
scaleresource_setmult (hwnd, -fmultx, -fmulty);
|
||||
} else {
|
||||
scaleresource_setmult (hwnd, gui_width, gui_height);
|
||||
//write_log (_T("Requested GUI %dx%d\n"), gui_width, gui_height);
|
||||
write_log (_T("Requested GUI size = %dx%d\n"), gui_width, gui_height);
|
||||
}
|
||||
tres = scaleresource (panelresource, hwnd, gui_resize);
|
||||
dhwnd = CreateDialogIndirect (tres->inst, tres->resource, hwnd, DialogProc);
|
||||
@ -15246,7 +15247,7 @@ static int GetSettings (int all_options, HWND hwnd)
|
||||
int w, h;
|
||||
|
||||
getguisize (dhwnd, &w, &h);
|
||||
//write_log (_T("GUI %dx%d\n"), w, h);
|
||||
write_log (_T("Got GUI size = %dx%d\n"), w, h);
|
||||
if (w < 100 || h < 100 || w > 4096 || h > 4096) {
|
||||
write_log (_T("GUI size (%dx%d) out of range!\n"), w, h);
|
||||
scaleresource_setdefaults ();
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
#include "sysconfig.h"
|
||||
#include "sysdeps.h"
|
||||
|
||||
#include "resource"
|
||||
#include "resource.h"
|
||||
#include "registry.h"
|
||||
#include "win32.h"
|
||||
#include "win32gui.h"
|
||||
@ -155,7 +155,7 @@ static void modifytemplatefont (DLGTEMPLATEEX *d, DLGTEMPLATEEX_END *d2)
|
||||
d2->pointsize = fontsize_gui;
|
||||
d2->italic = (fontstyle_gui & ITALIC_FONTTYPE) != 0;
|
||||
d2->weight = fontweight_gui;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void modifyitem (DLGTEMPLATEEX *d, DLGTEMPLATEEX_END *d2, DLGITEMTEMPLATEEX *dt, int id)
|
||||
@ -205,10 +205,10 @@ static INT_PTR CALLBACK DummyProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lP
|
||||
|
||||
struct newresource *scaleresource (struct newresource *res, HWND parent, int resize)
|
||||
{
|
||||
DLGTEMPLATEEX *d;
|
||||
DLGTEMPLATEEX_END *d2;
|
||||
DLGTEMPLATEEX *d, *s;
|
||||
DLGTEMPLATEEX_END *d2, *s2;
|
||||
DLGITEMTEMPLATEEX *dt;
|
||||
BYTE *p, *p2;
|
||||
BYTE *p, *p2, *ps, *ps2;
|
||||
int i;
|
||||
struct newresource *ns;
|
||||
|
||||
@ -230,6 +230,7 @@ struct newresource *scaleresource (struct newresource *res, HWND parent, int res
|
||||
memcpy ((void*)ns->resource, res->resource, ns->size);
|
||||
|
||||
d = (DLGTEMPLATEEX*)ns->resource;
|
||||
s = (DLGTEMPLATEEX*)res->resource;
|
||||
|
||||
if (resize > 0) {
|
||||
d->style &= ~DS_MODALFRAME;
|
||||
@ -244,20 +245,32 @@ struct newresource *scaleresource (struct newresource *res, HWND parent, int res
|
||||
p = skiptext (p);
|
||||
p = skiptext (p);
|
||||
p = skiptext (p);
|
||||
|
||||
s2 = (DLGTEMPLATEEX_END*)res->resource;
|
||||
ps = (BYTE*)s2 + sizeof (DLGTEMPLATEEX);
|
||||
ps = skiptext (ps);
|
||||
ps = skiptext (ps);
|
||||
ps = skiptext (ps);
|
||||
|
||||
d2 = (DLGTEMPLATEEX_END*)p;
|
||||
p2 = p;
|
||||
p2 += sizeof (DLGTEMPLATEEX_END);
|
||||
p2 = skiptextone (p2);
|
||||
p2 = todword (p2);
|
||||
|
||||
s2 = (DLGTEMPLATEEX_END*)ps;
|
||||
ps2 = ps;
|
||||
ps2 += sizeof (DLGTEMPLATEEX_END);
|
||||
ps2 = skiptextone (ps2);
|
||||
ps2 = todword (ps2);
|
||||
|
||||
modifytemplatefont (d, d2);
|
||||
|
||||
p += sizeof (DLGTEMPLATEEX_END);
|
||||
p = skiptextone (p);
|
||||
p = todword (p);
|
||||
|
||||
if (p != p2)
|
||||
memmove (p, p2, ns->size - (p2 - (BYTE*)ns->resource));
|
||||
memcpy (p, ps2, ns->size - (ps2 - (BYTE*)res->resource));
|
||||
|
||||
modifytemplate(d, d2, ns->tmpl);
|
||||
|
||||
|
||||
@ -121,6 +121,15 @@
|
||||
<IncludePath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath)</IncludePath>
|
||||
<ReferencePath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">$(ReferencePath)</ReferencePath>
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;C:\dev\lib;$(LibraryPath)</LibraryPath>
|
||||
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EmbedManifest>
|
||||
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
|
||||
<EmbedManifest Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">true</EmbedManifest>
|
||||
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\dev\include;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\dev\lib\x64;C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;$(LibraryPath)</LibraryPath>
|
||||
<IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath)</LibraryPath>
|
||||
<IncludePath Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Include;C:\dev\include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x64;C:\dev\lib\x64;$(LibraryPath)</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Midl>
|
||||
@ -185,7 +194,8 @@
|
||||
</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>..\resources\winuae.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
<AdditionalManifestFiles>../resources/winuae.exe.manifest</AdditionalManifestFiles>
|
||||
<EnableDPIAwareness>true</EnableDPIAwareness>
|
||||
</Manifest>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
@ -203,9 +213,9 @@
|
||||
<PreprocessorDefinitions>WINVER=0x0500;_DEBUG;WIN32_IE=0x0700;WIN32;WIN64;_CRT_SECURE_NO_WARNINGS;D3D_DEBUG_INFO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>true</BufferSecurityCheck>
|
||||
<RuntimeTypeInfo>true</RuntimeTypeInfo>
|
||||
<RuntimeTypeInfo>false</RuntimeTypeInfo>
|
||||
<PrecompiledHeaderOutputFile>$(Platform)\$(Configuration)\winuae_msvc.pch</PrecompiledHeaderOutputFile>
|
||||
<AssemblerListingLocation>$(Platform)\$(Configuration)\</AssemblerListingLocation>
|
||||
<ObjectFileName>$(Platform)\$(Configuration)\</ObjectFileName>
|
||||
@ -217,6 +227,7 @@
|
||||
<CompileAs>Default</CompileAs>
|
||||
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<EnablePREfast>false</EnablePREfast>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
</ClCompile>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
@ -226,7 +237,7 @@
|
||||
<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;libpng15.lib;lglcd.lib;wtsapi32.lib;wntab32x.lib;enet_x64.lib;prowizard_x64.lib;lzmalib.lib;libFLAC_static.lib;avrt.lib;hid.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_42.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(Platform)\$(Configuration)\winuae.pdb</ProgramDatabaseFile>
|
||||
@ -243,7 +254,8 @@
|
||||
</IgnoreAllDefaultLibraries>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
<AdditionalManifestFiles>..\resources\winuae64.exe.manifest</AdditionalManifestFiles>
|
||||
<EnableDPIAwareness>true</EnableDPIAwareness>
|
||||
</Manifest>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
@ -317,7 +329,10 @@
|
||||
</MinimumRequiredVersion>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>..\resources\winuae.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
<AdditionalManifestFiles>../resources/winuae.exe.manifest</AdditionalManifestFiles>
|
||||
<EnableDPIAwareness>true</EnableDPIAwareness>
|
||||
<OutputManifestFile>$(IntDir)$(TargetName)$(TargetExt).embed.manifest</OutputManifestFile>
|
||||
<AdditionalOptions>/validate_manifest %(AdditionalOptions)</AdditionalOptions>
|
||||
</Manifest>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
@ -340,7 +355,7 @@
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
|
||||
@ -370,7 +385,7 @@
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(Platform)\$(Configuration)\winuae.pdb</ProgramDatabaseFile>
|
||||
@ -387,7 +402,8 @@
|
||||
<TargetMachine>MachineX64</TargetMachine>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
<AdditionalManifestFiles>..\resources\winuae64.exe.manifest</AdditionalManifestFiles>
|
||||
<EnableDPIAwareness>true</EnableDPIAwareness>
|
||||
</Manifest>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|Win32'">
|
||||
@ -460,7 +476,8 @@
|
||||
</MinimumRequiredVersion>
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>..\resources\winuae9.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
<AdditionalManifestFiles>../resources/winuae.exe.manifest</AdditionalManifestFiles>
|
||||
<EnableDPIAwareness>true</EnableDPIAwareness>
|
||||
</Manifest>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='FullRelease|x64'">
|
||||
@ -483,7 +500,7 @@
|
||||
<StringPooling>true</StringPooling>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
|
||||
@ -514,7 +531,7 @@
|
||||
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)\..\lib\</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
<DelayLoadDLLs>wpcap.dll;packet.dll;d3dx9_43.dll;openal32.dll;wintab32.dll;portaudio_x64.dll;ws2_32.dll;msacm32.dll;wtsapi32.dll;dsound.dll;avrt.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<ProgramDatabaseFile>$(Platform)\$(Configuration)\winuae.pdb</ProgramDatabaseFile>
|
||||
@ -531,6 +548,7 @@
|
||||
</Link>
|
||||
<Manifest>
|
||||
<AdditionalManifestFiles>..\resources\winuae64.exe.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
|
||||
<EnableDPIAwareness>true</EnableDPIAwareness>
|
||||
</Manifest>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
@ -727,7 +745,6 @@
|
||||
<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">
|
||||
|
||||
@ -608,7 +608,6 @@
|
||||
<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">
|
||||
|
||||
@ -1,6 +1,19 @@
|
||||
|
||||
- restore only single input target to default.
|
||||
|
||||
Beta 15:
|
||||
|
||||
- Fixed too large GUI size if non-100% Windows DPI setting and full optimized build. (b13)
|
||||
- Fonts with long names caused corrupted dialog structure.
|
||||
- Marked WinUAE as Windows Vista/7/8 compatible. This should have been done long time ago, without this Windows enables
|
||||
some backwards compatibility features, for example Aero gets disabled in fullscreen directdraw.
|
||||
- Disabled COPJMP bug emulation, it triggers incorrectly in Seven Sins/Scoopex.
|
||||
(Already did some logic analyzer testing but I can't yet confirm exact trigger conditions for this bug, it wasn't as simple
|
||||
as I originally thought)
|
||||
- Editing non-custom event's qualifier reset input target to none.
|
||||
- Lightpen cursor wasn't removed when lightpen mode was disabled.
|
||||
- Wintab tablet messages corrupted memory if Windows driver installed but tablet mode was not enabled. (b6)
|
||||
|
||||
Beta 14:
|
||||
|
||||
- Borderblank emulation rewritten yet again, now borderblank state is included with color 0 change events (this time
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user