Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 72062: [REISERFS] Reduce verbosity
by pschweitzer＠svn.reactos.org 31 Jul '16

31 Jul '16

Author: pschweitzer Date: Sun Jul 31 10:13:39 2016 New Revision: 72062 URL: http://svn.reactos.org/svn/reactos?rev=72062&view=rev Log: [REISERFS] Reduce verbosity Modified: trunk/reactos/drivers/filesystems/reiserfs/src/debug.c Modified: trunk/reactos/drivers/filesystems/reiserfs/src/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/reiser… ============================================================================== --- trunk/reactos/drivers/filesystems/reiserfs/src/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/reiserfs/src/debug.c [iso-8859-1] Sun Jul 31 10:13:39 2016 @@ -22,7 +22,7 @@ extern PRFSD_GLOBAL RfsdGlobal; -LONG DebugLevel = DBG_FUNC; +LONG DebugLevel = DBG_USER; ULONG ProcessNameOffset = 0;

1 0

[mjansen] 72061: [ATL][ATL_APITEST] Implement / Improve CString, based upon the code that was already there. CORE-11579 #resolve Add code + tests for: Conversion of A->W and W->A, equality operator...
by mjansen＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: mjansen Date: Sat Jul 30 19:07:43 2016 New Revision: 72061 URL: http://svn.reactos.org/svn/reactos?rev=72061&view=rev Log: [ATL][ATL_APITEST] Implement / Improve CString, based upon the code that was already there. CORE-11579 #resolve Add code + tests for: Conversion of A->W and W->A, equality operators, MakeLower, MakeUpper, Find, FindOneOf, ReverseFind, Compare, Mid, Left, Right, Format, Replace, Trim, TrimLeft, TrimRight. Added: trunk/rostests/apitests/atl/CString.cpp (with props) trunk/rostests/apitests/atl/CString.inl (with props) Modified: trunk/reactos/sdk/lib/atl/atlsimpstr.h trunk/reactos/sdk/lib/atl/atlstr.h trunk/reactos/sdk/lib/atl/cstringt.h trunk/rostests/apitests/atl/CMakeLists.txt trunk/rostests/apitests/atl/testlist.c Modified: trunk/reactos/sdk/lib/atl/atlsimpstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlsimpstr.h?r… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlsimpstr.h [iso-8859-1] Sat Jul 30 19:07:43 2016 @@ -200,6 +200,28 @@ return *this; } + CSimpleStringT& operator=(_In_ const CSimpleStringT& strSrc) + { + CStringData* pData = GetData(); + CStringData* pNewData = strSrc.GetData(); + + if (pNewData != pData) + { + if (!pData->IsLocked() && (pNewData->pStringMgr == pData->pStringMgr)) + { + pNewData = CloneData(pNewData); + pData->Release(); + Attach(pNewData); + } + else + { + SetString(strSrc.GetString(), strSrc.GetLength()); + } + } + + return *this; + } + CSimpleStringT& operator+=(_In_ const CSimpleStringT& strSrc) { Append(strSrc); @@ -495,7 +517,7 @@ if (pOldData->IsShared()) { Fork(nLength); - ATLASSERT(FALSE); + //ATLASSERT(FALSE); } else if (pOldData->nAllocLength < nLength) { Modified: trunk/reactos/sdk/lib/atl/atlstr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlstr.h?rev=7… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlstr.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlstr.h [iso-8859-1] Sat Jul 30 19:07:43 2016 @@ -124,6 +124,12 @@ typedef CStringT< wchar_t, StrTraitATL< wchar_t, ChTraitsCRT<wchar_t> > > CAtlStringW; +typedef CStringT< char, StrTraitATL< char, ChTraitsCRT<char> > > CAtlStringA; + + +typedef CAtlStringW CStringW; +typedef CAtlStringA CStringA; + } Modified: trunk/reactos/sdk/lib/atl/cstringt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/cstringt.h?rev… ============================================================================== --- trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/cstringt.h [iso-8859-1] Sat Jul 30 19:07:43 2016 @@ -28,14 +28,28 @@ static int __cdecl GetBaseTypeLength(_In_z_ LPCWSTR pszSource) throw() { - return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, -1, NULL, 0, NULL, NULL) - 1; + if (pszSource == NULL) return -1; + return static_cast<int>(wcslen(pszSource)); + } + + static int __cdecl GetBaseTypeLength(_In_z_ LPCSTR pszSource) throw() + { + if (pszSource == NULL) return 0; + return ::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSource, -1, NULL, 0) - 1; } static int __cdecl GetBaseTypeLength( _In_reads_(nLength) LPCWSTR pszSource, _In_ int nLength) throw() { - return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, nLength, NULL, 0, NULL, NULL); + return nLength; + } + + static int __cdecl GetBaseTypeLength( + _In_reads_(nLength) LPCSTR pszSource, + _In_ int nLength) throw() + { + return ::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSource, nLength, NULL, 0); } static void __cdecl ConvertToBaseType( @@ -49,8 +63,197 @@ wmemcpy(pszDest, pszSrc, nSrcLength); } + + static void __cdecl ConvertToBaseType( + _Out_writes_(nDestLength) LPWSTR pszDest, + _In_ int nDestLength, + _In_ LPCSTR pszSrc, + _In_ int nSrcLength = -1) + { + if (nSrcLength == -1) + nSrcLength = 1 + GetBaseTypeLength(pszSrc); + + ::MultiByteToWideChar(_AtlGetConversionACP(), 0, pszSrc, nSrcLength, pszDest, nDestLength); + } + + static void __cdecl MakeLower( + _Out_writes_(nSrcLength) LPWSTR pszSource, + _In_ int nSrcLength) + { + ::CharLowerBuffW(pszSource, nSrcLength); + } + + static void __cdecl MakeUpper( + _Out_writes_(nSrcLength) LPWSTR pszSource, + _In_ int nSrcLength) + { + ::CharUpperBuffW(pszSource, nSrcLength); + } + + static LPWSTR __cdecl FindString( + _In_z_ LPCWSTR pszSource, + _In_z_ LPCWSTR pszSub) + { + return ::wcsstr(pszSource, pszSub); + } + + static LPWSTR __cdecl FindChar( + _In_z_ LPCWSTR pszSource, + _In_ WCHAR ch) + { + return ::wcschr(pszSource, ch); + } + + static LPWSTR __cdecl FindCharReverse( + _In_z_ LPCWSTR pszSource, + _In_ WCHAR ch) + { + return ::wcsrchr(pszSource, ch); + } + + static LPWSTR __cdecl FindOneOf( + _In_z_ LPCWSTR pszSource, + _In_z_ LPCWSTR pszCharSet) + { + return ::wcspbrk(pszSource, pszCharSet); + } + + static int __cdecl Compare( + _In_z_ LPCWSTR psz1, + _In_z_ LPCWSTR psz2) + { + return ::wcscmp(psz1, psz2); + } + + static int __cdecl FormatV( + _In_opt_z_ LPWSTR pszDest, + _In_z_ LPCWSTR pszFormat, + _In_ va_list args) + { + if (pszDest == NULL) + return ::_vscwprintf(pszFormat, args); + return ::vswprintf(pszDest, pszFormat, args); + } + }; + +// Template specialization + +template<> +class ChTraitsCRT<char> : public ChTraitsBase<char> +{ +public: + + static int __cdecl GetBaseTypeLength(_In_z_ LPCWSTR pszSource) throw() + { + return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, -1, NULL, 0, NULL, NULL) - 1; + } + + static int __cdecl GetBaseTypeLength(_In_z_ LPCSTR pszSource) throw() + { + if (pszSource == NULL) return 0; + return static_cast<int>(strlen(pszSource)); + } + + static int __cdecl GetBaseTypeLength( + _In_reads_(nLength) LPCWSTR pszSource, + _In_ int nLength) throw() + { + return ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSource, nLength, NULL, 0, NULL, NULL); + } + + static int __cdecl GetBaseTypeLength( + _In_reads_(nLength) LPCSTR pszSource, + _In_ int nLength) throw() + { + return nLength; + } + + static void __cdecl ConvertToBaseType( + _Out_writes_(nDestLength) LPSTR pszDest, + _In_ int nDestLength, + _In_ LPCWSTR pszSrc, + _In_ int nSrcLength = -1) + { + if (nSrcLength == -1) + nSrcLength = 1 + GetBaseTypeLength(pszSrc); + + ::WideCharToMultiByte(_AtlGetConversionACP(), 0, pszSrc, nSrcLength, pszDest, nDestLength, NULL, NULL); + } + + static void __cdecl ConvertToBaseType( + _Out_writes_(nDestLength) LPSTR pszDest, + _In_ int nDestLength, + _In_ LPCSTR pszSrc, + _In_ int nSrcLength = -1) + { + if (nSrcLength == -1) + nSrcLength = 1 + GetBaseTypeLength(pszSrc); + + memcpy(pszDest, pszSrc, nSrcLength); + } + + static void __cdecl MakeLower( + _Out_writes_(nSrcLength) LPSTR pszSource, + _In_ int nSrcLength) + { + ::CharLowerBuffA(pszSource, nSrcLength); + } + + static void __cdecl MakeUpper( + _Out_writes_(nSrcLength) LPSTR pszSource, + _In_ int nSrcLength) + { + ::CharUpperBuffA(pszSource, nSrcLength); + } + + static LPSTR __cdecl FindString( + _In_z_ LPCSTR pszSource, + _In_z_ LPCSTR pszSub) + { + return ::strstr(pszSource, pszSub); + } + + static LPSTR __cdecl FindChar( + _In_z_ LPCSTR pszSource, + _In_ CHAR ch) + { + return ::strchr(pszSource, ch); + } + + static LPSTR __cdecl FindCharReverse( + _In_z_ LPCSTR pszSource, + _In_ CHAR ch) + { + return ::strrchr(pszSource, ch); + } + + static LPSTR __cdecl FindOneOf( + _In_z_ LPCSTR pszSource, + _In_z_ LPCSTR pszCharSet) + { + return ::strpbrk(pszSource, pszCharSet); + } + + static int __cdecl Compare( + _In_z_ LPCSTR psz1, + _In_z_ LPCSTR psz2) + { + return ::strcmp(psz1, psz2); + } + + static int __cdecl FormatV( + _In_opt_z_ LPSTR pszDest, + _In_z_ LPCSTR pszFormat, + _In_ va_list args) + { + if (pszDest == NULL) + return ::_vscprintf(pszFormat, args); + return ::vsprintf(pszDest, pszFormat, args); + } + +}; namespace _CSTRING_IMPL_ @@ -62,6 +265,8 @@ }; } + +// TODO: disable conversion functions when _CSTRING_DISABLE_NARROW_WIDE_CONVERSION is defined. template <typename BaseType, class StringTraits> class CStringT : @@ -90,12 +295,19 @@ static void __cdecl Construct(_In_ CStringT* pString) { - pString = new CStringT; + new(pString) CStringT; } CStringT(_In_ const CStringT& strSrc) : CThisSimpleString(strSrc) { + } + + template<class StringTraits_> + CStringT(_In_ const CStringT<YCHAR, StringTraits_> & strSrc) : + CThisSimpleString(StringTraits::GetDefaultManager()) + { + *this = static_cast<const YCHAR*>(strSrc); } CStringT(_In_opt_z_ const XCHAR* pszSrc) : @@ -114,6 +326,36 @@ *this = pszSrc; } + CStringT(_In_opt_z_ const YCHAR* pszSrc) : + CThisSimpleString( StringTraits::GetDefaultManager() ) + { + // FIXME: Check whether pszSrc is not a resource string ID! + *this = pszSrc; + } + + CStringT( + _In_opt_z_ const YCHAR* pszSrc, + _In_ IAtlStringMgr* pStringMgr) : + CThisSimpleString( pStringMgr ) + { + // FIXME: Check whether pszSrc is not a resource string ID! + *this = pszSrc; + } + + CStringT( + _In_reads_z_(nLength) const XCHAR* pch, + _In_ int nLength) : + CThisSimpleString(pch, nLength, StringTraits::GetDefaultManager()) + { + } + + CStringT( + _In_reads_z_(nLength) const YCHAR* pch, + _In_ int nLength) : + CThisSimpleString(pch, nLength, StringTraits::GetDefaultManager()) + { + } + CStringT& operator=(_In_ const CStringT& strSrc) { CThisSimpleString::operator=(strSrc); @@ -124,6 +366,59 @@ { CThisSimpleString::operator=(pszSrc); return *this; + } + + CStringT& operator=(_In_opt_z_ PCYSTR pszSrc) + { + int length = pszSrc ? StringTraits::GetBaseTypeLength(pszSrc) : 0; + if (length > 0) + { + PXSTR result = CThisSimpleString::GetBuffer(length); + StringTraits::ConvertToBaseType(result, length, pszSrc); + CThisSimpleString::ReleaseBufferSetLength(length); + } + else + { + CThisSimpleString::Empty(); + } + return *this; + } + + friend bool operator==(const CStringT& str1, const CStringT& str2) throw() + { + return str1.Compare(str2) == 0; + } + + friend bool operator==(const CStringT& str1, PCXSTR psz2) throw() + { + return str1.Compare(psz2) == 0; + } + + friend bool operator==(const CStringT& str1, PCYSTR psz2) throw() + { + CStringT tmp(psz2, str1.GetManager()); + return tmp == str1; + } + + friend bool operator==(const CStringT& str1, XCHAR ch2) throw() + { + return str1.GetLength() == 1 && str1[0] == ch2; + } + + friend bool operator==(PCXSTR psz1, const CStringT& str2) throw() + { + return str2.Compare(psz1) == 0; + } + + friend bool operator==(PCYSTR psz1, const CStringT& str2) throw() + { + CStringT tmp(psz1, str2.GetManager()); + return tmp.Compare(str2) == 0; + } + + friend bool operator==(XCHAR ch1, const CStringT& str2) throw() + { + return str2.GetLength() == 1 && str2[0] == ch1; } CStringT& operator+=(_In_ const CThisSimpleString& str) @@ -151,6 +446,299 @@ return TRUE; } + + CStringT& MakeLower() + { + int nLength = CThisSimpleString::GetLength(); + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength); + + StringTraits::MakeLower(pszBuffer, nLength); + CThisSimpleString::ReleaseBufferSetLength(nLength); + + return *this; + } + + CStringT& MakeUpper() + { + int nLength = CThisSimpleString::GetLength(); + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength); + + StringTraits::MakeUpper(pszBuffer, nLength); + CThisSimpleString::ReleaseBufferSetLength(nLength); + + return *this; + } + + int Find(_In_ PCXSTR pszSub, _In_opt_ int iStart = 0) const throw() + { + int nLength = CThisSimpleString::GetLength(); + + if (iStart >= nLength || iStart < 0) + return -1; + + PCXSTR pszString = CThisSimpleString::GetString(); + PCXSTR pszResult = StringTraits::FindString(pszString + iStart, pszSub); + + return pszResult ? ((int)(pszResult - pszString)) : -1; + } + + int Find(_In_ XCHAR ch, _In_opt_ int iStart = 0) const throw() + { + int nLength = CThisSimpleString::GetLength(); + + if (iStart >= nLength || iStart < 0) + return -1; + + PCXSTR pszString = CThisSimpleString::GetString(); + PCXSTR pszResult = StringTraits::FindChar(pszString + iStart, ch); + + return pszResult ? ((int)(pszResult - pszString)) : -1; + } + + int FindOneOf(_In_ PCXSTR pszCharSet) const throw() + { + PCXSTR pszString = CThisSimpleString::GetString(); + PCXSTR pszResult = StringTraits::FindOneOf(pszString, pszCharSet); + + return pszResult ? ((int)(pszResult - pszString)) : -1; + } + + int ReverseFind(_In_ XCHAR ch) const throw() + { + PCXSTR pszString = CThisSimpleString::GetString(); + PCXSTR pszResult = StringTraits::FindCharReverse(pszString, ch); + + return pszResult ? ((int)(pszResult - pszString)) : -1; + } + + int Compare(_In_z_ PCXSTR psz) const + { + return StringTraits::Compare(CThisSimpleString::GetString(), psz); + } + + + CStringT Mid(int iFirst, int nCount) const + { + int nLength = CThisSimpleString::GetLength(); + + if (iFirst < 0) + iFirst = 0; + if (nCount < 0) + nCount = 0; + if (iFirst > nLength) + iFirst = nLength; + if (iFirst + nCount > nLength) + nCount = nLength - iFirst; + + return CStringT(CThisSimpleString::GetString() + iFirst, nCount); + } + + CStringT Mid(int iFirst) const + { + int nLength = CThisSimpleString::GetLength(); + + if (iFirst < 0) + iFirst = 0; + if (iFirst > nLength) + iFirst = nLength; + + return CStringT(CThisSimpleString::GetString() + iFirst, nLength - iFirst); + } + + CStringT Left(int nCount) const + { + int nLength = CThisSimpleString::GetLength(); + + if (nCount < 0) + nCount = 0; + if (nCount > nLength) + nCount = nLength; + + return CStringT(CThisSimpleString::GetString(), nCount); + } + + CStringT Right(int nCount) const + { + int nLength = CThisSimpleString::GetLength(); + + if (nCount < 0) + nCount = 0; + if (nCount > nLength) + nCount = nLength; + + return CStringT(CThisSimpleString::GetString() + nLength - nCount, nCount); + } + + + //void __cdecl Format(UINT nFormatID, ...) + //{ + // va_list args; + // va_start(args, dwMessageId); + // CStringT formatString; + // formatString.LoadString(?????); + // FormatV(formatString, args); + // va_end(args); + //} + + void __cdecl Format(PCXSTR pszFormat, ...) + { + va_list args; + va_start(args, pszFormat); + FormatV(pszFormat, args); + va_end(args); + } + + void FormatV(PCXSTR pszFormat, va_list args) + { + int nLength = StringTraits::FormatV(NULL, pszFormat, args); + + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength); + StringTraits::FormatV(pszBuffer, pszFormat, args); + CThisSimpleString::ReleaseBufferSetLength(nLength); + } + + + int Replace(PCXSTR pszOld, PCXSTR pszNew) + { + PCXSTR pszString = CThisSimpleString::GetString(); + + const int nLength = CThisSimpleString::GetLength(); + const int nOldLen = StringTraits::GetBaseTypeLength(pszOld); + const int nNewLen = StringTraits::GetBaseTypeLength(pszNew); + const int nDiff = nNewLen - nOldLen; + int nResultLength = nLength; + + PCXSTR pszFound; + while ((pszFound = StringTraits::FindString(pszString, pszOld))) + { + nResultLength += nDiff; + pszString = pszFound + nOldLen; + } + + if (pszString == CThisSimpleString::GetString()) + return 0; + + PXSTR pszResult = CThisSimpleString::GetBuffer(nResultLength); + PXSTR pszNext; + int nCount = 0, nRemaining = nLength; + while (nRemaining && (pszNext = StringTraits::FindString(pszResult, pszOld))) + { + nRemaining -= (pszNext - pszResult); + nRemaining -= nOldLen; + if (nRemaining > 0) + CThisSimpleString::CopyCharsOverlapped(pszNext + nNewLen, nRemaining + 1, pszNext + nOldLen, nRemaining + 1); + CThisSimpleString::CopyCharsOverlapped(pszNext, nNewLen, pszNew, nNewLen); + pszResult = pszNext + nNewLen; + nCount++; + } + + CThisSimpleString::ReleaseBufferSetLength(nResultLength); + + return nCount; + } + + int Replace(XCHAR chOld, XCHAR chNew) + { + PCXSTR pszString = CThisSimpleString::GetString(); + PXSTR pszFirst = StringTraits::FindChar(pszString, chOld); + if (!pszFirst) + return 0; + + int nLength = CThisSimpleString::GetLength(); + int nCount = 0; + + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength); + pszFirst = pszBuffer + (pszFirst - pszString); + do { + *pszFirst = chNew; + ++nCount; + } while ((pszFirst = StringTraits::FindChar(pszFirst + 1, chOld))); + + CThisSimpleString::ReleaseBufferSetLength(nLength); + return nCount; + } + + + static PCXSTR DefaultTrimChars() + { + static XCHAR str[] = { ' ', '\t', '\r', '\n', 0 }; + return str; + } + + + CStringT& TrimLeft() + { + return TrimLeft(DefaultTrimChars()); + } + + CStringT& TrimLeft(XCHAR chTarget) + { + XCHAR str[2] = { chTarget, 0 }; + return TrimLeft(str); + } + + CStringT& TrimLeft(PCXSTR pszTargets) + { + int nLength = CThisSimpleString::GetLength(); + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength); + int nCount = 0; + + while (nCount < nLength && StringTraits::FindChar(pszTargets, pszBuffer[nCount])) + nCount++; + + if (nCount > 0) + { + CThisSimpleString::CopyCharsOverlapped(pszBuffer, nLength - nCount, pszBuffer + nCount, nLength - nCount); + nLength -= nCount; + } + CThisSimpleString::ReleaseBufferSetLength(nLength); + + return *this; + } + + + CStringT& TrimRight() + { + return TrimRight(DefaultTrimChars()); + } + + CStringT& TrimRight(XCHAR chTarget) + { + XCHAR str[2] = { chTarget, 0 }; + return TrimRight(str); + } + + CStringT& TrimRight(PCXSTR pszTargets) + { + int nLength = CThisSimpleString::GetLength(); + PXSTR pszBuffer = CThisSimpleString::GetBuffer(nLength); + + while (nLength > 0 && StringTraits::FindChar(pszTargets, pszBuffer[nLength-1])) + nLength--; + + CThisSimpleString::ReleaseBufferSetLength(nLength); + + return *this; + } + + + CStringT& Trim() + { + return Trim(DefaultTrimChars()); + } + + CStringT& Trim(XCHAR chTarget) + { + XCHAR str[2] = { chTarget, 0 }; + return Trim(str); + } + + CStringT& Trim(PCXSTR pszTargets) + { + return TrimRight(pszTargets).TrimLeft(pszTargets); + } + + }; } //namespace ATL Modified: trunk/rostests/apitests/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CMakeLists.t… ============================================================================== --- trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/CMakeLists.txt [iso-8859-1] Sat Jul 30 19:07:43 2016 @@ -1,11 +1,12 @@ -set_cpp(WITH_RUNTIME) +set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/atl) add_executable(atl_apitest CComBSTR.cpp CComHeapPtr.cpp + CString.cpp testlist.c atl_apitest.rc) Added: trunk/rostests/apitests/atl/CString.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CString.cpp?… ============================================================================== --- trunk/rostests/apitests/atl/CString.cpp (added) +++ trunk/rostests/apitests/atl/CString.cpp [iso-8859-1] Sat Jul 30 19:07:43 2016 @@ -0,0 +1,176 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CString + * PROGRAMMER: Mark Jansen + */ + +#include <apitest.h> +#include <atlstr.h> + + +struct traits_test +{ + const char* strA; + const wchar_t* strW; + int str_len; + int exp_1, exp_2, exp_3, exp_4; +}; + +traits_test g_Tests[] = { + // inputs outputs + { NULL, NULL, 0, 0, 0, -1, 0 }, + { NULL, NULL, -1, 0, -1, -1, 0 }, + { NULL, NULL, 1, 0, 1, -1, 0 }, + + { "", L"", 0, 0, 0, 0, 0 }, + { "", L"", -1, 0, -1, 0, 1 }, + { "", L"", 1, 0, 1, 0, 1 }, + + { "AAABBB", L"AAABBB", 0, 6, 0, 6, 0 }, + { "AAABBB", L"AAABBB", 3, 6, 3, 6, 3 }, + { "AAABBB", L"AAABBB", -1, 6, -1, 6, 7 }, +}; + +static void test_basetypes() +{ + int len; + char bufA[10]; + wchar_t bufW[10]; + + for (size_t n = 0; n < _countof(g_Tests); ++n) + { + len = ChTraitsCRT<char>::GetBaseTypeLength(g_Tests[n].strA); + ok(len == g_Tests[n].exp_1, "Expected len to be %i, was %i for %u (A)\n", g_Tests[n].exp_1, len, n); + + len = ChTraitsCRT<char>::GetBaseTypeLength(g_Tests[n].strA, g_Tests[n].str_len); + ok(len == g_Tests[n].exp_2, "Expected len to be %i, was %i for %u (A,len)\n", g_Tests[n].exp_2, len, n); + + len = ChTraitsCRT<char>::GetBaseTypeLength(g_Tests[n].strW); + ok(len == g_Tests[n].exp_3, "Expected len to be %i, was %i for %u (W)\n", g_Tests[n].exp_3, len, n); + + len = ChTraitsCRT<char>::GetBaseTypeLength(g_Tests[n].strW, g_Tests[n].str_len); + ok(len == g_Tests[n].exp_4, "Expected len to be %i, was %i for %u (W,len)\n", g_Tests[n].exp_4, len, n); + + if (g_Tests[n].strA && g_Tests[n].strW) + { + memset(bufA, 'x', sizeof(bufA)); + ChTraitsCRT<char>::ConvertToBaseType(bufA, g_Tests[n].exp_1+1, g_Tests[n].strA); + char ch = bufA[g_Tests[n].exp_1]; + ok(ch == '\0', "Expected %i to be \\0, was: %c (%i) for %u\n", g_Tests[n].exp_1, ch, (int)ch, n); + ok(!strcmp(bufA, g_Tests[n].strA), "Expected bufA to be %s, was: %s for %u\n", g_Tests[n].strA, bufA, n); + ch = bufA[g_Tests[n].exp_1+1]; + ok(ch == 'x', "Expected %i to be 'x', was: %c (%i) for %u\n", g_Tests[n].exp_1+1, ch, (int)ch, n); + } + + if (g_Tests[n].strA && g_Tests[n].strW) + { + memset(bufA, 'x', sizeof(bufA)); + ChTraitsCRT<char>::ConvertToBaseType(bufA, g_Tests[n].exp_1+1, g_Tests[n].strW); + char ch = bufA[g_Tests[n].exp_1]; + ok(ch == '\0', "Expected %i to be \\0, was: %c (%i) for %u\n", g_Tests[n].exp_1, ch, (int)ch, n); + ok(!strcmp(bufA, g_Tests[n].strA), "Expected bufA to be %s, was: %s for %u\n", g_Tests[n].strA, bufA, n); + ch = bufA[g_Tests[n].exp_1+1]; + ok(ch == 'x', "Expected %i to be 'x', was: %c (%i) for %u\n", g_Tests[n].exp_1+1, ch, (int)ch, n); + } + + // wchar_t --> please note, swapped the expectations from 2 and 4 ! + len = ChTraitsCRT<wchar_t>::GetBaseTypeLength(g_Tests[n].strA); + ok(len == g_Tests[n].exp_1, "Expected len to be %i, was %i for %u (A)\n", g_Tests[n].exp_1, len, n); + + len = ChTraitsCRT<wchar_t>::GetBaseTypeLength(g_Tests[n].strA, g_Tests[n].str_len); + ok(len == g_Tests[n].exp_4, "Expected len to be %i, was %i for %u (A,len)\n", g_Tests[n].exp_4, len, n); + + len = ChTraitsCRT<wchar_t>::GetBaseTypeLength(g_Tests[n].strW); + ok(len == g_Tests[n].exp_3, "Expected len to be %i, was %i for %u (W)\n", g_Tests[n].exp_3, len, n); + + len = ChTraitsCRT<wchar_t>::GetBaseTypeLength(g_Tests[n].strW, g_Tests[n].str_len); + ok(len == g_Tests[n].exp_2, "Expected len to be %i, was %i for %u (W,len)\n", g_Tests[n].exp_2, len, n); + + if (g_Tests[n].strA && g_Tests[n].strW) + { + memset(bufW, 'x', sizeof(bufW)); + ChTraitsCRT<wchar_t>::ConvertToBaseType(bufW, g_Tests[n].exp_1+1, g_Tests[n].strA); + wchar_t ch = bufW[g_Tests[n].exp_1]; + ok(ch == L'\0', "Expected %i to be \\0, was: %c (%i) for %u\n", g_Tests[n].exp_1, ch, (int)ch, n); + ok(!wcscmp(bufW, g_Tests[n].strW), "Expected bufW to be %s, was: %s for %u\n", wine_dbgstr_w(g_Tests[n].strW), wine_dbgstr_w(bufW), n); + ch = bufW[g_Tests[n].exp_1+1]; + ok(ch == 30840, "Expected %i to be %i for %u\n", g_Tests[n].exp_1+1, (int)ch, n); + } + + if (g_Tests[n].strA && g_Tests[n].strW) + { + memset(bufW, 'x', sizeof(bufW)); + ChTraitsCRT<wchar_t>::ConvertToBaseType(bufW, g_Tests[n].exp_1+1, g_Tests[n].strW); + wchar_t ch = bufW[g_Tests[n].exp_1]; + ok(ch == '\0', "Expected %i to be \\0, was: %c (%i) for %u\n", g_Tests[n].exp_1, ch, (int)ch, n); + ok(!wcscmp(bufW, g_Tests[n].strW), "Expected bufW to be %s, was: %s for %u\n", wine_dbgstr_w(g_Tests[n].strW), wine_dbgstr_w(bufW), n); + ch = bufW[g_Tests[n].exp_1+1]; + ok(ch == 30840, "Expected %i to be %i for %u\n", g_Tests[n].exp_1+1, (int)ch, n); + } + } +} + +// Allocation strategy seems to differ a bit between us and MS's atl. +// if someone cares enough to find out why, feel free to change the macro below. +#define ALLOC_EXPECT(a, b) b + + +#undef ok +#undef _T + +#define TEST_NAMEX(name) void test_##name##W() +#define CStringX CStringW +#define _X(x) L ## x +#define XCHAR WCHAR +#define dbgstrx(x) wine_dbgstr_w(x) +#define ok ok_("CStringW:\n" __FILE__, __LINE__) +#include "CString.inl" + + +#undef CStringX +#undef TEST_NAMEX +#undef _X +#undef XCHAR +#undef dbgstrx +#undef ok + +#define TEST_NAMEX(name) void test_##name##A() +#define CStringX CStringA +#define _X(x) x +#define XCHAR CHAR +#define dbgstrx(x) (const char*)x +#define ok ok_("CStringA:\n" __FILE__, __LINE__) +#include "CString.inl" + + +START_TEST(CString) +{ + test_basetypes(); + + if ((ALLOC_EXPECT(1, 2)) == 2) + { + skip("Ignoring real GetAllocLength() lenght\n"); + } + + test_operators_initW(); + test_operators_initA(); + + test_compareW(); + test_compareA(); + + test_findW(); + test_findA(); + + test_formatW(); + test_formatA(); + + test_substrW(); + test_substrA(); + + test_replaceW(); + test_replaceA(); + + test_trimW(); + test_trimA(); +} Propchange: trunk/rostests/apitests/atl/CString.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/atl/CString.inl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CString.inl?… ============================================================================== --- trunk/rostests/apitests/atl/CString.inl (added) +++ trunk/rostests/apitests/atl/CString.inl [iso-8859-1] Sat Jul 30 19:07:43 2016 @@ -0,0 +1,358 @@ + +TEST_NAMEX(operators_init) +{ + CStringX test; + ok(test.IsEmpty() == true, "Expected test to be empty\n"); + ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == 0, "Expected GetAllocLength() to be 0, was: %i\n", test.GetAllocLength()); + + // Operator + const XCHAR* cstring = (const XCHAR*)test; + ok(cstring != NULL, "Expected a valid pointer\n"); + if (cstring) + { + ok(cstring[0] == '\0', "Expected \\0, got: %c (%i)\n", cstring[0], (int)cstring[0]); + } + + CStringX first(_X("First ")); + ok(first.IsEmpty() != true, "Expected first to not be empty\n"); + ok(first.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", first.GetLength()); + ok(first.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(7, 6), first.GetAllocLength()); + + CStringX second(_X("Second")); + ok(second.IsEmpty() != true, "Expected second to not be empty\n"); + ok(second.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", second.GetLength()); + ok(second.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(7, 6), second.GetAllocLength()); + + test = first; + ok(test.IsEmpty() != true, "Expected test to not be empty\n"); + ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(7, 6), test.GetAllocLength()); + + test.Empty(); + ok(test.IsEmpty() == true, "Expected test to be empty\n"); + ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == 0, "Expected GetAllocLength() to be 0, was: %i\n", test.GetAllocLength()); + + test = _X("First "); + ok(test.IsEmpty() != true, "Expected test to not be empty\n"); + ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(7, 6), test.GetAllocLength()); + + test += second; + ok(test.IsEmpty() != true, "Expected test to not be empty\n"); + ok(test.GetLength() == 12, "Expected GetLength() to be 12, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == ALLOC_EXPECT(15, 12), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(15, 12), test.GetAllocLength()); + + test = first + second; + ok(test.IsEmpty() != true, "Expected test to not be empty\n"); + ok(test.GetLength() == 12, "Expected GetLength() to be 12, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == ALLOC_EXPECT(15, 12), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(15, 12), test.GetAllocLength()); + + test = first + second + _X("."); + ok(test.IsEmpty() != true, "Expected test to not be empty\n"); + ok(test.GetLength() == 13, "Expected GetLength() to be 13, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == ALLOC_EXPECT(15, 18), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(15, 18), test.GetAllocLength()); + + CStringX test2(test); + ok(test2.IsEmpty() != true, "Expected test2 to not be empty\n"); + ok(test2.GetLength() == 13, "Expected GetLength() to be 13, was: %i\n", test2.GetLength()); + ok(test2.GetAllocLength() == ALLOC_EXPECT(15, 18), "Expected GetAllocLength() to be %i, was: %i\n", ALLOC_EXPECT(15, 18), test2.GetAllocLength()); + + // Clear it again + test.Empty(); + ok(test.IsEmpty() == true, "Expected test to be empty\n"); + ok(test.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == 0, "Expected GetAllocLength() to be 0, was: %i\n", test.GetAllocLength()); + + // Assign string + test = "First "; + ok(test.IsEmpty() != true, "Expected test to not be empty\n"); + ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be 7, was: %i\n", test.GetAllocLength()); + + CStringA testA = test; + ok(testA.IsEmpty() != true, "Expected testA to not be empty\n"); + ok(testA.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", testA.GetLength()); + ok(testA.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be 7, was: %i\n", testA.GetAllocLength()); + + CStringW testW = test; + ok(testW.IsEmpty() != true, "Expected testW to not be empty\n"); + ok(testW.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", testW.GetLength()); + ok(testW.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be 7, was: %i\n", testW.GetAllocLength()); + + // Assign wstring + test = L"First "; + ok(test.IsEmpty() != true, "Expected test to not be empty\n"); + ok(test.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", test.GetLength()); + ok(test.GetAllocLength() == ALLOC_EXPECT(7, 6), "Expected GetAllocLength() to be 7, was: %i\n", test.GetAllocLength()); +} + + +TEST_NAMEX(compare) +{ + CStringX s1, s2; + s1 = s2 = _X("some text 1!"); + + int c = s1.Compare(s2); + ok(c == 0, "Expected c to be 1, was: %i\n", c); + + c = s1.Compare(_X("r")); + ok(c == 1, "Expected c to be 1, was: %i\n", c); + + c = s1.Compare(_X("s")); + ok(c == 1, "Expected c to be 1, was: %i\n", c); + + c = s1.Compare(_X("t")); + ok(c == -1, "Expected c to be -1, was: %i\n", c); + + c = s1.Compare(_X("R")); + ok(c == 1, "Expected c to be 1, was: %i\n", c); + + c = s1.Compare(_X("S")); + ok(c == 1, "Expected c to be 1, was: %i\n", c); + + c = s1.Compare(_X("T")); + ok(c == 1, "Expected c to be 1, was: %i\n", c); + + ok(s1 == s2, "Expected s1 and s2 to be equal: '%s' == '%s'\n", dbgstrx(s1), dbgstrx(s2)); + + s1.MakeUpper(); // Does not modify s2 + ok(s1[0] == _X('S'), "Expected s1[0] to be S, was: %c\n", (char)s1[0]); + ok(s2[0] == _X('s'), "Expected s2[0] to be s, was: %c\n", (char)s2[0]); + + ok(s1 == _X("SOME TEXT 1!"), "Expected s1 to be 'SOME TEXT 1!', was: %s\n", dbgstrx(s1)); + + CStringX s3 = s1.MakeLower(); + ok(s1 == _X("some text 1!"), "Expected s1 to be 'some text 1!', was: %s\n", dbgstrx(s1)); + ok(s1 == s3, "Expected s1 and s3 to be equal: '%s' == '%s'\n", dbgstrx(s1), dbgstrx(s3)); +} + + +TEST_NAMEX(find) +{ + CStringX s(_X("adbcdef")); + int n = s.Find(_X('c')); + ok(n == 3, "Expected n to be 2, was %i\n", n); + n = s.Find(_X("de")); + ok(n == 4, "Expected n to be 4, was %i\n", n); + + CStringX str(_X("The waves are still")); + n = str.Find(_X('e'), 5); + ok(n == 7, "Expected n to be 7, was %i\n", n); + n = str.Find(_X('e'), 7); + ok(n == 7, "Expected n to be 7, was %i\n", n); + + s = _X("abcdefGHIJKLMNop"); + n = s.FindOneOf(_X("Nd")); + ok(n == 3, "Expected n to be 3, was %i\n", n); + n = s.FindOneOf(_X("Np")); + ok(n == 13, "Expected n to be 13, was %i\n", n); + + n = str.ReverseFind(_X('l')); + ok(n == 18, "Expected n to be 18, was %i\n", n); + + n = str.ReverseFind(_X('e')); + ok(n == 12, "Expected n to be 12, was %i\n", n); +} + + +void WriteString(const XCHAR* pstrFormat, ...) +{ + CStringX str; + + va_list args; + va_start(args, pstrFormat); + + str.FormatV(pstrFormat, args); + va_end(args); + + ok(str == _X("10e 1351l"), "Expected str to be '10e 1351l', was: %s\n", dbgstrx(str)); +} + +TEST_NAMEX(format) +{ + CStringX str; + + str.Format(_X("FP: %.2f"), 12345.12345); + ok(str == _X("FP: 12345.12"), "Expected str to be 'FP: 12345.12', was: %s\n", dbgstrx(str)); + + str.Format(_X("int: %.6d"), 35); + ok(str == _X("int: 000035"), "Expected str to be 'int: 000035', was: %s\n", dbgstrx(str)); + + WriteString(_X("%de %dl"), 10, 1351); +} + + +TEST_NAMEX(substr) +{ + CStringX s(_X("abcdef")); + + CStringX m = s.Mid(2, 3); + ok(m == _X("cde"), "Expected str to be 'cde', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 3, "Expected GetLength() to be 3, was: %i\n", m.GetLength()); + + m = s.Mid(-5, 3); + ok(m == _X("abc"), "Expected str to be 'abc', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 3, "Expected GetLength() to be 3, was: %i\n", m.GetLength()); + + m = s.Mid(3, 20); + ok(m == _X("def"), "Expected str to be 'def', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 3, "Expected GetLength() to be 3, was: %i\n", m.GetLength()); + + m = s.Mid(3, -1); + ok(m == _X(""), "Expected str to be '', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", m.GetLength()); + + m = s.Mid(2); + ok(m == _X("cdef"), "Expected str to be 'cdef', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 4, "Expected GetLength() to be 4, was: %i\n", m.GetLength()); + + m = s.Mid(-3); + ok(m == _X("abcdef"), "Expected str to be 'abcdef', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", m.GetLength()); + + m = s.Mid(20); + ok(m == _X(""), "Expected str to be '', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", m.GetLength()); + + m = s.Left(2); + ok(m == _X("ab"), "Expected str to be 'ab', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 2, "Expected GetLength() to be 2, was: %i\n", m.GetLength()); + + m = s.Left(40); + ok(m == _X("abcdef"), "Expected str to be 'abcdef', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", m.GetLength()); + + m = s.Left(-10); + ok(m == _X(""), "Expected str to be '', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", m.GetLength()); + + m = s.Right(2); + ok(m == _X("ef"), "Expected str to be 'ef', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 2, "Expected GetLength() to be 2, was: %i\n", m.GetLength()); + + m = s.Right(-40); + ok(m == _X(""), "Expected str to be '', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", m.GetLength()); + + m = s.Right(99); + ok(m == _X("abcdef"), "Expected str to be 'abcdef', was: %s\n", dbgstrx(m)); + ok(m.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", m.GetLength()); +} + + +TEST_NAMEX(replace) +{ + CStringX str(_X("abcde")); + int n = str.Replace(_X("b"), _X("bx")); + ok(n == 1, "Expected n to be 1, was %i\n", n); + ok(str == _X("abxcde"), "Expected str to be 'abxcde', was: %s\n", dbgstrx(str)); + ok(str.GetLength() == 6, "Expected GetLength() to be 6, was: %i\n", str.GetLength()); + + CStringX strBang(_X("The quick brown fox is lazy today of all days")); + + n = strBang.Replace(_X("is"), _X("was")); + ok(n == 1, "Expected n to be 1, was %i\n", n); + ok(strBang == _X("The quick brown fox was lazy today of all days"), + "Expected str to be 'The quick brown fox was lazy today of all days', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 46, "Expected GetLength() to be 46, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X("is"), _X("was")); + ok(n == 0, "Expected n to be 0, was %i\n", n); + ok(strBang == _X("The quick brown fox was lazy today of all days"), + "Expected str to be 'The quick brown fox was lazy today of all days', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 46, "Expected GetLength() to be 46, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X('o'), _X('0')); + ok(n == 4, "Expected n to be 4, was %i\n", n); + ok(strBang == _X("The quick br0wn f0x was lazy t0day 0f all days"), + "Expected str to be 'The quick br0wn f0x was lazy t0day 0f all days', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 46, "Expected GetLength() to be 46, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X('o'), _X('0')); + ok(n == 0, "Expected n to be 0, was %i\n", n); + ok(strBang == _X("The quick br0wn f0x was lazy t0day 0f all days"), + "Expected str to be 'The quick br0wn f0x was lazy t0day 0f all days', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 46, "Expected GetLength() to be 46, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X("y "), _X("y, ")); + ok(n == 2, "Expected n to be 2, was %i\n", n); + ok(strBang == _X("The quick br0wn f0x was lazy, t0day, 0f all days"), + "Expected str to be 'The quick br0wn f0x was lazy, t0day, 0f all days', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 48, "Expected GetLength() to be 48, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X(", 0f all days"), _X("")); + ok(n == 1, "Expected n to be 1, was %i\n", n); + ok(strBang == _X("The quick br0wn f0x was lazy, t0day"), + "Expected str to be 'The quick br0wn f0x was lazy, t0day', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 35, "Expected GetLength() to be 35, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X(" lazy, "), _X(" fast ")); + ok(n == 1, "Expected n to be 1, was %i\n", n); + ok(strBang == _X("The quick br0wn f0x was fast t0day"), + "Expected str to be 'The quick br0wn f0x was fast t0day', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 34, "Expected GetLength() to be 34, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X("The "), _X("")); + ok(n == 1, "Expected n to be 1, was %i\n", n); + ok(strBang == _X("quick br0wn f0x was fast t0day"), + "Expected str to be 'quick br0wn f0x was fast t0day', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 30, "Expected GetLength() to be 30, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X(" t0day"), _X("")); + ok(n == 1, "Expected n to be 1, was %i\n", n); + ok(strBang == _X("quick br0wn f0x was fast"), + "Expected str to be 'quick br0wn f0x was fast', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 24, "Expected GetLength() to be 24, was: %i\n", strBang.GetLength()); + + n = strBang.Replace(_X("quick"), _X("The fast, quick")); + ok(n == 1, "Expected n to be 1, was %i\n", n); + ok(strBang == _X("The fast, quick br0wn f0x was fast"), + "Expected str to be 'The fast, quick br0wn f0x was fast', was: %s\n", dbgstrx(strBang)); + ok(strBang.GetLength() == 34, "Expected GetLength() to be 34, was: %i\n", strBang.GetLength()); +} + + +TEST_NAMEX(trim) +{ + CStringX str; + str = _X(" \t\r\n******Trim some text!?!?!?!?!\n\r\t "); + + str.TrimLeft(); + ok(str == _X("******Trim some text!?!?!?!?!\n\r\t "), "Expected str to be '******Trim some text!?!?!?!?!\n\r\t ', was: %s\n", dbgstrx(str)); + ok(str.GetLength() == 33, "Expected GetLength() to be 33, was: %i\n", str.GetLength()); + + str.TrimRight(); + ok(str == _X("******Trim some text!?!?!?!?!"), "Expected str to be '******Trim some text!?!?!?!?!', was: %s\n", dbgstrx(str)); + ok(str.GetLength() == 29, "Expected GetLength() to be 29, was: %i\n", str.GetLength()); + + CStringX str2 = str.Trim(_X("?!*")); + ok(str2 == _X("Trim some text"), "Expected str to be 'Trim some text', was: %s\n", dbgstrx(str2)); + ok(str2.GetLength() == 14, "Expected GetLength() to be 14, was: %i\n", str2.GetLength()); + + str = _X("\t\t ****Trim some text!"); + str2 = str.TrimLeft(_X("\t *")); + ok(str2 == _X("Trim some text!"), "Expected str to be 'Trim some text!', was: %s\n", dbgstrx(str2)); + ok(str2.GetLength() == 15, "Expected GetLength() to be 15, was: %i\n", str2.GetLength()); + + str = _X("Trim some text!?!?!?!?!"); + str2 = str.TrimRight(_X("?!")); + ok(str2 == _X("Trim some text"), "Expected str to be 'Trim some text', was: %s\n", dbgstrx(str2)); + ok(str2.GetLength() == 14, "Expected GetLength() to be 14, was: %i\n", str2.GetLength()); + + str = _X("\t\t\t\t\t"); + str2 = str.TrimLeft(); + ok(str2 == _X(""), "Expected str2 to be '', was: %s\n", dbgstrx(str2)); + ok(str2.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", str2.GetLength()); + + str = _X("\t\t\t\t\t"); + str2 = str.TrimRight(); + ok(str2 == _X(""), "Expected str2 to be '', was: %s\n", dbgstrx(str2)); + ok(str2.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", str2.GetLength()); + + str = _X("\t\t\t\t\t"); + str2 = str.Trim(); + ok(str2 == _X(""), "Expected str2 to be '', was: %s\n", dbgstrx(str2)); + ok(str2.GetLength() == 0, "Expected GetLength() to be 0, was: %i\n", str2.GetLength()); +} Propchange: trunk/rostests/apitests/atl/CString.inl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/atl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/testlist.c?r… ============================================================================== --- trunk/rostests/apitests/atl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/atl/testlist.c [iso-8859-1] Sat Jul 30 19:07:43 2016 @@ -3,10 +3,12 @@ extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); +extern void func_CString(void); const struct test winetest_testlist[] = { { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, + { "CString", func_CString }, { 0, 0 } };

1 0

[hbelusca] 72060: [SCSIPORT]: Port Dmitry's fix from r72059 to our scsiport driver too. I'm wondering how "difficult" it would be to have some kind of scsiport library to be shared between the driv...
by hbelusca＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: hbelusca Date: Sat Jul 30 16:20:41 2016 New Revision: 72060 URL: http://svn.reactos.org/svn/reactos?rev=72060&view=rev Log: [SCSIPORT]: Port Dmitry's fix from r72059 to our scsiport driver too. I'm wondering how "difficult" it would be to have some kind of scsiport library to be shared between the driver and freeldr's. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sat Jul 30 16:20:41 2016 @@ -674,7 +674,6 @@ else { /* Nothing */ - *Length = 0; PhysicalAddress.QuadPart = (LONGLONG)(SP_UNINITIALIZED_VALUE); }

1 0

[dchapyshev] 72059: [WHOAMI] [ARP] [TRACERT] - Incorrect to compare the variable of BOOL type with TRUE. Any non-zero value is considered to be "true". [FREELDR] - Variable is assigned values twice...
by dchapyshev＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: dchapyshev Date: Sat Jul 30 16:00:10 2016 New Revision: 72059 URL: http://svn.reactos.org/svn/reactos?rev=72059&view=rev Log: [WHOAMI] [ARP] [TRACERT] - Incorrect to compare the variable of BOOL type with TRUE. Any non-zero value is considered to be "true". [FREELDR] - Variable is assigned values twice - The 'strlen' function was called multiple times inside the body of a loop - It is inefficient to identify an empty string by using 'strlen(str) > 0' construct. A more efficient way is to check: str[0] != 0 [NTOBJSHEX] [SLAYER] [CMICONTROL] - It is inefficient to identify an empty string by using 'strlen(str) > 0' construct. A more efficient way is to check: str[0] != 0 [SHELL32] - There is no sense in testing the pointer against null, as the memory was allocated using the 'new' operator. The exception will be generated in the case of memory allocation error - Verifying that a pointer value is not NULL is not required. The 'if (ptr != NULL)' check can be removed - Fix copy-paste error in CMenuFocusManager::PlaceHooks() [SRCLIENT] - Remove unneeded check. A part of conditional expression is always false. [DISK] [ATAPI] - Variable is assigned values twice * All bugs found by PVS-Studio Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c trunk/reactos/base/applications/network/arp/arp.c trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c trunk/reactos/boot/freeldr/freeldr/lib/fs/fs.c trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c trunk/reactos/boot/freeldr/freeldr/ntldr/wlregistry.c trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/slayer/slayer.c trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp trunk/reactos/dll/win32/srclient/srclient_main.c trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/ide/atapi/atapi.c trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -753,7 +753,7 @@ { NoHeaderArgCount++; - if (NoHeader != TRUE) + if (NoHeader == FALSE) { NoHeader = TRUE; // wprintf(L"Headers disabled!\n"); @@ -788,7 +788,7 @@ /* looks like you can't use the "/fo list /nh" options together for some stupid reason */ - if (PrintFormat == list && NoHeader == TRUE) + if (PrintFormat == list && NoHeader != FALSE) { wprintf(WhoamiLoadRcString(IDS_ERROR_NH_LIST)); return 1; Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/arp/arp.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -464,7 +464,7 @@ pDelHost->dwIndex = pIpNetTable->table[0].dwIndex; } - if (bFlushTable == TRUE) + if (bFlushTable != FALSE) { /* delete arp cache */ if (FlushIpNetTable(pDelHost->dwIndex) != NO_ERROR) Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/tracert/tracert.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -450,7 +450,7 @@ /* run until we hit either max hops, or find the target */ while ((iHopCount <= pInfo->iMaxHops) && - (bFoundTarget != TRUE)) + (bFoundTarget == FALSE)) { USHORT iSeqNum = 0; INT i; @@ -460,7 +460,7 @@ /* run 3 pings for each hop */ for (i = 0; i < 3; i++) { - if (SetTTL(pInfo->icmpSock, iTTL) != TRUE) + if (SetTTL(pInfo->icmpSock, iTTL) == FALSE) { DebugPrint(_T("error in Setup()\n")); return ret; Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -607,7 +607,6 @@ else { /* Nothing */ - *Length = 0; PhysicalAddress.QuadPart = (LONGLONG)(SP_UNINITIALIZED_VALUE); } Modified: trunk/reactos/boot/freeldr/freeldr/lib/fs/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/lib/f… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/lib/fs/fs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/lib/fs/fs.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -385,9 +385,12 @@ ULONG FsGetNumPathParts(PCSTR Path) { size_t i; + size_t len; ULONG num; - - for (i = 0, num = 0; i < strlen(Path); i++) + + len = strlen(Path); + + for (i = 0, num = 0; i < len; i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { @@ -410,11 +413,14 @@ VOID FsGetFirstNameFromPath(PCHAR Buffer, PCSTR Path) { size_t i; + size_t len; + + len = strlen(Path); // Copy all the characters up to the end of the // string or until we hit a '\' character // and put them in Buffer - for (i = 0; i < strlen(Path); i++) + for (i = 0; i < len; i++) { if ((Path[i] == '\\') || (Path[i] == '/')) { Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ntldr… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/winldr.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -650,7 +650,7 @@ } /* Append a backslash if needed */ - if ((strlen(BootPath) == 0) || BootPath[strlen(BootPath) - 1] != '\\') + if ((BootPath[0] == 0) || BootPath[strlen(BootPath) - 1] != '\\') strcat(BootPath, "\\"); /* Read booting options */ Modified: trunk/reactos/boot/freeldr/freeldr/ntldr/wlregistry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ntldr… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ntldr/wlregistry.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ntldr/wlregistry.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -705,7 +705,7 @@ // Check - if we have a valid ImagePath, if not - we need to build it // like "System32\\Drivers\\blah.sys" - if (ImagePath && (wcslen(ImagePath) > 0)) + if (ImagePath && (ImagePath[0] != 0)) { // Just copy ImagePath to the corresponding field in the structure PathLength = (USHORT)wcslen(ImagePath) * sizeof(WCHAR) + sizeof(UNICODE_NULL); Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -471,7 +471,7 @@ SHCONTF grfFlags, IEnumIDList **ppenumIDList) { - if (wcslen(m_NtPath) == 0 && m_hRoot == NULL) + if (m_NtPath[0] == 0 && m_hRoot == NULL) { return GetEnumRegistryRoot(ppenumIDList); } Modified: trunk/reactos/dll/shellext/slayer/slayer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… ============================================================================== --- trunk/reactos/dll/shellext/slayer/slayer.c [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/slayer/slayer.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -161,7 +161,7 @@ } info->CSelectedItem = NULL; - if (_tcslen(szStr) > 0) + if (szStr[0] != 0) { PCITEM item; Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -172,8 +172,7 @@ } pThis = new CComObject<CDesktopBrowser>; - if (pThis == NULL) - return NULL; + pThis->AddRef(); hRet = pThis->Initialize(hWnd, ShellDesk); Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuBand.cpp [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -67,11 +67,8 @@ { CMenuFocusManager::ReleaseManager(m_focusManager); - if (m_staticToolbar) - delete m_staticToolbar; - - if (m_SFToolbar) - delete m_SFToolbar; + delete m_staticToolbar; + delete m_SFToolbar; if (m_hmenu) DestroyMenu(m_hmenu); Modified: trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellmen… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellmenu/CMenuFocusManager.cpp [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -680,7 +680,7 @@ HRESULT CMenuFocusManager::PlaceHooks() { - if (m_hMsgFilterHook) + if (m_hGetMsgHook) { WARN("GETMESSAGE hook already placed!\n"); return S_OK; Modified: trunk/reactos/dll/win32/srclient/srclient_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/srclient/srclien… ============================================================================== --- trunk/reactos/dll/win32/srclient/srclient_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/srclient/srclient_main.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -35,7 +35,7 @@ DPRINT1("SRSetRestorePointA is unimplemented\n"); - if (!pRestorePtSpec || !pRestorePtSpec->szDescription) + if (!pRestorePtSpec) return FALSE; RPInfoW.dwEventType = pRestorePtSpec->dwEventType; Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -505,7 +505,6 @@ // SRB zone elements to allocate. // - adapterDisk = 0; adapterInfo = (PVOID) buffer; adapterDisk = ScsiClassFindUnclaimedDevices(InitializationData, adapterInfo); Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -5483,7 +5483,6 @@ // deviceExtension->ExpectingInterrupt = FALSE; - status = SRB_STATUS_SUCCESS; } else { @@ -5495,7 +5494,6 @@ GetBaseStatus(baseIoAddress1, statusByte); deviceExtension->ExpectingInterrupt = FALSE; - status = SRB_STATUS_SUCCESS; if (errorByte & IDE_ERROR_DATA_ERROR) { Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.cpp [iso-8859-1] Sat Jul 30 16:00:10 2016 @@ -943,12 +943,10 @@ ZeroMemory(&cmiTopologyDev, sizeof(CMIDEV)); hWave = NULL; - if (szCmdLine) { - if (strlen(szCmdLine) > 0) { - int result = parseArguments(szCmdLine); - cleanUp(); - return result; - } + if (szCmdLine && szCmdLine[0] != 0) { + int result = parseArguments(szCmdLine); + cleanUp(); + return result; } if ((hWndMain = FindWindow("cmiControlPanel", NULL))) {

1 0

[ekohl] 72058: [SOLITAIRE] Add Portuguese/Brazillian translation. Patch by Lucas Raziel. CORE-11665 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: ekohl Date: Sat Jul 30 14:09:58 2016 New Revision: 72058 URL: http://svn.reactos.org/svn/reactos?rev=72058&view=rev Log: [SOLITAIRE] Add Portuguese/Brazillian translation. Patch by Lucas Raziel. CORE-11665 #resolve #comment Thanks a lot! Added: trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc Added: trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc [iso-8859-1] Sat Jul 30 14:09:58 2016 @@ -0,0 +1,86 @@ +/* Portuguese translation of solitaire by Lucas Raziel (Oldcpv3) (raziellucas(a)hotmail.com) */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "OpÃ§Ãµes" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Cartas", -1, 7, 7, 90, 40 + AUTORADIOBUTTON "&Uma Carta", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&TrÃªs Cartas", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 + GROUPBOX "PontuaÃ§Ã£o", -1, 100, 7, 75, 53 + AUTORADIOBUTTON "&PadrÃ£o", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 + AUTORADIOBUTTON "&Nenhum", IDC_OPT_NOSCORE, 107, 45, 60, 10 + AUTOCHECKBOX "&Mostrar Tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP + AUTOCHECKBOX "B&arra de Status", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "Manter a pontuaÃ§Ã£o", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 +END + +IDD_CARDBACK DIALOGEX 6, 6, 345, 185 +CAPTION "Selecionar Cartas" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 71 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 61, 7, 50, 71 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 118, 7, 50, 71 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 175, 7, 50, 71 + CONTROL "", IDC_CARDBACK5, "Static", SS_NOTIFY, 232, 7, 50, 71 + CONTROL "", IDC_CARDBACK6, "Static", SS_NOTIFY, 289, 7, 50, 71 + CONTROL "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 89, 50, 71 + CONTROL "", IDC_CARDBACK8, "Static", SS_NOTIFY, 61, 89, 50, 71 + CONTROL "", IDC_CARDBACK9, "Static", SS_NOTIFY, 118, 89, 50, 71 + CONTROL "", IDC_CARDBACK10, "Static", SS_NOTIFY, 175, 89, 50, 71 + CONTROL "", IDC_CARDBACK11, "Static", SS_NOTIFY, 232, 89, 50, 71 + CONTROL "", IDC_CARDBACK12, "Static", SS_NOTIFY, 289, 89, 50, 71 + DEFPUSHBUTTON "OK", IDOK, 114, 165, 54, 14 + PUSHBUTTON "Cancel", IDCANCEL, 176, 165, 54, 14 +END + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "PaciÃªncia" + IDS_SOL_ABOUT "PaciÃªncia por J Brown\n\nCardLib versÃ£o 1.0." + IDS_SOL_QUIT "Sair do jogo Atual?" + IDS_SOL_WIN "ParabÃ©ns, VocÃª ganhou!" + IDS_SOL_DEAL "Jogar de Novo?" + IDS_SOL_SCORE "PontuaÃ§Ã£o: %d" + IDS_SOL_TIME "Tempo: %d" +END + +/* Menus */ + +IDR_MENU1 MENU +BEGIN + POPUP "&Jogo" + BEGIN + MENUITEM "&Novo Jogo\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "Baralho...", IDM_GAME_DECK + MENUITEM "&OpÃ§Ãµes...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Sair", IDM_GAME_EXIT + END + POPUP "&Ajuda" + BEGIN + MENUITEM "&ConteÃºdo\tF1", IDM_HELP_CONTENTS + MENUITEM "&Sobre", IDM_HELP_ABOUT + END +END + +/* Accelerators */ + +IDR_ACCELERATOR1 ACCELERATORS +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Sat Jul 30 14:09:58 2016 @@ -69,6 +69,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 0

[ekohl] 72057: [INF] Update russian translation of inf strings. Patch by amber. CORE-11604 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: ekohl Date: Sat Jul 30 13:39:56 2016 New Revision: 72057 URL: http://svn.reactos.org/svn/reactos?rev=72057&view=rev Log: [INF] Update russian translation of inf strings. Patch by amber. CORE-11604 #resolve #comment Thanks a lot! Modified: trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/bda.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/flpydisk.inf trunk/reactos/media/inf/hal.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/input.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/legcydrv.inf trunk/reactos/media/inf/monitor.inf trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtl.inf trunk/reactos/media/inf/netrtpnt.inf trunk/reactos/media/inf/nettcpip.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/shortcuts.inf trunk/reactos/media/inf/unknown.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf trunk/reactos/media/inf/wmiacpi.inf trunk/reactos/media/inf/xboxdisp.inf Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/NET_NIC.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/NET_NIC.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -63,6 +63,7 @@ DisplayClassName = "Adaptoare de reÈea" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" DisplayClassName = "Ð¡ÐµÑÐµÐ²ÑÐµ Ð°Ð´Ð°Ð¿ÑÐµÑÑ" [Strings.041B] Modified: trunk/reactos/media/inf/bda.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bda.inf?rev=7205… ============================================================================== --- trunk/reactos/media/inf/bda.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/bda.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -215,6 +215,15 @@ PlugIn_BdaCA="Extensie BDA pentru acces condiÈional" Pin.Name.AtscTS="Transport MPEG2" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +Category_BdaTuner="Ð¤Ð¸Ð»ÑÑÑ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ° BDA" +Category_BdaComponent="ÐÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ BDA-Ð¿ÑÐ¸ÐµÐ¼Ð½Ð¸Ðº" +Category_BdaRenderer="Ð¤Ð¸Ð»ÑÑÑ Ð²Ð¾ÑÐ¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´Ð¸ÑÐµÐ»Ñ BDA" +PlugIn_BdaDevice="ÐÐ¾Ð´ÑÐ»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾Ð¼ BDA" +PlugIn_BdaCA="BDA-Ð¿Ð»Ð°Ð³Ð¸Ð½ ÑÑÐ»Ð¾Ð²Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ð°" +Pin.Name.AtscTS="Ð¢ÑÐ°Ð½ÑÐ¿Ð¾ÑÑ MPEG2" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Category_BdaTuner="BDA-Kaynak SÃ¼zgeci" Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/display.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/display.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -129,6 +129,7 @@ VGA.DeviceDesc = "PlacÄ graficÄ compatibilÄ VGA" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" DisplayClassName = "ÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ðµ Ð°Ð´Ð°Ð¿ÑÐµÑÑ" StdMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ðµ Ð°Ð´Ð°Ð¿ÑÐµÑÑ)" Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=7205… ============================================================================== --- trunk/reactos/media/inf/fdc.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/fdc.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -120,6 +120,7 @@ *PNP0700.DeviceDesc = "Dispozitiv generic de control disc flexibil" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" FDCClassName = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑÑ Ð³Ð¸Ð±ÐºÐ¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²" GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑÑ Ð³Ð¸Ð±ÐºÐ¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²)" Modified: trunk/reactos/media/inf/flpydisk.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/flpydisk.inf?rev… ============================================================================== --- trunk/reactos/media/inf/flpydisk.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/flpydisk.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -91,6 +91,13 @@ GenericMfg = "(unitÄÈi generice de disc flexibil)" Floppy.DeviceDesc = "Unitate de disc flexibil" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +FloppyClassName = "ÐÐ¸ÑÐºÐ¾Ð²Ð¾Ð´Ñ Ð³Ð¸Ð±ÐºÐ¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²" +GenericMfg = "(Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐµ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´Ñ Ð³Ð¸Ð±ÐºÐ¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²)" +Floppy.DeviceDesc = "Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐ¹ Ð´Ð¸ÑÐºÐ¾Ð²Ð¾Ð´ Ð³Ð¸Ð±ÐºÐ¸Ñ Ð´Ð¸ÑÐºÐ¾Ð²" + + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Modified: trunk/reactos/media/inf/hal.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hal.inf?rev=7205… ============================================================================== --- trunk/reactos/media/inf/hal.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/hal.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -74,6 +74,16 @@ acpipic_up.DeviceDesc = "PC uniprocesor ACPI" e_isa_up.DeviceDesc = "PC uniprocesor standard" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" + +ComputerClassName = "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ" + +GenericMfg = "(Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ)" +acpipic_up.DeviceDesc = "ACPI Ð¾Ð´Ð½Ð¾Ð¿ÑÐ¾ÑÐµÑÑÐ¾ÑÐ½ÑÐ¹ ÐÐ" +e_isa_up.DeviceDesc = "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¹ Ð¾Ð´Ð½Ð¾Ð¿ÑÐ¾ÑÐµÑÑÐ¾ÑÐ½ÑÐ¹ ÐÐ" + + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=7205… ============================================================================== --- trunk/reactos/media/inf/hdc.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/hdc.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -1641,6 +1641,320 @@ PCI\CC_0105.DeviceDesc = "Dispozitiv de control ATA generic" PCI\CC_0106.DeviceDesc = "Dispozitiv de control Serial ATA generic" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +HDCClassName = "IDE ATA/ATAPI ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑÑ" +GenericMfg = "(Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ Ð¶ÐµÑÑÐºÐ¾Ð³Ð¾ Ð´Ð¸ÑÐºÐ°)" +PCI\VEN_1191&DEV_0005.DeviceDesc="Acard ATP850 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1191&DEV_0006.DeviceDesc="Acard ATP860A ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1191&DEV_0007.DeviceDesc="Acard ATP860R ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1191&DEV_0008.DeviceDesc="Acard ATP865A ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1191&DEV_0009.DeviceDesc="Acard ATP865R ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5289.DeviceDesc="ALI M5289 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5288.DeviceDesc="ALI M5288 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5287.DeviceDesc="ALI M5287 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5281.DeviceDesc="ALI M5281 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5229&REV_c5.DeviceDesc="ALI M5229 UDMA6 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5229&REV_c4.DeviceDesc="ALI M5229 UDMA5 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5229&REV_c2.DeviceDesc="ALI M5229 UDMA4 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5229&REV_20.DeviceDesc="ALI M5229 UDMA2 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10b9&DEV_5229.DeviceDesc="ALI M5229 WDMA2 IDE DMA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1022&DEV_7401.DeviceDesc="AMD 755 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1022&DEV_7409.DeviceDesc="AMD 756 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1022&DEV_7411.DeviceDesc="AMD 766 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1022&DEV_7441.DeviceDesc="AMD 768 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1022&DEV_7469.DeviceDesc="AMD 8111 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1022&DEV_209a.DeviceDesc="AMD CS5536 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_4349.DeviceDesc="ATI IXP200 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_4369.DeviceDesc="ATI IXP300 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_4376.DeviceDesc="ATI IXP400 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_436e.DeviceDesc="ATI IXP300 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_4379.DeviceDesc="ATI IXP400 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_437a.DeviceDesc="ATI IXP400 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_438c.DeviceDesc="ATI IXP600 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_4380.DeviceDesc="ATI IXP600 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_439c.DeviceDesc="ATI IXP700 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_4390.DeviceDesc="ATI IXP700 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1002&DEV_4391.DeviceDesc="ATI IXP700 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0004&REV_05.DeviceDesc="HighPoint HPT372 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0004&REV_03.DeviceDesc="HighPoint HPT370 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0004&REV_02.DeviceDesc="HighPoint HPT368 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0004.DeviceDesc="HighPoint HPT366 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0005&REV_01.DeviceDesc="HighPoint HPT372 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0005.DeviceDesc="HighPoint HPT372 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0006&REV_01.DeviceDesc="HighPoint HPT302 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0007&REV_01.DeviceDesc="HighPoint HPT371 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1103&DEV_0008&REV_07.DeviceDesc="HighPoint HPT374 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_1230.DeviceDesc="Intel PIIX IDE DMA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_7010.DeviceDesc="Intel PIIX3 IDE DMA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_7111.DeviceDesc="Intel PIIX4 ATA-44 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_7199.DeviceDesc="Intel PIIX4 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_84ca.DeviceDesc="Intel PIIX4 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_7601.DeviceDesc="Intel ICH0 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2421.DeviceDesc="Intel ICH ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2411.DeviceDesc="Intel ICH ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_244a.DeviceDesc="Intel ICH2 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_244b.DeviceDesc="Intel ICH2 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_248a.DeviceDesc="Intel ICH3 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_248b.DeviceDesc="Intel ICH3 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_24cb.DeviceDesc="Intel ICH4 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_24ca.DeviceDesc="Intel ICH4 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_24db.DeviceDesc="Intel ICH5 EB ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_24d1.DeviceDesc="Intel ICH5 EB1 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_24df.DeviceDesc="Intel ICH5 EB2 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_25a2.DeviceDesc="Intel 6300ESB ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_25a3.DeviceDesc="Intel 6300ESB1 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_25b0.DeviceDesc="Intel 6300ESB2 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_266f.DeviceDesc="Intel ICH6 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2651.DeviceDesc="Intel ICH6 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2652.DeviceDesc="Intel ICH6 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2653.DeviceDesc="Intel ICH6M SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_27df.DeviceDesc="Intel ICH7 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_27c0.DeviceDesc="Intel ICH7 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_27c1.DeviceDesc="Intel ICH7 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_27c3.DeviceDesc="Intel ICH7 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_27c4.DeviceDesc="Intel ICH7M SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_27c5.DeviceDesc="Intel ICH7M SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_27c6.DeviceDesc="Intel ICH7M SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_269e.DeviceDesc="Intel 63XXESB2 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2680.DeviceDesc="Intel 63XXESB2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2681.DeviceDesc="Intel 63XXESB2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2682.DeviceDesc="Intel 63XXESB2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2683.DeviceDesc="Intel 63XXESB2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2820.DeviceDesc="Intel ICH8 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2821.DeviceDesc="Intel ICH8 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2822.DeviceDesc="Intel ICH8 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2824.DeviceDesc="Intel ICH8 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2825.DeviceDesc="Intel ICH8 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2828.DeviceDesc="Intel ICH8M SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2829.DeviceDesc="Intel ICH8M SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_282a.DeviceDesc="Intel ICH8M SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2850.DeviceDesc="Intel ICH8M SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2920.DeviceDesc="Intel ICH9 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2921.DeviceDesc="Intel ICH9 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2926.DeviceDesc="Intel ICH9 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2923.DeviceDesc="Intel ICH9 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2922.DeviceDesc="Intel ICH9 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_8086&DEV_2928.DeviceDesc="Intel ICH9/M-E SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_2929.DeviceDesc="Intel ICH9/M-E SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_292d.DeviceDesc="Intel ICH9/M-E SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_292e.DeviceDesc="Intel ICH9/M-E SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_8086&DEV_3a00.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3a02.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3a03.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3a06.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3a20.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3a22.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3a23.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3a26.DeviceDesc="Intel ICH10 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_8086&DEV_3b20.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b21.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b22.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b23.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b26.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b28.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b29.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b2d.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b2e.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_8086&DEV_3b2f.DeviceDesc="Intel PCH SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_8086&DEV_3200.DeviceDesc="Intel 31244 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_11ab&DEV_5040.DeviceDesc="Marvell 88SX5040 ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_11ab&DEV_5041.DeviceDesc="Marvell 88SX5041 ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_11ab&DEV_5080.DeviceDesc="Marvell 88SX5080 ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_11ab&DEV_5081.DeviceDesc="Marvell 88SX5081 ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_11ab&DEV_6041.DeviceDesc="Marvell 88SX6041 ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_11ab&DEV_6081.DeviceDesc="Marvell 88SX6081 ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_11ab&DEV_6101.DeviceDesc="Marvell 88SX6101 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_11ab&DEV_6145.DeviceDesc="Marvell 88SX6145 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_01bc.DeviceDesc="nVidia nForce ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0065.DeviceDesc="nVidia nForce2 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0085.DeviceDesc="nVidia nForce2 Pro ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_008e.DeviceDesc="nVidia nForce2 Pro S1 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_00d5.DeviceDesc="nVidia nForce3 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_00e5.DeviceDesc="nVidia nForce3 Pro ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_00e3.DeviceDesc="nVidia nForce3 Pro S1 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_00ee.DeviceDesc="nVidia nForce3 Pro S2 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0035.DeviceDesc="nVidia nForce MCP ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0036.DeviceDesc="nVidia nForce MCP S1 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_003e.DeviceDesc="nVidia nForce MCP S2 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0053.DeviceDesc="nVidia nForce CK804 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0054.DeviceDesc="nVidia nForce CK804 S1 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0055.DeviceDesc="nVidia nForce CK804 S2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0265.DeviceDesc="nVidia nForce MCP51 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0266.DeviceDesc="nVidia nForce MCP51 S1 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0267.DeviceDesc="nVidia nForce MCP51 S2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_036e.DeviceDesc="nVidia nForce MCP55 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_037e.DeviceDesc="nVidia nForce MCP55 S1 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_037f.DeviceDesc="nVidia nForce MCP55 S2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_03ec.DeviceDesc="nVidia nForce MCP61 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_03e7.DeviceDesc="nVidia nForce MCP61 S1 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_03f6.DeviceDesc="nVidia nForce MCP61 S2 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_03f7.DeviceDesc="nVidia nForce MCP61 S3 SATA2 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0448.DeviceDesc="nVidia nForce MCP65 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0560.DeviceDesc="nVidia nForce MCP67 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_056c.DeviceDesc="nVidia nForce MCP73 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_10de&DEV_0759.DeviceDesc="nVidia nForce MCP77 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_100b&DEV_0502.DeviceDesc="National Geode SC1100 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_4d33.DeviceDesc="Promise PDC20246 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_4d38.DeviceDesc="Promise PDC20262 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_0d38.DeviceDesc="Promise PDC20263 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_0d30.DeviceDesc="Promise PDC20265 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_4d30.DeviceDesc="Promise PDC20267 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_4d68.DeviceDesc="Promise PDC20268 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_4d69.DeviceDesc="Promise PDC20269 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_6268.DeviceDesc="Promise PDC20270 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_6269.DeviceDesc="Promise PDC20271 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_1275.DeviceDesc="Promise PDC20275 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_5275.DeviceDesc="Promise PDC20276 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_7275.DeviceDesc="Promise PDC20277 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3318.DeviceDesc="Promise PDC20318 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3319.DeviceDesc="Promise PDC20319 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3371.DeviceDesc="Promise PDC20371 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3375.DeviceDesc="Promise PDC20375 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3376.DeviceDesc="Promise PDC20376 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3377.DeviceDesc="Promise PDC20377 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3373.DeviceDesc="Promise PDC20378 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_3372.DeviceDesc="Promise PDC20379 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_6617.DeviceDesc="Promise PDC20617 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_6626.DeviceDesc="Promise PDC20618 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_6629.DeviceDesc="Promise PDC20619 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_6620.DeviceDesc="Promise PDC20620 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_105a&DEV_6621.DeviceDesc="Promise PDC20621 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_105a&DEV_6622.DeviceDesc="Promise PDC20622 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_1166&DEV_0211.DeviceDesc="ServerWorks ROSB4 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0212&REV_92.DeviceDesc="ServerWorks CSB5 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0212.DeviceDesc="ServerWorks CSB5 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0213.DeviceDesc="ServerWorks CSB6 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0217.DeviceDesc="ServerWorks CSB6 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0214.DeviceDesc="ServerWorks HT1000 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_024b.DeviceDesc="ServerWorks HT1000 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_024a.DeviceDesc="ServerWorks HT1000 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0240.DeviceDesc="ServerWorks K2 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0241.DeviceDesc="ServerWorks Frodo4 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1166&DEV_0242.DeviceDesc="ServerWorks Frodo8 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_3114.DeviceDesc="SiI 3114 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_3512&REV_02.DeviceDesc="SiI 3512 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_3112&REV_02.DeviceDesc="SiI 3112 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0240&REV_02.DeviceDesc="SiI 3112 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_3512.DeviceDesc="SiI 3512 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_3112.DeviceDesc="SiI 3112 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0240.DeviceDesc="SiI 3112 SATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0680.DeviceDesc="SiI 0680 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0649.DeviceDesc="CMD 649 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0648.DeviceDesc="CMD 648 ATA-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0646&REV_07.DeviceDesc="CMD 646U2 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0646.DeviceDesc="CMD 646 IDE DMA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1095&DEV_0640.DeviceDesc="CMD 640 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_1039&DEV_0963.DeviceDesc="SiS 963 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0962.DeviceDesc="SiS 640 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_1039&DEV_0755.DeviceDesc="SiS 755 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0752.DeviceDesc="SiS 752 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0751.DeviceDesc="SiS 751 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0750.DeviceDesc="SiS 750 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0748.DeviceDesc="SiS 748 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0746.DeviceDesc="SiS 746 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0745.DeviceDesc="SiS 745 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0740.DeviceDesc="SiS 740 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0735.DeviceDesc="SiS 735 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0733.DeviceDesc="SiS 733 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0730.DeviceDesc="SiS 730 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_1039&DEV_0658.DeviceDesc="SiS 658 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0655.DeviceDesc="SiS 655 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0652.DeviceDesc="SiS 652 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0651.DeviceDesc="SiS 651 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0650.DeviceDesc="SiS 650 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0648.DeviceDesc="SiS 648 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0646.DeviceDesc="SiS 646 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0645.DeviceDesc="SiS 645 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0640.DeviceDesc="SiS 640 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0635.DeviceDesc="SiS 635 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0633.DeviceDesc="SiS 633 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0630.DeviceDesc="SiS 630 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0620.DeviceDesc="SiS 620 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_1039&DEV_0550.DeviceDesc="SiS 550 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0540.DeviceDesc="SiS 540 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1039&DEV_0530.DeviceDesc="SiS 530 IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_1039&DEV_5513&REV_c2.DeviceDesc="SiS ATA-xxx ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1039&DEV_5513.DeviceDesc="SiS ATA-xxx ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1039&DEV_0601.DeviceDesc="SiS ATA-xxx ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_1106&DEV_0586&REV_41.DeviceDesc="VIA 82C586B ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0586&REV_40.DeviceDesc="VIA 82C586B ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0586&REV_02.DeviceDesc="VIA 82C586B ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0586.DeviceDesc="VIA 82C586 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0596&REV_12.DeviceDesc="VIA 82C596B ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0596.DeviceDesc="VIA 82C596 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0686&REV_40.DeviceDesc="VIA 82C686B ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0686&REV_10.DeviceDesc="VIA 82C686A ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_0686.DeviceDesc="VIA 82C686 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_8231.DeviceDesc="VIA 8231 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_3074.DeviceDesc="VIA 8233 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_3109.DeviceDesc="VIA 8233C ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_3147.DeviceDesc="VIA 8233A ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1106&DEV_3177.DeviceDesc="VIA 8235 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_1106&DEV_0571.DeviceDesc="VIA ATA-xxx ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1106&DEV_3164.DeviceDesc="VIA 6410 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1106&DEV_3149.DeviceDesc="VIA 6420 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1106&DEV_3249.DeviceDesc="VIA 6421 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1106&DEV_0591.DeviceDesc="VIA 8237A ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1106&DEV_5337.DeviceDesc="VIA 8237S ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_1106&DEV_3349.DeviceDesc="VIA 8251 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_1080&DEV_c693.DeviceDesc="Cypress 82C693 IDE DMA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_105a&DEV_4d68.DeviceDesc="Promise TX2 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_105a&DEV_6268.DeviceDesc="Promise TX2 ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_105a&DEV_4d69.DeviceDesc="Promise TX2 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_105a&DEV_5275.DeviceDesc="Promise TX2 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_105a&DEV_6269.DeviceDesc="Promise TX2 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_105a&DEV_7275.DeviceDesc="Promise TX2 ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_105a&DEV_4d33.DeviceDesc="Promise Promise Ultra/FastTrak-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_105a&DEV_0d38.DeviceDesc="Promise Promise FastTrak-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_105a&DEV_4d38.DeviceDesc="Promise Promise Ultra/FastTrak-66 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +; PCI\VEN_105a&DEV_4d30.DeviceDesc="Promise Promise Ultra/FastTrak-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_105a&DEV_0d30.DeviceDesc="Promise OEM ATA-100 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑs" + +; PCI\VEN_1103&DEV_0004.DeviceDesc="HighPoint HPT366/368/370/372 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1103&DEV_0005.DeviceDesc="HighPoint HPT372 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +; PCI\VEN_1103&DEV_0008.DeviceDesc="HighPoint HPT374 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +PCI\VEN_16ca&DEV_0001.DeviceDesc="Cenatek Rocket Drive IDE DMA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1078&DEV_0102.DeviceDesc="Cyrix 5530 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1042&DEV_0102.DeviceDesc="RZ 100x IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1283&DEV_8172.DeviceDesc="IT8172 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_1283&DEV_8212.DeviceDesc="IT8212F ATA-133 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_169c&DEV_0044.DeviceDesc="Netcell SR3000/5000 ATA-33 ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_3388&DEV_8013.DeviceDesc="HiNT VXII EIDE IDE DMA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\VEN_ffff&DEV_ffff&REV_ff.DeviceDesc="IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" + +;Compatible adapters + +UniATA_Name = "Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐ¹ ATA Ð´ÑÐ°Ð¹Ð²ÐµÑ" +*PNP0600.PriDeviceDesc = "ÐÐµÑÐ²Ð¸ÑÐ½ÑÐ¹ ÐºÐ°Ð½Ð°Ð» IDE" +*PNP0600.SecDeviceDesc = "ÐÑÐ¾ÑÐ¸ÑÐ½ÑÐ¹ ÐºÐ°Ð½Ð°Ð» IDE" +PCI\CC_0101.DeviceDesc = "ÐÐ²ÑÑÐºÐ°Ð½Ð°Ð»ÑÐ½ÑÐ¹ PCI BusMaster IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\CC_0104.DeviceDesc = "Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐ¹ RAID IDE ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\CC_0105.DeviceDesc = "Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐ¹ ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" +PCI\CC_0106.DeviceDesc = "Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐ¹ Serial ATA ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑ" [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" HDCClassName = "IDE ATA/ATAPI Denetleyicileri" Modified: trunk/reactos/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/input.inf?rev=72… ============================================================================== --- trunk/reactos/media/inf/input.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/input.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -114,6 +114,15 @@ HID_DEVICE = "Dispozitiv compatibil de interfaÈare umanÄ" StdMfg = "(dispozitive generice de interfaÈare umanÄ)" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +HID.ClassName = "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° HID (Human Interface Devices)" +HID.DeviceDesc = "USB HID-ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" + +HID_DEVICE = "HID-ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" +StdMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ HID-ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°)" +MSMice = "Microsoft" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" HID.ClassName = "Ä°nsan Arabirimi AygÄ±tlarÄ±" Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== --- trunk/reactos/media/inf/keyboard.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/keyboard.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -165,8 +165,11 @@ *PNP0303.DeviceDesc = "TastaturÄ IBM PC/AT" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" KeyboardClassName = "ÐÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ" +HID.KeyboardDevice = "ÐÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ° HID" StdMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ)" +LocationOverride = "Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¾ Ðº Ð¿Ð¾ÑÑÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ" *PNP0303.DeviceDesc = "ÐÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ° IBM PC/AT" [Strings.041B] Modified: trunk/reactos/media/inf/legcydrv.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/legcydrv.inf?rev… ============================================================================== --- trunk/reactos/media/inf/legcydrv.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/legcydrv.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -35,6 +35,10 @@ ReactOS = "Echipa ReactOS" LegacyDriverClassName = "ModÃºle pilot de cuplare staticÄ (non-PnP)" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +LegacyDriverClassName = "ÐÑÐ°Ð¹Ð²ÐµÑÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² Ð½Ðµ Plug and Play" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" LegacyDriverClassName = "Tak ve ÃalÄ±ÅtÄ±r Olmayan SÃ¼rÃ¼cÃ¼ler" Modified: trunk/reactos/media/inf/monitor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/monitor.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/monitor.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/monitor.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -91,6 +91,13 @@ DefaultMonitor.DeviceDesc = "Ecran implicit" PnPMonitor.DeviceDesc = "Ecran cuplare dinamicÄ (PnP)" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +MonitorClassName = "ÐÐ¾Ð½Ð¸ÑÐ¾ÑÑ" +StdMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ Ð¼Ð¾Ð½Ð¸ÑÐ¾ÑÑ)" +DefaultMonitor.DeviceDesc = "ÐÐ¾Ð´ÑÐ»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ Ð¼Ð¾Ð½Ð¸ÑÐ¾ÑÐ°" +PnPMonitor.DeviceDesc = "ÐÐ¾Ð½Ð¸ÑÐ¾Ñ Plug and Play" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" MonitorClassName = "GÃ¶stergeÃ§ler" Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=7… ============================================================================== --- trunk/reactos/media/inf/netamd.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/netamd.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -70,6 +70,9 @@ [Strings.0418] ReactOS = "Echipa ReactOS" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=7… ============================================================================== --- trunk/reactos/media/inf/netisa.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/netisa.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -91,6 +91,7 @@ *PNP80D6.DeviceDesc = "Compatibile cu NE2000" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ ÑÐµÑÐµÐ²ÑÐµ Ð°Ð´Ð°Ð¿ÑÐµÑÑ)" *PNP80D6.DeviceDesc = "NE2000-ÑÐ¾Ð²Ð¼ÐµÑÑÐ¸Ð¼ÑÐµ" Modified: trunk/reactos/media/inf/netrtl.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtl.inf?rev=7… ============================================================================== --- trunk/reactos/media/inf/netrtl.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/netrtl.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -93,6 +93,9 @@ LevelOneFPC0106TX.DeviceDesc = "Adaptor Ethernet LevelOne FPC-0106Tx (RTL8139)" CompaqHNE300.DeviceDesc = "Adaptor Ethernet Compaq HNE-300 (RTL8139C)" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== --- trunk/reactos/media/inf/netrtpnt.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/netrtpnt.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -63,6 +63,9 @@ [Strings.0418] ReactOS = "Echipa ReactOS" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== --- trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/nettcpip.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -209,6 +209,9 @@ [Strings.0418] ReactOS = "Echipa ReactOS" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=72… ============================================================================== --- trunk/reactos/media/inf/ports.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/ports.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -175,6 +175,7 @@ *PNP0401.DeviceDesc = "Port de imprimantÄ ECP" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" PortsClassName = "ÐÐ¾ÑÑÑ (COM Ð¸ LPT)" StdMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ Ð¿Ð¾ÑÑÑ)" Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=720… ============================================================================== --- trunk/reactos/media/inf/scsi.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/scsi.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -116,6 +116,7 @@ PCI\VEN_104B&CC_0100.DeviceDesc = "Dispozitiv de control SCSI BusLogic" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" SCSIClassName = "SCSI Ð¸ RAID ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑÑ" GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ SCSI Ð¸ RAID ÐºÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑÑ)" Modified: trunk/reactos/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/shortcuts.inf?re… ============================================================================== --- trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/shortcuts.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -1231,7 +1231,7 @@ SYSTOOLS=Ð¡Ð»ÑÐ¶ÐµÐ±Ð½ÑÐµ ACCESSIBILITY=Ð¡Ð¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÐµ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ ENTERTAINMENT=Ð Ð°Ð·Ð²Ð»ÐµÑÐµÐ½Ð¸Ñ -COMMUNICATIONS=Communications +COMMUNICATIONS=Ð¡Ð²ÑÐ·Ñ GAMES=ÐÐ³ÑÑ README_TITLE=ÐÑÐ¾ÑÑÐ¸ ÐÐµÐ½Ñ @@ -1266,8 +1266,8 @@ MSPAINT_DESC=Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ Ð¸ ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¸ÑÑÐ½ÐºÐ¾Ð². CHARMAP_TITLE=Ð¢Ð°Ð±Ð»Ð¸ÑÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð² CHARMAP_DESC=ÐÐ¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð²Ð²Ð¾Ð´Ð¸ÑÑ Ð¾ÑÑÑÑÑÑÐ²ÑÑÑÐ¸Ðµ Ð½Ð° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐµ Ð·Ð½Ð°ÐºÐ¸. -CLIPBRD_TITLE=Clipboard Viewer -CLIPBRD_DESC=Clipboard Viewer +CLIPBRD_TITLE=ÐÑÑÐµÑ Ð¾Ð±Ð¼ÐµÐ½Ð° +CLIPBRD_DESC=ÐÑÑÐµÑ Ð¾Ð±Ð¼ÐµÐ½Ð° KBSWITCH_TITLE=ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ KBSWITCH_DESC=ÐÐµÑÐµÐºÐ»ÑÑÐ°ÑÐµÐ»Ñ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÐ¸ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ REGEDIT_TITLE=Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ ÑÐµÐµÑÑÑÐ° Modified: trunk/reactos/media/inf/unknown.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/unknown.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/unknown.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/unknown.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -38,6 +38,10 @@ ReactOS = "Echipa ReactOS" UnknownClassName = "Alte dispozitive" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +UnknownClassName = "ÐÑÑÐ³Ð¸Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" UnknownClassName = "BaÅka AygÄ±tlar" Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=7205… ============================================================================== --- trunk/reactos/media/inf/usb.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/usb.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -107,7 +107,9 @@ USB\CLASS_09.DeviceDesc = "Cuplator USB generic" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¹ USB ÑÐ°Ð±)" +USB\COMPOSITE.DeviceDesc = "USB ÑÐ¾ÑÑÐ°Ð²Ð½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾" USB\CLASS_09.DeviceDesc = "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐ¹ USB ÑÐ°Ð±" [Strings.041B] Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/usbport.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/usbport.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -227,6 +227,7 @@ PCI\VEN_8086&DEV_7112&CC_0C0300.DeviceDesc = "Dispozitiv de contorl USB Intel 82371AB/EB/MB PIIX4" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" USBClassName = "ÐÐ¾Ð½ÑÑÐ¾Ð»Ð»ÐµÑÑ USB" GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° USB)" Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/usbstor.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/usbstor.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -82,6 +82,7 @@ GenericBulkOnlyTransport.DeviceDesc = "Dispozitiv USB de stocare" [Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" GenericMfg = "(Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° USB)" GenericBulkOnlyTransport.DeviceDesc = "ÐÐ°Ð¿Ð¾Ð¼Ð¸Ð½Ð°ÑÑÐµÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾ USB" Modified: trunk/reactos/media/inf/wmiacpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wmiacpi.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/wmiacpi.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wmiacpi.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -49,6 +49,11 @@ GenericMfg = "(dispozitive generice de sistem)" *PNP0C14.DeviceDesc = "WMI pentru ACPI" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +GenericMfg = "(Ð£Ð½Ð¸Ð²ÐµÑÑÐ°Ð»ÑÐ½ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð°)" +*PNP0C14.DeviceDesc = "WMI Ð´Ð»Ñ ACPI" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±" Modified: trunk/reactos/media/inf/xboxdisp.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/xboxdisp.inf?rev… ============================================================================== --- trunk/reactos/media/inf/xboxdisp.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/xboxdisp.inf [iso-8859-1] Sat Jul 30 13:39:56 2016 @@ -61,6 +61,12 @@ nVidiaMfg = "CorporaÈia nVidia" PCI\VEN_10DE&DEV_02A0.DeviceDesc = "Unitate de procesare graficÄ Xbox NV2A" +[Strings.0419] +ReactOS = "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" + +nVidiaMfg = "ÐÐ¾ÑÐ¿Ð¾ÑÐ°ÑÐ¸Ñ nVidia" +PCI\VEN_10DE&DEV_02A0.DeviceDesc = "ÐÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ NV2A Xbox" + [Strings.041f] ReactOS = "ReactOS TakÄ±mÄ±"

1 0

[pschweitzer] 72056: [FASTFAT] Fix a FIXME
by pschweitzer＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: pschweitzer Date: Sat Jul 30 12:53:09 2016 New Revision: 72056 URL: http://svn.reactos.org/svn/reactos?rev=72056&view=rev Log: [FASTFAT] Fix a FIXME Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Jul 30 12:53:09 2016 @@ -445,7 +445,6 @@ Status = VfatMountDevice(DeviceExt, DeviceToMount); if (!NT_SUCCESS(Status)) { - /* FIXME: delete device object */ goto ByeBye; }

1 0

[gadamopoulos] 72055: [BROWSEUI] - Move handling of DISPID_NAVIGATECOMPLETE2 event from CAddressBand to CAddressEditBox as the todo comments say it should be. - Remove the todo entries that are com...
by gadamopoulos＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: gadamopoulos Date: Sat Jul 30 12:47:39 2016 New Revision: 72055 URL: http://svn.reactos.org/svn/reactos?rev=72055&view=rev Log: [BROWSEUI] - Move handling of DISPID_NAVIGATECOMPLETE2 event from CAddressBand to CAddressEditBox as the todo comments say it should be. - Remove the todo entries that are complete. - Remove IDispatch from CAddressBand as it is not really needed. Now CAddressBand takes care only of positioning and handling the button while CAddressEditBox does all the parsing and interaction with the browser. Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/addresseditbox.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Sat Jul 30 12:47:39 2016 @@ -29,11 +29,8 @@ /* TODO: -****Add command handler for show/hide Go button to OnWinEvent ****Add tooltip notify handler **Properly implement GetBandInfo - **Add correct text to Go button - **Implement TranslateAcceleratorIO Implement Exec Implement QueryService Implement Load @@ -46,7 +43,6 @@ fGoButton = NULL; fComboBox = NULL; fGoButtonShown = false; - fAdviseCookie = 0; } CAddressBand::~CAddressBand() @@ -103,7 +99,6 @@ HRESULT STDMETHODCALLTYPE CAddressBand::SetSite(IUnknown *pUnkSite) { - CComPtr<IBrowserService> browserService; CComPtr<IShellService> shellService; HWND parentWindow; HWND combobox; @@ -112,7 +107,6 @@ if (pUnkSite == NULL) { - hResult = AtlUnadvise(fSite, DIID_DWebBrowserEvents, fAdviseCookie); fSite.Release(); return S_OK; } @@ -170,13 +164,6 @@ fGoButtonShown = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Main", L"ShowGoButton", FALSE, TRUE); if (fGoButtonShown) CreateGoButton(); - - // take advice to watch events - hResult = IUnknown_QueryService(pUnkSite, SID_SShellBrowser, IID_PPV_ARG(IBrowserService, &browserService)); - if (SUCCEEDED(hResult)) - { - hResult = AtlAdvise(browserService, static_cast<IDispatch *>(this), DIID_DWebBrowserEvents, &fAdviseCookie); - } return hResult; } @@ -398,108 +385,6 @@ return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CAddressBand::GetTypeInfoCount(UINT *pctinfo) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CAddressBand::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CAddressBand::GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CAddressBand::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - CComPtr<IBrowserService> isb; - CComPtr<IShellFolder> sf; - HRESULT hr; - INT indexClosed, indexOpen, itemExists, oldIndex; - DWORD result; - COMBOBOXEXITEMW item; - PIDLIST_ABSOLUTE absolutePIDL; - LPCITEMIDLIST pidlChild; - LPITEMIDLIST pidlPrevious; - STRRET ret; - WCHAR buf[4096]; - - if (pDispParams == NULL) - return E_INVALIDARG; - - switch (dispIdMember) - { - case DISPID_NAVIGATECOMPLETE2: - case DISPID_DOCUMENTCOMPLETE: - - oldIndex = SendMessage(m_hWnd, CB_GETCURSEL, 0, 0); - - itemExists = FALSE; - pidlPrevious = NULL; - - ZeroMemory(&item, sizeof(item)); - item.mask = CBEIF_LPARAM; - item.iItem = 0; - if (SendMessage(m_hWnd, CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) - { - pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); - if (pidlPrevious) - itemExists = TRUE; - } - - hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; - isb->GetPidl(&absolutePIDL); - - SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - - sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); - - StrRetToBufW(&ret, pidlChild, buf, 4095); - - indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); - - item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; - item.iItem = 0; - item.iImage = indexClosed; - item.iSelectedImage = indexOpen; - item.pszText = buf; - item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); - - if (itemExists) - { - result = SendMessage(m_hWnd, CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); - oldIndex = 0; - - if (result) - { - ILFree(pidlPrevious); - } - } - else - { - oldIndex = SendMessage(m_hWnd, CBEM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&item)); - - if (oldIndex < 0) - DbgPrint("ERROR %d\n", GetLastError()); - } - - SendMessage(m_hWnd, CB_SETCURSEL, -1, 0); - SendMessage(m_hWnd, CB_SETCURSEL, oldIndex, 0); - - //fAddressEditBox->SetCurrentDir(index); - - break; - } - return S_OK; -} - LRESULT CAddressBand::OnNotifyClick(WPARAM wParam, NMHDR *notifyHeader, BOOL &bHandled) { if (notifyHeader->hwndFrom == fGoButton) Modified: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Sat Jul 30 12:47:39 2016 @@ -32,8 +32,7 @@ public IServiceProvider, public IWinEventHandler, public IAddressBand, - public IInputObjectSite, - public IDispatch + public IInputObjectSite { private: CComPtr<IDockingWindowSite> fSite; @@ -42,7 +41,6 @@ HWND fGoButton; HWND fComboBox; bool fGoButtonShown; - DWORD fAdviseCookie; public: CAddressBand(); virtual ~CAddressBand(); @@ -98,12 +96,6 @@ virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); - // *** IDispatch methods *** - virtual HRESULT STDMETHODCALLTYPE GetTypeInfoCount(UINT *pctinfo); - virtual HRESULT STDMETHODCALLTYPE GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo); - virtual HRESULT STDMETHODCALLTYPE GetIDsOfNames(REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId); - virtual HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr); - // message handlers LRESULT OnNotifyClick(WPARAM wParam, NMHDR *notifyHeader, BOOL &bHandled); LRESULT OnTipText(UINT idControl, NMHDR *notifyHeader, BOOL &bHandled); @@ -137,6 +129,5 @@ COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Jul 30 12:47:39 2016 @@ -26,17 +26,10 @@ /* TODO: - Add auto completion support - Subclass windows in Init method - Connect to browser connection point - Handle navigation complete messages to set edit box text Handle listbox dropdown message and fill contents Add drag and drop of icon in edit box - Handle enter in edit box to browse to typed path Handle change notifies to update appropriately - Add handling of enter in edit box Fix so selection in combo listbox navigates - Fix so editing text and typing enter navigates */ CAddressEditBox::CAddressEditBox() : @@ -291,6 +284,18 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { + CComPtr<IBrowserService> isb; + CComPtr<IShellFolder> sf; + HRESULT hr; + INT indexClosed, indexOpen, itemExists, oldIndex; + DWORD result; + COMBOBOXEXITEMW item; + PIDLIST_ABSOLUTE absolutePIDL; + LPCITEMIDLIST pidlChild; + LPITEMIDLIST pidlPrevious; + STRRET ret; + WCHAR buf[4096]; + if (pDispParams == NULL) return E_INVALIDARG; @@ -299,6 +304,64 @@ case DISPID_NAVIGATECOMPLETE2: case DISPID_DOCUMENTCOMPLETE: pidlLastParsed = NULL; + + oldIndex = fCombobox.SendMessage(CB_GETCURSEL, 0, 0); + + itemExists = FALSE; + pidlPrevious = NULL; + + ZeroMemory(&item, sizeof(item)); + item.mask = CBEIF_LPARAM; + item.iItem = 0; + if (fCombobox.SendMessage(CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) + { + pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); + if (pidlPrevious) + itemExists = TRUE; + } + + hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + isb->GetPidl(&absolutePIDL); + + SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + + sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); + + StrRetToBufW(&ret, pidlChild, buf, 4095); + + indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + + item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; + item.iItem = 0; + item.iImage = indexClosed; + item.iSelectedImage = indexOpen; + item.pszText = buf; + item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); + + if (itemExists) + { + result = fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); + oldIndex = 0; + + if (result) + { + ILFree(pidlPrevious); + } + } + else + { + oldIndex = fCombobox.SendMessage(CBEM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&item)); + + if (oldIndex < 0) + DbgPrint("ERROR %d\n", GetLastError()); + } + + fCombobox.SendMessage(CB_SETCURSEL, -1, 0); + fCombobox.SendMessage(CB_SETCURSEL, oldIndex, 0); + + //fAddressEditBox->SetCurrentDir(index); } return S_OK; }

1 0

[jimtabor] 72054: [NtUser] - Fix hang while inputting mouse message. Fix CORE-9998.
by jimtabor＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: jimtabor Date: Sat Jul 30 12:32:28 2016 New Revision: 72054 URL: http://svn.reactos.org/svn/reactos?rev=72054&view=rev Log: [NtUser] - Fix hang while inputting mouse message. Fix CORE-9998. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Jul 30 12:32:28 2016 @@ -1891,6 +1891,16 @@ return 1; } +/* check whether message is in the range of mouse messages */ +static inline BOOL is_mouse_message( UINT message ) +{ + return ( //( message >= WM_NCMOUSEFIRST && message <= WM_NCMOUSELAST ) || This seems to break tests... + ( message >= WM_MOUSEFIRST && message <= WM_MOUSELAST ) || + ( message >= WM_XBUTTONDOWN && message <= WM_XBUTTONDBLCLK ) || + ( message >= WM_MBUTTONDOWN && message <= WM_MBUTTONDBLCLK ) || + ( message >= WM_LBUTTONDOWN && message <= WM_RBUTTONDBLCLK ) ); +} + BOOL APIENTRY co_MsqPeekHardwareMessage(IN PTHREADINFO pti, IN BOOL Remove, @@ -1946,7 +1956,7 @@ if ( ( !Window || // 1 ( Window == PWND_BOTTOM && CurrentMessage->Msg.hwnd == NULL ) || // 2 ( Window != PWND_BOTTOM && Window->head.h == CurrentMessage->Msg.hwnd ) || // 3 - ( CurrentMessage->Msg.message == WM_MOUSEMOVE ) ) && // Null window for mouse moves. + ( is_mouse_message(CurrentMessage->Msg.message) ) ) && // Null window for anything mouse. ( ( ( MsgFilterLow == 0 && MsgFilterHigh == 0 ) && CurrentMessage->QS_Flags & QSflags ) || ( MsgFilterLow <= CurrentMessage->Msg.message && MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) {

1 0

[gadamopoulos] 72053: [BROWSEUI] - Use the _CreateInstance postfix for all functions that instantiate a class. - Move the the CreateInstance functions of the exported classes to browseui.h where we...
by gadamopoulos＠svn.reactos.org 30 Jul '16

30 Jul '16

Author: gadamopoulos Date: Sat Jul 30 11:53:16 2016 New Revision: 72053 URL: http://svn.reactos.org/svn/reactos?rev=72053&view=rev Log: [BROWSEUI] - Use the _CreateInstance postfix for all functions that instantiate a class. - Move the the CreateInstance functions of the exported classes to browseui.h where we can select uniformly which built in classes we use. Added: trunk/reactos/dll/win32/browseui/browseui.h (with props) Modified: trunk/reactos/dll/win32/browseui/addressband.cpp trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/bandproxy.cpp trunk/reactos/dll/win32/browseui/basebar.cpp trunk/reactos/dll/win32/browseui/basebarsite.cpp trunk/reactos/dll/win32/browseui/brandband.cpp trunk/reactos/dll/win32/browseui/explorerband.cpp trunk/reactos/dll/win32/browseui/explorerband.h trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/internettoolbar.h trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/dll/win32/browseui/toolsband.cpp trunk/reactos/dll/win32/browseui/travellog.cpp Modified: trunk/reactos/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -27,8 +27,6 @@ #include <shlwapi_undoc.h> #include <shellapi.h> -HRESULT CreateAddressEditBox(REFIID riid, void **ppv); - /* TODO: ****Add command handler for show/hide Go button to OnWinEvent @@ -155,19 +153,9 @@ fEditControl = reinterpret_cast<HWND>(SendMessage(CBEM_GETEDITCONTROL, 0, 0)); fComboBox = reinterpret_cast<HWND>(SendMessage(CBEM_GETCOMBOCONTROL, 0, 0)); -#if 1 - hResult = CoCreateInstance(CLSID_AddressEditBox, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); -#else - hResult = E_FAIL; -#endif - if (FAILED_UNEXPECTEDLY(hResult)) - { - // instantiate new version - hResult = CreateAddressEditBox(IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - } + hResult = CAddressEditBox_CreateInstance(IID_PPV_ARG(IAddressEditBox, &fAddressEditBox)); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; hResult = fAddressEditBox->QueryInterface(IID_PPV_ARG(IShellService, &shellService)); if (FAILED_UNEXPECTEDLY(hResult)) @@ -642,11 +630,6 @@ return 0; } -HRESULT CreateAddressBand(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CAddressBand>(riid, ppv); -} - void CAddressBand::CreateGoButton() { const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -330,8 +330,3 @@ { return E_NOTIMPL; } - -HRESULT CreateAddressEditBox(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CAddressEditBox>(riid, ppv); -} Modified: trunk/reactos/dll/win32/browseui/bandproxy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandpro… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandproxy.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -125,8 +125,3 @@ { return E_NOTIMPL; } - -HRESULT CreateBandProxy(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CBandProxy>(riid, ppv); -} Modified: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -548,7 +548,7 @@ return 0; } -HRESULT CreateBaseBar(REFIID riid, void **ppv, BOOL vertical) +HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical) { return ShellObjectCreatorInit<CBaseBar, BOOL>(vertical, riid, ppv); } Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -830,7 +830,7 @@ return S_OK; } -HRESULT CreateBaseBarSite(REFIID riid, void **ppv, BOOL bVertical) +HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical) { return ShellObjectCreatorInit<CBaseBarSite, BOOL>(bVertical, riid, ppv); } Modified: trunk/reactos/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/brandba… ============================================================================== --- trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/brandband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -456,8 +456,3 @@ Invalidate(FALSE); return 0; } - -HRESULT CreateBrandBand(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CBrandBand>(riid, ppv); -} Added: trunk/reactos/dll/win32/browseui/browseui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.h (added) +++ trunk/reactos/dll/win32/browseui/browseui.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -0,0 +1,122 @@ +#pragma once + +#define USE_CUSTOM_MENUBAND 1 +#define USE_CUSTOM_MERGEDFOLDER 1 +#define USE_CUSTOM_ADDRESSBAND 1 +#define USE_CUSTOM_ADDRESSEDITBOX 1 +#define USE_CUSTOM_BANDPROXY 1 +#define USE_CUSTOM_BRANDBAND 1 +#define USE_CUSTOM_EXPLORERBAND 1 +#define USE_CUSTOM_INTERNETTOOLBAR 1 + +/* Constructors for the classes that are not exported */ +HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv); +HRESULT CBaseBar_CreateInstance(REFIID riid, void **ppv, BOOL vertical); +HRESULT CBaseBarSite_CreateInstance(REFIID riid, void **ppv, BOOL bVertical); +HRESULT CToolsBand_CreateInstance(REFIID riid, void **ppv); + +static inline +HRESULT CAddressBand_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_ADDRESSBAND + return ShellObjectCreator<CAddressBand>(riid, ppv); +#else + return CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); +#endif +} + +static inline +HRESULT CAddressEditBox_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_ADDRESSEDITBOX + return ShellObjectCreator<CAddressEditBox>(riid, ppv); +#else + return CoCreateInstance(CLSID_AddressEditBox, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(riid, &ppv)); +#endif +} + +static inline +HRESULT CBandProxy_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_BANDPROXY + return ShellObjectCreator<CBandProxy>(riid, ppv); +#else + return CoCreateInstance(CLSID_BandProxy, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(riid, &ppv)); +#endif +} + +static inline +HRESULT CBrandBand_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_BRANDBAND + return ShellObjectCreator<CBrandBand>(riid, ppv); +#else + return CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +#endif +} + +static inline +HRESULT WINAPI CExplorerBand_CreateInstance(REFIID riid, LPVOID *ppv) +{ +#if USE_CUSTOM_EXPLORERBAND + return ShellObjectCreator<CExplorerBand>(riid, ppv); +#else + return CoCreateInstance(CLSID_ExplorerBand, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +#endif +} + +static inline +HRESULT CInternetToolbar_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_INTERNETTOOLBAR + return ShellObjectCreator<CInternetToolbar>(riid, ppv); +#else + return CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +#endif +} + +typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); + +static inline +HRESULT CMergedFolder_CreateInstance(REFIID riid, void **ppv) +{ +#if USE_CUSTOM_MERGEDFOLDER + HMODULE hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + + if (hRShell) + { + PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) + GetProcAddress(hRShell, "CMergedFolder_Constructor"); + + if (pCMergedFolder_Constructor) + { + return pCMergedFolder_Constructor(riid, ppv); + } + } +#endif + return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv); +} + +static inline +HRESULT CMenuBand_CreateInstance(REFIID iid, LPVOID *ppv) +{ +#if USE_CUSTOM_MENUBAND + HMODULE hRShell = GetModuleHandleW(L"rshell.dll"); + + if (!hRShell) + hRShell = LoadLibraryW(L"rshell.dll"); + + if (hRShell) + { + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + if (func) + { + return func(iid , ppv); + } + } +#endif + return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv); +} Propchange: trunk/reactos/dll/win32/browseui/browseui.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -27,12 +27,6 @@ #define UNIMPLEMENTED DbgPrint("%s is UNIMPLEMENTED!\n", __FUNCTION__) #endif - -extern "C" -HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv) -{ - return ShellObjectCreator<CExplorerBand>(riid, ppv); -} CExplorerBand::CExplorerBand() : pSite(NULL), fVisible(FALSE), bNavigating(FALSE), dwBandID(0) Modified: trunk/reactos/dll/win32/browseui/explorerband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/explore… ============================================================================== --- trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/explorerband.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -184,6 +184,3 @@ MESSAGE_HANDLER(WM_RBUTTONDOWN, ContextMenuHack) END_MSG_MAP() }; - -extern "C" -HRESULT WINAPI CExplorerBand_Constructor(REFIID riid, LPVOID *ppv); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -78,10 +78,6 @@ */ extern HRESULT WINAPI SHBindToFolder(LPCITEMIDLIST path, IShellFolder **newFolder); -extern HRESULT CreateToolsBar(REFIID riid, void **ppv); -extern HRESULT CreateBrandBand(REFIID riid, void **ppv); -extern HRESULT CreateBandProxy(REFIID riid, void **ppv); -extern HRESULT CreateAddressBand(REFIID riid, void **ppv); HRESULT IUnknown_RelayWinEvent(IUnknown * punk, HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { @@ -442,7 +438,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - hr = CreateMergedFolder(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); + hr = CMergedFolder_CreateInstance(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); if (FAILED_UNEXPECTEDLY(hr)) { *ppsfFavorites = psfUserFavorites.Detach(); @@ -503,7 +499,7 @@ if (fFavoritesMenu.p == NULL) { - hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &newMenu)); + hResult = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &newMenu)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED); @@ -671,7 +667,7 @@ *pMenuBar = NULL; - hResult = CreateMenuBand(IID_PPV_ARG(IShellMenu, &menubar)); + hResult = CMenuBand_CreateInstance(IID_PPV_ARG(IShellMenu, &menubar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -717,29 +713,6 @@ *pMenuBar = menubar.Detach(); return S_OK; -} - -HRESULT CInternetToolbar::CreateBrandBand(IUnknown **logoBar) -{ -#if 1 - return ::CreateBrandBand(IID_PPV_ARG(IUnknown, logoBar)); -#else - return CoCreateInstance(CLSID_BrandBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, logoBar)); -#endif -} - -HRESULT CInternetToolbar::CreateToolsBar(IUnknown **toolsBar) -{ - return ::CreateToolsBar(IID_PPV_ARG(IUnknown, toolsBar)); -} - -HRESULT CInternetToolbar::CreateAddressBand(IUnknown **toolsBar) -{ -#if 1 - return ::CreateAddressBand(IID_PPV_ARG(IUnknown, toolsBar)); -#else - return CoCreateInstance(CLSID_SH_AddressBand, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, toolsBar)); -#endif } HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) @@ -817,7 +790,7 @@ hResult = serviceProvider->QueryService(SID_IBandProxy, IID_PPV_ARG(IBandProxy, &fBandProxy)); if (FAILED_UNEXPECTEDLY(hResult)) { - hResult = CreateBandProxy(IID_PPV_ARG(IBandProxy, &fBandProxy)); + hResult = CBandProxy_CreateInstance(IID_PPV_ARG(IBandProxy, &fBandProxy)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; hResult = fBandProxy->SetSite(fSite); @@ -1048,7 +1021,7 @@ // and it will put them in their own row, sized to take up the whole row. #if 0 /* Create and attach the brand/logo to the rebar */ - hResult = CreateBrandBand(&logoBar); + hResult = CBrandBand_CreateInstance(IID_PPV_ARG(IUnknown, &logoBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(logoBar, ITBBID_BRANDBAND, CDockSite::ITF_NOGRIPPER | CDockSite::ITF_NOTITLE | CDockSite::ITF_FIXEDSIZE); @@ -1056,7 +1029,7 @@ #endif /* Create and attach the standard toolbar to the rebar */ - hResult = CreateToolsBar(&toolsBar); + hResult = CToolsBand_CreateInstance(IID_PPV_ARG(IUnknown, &toolsBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(toolsBar, ITBBID_TOOLSBAND, CDockSite::ITF_NOTITLE | CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); @@ -1066,7 +1039,7 @@ return hResult; /* Create and attach the address/navigation toolbar to the rebar */ - hResult = CreateAddressBand(&navigationBar); + hResult = CAddressBand_CreateInstance(IID_PPV_ARG(IUnknown, &navigationBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; AddDockItem(navigationBar, ITBBID_ADDRESSBAND, CDockSite::ITF_NEWBANDALWAYS | CDockSite::ITF_GRIPPERALWAYS); @@ -1875,7 +1848,3 @@ return 0; } -HRESULT CreateInternetToolbar(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CInternetToolbar>(riid, ppv); -} Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -98,9 +98,7 @@ void AddDockItem(IUnknown *newItem, int bandID, int flags); HRESULT ReserveBorderSpace(LONG maxHeight = -1); HRESULT CreateMenuBar(IShellMenu **menuBar); - HRESULT CreateBrandBand(IUnknown **logoBar); HRESULT CreateToolsBar(IUnknown **toolsBar); - HRESULT CreateAddressBand(IUnknown **toolsBar); HRESULT LockUnlockToolbars(bool locked); HRESULT CommandStateChanged(bool newValue, int commandID); HRESULT CreateAndInitBandProxy(); Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -49,57 +49,9 @@ #include "regtreeoptions.h" #include "explorerband.h" #include "CProgressDialog.h" +#include "browseui.h" #include <stdio.h> WINE_DEFAULT_DEBUG_CHANNEL(browseui); - -#define USE_CUSTOM_MENUBAND 1 - -typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); -typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); - -static inline -HRESULT CreateMergedFolder(REFIID riid, void **ppv) -{ -#if 1 - HMODULE hRShell = GetModuleHandle(L"rshell.dll"); - if (!hRShell) - hRShell = LoadLibrary(L"rshell.dll"); - - if (hRShell) - { - PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) - GetProcAddress(hRShell, "CMergedFolder_Constructor"); - - if (pCMergedFolder_Constructor) - { - return pCMergedFolder_Constructor(riid, ppv); - } - } -#endif - return CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, riid, ppv); -} - -static inline -HRESULT CreateMenuBand(REFIID iid, LPVOID *ppv) -{ -#if USE_CUSTOM_MENUBAND - HMODULE hRShell = GetModuleHandleW(L"rshell.dll"); - - if (!hRShell) - hRShell = LoadLibraryW(L"rshell.dll"); - - if (hRShell) - { - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); - if (func) - { - return func(iid , ppv); - } - } -#endif - return CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, iid, ppv); -} - #endif /* _BROWSEUI_PCH_ */ Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -23,8 +23,6 @@ #include <shellapi.h> #include <htiframe.h> #include <strsafe.h> - -#define USE_CUSTOM_EXPLORERBAND 1 extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); @@ -128,14 +126,6 @@ // this class is private to browseui.dll and is not registered externally? //DEFINE_GUID(CLSID_ShellFldSetExt, 0x6D5313C0, 0x8C62, 0x11D1, 0xB2, 0xCD, 0x00, 0x60, 0x97, 0xDF, 0x8C, 0x11); - - -extern HRESULT CreateTravelLog(REFIID riid, void **ppv); -extern HRESULT CreateBaseBar(REFIID riid, void **ppv, BOOL vertical); -extern HRESULT CreateBaseBarSite(REFIID riid, void **ppv, BOOL vertical); - -// temporary -extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); void DeleteMenuItems(HMENU theMenu, unsigned int firstIDToDelete, unsigned int lastIDToDelete) { @@ -325,7 +315,7 @@ HRESULT BrowseToPath(IShellFolder *newShellFolder, LPCITEMIDLIST absolutePIDL, FOLDERSETTINGS *folderSettings, long flags); HRESULT GetMenuBand(REFIID riid, void **shellMenu); - HRESULT GetBaseBar(bool vertical, IUnknown **theBaseBar); + HRESULT GetBaseBar(bool vertical, REFIID riid, void **theBaseBar); BOOL IsBandLoaded(const CLSID clsidBand, bool verticali, DWORD *pdwBandID); HRESULT ShowBand(const CLSID &classID, bool vertical); HRESULT NavigateToParent(); @@ -740,15 +730,9 @@ if (m_hWnd == NULL) return E_FAIL; -#if 0 - hResult = CoCreateInstance(CLSID_InternetToolbar, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &fClientBars[BIInternetToolbar].clientBar)); + hResult = CInternetToolbar_CreateInstance(IID_PPV_ARG(IUnknown, &clientBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; -#else - hResult = CreateInternetToolbar(IID_PPV_ARG(IUnknown, &clientBar)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; -#endif fClientBars[BIInternetToolbar].clientBar = clientBar; @@ -1105,7 +1089,7 @@ return deskBand->QueryInterface(riid, shellMenu); } -HRESULT CShellBrowser::GetBaseBar(bool vertical, IUnknown **theBaseBar) +HRESULT CShellBrowser::GetBaseBar(bool vertical, REFIID riid, void **theBaseBar) { CComPtr<IUnknown> newBaseBar; CComPtr<IDeskBar> deskBar; @@ -1120,10 +1104,10 @@ cache = &fClientBars[BIHorizontalBaseBar].clientBar.p; if (*cache == NULL) { - hResult = CreateBaseBar(IID_PPV_ARG(IUnknown, &newBaseBar), vertical); + hResult = CBaseBar_CreateInstance(IID_PPV_ARG(IUnknown, &newBaseBar), vertical); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = CreateBaseBarSite(IID_PPV_ARG(IUnknown, &newBaseBarSite), vertical); + hResult = CBaseBarSite_CreateInstance(IID_PPV_ARG(IUnknown, &newBaseBarSite), vertical); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -1152,13 +1136,12 @@ return hResult; } - return (*cache)->QueryInterface(IID_PPV_ARG(IUnknown, theBaseBar)); + return (*cache)->QueryInterface(riid, theBaseBar); } BOOL CShellBrowser::IsBandLoaded(const CLSID clsidBand, bool vertical, DWORD *pdwBandID) { HRESULT hResult; - CComPtr<IUnknown> baseBar; CComPtr<IDeskBar> deskBar; CComPtr<IUnknown> baseBarSite; CComPtr<IBandSite> bandSite; @@ -1168,10 +1151,7 @@ DWORD i; /* Get our basebarsite to be able to enumerate bands */ - hResult = GetBaseBar(vertical, &baseBar); - if (FAILED_UNEXPECTEDLY(hResult)) - return FALSE; - hResult = baseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); + hResult = GetBaseBar(vertical, IID_PPV_ARG(IDeskBar, &deskBar)); if (FAILED_UNEXPECTEDLY(hResult)) return FALSE; hResult = deskBar->GetClient(&baseBarSite); @@ -1213,41 +1193,34 @@ CComPtr<IDockingWindow> dockingWindow; CComPtr<IUnknown> baseBarSite; CComPtr<IUnknown> newBand; - CComPtr<IUnknown> theBaseBar; CComPtr<IDeskBar> deskBar; VARIANT vaIn; HRESULT hResult; DWORD dwBandID; - hResult = GetBaseBar(vertical, (IUnknown **)&theBaseBar); + hResult = GetBaseBar(vertical, IID_PPV_ARG(IDeskBar, &deskBar)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); + hResult = deskBar->GetClient(&baseBarSite); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = deskBar->GetClient(&baseBarSite); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - - hResult = theBaseBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); + hResult = deskBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; if (!IsBandLoaded(classID, vertical, &dwBandID)) { -#if USE_CUSTOM_EXPLORERBAND TRACE("ShowBand called for CLSID %s, vertical=%d...\n", wine_dbgstr_guid(&classID), vertical); if (IsEqualCLSID(CLSID_ExplorerBand, classID)) { TRACE("CLSID_ExplorerBand requested, building internal band.\n"); - hResult = CExplorerBand_Constructor(IID_PPV_ARG(IUnknown, &newBand)); + hResult = CExplorerBand_CreateInstance(IID_PPV_ARG(IUnknown, &newBand)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } else -#endif { TRACE("A different CLSID requested, using CoCreateInstance.\n"); hResult = CoCreateInstance(classID, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IUnknown, &newBand)); @@ -2388,7 +2361,7 @@ *pptl = NULL; if (fTravelLog.p == NULL) { - hResult = CreateTravelLog(IID_PPV_ARG(ITravelLog, &fTravelLog)); + hResult = CTravelLog_CreateInstance(IID_PPV_ARG(ITravelLog, &fTravelLog)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; } Modified: trunk/reactos/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/toolsba… ============================================================================== --- trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/toolsband.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -433,7 +433,7 @@ return 0; } -HRESULT CreateToolsBar(REFIID riid, void **ppv) +HRESULT CToolsBand_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreator<CToolsBand>(riid, ppv); } Modified: trunk/reactos/dll/win32/browseui/travellog.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/travell… ============================================================================== --- trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/travellog.cpp [iso-8859-1] Sat Jul 30 11:53:16 2016 @@ -624,7 +624,7 @@ return E_NOTIMPL; } -HRESULT CreateTravelLog(REFIID riid, void **ppv) +HRESULT CTravelLog_CreateInstance(REFIID riid, void **ppv) { return ShellObjectCreatorInit<CTravelLog>(riid, ppv); }

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