Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[hbelusca] 66507: [HELP]: Fix console output for languages using non-latin characters. Patch by Vort. CORE-7409 #resolve #comment Fixed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 28 23:50:01 2015 New Revision: 66507 URL: http://svn.reactos.org/svn/reactos?rev=66507&view=rev Log: [HELP]: Fix console output for languages using non-latin characters. Patch by Vort. CORE-7409 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/applications/cmdutils/help/help.c Modified: trunk/reactos/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/help/help.c [iso-8859-1] Sat Feb 28 23:50:01 2015 @@ -21,50 +21,21 @@ #include "help.h" #include "resource.h" -BOOL IsConsoleHandle(HANDLE hHandle) -{ - DWORD dwMode; - - /* Check whether the handle may be that of a console... */ - if ((GetFileType(hHandle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR) - return FALSE; - - /* - * It may be. Perform another test... The idea comes from the - * MSDN description of the WriteConsole API: - * - * "WriteConsole fails if it is used with a standard handle - * that is redirected to a file. If an application processes - * multilingual output that can be redirected, determine whether - * the output handle is a console handle (one method is to call - * the GetConsoleMode function and check whether it succeeds). - * If the handle is a console handle, call WriteConsole. If the - * handle is not a console handle, the output is redirected and - * you should call WriteFile to perform the I/O." - */ - return GetConsoleMode(hHandle, &dwMode); -} - VOID PrintResourceString(INT resID, ...) { - HANDLE OutputHandle = GetStdHandle(STD_OUTPUT_HANDLE); - WCHAR tmpBuffer[RC_STRING_MAX_SIZE]; - va_list arg_ptr; + WCHAR bufSrc[RC_STRING_MAX_SIZE]; + WCHAR bufFormatted[RC_STRING_MAX_SIZE]; + CHAR bufFormattedOem[RC_STRING_MAX_SIZE]; - va_start(arg_ptr, resID); - LoadStringW(GetModuleHandleW(NULL), resID, tmpBuffer, RC_STRING_MAX_SIZE); + va_list args; + va_start(args, resID); - // FIXME: Optimize by using Win32 console functions. - if (IsConsoleHandle(OutputHandle)) - { - vfwprintf(stdout, tmpBuffer, arg_ptr); - } - else - { - vwprintf(tmpBuffer, arg_ptr); - } + LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, RC_STRING_MAX_SIZE); + vswprintf(bufFormatted, bufSrc, args); + CharToOemW(bufFormatted, bufFormattedOem); + fputs(bufFormattedOem, stdout); - va_end(arg_ptr); + va_end(args); } BOOL IsInternalCommand(LPCWSTR Cmd) @@ -75,7 +46,7 @@ /* Invalid command */ if (!Cmd) return FALSE; - for (i = 0; i < sizeof(InternalCommands)/sizeof(InternalCommands[0]); ++i) + for (i = 0; i < ARRAYSIZE(InternalCommands); ++i) { res = _wcsicmp(InternalCommands[i], Cmd); if (res == 0)

9 years, 9 months

[tfaber] 66506: [ROSAUTOTEST] - Disable error dialogs unless running in interactive mode ONLINE-441

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 28 21:29:44 2015 New Revision: 66506 URL: http://svn.reactos.org/svn/reactos?rev=66506&view=rev Log: [ROSAUTOTEST] - Disable error dialogs unless running in interactive mode ONLINE-441 Modified: trunk/rostests/rosautotest/CConfiguration.cpp trunk/rostests/rosautotest/CConfiguration.h trunk/rostests/rosautotest/CWineTest.cpp Modified: trunk/rostests/rosautotest/CConfiguration.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] Sat Feb 28 21:29:44 2015 @@ -17,17 +17,22 @@ */ CConfiguration::CConfiguration() : m_CrashRecovery(false), + m_IsInteractive(false), m_PrintToConsole(true), m_Shutdown(false), m_Submit(false) { WCHAR WindowsDirectory[MAX_PATH]; + WCHAR Interactive[32]; /* Check if we are running under ReactOS from the SystemRoot directory */ if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) FATAL("GetWindowsDirectoryW failed"); m_IsReactOS = !_wcsnicmp(&WindowsDirectory[3], L"reactos", 7); + + if(GetEnvironmentVariableW(L"WINETEST_INTERACTIVE", Interactive, _countof(Interactive))) + m_IsInteractive = _wtoi(Interactive); } /** Modified: trunk/rostests/rosautotest/CConfiguration.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] Sat Feb 28 21:29:44 2015 @@ -9,6 +9,7 @@ { private: bool m_CrashRecovery; + bool m_IsInteractive; bool m_IsReactOS; bool m_PrintToConsole; bool m_Shutdown; @@ -30,6 +31,7 @@ bool DoPrint() const { return m_PrintToConsole; } bool DoShutdown() const { return m_Shutdown; } bool DoSubmit() const { return m_Submit; } + bool IsInteractive() const { return m_IsInteractive; } bool IsReactOS() const { return m_IsReactOS; } const string& GetComment() const { return m_Comment; } const wstring& GetModule() const { return m_Module; } Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sat Feb 28 21:29:44 2015 @@ -248,9 +248,14 @@ } catch(CTestException& e) { + stringstream ss; + + ss << "An exception occurred trying to list tests for: " << UnicodeToAscii(m_CurrentFile) << endl; + StringOut(ss.str()); + StringOut(e.GetMessage()); + StringOut("\n"); + m_CurrentFile.clear(); delete[] m_ListBuffer; - StringOut(e.GetMessage()); - m_CurrentFile.clear(); } } @@ -327,6 +332,7 @@ auto_ptr<CTestList> TestList; auto_ptr<CWebService> WebService; CTestInfo* TestInfo; + DWORD ErrorMode; /* The virtual test list is of course faster, so it should be preferred over the journaled one. @@ -349,6 +355,10 @@ if(Configuration.DoSubmit()) WebService.reset(new CWebService()); + /* Disable error dialogs if we're running in non-interactive mode */ + if(!Configuration.IsInteractive()) + ErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); + /* Get information for each test to run */ while((TestInfo = TestList->GetNextTestInfo()) != 0) { @@ -361,4 +371,8 @@ StringOut("\n\n"); } -} + + /* Restore the original error mode */ + if(!Configuration.IsInteractive()) + SetErrorMode(ErrorMode); +}

9 years, 9 months

[spetreolle] 66505: [NTDLL/LDR] LdrpInitializeProcess: Don't use NtLdrEntry to initialize LdrpImageEntry. It is overwritten afterwards to initialize the real NtLdrEntry.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Feb 28 21:23:07 2015 New Revision: 66505 URL: http://svn.reactos.org/svn/reactos?rev=66505&view=rev Log: [NTDLL/LDR] LdrpInitializeProcess: Don't use NtLdrEntry to initialize LdrpImageEntry. It is overwritten afterwards to initialize the real NtLdrEntry. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Feb 28 21:23:07 2015 @@ -1846,24 +1846,24 @@ PebLdr.Initialized = TRUE; /* Allocate a data entry for the Image */ - LdrpImageEntry = NtLdrEntry = LdrpAllocateDataTableEntry(Peb->ImageBaseAddress); + LdrpImageEntry = LdrpAllocateDataTableEntry(Peb->ImageBaseAddress); /* Set it up */ - NtLdrEntry->EntryPoint = LdrpFetchAddressOfEntryPoint(NtLdrEntry->DllBase); - NtLdrEntry->LoadCount = -1; - NtLdrEntry->EntryPointActivationContext = 0; - NtLdrEntry->FullDllName = ImageFileName; + LdrpImageEntry->EntryPoint = LdrpFetchAddressOfEntryPoint(LdrpImageEntry->DllBase); + LdrpImageEntry->LoadCount = -1; + LdrpImageEntry->EntryPointActivationContext = 0; + LdrpImageEntry->FullDllName = ImageFileName; if (IsDotNetImage) - NtLdrEntry->Flags = LDRP_COR_IMAGE; + LdrpImageEntry->Flags = LDRP_COR_IMAGE; else - NtLdrEntry->Flags = 0; + LdrpImageEntry->Flags = 0; /* Check if the name is empty */ if (!ImageFileName.Buffer[0]) { /* Use the same Base name */ - NtLdrEntry->BaseDllName = NtLdrEntry->FullDllName; + LdrpImageEntry->BaseDllName = LdrpImageEntry->FullDllName; } else { @@ -1882,21 +1882,21 @@ if (!NtDllName) { /* Use the same Base name */ - NtLdrEntry->BaseDllName = NtLdrEntry->FullDllName; + LdrpImageEntry->BaseDllName = LdrpImageEntry->FullDllName; } else { /* Setup the name */ - NtLdrEntry->BaseDllName.Length = (USHORT)((ULONG_PTR)ImageFileName.Buffer + ImageFileName.Length - (ULONG_PTR)NtDllName); - NtLdrEntry->BaseDllName.MaximumLength = NtLdrEntry->BaseDllName.Length + sizeof(WCHAR); - NtLdrEntry->BaseDllName.Buffer = (PWSTR)((ULONG_PTR)ImageFileName.Buffer + - (ImageFileName.Length - NtLdrEntry->BaseDllName.Length)); + LdrpImageEntry->BaseDllName.Length = (USHORT)((ULONG_PTR)ImageFileName.Buffer + ImageFileName.Length - (ULONG_PTR)NtDllName); + LdrpImageEntry->BaseDllName.MaximumLength = LdrpImageEntry->BaseDllName.Length + sizeof(WCHAR); + LdrpImageEntry->BaseDllName.Buffer = (PWSTR)((ULONG_PTR)ImageFileName.Buffer + + (ImageFileName.Length - LdrpImageEntry->BaseDllName.Length)); } } /* Processing done, insert it */ - LdrpInsertMemoryTableEntry(NtLdrEntry); - NtLdrEntry->Flags |= LDRP_ENTRY_PROCESSED; + LdrpInsertMemoryTableEntry(LdrpImageEntry); + LdrpImageEntry->Flags |= LDRP_ENTRY_PROCESSED; /* Now add an entry for NTDLL */ NtLdrEntry = LdrpAllocateDataTableEntry(SystemArgument1);

9 years, 9 months

[tfaber] 66504: [ROSAUTOTEST] - Continue the testing process in case a test fails to execute ONLINE-441

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 28 21:12:25 2015 New Revision: 66504 URL: http://svn.reactos.org/svn/reactos?rev=66504&view=rev Log: [ROSAUTOTEST] - Continue the testing process in case a test fails to execute ONLINE-441 Added: trunk/rostests/rosautotest/CTestException.h (with props) Modified: trunk/rostests/rosautotest/CProcess.cpp trunk/rostests/rosautotest/CSimpleException.cpp trunk/rostests/rosautotest/CSimpleException.h trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/precomp.h Modified: trunk/rostests/rosautotest/CProcess.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CProcess.cpp?… ============================================================================== --- trunk/rostests/rosautotest/CProcess.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CProcess.cpp [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -23,7 +23,7 @@ wcscpy(CommandLinePtr, CommandLine.c_str()); if(!CreateProcessW(NULL, CommandLinePtr, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, NULL, NULL, StartupInfo, &m_ProcessInfo)) - FATAL("CreateProcessW failed\n"); + TESTEXCEPTION("CreateProcessW failed\n"); } /** Modified: trunk/rostests/rosautotest/CSimpleException.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CSimpleExcept… ============================================================================== --- trunk/rostests/rosautotest/CSimpleException.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CSimpleException.cpp [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -12,9 +12,9 @@ * You should always use the EXCEPTION or SSEXCEPTION macro for throwing this exception. * * @param Message - * Constant pointer to a char array containing a short message about the exception + * String containing a short message about the exception */ -CSimpleException::CSimpleException(const char* Message) +CSimpleException::CSimpleException(const string& Message) : m_Message(Message) { } Modified: trunk/rostests/rosautotest/CSimpleException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CSimpleExcept… ============================================================================== --- trunk/rostests/rosautotest/CSimpleException.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CSimpleException.h [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -11,7 +11,7 @@ string m_Message; public: - CSimpleException(const char* Message); + CSimpleException(const string& Message); const string& GetMessage() const { return m_Message; } }; Added: trunk/rostests/rosautotest/CTestException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTestExceptio… ============================================================================== --- trunk/rostests/rosautotest/CTestException.h (added) +++ trunk/rostests/rosautotest/CTestException.h [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -0,0 +1,12 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Simple exception during test execution that can be skipped over + * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + */ + +class CTestException : public CSimpleException +{ +public: + CTestException(const string& Message) : CSimpleException(Message) { } +}; Propchange: trunk/rostests/rosautotest/CTestException.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sat Feb 28 21:12:25 2015 @@ -121,12 +121,12 @@ /* Wait till this process ended */ if(WaitForSingleObject(Process.GetProcessHandle(), ListTimeout) == WAIT_FAILED) - FATAL("WaitForSingleObject failed for the test list\n"); + TESTEXCEPTION("WaitForSingleObject failed for the test list\n"); } /* Read the output data into a buffer */ if(!Pipe.Peek(NULL, 0, NULL, &BytesAvailable)) - FATAL("CPipe::Peek failed for the test list\n"); + TESTEXCEPTION("CPipe::Peek failed for the test list\n"); /* Check if we got any */ if(!BytesAvailable) @@ -134,14 +134,14 @@ stringstream ss; ss << "The --list command did not return any data for " << UnicodeToAscii(m_CurrentFile) << endl; - SSEXCEPTION; + TESTEXCEPTION(ss.str()); } /* Read the data */ m_ListBuffer = new char[BytesAvailable]; if(!Pipe.Read(m_ListBuffer, BytesAvailable, &Temp)) - FATAL("CPipe::Read failed\n"); + TESTEXCEPTION("CPipe::Read failed\n"); return BytesAvailable; } @@ -208,40 +208,49 @@ { while(!m_CurrentFile.empty() || GetNextFile()) { - while(GetNextTest()) - { - /* If the user specified a test through the command line, check this here */ - if(!Configuration.GetTest().empty() && Configuration.GetTest() != m_CurrentTest) - continue; - + try + { + while(GetNextTest()) { - auto_ptr<CTestInfo> TestInfo(new CTestInfo()); - size_t UnderscorePosition; - - /* Build the command line */ - TestInfo->CommandLine = m_TestPath; - TestInfo->CommandLine += m_CurrentFile; - TestInfo->CommandLine += ' '; - TestInfo->CommandLine += AsciiToUnicode(m_CurrentTest); - - /* Store the Module name */ - UnderscorePosition = m_CurrentFile.find_last_of('_'); - - if(UnderscorePosition == m_CurrentFile.npos) + /* If the user specified a test through the command line, check this here */ + if(!Configuration.GetTest().empty() && Configuration.GetTest() != m_CurrentTest) + continue; + { - stringstream ss; - - ss << "Invalid test file name: " << UnicodeToAscii(m_CurrentFile) << endl; - SSEXCEPTION; + auto_ptr<CTestInfo> TestInfo(new CTestInfo()); + size_t UnderscorePosition; + + /* Build the command line */ + TestInfo->CommandLine = m_TestPath; + TestInfo->CommandLine += m_CurrentFile; + TestInfo->CommandLine += ' '; + TestInfo->CommandLine += AsciiToUnicode(m_CurrentTest); + + /* Store the Module name */ + UnderscorePosition = m_CurrentFile.find_last_of('_'); + + if(UnderscorePosition == m_CurrentFile.npos) + { + stringstream ss; + + ss << "Invalid test file name: " << UnicodeToAscii(m_CurrentFile) << endl; + SSEXCEPTION; + } + + TestInfo->Module = UnicodeToAscii(m_CurrentFile.substr(0, UnderscorePosition)); + + /* Store the test */ + TestInfo->Test = m_CurrentTest; + + return TestInfo.release(); } - - TestInfo->Module = UnicodeToAscii(m_CurrentFile.substr(0, UnderscorePosition)); - - /* Store the test */ - TestInfo->Test = m_CurrentTest; - - return TestInfo.release(); } + } + catch(CTestException& e) + { + delete[] m_ListBuffer; + StringOut(e.GetMessage()); + m_CurrentFile.clear(); } } @@ -271,6 +280,7 @@ StartTime = GetTickCount(); + try { /* Execute the test */ CPipedProcess Process(TestInfo->CommandLine, Pipe); @@ -286,7 +296,15 @@ TestInfo->Log += Buffer; } if(GetLastError() != ERROR_BROKEN_PIPE) - FATAL("CPipe::Read failed for the test run\n"); + TESTEXCEPTION("CPipe::Read failed for the test run\n"); + } + catch(CTestException& e) + { + if(!tailString.empty()) + StringOut(tailString); + tailString.clear(); + StringOut(e.GetMessage()); + TestInfo->Log += e.GetMessage(); } /* Print what's left */ @@ -297,6 +315,7 @@ ssFinish << "Test " << TestInfo->Test << " completed in "; ssFinish << setprecision(2) << fixed << TotalTime << " seconds." << endl; StringOut(ssFinish.str()); + TestInfo->Log += ssFinish.str(); } /** 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] Sat Feb 28 21:12:25 2015 @@ -34,6 +34,7 @@ #include "CProcess.h" #include "CPipedProcess.h" #include "CSimpleException.h" +#include "CTestException.h" #include "CTestInfo.h" #include "CTest.h" #include "CTestList.h" @@ -45,9 +46,10 @@ #include <rosautotestmsg.h> /* Useful macros */ -#define EXCEPTION(Message) throw CSimpleException(Message) -#define FATAL(Message) throw CFatalException(__FILE__, __LINE__, Message) -#define SSEXCEPTION throw CSimpleException(ss.str().c_str()) +#define EXCEPTION(Message) throw CSimpleException(Message) +#define FATAL(Message) throw CFatalException(__FILE__, __LINE__, Message) +#define SSEXCEPTION throw CSimpleException(ss.str()) +#define TESTEXCEPTION(Message) throw CTestException(Message) /* main.c */ extern CConfiguration Configuration;

9 years, 9 months

[tfaber] 66503: [CPPRT] - Implement __CxxFrameHandler3 as a wrapper around __CxxFrameHandler that translates VC8-style function exception descriptions to VC7-style. This is necessary to make C++ ex...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 28 21:03:04 2015 New Revision: 66503 URL: http://svn.reactos.org/svn/reactos?rev=66503&view=rev Log: [CPPRT] - Implement __CxxFrameHandler3 as a wrapper around __CxxFrameHandler that translates VC8-style function exception descriptions to VC7-style. This is necessary to make C++ exceptions work on Windows Server 2003, because msvcrt!__CxxFrameHandler does not support VC8 descriptors there. CORE-9290 #resolve Added: trunk/reactos/lib/sdk/cpprt/i386/framehandler.c (with props) Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt trunk/reactos/lib/sdk/cpprt/i386/cpprt.s Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Sat Feb 28 21:03:04 2015 @@ -1,5 +1,7 @@ set_cpp(WITH_EXCEPTIONS) + +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) list(APPEND SOURCE ehvec.cpp @@ -7,6 +9,7 @@ if(ARCH STREQUAL "i386") add_asm_files(cpprt_asm i386/cpprt.s) + list(APPEND SOURCE i386/framehandler.c) elseif(ARCH STREQUAL "amd64") add_asm_files(cpprt_asm amd64/cpprt.s) endif() Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Sat Feb 28 21:03:04 2015 @@ -7,13 +7,27 @@ ALIAS <&alias> = <&orig> ENDM +EXTERN _CxxHandleV8Frame@20 : PROC +PUBLIC ___CxxFrameHandler3 +___CxxFrameHandler3: + push eax + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + push dword ptr [esp + 20] + call _CxxHandleV8Frame@20 + ret + +EXTERN ___CxxFrameHandler : PROC +PUBLIC _CallCxxFrameHandler +_CallCxxFrameHandler: + mov eax, dword ptr [esp + 20] + jmp ___CxxFrameHandler + ; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *)) DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z ; void __stdcall `eh vector destructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *)) DEFINE_ALIAS ??_M@YGXPAXIHP6EX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YGXPAXIHP6EX0@Z@Z -; These are the same -DEFINE_ALIAS ___CxxFrameHandler3, ___CxxFrameHandler - END Added: trunk/reactos/lib/sdk/cpprt/i386/framehandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/frameha… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/framehandler.c (added) +++ trunk/reactos/lib/sdk/cpprt/i386/framehandler.c [iso-8859-1] Sat Feb 28 21:03:04 2015 @@ -0,0 +1,46 @@ +/* + * PROJECT: ReactOS C++ runtime library + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: __CxxFrameHandler3 to __CxxFrameHandler wrapper + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <ndk/rtltypes.h> + +#define WINE_NO_TRACE_MSGS +#include <wine/debug.h> +#include <wine/exception.h> +#include <internal/wine/msvcrt.h> +#include <internal/wine/cppexcept.h> + +extern DWORD CDECL CallCxxFrameHandler(PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD *frame, + PCONTEXT context, EXCEPTION_REGISTRATION_RECORD **dispatch, + const cxx_function_descr *descr); + +DWORD +__stdcall +CxxHandleV8Frame( + _In_ PEXCEPTION_RECORD rec, + _In_ EXCEPTION_REGISTRATION_RECORD *frame, + _In_ PCONTEXT context, + _In_ EXCEPTION_REGISTRATION_RECORD **dispatch, + _In_ const cxx_function_descr *descr) +{ + cxx_function_descr stub_descr; + + if (descr->magic != CXX_FRAME_MAGIC_VC8) + return CallCxxFrameHandler(rec, frame, context, dispatch, descr); + + if ((descr->flags & FUNC_DESCR_SYNCHRONOUS) && + (rec->ExceptionCode != CXX_EXCEPTION)) + { + return ExceptionContinueSearch; /* handle only c++ exceptions */ + } + + stub_descr = *descr; + stub_descr.magic = CXX_FRAME_MAGIC_VC7; + return CallCxxFrameHandler(rec, frame, context, dispatch, &stub_descr); +} Propchange: trunk/reactos/lib/sdk/cpprt/i386/framehandler.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 9 months

[hbelusca] 66502: [MSTSC] Update MSTSC with latest (1.8.3) rdesktop version. Patch by 'hater', for more details see CORE-9013 #resolve #comment Committed, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 28 20:28:09 2015 New Revision: 66502 URL: http://svn.reactos.org/svn/reactos?rev=66502&view=rev Log: [MSTSC] Update MSTSC with latest (1.8.3) rdesktop version. Patch by 'hater', for more details see CORE-9013 #resolve #comment Committed, thanks! Added: trunk/reactos/base/applications/mstsc/asn.c (with props) Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt trunk/reactos/base/applications/mstsc/bitmap.c trunk/reactos/base/applications/mstsc/bsops.c trunk/reactos/base/applications/mstsc/cache.c trunk/reactos/base/applications/mstsc/channels.c trunk/reactos/base/applications/mstsc/constants.h trunk/reactos/base/applications/mstsc/iso.c trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/mcs.c trunk/reactos/base/applications/mstsc/mppc.c trunk/reactos/base/applications/mstsc/orders.c trunk/reactos/base/applications/mstsc/orders.h trunk/reactos/base/applications/mstsc/parse.h trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/proto.h trunk/reactos/base/applications/mstsc/pstcache.c trunk/reactos/base/applications/mstsc/rdesktop.h trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/rdp5.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/ssl_calls.c trunk/reactos/base/applications/mstsc/tcp.c trunk/reactos/base/applications/mstsc/types.h trunk/reactos/base/applications/mstsc/uimain.c trunk/reactos/base/applications/mstsc/win32.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mstsc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/CM… Added: trunk/reactos/base/applications/mstsc/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/as… Modified: trunk/reactos/base/applications/mstsc/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi… Modified: trunk/reactos/base/applications/mstsc/bsops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bs… Modified: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… Modified: trunk/reactos/base/applications/mstsc/channels.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ch… Modified: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Modified: trunk/reactos/base/applications/mstsc/iso.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/is… Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… Modified: trunk/reactos/base/applications/mstsc/mcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mc… Modified: trunk/reactos/base/applications/mstsc/mppc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/mp… Modified: trunk/reactos/base/applications/mstsc/orders.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… Modified: trunk/reactos/base/applications/mstsc/orders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/or… Modified: trunk/reactos/base/applications/mstsc/parse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pa… Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… Modified: trunk/reactos/base/applications/mstsc/proto.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… Modified: trunk/reactos/base/applications/mstsc/pstcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ps… Modified: trunk/reactos/base/applications/mstsc/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/rdp5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… Modified: trunk/reactos/base/applications/mstsc/ssl_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ss… Modified: trunk/reactos/base/applications/mstsc/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/tc… Modified: trunk/reactos/base/applications/mstsc/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ty… Modified: trunk/reactos/base/applications/mstsc/uimain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ui… Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi…

9 years, 9 months

[akhaldi] 66501: [XDK] Addendum to r66499.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 28 16:00:09 2015 New Revision: 66501 URL: http://svn.reactos.org/svn/reactos?rev=66501&view=rev Log: [XDK] Addendum to r66499. Modified: trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sat Feb 28 16:00:09 2015 @@ -2971,9 +2971,22 @@ #define RTL_RUN_ONCE_ASYNC 0x00000002UL #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL +#define RTL_RUN_ONCE_INIT {0} + typedef union _RTL_RUN_ONCE { PVOID Ptr; } RTL_RUN_ONCE, *PRTL_RUN_ONCE; + +typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); +typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; + +NTSYSAPI +DWORD +WINAPI +RtlRunOnceComplete( + PRTL_RUN_ONCE, + DWORD, + PVOID); #endif

9 years, 9 months

[akhaldi] 66500: [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 28 15:46:43 2015 New Revision: 66500 URL: http://svn.reactos.org/svn/reactos?rev=66500&view=rev Log: [KERNEL32_VISTA] Add and export InitOnceExecuteOnce(). CORE-9246 Added: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c (with props) Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec Modified: trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/C… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/CMakeLists.txt [iso-8859-1] Sat Feb 28 15:46:43 2015 @@ -8,15 +8,11 @@ list(APPEND SOURCE DllMain.c GetTickCount64.c + InitOnceExecuteOnce.c ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) add_library(kernel32_vista SHARED ${SOURCE}) set_module_type(kernel32_vista win32dll HOTPATCHABLE ENTRYPOINT DllMain 12) -add_importlibs(kernel32_vista kernel32) - -if(MSVC) - add_importlibs(kernel32_vista ntdll) -endif() - +add_importlibs(kernel32_vista kernel32 ntdll) add_dependencies(kernel32_vista psdk) add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) Added: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/I… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c (added) +++ trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c [iso-8859-1] Sat Feb 28 15:46:43 2015 @@ -0,0 +1,118 @@ + +#include "k32_vista.h" + +#include <ndk/exfuncs.h> +#include <wine/config.h> +#include <wine/port.h> + +/* Taken from Wine ntdll/sync.c */ + +HANDLE keyed_event = NULL; + +static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +{ + if (flags & RTL_RUN_ONCE_CHECK_ONLY) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + } + + for (;;) + { + ULONG_PTR next, val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 0: /* first time */ + if (!interlocked_cmpxchg_ptr( &once->Ptr, + (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) + return STATUS_PENDING; + break; + + case 1: /* in progress, wait */ + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + next = val & ~3; + if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), + (void *)val ) == (void *)val) + NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); + break; + + case 2: /* done */ + if (context) *context = (void *)(val & ~3); + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + return STATUS_PENDING; + } + } +} + +static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +{ + if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; + + if (flags & RTL_RUN_ONCE_INIT_FAILED) + { + if (context) return STATUS_INVALID_PARAMETER; + if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; + } + else context = (void *)((ULONG_PTR)context | 2); + + for (;;) + { + ULONG_PTR val = (ULONG_PTR)once->Ptr; + + switch (val & 3) + { + case 1: /* in progress */ + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + val &= ~3; + while (val) + { + ULONG_PTR next = *(ULONG_PTR *)val; + NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); + val = next; + } + return STATUS_SUCCESS; + + case 3: /* in progress, async */ + if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; + if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; + return STATUS_SUCCESS; + + default: + return STATUS_UNSUCCESSFUL; + } + } +} + +static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ) +{ + DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); + + if (ret != STATUS_PENDING) return ret; + + if (!func( once, param, context )) + { + RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + return STATUS_UNSUCCESSFUL; + } + + return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); +} + +/* Taken from Wine kernel32/sync.c */ + +/* + * @implemented + */ +BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) +{ + return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); +} Propchange: trunk/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32_vista/k… ============================================================================== --- trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32_vista/kernel32_vista.spec [iso-8859-1] Sat Feb 28 15:46:43 2015 @@ -1,2 +1,3 @@ @ stdcall -ret64 GetTickCount64() +@ stdcall InitOnceExecuteOnce(ptr ptr ptr ptr)

9 years, 9 months

[akhaldi] 66499: [PSDK] Add missing RTL_RUN_ONCE_INIT, RTL_RUN_ONCE_INIT_FN, PRTL_RUN_ONCE_INIT_FN and RtlRunOnceComplete() definitions.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 28 15:41:27 2015 New Revision: 66499 URL: http://svn.reactos.org/svn/reactos?rev=66499&view=rev Log: [PSDK] Add missing RTL_RUN_ONCE_INIT, RTL_RUN_ONCE_INIT_FN, PRTL_RUN_ONCE_INIT_FN and RtlRunOnceComplete() definitions. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Feb 28 15:41:27 2015 @@ -4321,18 +4321,26 @@ RtlQueryDepthSList( _In_ PSLIST_HEADER ListHead); -#ifndef _RTL_RUN_ONCE_DEF -#define _RTL_RUN_ONCE_DEF - #define RTL_RUN_ONCE_CHECK_ONLY 0x00000001UL #define RTL_RUN_ONCE_ASYNC 0x00000002UL #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL +#define RTL_RUN_ONCE_INIT {0} + typedef union _RTL_RUN_ONCE { PVOID Ptr; } RTL_RUN_ONCE, *PRTL_RUN_ONCE; -#endif +typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*); +typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN; + +NTSYSAPI +DWORD +WINAPI +RtlRunOnceComplete( + PRTL_RUN_ONCE, + DWORD, + PVOID); #define RTL_CONDITION_VARIABLE_INIT {0} #define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1

9 years, 9 months

[hbelusca] 66498: [SVCHOST]: Delay-load netapi32 and ole32 (they will be loaded only if needed). [WIN32K]: Fix cursor check (in few corner cases SYSTEMCUR(ARROW) happens to be NULL, when some progr...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 28 15:33:26 2015 New Revision: 66498 URL: http://svn.reactos.org/svn/reactos?rev=66498&view=rev Log: [SVCHOST]: Delay-load netapi32 and ole32 (they will be loaded only if needed). [WIN32K]: Fix cursor check (in few corner cases SYSTEMCUR(ARROW) happens to be NULL, when some programs -- ole32 -- wants to create windows while there is no graphics initialized yet). James, can you investigate? Modified: trunk/reactos/base/services/svchost/CMakeLists.txt trunk/reactos/win32ss/user/ntuser/class.c Modified: trunk/reactos/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/CMak… ============================================================================== --- trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/svchost/CMakeLists.txt [iso-8859-1] Sat Feb 28 15:33:26 2015 @@ -14,6 +14,7 @@ target_link_libraries(svchost uuid) set_module_type(svchost win32cui UNICODE) -add_importlibs(svchost advapi32 netapi32 rpcrt4 ole32 kernel32 ntdll) +add_delay_importlibs(svchost netapi32 ole32) +add_importlibs(svchost advapi32 rpcrt4 kernel32 ntdll) add_pch(svchost svchost.h SOURCE) add_cd_file(TARGET svchost DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sat Feb 28 15:33:26 2015 @@ -2424,8 +2424,19 @@ wc.cbClsExtra = 0; wc.cbWndExtra = DefaultServerClasses[i].ExtraBytes; wc.hIcon = NULL; + //// System Cursors should be initilized!!! - wc.hCursor = DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL ? UserHMGetHandle(SYSTEMCUR(ARROW)) : NULL; + if (DefaultServerClasses[i].hCursor == (HICON)OCR_NORMAL && + SYSTEMCUR(ARROW) != NULL) + { + wc.hCursor = UserHMGetHandle(SYSTEMCUR(ARROW)); + } + else + { + ERR("SYSTEMCUR(ARROW) == NULL, should not happen!!\n"); + wc.hCursor = NULL; + } + hBrush = DefaultServerClasses[i].hBrush; if (hBrush <= (HBRUSH)COLOR_MENUBAR) {

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015