From dc9350fcc56c30e4f87ec177400a9a978f3dfc01 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Sun, 19 Mar 2006 21:40:24 +0000
Subject: [PATCH] committed changes for new file format

---
 plugins/BinLogReader/BinLog.cs        |  26 ++++++--
 plugins/BinLogReader/BinLogReader.exe | Bin 45056 -> 45056 bytes
 plugins/BinLogReader/Form1.cs         |  26 +-------
 plugins/BinLogReader/PluginDb.cs      |  90 ++++++++------------------
 4 files changed, 51 insertions(+), 91 deletions(-)

diff --git a/plugins/BinLogReader/BinLog.cs b/plugins/BinLogReader/BinLog.cs
index e97bd83f..cf6cac36 100644
--- a/plugins/BinLogReader/BinLog.cs
+++ b/plugins/BinLogReader/BinLog.cs
@@ -11,9 +11,10 @@ namespace BinLogReader
 	public class BinLog
 	{
 		private static uint BINLOG_MAGIC = 0x414D424C;
-		private static short BINLOG_VERSION = 0x0100;
+		private static short BINLOG_VERSION = 0x0200;
 
 		private ArrayList oplist;
+		private PluginDb plugdb;
 
 		public ArrayList OpList
 		{
@@ -28,7 +29,12 @@ namespace BinLogReader
 			oplist = new ArrayList(init_size);
 		}
 
-		public static BinLog FromFile(string filename, PluginDb db)
+		public PluginDb GetPluginDB()
+		{
+			return plugdb;
+		}
+
+		public static BinLog FromFile(string filename)
 		{
 			if (!File.Exists(filename))
 				return null;
@@ -68,6 +74,12 @@ namespace BinLogReader
 				else 
 					bl = new BinLog( (int)(fi.Length / 6) );
 
+				bl.plugdb = PluginDb.FromFile(br);
+				PluginDb db = bl.plugdb;
+
+				if (db == null)
+					throw new Exception("Plugin database read failure");
+
 				do
 				{
 					opcode = (BinLogOp)br.ReadByte();
@@ -246,14 +258,18 @@ namespace BinLogReader
 				} while (opcode != BinLogOp.BinLog_End);
 				opcode =BinLogOp.BinLog_End;
 			} 
-			catch
+			catch (Exception e)
 			{
-				if (bl != null)
+				if (bl != null && bl.plugdb != null)
 				{
 					BinLogSimple bs = new BinLogSimple(BinLogOp.BinLog_Invalid, gametime, realtime, pl);
 					bl.oplist.Add(bs);
+				} 
+				else 
+				{
+					throw new Exception(e.Message);
 				}
-			} 
+			}
 			finally
 			{
 				br.Close();
diff --git a/plugins/BinLogReader/BinLogReader.exe b/plugins/BinLogReader/BinLogReader.exe
index 52a9ce4e30ec44a76d0c4505080a3d9959d00ab6..72069d60bc2d599d1be3a68d5c52b26c664e104e 100644
GIT binary patch
delta 10553
zcmZp8z|`=7X+j5c;|1A?-Lg#kW=>oc#+NaZfgzZIfq`KG149AFL`C7rij470M=Ccr
zG1l>^Etm<CVqoxKU|?WkU|?v-XJB}t$-uzKz`$V1z`&+p!@v-0JozJ|*5m*I6Io#c
zMh13>4hE)b76t|uEe2@=b_PdQ1_s8-f!b=5Hw!FM=3v(dVqjpa1<7-ORSEM7^6GLI
zWil`n6bmyja8*qX71R?D<P~Jg4`g6q6K3ZWwh^?MJW0^Ko==;TJzt7}fh$Xx55f@U
zXU`X5VBiuKU>6h+kI0t>u?00`7#O$&1;qpf@?}8+LV|pP{DMM)tb#0p?8V|BQ-wM5
z85tPZ1cmeE7#O(JETotj7zDX>xY+Y0K{`YbHi<xO5M{3y6opwK2C+g+Oi&bJg}9)I
zpg7b5DUbycPzxlW7VKgITi^<{KuS<5vzQNLm86)kthOptSXwMgSVmA<SVmA%P^L$j
zfq@aCT~Jm$LbzU5P*zYX)98w}1Jw6&f^u*}6tz{LqVi(G3WD;&3WAb?3Oy<aGZe)m
zgcSu91?7ycL0zf^a;cJ_lAvV11_J{d)X7Q^J1sbv7#N^NDud{H1}<S0XlSUi3#!5b
zLk$ubYGQ(_kibwER2EbbREJuk3$jE5YPJT{?6r&x3=&WUDj)@#Pz9P$1wD*#%e4fx
zz$&fSiv>VRwV_J2p-PhwN_7Nvz)IPRML;Tbp(=GJ^NWbp>wzLwh=GACPgqY-52{WU
zq)s2IP9JLGe+Iba1|Xj^a0wd<8VDLf^(cb$7(w+ILG_$wU|`?`DG(_Jd&rohnwf!t
zMbH>3zq%f5s3<7TP1prZV4-Kqo(~o?V;3}oiJ61U5o9km0a;`rXaNaeQ!zmkZ~*5U
zfRZj$)Lcx^3?ga-ib9B`77$AX*##}~^%)r0@|_qM>e;|tLlD=6fq_k1P7G=d*u9oe
z_gX@<O7L<@IQ;(o|Gxz9Ju6`=4jnZ}cGW@EWewG34bi2|D`=H3&%nS1$;$T_?g_Ey
zD=;u{vE?hWGB9vyC{6Ac6_wk`!ocv6g@M6}fq_ARfq@ZJyjU<WFnncUV9;fqd`MJ@
zk!kW%Q3ZYp1_l-;mRd;=#ab&hSwu{|o}Gb#O(%p!P6N#FW-40Dz)+B{49dn#%=r!=
z??E`o5=G0A6}f>FsepA9t%XZyu}DG8<YQvaM<~&PS)~fLs-BQtS`5Ml%na2G;8Igi
zjEhAaVyZY3b3P9P0~@yxqlPL20~f@};#@2e5P54h9c8AXjd15MG3RqJFtG6mF=?p5
zm1~P?Vijj9+78#q%*2w<$H2fgxl3GUa+SCOqx9tU;^HA}3=C{c%(c?sk{RqqduVaZ
zT(lQSvj#T<0~?D52Ll5ebJ1C334VC6F&8}sOH7uMP^ky0XR4NAU|`AjW?*2`Vqg$9
zU||q~8qUPR%EzJswH%}fEYHjk0hPyN`E#%xplD)d(hvq&4vtvnB2h+Ij59M;3xN#H
z2gfFJkt|qd@_7l(dZ?AMptQqMD+i)jYvmEXFN8b55UdGePc=wAs5InKV=jtCmH?Rm
zv!)nH0wugA!X-qRi<ZMV%uLlFoAZ??_eg5PT&4hW5=*Tj!bwSRC#^?lEqchvP{33T
zQVppQG{G({BEk)5P5{}IugoynOiDu^8ahfa%b6IY;Ff<xSk6=pQjxDQxmQY+2NKcB
zposRGyiZCJ<`Iwx6HBcM%q(UGMA+g?S)xpcIMh(U6}cdzVS#Rrq@x;S86Ql>9V|0B
zMOsT1>MvE8TbLLe85kHqwL4R_>g3hZlIn?I#h@_MVlL`L=B!0<7#Jr1mljt-ZqlfM
zjTAOuV&H&=6ccl;+GG_ORd6_flQj!NHUk3#3j>27bJ170X-w51y*gfET-p}Q5Dr_u
z7AQ|^g9vb<W`l_5>o72IiAU=5Fe8-&Y~m4I$nr+Jn30PuhRG*nRKRXvVy;z(Bq|LM
z#agQgb~8A$r$QZ#n%}CW7#LV!nO&Y45hc|igJ9w7jVu8&8YU4Bmk?xTss`BxDb=(X
z7#Jomk=3e44nS?NW6%N+EC?zvv6lxZ?yH8|#>`Z$1xkkCpkpqYk1PQ)5#kEwBH5L2
z87)wu#03omCT12^4YtWna;o*#ppeqgWnkc9(y#y(Umyp{LDezq2s2fKROoO+=zKkp
zLS_wp1_my0jI%SCu`w{PGB5}-6&o-xaMkL7%qunoF?A74V+2zV!PIA9sApk<C^kR{
z8-kfeAR~;xOk)t!3d}SCF-^csQxMYv%mj;?f|+I@QA;orENYHmnt_<rAanA~LEfk~
z0oe~_gLFff8W2g4NAfKg7`P;Q*%=rZx!A;*szE+l#3s&E4RY-wwtP#lF(6T~d@DE`
ztV<H13*>pQE|Aw3u}Lsh>oYL0K(yC$K};=L4~i*kuo)orF!Mm{qTQ%+O#j&I7#P@!
zZ9uul7OVwivN+TUAa>Dlgcgux5>Po1yXZ8MTs<gE{;^r3nFsP8%sdbq>?Lu8mq1Yj
z@c<VjFp91t3<XKT+z(<GJx0iZBDCluh;IjWcs(dO<oWaM!8{NL)P&(;0>uqWz9YIQ
zIF>L(L2-<!78Kn`qH^*)#ZI6QbA}sQB+pXMP>}Be7ZA&Lg|ihVFflMFlrS<d6uW`6
zxx;0|@;%^erhjbq@UZg)3xiT8)Dxi833UQUR7ze9*$E(_`XYT6xD!AE3LPM8qtL7c
z$%y59!Obsn1?lnz^Ffw~=lj6fV)?#swsgK9oGqU34`++P98!-E$`63Ei$X!hL&61Q
zJa$KcWME+dVvB=%tXxdh;7D=+8wSdV&;S65q6L5{DE}2@BkTgH!EP5wMjRRdAa+qB
zNEajkK$gHf3St*6W??7*)!U9@l48X{pvVh`y9VxahzKbC7hMFI1@SFNKXw;@WMIAp
zv5OvpbU|DIN`Pp70|^y91}T9U4B}%k*p`c_8YCqN^&5y?^b@2FVlpTZqnQj6Dw1Xe
zrJBhHltt>1QYT1C0%{V7U8D_C1~y4ro)?miLqHx^SOQ9Aov>7<5egF2fW#R%6N2*?
zQ#Gg%)CdDf76r006lj3`QWOg}mFXWFC<jBzB8_m6LT~{qmLCCTL((mT4T?6XxR?e=
z2wZ_MGH^pHn_@Et1~!c-aLod$g!rN2Od_>5pi)Y#))rcWGBB_~<usxh>Y+6e6SzAC
z5@*(7V-}AWH<o6q1|`e<7_d{o%vexjh+|;jVwTWjW0r`QFy>~e2E}H6JlI}v)BOr)
zXarQFF>Ba>dI36;Ambct7#SFtszFZ4XJ%kvv($m`K`96<zy+}mmJ8ta6?L;R6v*3%
z<tKm|T@Xe2Acqvq1WBY|kys3psK6qz9wdQkR6WG3{m3$Gplr{^&E9Lnz`)2O#;aYx
z#tF)tY{D!;%o>TH4r&spBhD(wnx70BEMfr_SZw(zAQvLU96`-eG%;s%F%3Z$P^k&k
z%)u$hx`<Oef|rxss0ZrTR0akvj{LOAXVety*#z0ZZ9I9dsN!^x6FB7gggM28xwQ2J
z*#x=3&B78^1_mZ!c0mq7c0o=JPEco`qv$Ls&4JrHf?VPe!d!w}P?L;~Lt;>nBR>Na
zyP(vrC2hdUumm*V0E)(HP^H6^pUJ?$RnNsHuE(gw!~_=0&jR(ySwI7FplF3et}b`c
zMON5g91}P-L&*GW1_my%{2Y)axu7H^22LJK;__S?wxG_XL@g+R-ZSPdVrOG0;9&=k
z1n3BHfcvHpo~lM30|OTi6GxFX8$*GZynseND9G<IXfX<alCBU#Tmgge<Q*D1jJA`X
zYV@cUvoRECF;zP;FtCUlvlTTWxDv)}MH4~XqKA{GX|59kwVaKZM6{TyT^JZxm?0tQ
zGC4|14oS)tS*lOVgUu7vjMSNYM@vo&!~}KTksJ6Lfs+Na#p^**;An$b0OCR|5Mp3p
z0_S5khF1&>pss-+Q$A>riHoh+AJp3y<FPmc8VdlA^6)Z&DPa~SK^E9x4=Y5yFdLL+
zXNL^;u!;$?fCqL2+3E$^IXUu!L8Cz&?1CJSlnhQZ2G|S~<U}(8R9~|pl8yN(F=1|P
zBDH!lFtGUxa*Ia@a|?0{vYVgc5Rc&DU~|#^|NlQb)aM$Yu`f`k2h`W+V=Z=PU|{27
zss;rU8)RSz!T|@Nc%;_m5ZxAITLD1^2IV>ih8jTz1{FRA2Ib(AqRhPXVo*9*AkV<C
zfQ^AcIW(BTL5+a{lsJ^#Lp@y>7#IT77#L<u7EM$ab!T8;5N2Rt@MM4tWEU|oFyv1T
zO!Tk+$MlJbiy?`Hoso;76ijXalNZ1wBP&Q;6ijNevNQ5A1hLw%vN6nMRbgObkY*QT
zXJhbXw`ON!NCT7gU~(3i+zckqfXU}zl8FPPQW{K}fXU!`FjW91Z?b`mTgU+-*MP}g
zVDbzH$g)>pwmRo0CN>5SPLPNnm`nqcbHL;_&c&Qu3|d?uM>}w_GcIRv1&s_bG;ygg
za52mTi?8QmXI#v1oQr`$h~X<&{WC5h24(JNTwDxw+#qe6x!D<o7!GoS#E*f=3*67R
z*ch~UKt|Z|urq2iB=ayZa51#;fYeU{lk>skW*&CN&kP567#Kb?Jm+Cx&}R4!Rw=;?
zQmG0ijd<A^jTypuK{ZnwuZkc87sC{=#C$Nhk#}-XvPL~C0~-S)BLhPSgCzqegD?Xd
zLnDI#Ljr>(11p0BNRB~(A&0?|L4-k?fuDhqL4ctO%#&dd2J_m%JXr>DFmF1Tr@$Zu
z<}C;Flo({eyzO9~GJ^t`cLK~)t!GdHbFYHAY7FXN-U~2Kok0i8`vK-@G3bMNij0;F
zybL-FW(-V>3=Haw3=EtMb_@<+IYUN}vz?$k3oy@<!H+?Z!I6=RL6E_Zk(Ysyp^8y}
zfsvt+QG|hwt$q)q8ADjZ5k^afu!hTE@&TB94JQABNdYF1tRk2+0h7*PG89Z^g2`Gi
z*~etbz{UnKb3RiYLs-LFFu5B{9%rg!U}3n*)WpETaF3~#fra6DJyQn*BSRsx83Q9j
z3z(eC+{(bnuoTQ*!~B7PkpUtCVQ&P>?gq;q1(Oe%Eg2XYo->2|B+LRb2U)KK3&;d{
zFqzF_&B(}5$70XO$j|{MC$ZFnICH?9WngkYi!&o5!(lM{28%l*Bg11b`3_8e1Cv~=
z-i(Y4imd*Oj0`5M!HkRyF|6T?j12j#DU6H^U91_5urT0c%U}#^5CN0QY#EG<4Ek)1
zjEoFsY#?XZvkBBQFfzEaf!rPfc4HKn^k)P4gNs#wAwU6C^t5qwFiJ2mGNgccjS`a?
zK}o6w%xhzq$*9D@#4rQQo5rw|QJsN_K}HRvZ=%FHMqLJGaB;=J&>}IJv4??~Ap<No
zjo}s36oz^>h8ifBhj|VI2ZN3}NaHjHapq+V+zea5yfzLM<_!#d3@4yGL*^|Ed<=J>
zJR9bn416F>3=9m%SUs8dBJq5f4>9mDe1NJfW4_KHz`z13ni<+8CNth<5U6KR0dtQr
zfRu_b6hL_(W5gI5z`Qn&Zsr#ZVhjr)Jg`PFh67+8M4uFciYCYf#~48RWEf1qJdhQi
z8Dtnzz&wabC59(Z9!RAML;V*p7o_wbg9?KTXq1QnqEwTi2g(B})n=Fj=7CglFlsaG
z0rMa#^%<T(c_5XB3}3*!HjeYmFBl9NM6^Lp1L+fFG-R*=^C0@n81~ddxgd=e3}?VR
zkWy(z3x+pf9z>}PgN+Wz7>Ez;7y`h&HjcN<5)5_>DNx>TW>rQzh6*qbqSBtB1Iz=N
z*~4JZumH@1nCZkIp$nP;Vt^=hVE_#|F@R%6o6&_KLKk8oC}O-A&VYGs92zVy7<?EW
zKzT+iW{f@zU!Xi2mKO}Z3><nOeQg{bEM|<p3^HII#6mxY1~3oem;i<udJG`@A=U>o
ztbj{KGX^u90P~J8q_f5|1~YsC^BNh-Sfd$37%WUdR!n4=!K%v;!Vm!FH8Lz`&0!2-
z$bs@UvF0#_F*HDVhggdlBN$FVd1qNG86z21m@|OvZ)CX1n!^~)Py(9nVQ6G{!<xew
z%diB@YvTxId%+OTumj4A1M|*6c^PbGjPVQ)pu8fs7YqpuU!c4?HZ#Tq1`bP*L)$pI
z*j_LsGI&6FQ`xRFBr?Q+c=h1mZedJhSODTOv@y(QGh<9+*aPLQWHVz-XSf07ZD#9b
z%wXUF%~3J5G3;aOWz1x7fbveVO=8Sqh=KAhf_Wtn9>-6%>kL^8JrJJ6WX5TXSqy8y
zy!ti<X7<^P*$fB3To7*|V-CX?Fb`CiEN9GRcw-InMI(a-`#Q!v2GDeSI|qoI2qp_T
zLDNbloS-4?a!!zVHCUt;%&rHspEH4En~+5M!Rnhp(u@osl8FH#eHp9)WGFKO$WRsr
zh@r@8ZW5v94p_}Yur)6^K_lQGGg-lAvcb))2e}<$F+>AMDKi5|DGOLBD_ki;<u9<&
zAT_w1_z$dxkqhK+kV+h;fy#dtE|Ae6MYxS)=K=*RNDUL%S<G0RB?dM}5^SXm7cL)z
z?1Fe0WF}}d9Bedl@M2n{09ND61JWGA19A#7I~ptkBAFN<v5qW@%m!J>$N(Xa@-i?m
z)ia#p1qIP1UXXil@q)&!AMt`L07)}4yacm9B9UK^*bwnQV3GeI<4{ZkO(?N4__H-K
zOlCA=>;#h&874EvGtLCF7cxv{tT$s^3Fd4BlRLrWK`?m|OkM<&H^C$)!(_&2Mnwit
z_4|-v7RPqRhYVXe_Apj5OlCa7SjljZ;}jz!BgnE!hHD(>7%Leba$I8M1dDJoe&*Q8
zP|5I*V*^7a11BelEzEhno}rRKmh&2;Afo~29Y#S$E6zuZiVQBCuNWB_LpWbBR5B!R
zMl=2dlbVc~oVpB}3>}=lOdv9tNs@6g=L-fyFlosMavVrJo=KD8EoUl|A_Fg1ArmJ9
zNR1)`s0@$<dmxh`oi&<K5?r#@8-j%_!K5RYOazmjU@{O)MuJI4MkB6hMo-2Ft}3QL
z#x$-5CQF8VE?EXkhDt6o#z@A=jO|R84E<caOo@z3xXc(G8TW8aVRB@=$u*m)kkN&6
zAyXyeWX6q5j*P##wlg_0a&Vh5Ce||ua?3I_LM1e~_c1v#8gk1rBr@1>_cD1hfY^?V
zAPWK+!nxxa0~zwT;~5<pJGhTB1u{$oi!26{JGjp<&19U+c$vwO@h<lRCP{{8-20d$
z8UBDtZl32%k_;j|y-bdbvOMvO8^NKqld;~D=QGnz#xNdThCqf`o@mBEhAN()Oa~c3
z?2};fAfpTCe<nq6AU_1h<wM3>JY38#8C^I9m;)L3c*U82GNy6KGHZfUh9)?`8JX;P
z?U)l8y?8+-e<rUxvm_HQmoIZ7Lm6){vm#S3ZzQuO(}8;41ZEBf2?kpR4h9(pCk74%
z1qOEp4h9tl9|jHv4TeBalZ+vZfrG(-A)0}M!Gs}!frG(<A(erH!G<A=frG(;A)kSR
z!G)oOfrG(=p^|}vApmSn2-utmun93>^?$&&Fff8_VPSM<&|~0csGr2F#~{oAB9p<S
zHJFqJlg41u8%#!nNoOz_%rJ@Bfzg`Li6H?@Hh{?otRN8vHV~-*CLO?}0{dwuCx-Wo
zkxV&EWlV3GRGABztC@S5nHU%uSSPC&D%NjhG-P04h+sa&z`&5me2#&EA%poc0|P@n
z^AiRJhH1=i7#J9Cfk{plkjfAikVq7myvYV)-vg6Rz~mb+`I!x**OdJU1IQj`1||kB
z237_p25ts+1||j`22KVh27U%^1||mKOa@*CCI$rteg-B6bp}BOMg|QqX}}=Nz{H>r
zCJh-x85kLi7(^ME7#zTzJtqc92GC5dBm*OZ3xhNR6N59DbY+lbU}A7%kY`|G@MBP9
zU}*rAW(*8>IcAhjHYf@bT*34VHs=RkxW=-1a#0tfazRdMdP)*QdTL3$e}PYCaS4N7
za!Gy>gL`U8Ku&3TW}b`FX5Et0%$xt0cQNXLlsV^@=9M7iohm(37=kN{OHy<7JpCD*
zGV>CPDuYrJQ&NjI@2V_joNQICFgd+?7B@(*Z)$OIVtVSPn%B%=zFTHas$XL6<n9JT
zUdWgSgL8gfa$?Ek;|-ZiNkx<O8`UO<G-h&G1~B9>lrp4GUf(V$Uc`{fkjRk2pumvE
zkjRh;mMLOL-MqWefOYc4_A?F)3=CrXMOR6Ses%9*t9X&$b$K}h$M&k2FiDdKolI<;
zOl)k-Y(j#}Y(hRP3JgMmEDDT_93YktD+8kt2jAwPPAkUA6S^E^*%%mwe1vQ{6j(X<
zI5=22SQr?Y_}Cekgi84YD<{9{(w2;6w-qWCvK8VG<l*As5c1$;XJry<Xch9Atk-SN
z)X+FNr~3}81Ut8o&t&f&Su0ir2BAh?Rs}{ORSs4KMn)l3HU?%sK0ZDH23EmFR-r~t
zK0d)lNx?>0PIhLHKtm&+AUhAIkk8}?J>o(Wpi2=!Eu(cHw!%b3F{TAGH!JnNVcNtr
zfq66E1Up9V8Krl@jiec+cQ=PmG-u?sWYA+UW-wqdWH4Yb**traJ(|$u=aa3`6zNa7
R$<1`Ya<kxq_xuwL*a3fWQ_BDV

delta 11430
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
GzzzV6gyi)A

diff --git a/plugins/BinLogReader/Form1.cs b/plugins/BinLogReader/Form1.cs
index 91f0dfd3..e4a24e6b 100644
--- a/plugins/BinLogReader/Form1.cs
+++ b/plugins/BinLogReader/Form1.cs
@@ -5,7 +5,6 @@ using System.ComponentModel;
 using System.Windows.Forms;
 using System.Data;
 using System.Text;
-using System.Text.RegularExpressions;
 
 namespace BinLogReader
 {
@@ -61,7 +60,6 @@ namespace BinLogReader
 			base.Dispose( disposing );
 		}
 
-		private PluginDb plugdb;
 		private BinLog binlog;
 
 		#region Windows Form Designer generated code
@@ -250,7 +248,6 @@ namespace BinLogReader
 
 		private void Form1_Load(object sender, System.EventArgs e)
 		{
-			plugdb = null;
 			binlog = null;
 			g_UpdateViews = ViewAreas.Update_All;
 		}
@@ -281,8 +278,9 @@ namespace BinLogReader
 
 			if (v == ViewAreas.Update_All || 
 				((v & ViewAreas.Update_Plugins) == ViewAreas.Update_Plugins)
-				&& (plugdb != null))
+				&& (binlog.GetPluginDB() != null))
 			{
+				PluginDb plugdb = binlog.GetPluginDB();
 				PluginList.View = View.Details;
 				PluginList.Columns.Add("Number", 60, HorizontalAlignment.Left);
 				PluginList.Columns.Add("File", 100, HorizontalAlignment.Left);
@@ -333,25 +331,7 @@ namespace BinLogReader
 
 			try
 			{
-				/* try to open the accompanying database file */
-				Regex r = new Regex(@"binlog(\d+)\.blg");
-				Match m = r.Match(ofd.FileName);
-				if (!m.Success)
-				{
-					throw new Exception("Failed to find binary database, filename unrecognized!");
-				}
-				Group g = m.Groups[1];
-				CaptureCollection cc = g.Captures;
-				Capture c = cc[0];
-				string dbfile = r.Replace(ofd.FileName, "bindb" + c.ToString() + ".bdb", 1);
-
-				plugdb = PluginDb.FromFile(dbfile);
-				if (plugdb == null)
-				{
-					throw new Exception("Stream failure in database file");
-				}
-
-				binlog = BinLog.FromFile(ofd.FileName, plugdb);
+				binlog = BinLog.FromFile(ofd.FileName);
 				if (binlog == null)
 				{
 					throw new Exception("Stream failure in log file");
diff --git a/plugins/BinLogReader/PluginDb.cs b/plugins/BinLogReader/PluginDb.cs
index 9c464a26..9621b7fc 100644
--- a/plugins/BinLogReader/PluginDb.cs
+++ b/plugins/BinLogReader/PluginDb.cs
@@ -10,8 +10,6 @@ namespace BinLogReader
 	/// </summary>
 	public class PluginDb
 	{
-		private static uint BINDB_MAGIC = 0x414D4244;
-		private static short BINDB_VERSION = 0x0100;
 		private ArrayList PluginList;
 
 		public int Count
@@ -40,72 +38,38 @@ namespace BinLogReader
 			return (Plugin)PluginList[id];
 		}
 
-		public static PluginDb FromFile(string filename)
+		public static PluginDb FromFile(BinaryReader br)
 		{
-			if (!File.Exists(filename))
-				return null;
-
-			System.IO.FileStream stream = File.Open(filename, System.IO.FileMode.Open);
-			if (stream == null)
-				return null;
-			BinaryReader br = new BinaryReader(stream);
-			if (br == null)
-				return null;
-
-			PluginDb db;
-
-			try
+			//read plugins
+			uint plugins = br.ReadUInt32();
+			PluginDb db = new PluginDb(plugins);
+			for (uint i=0; i<plugins; i++)
 			{
-				//check header
-				uint magic = br.ReadUInt32();
-				if (magic != BINDB_MAGIC)
-					throw new Exception("Invalid magic DB number");
-				//check version
-				ushort vers = br.ReadUInt16();
-				if (vers > BINDB_VERSION)
-					throw new Exception("Unknown DB version");
-				//read plugins
-				uint plugins = br.ReadUInt32();
-				db = new PluginDb(plugins);
-				for (uint i=0; i<plugins; i++)
+				byte status = br.ReadByte();
+				byte length = br.ReadByte();
+				byte [] name = br.ReadBytes(length + 1);
+				uint natives = br.ReadUInt32();
+				uint publics = br.ReadUInt32();
+				int id = db.CreatePlugin(
+					Encoding.ASCII.GetString(name, 0, length), 
+					(int)natives,
+					(int)publics, 
+					status,
+					(int)i);
+				Plugin pl = db.GetPluginById(id);
+				for (uint j=0; j<natives; j++)
 				{
-					byte status = br.ReadByte();
-					byte length = br.ReadByte();
-					byte [] name = br.ReadBytes(length + 1);
-					uint natives = br.ReadUInt32();
-					uint publics = br.ReadUInt32();
-					int id = db.CreatePlugin(
-						Encoding.ASCII.GetString(name, 0, length), 
-						(int)natives,
-						(int)publics, 
-						status,
-						(int)i);
-					Plugin pl = db.GetPluginById(id);
-					for (uint j=0; j<natives; j++)
-					{
-						length = br.ReadByte();
-						name = br.ReadBytes(length + 1);
-						pl.AddNative(Encoding.ASCII.GetString(name, 0, length));
-					}
-					for (uint j=0; j<publics; j++)
-					{
-						length = br.ReadByte();
-						name = br.ReadBytes(length + 1);
-						pl.AddPublic(Encoding.ASCII.GetString(name, 0, length));
-					}
+					length = br.ReadByte();
+					name = br.ReadBytes(length + 1);
+					pl.AddNative(Encoding.ASCII.GetString(name, 0, length));
+				}
+				for (uint j=0; j<publics; j++)
+				{
+					length = br.ReadByte();
+					name = br.ReadBytes(length + 1);
+					pl.AddPublic(Encoding.ASCII.GetString(name, 0, length));
 				}
 			} 
-			catch 
-			{
-				db = null;
-				throw new Exception("DB file is corrupt");
-			} 
-			finally 
-			{
-				br.Close();
-				stream.Close();
-				GC.Collect();
-			}
 
 			return db;
 		}