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

Added the IBM 5161 ISA expansion for PC and XT;

Browse Source 
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port;
Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX);
Finished the 586MC1;
Added 8087 emulation;
Moved Cyrix 6x86'es to the Dev branch;
Sanitized/cleaned up memregs.c/h and intel.c/h;
Split the chipsets from machines and sanitized Port 92 emulation;
Added support for the 15bpp mode to the Compaq ATI 28800;
Moved the MR 386DX and 486 machines to the Dev branch;
Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00;
Ported the new timer code from PCem;
Cleaned up the CPU table of unused stuff and better optimized its structure;
Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch;
Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem;
Added the AHA-1540A and the BusTek BT-542B;
Moved the Sumo SCSI-AT to the Dev branch;
Minor IDE, FDC, and floppy drive code clean-ups;
Made NCR 5380/53C400-based cards' BIOS address configurable;
Got rid of the legacy romset variable;
Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit;
Added the Amstead PPC512 per PCem patch by John Elliott;
Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages);
Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing;
Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem;
Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit;
Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement;
Amstrad MegaPC does now works correctly with non-internal graphics card;
The SLiRP code no longer casts a packed struct type to a non-packed struct type;
The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present;
The S3 Virge on BeOS is no longer broken (was broken by build #1591);
OS/2 2.0 build 6.167 now sees key presses again;
Xi8088 now work on CGA again;
86F images converted from either the old or new variants of the HxC MFM format now work correctly;
Hardware interrupts with a vector of 0xFF are now handled correctly;
OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct;
Fixed VNC keyboard input bugs;
Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g  / 81 MIDI play no longer hangs with the build's own VTD driver;
Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly;
Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4;
Compaq Portable now works with all graphics cards;
Fixed various MDSI Genius bugs;
Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly;
Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355;
OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400.
Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391.
Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389.
Fixed a minor IDE timing bug, fixes #388.
Fixed Toshiba T1000 RAM issues, fixes #379.
Fixed EGA/(S)VGA overscan border handling, fixes #378;
Got rid of the now long useless IDE channel 2 auto-removal, fixes #370;
Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366;
Ported the Unicode CD image file name fix from VARCem, fixes #365;
Fixed high density floppy disks on the Xi8088, fixes #359;
Fixed some bugs in the Hercules emulation, fixes #346, fixes #358;
Fixed the SCSI hard disk mode sense pages, fixes #356;
Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349;
Fixed bugs in the serial mouse emulation, fixes #344;
Compiled 86Box binaries now include all the required .DLL's, fixes #341;
Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
OBattler
2019-09-20 14:02:30 +02:00
parent b06296bbf6
commit 552a87ea3d
524 changed files with 129555 additions and 21862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
src/win/win_ddraw.cpp
View File

@@ -11,15 +11,15 @@
* NOTES: This code should be re-merged into a single init() with a
* 'fullscreen' argument, indicating FS mode is requested.
*
* Version: @(#)win_ddraw.cpp 1.0.13 2018/11/18
* Version: @(#)win_ddraw.cpp 1.0.14 2019/03/09
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2008-2018 Sarah Walker.
* Copyright 2016-2018 Miran Grca.
* Copyright 2017,2018 Fred N. van Kempen.
* Copyright 2008-2019 Sarah Walker.
* Copyright 2016-2019 Miran Grca.
* Copyright 2017-2019 Fred N. van Kempen.
*/
#include <stdarg.h>
#include <stdint.h>
@@ -53,6 +53,7 @@ static HWND ddraw_hwnd;
static HBITMAP hbitmap;
static int ddraw_w, ddraw_h,
xs, ys, ys2;
static volatile int ddraw_enabled = 0;
static png_structp png_ptr;
static png_infop info_ptr;
@@ -133,7 +134,7 @@ DoubleLines(uint8_t *dst, uint8_t *src)
static void
SavePNG(wchar_t *szFilename, HBITMAP hBitmap)
SavePNG(const wchar_t *szFilename, HBITMAP hBitmap)
{
BITMAPINFO bmpInfo;
HDC hdc;
@@ -143,7 +144,7 @@ SavePNG(wchar_t *szFilename, HBITMAP hBitmap)
int i;
/* create file */
FILE *fp = plat_fopen(szFilename, (wchar_t *) L"wb");
FILE *fp = plat_fopen((wchar_t *) szFilename, (wchar_t *) L"wb");
if (!fp) {
ddraw_log("[SavePNG] File %ls could not be opened for writing", szFilename);
return;
@@ -266,38 +267,52 @@ static void
ddraw_fs_size(RECT w_rect, RECT *r_dest, int w, int h)
{
int ratio_w, ratio_h;
double hsr, gsr, ra, d;
double hsr, gsr, d, sh, sw, wh, ww, mh, mw;
ddraw_log("video_fullscreen_scale = %i\n", video_fullscreen_scale);
sh = (double) (w_rect.bottom - w_rect.top);
sw = (double) (w_rect.right - w_rect.left);
wh = (double) h;
ww = (double) w;
switch (video_fullscreen_scale) {
case FULLSCR_SCALE_FULL:
ddraw_fs_size_default(w_rect, r_dest);
break;
case FULLSCR_SCALE_43:
r_dest->top = 0;
r_dest->bottom = (w_rect.bottom - w_rect.top) - 1;
r_dest->left = ((w_rect.right - w_rect.left) / 2) - (((w_rect.bottom - w_rect.top) * 4) / (3 * 2));
r_dest->right = ((w_rect.right - w_rect.left) / 2) + (((w_rect.bottom - w_rect.top) * 4) / (3 * 2)) - 1;
if (r_dest->left < 0) {
r_dest->left = 0;
r_dest->right = (w_rect.right - w_rect.left) - 1;
r_dest->top = ((w_rect.bottom - w_rect.top) / 2) - (((w_rect.right - w_rect.left) * 3) / (4 * 2));
r_dest->bottom = ((w_rect.bottom - w_rect.top) / 2) + (((w_rect.right - w_rect.left) * 3) / (4 * 2)) - 1;
case FULLSCR_SCALE_KEEPRATIO:
if (video_fullscreen_scale == FULLSCR_SCALE_43) {
mw = 4.0;
mh = 3.0;
} else {
mw = ww;
mh = wh;
}
break;
case FULLSCR_SCALE_SQ:
r_dest->top = 0;
r_dest->bottom = (w_rect.bottom - w_rect.top) - 1;
r_dest->left = ((w_rect.right - w_rect.left) / 2) - (((w_rect.bottom - w_rect.top) * w) / (h * 2));
r_dest->right = ((w_rect.right - w_rect.left) / 2) + (((w_rect.bottom - w_rect.top) * w) / (h * 2)) - 1;
if (r_dest->left < 0) {
hsr = sw / sh;
gsr = mw / mh;
if (hsr > gsr) {
/* Host ratio is bigger than guest ratio. */
d = (sw - (mw * (sh / mh))) / 2.0;
r_dest->left = (int) d;
r_dest->right = (int) (sw - d - 1.0);
r_dest->top = 0;
r_dest->bottom = (int) (sh - 1.0);
} else if (hsr < gsr) {
/* Host ratio is smaller or rqual than guest ratio. */
d = (sh - (mh * (sw / mw))) / 2.0;
r_dest->left = 0;
r_dest->right = (w_rect.right - w_rect.left) - 1;
r_dest->top = ((w_rect.bottom - w_rect.top) / 2) - (((w_rect.right - w_rect.left) * h) / (w * 2));
r_dest->bottom = ((w_rect.bottom - w_rect.top) / 2) + (((w_rect.right - w_rect.left) * h) / (w * 2)) - 1;
r_dest->right = (int) (sw - 1.0);
r_dest->top = (int) d;
r_dest->bottom = (int) (sh - d - 1.0);
} else {
/* Host ratio is equal to guest ratio. */
ddraw_fs_size_default(w_rect, r_dest);
}
break;
@@ -311,38 +326,6 @@ ddraw_fs_size(RECT w_rect, RECT *r_dest, int w, int h)
r_dest->top = ((w_rect.bottom - w_rect.top) / 2) - ((h * ratio_w) / 2);
r_dest->bottom = ((w_rect.bottom - w_rect.top) / 2) + ((h * ratio_w) / 2) - 1;
break;
case FULLSCR_SCALE_KEEPRATIO:
hsr = ((double) (w_rect.right - w_rect.left)) / ((double) (w_rect.bottom - w_rect.top));
gsr = ((double) w) / ((double) h);
if (hsr > gsr) {
/* Host ratio is bigger than guest ratio. */
ra = ((double) (w_rect.bottom - w_rect.top)) / ((double) h);
d = ((double) w) * ra;
d = (((double) (w_rect.right - w_rect.left)) - d) / 2.0;
r_dest->left = ((int) d);
r_dest->right = (w_rect.right - w_rect.left) - ((int) d) - 1;
r_dest->top = 0;
r_dest->bottom = (w_rect.bottom - w_rect.top) - 1;
} else if (hsr < gsr) {
/* Host ratio is smaller or rqual than guest ratio. */
ra = ((double) (w_rect.right - w_rect.left)) / ((double) w);
d = ((double) h) * ra;
d = (((double) (w_rect.bottom - w_rect.top)) - d) / 2.0;
r_dest->left = 0;
r_dest->right = (w_rect.right - w_rect.left) - 1;
r_dest->top = ((int) d);
r_dest->bottom = (w_rect.bottom - w_rect.top) - ((int) d) - 1;
} else {
/* Host ratio is equal to guest ratio. */
ddraw_fs_size_default(w_rect, r_dest);
}
break;
}
}
@@ -357,6 +340,11 @@ ddraw_blit_fs(int x, int y, int y1, int y2, int w, int h)
HRESULT hr;
DDBLTFX ddbltfx;
if (!ddraw_enabled) {
video_blit_complete();
return;
}
if (lpdds_back == NULL) {
video_blit_complete();
return; /*Nothing to do*/
@@ -386,9 +374,9 @@ ddraw_blit_fs(int x, int y, int y1, int y2, int w, int h)
for (yy = y1; yy < y2; yy++) {
if (buffer32) {
if (video_grayscale || invert_display)
video_transform_copy((uint32_t *)((uintptr_t)ddsd.lpSurface + (yy * ddsd.lPitch)), &(((uint32_t *)buffer32->line[y + yy])[x]), w);
video_transform_copy((uint32_t *)((uintptr_t)ddsd.lpSurface + (yy * ddsd.lPitch)), &(buffer32->line[y + yy][x]), w);
else
memcpy((void *)((uintptr_t)ddsd.lpSurface + (yy * ddsd.lPitch)), &(((uint32_t *)buffer32->line[y + yy])[x]), w * 4);
memcpy((void *)((uintptr_t)ddsd.lpSurface + (yy * ddsd.lPitch)), &(buffer32->line[y + yy][x]), w * 4);
}
}
video_blit_complete();
@@ -434,6 +422,11 @@ ddraw_blit(int x, int y, int y1, int y2, int w, int h)
HRESULT hr;
int yy;
if (!ddraw_enabled) {
video_blit_complete();
return;
}
if (lpdds_back == NULL) {
video_blit_complete();
return; /*Nothing to do*/
@@ -465,9 +458,9 @@ ddraw_blit(int x, int y, int y1, int y2, int w, int h)
if (buffer32) {
if ((y + yy) >= 0 && (y + yy) < buffer32->h) {
if (video_grayscale || invert_display)
video_transform_copy((uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]), &(((uint32_t *)buffer32->line[y + yy])[x]), w);
video_transform_copy((uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]), &(buffer32->line[y + yy][x]), w);
else
memcpy((uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]), &(((uint32_t *)buffer32->line[y + yy])[x]), w * 4);
memcpy((uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]), &(buffer32->line[y + yy][x]), w * 4);
}
}
}
@@ -503,7 +496,7 @@ ddraw_blit(int x, int y, int y1, int y2, int w, int h)
void
ddraw_take_screenshot(wchar_t *fn)
ddraw_take_screenshot(const wchar_t *fn)
{
#if 0
xs = xsize;
@@ -541,8 +534,6 @@ ddraw_take_screenshot(wchar_t *fn)
int
ddraw_init(HWND h)
{
cgapal_rebuild();
if (FAILED(DirectDrawCreate(NULL, &lpdd, NULL))) return(0);
if (FAILED(lpdd->QueryInterface(IID_IDirectDraw4, (LPVOID *)&lpdd4)))
@@ -600,6 +591,8 @@ ddraw_init(HWND h)
video_setblit(ddraw_blit);
ddraw_enabled = 1;
return(1);
}
@@ -610,8 +603,6 @@ ddraw_init_fs(HWND h)
ddraw_w = GetSystemMetrics(SM_CXSCREEN);
ddraw_h = GetSystemMetrics(SM_CYSCREEN);
cgapal_rebuild();
if (FAILED(DirectDrawCreate(NULL, &lpdd, NULL))) return 0;
if (FAILED(lpdd->QueryInterface(IID_IDirectDraw4, (LPVOID *)&lpdd4))) return 0;
@@ -658,6 +649,8 @@ ddraw_init_fs(HWND h)
video_setblit(ddraw_blit_fs);
ddraw_enabled = 1;
return(1);
}
@@ -667,6 +660,9 @@ ddraw_close(void)
{
video_setblit(NULL);
if (ddraw_enabled)
ddraw_enabled = 0;
if (lpdds_back2) {
lpdds_back2->Release();
lpdds_back2 = NULL;
@@ -695,3 +691,10 @@ ddraw_pause(void)
{
return(0);
}
void
ddraw_enable(int enable)
{
ddraw_enabled = enable;
}