From 130074428eb03028df4c1eb55a75a196f4ac6e46 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 1 Feb 2009 12:32:34 +0000
Subject: [PATCH] revert r5314 - if the banner plug-in shows IDD_VERIFY in its
 own thread and that thread sets it as the foreground window because of the
 WS_VISIBLE style, the main thread loses the ability to set the foreground
 window. this causes the installer window to start on the background if banner
 is used in .oninit.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5915 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/UIs/default.rc       | 2 +-
 Contrib/UIs/modern.rc        | 2 +-
 Contrib/UIs/sdbarker_tiny.rc | 2 +-
 Source/exehead/fileform.c    | 1 +
 Source/exehead/resource.rc   | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Contrib/UIs/default.rc b/Contrib/UIs/default.rc
index 7e3f34f4..37cf5a25 100644
--- a/Contrib/UIs/default.rc
+++ b/Contrib/UIs/default.rc
@@ -113,7 +113,7 @@ BEGIN
 END
 
 IDD_VERIFY DIALOGEX 0, 0, 162, 22
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CTEXT           "",IDC_STR,7,7,148,8
diff --git a/Contrib/UIs/modern.rc b/Contrib/UIs/modern.rc
index 82b3d8aa..33a9df10 100644
--- a/Contrib/UIs/modern.rc
+++ b/Contrib/UIs/modern.rc
@@ -120,7 +120,7 @@ BEGIN
 END
 
 IDD_VERIFY DIALOGEX 0, 0, 167, 42
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CTEXT           "",IDC_STR,40,25,120,10,NOT WS_GROUP
diff --git a/Contrib/UIs/sdbarker_tiny.rc b/Contrib/UIs/sdbarker_tiny.rc
index d870b21a..9952e716 100644
--- a/Contrib/UIs/sdbarker_tiny.rc
+++ b/Contrib/UIs/sdbarker_tiny.rc
@@ -112,7 +112,7 @@ BEGIN
 END
 
 IDD_VERIFY DIALOGEX 0, 0, 162, 22
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CTEXT           "",IDC_STR,7,7,148,8,NOT WS_GROUP
diff --git a/Source/exehead/fileform.c b/Source/exehead/fileform.c
index 470f46dc..cd080d2a 100644
--- a/Source/exehead/fileform.c
+++ b/Source/exehead/fileform.c
@@ -144,6 +144,7 @@ void handle_ver_dlg(BOOL kill)
         0,
         verProc
       );
+      ShowWindow(hwnd, SW_SHOW);
     }
   }
 }
diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc
index 245927ef..920cb507 100644
--- a/Source/exehead/resource.rc
+++ b/Source/exehead/resource.rc
@@ -189,7 +189,7 @@ IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOGEX 0, 0, 162, 22
 #else
 IDD_VERIFY DIALOGEX 0, 0, 162, 22
 #endif
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CTEXT           "",IDC_STR,7,7,148,8