From f8b53b1d1b0bbcc94f81c481410ca9ab32509ea0 Mon Sep 17 00:00:00 2001
From: Daniel Collins <solemnwarning@solemnwarning.net>
Date: Sun, 18 Sep 2011 22:24:26 +0000
Subject: [PATCH] Added ipxconfig icon.

---
 Makefile          |  12 ++++++------
 changes.txt       |   2 ++
 ipxconfig-16.png  | Bin 0 -> 154 bytes
 ipxconfig-32.png  | Bin 0 -> 193 bytes
 ipxconfig.ico     | Bin 0 -> 5430 bytes
 src/ipxconfig.cpp |   5 +++--
 src/ipxconfig.rc  |   1 +
 7 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 ipxconfig-16.png
 create mode 100644 ipxconfig-32.png
 create mode 100644 ipxconfig.ico
 create mode 100644 src/ipxconfig.rc

diff --git a/Makefile b/Makefile
index 48fe11a..c93307e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,8 @@ SRC_FILES := changes.txt license.txt Makefile mkstubs.pl readme.txt src/config.h
 	src/mswsock.def src/mswsock_stubs.txt src/stubdll.c src/winsock.c src/wsock32.def \
 	src/wsock32_stubs.txt src/directplay.c src/dpwsockx.def src/dpwsockx_stubs.txt src/common.c \
 	src/common.h src/router.c src/router.h src/router-exe.c src/interface.c src/interface.h \
-	src/ipxrouter.rc ipxrouter.ico include/dplay.h include/dplaysp.h include/dplobby.h \
-	include/wsnwlink.h
+	src/ipxrouter.rc ipxrouter.ico src/ipxconfig.rc ipxconfig.ico include/dplay.h \
+	include/dplaysp.h include/dplobby.h include/wsnwlink.h
 
 all: ipxwrapper.dll wsock32.dll mswsock.dll ipxconfig.exe dpwsockx.dll ipxrouter.exe
 
@@ -59,8 +59,8 @@ dist: all
 ipxwrapper.dll: $(IPXWRAPPER_DEPS)
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o ipxwrapper.dll $(IPXWRAPPER_DEPS) -liphlpapi
 
-ipxconfig.exe: src/ipxconfig.cpp
-	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe src/ipxconfig.cpp -liphlpapi -lcomctl32
+ipxconfig.exe: src/ipxconfig.cpp src/ipxconfig-rc.o
+	$(CXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -D_WIN32_IE=0x0400 -mwindows -o ipxconfig.exe src/ipxconfig.cpp src/ipxconfig-rc.o -liphlpapi -lcomctl32
 
 dpwsockx.dll: src/directplay.o src/log.o src/dpwsockx_stubs.o src/common.o
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o dpwsockx.dll src/directplay.o src/log.o src/common.o src/dpwsockx_stubs.o src/dpwsockx.def -lwsock32
@@ -80,8 +80,8 @@ src/mswsock_stubs.s: src/mswsock_stubs.txt
 src/dpwsockx_stubs.s: src/dpwsockx_stubs.txt
 	perl mkstubs.pl src/dpwsockx_stubs.txt src/dpwsockx_stubs.s 3
 
-src/ipxrouter-rc.o: src/ipxrouter.rc
-	windres src/ipxrouter.rc -O coff -o src/ipxrouter-rc.o
+src/%-rc.o: src/%.rc
+	windres $< -O coff -o $@
 
 %.dll: src/stubdll.o src/%_stubs.o src/log.o src/common.o src/%.def
 	$(CC) $(CFLAGS) -Wl,--enable-stdcall-fixup -shared -o $@ $^
diff --git a/changes.txt b/changes.txt
index 3b6d2b6..35fcc5e 100644
--- a/changes.txt
+++ b/changes.txt
@@ -38,6 +38,8 @@ Version ???:
 	Update: Max packet (data) size reduced to 8KiB.
 	
 	Update: Implemented IPX_RECEIVE_BROADCAST option.
+	
+	Update: Added ipxconfig icon.
 
 Version 0.2.2:
 	Feature: Redesigned ipxconfig UI.
diff --git a/ipxconfig-16.png b/ipxconfig-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbca9b035cf2f71b2d23867e70c4c3b21d110c93
GIT binary patch
literal 154
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`iJmTwAr`$?1ERSO7;tniettG_
zPr-NNF5zr>=^j=tvkV`WI2Y6P-@pG|*s(tN-Hd`%MR9dw=7~q+=D4j(;d8CyU~HK6
zWa5)Y3;|*0tFofqg4&qM5>7LojAqgQ@q_LDW0qfz>g(@(tnvd|#^CAd=d#Wzp$PzT
C+&0Jn

literal 0
HcmV?d00001

diff --git a/ipxconfig-32.png b/ipxconfig-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1f0ecbe808b5022b0159de58ec849c86c94b7d6
GIT binary patch
literal 193
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ4o?@ykcif|Q$6_(C~&xLd|7GR
zBYsRYHbOvX)}I-lrafqw@3?6HWf5uX?8S9&-%S61%eB4Dv;J+C|Jr8l0`+fETNPTe
z9%Znu(GtHleYMvC(GzDH1LjxP?O<{ZwAp*=U(R;E4{DFZe#kViPx#s6)MI$%%C~#B
s)fpqiT`cWcm6o<H57??`)39iUU9`&0BFl-kKsPaXy85}Sb4q9e0N0*P6#xJL

literal 0
HcmV?d00001

diff --git a/ipxconfig.ico b/ipxconfig.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4dd9257e2b60a251fe6b6b3191c5f1aeec962fb9
GIT binary patch
literal 5430
zcmeHLF;2rk5ZnL{$P-*4N~E-r!bj+lcmQqQ;8*aB6ws0v@B%<`<kr%$8)xuk?6Z#}
z1#*1SYIb&J_vDl1I2M`7g=Cp1X7W52xfYSRqVb0-kvGk6w5Arh)3ExqrW5Et0p~<g
zqJL_<nzFa`oNA48|2)rKSF}$p?fScB$JEBMfBQO)E1|PEb{R`M|Mr~J%DL~KdTvwS
zbONI~0sBqu3S1;KaK=;Vm;=N<%uxsaRUeu&G(XfI+ZXB|szV3ze$3$uVaSg<<8SAL
z{HS9-I1qJ4=#21jeTawpxXv7Nxy~HE5Qh9*XO4MXXAU1De2nmM9h`M=M)rqv_<-<%
zGqMiOh(4~LC3mzo`X1`V<woQXPO;Ib?S~eNvb3nmYP*kOwW=)2rSj#rxLuSMXt3`T
z`nh8Nh2sBzr|5e}j=6o}`~Ck7&E#;u@8>+Gzwy+WKcmsY`!}A^XLx=X+5*;Wm~#*J
z`+Aq=>&VT=UgqY-@-^f@^B@PJ51Q4XA@@1^eV&x#&Rgq)W4+Uu9S{$a1HQgH_x0i2
N=ab^2b1(O`@C|qR6Jr1X

literal 0
HcmV?d00001

diff --git a/src/ipxconfig.cpp b/src/ipxconfig.cpp
index 373c7e2..98d24c5 100644
--- a/src/ipxconfig.cpp
+++ b/src/ipxconfig.cpp
@@ -571,11 +571,12 @@ static void init_windows() {
 	}
 	
 	WNDCLASS wclass;
-	
-	memset(&wclass, 0, sizeof(wclass));
 	wclass.style = 0;
 	wclass.lpfnWndProc = &main_wproc;
+	wclass.cbClsExtra = 0;
+	wclass.cbWndExtra = 0;
 	wclass.hInstance = GetModuleHandle(NULL);
+	wclass.hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(50), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
 	wclass.hCursor = LoadCursor(NULL, IDC_ARROW);
 	wclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);
 	wclass.lpszMenuName  = NULL;
diff --git a/src/ipxconfig.rc b/src/ipxconfig.rc
new file mode 100644
index 0000000..a9e89ca
--- /dev/null
+++ b/src/ipxconfig.rc
@@ -0,0 +1 @@
+50 ICON "../ipxconfig.ico"