The FDC is now a device_t, and the FDC code has been cleaned up;
Merged floppy.c and fdd.c and renamed floppy_*.c (the floppy image format handlers) to fdd_*.c; Reading the AT or PS/2 keyboard controller status no longer clears the transmit timeout bit, fixes error 8601 (mouse error) on the IBM PS/2 Model 80; MMU translate and DMA physical reads and writes now go through _mem_exec instead of directly to ram[], should fix the last remaining problems with remapped mappings; Implemented the Sound gain dialog; Added the resource for the "New floppy image" dialog and the needed functions for the functionality of exporting the currently mounted floppy image as 86F, both of which should be finished in the next commit; Applied the CD-ROM fixes from the PCem commit; Added the "Keep ratio" option for full screen stretch.
This commit is contained in:
OBattler
@@ -8,12 +8,12 @@
|
||||
*
|
||||
* Application resource script for Windows.
|
||||
*
|
||||
* Version: @(#)86Box.rc 1.0.22 2017/12/09
|
||||
* Version: @(#)86Box.rc 1.0.22 2018/01/17
|
||||
*
|
||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
*/
|
||||
#include <inttypes.h>
|
||||
#define IN_RESOURCE_H
|
||||
@@ -88,6 +88,7 @@ BEGIN
|
||||
MENUITEM "&4:3", IDM_VID_FS_43
|
||||
MENUITEM "&Square pixels", IDM_VID_FS_SQ
|
||||
MENUITEM "&Integer scale", IDM_VID_FS_INT
|
||||
MENUITEM "&Keep size", IDM_VID_FS_KEEPRATIO
|
||||
END
|
||||
POPUP "E&GA/(S)VGA settings"
|
||||
BEGIN
|
||||
@@ -116,11 +117,10 @@ BEGIN
|
||||
BEGIN
|
||||
MENUITEM "&Settings...", IDM_CONFIG
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Load configuration...", IDM_CONFIG_LOAD
|
||||
MENUITEM "&Save configuration...", IDM_CONFIG_SAVE
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "S&tatus", IDM_STATUS
|
||||
MENUITEM "Take s&creenshot\tCtrl+F11", IDM_ACTION_SCREENSHOT
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "S&ound gain...", IDM_SND_GAIN
|
||||
END
|
||||
#if defined(ENABLE_LOG_TOGGLES) || defined(ENABLE_LOG_COMMANDS)
|
||||
POPUP "&Logging"
|
||||
@@ -238,6 +238,39 @@ BEGIN
|
||||
LTEXT "1",IDT_STEXT,16,186,180,1000
|
||||
END
|
||||
|
||||
DLG_SND_GAIN DIALOG DISCARDABLE 0, 0, 174, 136
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Sound Gain"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,117,7,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,117,24,50,14
|
||||
CONTROL "Main",IDC_SLIDER_MAIN,"msctls_trackbar32",TBS_VERT |
|
||||
TBS_BOTH | TBS_AUTOTICKS | WS_TABSTOP,15,20,20,109
|
||||
CONTROL "CD",IDC_SLIDER_CD,"msctls_trackbar32",TBS_VERT |
|
||||
TBS_BOTH | TBS_AUTOTICKS | WS_TABSTOP,45,20,20,109
|
||||
CONTROL "MIDI",IDC_SLIDER_MIDI,"msctls_trackbar32",TBS_VERT |
|
||||
TBS_BOTH | TBS_AUTOTICKS | WS_TABSTOP,77,20,20,109
|
||||
CTEXT "Main",IDT_1746,7,7,32,9,SS_CENTERIMAGE
|
||||
CTEXT "CD",IDT_1747,38,7,32,9,SS_CENTERIMAGE
|
||||
CTEXT "MIDI",IDT_1748,70,7,32,9,SS_CENTERIMAGE
|
||||
END
|
||||
|
||||
DLG_NEW_FLOPPY DIALOG DISCARDABLE 0, 0, 186, 65
|
||||
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "New Floppy Image"
|
||||
FONT 8, "MS Sans Serif"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,74,44,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,129,44,50,14
|
||||
LTEXT "File name:",IDT_1749,7,6,34,12,SS_CENTERIMAGE
|
||||
LTEXT "Disk size:",IDT_1750,7,25,34,12,SS_CENTERIMAGE
|
||||
EDITTEXT IDC_EDIT_FILE_NAME,43,7,124,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
COMBOBOX IDC_COMBO_DISK_SIZE,43,25,136,14,CBS_DROPDOWN | CBS_SORT |
|
||||
WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON "...",IDC_CFILE,166,7,13,12
|
||||
END
|
||||
|
||||
DLG_CONFIG DIALOG DISCARDABLE 0, 0, 366, 241
|
||||
STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "86Box Settings"
|
||||
@@ -606,6 +639,22 @@ END
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO DISCARDABLE
|
||||
BEGIN
|
||||
DLG_SND_GAIN, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 167
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 129
|
||||
END
|
||||
|
||||
DLG_NEW_FLOPPY, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 7
|
||||
RIGHTMARGIN, 179
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 58
|
||||
END
|
||||
|
||||
DLG_CFG_MAIN, DIALOG
|
||||
BEGIN
|
||||
RIGHTMARGIN, 365
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#
|
||||
# Makefile for Win32 (MinGW32) environment.
|
||||
#
|
||||
# Version: @(#)Makefile.mingw 1.0.91 2018/01/01
|
||||
# Version: @(#)Makefile.mingw 1.0.92 2018/01/16
|
||||
#
|
||||
# Authors: Miran Grca, <mgrca8@gmail.com>
|
||||
# Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
@@ -255,7 +255,8 @@ ifneq ($(WX), n)
|
||||
else
|
||||
UIOBJ := win_ui.o win_ddraw.o win_d3d.o win_png.o \
|
||||
win_dialog.o win_about.o win_status.o win_stbar.o \
|
||||
win_settings.o win_devconf.o win_jsconf.o
|
||||
win_settings.o win_devconf.o \
|
||||
win_snd_gain.o win_jsconf.o
|
||||
endif
|
||||
|
||||
ifeq ($(OPENAL), y)
|
||||
@@ -394,9 +395,9 @@ DEVOBJ := bugger.o lpt.o $(SERIAL) \
|
||||
mouse_serial.o mouse_ps2.o mouse_bus.o
|
||||
|
||||
FDDOBJ := fdd.o fdc.o fdi2raw.o \
|
||||
floppy.o floppy_common.o floppy_86f.o \
|
||||
floppy_fdi.o floppy_imd.o floppy_img.o floppy_json.o \
|
||||
floppy_td0.o
|
||||
fdd_common.o fdd_86f.o \
|
||||
fdd_fdi.o fdd_imd.o fdd_img.o fdd_json.o \
|
||||
fdd_td0.o
|
||||
|
||||
HDDOBJ := hdd.o \
|
||||
hdd_image.o hdd_table.o \
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
*
|
||||
* Windows resource defines.
|
||||
*
|
||||
* Version: @(#)resource.h 1.0.15 2017/12/09
|
||||
* Version: @(#)resource.h 1.0.16 2018/01/17
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempem, <decwiz@yahoo.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2008-2017 Sarah Walker.
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2008-2018 Sarah Walker.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
*/
|
||||
#ifndef WIN_RESOURCE_H
|
||||
# define WIN_RESOURCE_H
|
||||
@@ -24,6 +24,8 @@
|
||||
/* Dialog IDs. */
|
||||
#define DLG_ABOUT 101 /* top-level dialog */
|
||||
#define DLG_STATUS 102 /* top-level dialog */
|
||||
#define DLG_SND_GAIN 103 /* top-level dialog */
|
||||
#define DLG_NEW_FLOPPY 104 /* top-level dialog */
|
||||
#define DLG_CONFIG 110 /* top-level dialog */
|
||||
#define DLG_CFG_MACHINE 111 /* sub-dialog of config */
|
||||
#define DLG_CFG_VIDEO 112 /* sub-dialog of config */
|
||||
@@ -77,6 +79,11 @@
|
||||
#define IDT_1743 1743 /* Channel: */
|
||||
#define IDT_STEXT 1744 /* text in status window */
|
||||
#define IDT_SDEVICE 1745 /* text in status window */
|
||||
#define IDT_1746 1746 /* Main */
|
||||
#define IDT_1747 1747 /* CD */
|
||||
#define IDT_1748 1748 /* MIDI */
|
||||
#define IDT_1749 1749 /* File name: */
|
||||
#define IDT_1750 1750 /* Disk size: */
|
||||
|
||||
|
||||
/*
|
||||
@@ -180,6 +187,13 @@
|
||||
#define IDC_BUTTON_CDROM_EDIT 1164 // status bar menu
|
||||
#define IDC_BUTTON_CDROM_REMOVE 1165 // status bar menu
|
||||
|
||||
#define IDC_SLIDER_MAIN 1180 /* sound gain dialog */
|
||||
#define IDC_SLIDER_CD 1181
|
||||
#define IDC_SLIDER_MIDI 1182
|
||||
|
||||
#define IDC_EDIT_FILE_NAME 1190 /* new floppy image dialog */
|
||||
#define IDC_COMBO_DISK_SIZE 1191
|
||||
|
||||
|
||||
/* For the DeviceConfig code, re-do later. */
|
||||
#define IDC_CONFIG_BASE 1200
|
||||
@@ -213,6 +227,7 @@
|
||||
#define IDM_CONFIG_LOAD 40021
|
||||
#define IDM_CONFIG_SAVE 40022
|
||||
#define IDM_STATUS 40030
|
||||
#define IDM_SND_GAIN 40040
|
||||
#define IDM_VID_RESIZE 40050
|
||||
#define IDM_VID_REMEMBER 40051
|
||||
#define IDM_VID_DDRAW 40060
|
||||
@@ -228,8 +243,9 @@
|
||||
#define IDM_VID_FS_43 40072
|
||||
#define IDM_VID_FS_SQ 40073
|
||||
#define IDM_VID_FS_INT 40074
|
||||
#define IDM_VID_FORCE43 40075
|
||||
#define IDM_VID_OVERSCAN 40076
|
||||
#define IDM_VID_FS_KEEPRATIO 40075
|
||||
#define IDM_VID_FORCE43 40076
|
||||
#define IDM_VID_OVERSCAN 40077
|
||||
#define IDM_VID_INVERT 40079
|
||||
#define IDM_VID_CGACON 40080
|
||||
#define IDM_VID_GRAYCT_601 40085
|
||||
|
||||
@@ -110,6 +110,10 @@ extern int ui_init(int nCmdShow);
|
||||
extern void AboutDialogCreate(HWND hwnd);
|
||||
|
||||
|
||||
/* Functions in win_snd_gain.c: */
|
||||
extern void SoundGainDialogCreate(HWND hwnd);
|
||||
|
||||
|
||||
/* Functions in win_status.c: */
|
||||
extern HWND hwndStatus;
|
||||
extern void StatusWindowCreate(HWND hwnd);
|
||||
|
||||
@@ -10,11 +10,9 @@
|
||||
*
|
||||
* Version: @(#)win_about.c 1.0.5 2017/12/13
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2008-2017 Sarah Walker.
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2017 Fred N. van Kempen.
|
||||
*/
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
* Implementation of the CD-ROM host drive IOCTL interface for
|
||||
* Windows using SCSI Passthrough Direct.
|
||||
*
|
||||
* Version: @(#)cdrom_ioctl.c 1.0.8 2017/11/24
|
||||
* Version: @(#)cdrom_ioctl.c 1.0.9 2018/01/17
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
*
|
||||
* Copyright 2008-2016 Sarah Walker.
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2008-2018 Sarah Walker.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
*/
|
||||
#define WINVER 0x0600
|
||||
#include <windows.h>
|
||||
@@ -573,13 +573,16 @@ static int is_track_audio(uint8_t id, uint32_t pos)
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (c = 0; c <= cdrom_ioctl_windows[id].toc.LastTrack; c++)
|
||||
for (c = 0; cdrom_ioctl_windows[id].toc.TrackData[c].TrackNumber != 0xaa; c++)
|
||||
{
|
||||
track_address = MSFtoLBA(cdrom_ioctl_windows[id].toc.TrackData[c].Address[1],cdrom_ioctl_windows[id].toc.TrackData[c].Address[2],cdrom_ioctl_windows[id].toc.TrackData[c].Address[3]);
|
||||
|
||||
if (track_address <= pos)
|
||||
if (cdrom_ioctl_windows[id].toc.TrackData[c].TrackNumber >= cdrom_ioctl_windows[id].toc.FirstTrack &&
|
||||
cdrom_ioctl_windows[id].toc.TrackData[c].TrackNumber <= cdrom_ioctl_windows[id].toc.LastTrack &&
|
||||
track_address <= pos)
|
||||
{
|
||||
control = cdrom_ioctl_windows[id].toc.TrackData[c].Control;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1048,7 +1051,6 @@ static int ioctl_readtoc(uint8_t id, unsigned char *b, unsigned char starttrack,
|
||||
break;
|
||||
}
|
||||
}
|
||||
b[2]=cdrom_ioctl_windows[id].toc.TrackData[c].TrackNumber;
|
||||
last_block = 0;
|
||||
for (c=d;c<=cdrom_ioctl_windows[id].toc.LastTrack;c++)
|
||||
{
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
*
|
||||
* Rendering module for Microsoft Direct3D 9.
|
||||
*
|
||||
* Version: @(#)win_d3d.cpp 1.0.9 2017/12/15
|
||||
* Version: @(#)win_d3d.cpp 1.0.10 2018/01/15
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2008-2017 Sarah Walker.
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2017 Fred N. van Kempen.
|
||||
* Copyright 2008-2018 Sarah Walker.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
* Copyright 2017,2018 Fred N. van Kempen.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
@@ -64,17 +64,25 @@ static CUSTOMVERTEX d3d_verts[] = {
|
||||
};
|
||||
|
||||
|
||||
static void
|
||||
d3d_size_default(RECT w_rect, double *l, double *t, double *r, double *b)
|
||||
{
|
||||
*l = -0.5;
|
||||
*t = -0.5;
|
||||
*r = (w_rect.right - w_rect.left) - 0.5;
|
||||
*b = (w_rect.bottom - w_rect.top) - 0.5;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
d3d_size(RECT w_rect, double *l, double *t, double *r, double *b, int w, int h)
|
||||
{
|
||||
int ratio_w, ratio_h;
|
||||
double hsr, gsr, ra, d;
|
||||
|
||||
switch (video_fullscreen_scale) {
|
||||
case FULLSCR_SCALE_FULL:
|
||||
*l = -0.5;
|
||||
*t = -0.5;
|
||||
*r = (w_rect.right - w_rect.left) - 0.5;
|
||||
*b = (w_rect.bottom - w_rect.top) - 0.5;
|
||||
d3d_size_default(w_rect, l, t, r, b);
|
||||
break;
|
||||
|
||||
case FULLSCR_SCALE_43:
|
||||
@@ -113,6 +121,38 @@ d3d_size(RECT w_rect, double *l, double *t, double *r, double *b, int w, int h)
|
||||
*t = ((w_rect.bottom - w_rect.top) / 2) - ((h * ratio_w) / 2) - 0.5;
|
||||
*b = ((w_rect.bottom - w_rect.top) / 2) + ((h * ratio_w) / 2) - 0.5;
|
||||
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;
|
||||
|
||||
*l = ((int) d) - 0.5;
|
||||
*r = (w_rect.right - w_rect.left) - ((int) d) - 0.5;
|
||||
*t = -0.5;
|
||||
*b = (w_rect.bottom - w_rect.top) - 0.5;
|
||||
} 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;
|
||||
|
||||
*l = -0.5;
|
||||
*r = (w_rect.right - w_rect.left) - 0.5;
|
||||
*t = ((int) d) - 0.5;
|
||||
*b = (w_rect.bottom - w_rect.top) - ((int) d) - 0.5;
|
||||
} else {
|
||||
/* Host ratio is equal to guest ratio. */
|
||||
d3d_size_default(w_rect, l, t, r, b);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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.4 2017/12/15
|
||||
* Version: @(#)win_ddraw.cpp 1.0.5 2018/01/15
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2008-2017 Sarah Walker.
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2017 Fred N. van Kempen.
|
||||
* Copyright 2008-2018 Sarah Walker.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
* Copyright 2017,2018 Fred N. van Kempen.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
@@ -155,17 +155,27 @@ SaveBitmap(wchar_t *szFilename, HBITMAP hBitmap)
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
ddraw_fs_size_default(RECT w_rect, RECT *r_dest)
|
||||
{
|
||||
r_dest->left = 0;
|
||||
r_dest->top = 0;
|
||||
r_dest->right = (w_rect.right - w_rect.left) - 1;
|
||||
r_dest->bottom = (w_rect.bottom - w_rect.top) - 1;
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
|
||||
pclog("video_fullscreen_scale = %i\n", video_fullscreen_scale);
|
||||
|
||||
switch (video_fullscreen_scale) {
|
||||
case FULLSCR_SCALE_FULL:
|
||||
r_dest->left = 0;
|
||||
r_dest->top = 0;
|
||||
r_dest->right = (w_rect.right - w_rect.left) - 1;
|
||||
r_dest->bottom = (w_rect.bottom - w_rect.top) - 1;
|
||||
ddraw_fs_size_default(w_rect, r_dest);
|
||||
break;
|
||||
|
||||
case FULLSCR_SCALE_43:
|
||||
@@ -204,6 +214,38 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
*
|
||||
* Windows 86Box Settings dialog handler.
|
||||
*
|
||||
* Version: @(#)win_settings.c 1.0.27 2017/12/13
|
||||
* Version: @(#)win_settings.c 1.0.28 2018/01/16
|
||||
*
|
||||
* Author: Miran Grca, <mgrca8@gmail.com>
|
||||
*
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
*/
|
||||
#define UNICODE
|
||||
#define BITMAP WINDOWS_BITMAP
|
||||
@@ -40,7 +40,6 @@
|
||||
#include "../disk/hdd.h"
|
||||
#include "../disk/hdc.h"
|
||||
#include "../disk/hdc_ide.h"
|
||||
#include "../floppy/floppy.h"
|
||||
#include "../floppy/fdd.h"
|
||||
#include "../scsi/scsi.h"
|
||||
#include "../network/network.h"
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
*
|
||||
* Implement the application's Status Bar.
|
||||
*
|
||||
* Version: @(#)win_stbar.c 1.0.7 2017/12/13
|
||||
* Version: @(#)win_stbar.c 1.0.8 2018/01/16
|
||||
*
|
||||
* Authors: Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2017 Fred N. van Kempen.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
* Copyright 2017,2018 Fred N. van Kempen.
|
||||
*/
|
||||
#define UNICODE
|
||||
#define BITMAP WINDOWS_BITMAP
|
||||
@@ -38,7 +38,6 @@
|
||||
#include "../cdrom/cdrom_null.h"
|
||||
#include "../disk/hdd.h"
|
||||
#include "../disk/hdc.h"
|
||||
#include "../floppy/floppy.h"
|
||||
#include "../floppy/fdd.h"
|
||||
#include "../scsi/scsi.h"
|
||||
#include "../scsi/scsi_disk.h"
|
||||
@@ -826,9 +825,9 @@ StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
|
||||
ret = file_dlg_w_st(hwnd, IDS_2159, floppyfns[id], 0);
|
||||
if (! ret) {
|
||||
floppy_close(id);
|
||||
fdd_close(id);
|
||||
ui_writeprot[id] = (item_id == IDM_FLOPPY_IMAGE_EXISTING_WP) ? 1 : 0;
|
||||
floppy_load(id, wopenfilestring);
|
||||
fdd_load(id, wopenfilestring);
|
||||
ui_sb_update_icon_state(SB_FLOPPY | id, wcslen(floppyfns[id]) ? 0 : 1);
|
||||
EnableMenuItem(sb_menu_handles[part], IDM_FLOPPY_EJECT | id, MF_BYCOMMAND | (wcslen(floppyfns[id]) ? MF_ENABLED : MF_GRAYED));
|
||||
ui_sb_update_tip(SB_FLOPPY | id);
|
||||
@@ -842,7 +841,7 @@ StatusBarProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
if ((part == -1) || (sb_menu_handles == NULL))
|
||||
break;
|
||||
|
||||
floppy_close(id);
|
||||
fdd_close(id);
|
||||
ui_sb_update_icon_state(SB_FLOPPY | id, 1);
|
||||
EnableMenuItem(sb_menu_handles[part], IDM_FLOPPY_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
|
||||
ui_sb_update_tip(SB_FLOPPY | id);
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
*
|
||||
* user Interface module for WinAPI on Windows.
|
||||
*
|
||||
* Version: @(#)win_ui.c 1.0.11 2017/12/28
|
||||
* Version: @(#)win_ui.c 1.0.12 2018/01/15
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2008-2017 Sarah Walker.
|
||||
* Copyright 2016,2017 Miran Grca.
|
||||
* Copyright 2017 Fred N. van Kempen.
|
||||
* Copyright 2008-2018 Sarah Walker.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
* Copyright 2017,2018 Fred N. van Kempen.
|
||||
*/
|
||||
#define UNICODE
|
||||
#include <windows.h>
|
||||
@@ -173,6 +173,7 @@ ResetAllMenus(void)
|
||||
CheckMenuItem(menuMain, IDM_VID_FS_FULL+1, MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_FS_FULL+2, MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_FS_FULL+3, MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_FS_FULL+4, MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_REMEMBER, MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_SCALE_1X+0, MF_UNCHECKED);
|
||||
CheckMenuItem(menuMain, IDM_VID_SCALE_1X+1, MF_UNCHECKED);
|
||||
@@ -309,6 +310,10 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
win_settings_open(hwnd);
|
||||
break;
|
||||
|
||||
case IDM_SND_GAIN:
|
||||
SoundGainDialogCreate(hwnd);
|
||||
break;
|
||||
|
||||
case IDM_ABOUT:
|
||||
AboutDialogCreate(hwnd);
|
||||
break;
|
||||
@@ -378,6 +383,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
case IDM_VID_FS_43:
|
||||
case IDM_VID_FS_SQ:
|
||||
case IDM_VID_FS_INT:
|
||||
case IDM_VID_FS_KEEPRATIO:
|
||||
CheckMenuItem(hmenu, IDM_VID_FS_FULL+video_fullscreen_scale, MF_UNCHECKED);
|
||||
video_fullscreen_scale = LOWORD(wParam) - IDM_VID_FS_FULL;
|
||||
CheckMenuItem(hmenu, IDM_VID_FS_FULL+video_fullscreen_scale, MF_CHECKED);
|
||||
|
||||
Reference in New Issue
Block a user