From 15ab5da3daaebc37b13fa6bdad388558b2e98b52 Mon Sep 17 00:00:00 2001 From: null_ptr Date: Sun, 15 Jun 2014 12:30:03 +0000 Subject: [PATCH] Removed loading of dynamic functions in mupen64plus-audio-bkm --- libmupen64plus/mupen64plus-audio-bkm/main.c | 40 -------------------- libmupen64plus/mupen64plus-audio-bkm/main.h | 20 ---------- output/dll/mupen64plus-audio-bkm.dll | Bin 9728 -> 8704 bytes 3 files changed, 60 deletions(-) diff --git a/libmupen64plus/mupen64plus-audio-bkm/main.c b/libmupen64plus/mupen64plus-audio-bkm/main.c index 2c8e78a074..c4fc2388c7 100644 --- a/libmupen64plus/mupen64plus-audio-bkm/main.c +++ b/libmupen64plus/mupen64plus-audio-bkm/main.c @@ -67,22 +67,6 @@ static void SetBufferSize(size_t size); static int critical_failure = 0; -/* definitions of pointers to Core config functions */ -ptr_ConfigOpenSection ConfigOpenSection = NULL; -ptr_ConfigDeleteSection ConfigDeleteSection = NULL; -ptr_ConfigSaveSection ConfigSaveSection = NULL; -ptr_ConfigSetParameter ConfigSetParameter = NULL; -ptr_ConfigGetParameter ConfigGetParameter = NULL; -ptr_ConfigGetParameterHelp ConfigGetParameterHelp = NULL; -ptr_ConfigSetDefaultInt ConfigSetDefaultInt = NULL; -ptr_ConfigSetDefaultFloat ConfigSetDefaultFloat = NULL; -ptr_ConfigSetDefaultBool ConfigSetDefaultBool = NULL; -ptr_ConfigSetDefaultString ConfigSetDefaultString = NULL; -ptr_ConfigGetParamInt ConfigGetParamInt = NULL; -ptr_ConfigGetParamFloat ConfigGetParamFloat = NULL; -ptr_ConfigGetParamBool ConfigGetParamBool = NULL; -ptr_ConfigGetParamString ConfigGetParamString = NULL; - /* Global functions */ static void DebugMessage(int level, const char *message, ...) { @@ -132,30 +116,6 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con return M64ERR_INCOMPATIBLE; } - /* Get the core config function pointers from the library handle */ - ConfigOpenSection = (ptr_ConfigOpenSection) osal_dynlib_getproc(CoreLibHandle, "ConfigOpenSection"); - ConfigDeleteSection = (ptr_ConfigDeleteSection) osal_dynlib_getproc(CoreLibHandle, "ConfigDeleteSection"); - ConfigSaveSection = (ptr_ConfigSaveSection) osal_dynlib_getproc(CoreLibHandle, "ConfigSaveSection"); - ConfigSetParameter = (ptr_ConfigSetParameter) osal_dynlib_getproc(CoreLibHandle, "ConfigSetParameter"); - ConfigGetParameter = (ptr_ConfigGetParameter) osal_dynlib_getproc(CoreLibHandle, "ConfigGetParameter"); - ConfigSetDefaultInt = (ptr_ConfigSetDefaultInt) osal_dynlib_getproc(CoreLibHandle, "ConfigSetDefaultInt"); - ConfigSetDefaultFloat = (ptr_ConfigSetDefaultFloat) osal_dynlib_getproc(CoreLibHandle, "ConfigSetDefaultFloat"); - ConfigSetDefaultBool = (ptr_ConfigSetDefaultBool) osal_dynlib_getproc(CoreLibHandle, "ConfigSetDefaultBool"); - ConfigSetDefaultString = (ptr_ConfigSetDefaultString) osal_dynlib_getproc(CoreLibHandle, "ConfigSetDefaultString"); - ConfigGetParamInt = (ptr_ConfigGetParamInt) osal_dynlib_getproc(CoreLibHandle, "ConfigGetParamInt"); - ConfigGetParamFloat = (ptr_ConfigGetParamFloat) osal_dynlib_getproc(CoreLibHandle, "ConfigGetParamFloat"); - ConfigGetParamBool = (ptr_ConfigGetParamBool) osal_dynlib_getproc(CoreLibHandle, "ConfigGetParamBool"); - ConfigGetParamString = (ptr_ConfigGetParamString) osal_dynlib_getproc(CoreLibHandle, "ConfigGetParamString"); - - if (!ConfigOpenSection || !ConfigDeleteSection || !ConfigSetParameter || !ConfigGetParameter || - !ConfigSetDefaultInt || !ConfigSetDefaultFloat || !ConfigSetDefaultBool || !ConfigSetDefaultString || - !ConfigGetParamInt || !ConfigGetParamFloat || !ConfigGetParamBool || !ConfigGetParamString) - return M64ERR_INCOMPATIBLE; - - /* ConfigSaveSection was added in Config API v2.1.0 */ - if (ConfigAPIVersion >= 0x020100 && !ConfigSaveSection) - return M64ERR_INCOMPATIBLE; - l_PluginInit = 1; return M64ERR_SUCCESS; } diff --git a/libmupen64plus/mupen64plus-audio-bkm/main.h b/libmupen64plus/mupen64plus-audio-bkm/main.h index 9864aa17e5..72d7c5b9a5 100644 --- a/libmupen64plus/mupen64plus-audio-bkm/main.h +++ b/libmupen64plus/mupen64plus-audio-bkm/main.h @@ -26,23 +26,3 @@ #define CONFIG_PARAM_VERSION 1.00 #define VERSION_PRINTF_SPLIT(x) (((x) >> 16) & 0xffff), (((x) >> 8) & 0xff), ((x) & 0xff) - -/* declarations of pointers to Core config functions */ -extern ptr_ConfigListSections ConfigListSections; -extern ptr_ConfigOpenSection ConfigOpenSection; -extern ptr_ConfigDeleteSection ConfigDeleteSection; -extern ptr_ConfigSaveSection ConfigSaveSection; -extern ptr_ConfigListParameters ConfigListParameters; -extern ptr_ConfigSaveFile ConfigSaveFile; -extern ptr_ConfigSetParameter ConfigSetParameter; -extern ptr_ConfigGetParameter ConfigGetParameter; -extern ptr_ConfigGetParameterHelp ConfigGetParameterHelp; -extern ptr_ConfigSetDefaultInt ConfigSetDefaultInt; -extern ptr_ConfigSetDefaultFloat ConfigSetDefaultFloat; -extern ptr_ConfigSetDefaultBool ConfigSetDefaultBool; -extern ptr_ConfigSetDefaultString ConfigSetDefaultString; -extern ptr_ConfigGetParamInt ConfigGetParamInt; -extern ptr_ConfigGetParamFloat ConfigGetParamFloat; -extern ptr_ConfigGetParamBool ConfigGetParamBool; -extern ptr_ConfigGetParamString ConfigGetParamString; - diff --git a/output/dll/mupen64plus-audio-bkm.dll b/output/dll/mupen64plus-audio-bkm.dll index f0a01b1a461693f3e4baa0bae7eb8a3997bb2869..f239519c7755a31958d520e8d3e9ed5de6425b5d 100644 GIT binary patch delta 1888 zcmc(ei&Iop7{JfHf-LNcS6tZTq3-gI5xjd}oXg&VOqxZve54{=*@tFpn%k20C6ekr}t*UDM=ejO!ANT!rmz}67Z=|4U#iPQeys-k+ z@6H`_`)ltZq%C7=N3~3<6en_0?yGLUldk-ZMK ze`~&$f48_2Tmz|S+4DYc-Sk?D-f#5=>#S60hvq;B7L1Vvp&aeEl1-uRC)!}Krv0@{_JL_;(&g=ItGSA}Ije;_QCIz~PWn+N^PuvGCF z1mJ&IBd;^KbVaMwNCA#7&p8FwsyK%x0>8t}tZDF7%}`y;O4X%PBTtd}dK>t!*PCLr zEZianFSVyJ*U;db`C2`kKowiaA-z3Rn^t?Y(QQ3HU(42`nRuT^+gQ#WbLo~(>|BusiC zlm#b)=Y{&F*tRB;W^>H{U3LAGs(ZQUcj)TL3b&^qq?K{@1Od1e0cxm z$^rbd5Za~LKyHAV^}!qi_8M&rXk(2b0D*mStVtily9L|@9;P5W`U8}ZRD{ex3LpXt zfkL1J*bGzxuL4a#E6@R)OZ7I#RZw0(%}||lgMzB}K>A^9B%97kY%c3y>)3;AGkc6} zWmVQ}6Kqf0p0zEpZM4w}z^~yQ{BFLMzsP^dQ-V>55i*2@LYd$Ys)a_OxmqB?d&0*;k1!zo zDhvy8Vv;C{`Qj$gA(o2=M7MZcd{_KHJS$!kZ;AKCzr;u>R?3j_rBcZ$RY-41Z%ggc z`%pxp*lq!fSCE-i~+Uy|@84V}h&S z#2$PapTn2&Roshz#QpeZtm5hN3^`U#mgmdaa4^XU delta 2577 zcmc(ge^3yLz3=x_B8_G(x^&bvri>S?Y7NIireL^#I9ekM5@rQ1qH)bx~4D zxXv0`U}=hkOpiufkkINq50|FCbsVy8PTvSu?c<(UD9`(Mu-mB7MVh8{oiH``lf{-r zK3{sg4Q+j7ykYBtuNH27WTHWfN9rabL!B29B7xS<8>F6~yA8Ebk$7aNjqdzRgQ*RJ zH%y%uH55i@;o!KnL<6(l%M|L1jNKx03+`CNyAej3w2!^Lr0;t{ugm+IE_N8AUl%(K zaatF93^AgM*9`HMF5WPN#U3W<4j8J~PQNwy%74&rza3aqmAiZF7k|Ev>M#z^pnXQASw7sxY)9& zJ-L&jd+pJEQwu5c0PL-e9)16&`hE&aU$(1LOp!TfA-XRPm!5xzlDXL2WyiZp(P()x zLf)pC$U2$=cPEpIeR=8;(|4%T>UC2UTuaU6)R6kHc{W`A=5k>O5^xt5%S$aGQ{$tW zjfc}E&pHooFyBkM(Q9y27x%=1=~@VW_>f7nomWqrG0eYZ&dDQHL<9%S(#~zJvye@8 z!4@d}m=G<4BSFa0}Pbe8oJrN-$!VMhr<&%h@k06Y%N11f-A z;ASa8e+Gtu!@v%p7g!Ip0lOe(3G}2@K`#Pxfdb$vKfI=;y|HCQu+`rV z!-iMe;%f=EBwWL5^gManNyIg_1nWHk&l3Ti2SW@7`1I3sI~e;V0+!kkR0{$yHn zGFft-I!HSU7-SuT^Fdy+hQ`{)Q%!IGzHEzh|F-R)yq>y$;tPu^WYo=HxfzZb@a95GfE_iEz5zsM!XhJ=(eDXfw#UbBC;0o}ca#W4Xa}de_ z$^i+e0~&zG0UrYe^ZUyJ( zLfq5bZtg8^fSbaX@b~f@U&F8DpW?Uh+xgx6oBZ4SZ}=hp1O6gETPPJgLQq&QY!mhh zgTj#T7vT%xif~OZi#AadYsH0Plekgr5nmDyipRwv@r?La@k{Z#m?EW1+0wldmg=OX zQb-DKkhVz&rK8fY^r3W9q8w8lX^t$%YzO05;8@}aIDYH6>QLl>yiVREcgtJkUioEt zm%L9tAV=kQ ztsGL0DjzBTP_8R{wOqZVy4h2m>zw7h&$+`vR{F+R4P3vrGlYa0PrhU%}6V Pr|0FPh53IYA8qNsUdH;R