Fabian Maurer : msi: In dialogs show titlebar buttons.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 82b6b61360c2399a245cce9b72d599228fd897cd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=82b6b61360c2399a245cce9b72d599228fd897cd

Author: Fabian Maurer <dark.shadow4 at web.de>
Date:   Sat Nov  3 18:05:28 2018 +0100

msi: In dialogs show titlebar buttons.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46080
Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 84e6b331918d57f39e20a3063b67eb7fc0876288)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/msi/dialog.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index abecde1..304a3e9 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -3798,6 +3798,10 @@ static LRESULT WINAPI MSIDialog_WndProc( HWND hwnd, UINT msg,
     case WM_COMMAND:
         return msi_dialog_oncommand( dialog, wParam, (HWND)lParam );
 
+    case WM_CLOSE:
+        /* Simulate escape press */
+        return msi_dialog_oncommand(dialog, 2, NULL);
+
     case WM_ACTIVATE:
         if( LOWORD(wParam) == WA_INACTIVE )
             dialog->hWndFocus = GetFocus();
@@ -3843,10 +3847,13 @@ static UINT dialog_run_message_loop( msi_dialog *dialog )
         return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog );
 
     /* create the dialog window, don't show it yet */
-    style = WS_OVERLAPPED;
+    style = WS_OVERLAPPED | WS_SYSMENU;
     if( dialog->attributes & msidbDialogAttributesVisible )
         style |= WS_VISIBLE;
 
+    if (dialog->parent == NULL && (dialog->attributes & msidbDialogAttributesMinimize))
+        style |= WS_MINIMIZEBOX;
+
     hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style,
                      CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
                      NULL, NULL, NULL, dialog );