Some old variables deleted, no longer used. Also, updated pcap_if.rc.

src/Makefile.mingw

@@ -8,7 +8,7 @@
 #
 #		Modified Makefile for Win32 MinGW 32-bit environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.8	2017/05/08
+# Version:	@(#)Makefile.mingw	1.0.10	2017/05/10
 #
 # Authors:	Kotori, <oubattler@gmail.com>
 #               Fred N. van Kempen, <decwiz@yahoo.com>
@@ -131,7 +131,9 @@ DEVOBJ	= bugger.o lpt.o serial.o \
 	  cdrom.o \
 	    cdrom-dosbox.o cdrom-image.o cdrom-ioctl.o cdrom-null.o
 USBOBJ	= usb.o
-NETOBJ	= network.o net_ne2000.o
+NETOBJ	= network.o \
+	    net_pcap.o \
+	    net_ne2000.o
 SCSIOBJ	= scsi.o scsi_disk.o scsi_buslogic.o scsi_aha154x.o
 SNDOBJ	= sound.o \
 	    convolve.o convolve-sse.o envelope.o extfilt.o \
@@ -216,10 +218,10 @@ ifneq ($(DEBUG), y)
 		strip $(PROG).exe
 endif
 
-pcap_if.exe:	pcap_if.o
+pcap_if.exe:	pcap_if.o pcap_if.res
 		@echo Linking pcap_if.exe ..
 		@$(CC) -o pcap_if.exe \
-			pcap_if.o -static -L. -lwpcapdelay
+			pcap_if.o pcap_if.res -static -L. -lwpcapdelay
 ifneq ($(DEBUG), y)
 		strip pcap_if.exe
 endif
@@ -235,5 +237,9 @@ clean:
 		@echo Processing $<
 		@$(WINDRES) $(RFLAGS) -i 86Box.rc -o 86Box.res
 
+pcap_if.res:	pcap_if.rc
+		@echo Processing $<
+		@$(WINDRES) $(RFLAGS) -i pcap_if.rc -o pcap_if.res
+
 
 # End of Makefile.mingw.

src/config.c

@@ -30,10 +30,12 @@
 #include "sound/sound.h"
 #include "video/video.h"
 
+
 wchar_t config_file_default[256];
 
 static wchar_t config_file[256];
 
+
 typedef struct list_t
 {
         struct list_t *next;
@@ -70,7 +72,7 @@ typedef struct entry_t
                 (new)->next = NULL;                     \
         }
 
-void config_dump()
+void config_dump(void)
 {
         section_t *current_section;
         
@@ -97,7 +99,7 @@ void config_dump()
         }
 }
 
-void config_free()
+void config_free(void)
 {
         section_t *current_section;
         current_section = (section_t *)config_head.next;
@@ -220,7 +222,7 @@ void config_load(wchar_t *fn)
 
 
 
-void config_new()
+void config_new(void)
 {
         FILE *f = _wfopen(config_file, L"wt, ccs=UNICODE");
         fclose(f);
@@ -543,16 +545,9 @@ void loadconfig(wchar_t *fn)
                 scsi_card_current = 0;
 
 	/* network */
-	ethif = config_get_int(NULL, "netinterface", 1);
-        if (ethif >= inum)
-            inum = ethif + 1;
         p = (char *)config_get_string(NULL, "netcard", "");
-        if (p)
-                network_card_current = network_card_get_from_internal_name(p);
-        else
-                network_card_current = 0;
-	ne2000_generate_maclocal(config_get_int(NULL, "maclocal", -1));
-	ne2000_generate_maclocal_pci(config_get_int(NULL, "maclocal_pci", -1));
+	if (p != NULL)
+		network_setup(p);
 
         p = (char *)config_get_string(NULL, "model", "");
         if (p)
@@ -848,7 +843,6 @@ void saveconfig(void)
 
 	config_set_string(NULL, "scsicard", scsi_card_get_internal_name(scsi_card_current));
 
-	config_set_int(NULL, "netinterface", ethif);
 	config_set_string(NULL, "netcard", network_card_get_internal_name(network_card_current));
 	config_set_int(NULL, "maclocal", ne2000_get_maclocal());
 	config_set_int(NULL, "maclocal_pci", ne2000_get_maclocal_pci());

src/pcap_if.rc

@@ -0,0 +1,52 @@
+#ifdef _WIN32
+#include <windows.h>
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+
+#ifdef RELEASE_BUILD
+/* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC_256x256.png */
+100                     ICON    DISCARDABLE     "ICONS/86Box-RB.ico"
+#else
+/* Icon by Devcore - https://commons.wikimedia.org/wiki/File:Icon_PC2_256x256.png */
+100                     ICON    DISCARDABLE     "ICONS/86Box.ico"
+#endif
+
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,2,0
+ PRODUCTVERSION 1,0,2,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "IRC #SoftHistory\0"
+            VALUE "FileDescription", "PCap_IF - test tool for WinPcap\0"
+            VALUE "FileVersion", "1.0.2\0"
+            VALUE "InternalName", "pcap_if\0"
+            VALUE "LegalCopyright", "Copyright 2017 Fred N. van Kempen\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "pcap_if.exe\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "WinPcap Test Tool\0"
+            VALUE "ProductVersion", "1.0.2\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END