Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 66321: [SERVICES] German translation & Small fix I think which should be right for English ^^
by dreimer＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: dreimer Date: Mon Feb 16 20:27:29 2015 New Revision: 66321 URL: http://svn.reactos.org/svn/reactos?rev=66321&view=rev Log: [SERVICES] German translation & Small fix I think which should be right for English ^^ Added: trunk/reactos/base/system/services/lang/de-DE.rc (with props) Modified: trunk/reactos/base/system/services/lang/en-US.rc trunk/reactos/base/system/services/services.rc Added: trunk/reactos/base/system/services/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/de-DE.rc (added) +++ trunk/reactos/base/system/services/lang/de-DE.rc [iso-8859-1] Mon Feb 16 20:27:29 2015 @@ -0,0 +1,12 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_SERVICE_START "starten" + IDS_SERVICE_STOP "beenden" + IDS_SERVICE_PAUSE "anhalten" + IDS_SERVICE_RESUME "fortsetzen" + IDS_SERVICE_RUNNING "Ausgeführt" + IDS_SERVICE_STOPPED "Beendet" + IDS_SERVICE_PAUSED "Angehalten" +END Propchange: trunk/reactos/base/system/services/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/services/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/lang/en-US.rc [iso-8859-1] Mon Feb 16 20:27:29 2015 @@ -6,7 +6,7 @@ IDS_SERVICE_STOP "stop" IDS_SERVICE_PAUSE "pause" IDS_SERVICE_RESUME "resume" - IDS_SERVICE_RUNNING "running" - IDS_SERVICE_STOPPED "stopped" - IDS_SERVICE_PAUSED "paused" + IDS_SERVICE_RUNNING "Running" + IDS_SERVICE_STOPPED "Stopped" + IDS_SERVICE_PAUSED "Paused" END Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.rc [iso-8859-1] Mon Feb 16 20:27:29 2015 @@ -12,6 +12,10 @@ /* UTF-8 */ #pragma code_page(65001) +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif + #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif

1 0

[tfaber] 66320: [BOOTCDREGTEST] - Add /n switch to rosautotest invocation to see how much of a difference it makes on testbot
by tfaber＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: tfaber Date: Mon Feb 16 16:17:22 2015 New Revision: 66320 URL: http://svn.reactos.org/svn/reactos?rev=66320&view=rev Log: [BOOTCDREGTEST] - Add /n switch to rosautotest invocation to see how much of a difference it makes on testbot Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd Modified: trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/regtest.cmd [iso-8859-1] Mon Feb 16 16:17:22 2015 @@ -9,4 +9,4 @@ ) dbgprint --process "ipconfig" -start rosautotest /r /s +start rosautotest /r /s /n

1 0

[ekohl] 66319: [NTOSKRNL] NtQueryInformationFile: Implement the FileModeInformation case according to 'File System Internals' page 485.
by ekohl＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: ekohl Date: Mon Feb 16 15:33:34 2015 New Revision: 66319 URL: http://svn.reactos.org/svn/reactos?rev=66319&view=rev Log: [NTOSKRNL] NtQueryInformationFile: Implement the FileModeInformation case according to 'File System Internals' page 485. Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Mon Feb 16 15:33:34 2015 @@ -863,6 +863,35 @@ *Handle = TargetHandle; return STATUS_SUCCESS; +} + +static +ULONG +IopGetFileMode(IN PFILE_OBJECT FileObject) +{ + ULONG Mode = 0; + + if (FileObject->Flags & FO_WRITE_THROUGH) + Mode |= FILE_WRITE_THROUGH; + + if (FileObject->Flags & FO_SEQUENTIAL_ONLY) + Mode |= FILE_SEQUENTIAL_ONLY; + + if (FileObject->Flags & FO_NO_INTERMEDIATE_BUFFERING) + Mode |= FILE_NO_INTERMEDIATE_BUFFERING; + + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + if (FileObject->Flags & FO_ALERTABLE_IO) + Mode |= FILE_SYNCHRONOUS_IO_ALERT; + else + Mode |= FILE_SYNCHRONOUS_IO_NONALERT; + } + + if (FileObject->Flags & FO_DELETE_ON_CLOSE) + Mode |= FILE_DELETE_ON_CLOSE; + + return Mode; } /* PUBLIC FUNCTIONS **********************************************************/ @@ -1865,6 +1894,7 @@ IO_STATUS_BLOCK KernelIosb; BOOLEAN CallDriver = TRUE; PFILE_ACCESS_INFORMATION AccessBuffer; + PFILE_MODE_INFORMATION ModeBuffer; PFILE_ALIGNMENT_INFORMATION AlignmentBuffer; PAGED_CODE(); IOTRACE(IO_API_DEBUG, "FileHandle: %p\n", FileHandle); @@ -2053,6 +2083,13 @@ AccessBuffer = Irp->AssociatedIrp.SystemBuffer; AccessBuffer->AccessFlags = HandleInformation.GrantedAccess; Irp->IoStatus.Information = sizeof(FILE_ACCESS_INFORMATION); + CallDriver = FALSE; + } + else if (FileInformationClass == FileModeInformation) + { + ModeBuffer = Irp->AssociatedIrp.SystemBuffer; + ModeBuffer->Mode = IopGetFileMode(FileObject); + Irp->IoStatus.Information = sizeof(FILE_MODE_INFORMATION); CallDriver = FALSE; } else if (FileInformationClass == FileAlignmentInformation)

1 0

[tfaber] 66318: [ROSAUTOTEST] - Add /n option to suppress console output. May or may not help to speed up testbot runs, but can't hurt to have in here.
by tfaber＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: tfaber Date: Mon Feb 16 14:55:39 2015 New Revision: 66318 URL: http://svn.reactos.org/svn/reactos?rev=66318&view=rev Log: [ROSAUTOTEST] - Add /n option to suppress console output. May or may not help to speed up testbot runs, but can't hurt to have in here. Modified: trunk/rostests/rosautotest/CConfiguration.cpp trunk/rostests/rosautotest/CConfiguration.h trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/tools.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] Mon Feb 16 14:55:39 2015 @@ -16,13 +16,12 @@ * Constructs an empty CConfiguration object */ CConfiguration::CConfiguration() + : m_CrashRecovery(false), + m_PrintToConsole(true), + m_Shutdown(false), + m_Submit(false) { WCHAR WindowsDirectory[MAX_PATH]; - - /* Zero-initialize variables */ - m_CrashRecovery = false; - m_Shutdown = false; - m_Submit = false; /* Check if we are running under ReactOS from the SystemRoot directory */ if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) @@ -55,6 +54,10 @@ m_Comment = UnicodeToAscii(argv[i]); break; + case 'n': + m_PrintToConsole = false; + break; + case 'r': m_CrashRecovery = true; break; 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] Mon Feb 16 14:55:39 2015 @@ -10,6 +10,7 @@ private: bool m_CrashRecovery; bool m_IsReactOS; + bool m_PrintToConsole; bool m_Shutdown; bool m_Submit; string m_Comment; @@ -26,6 +27,7 @@ void GetConfigurationFromFile(); bool DoCrashRecovery() const { return m_CrashRecovery; } + bool DoPrint() const { return m_PrintToConsole; } bool DoShutdown() const { return m_Shutdown; } bool DoSubmit() const { return m_Submit; } bool IsReactOS() const { return m_IsReactOS; } Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Mon Feb 16 14:55:39 2015 @@ -23,6 +23,7 @@ << " /c <comment> - Specifies the comment to be submitted to the Web Service." << endl << " Skips the comment set in the configuration file (if any)." << endl << " Only has an effect when /w is also used." << endl + << " /n - Do not print test output to console" << endl << " /r - Maintain information to resume from ReactOS crashes" << endl << " Can only be run under ReactOS and relies on sysreg2," << endl << " so incompatible with /w" << endl Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Mon Feb 16 14:55:39 2015 @@ -149,7 +149,8 @@ if(forcePrint == true || NewString[curr_pos - 1] == '\n') { /* Output the whole string */ - cout << NewString; + if(Configuration.DoPrint()) + cout << NewString; memcpy(DbgString, NewString.c_str() + start, size); DbgString[size] = 0; @@ -160,7 +161,8 @@ } /* Output full lines only */ - cout << NewString.substr(0, start); + if(Configuration.DoPrint()) + cout << NewString.substr(0, start); /* Return the remaining chunk */ return NewString.substr(start, size);

1 0

[pschweitzer] 66317: [WMISVC] Silence a DPRINT
by pschweitzer＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: pschweitzer Date: Mon Feb 16 13:40:13 2015 New Revision: 66317 URL: http://svn.reactos.org/svn/reactos?rev=66317&view=rev Log: [WMISVC] Silence a DPRINT Modified: trunk/reactos/base/services/wmisvc/wmisvc.c Modified: trunk/reactos/base/services/wmisvc/wmisvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wmisvc/wmisv… ============================================================================== --- trunk/reactos/base/services/wmisvc/wmisvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wmisvc/wmisvc.c [iso-8859-1] Mon Feb 16 13:40:13 2015 @@ -117,7 +117,7 @@ UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); - DPRINT1("ServiceMain() called\n"); + DPRINT("ServiceMain() called\n"); ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, ServiceControlHandler,

1 0

[tfaber] 66316: [ROSAUTOTEST] - Abstract unidirectional anonymous pipes into a CPipe class - Abstract a process with redirected output into a CPipedProcess class - Use these abstractions to avoid p...
by tfaber＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: tfaber Date: Mon Feb 16 13:17:04 2015 New Revision: 66316 URL: http://svn.reactos.org/svn/reactos?rev=66316&view=rev Log: [ROSAUTOTEST] - Abstract unidirectional anonymous pipes into a CPipe class - Abstract a process with redirected output into a CPipedProcess class - Use these abstractions to avoid polling for output from test processes. Instead, use blocking read operations to yield the CPU while waiting for data. ROSTESTS-144 #resolve Added: trunk/rostests/rosautotest/CPipe.cpp (with props) trunk/rostests/rosautotest/CPipe.h (with props) trunk/rostests/rosautotest/CPipedProcess.cpp (with props) trunk/rostests/rosautotest/CPipedProcess.h (with props) Modified: trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/CWineTest.h trunk/rostests/rosautotest/precomp.h Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Mon Feb 16 13:17:04 2015 @@ -6,6 +6,8 @@ CFatalException.cpp CInvalidParameterException.cpp CJournaledTestList.cpp + CPipe.cpp + CPipedProcess.cpp CProcess.cpp CSimpleException.cpp CTest.cpp Added: trunk/rostests/rosautotest/CPipe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipe.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/CPipe.cpp (added) +++ trunk/rostests/rosautotest/CPipe.cpp [iso-8859-1] Mon Feb 16 13:17:04 2015 @@ -0,0 +1,143 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Class that managed an unidirectional anonymous byte stream pipe + * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "precomp.h" + +/** + * Constructs a CPipe object and initializes read and write handles. + */ +CPipe::CPipe() +{ + SECURITY_ATTRIBUTES SecurityAttributes; + + SecurityAttributes.nLength = sizeof(SecurityAttributes); + SecurityAttributes.bInheritHandle = TRUE; + SecurityAttributes.lpSecurityDescriptor = NULL; + + if(!CreatePipe(&m_hReadPipe, &m_hWritePipe, &SecurityAttributes, 0)) + FATAL("CreatePipe failed\n"); +} + +/** + * Destructs a CPipe object and closes all open handles. + */ +CPipe::~CPipe() +{ + if (m_hReadPipe) + CloseHandle(m_hReadPipe); + if (m_hWritePipe) + CloseHandle(m_hWritePipe); +} + +/** + * Closes a CPipe's read pipe, leaving the write pipe unchanged. + */ +void +CPipe::CloseReadPipe() +{ + if (!m_hReadPipe) + FATAL("Trying to close already closed read pipe"); + CloseHandle(m_hReadPipe); +} + +/** + * Closes a CPipe's write pipe, leaving the read pipe unchanged. + */ +void +CPipe::CloseWritePipe() +{ + if (!m_hWritePipe) + FATAL("Trying to close already closed write pipe"); + CloseHandle(m_hWritePipe); +} + +/** + * Reads data from a pipe without advancing the read offset and/or retrieves information about available data. + * + * This function must not be called after CloseReadPipe. + * + * @param Buffer + * An optional buffer to read pipe data into. + * + * @param BufferSize + * The size of the buffer specified in Buffer, or 0 if no read should be performed. + * + * @param BytesRead + * On return, the number of bytes actually read from the pipe into Buffer. + * + * @param TotalBytesAvailable + * On return, the total number of bytes available to read from the pipe. + * + * @return + * True on success, false on failure; call GetLastError for error information. + * + * @see PeekNamedPipe + */ +bool +CPipe::Peek(PVOID Buffer, DWORD BufferSize, PDWORD BytesRead, PDWORD TotalBytesAvailable) +{ + if (!m_hReadPipe) + FATAL("Trying to peek from a closed read pipe"); + + return PeekNamedPipe(m_hReadPipe, Buffer, BufferSize, BytesRead, TotalBytesAvailable, NULL); +} + +/** + * Reads data from the read pipe, advancing the read offset accordingly. + * + * This function must not be called after CloseReadPipe. + * + * @param Buffer + * Buffer to read pipe data into. + * + * @param NumberOfBytesToRead + * The number of bytes to read into Buffer. + * + * @param NumberOfBytesRead + * On return, the number of bytes actually read from the pipe into Buffer. + * + * @return + * True on success, false on failure; call GetLastError for error information. + * + * @see ReadFile + */ +bool +CPipe::Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead) +{ + if (!m_hReadPipe) + FATAL("Trying to read from a closed read pipe"); + + return ReadFile(m_hReadPipe, Buffer, NumberOfBytesToRead, NumberOfBytesRead, NULL); +} + +/** + * Writes data to the write pipe. + * + * This function must not be called after CloseWritePipe. + * + * @param Buffer + * Buffer containing the data to write. + * + * @param NumberOfBytesToWrite + * The number of bytes to write to the pipe from Buffer. + * + * @param NumberOfBytesWritten + * On return, the number of bytes actually written to the pipe. + * + * @return + * True on success, false on failure; call GetLastError for error information. + * + * @see WriteFile + */ +bool +CPipe::Write(LPCVOID Buffer, DWORD NumberOfBytesToWrite, PDWORD NumberOfBytesWritten) +{ + if (!m_hWritePipe) + FATAL("Trying to write to a closed write pipe"); + + return WriteFile(m_hWritePipe, Buffer, NumberOfBytesToWrite, NumberOfBytesWritten, NULL); +} Propchange: trunk/rostests/rosautotest/CPipe.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/CPipe.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipe.h?rev=6… ============================================================================== --- trunk/rostests/rosautotest/CPipe.h (added) +++ trunk/rostests/rosautotest/CPipe.h [iso-8859-1] Mon Feb 16 13:17:04 2015 @@ -0,0 +1,26 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Class that managed an unidirectional anonymous byte stream pipe + * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + */ + +class CPipe +{ +private: + HANDLE m_hReadPipe; + HANDLE m_hWritePipe; + +public: + CPipe(); + ~CPipe(); + + void CloseReadPipe(); + void CloseWritePipe(); + + bool Peek(PVOID Buffer, DWORD BufferSize, PDWORD BytesRead, PDWORD TotalBytesAvailable); + bool Read(PVOID Buffer, DWORD NumberOfBytesToRead, PDWORD NumberOfBytesRead); + bool Write(LPCVOID Buffer, DWORD NumberOfBytesToWrite, PDWORD NumberOfBytesWritten); + + friend class CPipedProcess; +}; Propchange: trunk/rostests/rosautotest/CPipe.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/CPipedProcess.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipedProcess… ============================================================================== --- trunk/rostests/rosautotest/CPipedProcess.cpp (added) +++ trunk/rostests/rosautotest/CPipedProcess.cpp [iso-8859-1] Mon Feb 16 13:17:04 2015 @@ -0,0 +1,42 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Class that creates a process and redirects its output to a pipe + * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include "precomp.h" + +/** + * Constructs a CPipedProcess object and starts the process with redirected output. + * + * @param CommandLine + * A std::wstring containing the command line to run. + * + * @param Pipe + * The CPipe instance to redirect the process's output to. + * Note that only the read pipe is usable after the pipe was passed to this object. + */ +CPipedProcess::CPipedProcess(const wstring& CommandLine, CPipe& Pipe) + : CProcess(CommandLine, InitStartupInfo(Pipe)) +{ + Pipe.CloseWritePipe(); +} + +/** + * Initializes the STARTUPINFO structure for use in CreateProcessW. + * + * @param Pipe + * The CPipe instance to redirect the process's output to. + */ +LPSTARTUPINFOW +CPipedProcess::InitStartupInfo(CPipe& Pipe) +{ + ZeroMemory(&m_StartupInfo, sizeof(m_StartupInfo)); + m_StartupInfo.cb = sizeof(m_StartupInfo); + m_StartupInfo.dwFlags = STARTF_USESTDHANDLES; + m_StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + m_StartupInfo.hStdOutput = Pipe.m_hWritePipe; + m_StartupInfo.hStdError = Pipe.m_hWritePipe; + return &m_StartupInfo; +} Propchange: trunk/rostests/rosautotest/CPipedProcess.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/rosautotest/CPipedProcess.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipedProcess… ============================================================================== --- trunk/rostests/rosautotest/CPipedProcess.h (added) +++ trunk/rostests/rosautotest/CPipedProcess.h [iso-8859-1] Mon Feb 16 13:17:04 2015 @@ -0,0 +1,17 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PURPOSE: Class that creates a process and redirects its output to a pipe + * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + */ + +class CPipedProcess : public CProcess +{ +private: + STARTUPINFOW m_StartupInfo; + + LPSTARTUPINFOW InitStartupInfo(CPipe& Pipe); + +public: + CPipedProcess(const wstring& CommandLine, CPipe& Pipe); +}; Propchange: trunk/rostests/rosautotest/CPipedProcess.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] Mon Feb 16 13:17:04 2015 @@ -18,10 +18,7 @@ /* Zero-initialize variables */ m_hFind = NULL; - m_hReadPipe = NULL; - m_hWritePipe = NULL; m_ListBuffer = NULL; - memset(&m_StartupInfo, 0, sizeof(m_StartupInfo)); /* Set up m_TestPath */ if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) @@ -38,12 +35,6 @@ { if(m_hFind) FindClose(m_hFind); - - if(m_hReadPipe) - CloseHandle(m_hReadPipe); - - if(m_hWritePipe) - CloseHandle(m_hWritePipe); if(m_ListBuffer) delete m_ListBuffer; @@ -111,6 +102,7 @@ DWORD BytesAvailable; DWORD Temp; wstring CommandLine; + CPipe Pipe; /* Build the command line */ CommandLine = m_TestPath; @@ -119,7 +111,7 @@ { /* Start the process for getting all available tests */ - CProcess Process(CommandLine, &m_StartupInfo); + CPipedProcess Process(CommandLine, Pipe); /* Wait till this process ended */ if(WaitForSingleObject(Process.GetProcessHandle(), ListTimeout) == WAIT_FAILED) @@ -127,8 +119,8 @@ } /* Read the output data into a buffer */ - if(!PeekNamedPipe(m_hReadPipe, NULL, 0, NULL, &BytesAvailable, NULL)) - FATAL("PeekNamedPipe failed for the test list\n"); + if(!Pipe.Peek(NULL, 0, NULL, &BytesAvailable)) + FATAL("CPipe::Peek failed for the test list\n"); /* Check if we got any */ if(!BytesAvailable) @@ -142,8 +134,8 @@ /* Read the data */ m_ListBuffer = new char[BytesAvailable]; - if(!ReadFile(m_hReadPipe, m_ListBuffer, BytesAvailable, &Temp, NULL)) - FATAL("ReadPipe failed\n"); + if(!Pipe.Read(m_ListBuffer, BytesAvailable, &Temp)) + FATAL("CPipe::Read failed\n"); return BytesAvailable; } @@ -260,13 +252,13 @@ void CWineTest::RunTest(CTestInfo* TestInfo) { - bool BreakLoop = false; DWORD BytesAvailable; - DWORD Temp; stringstream ss, ssFinish; DWORD StartTime = GetTickCount(); float TotalTime; string tailString; + CPipe Pipe; + char Buffer[1024]; ss << "Running Wine Test, Module: " << TestInfo->Module << ", Test: " << TestInfo->Test << endl; StringOut(ss.str()); @@ -275,40 +267,20 @@ { /* Execute the test */ - CProcess Process(TestInfo->CommandLine, &m_StartupInfo); + CPipedProcess Process(TestInfo->CommandLine, Pipe); /* Receive all the data from the pipe */ - do + while(Pipe.Read(Buffer, sizeof(Buffer) - 1, &BytesAvailable) && BytesAvailable) { - /* When the application finished, make sure that we peek the pipe one more time, so that we get all data. - If the following condition would be the while() condition, we might hit a race condition: - - We check for data with PeekNamedPipe -> no data available - - The application outputs its data and finishes - - WaitForSingleObject reports that the application has finished and we break the loop without receiving any data - */ - if(WaitForSingleObject(Process.GetProcessHandle(), 0) != WAIT_TIMEOUT) - BreakLoop = true; - - if(!PeekNamedPipe(m_hReadPipe, NULL, 0, NULL, &BytesAvailable, NULL)) - FATAL("PeekNamedPipe failed for the test run\n"); - - if(BytesAvailable) - { - /* There is data, so get it and output it */ - auto_array_ptr<char> Buffer(new char[BytesAvailable + 1]); - - if(!ReadFile(m_hReadPipe, Buffer, BytesAvailable, &Temp, NULL)) - FATAL("ReadFile failed for the test run\n"); - - /* Output text through StringOut, even while the test is still running */ - Buffer[BytesAvailable] = 0; - tailString = StringOut(tailString.append(string(Buffer)), false); - - if(Configuration.DoSubmit()) - TestInfo->Log += Buffer; - } + /* Output text through StringOut, even while the test is still running */ + Buffer[BytesAvailable] = 0; + tailString = StringOut(tailString.append(string(Buffer)), false); + + if(Configuration.DoSubmit()) + TestInfo->Log += Buffer; } - while(!BreakLoop); + if(GetLastError() != ERROR_BROKEN_PIPE) + FATAL("CPipe::Read failed for the test run\n"); } /* Print what's left */ @@ -330,21 +302,6 @@ auto_ptr<CTestList> TestList; auto_ptr<CWebService> WebService; CTestInfo* TestInfo; - SECURITY_ATTRIBUTES SecurityAttributes; - - /* Create a pipe for getting the output of the tests */ - SecurityAttributes.nLength = sizeof(SecurityAttributes); - SecurityAttributes.bInheritHandle = TRUE; - SecurityAttributes.lpSecurityDescriptor = NULL; - - if(!CreatePipe(&m_hReadPipe, &m_hWritePipe, &SecurityAttributes, 0)) - FATAL("CreatePipe failed\n"); - - m_StartupInfo.cb = sizeof(m_StartupInfo); - m_StartupInfo.dwFlags = STARTF_USESTDHANDLES; - m_StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); - m_StartupInfo.hStdOutput = m_hWritePipe; - m_StartupInfo.hStdError = m_hWritePipe; /* The virtual test list is of course faster, so it should be preferred over the journaled one. Modified: trunk/rostests/rosautotest/CWineTest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.h?r… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.h [iso-8859-1] Mon Feb 16 13:17:04 2015 @@ -9,10 +9,7 @@ { private: HANDLE m_hFind; - HANDLE m_hReadPipe; - HANDLE m_hWritePipe; PCHAR m_ListBuffer; - STARTUPINFOW m_StartupInfo; string m_CurrentTest; wstring m_CurrentFile; wstring m_CurrentListCommand; 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] Mon Feb 16 13:17:04 2015 @@ -30,7 +30,9 @@ #include "CConfiguration.h" #include "CFatalException.h" #include "CInvalidParameterException.h" +#include "CPipe.h" #include "CProcess.h" +#include "CPipedProcess.h" #include "CSimpleException.h" #include "CTestInfo.h" #include "CTest.h"

1 0

[ekohl] 66315: [SERVICES] Remove unused prototype.
by ekohl＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: ekohl Date: Mon Feb 16 11:52:43 2015 New Revision: 66315 URL: http://svn.reactos.org/svn/reactos?rev=66315&view=rev Log: [SERVICES] Remove unused prototype. Modified: trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Mon Feb 16 11:52:43 2015 @@ -199,7 +199,6 @@ WORD wType, WORD wStrings, LPCWSTR *lpStrings); -LPWSTR ScmGetResourceString(UINT uID); VOID ScmWaitForLsa(VOID); #endif /* _SERVICES_H */

1 0

[ekohl] 66314: [SERVICES] Replace hard-coded strings by string resources.
by ekohl＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: ekohl Date: Mon Feb 16 11:47:40 2015 New Revision: 66314 URL: http://svn.reactos.org/svn/reactos?rev=66314&view=rev Log: [SERVICES] Replace hard-coded strings by string resources. Added: trunk/reactos/base/system/services/lang/ (with props) trunk/reactos/base/system/services/lang/en-US.rc (with props) trunk/reactos/base/system/services/resource.h (with props) Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h trunk/reactos/base/system/services/services.rc Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Mon Feb 16 11:47:40 2015 @@ -1340,7 +1340,7 @@ OVERLAPPED Overlapped = {0}; #endif #if 0 - LPCWSTR lpErrorStrings[3]; + LPCWSTR lpLogStrings[3]; WCHAR szBuffer1[20]; WCHAR szBuffer2[20]; #endif @@ -1377,13 +1377,13 @@ #if 0 _ultow(PipeTimeout, szBuffer1, 10); - lpErrorStrings[0] = Service->lpDisplayName; - lpErrorStrings[1] = szBuffer1; + lpLogStrings[0] = Service->lpDisplayName; + lpLogStrings[1] = szBuffer1; ScmLogEvent(EVENT_CONNECTION_TIMEOUT, EVENTLOG_ERROR_TYPE, 2, - lpErrorStrings); + lpLogStrings); #endif DPRINT1("Log EVENT_CONNECTION_TIMEOUT by %S\n", Service->lpDisplayName); @@ -1444,12 +1444,12 @@ #if 0 _ultow(PipeTimeout, szBuffer1, 10); - lpErrorStrings[0] = szBuffer1; + lpLogStrings[0] = szBuffer1; ScmLogEvent(EVENT_READFILE_TIMEOUT, EVENTLOG_ERROR_TYPE, 1, - lpErrorStrings); + lpLogStrings); #endif DPRINT1("Log EVENT_READFILE_TIMEOUT by %S\n", Service->lpDisplayName); @@ -1491,14 +1491,14 @@ _ultow(Service->lpImage->dwProcessId, szBuffer1, 10); _ultow(dwProcessId, szBuffer2, 10); - lpErrorStrings[0] = Service->lpDisplayName; - lpErrorStrings[1] = szBuffer1; - lpErrorStrings[2] = szBuffer2; + lpLogStrings[0] = Service->lpDisplayName; + lpLogStrings[1] = szBuffer1; + lpLogStrings[2] = szBuffer2; ScmLogEvent(EVENT_SERVICE_DIFFERENT_PID_CONNECTED, EVENTLOG_WARNING_TYPE, 3, - lpErrorStrings); + lpLogStrings); #endif DPRINT1("Log EVENT_SERVICE_DIFFERENT_PID_CONNECTED by %S\n", Service->lpDisplayName); @@ -1625,8 +1625,8 @@ { PSERVICE_GROUP Group = Service->lpGroup; DWORD dwError = ERROR_SUCCESS; - LPCWSTR lpErrorStrings[2]; - WCHAR szErrorBuffer[32]; + LPCWSTR lpLogStrings[2]; + WCHAR szLogBuffer[80]; DPRINT("ScmLoadService() called\n"); DPRINT("Start Service %p (%S)\n", Service, Service->lpServiceName); @@ -1682,25 +1682,27 @@ } /* Log a successful service start */ - lpErrorStrings[0] = Service->lpDisplayName; - lpErrorStrings[1] = L"start"; + LoadStringW(GetModuleHandle(NULL), IDS_SERVICE_START, szLogBuffer, 80); + lpLogStrings[0] = Service->lpDisplayName; + lpLogStrings[1] = szLogBuffer; + ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, EVENTLOG_INFORMATION_TYPE, 2, - lpErrorStrings); + lpLogStrings); } else { if (Service->dwErrorControl != SERVICE_ERROR_IGNORE) { /* Log a failed service start */ - swprintf(szErrorBuffer, L"%lu", dwError); - lpErrorStrings[0] = Service->lpServiceName; - lpErrorStrings[1] = szErrorBuffer; + swprintf(szLogBuffer, L"%lu", dwError); + lpLogStrings[0] = Service->lpServiceName; + lpLogStrings[1] = szLogBuffer; ScmLogEvent(EVENT_SERVICE_START_FAILED, EVENTLOG_ERROR_TYPE, 2, - lpErrorStrings); + lpLogStrings); } #if 0 Propchange: trunk/reactos/base/system/services/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Feb 16 11:47:40 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/system/services/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/system/services/lang/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/system/services/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/services/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/lang/… ============================================================================== --- trunk/reactos/base/system/services/lang/en-US.rc (added) +++ trunk/reactos/base/system/services/lang/en-US.rc [iso-8859-1] Mon Feb 16 11:47:40 2015 @@ -0,0 +1,12 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_SERVICE_START "start" + IDS_SERVICE_STOP "stop" + IDS_SERVICE_PAUSE "pause" + IDS_SERVICE_RESUME "resume" + IDS_SERVICE_RUNNING "running" + IDS_SERVICE_STOPPED "stopped" + IDS_SERVICE_PAUSED "paused" +END Propchange: trunk/reactos/base/system/services/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/services/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/resou… ============================================================================== --- trunk/reactos/base/system/services/resource.h (added) +++ trunk/reactos/base/system/services/resource.h [iso-8859-1] Mon Feb 16 11:47:40 2015 @@ -0,0 +1,9 @@ +#pragma once + +#define IDS_SERVICE_START 100 +#define IDS_SERVICE_STOP 101 +#define IDS_SERVICE_PAUSE 102 +#define IDS_SERVICE_RESUME 103 +#define IDS_SERVICE_RUNNING 104 +#define IDS_SERVICE_STOPPED 105 +#define IDS_SERVICE_PAUSED 106 Propchange: trunk/reactos/base/system/services/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Mon Feb 16 11:47:40 2015 @@ -1085,7 +1085,9 @@ DWORD dwControlsAccepted; DWORD dwCurrentState; HKEY hServicesKey = NULL; - LPCWSTR lpErrorStrings[2]; + LPCWSTR lpLogStrings[2]; + WCHAR szLogBuffer[80]; + UINT uID; DPRINT("RControlService() called\n"); @@ -1245,34 +1247,35 @@ if (dwError == ERROR_SUCCESS) { - if (dwControl != SERVICE_CONTROL_INTERROGATE) + if (dwControl == SERVICE_CONTROL_STOP || + dwControl == SERVICE_CONTROL_PAUSE || + dwControl == SERVICE_CONTROL_CONTINUE) { /* Log a sucessful send control */ - lpErrorStrings[0] = lpService->lpDisplayName; - - switch(dwControl) + + switch (dwControl) { case SERVICE_CONTROL_STOP: - lpErrorStrings[1] = L"stop"; + uID = IDS_SERVICE_STOP; break; case SERVICE_CONTROL_PAUSE: - lpErrorStrings[1] = L"pause"; + uID = IDS_SERVICE_PAUSE; break; case SERVICE_CONTROL_CONTINUE: - lpErrorStrings[1] = L"continue"; - break; - - default: - lpErrorStrings[1] = L"other"; + uID = IDS_SERVICE_RESUME; break; } + LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, 80); + + lpLogStrings[0] = lpService->lpDisplayName; + lpLogStrings[1] = szLogBuffer; ScmLogEvent(EVENT_SERVICE_CONTROL_SUCCESS, EVENTLOG_INFORMATION_TYPE, 2, - lpErrorStrings); + lpLogStrings); } } @@ -1652,8 +1655,9 @@ PSERVICE lpService; DWORD dwPreviousState; DWORD dwPreviousType; - LPCWSTR lpErrorStrings[2]; - WCHAR szErrorBuffer[32]; + LPCWSTR lpLogStrings[2]; + WCHAR szLogBuffer[80]; + UINT uID; DPRINT("RSetServiceStatus() called\n"); DPRINT("hServiceStatus = %lu\n", hServiceStatus); @@ -1730,14 +1734,14 @@ (lpServiceStatus->dwWin32ExitCode != ERROR_SUCCESS)) { /* Log a failed service stop */ - swprintf(szErrorBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); - lpErrorStrings[0] = lpService->lpDisplayName; - lpErrorStrings[1] = szErrorBuffer; + swprintf(szLogBuffer, L"%lu", lpServiceStatus->dwWin32ExitCode); + lpLogStrings[0] = lpService->lpDisplayName; + lpLogStrings[1] = szLogBuffer; ScmLogEvent(EVENT_SERVICE_EXIT_FAILED, EVENTLOG_ERROR_TYPE, 2, - lpErrorStrings); + lpLogStrings); } else if (lpServiceStatus->dwCurrentState != dwPreviousState && (lpServiceStatus->dwCurrentState == SERVICE_STOPPED || @@ -1745,27 +1749,29 @@ lpServiceStatus->dwCurrentState == SERVICE_PAUSED)) { /* Log a successful service status change */ - lpErrorStrings[0] = lpService->lpDisplayName; - switch(lpServiceStatus->dwCurrentState) { case SERVICE_STOPPED: - lpErrorStrings[1] = L"stopped"; + uID = IDS_SERVICE_STOPPED; break; case SERVICE_RUNNING: - lpErrorStrings[1] = L"running"; + uID = IDS_SERVICE_RUNNING; break; case SERVICE_PAUSED: - lpErrorStrings[1] = L"paused"; + uID = IDS_SERVICE_PAUSED; break; } + + LoadStringW(GetModuleHandle(NULL), uID, szLogBuffer, 80); + lpLogStrings[0] = lpService->lpDisplayName; + lpLogStrings[1] = szLogBuffer; ScmLogEvent(EVENT_SERVICE_STATUS_SUCCESS, EVENTLOG_INFORMATION_TYPE, 2, - lpErrorStrings); + lpLogStrings); } DPRINT("Set %S to %lu\n", lpService->lpDisplayName, lpService->Status.dwCurrentState); Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Mon Feb 16 11:47:40 2015 @@ -16,12 +16,15 @@ #include <winbase.h> #include <winsvc.h> #include <winreg.h> +#include <winuser.h> #include <netevent.h> #define NTOS_MODE_USER #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <services/services.h> #include <svcctl_s.h> + +#include "resource.h" typedef struct _SERVICE_GROUP { @@ -196,6 +199,7 @@ WORD wType, WORD wStrings, LPCWSTR *lpStrings); +LPWSTR ScmGetResourceString(UINT uID); VOID ScmWaitForLsa(VOID); #endif /* _SERVICES_H */ Modified: trunk/reactos/base/system/services/services.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.rc [iso-8859-1] Mon Feb 16 11:47:40 2015 @@ -1,4 +1,17 @@ +#include <windef.h> +#include <winuser.h> + +#include "resource.h" + #define REACTOS_STR_FILE_DESCRIPTION "Service Control Manager" #define REACTOS_STR_INTERNAL_NAME "Services" #define REACTOS_STR_ORIGINAL_FILENAME "Services.exe" #include <reactos/version.rc> + + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

1 0

[tfaber] 66313: [PSDK] - Add missing OUT_SCREEN_OUTLINE_PRECIS, OUT_PS_ONLY_PRECIS & CLIP_DFA_DISABLE definitions aka fix build
by tfaber＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: tfaber Date: Mon Feb 16 09:11:13 2015 New Revision: 66313 URL: http://svn.reactos.org/svn/reactos?rev=66313&view=rev Log: [PSDK] - Add missing OUT_SCREEN_OUTLINE_PRECIS, OUT_PS_ONLY_PRECIS & CLIP_DFA_DISABLE definitions aka fix build Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Mon Feb 16 09:11:13 2015 @@ -419,12 +419,17 @@ #define OUT_RASTER_PRECIS 6 #define OUT_TT_ONLY_PRECIS 7 #define OUT_OUTLINE_PRECIS 8 +#define OUT_SCREEN_OUTLINE_PRECIS 9 +#define OUT_PS_ONLY_PRECIS 10 #define CLIP_DEFAULT_PRECIS 0 #define CLIP_CHARACTER_PRECIS 1 #define CLIP_STROKE_PRECIS 2 #define CLIP_MASK 15 #define CLIP_LH_ANGLES 16 #define CLIP_TT_ALWAYS 32 +#if (_WIN32_WINNT >= _WIN32_WINNT_LONGHORN) +#define CLIP_DFA_DISABLE 64 +#endif #define CLIP_EMBEDDED 128 #define DEFAULT_QUALITY 0 #define DRAFT_QUALITY 1

1 0

[tfaber] 66312: [GDI32_WINETEST] - Sync to Wine 1.7.36 - Properly disable test_dib_formats. ROSTESTS-152, CORE-5922 - Fix skip message in test_mono_bitmap not to point to a resolved bug. ROSTESTS-1...
by tfaber＠svn.reactos.org 16 Feb '15

16 Feb '15

Author: tfaber Date: Mon Feb 16 09:06:45 2015 New Revision: 66312 URL: http://svn.reactos.org/svn/reactos?rev=66312&view=rev Log: [GDI32_WINETEST] - Sync to Wine 1.7.36 - Properly disable test_dib_formats. ROSTESTS-152, CORE-5922 - Fix skip message in test_mono_bitmap not to point to a resolved bug. ROSTESTS-153, CORE-5922 - Re-enable font tests that were left skipped even though the associated bug is correctly marked as resolved. ROSTESTS-8 Modified: trunk/rostests/winetests/gdi32/bitmap.c trunk/rostests/winetests/gdi32/clipping.c trunk/rostests/winetests/gdi32/dib.c trunk/rostests/winetests/gdi32/font.c trunk/rostests/winetests/gdi32/metafile.c trunk/rostests/winetests/gdi32/wine_test.sfd trunk/rostests/winetests/gdi32/wine_test.ttf Modified: trunk/rostests/winetests/gdi32/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/bitmap.c?… ============================================================================== --- trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/bitmap.c [iso-8859-1] Mon Feb 16 09:06:45 2015 @@ -838,7 +838,7 @@ } pbmi->bmiHeader.biClrUsed = 173; memset( pbmi->bmiColors, 0xcc, 256 * sizeof(RGBQUAD) ); - GetDIBits( hdc, hdib, 0, 1, bits, pbmi, DIB_RGB_COLORS ); + GetDIBits( hdc, hdib, 0, 1, NULL, pbmi, DIB_RGB_COLORS ); ok( pbmi->bmiHeader.biClrUsed == 0, "wrong colors %u\n", pbmi->bmiHeader.biClrUsed ); for (i = 0; i < 256; i++) { @@ -854,6 +854,21 @@ i, colors[i].rgbRed, colors[i].rgbGreen, colors[i].rgbBlue, colors[i].rgbReserved); } + rgb[0].rgbRed = 1; + rgb[0].rgbGreen = 2; + rgb[0].rgbBlue = 3; + rgb[0].rgbReserved = 123; + ret = SetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "SetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbReserved == 123, "Expected rgbReserved = 123, got %u\n", rgb[0].rgbReserved ); + + ret = GetDIBColorTable( hdcmem, 0, 1, rgb ); + ok( ret == 1, "GetDIBColorTable returned unexpected result %u\n", ret ); + ok( rgb[0].rgbRed == 1, "Expected rgbRed = 1, got %u\n", rgb[0].rgbRed ); + ok( rgb[0].rgbGreen == 2, "Expected rgbGreen = 2, got %u\n", rgb[0].rgbGreen ); + ok( rgb[0].rgbBlue == 3, "Expected rgbBlue = 3, got %u\n", rgb[0].rgbBlue ); + todo_wine ok( rgb[0].rgbReserved == 0, "Expected rgbReserved = 0, got %u\n", rgb[0].rgbReserved ); + SelectObject(hdcmem, oldbm); DeleteObject(hdib); DeleteObject(hpal); @@ -881,11 +896,11 @@ BITMAPINFO *bi; char data[256]; void *bits; - //int planes, bpp, compr, format; + int planes, bpp, compr, format; HBITMAP hdib, hbmp; HDC hdc, memdc; UINT ret; - //BOOL expect_ok, todo; + BOOL format_ok, expect_ok; bi = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] ) ); hdc = GetDC( 0 ); @@ -894,7 +909,9 @@ memset( data, 0xaa, sizeof(data) ); -#if 0 // FIXME: CORE-5922 + if (!winetest_interactive) + skip("ROSTESTS-152: Skipping loop in test_dib_formats because it's too big and causes too many failures\n"); + else for (bpp = 0; bpp <= 64; bpp++) { for (planes = 0; planes <= 64; planes++) @@ -1031,7 +1048,6 @@ } } } -#endif memset( bi, 0, sizeof(bi->bmiHeader) ); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -1707,7 +1723,7 @@ if (!winetest_interactive) { - skip("test_mono_bitmap skipped, CORE-5922\n"); + skip("ROSTESTS-153: Skipping test_mono_bitmap because it causes too many failures and takes too long\n"); return; } @@ -4533,7 +4549,6 @@ ok( ret == 2, "got %d\n", ret ); ok( !memcmp( data, inverted_bits + 32, 16 * 4 ), "bits differ\n"); for (i = 16; i < 128; i++) ok( data[i] == 0xaaaaaaaa, "%d: got %08x\n", i, data[i] ); - memset( data, 0xaa, sizeof(data) ); DeleteObject( dib ); Modified: trunk/rostests/winetests/gdi32/clipping.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/clipping.… ============================================================================== --- trunk/rostests/winetests/gdi32/clipping.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/clipping.c [iso-8859-1] Mon Feb 16 09:06:45 2015 @@ -184,11 +184,12 @@ { static const RECT empty_rect; static const RECT rc = { 111, 222, 333, 444 }; + static const RECT arc[2] = { {0, 0, 10, 10}, {10, 10, 20, 20}}; static const RECT rc_xformed = { 76, 151, 187, 262 }; union { RGNDATA data; - char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + char buf[sizeof(RGNDATAHEADER) + 2 * sizeof(RECT)]; } rgn; HRGN hrgn; XFORM xform; @@ -224,6 +225,20 @@ rgn.data.rdh.iType = RDH_RECTANGLES; rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); + /* sizeof(RGNDATAHEADER) is large enough */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER), &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &empty_rect); + DeleteObject(hrgn); + + /* Cannot be smaller than sizeof(RGNDATAHEADER) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); @@ -233,6 +248,13 @@ rgn.data.rdh.nCount = 1; SetRectEmpty(&rgn.data.rdh.rcBound); memcpy(rgn.data.Buffer, &rc, sizeof(rc)); + + /* With a single rect this seems to work... */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + sizeof(RECT) - 1, &rgn.data); + ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); + verify_region(hrgn, &rc); + DeleteObject(hrgn); SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); @@ -267,6 +289,18 @@ ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError()); verify_region(hrgn, &rc_xformed); DeleteObject(hrgn); + + rgn.data.rdh.nCount = 2; + SetRectEmpty(&rgn.data.rdh.rcBound); + memcpy(rgn.data.Buffer, arc, sizeof(arc)); + + /* Buffer cannot be smaller than sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) */ + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) - 1, &rgn.data); + todo_wine + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + } static void test_GetClipRgn(void) Modified: trunk/rostests/winetests/gdi32/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/dib.c?rev… ============================================================================== --- trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/dib.c [iso-8859-1] Mon Feb 16 09:06:45 2015 @@ -1214,17 +1214,17 @@ static const RECT *current_bounds; static const char *dst_format; -static inline DWORD get_stride(BITMAPINFO *bmi) +static inline DWORD get_stride(const BITMAPINFO *bmi) { return ((bmi->bmiHeader.biBitCount * bmi->bmiHeader.biWidth + 31) >> 3) & ~3; } -static inline DWORD get_dib_size(BITMAPINFO *bmi) +static inline DWORD get_dib_size(const BITMAPINFO *bmi) { return get_stride(bmi) * abs(bmi->bmiHeader.biHeight); } -static char *hash_dib(BITMAPINFO *bmi, void *bits) +static char *hash_dib(const BITMAPINFO *bmi, const void *bits) { DWORD dib_size = get_dib_size(bmi); HCRYPTHASH hash; @@ -1292,7 +1292,7 @@ current_bounds++; } -static void compare_hash_broken_todo(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) +static void compare_hash_broken_todo(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info, int num_broken, BOOL todo) { char *hash = hash_dib(bmi, bits); BOOL ok_cond; @@ -1336,7 +1336,7 @@ compare_bounds( hdc, info ); } -static void compare_hash(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char *info) +static void compare_hash(HDC hdc, const BITMAPINFO *bmi, BYTE *bits, const char *info) { compare_hash_broken_todo(hdc, bmi, bits, info, 0, FALSE); } @@ -1619,7 +1619,7 @@ DeleteObject( SelectObject( hdc, brush ) ); } -static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) +static void draw_graphics(HDC hdc, const BITMAPINFO *bmi, BYTE *bits) { char pal_buffer[sizeof(LOGPALETTE) + 255 * sizeof(PALETTEENTRY)]; LOGPALETTE *pal = (LOGPALETTE *)pal_buffer; @@ -2844,7 +2844,7 @@ static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; -static void draw_text_2( HDC hdc, BITMAPINFO *bmi, BYTE *bits, BOOL aa ) +static void draw_text_2( HDC hdc, const BITMAPINFO *bmi, BYTE *bits, BOOL aa ) { DWORD dib_size = get_dib_size(bmi), ret; LOGFONTA lf; @@ -2960,7 +2960,7 @@ DeleteObject( font ); } -static void draw_text( HDC hdc, BITMAPINFO *bmi, BYTE *bits ) +static void draw_text( HDC hdc, const BITMAPINFO *bmi, BYTE *bits ) { draw_text_2( hdc, bmi, bits, FALSE ); Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Mon Feb 16 09:06:45 2015 @@ -399,12 +399,6 @@ SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; - if(!winetest_interactive) - { - skip("reactos bug ROSTESTS-8: Skipping bitmap font tests!\n"); - return; - } - hdc = CreateCompatibleDC(0); /* "System" has only 1 pixel size defined, otherwise the test breaks */ @@ -497,12 +491,6 @@ MAT2 mat2 = { {0x8000,0}, {0,0}, {0,0}, {0x8000,0} }; POINT pt; INT ret; - - if(!winetest_interactive) - { - skip("reactos bug 5401: Skipping outline font tests!\n"); - return; - } if (!is_truetype_font_installed("Arial")) { @@ -972,7 +960,6 @@ if(!TranslateCharsetInfo( fs, &csi, TCI_SRCFONTSIG )) continue; lf.lfCharSet = csi.ciCharset; - trace("looking for %s height %d charset %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet); ret = EnumFontFamiliesExA(hdc, &lf, find_font_proc, (LPARAM)&lf, 0); if (fd[i].height & FH_SCALE) ok(ret, "scaled font height %d should not be enumerated\n", height); @@ -1000,7 +987,6 @@ { ok(ret != ANSI_CHARSET, "font charset should not be ANSI_CHARSET\n"); ok(ret != expected_cs, "font charset %d should not be %d\n", ret, expected_cs); - trace("Skipping replacement %s height %d charset %d\n", face_name, tm.tmHeight, tm.tmCharSet); SelectObject(hdc, old_hfont); DeleteObject(hfont); continue; @@ -1855,7 +1841,6 @@ ok(ret, "GetTextMetrics error %d\n", GetLastError()); if(fd[i].dpi == tm.tmDigitizedAspectX) { - trace("found font %s, height %d charset %x dpi %d\n", lf.lfFaceName, lf.lfHeight, lf.lfCharSet, fd[i].dpi); ok(tm.tmWeight == fd[i].weight, "%s(%d): tm.tmWeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmWeight, fd[i].weight); ok(match_off_by_1(tm.tmHeight, fd[i].height, fd[i].exact), "%s(%d): tm.tmHeight %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmHeight, fd[i].height); ok(match_off_by_1(tm.tmAscent, fd[i].ascent, fd[i].exact), "%s(%d): tm.tmAscent %d != %d\n", fd[i].face_name, fd[i].requested_height, tm.tmAscent, fd[i].ascent); @@ -2227,8 +2212,6 @@ } } - trace( "%u %.*s\n", size.cx, (int)(pLastChar - pFirstChar), pFirstChar); - y += size.cy; str = pLastChar; } while (*str && y < clientArea->bottom); @@ -2582,6 +2565,22 @@ hfont = SelectObject(hdc, hfont); DeleteObject(hfont); + + /* CLIP_DFA_DISABLE turns off the font association */ + lf.lfClipPrecision = CLIP_DFA_DISABLE; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hfont = SelectObject(hdc, hfont); + charset = GetTextCharset(hdc); + codepage = pGdiGetCodePage(hdc); + trace("acp=%d, lfFaceName=%s, lfCharSet=%d, GetTextCharset=%d, GdiGetCodePage=%d\n", + acp, lf.lfFaceName, lf.lfCharSet, charset, codepage); + ok(codepage == 1252, "GdiGetCodePage returned %d\n", codepage); + + hfont = SelectObject(hdc, hfont); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); } } @@ -3267,42 +3266,20 @@ int i; cmap_format_4 *cmap = (cmap_format_4*)ptr; USHORT seg_count = GET_BE_WORD(cmap->seg_countx2) / 2; - USHORT const *glyph_ids = cmap->end_count + 4 * seg_count + 1; *first = 0x10000; for(i = 0; i < seg_count; i++) { - DWORD code, index; cmap_format_4_seg seg; get_seg4(cmap, i, &seg); - for(code = seg.start_count; code <= seg.end_count; code++) - { - if(seg.id_range_offset == 0) - index = (seg.id_delta + code) & 0xffff; - else - { - index = seg.id_range_offset / 2 - + code - seg.start_count - + i - seg_count; - - /* some fonts have broken last segment */ - if ((char *)(glyph_ids + index + 1) < (char *)ptr + limit) - index = GET_BE_WORD(glyph_ids[index]); - else - { - trace("segment %04x/%04x index %04x points to nowhere\n", - seg.start_count, seg.end_count, index); - index = 0; - } - if(index) index += seg.id_delta; - } - if(*first == 0x10000) - *last = *first = code; - else if(index) - *last = code; - } + + if(seg.start_count > 0xfffe) break; + + if(*first == 0x10000) *first = seg.start_count; + + *last = min(seg.end_count, 0xfffe); } if(*first == 0x10000) return FALSE; @@ -3380,7 +3357,12 @@ return r; } +#define TT_PLATFORM_APPLE_UNICODE 0 +#define TT_PLATFORM_MACINTOSH 1 #define TT_PLATFORM_MICROSOFT 3 +#define TT_APPLE_ID_DEFAULT 0 +#define TT_APPLE_ID_ISO_10646 2 +#define TT_APPLE_ID_UNICODE_2_0 3 #define TT_MS_ID_SYMBOL_CS 0 #define TT_MS_ID_UNICODE_CS 1 #define TT_MS_LANGID_ENGLISH_UNITED_STATES 0x0409 @@ -3388,6 +3370,194 @@ #define TT_NAME_ID_FONT_SUBFAMILY 2 #define TT_NAME_ID_UNIQUE_ID 3 #define TT_NAME_ID_FULL_NAME 4 +#define TT_MAC_ID_SIMPLIFIED_CHINESE 25 + +typedef struct sfnt_name +{ + USHORT platform_id; + USHORT encoding_id; + USHORT language_id; + USHORT name_id; + USHORT length; + USHORT offset; +} sfnt_name; + +static const LANGID mac_langid_table[] = +{ + MAKELANGID(LANG_ENGLISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ENGLISH */ + MAKELANGID(LANG_FRENCH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_FRENCH */ + MAKELANGID(LANG_GERMAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_GERMAN */ + MAKELANGID(LANG_ITALIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ITALIAN */ + MAKELANGID(LANG_DUTCH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_DUTCH */ + MAKELANGID(LANG_SWEDISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SWEDISH */ + MAKELANGID(LANG_SPANISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SPANISH */ + MAKELANGID(LANG_DANISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_DANISH */ + MAKELANGID(LANG_PORTUGUESE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_PORTUGUESE */ + MAKELANGID(LANG_NORWEGIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_NORWEGIAN */ + MAKELANGID(LANG_HEBREW,SUBLANG_DEFAULT), /* TT_MAC_LANGID_HEBREW */ + MAKELANGID(LANG_JAPANESE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_JAPANESE */ + MAKELANGID(LANG_ARABIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ARABIC */ + MAKELANGID(LANG_FINNISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_FINNISH */ + MAKELANGID(LANG_GREEK,SUBLANG_DEFAULT), /* TT_MAC_LANGID_GREEK */ + MAKELANGID(LANG_ICELANDIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ICELANDIC */ + MAKELANGID(LANG_MALTESE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALTESE */ + MAKELANGID(LANG_TURKISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TURKISH */ + MAKELANGID(LANG_CROATIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_CROATIAN */ + MAKELANGID(LANG_CHINESE_TRADITIONAL,SUBLANG_DEFAULT), /* TT_MAC_LANGID_CHINESE_TRADITIONAL */ + MAKELANGID(LANG_URDU,SUBLANG_DEFAULT), /* TT_MAC_LANGID_URDU */ + MAKELANGID(LANG_HINDI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_HINDI */ + MAKELANGID(LANG_THAI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_THAI */ + MAKELANGID(LANG_KOREAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_KOREAN */ + MAKELANGID(LANG_LITHUANIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_LITHUANIAN */ + MAKELANGID(LANG_POLISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_POLISH */ + MAKELANGID(LANG_HUNGARIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_HUNGARIAN */ + MAKELANGID(LANG_ESTONIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESTONIAN */ + MAKELANGID(LANG_LATVIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_LETTISH */ + MAKELANGID(LANG_SAMI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SAAMISK */ + MAKELANGID(LANG_FAEROESE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_FAEROESE */ + MAKELANGID(LANG_FARSI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_FARSI */ + MAKELANGID(LANG_RUSSIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_RUSSIAN */ + MAKELANGID(LANG_CHINESE_SIMPLIFIED,SUBLANG_DEFAULT), /* TT_MAC_LANGID_CHINESE_SIMPLIFIED */ + MAKELANGID(LANG_DUTCH,SUBLANG_DUTCH_BELGIAN), /* TT_MAC_LANGID_FLEMISH */ + MAKELANGID(LANG_IRISH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_IRISH */ + MAKELANGID(LANG_ALBANIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ALBANIAN */ + MAKELANGID(LANG_ROMANIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ROMANIAN */ + MAKELANGID(LANG_CZECH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_CZECH */ + MAKELANGID(LANG_SLOVAK,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SLOVAK */ + MAKELANGID(LANG_SLOVENIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SLOVENIAN */ + 0, /* TT_MAC_LANGID_YIDDISH */ + MAKELANGID(LANG_SERBIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SERBIAN */ + MAKELANGID(LANG_MACEDONIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MACEDONIAN */ + MAKELANGID(LANG_BULGARIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BULGARIAN */ + MAKELANGID(LANG_UKRAINIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_UKRAINIAN */ + MAKELANGID(LANG_BELARUSIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BYELORUSSIAN */ + MAKELANGID(LANG_UZBEK,SUBLANG_DEFAULT), /* TT_MAC_LANGID_UZBEK */ + MAKELANGID(LANG_KAZAK,SUBLANG_DEFAULT), /* TT_MAC_LANGID_KAZAKH */ + MAKELANGID(LANG_AZERI,SUBLANG_AZERI_CYRILLIC), /* TT_MAC_LANGID_AZERBAIJANI */ + 0, /* TT_MAC_LANGID_AZERBAIJANI_ARABIC_SCRIPT */ + MAKELANGID(LANG_ARMENIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ARMENIAN */ + MAKELANGID(LANG_GEORGIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_GEORGIAN */ + 0, /* TT_MAC_LANGID_MOLDAVIAN */ + MAKELANGID(LANG_KYRGYZ,SUBLANG_DEFAULT), /* TT_MAC_LANGID_KIRGHIZ */ + MAKELANGID(LANG_TAJIK,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TAJIKI */ + MAKELANGID(LANG_TURKMEN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TURKMEN */ + MAKELANGID(LANG_MONGOLIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MONGOLIAN */ + MAKELANGID(LANG_MONGOLIAN,SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA), /* TT_MAC_LANGID_MONGOLIAN_CYRILLIC_SCRIPT */ + MAKELANGID(LANG_PASHTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_PASHTO */ + 0, /* TT_MAC_LANGID_KURDISH */ + MAKELANGID(LANG_KASHMIRI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_KASHMIRI */ + MAKELANGID(LANG_SINDHI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SINDHI */ + MAKELANGID(LANG_TIBETAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TIBETAN */ + MAKELANGID(LANG_NEPALI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_NEPALI */ + MAKELANGID(LANG_SANSKRIT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SANSKRIT */ + MAKELANGID(LANG_MARATHI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MARATHI */ + MAKELANGID(LANG_BENGALI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BENGALI */ + MAKELANGID(LANG_ASSAMESE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ASSAMESE */ + MAKELANGID(LANG_GUJARATI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_GUJARATI */ + MAKELANGID(LANG_PUNJABI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_PUNJABI */ + MAKELANGID(LANG_ORIYA,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ORIYA */ + MAKELANGID(LANG_MALAYALAM,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAYALAM */ + MAKELANGID(LANG_KANNADA,SUBLANG_DEFAULT), /* TT_MAC_LANGID_KANNADA */ + MAKELANGID(LANG_TAMIL,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TAMIL */ + MAKELANGID(LANG_TELUGU,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TELUGU */ + MAKELANGID(LANG_SINHALESE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SINHALESE */ + 0, /* TT_MAC_LANGID_BURMESE */ + MAKELANGID(LANG_KHMER,SUBLANG_DEFAULT), /* TT_MAC_LANGID_KHMER */ + MAKELANGID(LANG_LAO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_LAO */ + MAKELANGID(LANG_VIETNAMESE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_VIETNAMESE */ + MAKELANGID(LANG_INDONESIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INDONESIAN */ + 0, /* TT_MAC_LANGID_TAGALOG */ + MAKELANGID(LANG_MALAY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAY_ROMAN_SCRIPT */ + 0, /* TT_MAC_LANGID_MALAY_ARABIC_SCRIPT */ + MAKELANGID(LANG_AMHARIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_AMHARIC */ + MAKELANGID(LANG_TIGRIGNA,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TIGRINYA */ + 0, /* TT_MAC_LANGID_GALLA */ + 0, /* TT_MAC_LANGID_SOMALI */ + MAKELANGID(LANG_SWAHILI,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SWAHILI */ + 0, /* TT_MAC_LANGID_RUANDA */ + 0, /* TT_MAC_LANGID_RUNDI */ + 0, /* TT_MAC_LANGID_CHEWA */ + MAKELANGID(LANG_MALAGASY,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MALAGASY */ + MAKELANGID(LANG_ESPERANTO,SUBLANG_DEFAULT), /* TT_MAC_LANGID_ESPERANTO */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 95-111 */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 112-127 */ + MAKELANGID(LANG_WELSH,SUBLANG_DEFAULT), /* TT_MAC_LANGID_WELSH */ + MAKELANGID(LANG_BASQUE,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BASQUE */ + MAKELANGID(LANG_CATALAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_CATALAN */ + 0, /* TT_MAC_LANGID_LATIN */ + MAKELANGID(LANG_QUECHUA,SUBLANG_DEFAULT), /* TT_MAC_LANGID_QUECHUA */ + 0, /* TT_MAC_LANGID_GUARANI */ + 0, /* TT_MAC_LANGID_AYMARA */ + MAKELANGID(LANG_TATAR,SUBLANG_DEFAULT), /* TT_MAC_LANGID_TATAR */ + MAKELANGID(LANG_UIGHUR,SUBLANG_DEFAULT), /* TT_MAC_LANGID_UIGHUR */ + 0, /* TT_MAC_LANGID_DZONGKHA */ + 0, /* TT_MAC_LANGID_JAVANESE */ + 0, /* TT_MAC_LANGID_SUNDANESE */ + MAKELANGID(LANG_GALICIAN,SUBLANG_DEFAULT), /* TT_MAC_LANGID_GALICIAN */ + MAKELANGID(LANG_AFRIKAANS,SUBLANG_DEFAULT), /* TT_MAC_LANGID_AFRIKAANS */ + MAKELANGID(LANG_BRETON,SUBLANG_DEFAULT), /* TT_MAC_LANGID_BRETON */ + MAKELANGID(LANG_INUKTITUT,SUBLANG_DEFAULT), /* TT_MAC_LANGID_INUKTITUT */ + MAKELANGID(LANG_SCOTTISH_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_SCOTTISH_GAELIC */ + MAKELANGID(LANG_MANX_GAELIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_MANX_GAELIC */ + MAKELANGID(LANG_IRISH,SUBLANG_IRISH_IRELAND), /* TT_MAC_LANGID_IRISH_GAELIC */ + 0, /* TT_MAC_LANGID_TONGAN */ + 0, /* TT_MAC_LANGID_GREEK_POLYTONIC */ + MAKELANGID(LANG_GREENLANDIC,SUBLANG_DEFAULT), /* TT_MAC_LANGID_GREELANDIC */ + MAKELANGID(LANG_AZERI,SUBLANG_AZERI_LATIN), /* TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT */ +}; + +static inline WORD get_mac_code_page( const sfnt_name *name ) +{ + if (GET_BE_WORD(name->encoding_id) == TT_MAC_ID_SIMPLIFIED_CHINESE) return 10008; /* special case */ + return 10000 + GET_BE_WORD(name->encoding_id); +} + +static int match_name_table_language( const sfnt_name *name, LANGID lang ) +{ + LANGID name_lang; + int res = 0; + + switch (GET_BE_WORD(name->platform_id)) + { + case TT_PLATFORM_MICROSOFT: + res += 5; /* prefer the Microsoft name */ + switch (GET_BE_WORD(name->encoding_id)) + { + case TT_MS_ID_UNICODE_CS: + case TT_MS_ID_SYMBOL_CS: + name_lang = GET_BE_WORD(name->language_id); + break; + default: + return 0; + } + break; + case TT_PLATFORM_MACINTOSH: + if (!IsValidCodePage( get_mac_code_page( name ))) return 0; + if (GET_BE_WORD(name->language_id) >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + name_lang = mac_langid_table[GET_BE_WORD(name->language_id)]; + break; + case TT_PLATFORM_APPLE_UNICODE: + res += 2; /* prefer Unicode encodings */ + switch (GET_BE_WORD(name->encoding_id)) + { + case TT_APPLE_ID_DEFAULT: + case TT_APPLE_ID_ISO_10646: + case TT_APPLE_ID_UNICODE_2_0: + if (GET_BE_WORD(name->language_id) >= sizeof(mac_langid_table)/sizeof(mac_langid_table[0])) return 0; + name_lang = mac_langid_table[GET_BE_WORD(name->language_id)]; + break; + default: + return 0; + } + break; + default: + return 0; + } + if (name_lang == lang) res += 30; + else if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) res += 20; + else if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) res += 10; + return res; +} static BOOL get_ttf_nametable_entry(HDC hdc, WORD name_id, WCHAR *out_buf, SIZE_T out_size, LCID language_id) { @@ -3397,21 +3567,14 @@ USHORT number_of_record; USHORT storage_offset; } *header; - struct sfnt_name - { - USHORT platform_id; - USHORT encoding_id; - USHORT language_id; - USHORT name_id; - USHORT length; - USHORT offset; - } *entry; + sfnt_name *entry; BOOL r = FALSE; LONG size, offset, length; LONG c, ret; WCHAR *name; BYTE *data; USHORT i; + int res, best_lang = 0, best_index = -1; size = GetFontData(hdc, MS_NAME_TAG, 0, NULL, 0); ok(size != GDI_ERROR, "no name table found\n"); @@ -3444,35 +3607,34 @@ entry = (void *)&header[1]; for (i = 0; i < header->number_of_record; i++) { - if (GET_BE_WORD(entry[i].platform_id) != TT_PLATFORM_MICROSOFT || - (GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_UNICODE_CS && GET_BE_WORD(entry[i].encoding_id) != TT_MS_ID_SYMBOL_CS) || - GET_BE_WORD(entry[i].language_id) != language_id || - GET_BE_WORD(entry[i].name_id) != name_id) + if (GET_BE_WORD(entry[i].name_id) != name_id) continue; + res = match_name_table_language( &entry[i], language_id); + if (res > best_lang) { - continue; + best_lang = res; + best_index = i; } - - offset = header->storage_offset + GET_BE_WORD(entry[i].offset); - length = GET_BE_WORD(entry[i].length); - if (offset + length > size) - { - trace("entry %d is out of range\n", i); - break; - } - if (length >= out_size) - { - trace("buffer too small for entry %d\n", i); - break; - } - - name = (WCHAR *)(data + offset); - for (c = 0; c < length / 2; c++) - out_buf[c] = GET_BE_WORD(name[c]); - out_buf[c] = 0; - - r = TRUE; - break; - } + } + + offset = header->storage_offset + GET_BE_WORD(entry[best_index].offset); + length = GET_BE_WORD(entry[best_index].length); + if (offset + length > size) + { + trace("entry %d is out of range\n", best_index); + goto out; + } + if (length >= out_size) + { + trace("buffer too small for entry %d\n", best_index); + goto out; + } + + name = (WCHAR *)(data + offset); + for (c = 0; c < length / 2; c++) + out_buf[c] = GET_BE_WORD(name[c]); + out_buf[c] = 0; + + r = TRUE; out: HeapFree(GetProcessHeap(), 0, data); @@ -3555,6 +3717,9 @@ expect_first_W = 0; switch(GetACP()) { + case 1255: /* Hebrew */ + expect_last_W = 0xf896; + break; case 1257: /* Baltic */ expect_last_W = 0xf8fd; break; @@ -3569,7 +3734,7 @@ else { expect_first_W = cmap_first; - expect_last_W = min(cmap_last, os2_last_char); + expect_last_W = cmap_last; if(os2_first_char <= 1) expect_break_W = os2_first_char + 2; else if(os2_first_char > 0xff) @@ -4200,7 +4365,11 @@ SetLastError(0xdeadbeef); ret = GetGlyphOutlineW(hdc, ' ', GGO_NATIVE, &gm, 0, NULL, &mat); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { ok(ret == 0, "GetGlyphOutlineW should return 0 buffer size for space char\n"); + ok(gm.gmBlackBoxX == 1, "Expected 1, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "Expected 1, got %u\n", gm.gmBlackBoxY); + } /* requesting buffer size for space char + error */ memset(&gm, 0, sizeof(gm)); @@ -4210,7 +4379,15 @@ { ok(ret == GDI_ERROR, "GetGlyphOutlineW should return GDI_ERROR\n"); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); - } + ok(gm.gmBlackBoxX == 0, "Expected 0, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 0, "Expected 0, got %u\n", gm.gmBlackBoxY); + } + + /* test GetGlyphOutline with a buffer too small */ + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'A', GGO_NATIVE, &gm, sizeof(i), &i, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + ok(ret == GDI_ERROR, "GetGlyphOutlineW should return an error when the buffer size is too small.\n"); for (i = 0; i < sizeof(fmt) / sizeof(fmt[0]); ++i) { @@ -4690,6 +4867,7 @@ int ret; LOGFONTA lf; HDC hdc; + struct enum_fullname_data efnd; if (!is_truetype_font_installed("Arial")) { @@ -4749,6 +4927,28 @@ strcpy(lf.lfFaceName, "Arial Italic Bold"); ret = EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf); ok(ret, "font Arial Italic Bold should not be enumerated\n"); + + /* MS Shell Dlg and MS Shell Dlg 2 must exist */ + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg"); + todo_wine ok(!ret, "expected MS Shell Dlg got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg"); + ok(ret, "did not expect MS Shell Dlg\n"); + + memset(&efnd, 0, sizeof(efnd)); + strcpy(lf.lfFaceName, "MS Shell Dlg 2"); + ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0); + ok(ret, "font MS Shell Dlg 2 is not enumerated\n"); + ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2"); + todo_wine ok(!ret, "expected MS Shell Dlg 2 got %s\n", efnd.elf[0].elfLogFont.lfFaceName); + ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg 2"); + ok(ret, "did not expect MS Shell Dlg 2\n"); DeleteDC(hdc); } @@ -4871,8 +5071,6 @@ FaceName = (char *)efnd.elf[i].elfFullName; StyleName = (char *)efnd.elf[i].elfStyle; - trace("Checking font %s:\nFamilyName: %s; FaceName: %s; StyleName: %s\n", Family, FamilyName, FaceName, StyleName); - get_vertical = ( FamilyName[0] == '@' ); ok(get_vertical == want_vertical, "Vertical flags don't match: %s %s\n", Family, FamilyName); @@ -4898,12 +5096,8 @@ bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FONT_FAMILY found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "FAMILY (family name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_FAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: FAMILY (family name) could not be read\n", FamilyName); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); ok(!lstrcmpA(FamilyName, bufA), "font family names don't match: returned %s, expect %s\n", FamilyName, bufA); @@ -4913,44 +5107,32 @@ bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FULL_NAME found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FULL_NAME, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); ok(ret, "FULL_NAME (face name) could not be read\n"); if (want_vertical) bufW = prepend_at(bufW); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); - ok(!lstrcmpA(FaceName, bufA), "font face names don't match: returned %s, expect %s\n", FaceName, bufA); + ok(!lstrcmpA(FaceName, bufA), "%s: font face names don't match: returned %s, expect %s\n", FamilyName, FaceName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFaceName; - ok(!lstrcmpA(FaceName, otmStr), "FaceName %s doesn't match otmpFaceName %s\n", FaceName, otmStr); + ok(!lstrcmpA(FaceName, otmStr), "%s: FaceName %s doesn't match otmpFaceName %s\n", FamilyName, FaceName, otmStr); bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized FONT_SUBFAMILY found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "SUBFAMILY (style name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_FONT_SUBFAMILY, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: SUBFAMILY (style name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); - ok(!lstrcmpA(StyleName, bufA), "style names don't match: returned %s, expect %s\n", StyleName, bufA); + ok(!lstrcmpA(StyleName, bufA), "%s: style names don't match: returned %s, expect %s\n", FamilyName, StyleName, bufA); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpStyleName; - ok(!lstrcmpA(StyleName, otmStr), "StyleName %s doesn't match otmpStyleName %s\n", StyleName, otmStr); + ok(!lstrcmpA(StyleName, otmStr), "%s: StyleName %s doesn't match otmpStyleName %s\n", FamilyName, StyleName, otmStr); bufW[0] = 0; bufA[0] = 0; ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, GetSystemDefaultLangID()); - if (!ret) - { - trace("no localized UNIQUE_ID found.\n"); - ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); - } - ok(ret, "UNIQUE_ID (full name) could not be read\n"); + if (!ret) ret = get_ttf_nametable_entry(hdc, TT_NAME_ID_UNIQUE_ID, bufW, buf_size, TT_MS_LANGID_ENGLISH_UNITED_STATES); + ok(ret, "%s: UNIQUE_ID (full name) could not be read\n", FamilyName); WideCharToMultiByte(CP_ACP, 0, bufW, -1, bufA, buf_size, NULL, FALSE); otmStr = (LPSTR)otm + (UINT_PTR)otm->otmpFullName; - ok(!lstrcmpA(otmStr, bufA), "UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", otmStr, bufA); + ok(!lstrcmpA(otmStr, bufA), "%s: UNIQUE ID (full name) doesn't match: returned %s, expect %s\n", FamilyName, otmStr, bufA); SelectObject(hdc, of); DeleteObject(hfont); @@ -5050,6 +5232,7 @@ HFONT hfont, hfont_prev; GLYPHMETRICS gm; TEXTMETRICA tm; + TEXTMETRICW tmW; DWORD ret; memset(&lf, 0, sizeof(lf)); @@ -5077,6 +5260,11 @@ ok(gm.gmptGlyphOrigin.y - gm.gmBlackBoxY >= -tm.tmDescent, "Glyph bottom(%d) exceeds descent(%d)\n", gm.gmptGlyphOrigin.y - gm.gmBlackBoxY, -tm.tmDescent); + + /* Test tmLastChar - wine_test has code points fffb-fffe mapped to glyph 0 */ + GetTextMetricsW(hdc, &tmW); +todo_wine + ok( tmW.tmLastChar == 0xfffe, "got %04x\n", tmW.tmLastChar); SelectObject(hdc, hfont_prev); DeleteObject(hfont); Modified: trunk/rostests/winetests/gdi32/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/metafile.… ============================================================================== --- trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/metafile.c [iso-8859-1] Mon Feb 16 09:06:45 2015 @@ -84,9 +84,6 @@ LOGFONTA device_lf; INT ret; - trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n", - hdc, emr->iType, emr->nSize, (void *)param); - if(!hdc) return 1; PlayEnhMetaFileRecord(hdc, handle_table, emr, n_objs); @@ -299,10 +296,6 @@ if (emr->iType == EMR_EXTTEXTOUTW) { const EMREXTTEXTOUTW *pExtTextOutW = (const EMREXTTEXTOUTW *)emr; - trace("gm %d, mm %d, scale %f, %f, expected %f, %f\n", - test->graphics_mode, test->map_mode, - pExtTextOutW->exScale, pExtTextOutW->eyScale, - test->ex_scale, test->ey_scale); ok(fabs(test->ex_scale - pExtTextOutW->exScale) < 0.001, "Got exScale %f, expected %f\n", pExtTextOutW->exScale, test->ex_scale); ok(fabs(test->ey_scale - pExtTextOutW->eyScale) < 0.001, @@ -488,7 +481,6 @@ trace("hdc %p, emr->iType %d, emr->nSize %d, param %p\n", hdc, emr->iType, emr->nSize, (void *)param); - trace("BEFORE:\n"); SetLastError(0xdeadbeef); ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -610,7 +602,6 @@ break; } - trace("AFTER:\n"); SetLastError(0xdeadbeef); ret = GetWorldTransform(hdc, &xform); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -3222,11 +3213,8 @@ for(mode = MM_MIN; mode <= MM_MAX; mode++) { RECT *rc; - trace("mode %d\n", mode); - for(rc = frames; rc->right - rc->left > 0; rc++) { - trace("frame %d,%d - %d,%d\n", rc->left, rc->top, rc->right, rc->bottom); getwinmetafilebits(mode, 1, rc); getwinmetafilebits(mode, 2, rc); } Modified: trunk/rostests/winetests/gdi32/wine_test.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test… ============================================================================== --- trunk/rostests/winetests/gdi32/wine_test.sfd [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/wine_test.sfd [iso-8859-1] Mon Feb 16 09:06:45 2015 @@ -12,15 +12,13 @@ Descent: 410 sfntRevision: 0x00010000 LayerCount: 2 -Layer: 0 1 "Back" 1 -Layer: 1 1 "Fore" 0 +Layer: 0 1 "Back" 1 +Layer: 1 1 "Fore" 0 XUID: [1021 905 592216984 1247726] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 -CreationTime: 1288336343 -ModificationTime: 1366465321 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -92,6 +90,7 @@ StartChar: .notdef Encoding: 65536 -1 0 +AltUni2: 00fffe.ffffffff.0 00fffd.ffffffff.0 00fffc.ffffffff.0 00fffb.ffffffff.0 Width: 748 Flags: W TtInstrs: @@ -212,14 +211,14 @@ LayerCount: 2 Fore SplineSet -459 1258 m 29,0,-1 - 462 1639 l 5,1,-1 - 389 1638 l 5,2,-1 - 492 1815 l 5,3,-1 - 609 1638.5 l 5,4,-1 - 531 1637.5 l 5,5,-1 - 523 1258 l 5,6,-1 - 459 1258 l 29,0,-1 +459 1258 m 25,0,-1 + 462 1639 l 1,1,-1 + 389 1638 l 1,2,-1 + 492 1815 l 1,3,-1 + 609 1638.5 l 1,4,-1 + 531 1637.5 l 1,5,-1 + 523 1258 l 1,6,-1 + 459 1258 l 25,0,-1 EndSplineSet EndChar @@ -231,14 +230,14 @@ LayerCount: 2 Fore SplineSet -461 -30.7998 m 29,0,-1 - 464 -411.8 l 5,1,-1 - 391 -410.8 l 5,2,-1 - 494 -587.8 l 5,3,-1 - 611 -411.3 l 5,4,-1 - 533 -410.3 l 5,5,-1 - 525 -30.7998 l 5,6,-1 - 461 -30.7998 l 29,0,-1 +461 -30.7998 m 25,0,-1 + 464 -411.8 l 1,1,-1 + 391 -410.8 l 1,2,-1 + 494 -587.8 l 1,3,-1 + 611 -411.3 l 1,4,-1 + 533 -410.3 l 1,5,-1 + 525 -30.7998 l 1,6,-1 + 461 -30.7998 l 25,0,-1 EndSplineSet EndChar EndChars Modified: trunk/rostests/winetests/gdi32/wine_test.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/wine_test… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs