Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 72192: [KMTESTS:FSRTL] Add a stress test for tunnel cache implementation, where we have fun adding duplicated entries. It doesn't seem to go well. These tests are also known as "Learn...
by pschweitzer＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: pschweitzer Date: Wed Aug 10 20:50:36 2016 New Revision: 72192 URL: http://svn.reactos.org/svn/reactos?rev=72192&view=rev Log: [KMTESTS:FSRTL] Add a stress test for tunnel cache implementation, where we have fun adding duplicated entries. It doesn't seem to go well. These tests are also known as "Learn your English ordinals", or as "Learn how to count in English". My pleasure. CORE-11819 Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlT… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] Wed Aug 10 20:50:36 2016 @@ -121,6 +121,116 @@ FsRtlDeleteKeyFromTunnelCache(T, a); } +static +void DuplicatesTest() +{ + UNICODE_STRING ShortName, LongName, OutShort, OutLong, ShortName2, LongName2; + ULONG First, Second, OutLength, OutData; + PTUNNEL Tunnel; + PVOID Buffer; + + First = 1; + Second = 2; + RtlInitUnicodeString(&ShortName, L"LONGFI~1.TXT"); + RtlInitUnicodeString(&LongName, L"Longfilename.txt"); + RtlInitUnicodeString(&ShortName2, L"LONGFI~2.TXT"); + RtlInitUnicodeString(&LongName2, L"Longfilenamr.txt"); + Tunnel = ExAllocatePool(NonPagedPool, sizeof(TUNNEL)); + RtlZeroMemory(Tunnel, sizeof(TUNNEL)); + OutShort.MaximumLength = 13 * sizeof(WCHAR); + OutShort.Buffer = ExAllocatePool(PagedPool, OutShort.MaximumLength); + OutLong.MaximumLength = 17 * sizeof(WCHAR); + OutLong.Buffer = Buffer = ExAllocatePool(PagedPool, OutLong.MaximumLength); + + FsRtlInitializeTunnelCache(Tunnel); + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName, &LongName, TRUE, sizeof(ULONG), &First); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "First call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 1); + ok_eq_pointer(OutLong.Buffer, Buffer); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName, &LongName, TRUE, sizeof(ULONG), &Second); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Second call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + ok_eq_pointer(OutLong.Buffer, Buffer); + + OutLong.MaximumLength = 13 * sizeof(WCHAR); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Third call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + ok(OutLong.Buffer != Buffer, "Buffer didn't get reallocated!\n"); + ok_eq_uint(OutLong.MaximumLength, 16 * sizeof(WCHAR)); + + FsRtlDeleteKeyFromTunnelCache(Tunnel, 1); + ok_bool_false(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Fourth call"); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName, &LongName, TRUE, sizeof(ULONG), &First); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Fifth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 1); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName2, &LongName2, TRUE, sizeof(ULONG), &First); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Sixth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 1); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName2, &OutShort, &OutLong, &OutLength, &OutData), "Seventh call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 1); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName, &LongName, TRUE, sizeof(ULONG), &Second); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Eighth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName2, &OutShort, &OutLong, &OutLength, &OutData), "Ninth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 1); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName2, &LongName2, TRUE, sizeof(ULONG), &Second); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Tenth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName2, &OutShort, &OutLong, &OutLength, &OutData), "Eleventh call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + + FsRtlDeleteKeyFromTunnelCache(Tunnel, 1); + ok_bool_false(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Twelfth call"); + ok_bool_false(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName2, &OutShort, &OutLong, &OutLength, &OutData), "Thirteenth call"); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName, &LongName, TRUE, sizeof(ULONG), &First); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Fourteenth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 1); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName, &LongName, TRUE, sizeof(ULONG), &Second); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Fifteenth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName2, &LongName2, TRUE, sizeof(ULONG), &First); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Sixteenth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName2, &OutShort, &OutLong, &OutLength, &OutData), "Seventeenth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 1); + + FsRtlAddToTunnelCache(Tunnel, 1, &ShortName2, &LongName2, TRUE, sizeof(ULONG), &Second); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName, &OutShort, &OutLong, &OutLength, &OutData), "Eighteenth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + ok_bool_true(FsRtlFindInTunnelCache(Tunnel, 1, &ShortName2, &OutShort, &OutLong, &OutLength, &OutData), "Nineteenth call"); + ok_eq_ulong(OutLength, sizeof(ULONG)); + ok_eq_ulong(OutData, 2); + + FsRtlDeleteTunnelCache(Tunnel); + ExFreePool(OutShort.Buffer); + ExFreePool(OutLong.Buffer); + ExFreePool(Buffer); + ExFreePool(Tunnel); +} + START_TEST(FsRtlTunnel) { PUNICODE_STRING s_name; @@ -183,4 +293,6 @@ ExFreePool(Tb); ExFreePool(T); -} + + DuplicatesTest(); +}

1 0

[mjansen] 72191: [ATL][ATL_APITEST] Partially implement CRegKey + add tests. CORE-11746
by mjansen＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: mjansen Date: Wed Aug 10 19:34:38 2016 New Revision: 72191 URL: http://svn.reactos.org/svn/reactos?rev=72191&view=rev Log: [ATL][ATL_APITEST] Partially implement CRegKey + add tests. CORE-11746 Added: trunk/rostests/apitests/atl/CRegKey.cpp (with props) Modified: trunk/reactos/sdk/lib/atl/atlbase.cpp trunk/reactos/sdk/lib/atl/atlbase.h trunk/rostests/apitests/atl/CMakeLists.txt trunk/rostests/apitests/atl/testlist.c Modified: trunk/reactos/sdk/lib/atl/atlbase.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlbase.cpp?re… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlbase.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlbase.cpp [iso-8859-1] Wed Aug 10 19:34:38 2016 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <tchar.h> #include "atlbase.h" namespace ATL Modified: trunk/reactos/sdk/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/atl/atlbase.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/atl/atlbase.h [iso-8859-1] Wed Aug 10 19:34:38 2016 @@ -25,6 +25,7 @@ #include "atlcomcli.h" #include "atlalloc.h" #include "comcat.h" +#include "tchar.h" #ifdef _MSC_VER // It is common to use this in ATL constructors. They only store this for later use, so the usage is safe. @@ -886,6 +887,218 @@ } }; +class CRegKey +{ +public: + HKEY m_hKey; + +public: + + CRegKey() throw() + : m_hKey(NULL) + { + } + + CRegKey(CRegKey& key) throw() + { + Attach(key.Detach()); + } + + explicit CRegKey(HKEY hKey) throw() + :m_hKey(hKey) + { + } + + ~CRegKey() throw() + { + } + + void Attach(HKEY hKey) throw() + { + m_hKey = hKey; + } + + LONG Close() throw() + { + if (m_hKey) + { + HKEY hKey = Detach(); + return RegCloseKey(hKey); + } + return ERROR_SUCCESS; + } + + HKEY Detach() throw() + { + HKEY hKey = m_hKey; + m_hKey = NULL; + return hKey; + } + + LONG Open(HKEY hKeyParent, LPCTSTR lpszKeyName, REGSAM samDesired = KEY_READ | KEY_WRITE) throw() + { + HKEY hKey = NULL; + + LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyName, NULL, samDesired, &hKey); + if (lRes == ERROR_SUCCESS) + { + Close(); + m_hKey = hKey; + } + return lRes; + } + + LONG Create(HKEY hKeyParent, LPCTSTR lpszKeyName, LPTSTR lpszClass = REG_NONE, DWORD dwOptions = REG_OPTION_NON_VOLATILE, REGSAM samDesired = KEY_READ | KEY_WRITE, LPSECURITY_ATTRIBUTES lpSecAttr = NULL, LPDWORD lpdwDisposition = NULL) throw() + { + HKEY hKey = NULL; + + LONG lRes = RegCreateKeyEx(hKeyParent, lpszKeyName, NULL, lpszClass, dwOptions, samDesired, lpSecAttr, &hKey, lpdwDisposition); + if (lRes == ERROR_SUCCESS) + { + Close(); + m_hKey = hKey; + } + return lRes; + } + + + LONG QueryValue(LPCTSTR pszValueName, DWORD* pdwType, void* pData, ULONG* pnBytes) throw() + { + return RegQueryValueEx(m_hKey, pszValueName, NULL, pdwType, (LPBYTE)pData, pnBytes); + } + + LONG QueryDWORDValue(LPCTSTR pszValueName, DWORD& dwValue) throw() + { + ULONG size = sizeof(DWORD); + DWORD type = 0; + LONG lRet = QueryValue(pszValueName, &type, &dwValue, &size); + + if (lRet == ERROR_SUCCESS && type != REG_DWORD) + lRet = ERROR_INVALID_DATA; + + return lRet; + } + + LONG QueryBinaryValue(LPCTSTR pszValueName, void* pValue, ULONG* pnBytes) throw() + { + DWORD type = 0; + LONG lRet = QueryValue(pszValueName, &type, pValue, pnBytes); + + if (lRet == ERROR_SUCCESS && type != REG_BINARY) + lRet = ERROR_INVALID_DATA; + + return lRet; + } + + LONG QueryStringValue(LPCTSTR pszValueName, LPTSTR pszValue, ULONG* pnChars) throw() + { + ULONG size = (*pnChars) * sizeof(TCHAR); + DWORD type = 0; + LONG lRet = QueryValue(pszValueName, &type, pszValue, &size); + + if (lRet == ERROR_SUCCESS && type != REG_SZ) + lRet = ERROR_INVALID_DATA; + + *pnChars = size / sizeof(TCHAR); + return lRet; + } + + LONG QueryGUIDValue(LPCTSTR pszValueName, GUID& guidValue) throw() + { + OLECHAR buf[40] = {0}; + ULONG nChars = 39; + LONG lRet; + +#ifdef UNICODE + lRet = QueryStringValue(pszValueName, buf, &nChars); +#else + CHAR bufA[40] = {0}; + lRet = QueryStringValue(pszValueName, bufA, &nChars); + if (lRet != ERROR_SUCCESS) + return lRet; + if (!::MultiByteToWideChar(CP_THREAD_ACP, 0, bufA, -1, buf, 39)) + lRet = ERROR_INVALID_DATA; +#endif + if (lRet != ERROR_SUCCESS) + return lRet; + + if (!SUCCEEDED(CLSIDFromString(buf, &guidValue))) + return ERROR_INVALID_DATA; + + return lRet; + } + + LONG SetValue(LPCTSTR pszValueName, DWORD dwType, const void* pValue, ULONG nBytes) throw() + { + return RegSetValueEx(m_hKey, pszValueName, NULL, dwType, (const BYTE*)pValue, nBytes); + } + + LONG SetDWORDValue(LPCTSTR pszValueName, DWORD dwValue) throw() + { + return SetValue(pszValueName, REG_DWORD, &dwValue, sizeof(DWORD)); + } + + LONG SetStringValue(LPCTSTR pszValueName, LPCTSTR pszValue, DWORD dwType = REG_SZ) throw() + { + if (dwType != REG_SZ) + return ERROR_INVALID_DATA; // not implemented yet. + + ULONG length = (_tcslen(pszValue) + 1) * sizeof(TCHAR); + return SetValue(pszValueName, dwType, pszValue, length); + } + + LONG SetGUIDValue(LPCTSTR pszValueName, REFGUID guidValue) throw() + { + OLECHAR buf[40] = {0}; + StringFromGUID2(guidValue, buf, 39); +#ifdef UNICODE + return SetStringValue(pszValueName, buf); +#else + CHAR bufA[40] = {0}; + ::WideCharToMultiByte(CP_THREAD_ACP, 0, buf, -1, bufA, 40, NULL, NULL); + return SetStringValue(pszValueName, bufA); +#endif + } + + LONG SetBinaryValue(LPCTSTR pszValueName, const void* pValue, ULONG nBytes) throw() + { + return SetValue(pszValueName, REG_BINARY, pValue, nBytes); + } + + LONG SetKeyValue(LPCTSTR lpszKeyName, LPCTSTR lpszValue, LPCTSTR lpszValueName = NULL) throw() + { + CRegKey key; + LONG lRet = key.Create(m_hKey, lpszKeyName); + if (lRet == ERROR_SUCCESS) + { + lRet = key.SetStringValue(lpszValueName, lpszValue); + } + return lRet; + } + + LONG DeleteValue(LPCTSTR lpszValue) throw() + { + return RegDeleteValue(m_hKey, lpszValue); + } + + LONG DeleteSubKey(LPCTSTR lpszSubKey) throw() + { + return RegDeleteKey(m_hKey, lpszSubKey); + } + + operator HKEY() const throw() + { + return m_hKey; + } + + CRegKey& operator =(CRegKey& key) throw() + { + Attach(Detach()); + return *this; + } + +}; + template<class T> class CComHeapPtr : public CHeapPtr<T, CComAllocator> 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] Wed Aug 10 19:34:38 2016 @@ -7,11 +7,12 @@ atltypes.cpp CComBSTR.cpp CComHeapPtr.cpp + CRegKey.cpp CString.cpp testlist.c atl_apitest.rc) target_link_libraries(atl_apitest wine uuid) set_module_type(atl_apitest win32cui) -add_importlibs(atl_apitest ole32 oleaut32 user32 msvcrt kernel32) +add_importlibs(atl_apitest ole32 oleaut32 advapi32 user32 msvcrt kernel32) add_cd_file(TARGET atl_apitest DESTINATION reactos/bin FOR all) Added: trunk/rostests/apitests/atl/CRegKey.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/atl/CRegKey.cpp?… ============================================================================== --- trunk/rostests/apitests/atl/CRegKey.cpp (added) +++ trunk/rostests/apitests/atl/CRegKey.cpp [iso-8859-1] Wed Aug 10 19:34:38 2016 @@ -0,0 +1,188 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for CRegKey + * PROGRAMMER: Mark Jansen + */ + +#include <apitest.h> +#include <atlbase.h> + +START_TEST(CRegKey) +{ + CRegKey key; + CRegKey key2(HKEY_CURRENT_USER); + + ok(key.m_hKey == NULL, "Expected m_hKey to be initialized to 0, was: %p\n", key.m_hKey); + ok(key2.m_hKey == HKEY_CURRENT_USER, "Expected m_hKey to be initialized to HKEY_CURRENT_USER, was: %p\n", key2.m_hKey); + ok(key2 == HKEY_CURRENT_USER, "Expected operator HKEY() to be implemented\n"); + + // Take ownership + CRegKey key3(key2); + ok(key3.m_hKey == HKEY_CURRENT_USER, "Expected m_hKey to be initialized to HKEY_CURRENT_USER, was: %p\n", key3.m_hKey); + ok(key2.m_hKey == NULL, "Expected m_hKey to be initialized to 0, was: %p\n", key2.m_hKey); + + LSTATUS lret; + + lret = key.Close(); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + lret = key2.Close(); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + lret = key3.Close(); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + // read/write + lret = key.Open(HKEY_CURRENT_USER, _T("Environment")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(key.m_hKey != NULL, "Expected m_hKey to not be NULL, was: %p\n", key.m_hKey); + + + HKEY tmp = key.m_hKey; + HKEY detached = key.Detach(); + ok(key.m_hKey == NULL, "Expected m_hKey to be 0, was: %p\n", key.m_hKey); + ok(detached == tmp, "Expected detached to be %p, was: %p\n", tmp, detached); + key.Attach(detached); + ok(key.m_hKey == tmp, "Expected m_hKey to be %p, was: %p\n", tmp, key.m_hKey); + + lret = key2.Open(HKEY_CURRENT_USER, _T("Environment"), KEY_READ); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + lret = key3.Open(HKEY_CURRENT_USER, _T("Environment"), KEY_WRITE); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + TCHAR testdata[] = _T("XX-XX"); + lret = key.SetValue(_T("APITEST_VALUE_NAME"), REG_SZ, testdata, sizeof(testdata)); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + TCHAR buffer[100]; + ULONG buffer_size = sizeof(buffer); + DWORD type = 0x12345; + memset(buffer, 0, sizeof(buffer)); + + lret = key.QueryValue(_T("APITEST_VALUE_NAME"), &type, buffer, &buffer_size); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(type == REG_SZ, "Expected type to be REG_SZ, was: %lu\n", type); + ok(buffer_size == sizeof(testdata), "Expected buffer_size to be %u, was: %lu\n", sizeof(testdata), buffer_size); + ok(!memcmp(buffer, testdata, sizeof(testdata)), "Expected to get the same input as what was written!\n"); + + + buffer_size = sizeof(buffer); + type = 0x12345; + memset(buffer, 0, sizeof(buffer)); + lret = key2.QueryValue(_T("APITEST_VALUE_NAME"), &type, buffer, &buffer_size); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(type == REG_SZ, "Expected type to be REG_SZ, was: %lu\n", type); + ok(buffer_size == sizeof(testdata), "Expected buffer_size to be %u, was: %lu\n", sizeof(testdata), buffer_size); + ok(!memcmp(buffer, testdata, sizeof(testdata)), "Expected to get the same input as what was written!\n"); + + buffer_size = sizeof(buffer); + type = 0x12345; + memset(buffer, 0, sizeof(buffer)); + lret = key3.QueryValue(_T("APITEST_VALUE_NAME"), &type, buffer, &buffer_size); + ok(lret == ERROR_ACCESS_DENIED, "Expected lret to be ERROR_ACCESS_DENIED, was: %lu\n", lret); + ok(type == 0 || broken(type == 203), "Expected type to be 0, was: %lu\n", type); + ok(buffer_size == sizeof(buffer), "Expected buffer_size to be %u, was: %lu\n", sizeof(buffer), buffer_size); + + + lret = key2.SetValue(_T("APITEST_VALUE_NAME"), REG_SZ, testdata, sizeof(testdata)); + ok(lret == ERROR_ACCESS_DENIED, "Expected lret to be ERROR_ACCESS_DENIED, was: %lu\n", lret); + + lret = key2.DeleteValue(_T("APITEST_VALUE_NAME")); + ok(lret == ERROR_ACCESS_DENIED, "Expected lret to be ERROR_ACCESS_DENIED, was: %lu\n", lret); + + DWORD dword = 0x54321; + lret = key2.QueryDWORDValue(_T("APITEST_VALUE_NAME"), dword); + ok(lret == ERROR_MORE_DATA, "Expected lret to be ERROR_MORE_DATA, was: %lu\n", lret); + ok(dword == 0x54321, "Expected dword to be 0x54321, was: %lu\n", dword); + + lret = key.SetValue(_T("APITEST_VALUE_NAME"), REG_SZ, testdata, sizeof(TCHAR)); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_ACCESS_DENIED, was: %lu\n", lret); + + dword = 0x54321; + lret = key2.QueryDWORDValue(_T("APITEST_VALUE_NAME"), dword); + ok(lret == ERROR_INVALID_DATA, "Expected lret to be ERROR_MORE_DATA, was: %lu\n", lret); + ok(dword != 0x54321, "Expected dword to NOT be 0x54321, was: %lu\n", dword); + + lret = key3.SetDWORDValue(_T("APITEST_VALUE_NAME"), 0x12345); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + dword = 0x54321; + lret = key2.QueryDWORDValue(_T("APITEST_VALUE_NAME"), dword); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(dword == 0x12345, "Expected dword to be 0x12345, was: %lu\n", dword); + + + lret = key3.DeleteValue(_T("APITEST_VALUE_NAME")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + + lret = key.SetKeyValue(_T("APITEST_KEY_NAME"), _T("APITEST_VALUE")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + CRegKey qv; + + // COUNTOF, not SIZEOF!!!! + lret = qv.Open(HKEY_CURRENT_USER, _T("Environment\\APITEST_KEY_NAME")); + buffer_size = _countof(buffer); + memset(buffer, 0, sizeof(buffer)); + lret = qv.QueryStringValue(NULL, buffer, &buffer_size); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(buffer_size == _countof("APITEST_VALUE"), "Expected buffer_size to be %u, was: %lu\n", _countof("APITEST_VALUE"), buffer_size); + ok(!_tcscmp(buffer, _T("APITEST_VALUE")), "Expected to get the same input as what was written!\n"); + + lret = key.SetKeyValue(_T("APITEST_KEY_NAME"), _T("APITEST_VALUE2"), _T("APITEST_VALUE_NAME")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + buffer_size = _countof(buffer); + memset(buffer, 0, sizeof(buffer)); + lret = qv.QueryStringValue(_T("APITEST_VALUE_NAME"), buffer, &buffer_size); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(buffer_size == _countof("APITEST_VALUE2"), "Expected buffer_size to be %u, was: %lu\n", _countof("APITEST_VALUE2"), buffer_size); + ok(!_tcscmp(buffer, _T("APITEST_VALUE2")), "Expected to get the same input as what was written!\n"); + + lret = key.DeleteSubKey(_T("APITEST_KEY_NAME")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + GUID guid, guid2; + memset(&guid, 56, sizeof(guid)); + + lret = key.SetGUIDValue(_T("GUID_NAME"), guid); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + lret = key.QueryGUIDValue(_T("GUID_NAME"), guid2); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(!memcmp(&guid, &guid2, sizeof(guid)), "Expected guid to equal guid2\n"); + + buffer_size = _countof(buffer); + memset(buffer, 0, sizeof(buffer)); + lret = key2.QueryStringValue(_T("GUID_NAME"), buffer, &buffer_size); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(buffer_size == _countof("{38383838-3838-3838-3838-383838383838}"), + "Expected buffer_size to be %u, was: %lu\n", _countof("{38383838-3838-3838-3838-383838383838}"), buffer_size); + ok(!_tcscmp(buffer, _T("{38383838-3838-3838-3838-383838383838}")), "Expected to get the same input as what was written!\n"); + + memset(&guid, 33, 5); + lret = key.SetBinaryValue(_T("BIN_NAME"), &guid, 5); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + buffer_size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + lret = key.QueryBinaryValue(_T("GUID_NAME"), buffer, &buffer_size); + ok(lret == ERROR_INVALID_DATA, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(buffer_size == sizeof(_T("{38383838-3838-3838-3838-383838383838}")), + "Expected buffer_size to be %u, was: %lu\n", sizeof(_T("{38383838-3838-3838-3838-383838383838}")), buffer_size); + ok(buffer[0] == '{', "Expected buffer[0] to be 123, was: %i\n", (int)buffer[0]); + + buffer_size = sizeof(buffer); + memset(buffer, 0, sizeof(buffer)); + lret = key.QueryBinaryValue(_T("BIN_NAME"), buffer, &buffer_size); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + ok(buffer_size == 5, "Expected buffer_size to be %i, was: %lu\n", 5, buffer_size); + ok(!memcmp(buffer, &guid, 5), "Expected the first 5 bytes of buffer to equal the data in null_guid\n"); + + lret = key.DeleteValue(_T("GUID_NAME")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); + + lret = key.DeleteValue(_T("BIN_NAME")); + ok(lret == ERROR_SUCCESS, "Expected lret to be ERROR_SUCCESS, was: %lu\n", lret); +} Propchange: trunk/rostests/apitests/atl/CRegKey.cpp ------------------------------------------------------------------------------ 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] Wed Aug 10 19:34:38 2016 @@ -4,6 +4,7 @@ extern void func_atltypes(void); extern void func_CComBSTR(void); extern void func_CComHeapPtr(void); +extern void func_CRegKey(void); extern void func_CString(void); const struct test winetest_testlist[] = @@ -11,6 +12,7 @@ { "atltypes", func_atltypes }, { "CComBSTR", func_CComBSTR }, { "CComHeapPtr", func_CComHeapPtr }, + { "CRegKey", func_CRegKey }, { "CString", func_CString }, { 0, 0 } };

1 0

[dchapyshev] 72190: [SDK] - KLF_SHIFTLOCK is not equal 65535. Correct value is 0x00010000
by dchapyshev＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: dchapyshev Date: Wed Aug 10 19:05:54 2016 New Revision: 72190 URL: http://svn.reactos.org/svn/reactos?rev=72190&view=rev Log: [SDK] - KLF_SHIFTLOCK is not equal 65535. Correct value is 0x00010000 Modified: trunk/reactos/sdk/include/psdk/winuser.h Modified: trunk/reactos/sdk/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/winuser.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/winuser.h [iso-8859-1] Wed Aug 10 19:05:54 2016 @@ -116,7 +116,7 @@ #define KLF_NOTELLSHELL 128 #define KLF_SETFORPROCESS 256 #if (_WIN32_WINNT >= 0x0500) -#define KLF_SHIFTLOCK 65535 +#define KLF_SHIFTLOCK 0x00010000 #define KLF_RESET 0x40000000 #endif /*(_WIN32_WINNT >= 0x0500) */ #define KL_NAMELENGTH 9

1 0

[dchapyshev] 72189: [INPUT] - Draw 0x2022 unicode symbol instead 0x25CF (marking default input method) - Fix incorrect logic in CapsLock parameters - Notice system of change CapsLock mode parameters
by dchapyshev＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: dchapyshev Date: Wed Aug 10 19:04:11 2016 New Revision: 72189 URL: http://svn.reactos.org/svn/reactos?rev=72189&view=rev Log: [INPUT] - Draw 0x2022 unicode symbol instead 0x25CF (marking default input method) - Fix incorrect logic in CapsLock parameters - Notice system of change CapsLock mode parameters Modified: trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/key_settings_dialog.c trunk/reactos/dll/cpl/input/settings_page.c Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Wed Aug 10 19:04:11 2016 @@ -67,6 +67,9 @@ INT_PTR CALLBACK KeySettingsDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +DWORD +ReadAttributes(VOID); + /* key_sequence_dialog.c */ INT_PTR CALLBACK ChangeKeySeqDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); Modified: trunk/reactos/dll/cpl/input/key_settings_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/key_settings… ============================================================================== --- trunk/reactos/dll/cpl/input/key_settings_dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/key_settings_dialog.c [iso-8859-1] Wed Aug 10 19:04:11 2016 @@ -10,32 +10,40 @@ static KEY_SETTINGS _KeySettings = { 0 }; +DWORD +ReadAttributes(VOID) +{ + DWORD dwAttributes = 0; + HKEY hKey; + + if (RegOpenKeyExW(HKEY_CURRENT_USER, + L"Keyboard Layout", + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) + { + DWORD dwSize; + + dwSize = sizeof(dwSize); + + RegQueryValueExW(hKey, + L"Attributes", + NULL, NULL, + (LPBYTE)&dwAttributes, + &dwSize); + + RegCloseKey(hKey); + } + + return dwAttributes; +} + static VOID ReadKeysSettings(VOID) { HKEY hKey; - if (RegOpenKeyExW(HKEY_CURRENT_USER, - L"Keyboard Layout", - 0, - KEY_QUERY_VALUE, - &hKey) == ERROR_SUCCESS) - { - DWORD dwSize; - - dwSize = sizeof(dwSize); - - if (RegQueryValueExW(hKey, - L"Attributes", - NULL, NULL, - (LPBYTE)&_KeySettings.dwAttributes, - &dwSize) != ERROR_SUCCESS) - { - _KeySettings.dwAttributes = (DWORD) -1; - } - - RegCloseKey(hKey); - } + _KeySettings.dwAttributes = ReadAttributes(); if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Keyboard Layout\\Toggle", @@ -126,10 +134,13 @@ (wcslen(szBuffer) + 1) * sizeof(WCHAR)); RegCloseKey(hKey); - - /* Notice system of change of parameters */ - SystemParametersInfoW(SPI_SETLANGTOGGLE, 0, NULL, 0); - } + } + + /* Notice system of change hotkeys parameters */ + SystemParametersInfoW(SPI_SETLANGTOGGLE, 0, NULL, 0); + + /* Notice system of change CapsLock mode parameters */ + ActivateKeyboardLayout(GetKeyboardLayout(0), KLF_RESET | _KeySettings.dwAttributes); } @@ -178,20 +189,20 @@ if (_KeySettings.dwAttributes & KLF_SHIFTLOCK) { + CheckDlgButton(hwndDlg, IDC_PRESS_SHIFT_KEY_RB, BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_PRESS_CL_KEY_RB, BST_UNCHECKED); + } + else + { CheckDlgButton(hwndDlg, IDC_PRESS_SHIFT_KEY_RB, BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_PRESS_CL_KEY_RB, BST_CHECKED); } - else - { - CheckDlgButton(hwndDlg, IDC_PRESS_SHIFT_KEY_RB, BST_CHECKED); - CheckDlgButton(hwndDlg, IDC_PRESS_CL_KEY_RB, BST_UNCHECKED); - } hwndList = GetDlgItem(hwndDlg, IDC_KEY_LISTVIEW); ListView_SetExtendedListViewStyle(hwndList, LVS_EX_FULLROWSELECT); - ZeroMemory(&column, sizeof(column)); + ZeroMemory(&column, sizeof(column)); column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; @@ -243,7 +254,7 @@ case IDOK: { - if (IsDlgButtonChecked(hwndDlg, IDC_PRESS_CL_KEY_RB) == BST_UNCHECKED) + if (IsDlgButtonChecked(hwndDlg, IDC_PRESS_CL_KEY_RB) == BST_CHECKED) { _KeySettings.dwAttributes &= ~KLF_SHIFTLOCK; } Modified: trunk/reactos/dll/cpl/input/settings_page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings_pag… ============================================================================== --- trunk/reactos/dll/cpl/input/settings_page.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings_page.c [iso-8859-1] Wed Aug 10 19:04:11 2016 @@ -63,7 +63,7 @@ ExtTextOutW(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, L"", 0, NULL); SelectObject(hdc, hFont); - DrawTextW(hdc, L"\x25CF", 1, &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER); + DrawTextW(hdc, L"\x2022", 1, &rect, DT_SINGLELINE | DT_CENTER | DT_VCENTER); } else {

1 0

[gadamopoulos] 72188: [SHELL32] - Add CRegFolder using the guid item specific functions. So far it is only partly implemented with stuff like enumerating still missing. - Use CRegFolder in CDesktop...
by gadamopoulos＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: gadamopoulos Date: Wed Aug 10 18:56:48 2016 New Revision: 72188 URL: http://svn.reactos.org/svn/reactos?rev=72188&view=rev Log: [SHELL32] - Add CRegFolder using the guid item specific functions. So far it is only partly implemented with stuff like enumerating still missing. - Use CRegFolder in CDesktopFolder, CDrivesFolder and CControlPanelFolder and stop using guid item specific functions. Added: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.h trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shfldr.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -4,7 +4,7 @@ add_subdirectory(shellmenu) add_subdirectory(shellrecyclebin) -set_cpp(WITH_RUNTIME) +set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) if(NOT MSVC) @@ -53,6 +53,7 @@ folders/CFontsFolder.cpp folders/CControlPanelFolder.cpp folders/CRecycleBin.cpp + folders/CRegFolder.cpp droptargets/CexeDropHandler.cpp shlexec.cpp shlfileop.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -129,9 +129,7 @@ { PIDLCPanelStruct *pData = _ILGetCPanelPointer(pidl); if (!pData) - { - return CGuidItemExtractIcon_CreateInstance(psf, pidl, riid, ppvOut); - } + return E_FAIL; CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); @@ -305,7 +303,7 @@ DWORD *pdwAttributes) { /* We only support parsing guid names */ - return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + return m_regFolder->ParseDisplayName(hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); } /************************************************************************** @@ -325,7 +323,7 @@ REFIID riid, LPVOID *ppvOut) { - return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); + return m_regFolder->BindToObject(pidl, pbcReserved, riid, ppvOut); } /************************************************************************** @@ -435,7 +433,7 @@ if (_ILIsCPanelStruct(*apidl)) *rgfInOut &= SFGAO_CANLINK; else if (_ILIsSpecialFolder(*apidl)) - SHELL32_GetGuidItemAttributes(this, *apidl, rgfInOut); + m_regFolder->GetAttributesOf(1, apidl, rgfInOut); else ERR("Got an unkown pidl here!\n"); apidl++; @@ -492,7 +490,10 @@ } else if (IsEqualIID(riid, IID_IDataObject) && (cidl >= 1)) { hr = IDataObject_Constructor(hwndOwner, pidlRoot, apidl, cidl, (IDataObject **)&pObj); } else if ((IsEqualIID(riid, IID_IExtractIconA) || IsEqualIID(riid, IID_IExtractIconW)) && (cidl == 1)) { - hr = CCPLExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + if (_ILGetCPanelPointer(apidl[0])) + hr = CCPLExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + else + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } else { hr = E_NOINTERFACE; } @@ -522,11 +523,10 @@ } else if (_ILIsSpecialFolder(pidl)) { - static const WCHAR* pszCPanelPath = L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"; - return SHELL32_GetDisplayNameOfGUIDItem(this, pszCPanelPath, pidl, dwFlags, strRet); - } - - return S_OK; + return m_regFolder->GetDisplayNameOf(pidl, dwFlags, strRet); + } + + return E_FAIL; } /************************************************************************** @@ -597,7 +597,7 @@ } else if (_ILIsSpecialFolder(pidl)) { - return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); + return m_regFolder->GetDetailsOf(pidl, iColumn, psd); } else { @@ -649,6 +649,17 @@ SHFree((LPVOID)pidlRoot); pidlRoot = ILClone(pidl); + + /* Create the inner reg folder */ + HRESULT hr; + static const WCHAR* pszCPanelPath = L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"; + hr = CRegFolder_CreateInstance(&CLSID_ControlPanel, + pidlRoot, + pszCPanelPath, + IID_PPV_ARG(IShellFolder2, &m_regFolder)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return S_OK; } Modified: trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CControlPanelFolder.h [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -32,6 +32,7 @@ /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ + CComPtr<IShellFolder2> m_regFolder; HRESULT WINAPI ExecuteFromIdList(LPCITEMIDLIST pidl); Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -258,7 +258,8 @@ HRESULT WINAPI CDesktopFolder::FinalConstruct() { - WCHAR szMyPath[MAX_PATH]; HRESULT hr; + WCHAR szMyPath[MAX_PATH]; + HRESULT hr; /* Create the root pidl */ pidlRoot = _ILCreateDesktop(); @@ -285,6 +286,13 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; + /* Create the inner reg folder */ + hr = CRegFolder_CreateInstance(&CLSID_ShellDesktop, + pidlRoot, + L"", + IID_PPV_ARG(IShellFolder2, &m_regFolder)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; /* Cache the path to the user desktop directory */ if (!SHGetSpecialFolderPathW( 0, szMyPath, CSIDL_DESKTOPDIRECTORY, TRUE )) @@ -301,6 +309,9 @@ HRESULT CDesktopFolder::_GetSFFromPidl(LPCITEMIDLIST pidl, IShellFolder2** psf) { WCHAR szFileName[MAX_PATH]; + + if (_ILIsSpecialFolder(pidl)) + return m_regFolder->QueryInterface(IID_PPV_ARG(IShellFolder2, psf)); lstrcpynW(szFileName, sPathTarget, MAX_PATH - 1); PathAddBackslashW(szFileName); @@ -354,7 +365,7 @@ if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') { - return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + return m_regFolder->ParseDisplayName(hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); } else if (PathGetDriveNumberW (lpszDisplayName) >= 0) { @@ -445,9 +456,6 @@ if (!pidl) return E_INVALIDARG; - if (_ILIsSpecialFolder(pidl)) - return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); - CComPtr<IShellFolder2> psf; HRESULT hr = _GetSFFromPidl(pidl, &psf); if (FAILED_UNEXPECTEDLY(hr)) @@ -491,7 +499,7 @@ return MAKE_COMPARE_HRESULT(bIsDesktopFolder1 - bIsDesktopFolder2); if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) - return SHELL32_CompareGuidItems(this, lParam, pidl1, pidl2); + return m_regFolder->CompareIDs(lParam, pidl1, pidl2); return m_DesktopFSFolder->CompareIDs(lParam, pidl1, pidl2); } @@ -567,9 +575,7 @@ *rgfInOut &= dwMyComputerAttributes; else if (_ILIsNetHood(apidl[i])) *rgfInOut &= dwMyNetPlacesAttributes; - else if (_ILIsSpecialFolder(apidl[i])) - SHELL32_GetGuidItemAttributes(this, apidl[i], rgfInOut); - else if (_ILIsFolder(apidl[i]) || _ILIsValue(apidl[i])) + else if (_ILIsFolder(apidl[i]) || _ILIsValue(apidl[i]) || _ILIsSpecialFolder(apidl[i])) { CComPtr<IShellFolder2> psf; HRESULT hr = _GetSFFromPidl(apidl[i], &psf); @@ -641,7 +647,7 @@ } else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) { - hr = CGuidItemExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } else hr = E_NOINTERFACE; @@ -671,10 +677,6 @@ if (!_ILIsPidlSimple (pidl)) { return SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, strRet); - } - else if (!_ILIsDesktop(pidl) && _ILIsSpecialFolder(pidl)) - { - return SHELL32_GetDisplayNameOfGUIDItem(this, L"", pidl, dwFlags, strRet); } else if (_ILIsDesktop(pidl)) { @@ -712,9 +714,6 @@ DWORD dwFlags, PITEMID_CHILD *pPidlOut) { - if (_ILGetGUIDPointer(pidl)) - return SHELL32_SetNameOfGuidItem(pidl, lpName, dwFlags, pPidlOut); - CComPtr<IShellFolder2> psf; HRESULT hr = _GetSFFromPidl(pidl, &psf); if (FAILED_UNEXPECTEDLY(hr)) @@ -783,10 +782,6 @@ psd->cxChar = DesktopSFHeader[iColumn].cxChar; return SHSetStrRet(&psd->str, DesktopSFHeader[iColumn].colnameid); } - else if (_ILIsSpecialFolder(pidl)) - { - return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); - } CComPtr<IShellFolder2> psf; HRESULT hr = _GetSFFromPidl(pidl, &psf); Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.h [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -33,6 +33,7 @@ /* both paths are parsible from the desktop */ CComPtr<IShellFolder2> m_DesktopFSFolder; CComPtr<IShellFolder2> m_SharedDesktopFSFolder; + CComPtr<IShellFolder2> m_regFolder; LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ LPITEMIDLIST pidlRoot; /* absolute pidl */ Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -41,11 +41,6 @@ HRESULT CDrivesExtractIcon_CreateInstance(IShellFolder * psf, LPCITEMIDLIST pidl, REFIID riid, LPVOID * ppvOut) { - if (!_ILIsDrive(pidl)) - { - return CGuidItemExtractIcon_CreateInstance(psf, pidl, riid, ppvOut); - } - CComPtr<IDefaultExtractIconInit> initIcon; HRESULT hr = SHCreateDefaultExtractIcon(IID_PPV_ARG(IDefaultExtractIconInit, &initIcon)); if (FAILED(hr)) @@ -91,6 +86,7 @@ return initIcon->QueryInterface(riid, ppvOut); } + class CDrivesFolderEnum : public CEnumIDListBase { @@ -230,7 +226,12 @@ if (pidlRoot == NULL) return E_OUTOFMEMORY; - return S_OK; + HRESULT hr = CRegFolder_CreateInstance(&CLSID_MyComputer, + pidlRoot, + L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", + IID_PPV_ARG(IShellFolder2, &m_regFolder)); + + return hr; } /************************************************************************** @@ -253,7 +254,7 @@ /* handle CLSID paths */ if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') - return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); + return m_regFolder->ParseDisplayName(hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); if (PathGetDriveNumberW(lpszDisplayName) < 0) return E_INVALIDARG; @@ -280,7 +281,7 @@ if (_ILIsDrive(pidlTemp)) *pdwAttributes &= dwDriveAttributes; else if (_ILIsSpecialFolder(pidlTemp)) - SHELL32_GetGuidItemAttributes(this, pidlTemp, pdwAttributes); + m_regFolder->GetAttributesOf(1, &pidlTemp, pdwAttributes); else ERR("Got an unkown pidl here!\n"); } @@ -310,7 +311,7 @@ pidl, pbcReserved, shdebugstr_guid(&riid), ppvOut); if (_ILIsSpecialFolder(pidl)) - return SHELL32_BindToGuidItem(pidlRoot, pidl, pbcReserved, riid, ppvOut); + return m_regFolder->BindToObject(pidl, pbcReserved, riid, ppvOut); LPITEMIDLIST pidlChild = ILCloneFirst (pidl); if (!pidlChild) @@ -364,7 +365,7 @@ } if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) - return SHELL32_CompareGuidItems(this, lParam, pidl1, pidl2); + m_regFolder->CompareIDs(lParam, pidl1, pidl2); if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS) return E_INVALIDARG; @@ -482,7 +483,7 @@ else if (_ILIsControlPanel(apidl[i])) *rgfInOut &= dwControlPanelAttributes; else if (_ILIsSpecialFolder(*apidl)) - SHELL32_GetGuidItemAttributes(this, apidl[i], rgfInOut); + m_regFolder->GetAttributesOf(1, &apidl[i], rgfInOut); else ERR("Got unknown pidl type!\n"); } @@ -533,7 +534,10 @@ } else if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) { - hr = CDrivesExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + if (_ILIsDrive(apidl[0])) + hr = CDrivesExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + else + hr = m_regFolder->GetUIObjectOf(hwndOwner, cidl, apidl, riid, prgfInOut, &pObj); } else if (IsEqualIID (riid, IID_IDropTarget) && (cidl >= 1)) { @@ -570,11 +574,11 @@ { return SHELL32_GetDisplayNameOfChild(this, pidl, dwFlags, strRet); } - else if (!_ILIsDesktop(pidl) && _ILIsSpecialFolder(pidl)) - { - return SHELL32_GetDisplayNameOfGUIDItem(this, L"::{20D04FE0-3AEA-1069-A2D8-08002B30309D}", pidl, dwFlags, strRet); - } - else if (pidl->mkid.cb && !_ILIsDrive(pidl)) + else if (_ILIsSpecialFolder(pidl)) + { + return m_regFolder->GetDisplayNameOf(pidl, dwFlags, strRet); + } + else if (!_ILIsDrive(pidl)) { ERR("Wrong pidl type\n"); return E_INVALIDARG; @@ -586,61 +590,51 @@ pszPath[0] = 0; - if (!pidl->mkid.cb) - { - /* parsing name like ::{...} */ - pszPath[0] = ':'; - pszPath[1] = ':'; - SHELL32_GUIDToStringW(CLSID_MyComputer, &pszPath[2]); - } - else - { - _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); /* append my own path */ - /* long view "lw_name (C:)" */ - if (!(dwFlags & SHGDN_FORPARSING)) - { - WCHAR wszDrive[18] = {0}; - DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; - static const WCHAR wszOpenBracket[] = {' ', '(', 0}; - static const WCHAR wszCloseBracket[] = {')', 0}; - - lstrcpynW(wszDrive, pszPath, 4); - pszPath[0] = L'\0'; - GetVolumeInformationW(wszDrive, pszPath, - MAX_PATH - 7, - &dwVolumeSerialNumber, - &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); - pszPath[MAX_PATH-1] = L'\0'; - if (!wcslen(pszPath)) + _ILSimpleGetTextW(pidl, pszPath, MAX_PATH); /* append my own path */ + /* long view "lw_name (C:)" */ + if (!(dwFlags & SHGDN_FORPARSING)) + { + WCHAR wszDrive[18] = {0}; + DWORD dwVolumeSerialNumber, dwMaximumComponentLength, dwFileSystemFlags; + static const WCHAR wszOpenBracket[] = {' ', '(', 0}; + static const WCHAR wszCloseBracket[] = {')', 0}; + + lstrcpynW(wszDrive, pszPath, 4); + pszPath[0] = L'\0'; + GetVolumeInformationW(wszDrive, pszPath, + MAX_PATH - 7, + &dwVolumeSerialNumber, + &dwMaximumComponentLength, &dwFileSystemFlags, NULL, 0); + pszPath[MAX_PATH-1] = L'\0'; + if (!wcslen(pszPath)) + { + UINT DriveType, ResourceId; + DriveType = GetDriveTypeW(wszDrive); + switch(DriveType) { - UINT DriveType, ResourceId; - DriveType = GetDriveTypeW(wszDrive); - switch(DriveType) - { - case DRIVE_FIXED: - ResourceId = IDS_DRIVE_FIXED; - break; - case DRIVE_REMOTE: - ResourceId = IDS_DRIVE_NETWORK; - break; - case DRIVE_CDROM: - ResourceId = IDS_DRIVE_CDROM; - break; - default: - ResourceId = 0; - } - if (ResourceId) - { - dwFileSystemFlags = LoadStringW(shell32_hInstance, ResourceId, pszPath, MAX_PATH); - if (dwFileSystemFlags > MAX_PATH - 7) - pszPath[MAX_PATH-7] = L'\0'; - } + case DRIVE_FIXED: + ResourceId = IDS_DRIVE_FIXED; + break; + case DRIVE_REMOTE: + ResourceId = IDS_DRIVE_NETWORK; + break; + case DRIVE_CDROM: + ResourceId = IDS_DRIVE_CDROM; + break; + default: + ResourceId = 0; } - wcscat (pszPath, wszOpenBracket); - wszDrive[2] = L'\0'; - wcscat (pszPath, wszDrive); - wcscat (pszPath, wszCloseBracket); - } + if (ResourceId) + { + dwFileSystemFlags = LoadStringW(shell32_hInstance, ResourceId, pszPath, MAX_PATH); + if (dwFileSystemFlags > MAX_PATH - 7) + pszPath[MAX_PATH-7] = L'\0'; + } + } + wcscat (pszPath, wszOpenBracket); + wszDrive[2] = L'\0'; + wcscat (pszPath, wszDrive); + wcscat (pszPath, wszCloseBracket); } if (SUCCEEDED(hr)) @@ -681,7 +675,7 @@ return S_OK; } - return SHELL32_SetNameOfGuidItem(pidl, lpName, dwFlags, pPidlOut); + return m_regFolder->SetNameOf(hwndOwner, pidl, lpName, dwFlags, pPidlOut); } HRESULT WINAPI CDrivesFolder::GetDefaultSearchGUID(GUID * pguid) @@ -740,7 +734,7 @@ } else if (_ILIsSpecialFolder(pidl)) { - return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); + return m_regFolder->GetDetailsOf(pidl, iColumn, psd); } else { Modified: trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDrivesFolder.h [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -32,6 +32,8 @@ private: /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ + CComPtr<IShellFolder2> m_regFolder; + public: CDrivesFolder(); ~CDrivesFolder(); Added: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp (added) +++ trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -0,0 +1,256 @@ +/* + * ReactOS Shell + * + * Copyright 2016 Giannis Adamopoulos + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <precomp.h> + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +class CRegFolder : + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellFolder2 +{ + private: + GUID m_guid; + CAtlStringW m_rootPath; + CComHeapPtr<ITEMIDLIST> m_pidlRoot; + + public: + CRegFolder(); + ~CRegFolder(); + HRESULT WINAPI Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath); + + // IShellFolder + virtual HRESULT WINAPI ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes); + virtual HRESULT WINAPI EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList); + virtual HRESULT WINAPI BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2); + virtual HRESULT WINAPI CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut); + virtual HRESULT WINAPI GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut); + virtual HRESULT WINAPI GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT * prgfInOut, LPVOID * ppvOut); + virtual HRESULT WINAPI GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet); + virtual HRESULT WINAPI SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut); + + /* ShellFolder2 */ + virtual HRESULT WINAPI GetDefaultSearchGUID(GUID *pguid); + virtual HRESULT WINAPI EnumSearches(IEnumExtraSearch **ppenum); + virtual HRESULT WINAPI GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay); + virtual HRESULT WINAPI GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags); + virtual HRESULT WINAPI GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv); + virtual HRESULT WINAPI GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd); + virtual HRESULT WINAPI MapColumnToSCID(UINT column, SHCOLUMNID *pscid); + + DECLARE_NOT_AGGREGATABLE(CRegFolder) + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + BEGIN_COM_MAP(CRegFolder) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder2, IShellFolder2) + COM_INTERFACE_ENTRY_IID(IID_IShellFolder, IShellFolder) + END_COM_MAP() +}; + +CRegFolder::CRegFolder() +{ +} + +CRegFolder::~CRegFolder() +{ +} + +HRESULT WINAPI CRegFolder::Initialize(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath) +{ + memcpy(&m_guid, pGuid, sizeof(m_guid)); + + m_rootPath = lpszPath; + if (!m_rootPath) + return E_OUTOFMEMORY; + + m_pidlRoot.Attach(ILClone(pidlRoot)); + if (!m_pidlRoot) + return E_OUTOFMEMORY; + + return S_OK; +} + +HRESULT WINAPI CRegFolder::ParseDisplayName(HWND hwndOwner, LPBC pbc, LPOLESTR lpszDisplayName, + ULONG *pchEaten, PIDLIST_RELATIVE *ppidl, ULONG *pdwAttributes) +{ + return SH_ParseGuidDisplayName(this, hwndOwner, pbc, lpszDisplayName, pchEaten, ppidl, pdwAttributes); +} + +HRESULT WINAPI CRegFolder::EnumObjects(HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST *ppEnumIDList) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI CRegFolder::BindToObject(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +{ + return SHELL32_BindToGuidItem(m_pidlRoot, pidl, pbcReserved, riid, ppvOut); +} + +HRESULT WINAPI CRegFolder::BindToStorage(PCUIDLIST_RELATIVE pidl, LPBC pbcReserved, REFIID riid, LPVOID *ppvOut) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI CRegFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) +{ + return SHELL32_CompareGuidItems(this, lParam, pidl1, pidl2); +} + +HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI CRegFolder::GetAttributesOf(UINT cidl, PCUITEMID_CHILD_ARRAY apidl, DWORD *rgfInOut) +{ + if (!rgfInOut || !cidl || !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + while(cidl > 0 && *apidl) + { + if (_ILIsSpecialFolder(*apidl)) + SHELL32_GetGuidItemAttributes(this, *apidl, rgfInOut); + else + ERR("Got an unkown pidl here!\n"); + apidl++; + cidl--; + } + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + return S_OK; +} + +HRESULT WINAPI CRegFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, + REFIID riid, UINT * prgfInOut, LPVOID * ppvOut) +{ + LPVOID pObj = NULL; + HRESULT hr = E_INVALIDARG; + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if ((IsEqualIID (riid, IID_IExtractIconA) || IsEqualIID (riid, IID_IExtractIconW)) && (cidl == 1)) + { + hr = CGuidItemExtractIcon_CreateInstance(this, apidl[0], riid, &pObj); + } + else + hr = E_NOINTERFACE; + + *ppvOut = pObj; + return hr; + +} + +HRESULT WINAPI CRegFolder::GetDisplayNameOf(PCUITEMID_CHILD pidl, DWORD dwFlags, LPSTRRET strRet) +{ + if (!strRet || !_ILIsSpecialFolder(pidl)) + return E_INVALIDARG; + + if (!pidl->mkid.cb) + { + LPWSTR pszPath = (LPWSTR)CoTaskMemAlloc((MAX_PATH + 1) * sizeof(WCHAR)); + if (!pszPath) + return E_OUTOFMEMORY; + + /* parsing name like ::{...} */ + pszPath[0] = ':'; + pszPath[1] = ':'; + SHELL32_GUIDToStringW(m_guid, &pszPath[2]); + + strRet->uType = STRRET_WSTR; + strRet->pOleStr = pszPath; + + return S_OK; + } + + if (pidl->mkid.cb) + { + return SHELL32_GetDisplayNameOfGUIDItem(this, m_rootPath, pidl, dwFlags, strRet); + } + + return E_FAIL; +} + +HRESULT WINAPI CRegFolder::SetNameOf(HWND hwndOwner, PCUITEMID_CHILD pidl, /* simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, PITEMID_CHILD *pPidlOut) +{ + return SHELL32_SetNameOfGuidItem(pidl, lpName, dwFlags, pPidlOut); +} + +HRESULT WINAPI CRegFolder::GetDefaultSearchGUID(GUID *pguid) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI CRegFolder::EnumSearches(IEnumExtraSearch ** ppenum) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI CRegFolder::GetDefaultColumn(DWORD dwRes, ULONG *pSort, ULONG *pDisplay) +{ + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + + return S_OK; +} + +HRESULT WINAPI CRegFolder::GetDefaultColumnState(UINT iColumn, DWORD *pcsFlags) +{ + if (iColumn >= 2) + return E_INVALIDARG; + *pcsFlags = SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT; + return S_OK; +} + +HRESULT WINAPI CRegFolder::GetDetailsEx(PCUITEMID_CHILD pidl, const SHCOLUMNID *pscid, VARIANT *pv) +{ + return E_NOTIMPL; +} + +HRESULT WINAPI CRegFolder::GetDetailsOf(PCUITEMID_CHILD pidl, UINT iColumn, SHELLDETAILS *psd) +{ + if (!psd || iColumn >= 2) + return E_INVALIDARG; + + return SHELL32_GetDetailsOfGuidItem(this, pidl, iColumn, psd); +} + +HRESULT WINAPI CRegFolder::MapColumnToSCID(UINT column, SHCOLUMNID *pscid) +{ + return E_NOTIMPL; +} + +HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv) +{ + return ShellObjectCreatorInit<CRegFolder>(pGuid, pidlRoot, lpszPath, riid, ppv); +} Propchange: trunk/reactos/dll/win32/shell32/folders/CRegFolder.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -27,6 +27,7 @@ #include <atlbase.h> #include <atlcom.h> #include <atlwin.h> +#include <atlstr.h> #include <powrprof.h> #include <winnetwk.h> #include <objsafe.h> Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Wed Aug 10 18:56:48 2016 @@ -107,6 +107,8 @@ void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags); BOOL SHELL_FS_HideExtension(LPWSTR pwszPath); +HRESULT CRegFolder_CreateInstance(const GUID *pGuid, LPCITEMIDLIST pidlRoot, LPCWSTR lpszPath, REFIID riid, void **ppv); + #ifdef __cplusplus HRESULT inline SHSetStrRet(LPSTRRET pStrRet, DWORD resId)

1 0

[akhaldi] 72187: [SHIMLIB] Improve header inclusions.
by akhaldi＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: akhaldi Date: Wed Aug 10 13:37:22 2016 New Revision: 72187 URL: http://svn.reactos.org/svn/reactos?rev=72187&view=rev Log: [SHIMLIB] Improve header inclusions. Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c Modified: trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/appcompat/shims/shimli… ============================================================================== --- trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/appcompat/shims/shimlib/shimlib.c [iso-8859-1] Wed Aug 10 13:37:22 2016 @@ -6,7 +6,8 @@ * PROGRAMMER: Mark Jansen */ -#include <windows.h> +#include <windef.h> +#include <winbase.h> #include <shimlib.h> #include <strsafe.h>

1 0

[pschweitzer] 72186: [NTOSKRNL] While attempting to read data from disk in CcReadVirtualAddress(), always align our read size by pages. That means that even on boundaries, we will read a complete p...
by pschweitzer＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: pschweitzer Date: Wed Aug 10 11:52:30 2016 New Revision: 72186 URL: http://svn.reactos.org/svn/reactos?rev=72186&view=rev Log: [NTOSKRNL] While attempting to read data from disk in CcReadVirtualAddress(), always align our read size by pages. That means that even on boundaries, we will read a complete page. This fixes FSD relying on Cc to properly align reads and thus poorly failing in disk.sys because of unaligned reads. Notably, it helps MS FastFAT loading a bit farther in ReactOS (but it still fails :-(). This also fixes a few kmtests. CORE-11003 CORE-11819 Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=721… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Wed Aug 10 11:52:30 2016 @@ -65,7 +65,7 @@ CcReadVirtualAddress ( PROS_VACB Vacb) { - ULONG Size; + ULONG Size, Pages; PMDL Mdl; NTSTATUS Status; IO_STATUS_BLOCK IoStatus; @@ -77,7 +77,10 @@ Size = VACB_MAPPING_GRANULARITY; } - Mdl = IoAllocateMdl(Vacb->BaseAddress, Size, FALSE, FALSE, NULL); + Pages = BYTES_TO_PAGES(Size); + ASSERT(Pages * PAGE_SIZE <= VACB_MAPPING_GRANULARITY); + + Mdl = IoAllocateMdl(Vacb->BaseAddress, Pages * PAGE_SIZE, FALSE, FALSE, NULL); if (!Mdl) { return STATUS_INSUFFICIENT_RESOURCES;

1 0

[hbelusca] 72185: [INPUT] - Fix misspelling "Dublicate" -> "Duplicate". - Use ZeroMemory instead of memset(..., 0, ...). - Don't hardcode most of the variable types for sizeof.
by hbelusca＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: hbelusca Date: Wed Aug 10 11:42:21 2016 New Revision: 72185 URL: http://svn.reactos.org/svn/reactos?rev=72185&view=rev Log: [INPUT] - Fix misspelling "Dublicate" -> "Duplicate". - Use ZeroMemory instead of memset(..., 0, ...). - Don't hardcode most of the variable types for sizeof. Modified: trunk/reactos/dll/cpl/input/input.c trunk/reactos/dll/cpl/input/input.h trunk/reactos/dll/cpl/input/input_list.c trunk/reactos/dll/cpl/input/key_settings_dialog.c trunk/reactos/dll/cpl/input/layout_list.c trunk/reactos/dll/cpl/input/locale_list.c trunk/reactos/dll/cpl/input/settings_page.c Modified: trunk/reactos/dll/cpl/input/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.c [iso-8859-1] Wed Aug 10 11:42:21 2016 @@ -29,9 +29,9 @@ static VOID InitPropSheetPage(PROPSHEETPAGEW *page, WORD idDlg, DLGPROC DlgProc) { - memset(page, 0, sizeof(PROPSHEETPAGEW)); + ZeroMemory(page, sizeof(*page)); - page->dwSize = sizeof(PROPSHEETPAGEW); + page->dwSize = sizeof(*page); page->dwFlags = PSP_DEFAULT; page->hInstance = hApplet; page->pszTemplate = MAKEINTRESOURCEW(idDlg); @@ -49,13 +49,13 @@ LoadStringW(hApplet, IDS_CPLSYSTEMNAME, szCaption, ARRAYSIZE(szCaption)); - memset(&header, 0, sizeof(PROPSHEETHEADER)); + ZeroMemory(&header, sizeof(header)); - header.dwSize = sizeof(PROPSHEETHEADER); + header.dwSize = sizeof(header); header.dwFlags = PSH_PROPSHEETPAGE; header.hwndParent = hCPLWindow; header.hInstance = hApplet; - header.hIcon = LoadIconW(hApplet, MAKEINTRESOURCE(IDI_CPLSYSTEM)); + header.hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); header.pszCaption = szCaption; header.nPages = ARRAYSIZE(page); header.nStartPage = 0; Modified: trunk/reactos/dll/cpl/input/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.h?rev=… ============================================================================== --- trunk/reactos/dll/cpl/input/input.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input.h [iso-8859-1] Wed Aug 10 11:42:21 2016 @@ -73,20 +73,20 @@ static inline WCHAR* -DublicateString(const WCHAR *pszString) +DuplicateString(const WCHAR *pszString) { - WCHAR *pszDublicate; + WCHAR *pszDuplicate; size_t size; size = (wcslen(pszString) + 1) * sizeof(WCHAR); - pszDublicate = (WCHAR*) malloc(size); - if (pszDublicate != NULL) + pszDuplicate = (WCHAR*) malloc(size); + if (pszDuplicate != NULL) { - StringCbCopyW(pszDublicate, size, pszString); + StringCbCopyW(pszDuplicate, size, pszString); } - return pszDublicate; + return pszDuplicate; } static inline DWORD Modified: trunk/reactos/dll/cpl/input/input_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input_list.c… ============================================================================== --- trunk/reactos/dll/cpl/input/input_list.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/input_list.c [iso-8859-1] Wed Aug 10 11:42:21 2016 @@ -23,7 +23,7 @@ if (pNew == NULL) return NULL; - memset(pNew, 0, sizeof(INPUT_LIST_NODE)); + ZeroMemory(pNew, sizeof(INPUT_LIST_NODE)); if (pCurrent == NULL) { @@ -318,7 +318,7 @@ if (len > 0) { szIndicator[len - 1] = 0; - pInput->pszIndicator = DublicateString(szIndicator); + pInput->pszIndicator = DuplicateString(szIndicator); } } @@ -447,7 +447,7 @@ if (len > 0) { szIndicator[len - 1] = 0; - pInput->pszIndicator = DublicateString(szIndicator); + pInput->pszIndicator = DuplicateString(szIndicator); } } } Modified: trunk/reactos/dll/cpl/input/key_settings_dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/key_settings… ============================================================================== --- trunk/reactos/dll/cpl/input/key_settings_dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/key_settings_dialog.c [iso-8859-1] Wed Aug 10 11:42:21 2016 @@ -23,7 +23,7 @@ { DWORD dwSize; - dwSize = sizeof(DWORD); + dwSize = sizeof(dwSize); if (RegQueryValueExW(hKey, L"Attributes", @@ -142,7 +142,7 @@ ListView_DeleteAllItems(hwndList); - memset(&item, 0, sizeof(LV_ITEM)); + ZeroMemory(&item, sizeof(item)); LoadStringW(hApplet, IDS_SWITCH_BET_INLANG, szBuffer, ARRAYSIZE(szBuffer)); item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE; @@ -191,7 +191,7 @@ ListView_SetExtendedListViewStyle(hwndList, LVS_EX_FULLROWSELECT); - memset(&column, 0, sizeof(LV_COLUMN)); + ZeroMemory(&column, sizeof(column)); column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; Modified: trunk/reactos/dll/cpl/input/layout_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/layout_list.… ============================================================================== --- trunk/reactos/dll/cpl/input/layout_list.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/layout_list.c [iso-8859-1] Wed Aug 10 11:42:21 2016 @@ -22,13 +22,13 @@ pCurrent = _LayoutList; - pNew = (LAYOUT_LIST_NODE*) malloc(sizeof(LAYOUT_LIST_NODE)); + pNew = (LAYOUT_LIST_NODE*)malloc(sizeof(LAYOUT_LIST_NODE)); if (pNew == NULL) return NULL; - memset(pNew, 0, sizeof(LAYOUT_LIST_NODE)); - - pNew->pszName = DublicateString(pszName); + ZeroMemory(pNew, sizeof(LAYOUT_LIST_NODE)); + + pNew->pszName = DuplicateString(pszName); if (pNew->pszName == NULL) { free(pNew); Modified: trunk/reactos/dll/cpl/input/locale_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/locale_list.… ============================================================================== --- trunk/reactos/dll/cpl/input/locale_list.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/locale_list.c [iso-8859-1] Wed Aug 10 11:42:21 2016 @@ -22,13 +22,13 @@ pCurrent = _LocaleList; - pNew = (LOCALE_LIST_NODE*) malloc(sizeof(LOCALE_LIST_NODE)); + pNew = (LOCALE_LIST_NODE*)malloc(sizeof(LOCALE_LIST_NODE)); if (pNew == NULL) return NULL; - memset(pNew, 0, sizeof(LOCALE_LIST_NODE)); + ZeroMemory(pNew, sizeof(LOCALE_LIST_NODE)); - pNew->pszName = DublicateString(pszName); + pNew->pszName = DuplicateString(pszName); if (pNew->pszName == NULL) { free(pNew); Modified: trunk/reactos/dll/cpl/input/settings_page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/settings_pag… ============================================================================== --- trunk/reactos/dll/cpl/input/settings_page.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/settings_page.c [iso-8859-1] Wed Aug 10 11:42:21 2016 @@ -34,9 +34,9 @@ hBmpNew = CreateBitmap(width, height, 1, 1, NULL); if (hBmpNew) { - LOGFONT lf; - - if (SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &lf, 0)) + LOGFONTW lf; + + if (SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0)) { ICONINFO IconInfo; HFONT hFont; @@ -143,7 +143,7 @@ } } - memset(&item, 0, sizeof(LV_ITEM)); + ZeroMemory(&item, sizeof(item)); item.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; item.pszText = pInputNode->pLocale->pszName; @@ -202,7 +202,7 @@ ListView_SetExtendedListViewStyle(hwndInputList, LVS_EX_FULLROWSELECT); - memset(&column, 0, sizeof(LV_COLUMN)); + ZeroMemory(&column, sizeof(column)); column.mask = LVCF_FMT | LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM;

1 0

[tfaber] 72184: [TCPIP] - Use pool tagging
by tfaber＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: tfaber Date: Wed Aug 10 11:19:59 2016 New Revision: 72184 URL: http://svn.reactos.org/svn/reactos?rev=72184&view=rev Log: [TCPIP] - Use pool tagging Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/tags.h trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Wed Aug 10 11:19:59 2016 @@ -138,8 +138,9 @@ ULONG BytesCopied; NDIS_STATUS Status; - HeaderBuffer = ExAllocatePool(NonPagedPool, - Adapter->HeaderSize); + HeaderBuffer = ExAllocatePoolWithTag(NonPagedPool, + Adapter->HeaderSize, + HEADER_TAG); if (!HeaderBuffer) return NDIS_STATUS_RESOURCES; @@ -151,7 +152,7 @@ if (BytesCopied != Adapter->HeaderSize) { /* Runt frame */ - ExFreePool(HeaderBuffer); + ExFreePoolWithTag(HeaderBuffer, HEADER_TAG); TI_DbgPrint(DEBUG_DATALINK, ("Runt frame (size %d).\n", BytesCopied)); return NDIS_STATUS_NOT_ACCEPTED; } @@ -161,7 +162,7 @@ BytesCopied, PacketType); - ExFreePool(HeaderBuffer); + ExFreePoolWithTag(HeaderBuffer, HEADER_TAG); return Status; } @@ -607,7 +608,7 @@ } else { - KeyValueInfo = ExAllocatePool(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR)); + KeyValueInfo = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), KEY_VALUE_TAG); if (!KeyValueInfo) { ZwClose(ParameterHandle); @@ -696,6 +697,7 @@ } } + ExFreePoolWithTag(KeyValueInfo, KEY_VALUE_TAG); ZwClose(ParameterHandle); } @@ -823,7 +825,7 @@ if (!Adapter->Context) return; - Context = ExAllocatePool(NonPagedPool, sizeof(RECONFIGURE_CONTEXT)); + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(RECONFIGURE_CONTEXT), CONTEXT_TAG); if (!Context) return; @@ -836,7 +838,7 @@ if (Adapter->State == LAN_STATE_STARTED) { - ExFreePool(Context); + ExFreePoolWithTag(Context, CONTEXT_TAG); return; } @@ -848,7 +850,7 @@ if (Adapter->State == LAN_STATE_STOPPED) { - ExFreePool(Context); + ExFreePoolWithTag(Context, CONTEXT_TAG); return; } @@ -859,7 +861,7 @@ Adapter->OldState = Adapter->State; Adapter->State = LAN_STATE_RESETTING; /* Nothing else to do here */ - ExFreePool(Context); + ExFreePoolWithTag(Context, CONTEXT_TAG); return; case NDIS_STATUS_RESET_END: @@ -869,13 +871,13 @@ default: DbgPrint("Unhandled status: %x", GeneralStatus); - ExFreePool(Context); + ExFreePoolWithTag(Context, CONTEXT_TAG); return; } /* Queue the work item */ if (!ChewCreate(ReconfigureAdapterWorker, Context)) - ExFreePool(Context); + ExFreePoolWithTag(Context, CONTEXT_TAG); } VOID NTAPI ProtocolStatusComplete(NDIS_HANDLE NdisBindingContext) @@ -1108,8 +1110,8 @@ UnicodeString.MaximumLength = Information->DataLength; String->Buffer = - (PWCHAR)ExAllocatePool( NonPagedPool, - UnicodeString.MaximumLength + sizeof(WCHAR) ); + (PWCHAR)ExAllocatePoolWithTag( NonPagedPool, + UnicodeString.MaximumLength + sizeof(WCHAR), REG_STR_TAG ); if( !String->Buffer ) return STATUS_NO_MEMORY; @@ -1135,9 +1137,9 @@ BOOLEAN Deallocate) { NTSTATUS Status; UNICODE_STRING Ustr = *ResultFirst; - PWSTR new_string = ExAllocatePool + PWSTR new_string = ExAllocatePoolWithTag (PagedPool, - (ResultFirst->Length + Second->Length + sizeof(WCHAR))); + (ResultFirst->Length + Second->Length + sizeof(WCHAR)), TEMP_STRING_TAG); if( !new_string ) { return STATUS_NO_MEMORY; } @@ -1150,7 +1152,7 @@ new_string[ResultFirst->Length / sizeof(WCHAR)] = 0; Status = RtlCreateUnicodeString(ResultFirst,new_string) ? STATUS_SUCCESS : STATUS_NO_MEMORY; - ExFreePool(new_string); + ExFreePoolWithTag(new_string, TEMP_STRING_TAG); return Status; } @@ -1213,7 +1215,7 @@ NTSTATUS Status; ULONG i; KEY_BASIC_INFORMATION *Kbio = - ExAllocatePool(NonPagedPool, sizeof(KEY_BASIC_INFORMATION)); + ExAllocatePoolWithTag(NonPagedPool, sizeof(KEY_BASIC_INFORMATION), KBIO_TAG); ULONG KbioLength = sizeof(KEY_BASIC_INFORMATION), ResultLength; RtlInitUnicodeString( DeviceDesc, NULL ); @@ -1228,7 +1230,7 @@ if( !NT_SUCCESS(Status) ) { TI_DbgPrint(DEBUG_DATALINK,("Couldn't open Enum key %wZ: %x\n", &EnumKeyName, Status)); - ExFreePool( Kbio ); + ExFreePoolWithTag( Kbio, KBIO_TAG ); return Status; } @@ -1237,9 +1239,9 @@ Kbio, KbioLength, &ResultLength ); if( Status == STATUS_BUFFER_TOO_SMALL || Status == STATUS_BUFFER_OVERFLOW ) { - ExFreePool( Kbio ); + ExFreePoolWithTag( Kbio, KBIO_TAG ); KbioLength = ResultLength; - Kbio = ExAllocatePool( NonPagedPool, KbioLength ); + Kbio = ExAllocatePoolWithTag( NonPagedPool, KbioLength, KBIO_TAG ); if( !Kbio ) { TI_DbgPrint(DEBUG_DATALINK,("Failed to allocate memory\n")); ZwClose( EnumKey ); @@ -1252,7 +1254,7 @@ if( !NT_SUCCESS(Status) ) { TI_DbgPrint(DEBUG_DATALINK,("Couldn't enum key child %d\n", i)); ZwClose( EnumKey ); - ExFreePool( Kbio ); + ExFreePoolWithTag( Kbio, KBIO_TAG ); return Status; } } @@ -1266,14 +1268,14 @@ ( &EnumKeyName, &TargetKeyName, Name, DeviceDesc ); if( NT_SUCCESS(Status) ) { ZwClose( EnumKey ); - ExFreePool( Kbio ); + ExFreePoolWithTag( Kbio, KBIO_TAG ); return Status; } else Status = STATUS_SUCCESS; } } ZwClose( EnumKey ); - ExFreePool( Kbio ); + ExFreePoolWithTag( Kbio, KBIO_TAG ); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/network/tcpip/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tags.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tags.h [iso-8859-1] Wed Aug 10 11:19:59 2016 @@ -35,3 +35,12 @@ #define OSK_SMALL_TAG 'SKSO' #define LAN_ADAPTER_TAG ' NAL' #define WQ_CONTEXT_TAG 'noCW' +#define ROUTE_ENTRY_TAG 'erCT' +#define OUT_DATA_TAG 'doCT' +#define ARP_ENTRY_TAG 'raCT' +#define KBIO_TAG 'ikCT' +#define TEMP_STRING_TAG 'tsCT' +#define CONTEXT_TAG 'xcCT' +#define KEY_VALUE_TAG 'vkCT' +#define HEADER_TAG 'rhCT' +#define REG_STR_TAG 'srCT' Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Wed Aug 10 11:19:59 2016 @@ -35,7 +35,7 @@ ("Getting IFEntry MIB (IF %08x LA %08x) (%04x:%d)\n", Interface, IF, ID.tei_entity, ID.tei_instance)); - OutData = ExAllocatePool( NonPagedPool, FIELD_OFFSET(IFEntry, if_descr[MAX_ADAPTER_DESCRIPTION_LENGTH + 1])); + OutData = ExAllocatePoolWithTag( NonPagedPool, FIELD_OFFSET(IFEntry, if_descr[MAX_ADAPTER_DESCRIPTION_LENGTH + 1]), OUT_DATA_TAG ); if( !OutData ) return TDI_NO_RESOURCES; /* Out of memory */ @@ -95,7 +95,7 @@ ID.tei_entity, ID.tei_instance, Size)); Status = InfoCopyOut( (PCHAR)OutData, Size, Buffer, BufferSize ); - ExFreePool( OutData ); + ExFreePoolWithTag( OutData, OUT_DATA_TAG ); TI_DbgPrint(DEBUG_INFO,("Returning %x\n", Status)); @@ -113,14 +113,14 @@ if (MemSize != 0) { - ArpEntries = ExAllocatePool( NonPagedPool, MemSize ); + ArpEntries = ExAllocatePoolWithTag( NonPagedPool, MemSize, ARP_ENTRY_TAG ); if( !ArpEntries ) return STATUS_NO_MEMORY; NBCopyNeighbors( Interface, ArpEntries ); Status = InfoCopyOut( (PVOID)ArpEntries, MemSize, Buffer, BufferSize ); - ExFreePool( ArpEntries ); + ExFreePoolWithTag( ArpEntries, ARP_ENTRY_TAG ); } else { Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Wed Aug 10 11:19:59 2016 @@ -29,15 +29,15 @@ if (RtCount == 0) return InfoCopyOut(NULL, 0, NULL, BufferSize); - RouteEntries = ExAllocatePool( NonPagedPool, Size ); + RouteEntries = ExAllocatePoolWithTag( NonPagedPool, Size, ROUTE_ENTRY_TAG ); RtCurrent = RouteEntries; - RCache = ExAllocatePool( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount ); + RCache = ExAllocatePoolWithTag( NonPagedPool, sizeof( FIB_ENTRY ) * RtCount, FIB_TAG ); RCacheCur = RCache; if( !RCache || !RouteEntries ) { - if( RCache ) ExFreePool( RCache ); - if( RouteEntries ) ExFreePool( RouteEntries ); + if( RCache ) ExFreePoolWithTag( RCache, FIB_TAG ); + if( RouteEntries ) ExFreePoolWithTag( RouteEntries, ROUTE_ENTRY_TAG ); return TDI_NO_RESOURCES; } @@ -87,8 +87,8 @@ Status = InfoCopyOut( (PCHAR)RouteEntries, Size, Buffer, BufferSize ); - ExFreePool( RouteEntries ); - ExFreePool( RCache ); + ExFreePoolWithTag( RouteEntries, ROUTE_ENTRY_TAG ); + ExFreePoolWithTag( RCache, FIB_TAG ); TI_DbgPrint(DEBUG_INFO, ("Returning %08x\n", Status)); @@ -122,7 +122,7 @@ return TDI_INVALID_PARAMETER; } - IPEntry = ExAllocatePool(NonPagedPool, sizeof(IPADDR_ENTRY)); + IPEntry = ExAllocatePoolWithTag(NonPagedPool, sizeof(IPADDR_ENTRY), IP_ADDRESS_TAG); if (!IPEntry) { TcpipReleaseSpinLock(&EntityListLock, OldIrql); @@ -147,7 +147,7 @@ InfoCopyOut((PCHAR)IPEntry, sizeof(IPADDR_ENTRY), Buffer, BufferSize); - ExFreePool(IPEntry); + ExFreePoolWithTag(IPEntry, IP_ADDRESS_TAG); return TDI_SUCCESS; }

1 0

[tfaber] 72183: [IP] - Only accept an incoming connection on one listening socket, not all. Fixes use after free when multiple connection endpoints are assigned the same PCB. CORE-11649 #resolve
by tfaber＠svn.reactos.org 10 Aug '16

10 Aug '16

Author: tfaber Date: Wed Aug 10 10:28:28 2016 New Revision: 72183 URL: http://svn.reactos.org/svn/reactos?rev=72183&view=rev Log: [IP] - Only accept an incoming connection on one listening socket, not all. Fixes use after free when multiple connection endpoints are assigned the same PCB. CORE-11649 #resolve Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/event.c Modified: trunk/reactos/sdk/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/ip/transpo… ============================================================================== --- trunk/reactos/sdk/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Wed Aug 10 10:28:28 2016 @@ -345,6 +345,11 @@ DereferenceObject(Bucket->AssociatedEndpoint); CompleteBucket(Connection, Bucket, FALSE); + + if (Status == STATUS_SUCCESS) + { + break; + } } DereferenceObject(Connection);

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