From 883d1f9f9ba714e5fb88522cb2a0e1bab19088b8 Mon Sep 17 00:00:00 2001 From: kichik Date: Mon, 26 Aug 2002 13:33:34 +0000 Subject: [PATCH] Disabled UseOuterUIItem git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@745 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/build.cpp | 6 +++-- Source/exehead/Ui.c | 49 ++++++++++++++++++++++++--------------- Source/exehead/fileform.h | 11 ++++++--- Source/script.cpp | 9 ++++--- Source/tokens.cpp | 2 +- Source/tokens.h | 2 +- 6 files changed, 50 insertions(+), 29 deletions(-) diff --git a/Source/build.cpp b/Source/build.cpp index 60fb98e9..d01b863a 100644 --- a/Source/build.cpp +++ b/Source/build.cpp @@ -227,12 +227,13 @@ CEXEBuild::CEXEBuild() build_header.no_custom_instmode_flag=0; #endif build_header.num_sections=0; + /* Useless build_header.space_avail_id=0; build_header.space_req_id=0; build_header.dir_subtext_id=0; build_header.com_subtext1_id=0; build_header.com_subtext2_id=0; - build_header.common.intro_text_id=0; + build_header.common.intro_text_id=0;*/ build_header.common.num_entries=0; #ifdef NSIS_CONFIG_SILENT_SUPPORT build_header.common.silent_install=0; @@ -248,8 +249,9 @@ CEXEBuild::CEXEBuild() uninstall_size=-1; memset(&build_uninst,-1,sizeof(build_uninst)); + /* Useless build_uninst.uninst_subtext_id=0; - build_uninst.common.intro_text_id=0; + build_uninst.common.intro_text_id=0;*/ build_uninst.common.lb_bg=RGB(0,0,0); build_uninst.common.lb_fg=RGB(0,255,0); build_uninst.common.num_entries=0; diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 1ce419dc..682faa15 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -107,6 +107,9 @@ static BOOL NSISCALL SetDlgItemTextFromLang(HWND dlg, WORD id, langid_t lid) { return SetDlgItemText(dlg,id,STR(GetLangString(lid))); } +/* +Useless functions + static BOOL NSISCALL SetUITextFromLang(HWND defhw, WORD def, WORD custom, langid_t lid) { return SetDlgItemTextFromLang(custom?g_hwnd:defhw,(WORD)(custom?custom:def),lid); } @@ -122,7 +125,12 @@ static UINT NSISCALL GetUIText(WORD def, WORD custom, char *str, int max_size) { static HWND NSISCALL GetUIItem(HWND defhw, WORD def, WORD custom) { return GetDlgItem(custom?g_hwnd:defhw,custom?custom:def); -} +}*/ + +#define SetUITextFromLang(hw,it,a,la) SetDlgItemTextFromLang(hw,it,la) +#define SetUITextNT(hw,it,a,text) SetDlgItemText(hw,it,text) +#define GetUIText(it,a,s,ss) GetDlgItemText(hwndDlg,it,s,ss) +#define GetUIItem(hw,it,a) GetDlgItem(hw,it) #define HandleStaticBkColor() _HandleStaticBkColor(uMsg, wParam, lParam) static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -735,7 +743,7 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar bi.pszDisplayName = name; bi.lpfn=BrowseCallbackProc; bi.lParam=(LPARAM)hwndDlg; - bi.lpszTitle = str; + bi.lpszTitle=str; #ifndef BIF_NEWDIALOGSTYLE #define BIF_NEWDIALOGSTYLE 0x0040 #endif @@ -833,27 +841,36 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar #ifdef NSIS_CONFIG_COMPONENTPAGE +TVHITTESTINFO NSISCALL hit_test(HWND tree) +{ + TVHITTESTINFO ht = {0}; + DWORD dwpos = GetMessagePos(); + + ht.pt.x = GET_X_LPARAM(dwpos); + ht.pt.y = GET_Y_LPARAM(dwpos); + MapWindowPoints(HWND_DESKTOP, tree, &ht.pt, 1); + + TreeView_HitTest(tree, &ht); + + return ht; +} + static LONG oldTreeWndProc; static DWORD WINAPI newTreeWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + static LPARAM last_item=-1; if (uMsg == WM_KEYDOWN && wParam == VK_SPACE) { SendMessage(GetParent(hwnd),WM_TREEVIEW_KEYHACK,0,0); return 0; } + if (uMsg == WM_DESTROY) { + last_item=-1; + } if (uMsg == WM_MOUSEMOVE) { - TVHITTESTINFO ht = {0}; - DWORD dwpos = GetMessagePos(); - - ht.pt.x = GET_X_LPARAM(dwpos); - ht.pt.y = GET_Y_LPARAM(dwpos); - MapWindowPoints(HWND_DESKTOP, hwnd, &ht.pt, 1); - - TreeView_HitTest(hwnd, &ht); - + TVHITTESTINFO ht = hit_test(hwnd); if (ht.flags & (TVHT_ONITEMSTATEICON|TVHT_ONITEMLABEL|TVHT_ONITEMRIGHT|TVHT_ONITEM)) { - static LPARAM last_item; TVITEM hItem; hItem.hItem = ht.hItem; @@ -1041,13 +1058,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar TVHITTESTINFO ht = {0}; if (uMsg != WM_TREEVIEW_KEYHACK) { - DWORD dwpos = GetMessagePos(); - - ht.pt.x = GET_X_LPARAM(dwpos); - ht.pt.y = GET_Y_LPARAM(dwpos); - MapWindowPoints(HWND_DESKTOP, hwndTree1, &ht.pt, 1); - - TreeView_HitTest(hwndTree1, &ht); + ht=hit_test(hwndTree1); } else { diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h index 911844c2..c9b7f74a 100644 --- a/Source/exehead/fileform.h +++ b/Source/exehead/fileform.h @@ -262,7 +262,8 @@ typedef struct // Added by Amir Szekely 6th August 2002 // Adds the ability to make the inner text show up in a dialog item in the outer dialog. - WORD intro_text_id; + /* Useless + WORD intro_text_id;*/ } common_header; @@ -332,11 +333,14 @@ typedef struct // Added by Amir Szekely 6th August 2002 // Adds the ability to make the inner text show up in a dialog item in the outer dialog. + /* + Useless + WORD space_avail_id; WORD space_req_id; WORD dir_subtext_id; WORD com_subtext1_id; - WORD com_subtext2_id; + WORD com_subtext2_id;*/ } header; @@ -360,7 +364,8 @@ typedef struct // Added by Amir Szekely 6th August 2002 // Adds the ability to make the inner text show up in a dialog item in the outer dialog. - WORD uninst_subtext_id; + /* Useless + WORD uninst_subtext_id;*/ } uninstall_header; diff --git a/Source/script.cpp b/Source/script.cpp index 4517f803..8afb386c 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -1153,7 +1153,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char return PS_ERROR; } return make_sure_not_in_secorfunc(line.gettoken_str(0)); - case TOK_USEOUTERUIITEM: + /* + Useless + + case TOK_USEOUTERUIITEM: { int k = line.gettoken_enum(1,"introtext\0spaceavail\0spacereq\0dirsubtext\0comsubtext1\0comsubtext2\0uninstsubtext\0"); if (k < 0) PRINTHELP(); @@ -1187,10 +1190,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char } SCRIPT_MSG("%s: %s now uses outer UI item %d\n",line.gettoken_str(0),line.gettoken_str(1),id); } - return make_sure_not_in_secorfunc(line.gettoken_str(0)); + return make_sure_not_in_secorfunc(line.gettoken_str(0));*/ #else case TOK_CHANGEUI: - case TOK_USEOUTERUIITEM: + //case TOK_USEOUTERUIITEM: ERROR_MSG("Error: %s specified, NSIS_CONFIG_VISIBLE_SUPPORT not defined.\n",line.gettoken_str(0)); return PS_ERROR; #endif// NSIS_CONFIG_VISIBLE_SUPPORT diff --git a/Source/tokens.cpp b/Source/tokens.cpp index b1b242c6..43f110d7 100644 --- a/Source/tokens.cpp +++ b/Source/tokens.cpp @@ -156,7 +156,7 @@ static tokenType tokenlist[TOK__LAST] = {TOK_UNINSTCAPTION,"UninstallCaption",1,1,"[/LANG=lang_id] uninstaller_caption"}, {TOK_UNINSTSUBCAPTION,"UninstallSubCaption",2,1,"[/LANG=lang_id] page_number(0-2) new_subcaption"}, {TOK_UNREGDLL,"UnRegDLL",1,0,"dll_path_on_target.dll"}, -{TOK_USEOUTERUIITEM,"UseOuterUIItem",2,0,"item id"}, +// useless - {TOK_USEOUTERUIITEM,"UseOuterUIItem",2,0,"item id"}, {TOK_WINDOWICON,"WindowIcon",1,0,"on|off"}, {TOK_WRITEINISTR,"WriteINIStr",4,0,"ini_file section_name entry_name new_value"}, {TOK_WRITEREGBIN,"WriteRegBin",4,0,"rootkey subkey entry_name hex_string_like_12848412AB\n root_key=(HKCR|HKLM|HKCU|HKU|HKCC|HKDD|HKPD)"}, diff --git a/Source/tokens.h b/Source/tokens.h index a449b96f..fa35df9a 100644 --- a/Source/tokens.h +++ b/Source/tokens.h @@ -40,7 +40,7 @@ enum TOK_INSTPROGRESSFLAGS, TOK_XPSTYLE, TOK_CHANGEUI, - TOK_USEOUTERUIITEM, + // useless - TOK_USEOUTERUIITEM, TOK_ADDBRANDINGIMAGE, TOK_SETFONT, TOK_SETCOMPRESSOR,