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

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

View file

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

View file

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