Mike McCormack : msi: Show "hidden dialogs" but hide them initially.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Mar 22 04:56:21 CST 2006


Module: wine
Branch: refs/heads/master
Commit: 06c84c4a42092a009dbab444e19ec94aa67d5536
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=06c84c4a42092a009dbab444e19ec94aa67d5536

Author: Mike McCormack <mike at codeweavers.com>
Date:   Wed Mar 22 14:06:30 2006 +0900

msi: Show "hidden dialogs" but hide them initially.

---

 dlls/msi/dialog.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c
index 69909a7..ffbd6b8 100644
--- a/dlls/msi/dialog.c
+++ b/dlls/msi/dialog.c
@@ -1931,7 +1931,6 @@ static LRESULT msi_dialog_oncreate( HWND
     SetWindowPos( hwnd, 0, 0, 0, size.cx, size.cy,
                   SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOREDRAW );
 
-
     msi_dialog_build_font_list( dialog );
     msi_dialog_fill_controls( dialog );
     msi_dialog_evaluate_control_conditions( dialog );
@@ -2351,16 +2350,18 @@ void msi_dialog_check_messages( HANDLE h
 
 UINT msi_dialog_run_message_loop( msi_dialog *dialog )
 {
+    DWORD style;
     HWND hwnd;
 
-    if( !(dialog->attributes & msidbDialogAttributesVisible) )
-        return ERROR_SUCCESS;
-
     if( uiThreadId != GetCurrentThreadId() )
         return SendMessageW( hMsiHiddenWindow, WM_MSI_DIALOG_CREATE, 0, (LPARAM) dialog );
 
     /* create the dialog window, don't show it yet */
-    hwnd = CreateWindowW( szMsiDialogClass, dialog->name, WS_OVERLAPPEDWINDOW,
+    style = WS_OVERLAPPED;
+    if( dialog->attributes & msidbDialogAttributesVisible )
+        style |= WS_VISIBLE;
+
+    hwnd = CreateWindowW( szMsiDialogClass, dialog->name, style,
                      CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
                      NULL, NULL, NULL, dialog );
     if( !hwnd )




More information about the wine-cvs mailing list