[gadamopoulos] 50386: Revert 50381 and 50382. Altough it reduces number of reboots in the test server, it somehow reveals a registry corruption and cripples completely automated testing
Author: gadamopoulos Date: Fri Jan 14 23:20:26 2011 New Revision: 50386
URL: http://svn.reactos.org/svn/reactos?rev=50386&view=rev Log: Revert 50381 and 50382. Altough it reduces number of reboots in the test server, it somehow reveals a registry corruption and cripples completely automated testing
Removed: trunk/rostests/rosautotest/CDialogSurpass.cpp trunk/rostests/rosautotest/CDialogSurpass.h Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/rosautotest.rbuild
Removed: trunk/rostests/rosautotest/CDialogSurpass.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CDialogSurpass... ============================================================================== --- trunk/rostests/rosautotest/CDialogSurpass.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CDialogSurpass.cpp (removed) @@ -1,97 +1,0 @@ -/* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class for managing all the configuration parameters - * COPYRIGHT: Copyright 2011 - */ - -#include "precomp.h" - -BOOL CALLBACK PrintWindow(HWND hwnd, LPARAM lParam) -{ - CHAR WindowTitle[100]; - int lenght; - - lenght = GetWindowTextA(hwnd, WindowTitle, 100); - if(lenght == 0) - return TRUE; - - StringOut( string(WindowTitle) + "\n" ); - - return TRUE; -} - - -void CALLBACK WinEventProc(HWINEVENTHOOK hWinEventHook, - DWORD event, - HWND hwnd, - LONG idObject, - LONG idChild, - DWORD dwEventThread, - DWORD dwmsEventTime) -{ - /* make sure we got the correct event */ - if(event == EVENT_SYSTEM_DIALOGSTART) - { - /* wait for some time to make sure that the dialog is hung */ - Sleep(30 * 1000); - - /* Check if it is still open */ - if(IsWindow(hwnd)) - { - /* Print an error message */ - StringOut("Closing following dialog box:\n"); - PrintWindow(hwnd, NULL); - EnumChildWindows(hwnd, PrintWindow, NULL); - - /* Close the dialog */ - SendMessage(hwnd, WM_CLOSE, 0, 0); - } - } -} - - -DWORD WINAPI DialogSurpassThread(LPVOID lpThreadParameter) -{ - MSG dummy; - - /* Install event notifications */ - SetWinEventHook(EVENT_SYSTEM_DIALOGSTART, - EVENT_SYSTEM_DIALOGSTART, - NULL, - WinEventProc, - 0, - 0, - WINEVENT_OUTOFCONTEXT); - - while(GetMessage(&dummy, 0,0,0)) - { - /* There is no need to dispatch messages here */ - /* Actually this block will never be executed */ - } - - return 0; -} - -CDialogSurpass::CDialogSurpass() -{ - /* Creat the trhead that will receive notifications */ - hThread = CreateThread(NULL, - 0, - DialogSurpassThread, - NULL, - 0, - &ThreadID); -} - -CDialogSurpass::~CDialogSurpass() -{ - /* Notify the thread to close */ - PostThreadMessage(ThreadID, WM_QUIT, 0, 0); - - /* Wait for it close */ - WaitForSingleObject(hThread, INFINITE); - - /* Now close its handle*/ - CloseHandle(hThread); -}
Removed: trunk/rostests/rosautotest/CDialogSurpass.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CDialogSurpass... ============================================================================== --- trunk/rostests/rosautotest/CDialogSurpass.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CDialogSurpass.h (removed) @@ -1,17 +1,0 @@ -/* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class for managing all the configuration parameters - * COPYRIGHT: Copyright 2011 - */ - -class CDialogSurpass -{ -private: - - DWORD ThreadID; - HANDLE hThread; -public: - CDialogSurpass(); - ~CDialogSurpass(); -};
Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.txt... ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -4,7 +4,6 @@
list(APPEND SOURCE CConfiguration.cpp - CDialogSurpass.cpp CFatalException.cpp CInvalidParameterException.cpp CJournaledTestList.cpp
Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=5... ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -48,7 +48,6 @@ { CWineTest WineTest; int ReturnValue = 1; - CDialogSurpass s;
try {
Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev=... ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -20,7 +20,6 @@ /* Class includes */ #include "auto_array_ptr.h" #include "CConfiguration.h" -#include "CDialogSurpass.h" #include "CFatalException.h" #include "CInvalidParameterException.h" #include "CProcess.h"
Modified: trunk/rostests/rosautotest/rosautotest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/rosautotest.rb... ============================================================================== --- trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] (original) +++ trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] Fri Jan 14 23:20:26 2011 @@ -8,7 +8,6 @@ <library>user32</library> <library>wininet</library> <file>CConfiguration.cpp</file> - <file>CDialogSurpass.cpp</file> <file>CFatalException.cpp</file> <file>CInvalidParameterException.cpp</file> <file>CJournaledTestList.cpp</file>
-
gadamopoulos＠svn.reactos.org