From 06c84c4a42092a009dbab444e19ec94aa67d5536 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Wed, 22 Mar 2006 14:06:30 +0900 Subject: [PATCH] msi: Show "hidden dialogs" but hide them initially. --- dlls/msi/dialog.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 69909a753c3..ffbd6b8403f 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1931,7 +1931,6 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) 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 handle ) 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 )