dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

more byte saveage

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1177 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-09-25 03:06:36 +00:00
parent 863d0f4fa3
commit 04adc90a1f
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/exehead/Main.c
View file

@ -366,6 +366,7 @@ end:
// Clean up after plug-ins // Clean up after plug-ins
if (plugins_temp_dir[0]) doRMDir(plugins_temp_dir,1); if (plugins_temp_dir[0]) doRMDir(plugins_temp_dir,1);
#endif // NSIS_CONFIG_PLUGIN_SUPPORT #endif // NSIS_CONFIG_PLUGIN_SUPPORT
if (g_hIcon) DeleteObject(g_hIcon);
ExitProcess(ret); ExitProcess(ret);
} }

7
Source/exehead/Ui.c
View file

@ -38,6 +38,7 @@
#define LB_ICONWIDTH 20 #define LB_ICONWIDTH 20
#define LB_ICONHEIGHT 20 #define LB_ICONHEIGHT 20
HICON g_hIcon;
static char gDontFookWithFocus = 0; static char gDontFookWithFocus = 0;
// Added by Amir Szekely 3rd August 2002 // Added by Amir Szekely 3rd August 2002
@ -360,6 +361,7 @@ int NSISCALL ui_doinstall(void)
if (!g_inst_cmnheader->silent_install) if (!g_inst_cmnheader->silent_install)
#endif//NSIS_CONFIG_SILENT_SUPPORT #endif//NSIS_CONFIG_SILENT_SUPPORT
{ {
g_hIcon=LoadIcon(g_hInstance,MAKEINTRESOURCE(IDI_ICON2));
m_bgwnd=GetDesktopWindow(); m_bgwnd=GetDesktopWindow();
#ifdef NSIS_SUPPORT_BGBG #ifdef NSIS_SUPPORT_BGBG
if (g_inst_cmnheader->bg_color1 != -1) if (g_inst_cmnheader->bg_color1 != -1)
@ -442,8 +444,6 @@ static int CALLBACK WINAPI BrowseCallbackProc( HWND hwnd, UINT uMsg, LPARAM lPar
BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
static HICON hIcon;
if (uMsg == WM_DESTROY && hIcon) { DeleteObject(hIcon); hIcon=0; }
if (uMsg == WM_INITDIALOG || uMsg == WM_NOTIFY_OUTER_NEXT) if (uMsg == WM_INITDIALOG || uMsg == WM_NOTIFY_OUTER_NEXT)
{ {
int iscp=0,islp=0,isdp=0,ispotentiallydp=0; int iscp=0,islp=0,isdp=0,ispotentiallydp=0;
@ -480,8 +480,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
m_hwndOK=GetDlgItem(hwndDlg,IDOK); m_hwndOK=GetDlgItem(hwndDlg,IDOK);
m_hwndCancel=GetDlgItem(hwndDlg,IDCANCEL); m_hwndCancel=GetDlgItem(hwndDlg,IDCANCEL);
SetDlgItemTextFromLang(hwndDlg,IDC_VERSTR,LANGID_BRANDING); SetDlgItemTextFromLang(hwndDlg,IDC_VERSTR,LANGID_BRANDING);
hIcon=LoadIcon(g_hInstance,MAKEINTRESOURCE(IDI_ICON2)); SetClassLong(hwndDlg,GCL_HICON,(long)g_hIcon);
SetClassLong(hwndDlg,GCL_HICON,(long)hIcon);
SetDlgItemTextFromLang(hwndDlg,IDCANCEL,LANGID_BTN_CANCEL); SetDlgItemTextFromLang(hwndDlg,IDCANCEL,LANGID_BTN_CANCEL);
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT #ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
if (!g_is_uninstaller) if (!g_is_uninstaller)

3
Source/exehead/bgbg.c
View file

@ -73,10 +73,9 @@ HWND NSISCALL bgWnd_Init()
{ {
RECT vp; RECT vp;
static WNDCLASS wc; static WNDCLASS wc;
wc.style = CS_VREDRAW | CS_HREDRAW;
wc.lpfnWndProc = BG_WndProc; wc.lpfnWndProc = BG_WndProc;
wc.hInstance = g_hInstance; wc.hInstance = g_hInstance;
wc.hIcon = LoadIcon(g_hInstance,MAKEINTRESOURCE(IDI_ICON2)); wc.hIcon = g_hIcon;
wc.hCursor = LoadCursor(NULL,IDC_ARROW); wc.hCursor = LoadCursor(NULL,IDC_ARROW);
wc.lpszClassName = "_Nb"; wc.lpszClassName = "_Nb";

1
Source/exehead/state.h
View file

@ -12,3 +12,4 @@ extern HWND g_hwnd;
extern int g_filehdrsize; extern int g_filehdrsize;
extern HANDLE g_hInstance; extern HANDLE g_hInstance;
extern HWND insthwnd,insthwndbutton; extern HWND insthwnd,insthwndbutton;
extern HICON g_hIcon;