From 5ef483cf7b1cf9d68a9973f39b58c4761d39d82f Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 11 Mar 2005 11:28:58 +0000 Subject: [PATCH] fixed GlobalFree call with a bad pointer (thanks Takhir) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3920 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/AdvSplash/advsplash.c | 3 ++- Plugins/advsplash.dll | Bin 6144 -> 6144 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Contrib/AdvSplash/advsplash.c b/Contrib/AdvSplash/advsplash.c index 11ecb686..7c95e998 100644 --- a/Contrib/AdvSplash/advsplash.c +++ b/Contrib/AdvSplash/advsplash.c @@ -76,6 +76,7 @@ void SetTransparentRegion(HWND myWnd) BITMAPINFO bmi; int size = bm.bmWidth * bm.bmHeight * 4; int *bmp = GlobalAlloc(GPTR, size); + int *bmp_orig = bmp; bmi.bmiHeader.biBitCount = 32; bmi.bmiHeader.biCompression = BI_RGB; bmi.bmiHeader.biHeight = bm.bmHeight; @@ -115,7 +116,7 @@ void SetTransparentRegion(HWND myWnd) SetWindowRgn(myWnd, region, TRUE); DeleteObject(region); DeleteObject(dc); - GlobalFree(bmp); + GlobalFree(bmp_orig); } BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, diff --git a/Plugins/advsplash.dll b/Plugins/advsplash.dll index 926d2f83aefa15e7ed2aff1a17331cf8015a7cb7..ef15df2f21a4957a88391e031f90b77008914313 100644 GIT binary patch delta 706 zcmXX^Z%9*76u)=Pbd_#uLy5}SKkb8h@4NTDO$Mgr(+}YvT4)3VGnO>dWjHl6oo2#g z%gPs|;RhE+Mv&k}l$a<=>JqXbgEFu_q?8}D3`bb6x6y&~|Mxow4#$OD=+<2F&Q^RB z{Fg-#le`^n1z?*}2&p1vx7V(yOi((bB9a%TzyxUq*27+3j%pG*a=ilx=q%d7hVh%ok7vLd~Qkz7=UP)3Rz|&3PTiDi)H-|CBGqzSc*%e8g=GDt*2GNhbNjRMC)erC3iv4t!e!%%Q7%W zKT~*4i}Y4~Bo~ARIag%8K?%Zy?~&Jppjs9-Glk8j&ce&>b|^d7WoMMEzY_+pyIBY< z&&$r$kXiN}k2tAXRBoB^7AJ#m#=T1*gtNTfx3 z&;gW=PNOnpM|J2b>OdaUg}PBc@}pVw6~*FRI04<@(kaUtm@`;sHkg68aOxlTu z^pFSS5qU!VN(UZjoGMXys2?V@+7mkv-r z9j24?6@5eB(@*pZU7|mznkBM*EQMt-#>}jUS($@1G8gM$9@fRWSs#1IUNAb(7T6LC vGQdak@%(;1mB)M?-^6$FUj8vZ%#ZOe`JX&6MjH*rG$S!)8SO^p9|QjYNK^K& delta 716 zcmXYvYe-Z<6vt=Q^|6-g1J;V%Qq0^4Z063)T{0s@@3%^6(*jxW!BsNbq+Bx<*GHj? z`07^nAY;J~vIH*Num@5rSQ>31`Xvf!izuTEBax+q>F(BnIWy<{|1&=rP6z5hL-QF$ z%kK-o{|EwO#wHj8K)lunFD=T3f41r5-m zW7=MJVmhcRsmtf4{B)4ymO>GgymL!)p0IAKnU!9r1Gjx%I|Lw@mHZZs;Ff0G_MqGT ziJOwNdz?*aUbnPb!cCjCx?l3!O1Lw`S%mdZ=FU}aic@;@yDfcYpt;)GBZzK!16=mE zJNk}<`V5^PIOpI%!b9ynXR)%NKa`su1~|X-#fbY`Y_}BBb7^D0w9$6u=*6Bo$enB4 z8OKdmBgQqp7$#{cq?Se>*Fmg$V{K4p_@nSR3zQX$;UolVr@^HkM)A<6LgN+)eF`*A zsB?*LVOj<#JbR|i}R76v_2+qg-57Cs#KrPm(9~;qOQi+-DB35#c*od7}lSUV5 zAzfsU+$ML)81a$`a-TdRPsua#k*tt4!buEGqnR{^T4^3Fq!qM=Hqa*8O1o$;?WZGj zlzOR;KBm)jmcF8k^bK92%k(!jvaQU_ve;gRnZ#^NW(}-~wXrVN%LdqWc894fz=Q?1 y#D1`K79|?QZQ>3wTdWt)iI>C?(IfiANpVX2Dz1xB)>Lbzb&r)=E3DdN2L1vk