From cf0a0762a528cfec652c0875dedca77634142d73 Mon Sep 17 00:00:00 2001 From: ramon18 Date: Thu, 3 Jul 2003 21:53:38 +0000 Subject: [PATCH] Small bug with structures fixed (thanks brainsucker) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2689 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/System/Source/System.c | 6 ++++-- Plugins/System.dll | Bin 9728 -> 9728 bytes 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Contrib/System/Source/System.c b/Contrib/System/Source/System.c index 237259da..31423bc7 100644 --- a/Contrib/System/Source/System.c +++ b/Contrib/System/Source/System.c @@ -889,7 +889,7 @@ SystemProc __declspec(naked) *CallProc(SystemProc *proc) } // In case of cleared call-proc-queue -> clear allocated stack place (more flexible) - if (LastProc == NULL) LastStackPlace = NULL; + if (LastProc == NULL) LastStackPlace = (int) NULL; // Save return proc->Params[0].Value = z1; @@ -1105,7 +1105,7 @@ HANDLE CreateCallback(SystemProc *cbproc) void CallStruct(SystemProc *proc) { - BOOL ssflag = FALSE; // structsize flag -> structure size should be loaded + BOOL ssflag; int i, structsize = 0, size = 0; char *st, *ptr; @@ -1130,6 +1130,8 @@ void CallStruct(SystemProc *proc) for (i = 1; i <= proc->ParamCount; i++) { + ssflag = FALSE; + // Normal or special block? if (proc->Params[i].Option < 1) { diff --git a/Plugins/System.dll b/Plugins/System.dll index c66c50376fa2e852a7968a8339bff644a8f41007..336f4d3ff38770f764a30d09cb9843231165951a 100644 GIT binary patch delta 1096 zcmZ8geQXnD7=N!l+Us`fT3FrMeH4`1$tsy#Kc*XE8MhVFk-Edp8U#z*gleVQ-Dw=| zL(f5uvy1Zxk@yE{AS0yl533TDM0DB(zdwkgEOF{$-sE(mQ|M&m^}WLW@shjW{eI8y zdEV!F^S-0u(eU#f#O%bzEhAgw=$7WH{PKIp>PWr?^OG3Ym32Dr!uSo{llNfstnJO; zTE=_w&1LK_V{aw;_e59#!UPHWZ$@`6hh~9!O(kKh01g05fVw6>KC$>6vA*yX z;nclOdJVdwvEZ+;=}m~rv7?cq0Ti}ZZ6K)j%Q8Dx1V9-#yDYi=6bXQ2Zuz)q1XwIg zna}BTMW7t9Zd-*p5@wK%ZUq+AAhRJz{APlS_c>V=nZ|LsaMON0r;^Y}QX?VQGkxLv)TFSIJ!1tn}BljU27P?aK#f z{FT^}^uXWM&wYgF$(`!JimGQWbjn>z%-Qy-p-Oot_5Lq9NubpG#hy8oyAR1-CFbjv z52jg&aLzRQ8^SovUPKuA4I#cR#8-p_k8F@wN_ELBE+iSGJ~G(;!&4^l3OPh>lBZN1 zb4K1WHn+y09+U2+#32gs>&0Oj2;|sVzM4YvN zBpy@@j!o{&?+B@`u`|PFv1A`Hg(C1LO<5_8d$b*?+{58~*ruc%Ta7>BNCX;{(~kPu zPx0_-4F})ETC_Z+N^@{hnRjfrH2sBJJ1_1di70R6;H=VHf1~&K5>BvjaNQ!tN^y}8 zOdLFQMRP_kiRCHyCJs7E2yt-ZAKFTHD<|sRM78o|eQn_L%XppWL&j)Mm|Hl$Yp03} zzoTi|GJFFEGnibfvpUMt$k&Wd2n-dP8h$1wT8%F>ogbMey3?86v2-w<&cwk#*I8FK znFQeKb;hLzF?&m&9^kX_N1qG=@b>cm-XM69=uYyHY$hH|B(lkY0RTd}a3+=rr*>y! zSy(f;q>ijNY5}KJDG- pJLo&)d)fDy?^oY0|1tl2{-S@ue^a0(;18S(Slirf%4530{{Z!@sSf}E delta 1144 zcmXw2e@q)?82+w3$}vhQln%;|(fz0(!)79h;=pP`iB$7 zxs#FGtq-mtZ23&^uD7B zY?-1B!>xLlKY(i3SOU3>Jv8kVyt44IYz5ixK-ICx6w&%kpg?e%s`g3 zLJ!i)ofk9%JFXlUp4)1I^qNs_WxTD7u-n^aj%9dT7lk~Y#26Aw;r71>k-jvulioI~ zkPB)GHgMCLN_C_Nx1?}O(nM*)h~9SY`6ji?vA^--e+W?)m(N&1ql4{286I6Eq#fHJ zFo2zZq>~1Soz_RcM><6#VFz9YO8^_yc}E!)REgsmTkirPnrnFcltoH8hO&GC{G)of z*hW36hKir{PQz{h8~!6C7?d-$n%-lOjVJa>0NJE%&0$I!D3<_rA zu7rDqn-hhlKU42+nI8IqIv9?0b%vY6;Yc_7X`Qu1Lm`BIU1xmXNnn?a;eH|7{o3oz z2wmM+pJ+xhbuc6ZqLJ?Ao}Or^zaODp27jcp$KTf#?TqT~mvu*Lq$d^*`8rSZghQZR zOJ@jg4nYR=yl(J!_6uAz8i^uwQGK=CK~1Y8|3nDzRg}{-(x>uKV)yRU$Eb?-?IyBMs2iqr1rG?g8QobhWnm-!TplwBhQ5A Z8_y$8Rb5Tp-nvigit2aOt8W@k{ts>SxIzE`