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

LockWindow Off should always enable painting

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6789 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2016-10-11 19:47:21 +00:00
parent 0bb94c1591
commit 08ebc678e5
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/exehead/Ui.c
View file

@ -637,7 +637,7 @@ skipPage:
if (!ui_dlg_visible && m_curwnd) if (!ui_dlg_visible && m_curwnd)
{ {
ShowWindow(hwndDlg, SW_SHOWDEFAULT); ShowWindow(hwndDlg, SW_SHOWDEFAULT); // BUGBUG: Why is this here, it does not seem to be required?
ui_dlg_visible = 1; ui_dlg_visible = 1;
} }

8
Source/exehead/exec.c
View file

@ -1702,10 +1702,10 @@ static int NSISCALL ExecuteEntry(entry *entry_)
#ifdef NSIS_LOCKWINDOW_SUPPORT #ifdef NSIS_LOCKWINDOW_SUPPORT
case EW_LOCKWINDOW: case EW_LOCKWINDOW:
{ {
// ui_dlg_visible is 1 or 0, so is parm0 // Not using ui_dlg_visible because it is not always in sync and we don't want to risk not painting.
SendMessage(g_hwnd, WM_SETREDRAW, parm0 & ui_dlg_visible, 0); // See http://forums.winamp.com/showthread.php?t=397781 for details.
if ( parm0 ) SendMessage(g_hwnd, WM_SETREDRAW, parm0, 0);
InvalidateRect(g_hwnd, NULL, FALSE); if (parm0) InvalidateRect(g_hwnd, NULL, FALSE);
break; break;
} }
#endif //NSIS_LOCKWINDOW_SUPPORT #endif //NSIS_LOCKWINDOW_SUPPORT

5
Source/script.cpp
View file

@ -6297,9 +6297,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
case TOK_PLUGINDIR: case TOK_PLUGINDIR:
case TOK__PLUGINCOMMAND: case TOK__PLUGINCOMMAND:
case TOK_INITPLUGINSDIR: case TOK_INITPLUGINSDIR:
{
ERROR_MSG(_T("Error: %") NPRIs _T(" specified, NSIS_CONFIG_PLUGIN_SUPPORT not defined.\n"),line.gettoken_str(0)); ERROR_MSG(_T("Error: %") NPRIs _T(" specified, NSIS_CONFIG_PLUGIN_SUPPORT not defined.\n"),line.gettoken_str(0));
}
return PS_ERROR; return PS_ERROR;
#endif// NSIS_CONFIG_PLUGIN_SUPPORT #endif// NSIS_CONFIG_PLUGIN_SUPPORT
@ -6308,8 +6306,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
SCRIPT_MSG(_T("LockWindow: lock state=%d\n"),line.gettoken_str(1)); SCRIPT_MSG(_T("LockWindow: lock state=%d\n"),line.gettoken_str(1));
ent.which=EW_LOCKWINDOW; ent.which=EW_LOCKWINDOW;
ent.offsets[0]=line.gettoken_enum(1,_T("on\0off\0")); ent.offsets[0]=line.gettoken_enum(1,_T("on\0off\0"));
if (ent.offsets[0] == -1) if (ent.offsets[0] == -1) PRINTHELP();
PRINTHELP();
return add_entry(&ent); return add_entry(&ent);
#else #else
case TOK_LOCKWINDOW: case TOK_LOCKWINDOW: