From 7fe6c3d77feee22b36b5ed758f3f45c00799f7f8 Mon Sep 17 00:00:00 2001 From: janwas Date: Mon, 28 May 2007 15:01:29 +0000 Subject: [PATCH] add detours library for API hooking. (update aken driver while at it) This was SVN commit r5107. --- binaries/system/aken.sys | Bin 5504 -> 5376 bytes binaries/system/aken64.sys | Bin 7168 -> 6656 bytes build/premake/extern_libs.lua | 5 ++++- build/premake/premake.lua | 6 ++++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/binaries/system/aken.sys b/binaries/system/aken.sys index e4805d0f1a47b09c9966f87a0099fcfd31838650..828af03c1d038d54734be83048115af0d1a99d90 100644 GIT binary patch delta 2045 zcmb_dZERCj7(REq?e5yG?aBtrELp*A?u)Ss?d?X}b#oV7SjSdYz$s&(kSkyrWXQ~H z)>@}7H#4axn#CW>5KRyPiIS~|G24Ppld1CqGYBfdV7j!LB`#Q?THkYTFYE_DJ;`&< zdERs0kMo}Up6jphm!I2_R`%%Kwv8y&t|JYlrZQAWgOEQ>5)S0RoQ63Lq!p@Bp2Ys0 zMEHZWV#N%s+Cl+CRxU!PVN;h5AwwuoNyFG4TJ?~=s%LL+4=j|ZB}Km)ccib*M6ix1 zVs#+BFcT3UKoCBYUTE?Y2HwfIv>6e)QFUbR!9!0Ybd@ZCPszqV=|N@vX0D~yh+m?s z$BH`Xb0z$e$UyV^A}+2ON&m}gaCH4guruUZY#Z`ib0_l}MTc`i-yHIl@y0lDGLZ6!6hL}qkBQb~ zUNhD!9h4QfDf^)RTFLhB&!AAUXkZ%*;R)!X1>pq-hGk)-f*~tBnhk>@JfVS*Ztk3- z(OTGL0oVbJfXx6z(=-K01EkN$O-^XjmdDzgcM-PB&DA&VYTe>)ha4i1)WSU=Wb8h4 zq{mp?YqUeBLbCphkn{+#U@V{agOA8J8L3MkWHJMv$=JS?f#Yk(W(PfqXt{Qri^CbS zh-m!FL02NWLObq>Ly~l2k`mF3a5h2{(RKVNF;OYm6SzdHcH9+j<4+Rla=e`>D|tZZ z+ucp=oE*Efj^AbqR;Gf?<C*O0(8YkQ>RmpRbt*gzc&?ZM~n; zRIsJ|^-Qqyx@4V?5E4+}KQi6a8thbc$z?I3Dv+mRsuFp6Rn>#X)K%0dzNv1iEE1C& z3;JTnx0;`YuO`x$E+t`(5U)f8E;et$9a$yi#w7}c`~ulimQsilVvxxERfJDv?QS+K z*>2zsYS=LX6;H~sh>(y(qHcj(sNjYNxp2T2CdGba<$ko^#XDgW-wRzbuM~G=m+qM6 zV({@HLCpDjunwVhl1%2NGWmckdRkod_tJRp#{Ezmkw4+{7vBcFLi0qntlM$S<9!bQ zs>;W2YDx`{i)UC2`WDHvpo3b9RHoGO@fFP@W?9YSJ>Wfb%xe@&=Ki%wmB5b@#qS_? z;_sveo3$14o$S%p;%cR$D;Q&V1dm3fCAEzqq+TNMhQ!5}w%}oe2AaGUL@L(2SdqzMn~n+vo@_a_457CGF9W&(oq*2(q|NFP`W=u4{1S}i zFg5@_f%&_DVZbW@FF+6Sr}Uv!%h$+17V;nQ0A7SApTNDfaqAst$=&js8#Y~d@x524 z4xc%mj&pME?4xriG%#_&c@d!=dc)+=hlRXq2scdRlM!ZJS}`fL6NDbk5GKXR-?JwW z@SXF|{FO`=K>%`Vg+L78j#(o69%Kj~)~|5=ugCrPvi?J=e;91nm^Yeto3Z)0`K%(O*sDYTd@-Ikc8h^=6&S(bIM9NWxpV>{SRb`QIc{fhmGU2olF?XVuO z2CTQO%9`hEhH6G?PS;G;WY#XPy|h7NGuX;(T{f?+&la`awkhou_G-Jue$f8DeaybI u%yGcc>-fU)gQKZ#TixNhzPeD|J9XqgOMa7rX~cBG^pWYJY04A|wEqWpmu3+F delta 2172 zcmb_deN0nV6u+;$LTP~lLctH@sgz+s#A0~``T>k;*esMn<1|BIQu69psaO?18p?`O z_NEb@f4E2%7eDr?lFUGjEEA=XdV8 z=kwk3yee=0&|9L_?4$Y(DEdsJBtk~SNxex3c}0RyoC-V%#Px`>W!`iFT}~#ruS81m zCfL>WuUMMsO+)AkoS05VXjy+xzSs*)BkZIWy6s(V*!e&v97PG-)|i#?cpnki?%|m1 zcy9`DAn=XNkb>TxHbic6E-rlhTp()tFP6ZqP#Q6G)NbV?Ez+ESG1L7Pt z8?mvozS%s+OA;tBB}K@0i)4B+m=HkQm}xE(!Tb3VG-e8&mE%eP@gH_^8}D5 zo4JJ5_eReSVc-w|YYGHCtVuFfp)HCf5Nno__a}Rk|Gt{5hi8$(U7K2bcA3AFaTO#RqICZRn@N>Ij z55oIVEZzM^9DyP^hf84bpMY0ziGNfA%Od}HJS+)*=qU<{{S*YkK5V*4A~|R&fUQ}=q~rtOt)nrgROO_kN#Ep^sL2oF)Nj!rkFRCQ5$O4%hv z{F!LcGnrJ%sxj556#tcc?h;~m{6!F_NoYYX+b7QvdGjmxlviv!y+%fGu%L#ml(QWLboZ`(9R4aE@={tj{xxJS&+`q!9A87~zXJgTW;M zu%_9W{ajf>uIkK!1KG?l)^S7+_%V1}05e$x_hCXy-Qa)Jf5jS8Ff{NrpTuB705bzn zWY+W~-*l?a7R3SVqP~>3n1VYPO`R4wu-c{(t6hB zx3Z>l7S?SS0F&hZX0fT8gBY4-L};V{eIbQ zRv`?nG-f&xY(9p2iL-gYjU;XX`h z^qK}cvpL^&LdPin5=Zaoyf^;KVi1glzyzpbN2HwlIVm4|ij|jPPunC+GghdLDzsuy zDFB#fA%3d8z*8;U4qM0g`}{Rd+br?zCy_f5DuinYlM74v`NIbgQC?3b`g;!6s$hmI zfJmSxi(sw;8Sq?(#{zsC(EC8uKwkpg1S$i{0m=l51$qqsi2+zAQ~Osa*3AFWAP-~% z3d5fUleM9`;YCI6->Qe@8?PQZf8^$_i=T?P{^S>Jy(t7bJbJa_8bWTe{KlSDZ2Ay{ z>&NmN0ZFk)iO0ZM4EMybH+bf+@v~mQO*6NiMIz@G{HVqukU?;Fbb-tY33<7vDH-Pf zHQjG)sh5fFLCA5jCRbCb*{$i(9M_!JT-IFGe5bjqd7ycwiD*(vEG2hJNLofG(;4(~ zT1gksC3G2WpsVN&^vCoCn$%`!RoZfGz4iy~UG0X_rc!6=q0)iUUrPTdeNbMg)9Gq- zUfprsX`M{JSf8t})i>z3=zaQO{ZIP%wFZUZTf>irdxl(NvGEJzuyMlpoAId;qJk=9 W!Xhe?sh6u)snzOob(Olmr}kf+cboVC diff --git a/binaries/system/aken64.sys b/binaries/system/aken64.sys index a6f63bb5eaf33d6cee7b3f3844d17792ba167b29..1401c4ddda589b9c2bcecff8825c7a2c41226de9 100644 GIT binary patch delta 751 zcmXw1T}TvB6h1TK{>2qeA$q^~SU09u!gVv-x zC{--@iR>VfITCm*u!7X}-q6ibryP!gab4u*qSKlo_^i*-+9>u7eo@pOeN~Lkkl8I< z-3iClQ!ZQwd8cc~=1HOaDl{X3H57Zf*gE4%OTKA0(W(c!QU2+!)Ru7#JB|e1s=yjo zcxK{Z0XsZI!C6DsjjW+3vP+NzMBm^I&y;owto;Df(7rG5I6v~fE*nJ0UUU_l3E|Wo z=Zxsjy12i1Tw4Zh$B|&&C;HgbHz&8c`G;>HcD)Flw~E6)6v}77nA4eCk$A*^GUgY8 z)`B1}a3gT8S3>IHKmL!gB-VDf>`d4YxC1yhfNzsa^Y@ZH-b)2@3nv5hWq5&|pvcU& z=*RP63kMRrnVI=gjGW^OUR`a%0Q(M>IPpt`74?>^xp`QPNhzLIP07#eYNPx~=DJ|z zt_E>4j5uKSU-i=EU;$@MZ$7+;krPLx)S|*E4wV|~kg-C0;re*7gfu!{j8%LWaf+r@v*gonn8qV9)4=-umPRQf-d1aoJJj-hlV+xR&oyPqz#-0yX1%5 z0QNX72q_oL2#NjHO-M=*mWElsAUf4_!Uc?Oik{Tg@^Qw0HmTZThTqfY+G>}DbsmU~ z%+*L#*OeURqI8dL_l^~yl>)3`0j5GazJt<`)FN6n{sAyt zOb9680z%bRdJP0ONKnJM0$xRu*WkJz6WP;x%~Y3~eOtBXd%^(5NZ z*;bl+yvWy~!t%Pd@PB2n={A)0q`igQY-(*U&5iCOtt~eq_5PMy5k?SFdYCjcMe3Tj z1#FUu?ITB1V_2TxsxTdNUXB%5^8fuU@J&%QL?3}jL+DJ<9~?b%7 diff --git a/build/premake/extern_libs.lua b/build/premake/extern_libs.lua index 9eda5457dd..14268a2ddc 100644 --- a/build/premake/extern_libs.lua +++ b/build/premake/extern_libs.lua @@ -18,7 +18,7 @@ local function add_extern_lib_paths(extern_lib) if OS == "windows" or extern_lib == 'cxxtest' or extern_lib == 'fcollada' then tinsert(package.includepaths, libraries_dir .. extern_lib .. "/include") end - tinsert(package.libpaths, libraries_dir .. extern_lib .. "/lib") + tinsert(package.libpaths, libraries_dir .. extern_lib .. "/lib") end @@ -71,6 +71,9 @@ extern_lib_defs = { devil = { unix_names = { "IL", "ILU" }, }, + detours = { + dbg_suffix = "", + }, directx = { win_names = { "ddraw", }, dbg_suffix = "", diff --git a/build/premake/premake.lua b/build/premake/premake.lua index 7c4b0405fd..a4cbbcb059 100755 --- a/build/premake/premake.lua +++ b/build/premake/premake.lua @@ -388,7 +388,8 @@ function setup_all_libs () "libjpg", "dbghelp", "directx", - "cryptopp" + "cryptopp", + "detours" } setup_static_lib_package("lowlevel", source_dirs, extern_libs, {}) sysdep_dirs = { @@ -425,6 +426,7 @@ used_extern_libs = { "dbghelp", "cxxtest", "directx", + "detours" } -- Bundles static libs together with main.cpp and builds game executable. @@ -458,7 +460,7 @@ function setup_main_exe () end package.linkoptions = { - -- required for win.cpp's init mechanism + -- required for winit.cpp's init mechanism "/ENTRY:entry", -- delay loading of various Windows DLLs (not specific to any of the