diff --git a/Source/exehead/Main.c b/Source/exehead/Main.c index d08f7b88..d35858d4 100644 --- a/Source/exehead/Main.c +++ b/Source/exehead/Main.c @@ -79,7 +79,7 @@ BOOL CALLBACK verProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) wsprintf(bt,msg,MulDiv(m_pos,100,m_length)); SetWindowText(hwndDlg,bt); - SetDlgItemText(hwndDlg,IDC_STR,bt); + my_SetDialogItemText(hwndDlg,IDC_STR,bt); } return 0; } diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c index 08cb62d1..64bc5ded 100644 --- a/Source/exehead/Ui.c +++ b/Source/exehead/Ui.c @@ -115,7 +115,7 @@ static HWND m_curwnd, m_bgwnd; static int m_whichcfg; static BOOL NSISCALL SetDlgItemTextFromLang(HWND dlg, WORD id, langid_t lid) { - return SetDlgItemText(dlg,id,STR(GetLangString(lid))); + return my_SetDialogItemText(dlg,id,STR(GetLangString(lid))); } /* @@ -127,7 +127,7 @@ static BOOL NSISCALL SetUITextFromLang(HWND defhw, WORD def, WORD custom, langid // no tab static BOOL NSISCALL SetUITextNT(HWND defhw, WORD def, WORD custom, const char *text) { - return SetDlgItemText(custom?g_hwnd:defhw,custom?custom:def,text); + return my_SetDialogItemText(custom?g_hwnd:defhw,custom?custom:def,text); } static UINT NSISCALL GetUIText(WORD def, WORD custom, char *str, int max_size) { @@ -139,7 +139,7 @@ static HWND NSISCALL GetUIItem(HWND defhw, WORD def, WORD custom) { }*/ #define SetUITextFromLang(hw,it,a,la) SetDlgItemTextFromLang(hw,it,la) -#define SetUITextNT(hw,it,a,text) SetDlgItemText(hw,it,text) +#define SetUITextNT(hw,it,a,text) my_SetDialogItemText(hw,it,text) #define GetUIText(it,a,s,ss) GetDlgItemText(hwndDlg,it,s,ss) #define GetUIItem(hw,it,a) GetDlgItem(hw,it) @@ -749,7 +749,7 @@ static BOOL CALLBACK UninstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l { SetUITextFromLang(hwndDlg,IDC_INTROTEXT,g_inst_header->common.intro_text_id,LANGID_UNINST_TEXT); SetUITextFromLang(hwndDlg,IDC_UNINSTFROM,g_inst_uninstheader->uninst_subtext_id,LANGID_UNINST_SUBTEXT); - SetDlgItemText(hwndDlg,IDC_EDIT1,state_install_directory); + my_SetDialogItemText(hwndDlg,IDC_EDIT1,state_install_directory); } return HandleStaticBkColor(); } @@ -787,7 +787,7 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar ShowWindow(h,SW_SHOWNA); } #endif - SetDlgItemText(hwndDlg,IDC_DIR,state_install_directory); + my_SetDialogItemText(hwndDlg,IDC_DIR,state_install_directory); SetUITextFromLang(hwndDlg,IDC_INTROTEXT,g_inst_header->common.intro_text_id,LANGID_DIR_TEXT); SetDlgItemTextFromLang(hwndDlg,IDC_BROWSE,LANGID_BTN_BROWSE); SetUITextFromLang(hwndDlg,IDC_SELDIRTEXT,g_inst_header->dir_subtext_id,LANGID_DIR_SUBTEXT); @@ -843,7 +843,7 @@ static BOOL CALLBACK DirProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar } } - SetDlgItemText(hwndDlg,IDC_DIR,name); + my_SetDialogItemText(hwndDlg,IDC_DIR,name); } } } diff --git a/Source/exehead/util.c b/Source/exehead/util.c index 0293e935..696925ad 100644 --- a/Source/exehead/util.c +++ b/Source/exehead/util.c @@ -36,6 +36,11 @@ HANDLE NSISCALL myCreateProcess(char *cmd, char *dir) return ProcInfo.hProcess; } +BOOL NSISCALL my_SetDialogItemText(HWND dlg, UINT idx, const char *val) +{ + return SetDlgItemText(dlg,idx,val); +} + int NSISCALL my_MessageBox(const char *text, UINT type) { return MessageBox(g_hwnd, text, g_caption, type); } diff --git a/Source/exehead/util.h b/Source/exehead/util.h index 689fda3e..0b1141fc 100644 --- a/Source/exehead/util.h +++ b/Source/exehead/util.h @@ -13,6 +13,8 @@ int NSISCALL myatoi(char *s); void NSISCALL myitoa(char *s, int d); char * NSISCALL mystrcpy(char *out, const char *in); int NSISCALL mystrlen(const char *in); +BOOL NSISCALL my_SetDialogItemText(HWND dlg, UINT idx, const char *val); + #ifdef NSIS_CONFIG_LOG extern char log_text[NSIS_MAX_STRLEN*4];