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

SLiRP overhaul

Browse Source
This commit is contained in:
RichardG867
2020-08-07 12:39:34 -03:00
parent 8208f1ff45
commit 8ca17a300d
97 changed files with 14123 additions and 13666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/win/Makefile.mingw
View File

@@ -701,9 +701,9 @@ SCSIOBJ := scsi.o scsi_device.o \
NETOBJ := network.o \
net_pcap.o \
net_slirp.o \
bootp.o ip_icmp.o misc.o socket.o tcp_timer.o cksum.o \
ip_input.o queue.o tcp_input.o debug.o ip_output.o \
sbuf.o tcp_output.o udp.o if.o mbuf.o slirp.o tcp_subr.o \
arp_table.o bootp.o cksum.o dnssearch.o if.o ip_icmp.o ip_input.o \
ip_output.o mbuf.o misc.o sbuf.o slirp.o socket.o tcp_input.o \
tcp_output.o tcp_subr.o tcp_timer.o udp.o util.o version.o \
net_dp8390.o \
net_3c503.o net_ne2000.o \
net_pcnet.o net_wd8003.o

15
src/win/win_settings.c
View File

@@ -941,6 +941,7 @@ recalc_vid_list(HWND hdlg)
int c = 0, d = 0;
int found_card = 0;
WCHAR szText[512];
char *s;
SendMessage(h, CB_RESETCONTENT, 0, 0);
SendMessage(h, CB_SETCURSEL, 0, 0);
@@ -952,7 +953,12 @@ recalc_vid_list(HWND hdlg)
continue;
}
char *s = video_card_getname(c);
if (c == VID_INTERNAL) {
s = malloc(512);
sprintf(s, "%s (%s)", video_card_getname(c), machine_getdevice(temp_machine)->name);
} else {
s = video_card_getname(c);
}
if (!s[0])
break;
@@ -1286,7 +1292,12 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
continue;
}
s = sound_card_getname(c);
if (c == SOUND_INTERNAL) {
s = malloc(512);
sprintf(s, "%s (%s)", sound_card_getname(c), machine_getdevice(temp_machine)->name);
} else {
s = sound_card_getname(c);
}
if (!s[0])
break;