claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Applied all mainline PCem commits;

Browse Source 
Added experimental NVidia Riva TNT2 emulation (patch from MoochMcGee);
ASUS P/I-P54TP4XE, ASUS P/I-P55T2P4, and ASUS P/I-P55TVP4 are back;
National Semiconductor PC87306 Super I/O chip now correctly reenables devices after a chip power cycle;
Several FDC improvements and the behavior is now a bit closer to real hardware (based on actual tests);
Added MR Intel Advanced/ATX with Microid Research BIOS with support for 4 floppy drives and up to 4 IDE controllers;
Added floppy drives 3 and 4, bringing the maximum to 4;
You can now connect hard disks to the tertiary IDE controller;
Correct undocumented behavior of the LEA instruction with register is back on 286 and later CPU's;
Pentium-rea models with Intel chipsets now have port 92 (with alternate reset and alternate A20 toggle);
Overhauled DMA channel read and write routines and fixed cascading;
Improved IMG detection of a bad BPB (or complete lack of a BPB);
Added preliminary emulation of PS/2 1.44 MB and PC-98 1.25 MB 3-mode drives (both have an inverted DENSEL pin);
Removed the incorrect Amstrad mouse patch from TheCollector1995;
Fixed ATAPI CD-ROM disk change detection;
Windows IOCTL CD-ROM handler now tries to use direct SCSI passthrough for more things, including obtaining CD-ROM capacity;
The Diamond Stealth32 (ET4000/W32p) now also works correctly on the two Award SiS 496/497 boxes;
The (S)VGA handler now converts 6-bit RAMDAC RGB channels to standard 8-bit RGB using a lookup table generated at emulator start, calculated using the correct intensity conversion method and treating intensity 64 as equivalent to 63;
Moved a few options from the Configuration dialog box to the menu;
SIO, PIIX, and PIIX3 now have the reset control register on port CF9 as they should;
Several bugfixes.
This commit is contained in:
OBattler
2016-12-23 03:16:24 +01:00
parent 724c5699ca
commit dc46480aa4
142 changed files with 8778 additions and 3331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/win.c
View File

@@ -27,6 +27,7 @@
#include "cpu.h"
#include "cdrom.h"
#include "model.h"
#include "mouse.h"
#include "nethandler.h"
#include "nvr.h"
#include "sound.h"
@@ -322,7 +323,7 @@ static void initmenu(void)
HMENU m;
char s[32];
m=GetSubMenu(menu,1); /*Disc*/
m=GetSubMenu(m,9); /*CD-ROM*/
m=GetSubMenu(m,17); /*CD-ROM*/
/* Loop through each Windows drive letter and test to see if
it's a CDROM */
@@ -722,9 +723,17 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
}
if (cdrom_drive == 200)
{
CheckMenuItem(menu, IDM_CDROM_ISO, MF_CHECKED);
}
else
{
CheckMenuItem(menu, IDM_CDROM_REAL + cdrom_drive, MF_CHECKED);
}
CheckMenuItem(menu, IDM_VID_FORCE43, force_43 ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_VID_OVERSCAN, enable_overscan ? MF_CHECKED : MF_UNCHECKED);
CheckMenuItem(menu, IDM_VID_FLASH, enable_flash ? MF_CHECKED : MF_UNCHECKED);
// pclog("Checking video resize menu item...\n");
if (vid_resize) CheckMenuItem(menu, IDM_VID_RESIZE, MF_CHECKED);
@@ -1127,6 +1136,13 @@ int scsi_set_dma(HMENU hmenu, int dma, int id)
return 1;
}
void video_toggle_option(HMENU hmenu, int *val, int id)
{
*val ^= 1;
CheckMenuItem(hmenu, id, *val ? MF_CHECKED : MF_UNCHECKED);
saveconfig();
}
LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
HMENU hmenu;
@@ -1176,34 +1192,62 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
case IDM_FILE_EXIT:
PostQuitMessage (0); /* send a WM_QUIT to the message queue */
break;
case IDM_DISC_A:
case IDM_DISC_A_WP:
case IDM_DISC_1:
case IDM_DISC_1_WP:
if (!getfile(hwnd, floppy_image_extensions, discfns[0]))
{
disc_close(0);
ui_writeprot[0] = (LOWORD(wParam) == IDM_DISC_A_WP) ? 1 : 0;
ui_writeprot[0] = (LOWORD(wParam) == IDM_DISC_1_WP) ? 1 : 0;
disc_load(0, openfilestring);
saveconfig();
}
break;
case IDM_DISC_B:
case IDM_DISC_B_WP:
case IDM_DISC_2:
case IDM_DISC_2_WP:
if (!getfile(hwnd, floppy_image_extensions, discfns[1]))
{
disc_close(1);
ui_writeprot[1] = (LOWORD(wParam) == IDM_DISC_B_WP) ? 1 : 0;
ui_writeprot[1] = (LOWORD(wParam) == IDM_DISC_2_WP) ? 1 : 0;
disc_load(1, openfilestring);
saveconfig();
}
break;
case IDM_EJECT_A:
case IDM_DISC_3:
case IDM_DISC_3_WP:
if (!getfile(hwnd, floppy_image_extensions, discfns[2]))
{
disc_close(2);
ui_writeprot[2] = (LOWORD(wParam) == IDM_DISC_3_WP) ? 1 : 0;
disc_load(2, openfilestring);
saveconfig();
}
break;
case IDM_DISC_4:
case IDM_DISC_4_WP:
if (!getfile(hwnd, floppy_image_extensions, discfns[3]))
{
disc_close(3);
ui_writeprot[3] = (LOWORD(wParam) == IDM_DISC_4_WP) ? 1 : 0;
disc_load(3, openfilestring);
saveconfig();
}
break;
case IDM_EJECT_1:
disc_close(0);
saveconfig();
break;
case IDM_EJECT_B:
case IDM_EJECT_2:
disc_close(1);
saveconfig();
break;
case IDM_EJECT_3:
disc_close(2);
saveconfig();
break;
case IDM_EJECT_4:
disc_close(3);
saveconfig();
break;
case IDM_HDCONF:
hdconf_open(hwnd);
break;
@@ -1279,6 +1323,18 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
saveconfig();
break;
case IDM_VID_FORCE43:
video_toggle_option(hmenu, &force_43, IDM_VID_FORCE43);
break;
case IDM_VID_OVERSCAN:
video_toggle_option(hmenu, &enable_overscan, IDM_VID_OVERSCAN);
break;
case IDM_VID_FLASH:
video_toggle_option(hmenu, &enable_flash, IDM_VID_FLASH);
break;
case IDM_VID_SCREENSHOT:
take_screenshot();
break;
@@ -1723,7 +1779,8 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
break;
case WM_MBUTTONUP:
releasemouse();
if (!(mouse_get_type(mouse_type) & MOUSE_TYPE_3BUTTON))
releasemouse();
break;
case WM_ENTERMENULOOP: