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

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source 
# Conflicts:
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
This commit is contained in:
RichardG867
2022-06-07 15:36:12 -03:00
parent 0582c11e90 92c3768a48
commit 50b75c457d
104 changed files with 7259 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/win/Makefile.mingw
View File

@@ -689,6 +689,7 @@ VIDOBJ := agpgart.o video.o \
vid_wy700.o \
vid_ega.o vid_ega_render.o \
vid_svga.o vid_svga_render.o \
vid_8514a.o \
vid_ddc.o \
vid_vga.o \
vid_ati_eeprom.o \

1
src/win/languages/cs-CZ.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Grafika:"
#define STR_VOODOO "Použít grafický akcelerátor Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Myš:"
#define STR_JOYSTICK "Joystick:"

1
src/win/languages/de-DE.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Videokarte:"
#define STR_VOODOO "Voodoo-Grafik"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Maus:"
#define STR_JOYSTICK "Joystick:"

4
src/win/languages/dialogs.rc
View File

@@ -265,6 +265,10 @@ BEGIN
7, 27, 199, CFG_CHECKBOX_HEIGHT
PUSHBUTTON STR_CONFIGURE, IDC_BUTTON_VOODOO,
CFG_COMBO_BTN_LEFT, 25, CFG_BTN_WIDTH, CFG_BTN_HEIGHT
CONTROL STR_IBM8514, IDC_CHECK_IBM8514,
"Button", BS_AUTOCHECKBOX | WS_TABSTOP,
7, 46, 199, CFG_CHECKBOX_HEIGHT
END
DLG_CFG_INPUT DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT

1
src/win/languages/en-GB.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:"

1
src/win/languages/en-US.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:"

1
src/win/languages/es-ES.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Vídeo:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Ratón:"
#define STR_JOYSTICK "Mando:"

1
src/win/languages/fi-FI.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Näytönohjain:"
#define STR_VOODOO "Voodoo-grafiikkasuoritin"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Hiiri:"
#define STR_JOYSTICK "Peliohjain:"

1
src/win/languages/fr-FR.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Vidéo:"
#define STR_VOODOO "Graphique Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Souris:"
#define STR_JOYSTICK "Manette de commande:"

1
src/win/languages/hr-HR.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo grafika"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Miš:"
#define STR_JOYSTICK "Palica za igru:"

1
src/win/languages/hu-HU.rc
View File

@@ -277,6 +277,7 @@ END
#define STR_VIDEO "Videokártya:"
#define STR_VOODOO "Voodoo-gyorsítókártya"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Egér:"
#define STR_JOYSTICK "Játékvezérlő:"

1
src/win/languages/it-IT.rc
View File

@@ -273,6 +273,7 @@ END
#define STR_VIDEO "Video:"
#define STR_VOODOO "Grafica Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:"

1
src/win/languages/ja-JP.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "ビデオカード:"
#define STR_VOODOO "Voodooグラフィック"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "マウス:"
#define STR_JOYSTICK "ジョイスティック:"

1
src/win/languages/ko-KR.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "비디오 카드:"
#define STR_VOODOO "Voodoo 그래픽"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "마우스:"
#define STR_JOYSTICK "조이스틱:"

1
src/win/languages/pl-PL.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Wideo:"
#define STR_VOODOO "Grafika Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mysz:"
#define STR_JOYSTICK "Joystick:"

1
src/win/languages/pt-BR.rc
View File

@@ -275,6 +275,7 @@ END
#define STR_VIDEO "Vídeo:"
#define STR_VOODOO "3DFX Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Mouse:"
#define STR_JOYSTICK "Joystick:"

1
src/win/languages/pt-PT.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Vídeo:"
#define STR_VOODOO "Gráficos Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Rato:"
#define STR_JOYSTICK "Joystick:"

1
src/win/languages/ru-RU.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Видеокарта:"
#define STR_VOODOO "Ускоритель Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Мышь:"
#define STR_JOYSTICK "Джойстик:"

1
src/win/languages/sl-SI.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Video:"
#define STR_VOODOO "Voodoo grafika"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Miška:"
#define STR_JOYSTICK "Igralna palica:"

1
src/win/languages/tr-TR.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Ekran kartı:"
#define STR_VOODOO "Voodoo Grafikleri"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Fare:"
#define STR_JOYSTICK "Oyun kolu:"

1
src/win/languages/uk-UA.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "Відеокарта:"
#define STR_VOODOO "Прискорювач Voodoo"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "Миша:"
#define STR_JOYSTICK "Джойстик:"

1
src/win/languages/zh-CN.rc
View File

@@ -272,6 +272,7 @@ END
#define STR_VIDEO "显卡:"
#define STR_VOODOO "Voodoo Graphics"
#define STR_IBM8514 "IBM 8514/a Graphics"
#define STR_MOUSE "鼠标:"
#define STR_JOYSTICK "操纵杆:"

1
src/win/win_mouse.c
View File

@@ -28,6 +28,7 @@
#include <86box/win.h>
int mouse_capture;
double mouse_sensitivity = 1.0; /* Unused. */
typedef struct {
int buttons;

41
src/win/win_opendir.c
View File

@@ -28,26 +28,15 @@
#include <86box/plat_dir.h>
#ifdef UNICODE
# define SUFFIX L"\\*"
# define FINDATA struct _wfinddata_t
# define FINDFIRST _wfindfirst
# define FINDNEXT _wfindnext
#else
# define SUFFIX "\\*"
# define FINDATA struct _finddata_t
# define FINDFIRST _findfirst
# define FINDNEXT _findnext
#endif
#define SUFFIX "\\*"
#define FINDATA struct _finddata_t
#define FINDFIRST _findfirst
#define FINDNEXT _findnext
/* Open a directory. */
DIR *
#ifdef UNICODE
opendirw(const wchar_t *name)
#else
opendir(const char *name)
#endif
{
DIR *p;
@@ -69,20 +58,11 @@ opendir(const char *name)
memset(p->dta, 0x00, sizeof(struct _finddata_t));
/* Add search filespec. */
#ifdef UNICODE
wcscpy(p->dir, name);
wcscat(p->dir, SUFFIX);
#else
strcpy(p->dir, name);
strcat(p->dir, SUFFIX);
#endif
/* Special case: flag if we are in the root directory. */
#ifdef UNICODE
if (wcslen(p->dir) == 3)
#else
if (strlen(p->dir) == 3)
#endif
p->flags |= DIR_F_ISROOT;
/* Start the searching by doing a FindFirst. */
@@ -136,31 +116,18 @@ readdir(DIR *p)
p->dent.d_off = p->offset++;
switch(p->offset) {
case 1: /* . */
#ifdef UNICODE
wcsncpy(p->dent.d_name, L".", MAXNAMLEN+1);
#else
strncpy(p->dent.d_name, ".", MAXNAMLEN+1);
#endif
p->dent.d_reclen = 1;
break;
case 2: /* .. */
#ifdef UNICODE
wcsncpy(p->dent.d_name, L"..", MAXNAMLEN+1);
#else
strncpy(p->dent.d_name, "..", MAXNAMLEN+1);
#endif
p->dent.d_reclen = 2;
break;
default: /* regular entry. */
#ifdef UNICODE
wcsncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1);
p->dent.d_reclen = (char)wcslen(p->dent.d_name);
#else
strncpy(p->dent.d_name, ffp->name, MAXNAMLEN+1);
p->dent.d_reclen = (char)strlen(p->dent.d_name);
#endif
}
/* Read next entry. */

14
src/win/win_settings.c
View File

@@ -85,7 +85,7 @@ static int temp_dynarec;
#endif
/* Video category */
static int temp_gfxcard, temp_voodoo;
static int temp_gfxcard, temp_ibm8514, temp_voodoo;
/* Input devices category */
static int temp_mouse, temp_joystick;
@@ -332,6 +332,7 @@ win_settings_init(void)
/* Video category */
temp_gfxcard = gfxcard;
temp_voodoo = voodoo_enabled;
temp_ibm8514 = ibm8514_enabled;
/* Input devices category */
temp_mouse = mouse_type;
@@ -456,6 +457,7 @@ win_settings_changed(void)
/* Video category */
i = i || (gfxcard != temp_gfxcard);
i = i || (voodoo_enabled != temp_voodoo);
i = i || (ibm8514_enabled != temp_ibm8514);
/* Input devices category */
i = i || (mouse_type != temp_mouse);
@@ -546,6 +548,7 @@ win_settings_save(void)
/* Video category */
gfxcard = temp_gfxcard;
voodoo_enabled = temp_voodoo;
ibm8514_enabled = temp_ibm8514;
/* Input devices category */
mouse_type = temp_mouse;
@@ -1106,9 +1109,13 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_enable_window(hdlg, IDC_COMBO_VIDEO, !machine_has_flags(temp_machine, MACHINE_VIDEO_ONLY));
e = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
settings_enable_window(hdlg, IDC_CONFIGURE_VID, video_card_has_config(e));
settings_enable_window(hdlg, IDC_CHECK_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI));
settings_set_check(hdlg, IDC_CHECK_VOODOO, temp_voodoo);
settings_enable_window(hdlg, IDC_BUTTON_VOODOO, machine_has_bus(temp_machine, MACHINE_BUS_PCI) && temp_voodoo);
settings_enable_window(hdlg, IDC_CHECK_IBM8514, machine_has_bus(temp_machine, MACHINE_BUS_ISA16) || machine_has_bus(temp_machine, MACHINE_BUS_MCA));
settings_set_check(hdlg, IDC_CHECK_IBM8514, temp_ibm8514);
return TRUE;
case WM_COMMAND:
@@ -1123,6 +1130,10 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
settings_enable_window(hdlg, IDC_BUTTON_VOODOO, temp_voodoo);
break;
case IDC_CHECK_IBM8514:
temp_ibm8514 = settings_get_check(hdlg, IDC_CHECK_IBM8514);
break;
case IDC_BUTTON_VOODOO:
temp_deviceconfig |= deviceconfig_open(hdlg, (void *)&voodoo_device);
break;
@@ -1137,6 +1148,7 @@ win_settings_video_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_SAVESETTINGS:
temp_gfxcard = settings_list_to_device[0][settings_get_cur_sel(hdlg, IDC_COMBO_VIDEO)];
temp_voodoo = settings_get_check(hdlg, IDC_CHECK_VOODOO);
temp_ibm8514 = settings_get_check(hdlg, IDC_CHECK_IBM8514);
default:
return FALSE;

10
src/win/win_thread.c
View File

@@ -45,6 +45,16 @@ thread_create(void (*func)(void *param), void *param)
}
int
thread_test_mutex(thread_t *arg)
{
if (arg == NULL) return(0);
return (WaitForSingleObject(arg, 0) == WAIT_OBJECT_0) ? 1 : 0;
}
int
thread_wait(thread_t *arg)
{