From d9684fd53b295411b967fb32cb257b980cb18f2e Mon Sep 17 00:00:00 2001
From: Daniel Collins <solemnwarning@solemnwarning.net>
Date: Sun, 18 Sep 2011 15:43:13 +0000
Subject: [PATCH] Added icon for ipxrouter.

---
 Makefile         |   5 ++++-
 ipxrouter-16.png | Bin 0 -> 180 bytes
 ipxrouter-32.png | Bin 0 -> 263 bytes
 ipxrouter.ico    | Bin 0 -> 5430 bytes
 src/ipxrouter.rc |   1 +
 src/router-exe.c |   8 +-------
 6 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 ipxrouter-16.png
 create mode 100644 ipxrouter-32.png
 create mode 100644 ipxrouter.ico
 create mode 100644 src/ipxrouter.rc

diff --git a/Makefile b/Makefile
index 4581022..1fec891 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ ipxconfig.exe: src/ipxconfig.cpp
 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
 
-ipxrouter.exe: src/router-exe.o src/router.o src/interface.o src/common.o src/log.o
+ipxrouter.exe: src/router-exe.o src/router.o src/interface.o src/common.o src/log.o src/ipxrouter-rc.o
 	$(CC) $(CFLAGS) -static-libgcc -mwindows -o ipxrouter.exe $^ -lws2_32 -liphlpapi
 
 src/ipxwrapper_stubs.s: src/ipxwrapper_stubs.txt
@@ -79,6 +79,9 @@ 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
+
 %.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/ipxrouter-16.png b/ipxrouter-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce899a2fa7e26194a53a0bd32a29b437f26ada3a
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`)t)YnAr`%RCk1jHP~dUC{803|
zb6NYFx+9_D-G?F^F1Yuu<f_r&Pu?c?dgVzA|C<{pXnAQ(p31B9Xw6)<@~UNO|4*E`
zb4G^Yl=F9`m8-t6F)a8faY%W!R=$giSyA(n4XTn^Kiq@7R_-{c<5|VdRcOC^y1>pK
e)9==73^8x))Lp?G`X(Ld3<ghEKbLh*2~7a;bwu|7

literal 0
HcmV?d00001

diff --git a/ipxrouter-32.png b/ipxrouter-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..203d101c892462ca215ac50c41a94f5a59b4431c
GIT binary patch
literal 263
zcmV+i0r>ujP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002aNkl<ZScUDC
zQ4WM43`Ak$746wP1A9pP*r<eU=@b++@g;r;wKG(p&b=H&<&k3Y9E+l}FyA#9NRw^J
zB@^2GpBZEvH35sa8sNlC;)sFLKHyB4#H|KOREZ-75H78NMVxytiXz9*BCd^}YT&ec
zpq8eaa0tGaPzYgPH4$~wWeucEN5q)_@);qTGKn)Jj0Z4Yip#ih1+0K8&be^~Dp$0#
z?Fl8%@Cx7t$jK+8i-C*4Pl0t$JntT$UuTSQhI)ecUt32Ldd=_(ysScAksa4+%<%vK
N002ovPDHLkV1j4lY-Iod

literal 0
HcmV?d00001

diff --git a/ipxrouter.ico b/ipxrouter.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4f79fd219a4a2390d9e15938d2f5ca12bc31f0a7
GIT binary patch
literal 5430
zcmeHLJ5B>Z3^jxU<ObP_(9+StB`B$AkT?JhccA46D5uy0l#Ux9Kq<BWBv2YwAck?0
zr&z|`+09Q1Fp}l*^Ru64A-l;EZO|rV8AYGbRhwv=h}zL}e6mG!8}~aAixfJD#`yoL
zcLfeZ2z9Jpw<)XF>xF6L@9JnX$M0ZglKMRgv_xBbeTvtIt?o5a{JGDs`X%R3{JHh(
zo*TS%*T?+Y<9rQ$<Lj?=5jWJu|H;zzF(15|bM5ri{J4&@`o`y9wZ8q>SQwf-|H72)
zMywCB8NUMMXVhilB%HUtKa8Jm`27C#+!h>90=>N%s`BXV`8xW{@iaW#ItymdIS<!7
zt)*kl*RiML;kuq<smXO5*Ik|taOtah${DJ7I*0xqjy$~PaV)i&x5)ELJ!=N3t!I(7
z-rnlTTnpEj)`o_MBac3wm-?E69x08gyzZ%EPaoRIvqsgz3{{*zlZ!tkN9(l}?%8sp
zP7{m8_tE;JCZQPS-N7L5zV*xE{h};BJLSXIe)(|TDT}=r@AmWTc#vnsaLf;Z-&4fb
z6{9y4t9nnNe`7~^bD7^+8hkHH*7N7t>NmlY^;Ruosru=C#MYnmb@jb^;Hi3VZiSor
z=3mMNxqjXrMrV0n;xxx{rDEnvj@+XUFnHkb66ZY(dG?Ycah(GXUgjl+9*n`j)iJop
n%Xp?ezwvtfAj(@5EDI&YTMC7nI|?sP6rRtbKc#SeG{(OHeuL6J

literal 0
HcmV?d00001

diff --git a/src/ipxrouter.rc b/src/ipxrouter.rc
new file mode 100644
index 0000000..baa8f5f
--- /dev/null
+++ b/src/ipxrouter.rc
@@ -0,0 +1 @@
+50 ICON "../ipxrouter.ico"
diff --git a/src/router-exe.c b/src/router-exe.c
index 897cada..019f697 100644
--- a/src/router-exe.c
+++ b/src/router-exe.c
@@ -25,8 +25,6 @@
 
 struct reg_global global_conf;
 
-static HMODULE netshell_dll = NULL;
-
 #define APPWM_TRAY (WM_APP+1)
 #define MNU_EXIT 101
 
@@ -142,11 +140,7 @@ static void init_ui() {
 		die("CreateWindow: ", w32_error(GetLastError()));
 	}
 	
-	if(!(netshell_dll = LoadLibrary("netshell.dll"))) {
-		die("Error loading netshell.dll: ", w32_error(GetLastError()));
-	}
-	
-	HICON icon = LoadIcon(netshell_dll, MAKEINTRESOURCE(162));
+	HICON icon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(50), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE);
 	if(!icon) {
 		die("Error loading icon: ", w32_error(GetLastError()));
 	}