From b176883de5ec3b3f9588f017f44e4fb4d6c8e63c Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 2 Feb 2008 13:22:06 +0000 Subject: [PATCH] same for welcome page (mainly fixes memory allocation) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5514 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI 2/Pages/Welcome.nsh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Contrib/Modern UI 2/Pages/Welcome.nsh b/Contrib/Modern UI 2/Pages/Welcome.nsh index 86f07cc8..1f87bacc 100644 --- a/Contrib/Modern UI 2/Pages/Welcome.nsh +++ b/Contrib/Modern UI 2/Pages/Welcome.nsh @@ -137,13 +137,16 @@ Welcome page (implemented using nsDialogs) !ifndef MUI_${MUI_PAGE_UNINSTALLER_PREFIX}WELCOMEFINISHPAGE_BITMAP_NOSTRETCH System::Call '*(i, i, i, i) i.s' Pop $mui.WelcomePage.Image.Rect - System::Call 'user32::GetClientRect(i $mui.WelcomePage.Image, i $mui.WelcomePage.Image.Rect)' - System::Call '*$mui.WelcomePage.Image.Rect(i, i, i, i) i (, , .s, .s)' - Pop $mui.WelcomePage.Image.Width - Pop $mui.WelcomePage.Image.Height - System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i $mui.WelcomePage.Image.Width, i $mui.WelcomePage.Image.Height, i ${LR_LOADFROMFILE}) i.s' + ${If} $mui.WelcomePage.Image.Rect != 0 + System::Call 'user32::GetClientRect(i $mui.WelcomePage.Image, i $mui.WelcomePage.Image.Rect)' + System::Call '*$mui.WelcomePage.Image.Rect(i, i, i .s, i .s)' + System::Free $mui.WelcomePage.Image.Rect + Pop $mui.WelcomePage.Image.Width + Pop $mui.WelcomePage.Image.Height + ${EndIf} + System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i $mui.WelcomePage.Image.Width, i $mui.WelcomePage.Image.Height, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp" !else - System::Call 'user32::LoadImage(i 0, t "$PLUGINSDIR\modern-wizard.bmp", i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s' + System::Call 'user32::LoadImage(i 0, t s, i ${IMAGE_BITMAP}, i 0, i 0, i ${LR_LOADFROMFILE}) i.s' "$PLUGINSDIR\modern-wizard.bmp" !endif Pop $mui.WelcomePage.Image.Bitmap SendMessage $mui.WelcomePage.Image ${STM_SETIMAGE} ${IMAGE_BITMAP} $mui.WelcomePage.Image.Bitmap