Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 02:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert incorrect fix committed in r34077 by cfinck, and replace it by a better one.

Browse source 
svn path=/trunk/; revision=34788
This commit is contained in:
Hervé Poussineau 2008-07-25 18:45:54 +00:00
parent 7cf8ccf54f
commit d62f18210a
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/win32/msgina/gui.c
View file

@ -51,11 +51,7 @@ StatusMessageWindowProc(
if (msg->pTitle) if (msg->pTitle)
SetWindowTextW(hwndDlg, msg->pTitle); SetWindowTextW(hwndDlg, msg->pTitle);
SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, msg->pMessage); SetDlgItemTextW(hwndDlg, IDC_STATUSLABEL, msg->pMessage);
if (!msg->Context->SignaledStatusWindowCreated) SetEvent(msg->StartupEvent);
{
msg->Context->SignaledStatusWindowCreated = TRUE;
SetEvent(msg->StartupEvent);
}
return TRUE; return TRUE;
} }
} }
@ -140,7 +136,7 @@ GUIDisplayStatusMessage(
return FALSE; return FALSE;
} }
if(pTitle) if (pTitle)
SetWindowTextW(pgContext->hStatusWindow, pTitle); SetWindowTextW(pgContext->hStatusWindow, pTitle);
SetDlgItemTextW(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage); SetDlgItemTextW(pgContext->hStatusWindow, IDC_STATUSLABEL, pMessage);
@ -155,8 +151,7 @@ GUIRemoveStatusMessage(
if (pgContext->hStatusWindow) if (pgContext->hStatusWindow)
{ {
EndDialog(pgContext->hStatusWindow, 0); EndDialog(pgContext->hStatusWindow, 0);
pgContext->hStatusWindow = 0; pgContext->hStatusWindow = NULL;
pgContext->SignaledStatusWindowCreated = FALSE;
} }
return TRUE; return TRUE;

1
reactos/dll/win32/msgina/msgina.h
View file

@ -18,7 +18,6 @@ typedef struct
PWLX_DISPATCH_VERSION_1_3 pWlxFuncs; PWLX_DISPATCH_VERSION_1_3 pWlxFuncs;
HANDLE hDllInstance; HANDLE hDllInstance;
HWND hStatusWindow; HWND hStatusWindow;
BOOL SignaledStatusWindowCreated;
DWORD AutoLogonState; DWORD AutoLogonState;
/* Informations to be filled during logon */ /* Informations to be filled during logon */