Installers can now contain more than one branding image
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2085 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
c12d20910b
commit
0274afd413
1 changed files with 5 additions and 8 deletions
|
@ -29,10 +29,6 @@ static int exec_errorflag;
|
||||||
static int exec_rebootflag;
|
static int exec_rebootflag;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
|
|
||||||
HBITMAP g_hBrandingBitmap = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef NSIS_CONFIG_PLUGIN_SUPPORT
|
#ifdef NSIS_CONFIG_PLUGIN_SUPPORT
|
||||||
char plugins_temp_dir[NSIS_MAX_STRLEN]="";
|
char plugins_temp_dir[NSIS_MAX_STRLEN]="";
|
||||||
#endif
|
#endif
|
||||||
|
@ -781,10 +777,10 @@ static int NSISCALL ExecuteEntry(entry *entry_)
|
||||||
case EW_SETBRANDINGIMAGE:
|
case EW_SETBRANDINGIMAGE:
|
||||||
{
|
{
|
||||||
RECT r;
|
RECT r;
|
||||||
HWND hwImage = GetDlgItem(g_hwnd, parm1);
|
HANDLE hImage;
|
||||||
|
HWND hwImage=GetDlgItem(g_hwnd, parm1);
|
||||||
GetWindowRect(hwImage, &r);
|
GetWindowRect(hwImage, &r);
|
||||||
if (g_hBrandingBitmap) DeleteObject(g_hBrandingBitmap);
|
hImage=LoadImage(
|
||||||
g_hBrandingBitmap=LoadImage(
|
|
||||||
0,
|
0,
|
||||||
process_string_fromparm_tobuf(0x00),
|
process_string_fromparm_tobuf(0x00),
|
||||||
IMAGE_BITMAP,
|
IMAGE_BITMAP,
|
||||||
|
@ -792,11 +788,12 @@ static int NSISCALL ExecuteEntry(entry *entry_)
|
||||||
parm2?r.bottom-r.top:0,
|
parm2?r.bottom-r.top:0,
|
||||||
LR_LOADFROMFILE
|
LR_LOADFROMFILE
|
||||||
);
|
);
|
||||||
|
DeleteObject((HGDIOBJ)SetWindowLong(hwImage,DWL_USER,(LONG)hImage));
|
||||||
SendMessage(
|
SendMessage(
|
||||||
hwImage,
|
hwImage,
|
||||||
STM_SETIMAGE,
|
STM_SETIMAGE,
|
||||||
IMAGE_BITMAP,
|
IMAGE_BITMAP,
|
||||||
(LPARAM)g_hBrandingBitmap
|
(LPARAM)hImage
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue