Revert incorrect fix committed in r34077 by cfinck, and replace it by a better one.
authorHervé Poussineau <hpoussin@reactos.org>
Fri, 25 Jul 2008 18:45:54 +0000 (18:45 +0000)
committerHervé Poussineau <hpoussin@reactos.org>
Fri, 25 Jul 2008 18:45:54 +0000 (18:45 +0000)
svn path=/trunk/; revision=34788

reactos/dll/win32/msgina/gui.c
reactos/dll/win32/msgina/msgina.h

index 1a6e256..a617b6f 100644 (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;
index 19a2d2a..c6207fa 100644 (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 */