Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[akhaldi] 66487: [DXGI] Add missing config.h include.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 28 10:17:21 2015 New Revision: 66487 URL: http://svn.reactos.org/svn/reactos?rev=66487&view=rev Log: [DXGI] Add missing config.h include. Modified: trunk/reactos/dll/directx/wine/dxgi/guid.c Modified: trunk/reactos/dll/directx/wine/dxgi/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dxgi/guid… ============================================================================== --- trunk/reactos/dll/directx/wine/dxgi/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dxgi/guid.c [iso-8859-1] Sat Feb 28 10:17:21 2015 @@ -1,5 +1,6 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ +#include <wine/config.h> #include <stdarg.h> #define WIN32_NO_STATUS

9 years, 9 months

[akhaldi] 66486: [INCLUDE/WINE] Update rbtree.h. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 28 10:15:41 2015 New Revision: 66486 URL: http://svn.reactos.org/svn/reactos?rev=66486&view=rev Log: [INCLUDE/WINE] Update rbtree.h. CORE-9246 Modified: trunk/reactos/include/reactos/wine/rbtree.h Modified: trunk/reactos/include/reactos/wine/rbtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/rbtre… ============================================================================== --- trunk/reactos/include/reactos/wine/rbtree.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/rbtree.h [iso-8859-1] Sat Feb 28 10:15:41 2015 @@ -23,7 +23,7 @@ #define __WINE_WINE_RBTREE_H #define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - FIELD_OFFSET(type, field))) + ((type *)((char *)(element) - offsetof(type, field))) struct wine_rb_entry { @@ -220,12 +220,16 @@ wine_rb_postorder(tree, callback, context); } -static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +static inline void wine_rb_clear(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { /* Note that we use postorder here because the callback will likely free the entry. */ if (callback) wine_rb_postorder(tree, callback, context); - tree->root = NULL; +} + +static inline void wine_rb_destroy(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) +{ + wine_rb_clear(tree, callback, context); tree->functions->free(tree->stack.entries); }

9 years, 9 months

[akhaldi] 66485: [NETSHELL] Simplify registration by using an rgs file. Brought to you by Giannis Adamopoulos. CORE-9276

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 28 10:11:51 2015 New Revision: 66485 URL: http://svn.reactos.org/svn/reactos?rev=66485&view=rev Log: [NETSHELL] Simplify registration by using an rgs file. Brought to you by Giannis Adamopoulos. CORE-9276 Added: trunk/reactos/dll/shellext/netshell/res/netshell.rgs Modified: trunk/reactos/dll/shellext/netshell/netshell.cpp trunk/reactos/dll/shellext/netshell/netshell.rc trunk/reactos/dll/shellext/netshell/resource.h Modified: trunk/reactos/dll/shellext/netshell/netshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… ============================================================================== --- trunk/reactos/dll/shellext/netshell/netshell.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/netshell.cpp [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -4,13 +4,12 @@ HINSTANCE netshell_hInstance; -static const WCHAR szNetConnectClass[] = L"CLSID\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szLanConnectUI[] = L"CLSID\\{7007ACC5-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szLanConnectStatusUI[] = L"CLSID\\{7007ACCF-3202-11D1-AAD2-00805FC1270E}"; -static const WCHAR szNamespaceKey[] = L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\ControlPanel\\NameSpace\\{7007ACC7-3202-11D1-AAD2-00805FC1270E}"; - extern "C" { + +/* FIXME: rpcproxy.h */ +HRESULT __wine_register_resources(HMODULE module); +HRESULT __wine_unregister_resources(HMODULE module); BOOL WINAPI @@ -39,94 +38,13 @@ STDAPI DllRegisterServer(void) { - HKEY hKey, hSubKey; - WCHAR szName[MAX_PATH+20] = {0}; - WCHAR szNet[20]; - UINT Length, Offset; - - - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szNetConnectClass, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return SELFREG_E_CLASS; - - if (LoadStringW(netshell_hInstance, IDS_NETWORKCONNECTION, szName, MAX_PATH)) - { - szName[MAX_PATH-1] = L'\0'; - RegSetValueW(hKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); - } - - if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szNamespaceKey, 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, szName, (wcslen(szName)+1) * sizeof(WCHAR)); - RegCloseKey(hSubKey); - } - - Length = swprintf(szNet, L",-%u", IDS_NETWORKCONNECTION); - Offset = GetModuleFileNameW(netshell_hInstance, &szName[1], (sizeof(szName)/sizeof(WCHAR))-1); - if (Offset + Length + 2 < MAX_PATH) - { - /* set localized name */ - szName[0] = L'@'; - wcscpy(&szName[Offset+1], szNet); - RegSetValueExW(hKey, L"LocalizedString", 0, REG_SZ, (const LPBYTE)szName, (wcslen(szName)+1) * sizeof(WCHAR)); - } - - szName[Offset+1] = L'\0'; - - /* store default icon */ - if (RegCreateKeyExW(hKey, L"DefaultIcon", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegCloseKey(hSubKey); - } - if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); - RegCloseKey(hSubKey); - } - - if (RegCreateKeyExW(hKey, L"ShellFolder", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - DWORD dwAttributes = SFGAO_FOLDER; - RegSetValueExW(hSubKey, L"Attributes",0, REG_BINARY, (const LPBYTE)&dwAttributes, sizeof(DWORD)); - } - - RegCloseKey(hKey); - - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return SELFREG_E_CLASS; - - if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); - RegCloseKey(hSubKey); - } - - RegCloseKey(hKey); - - if (RegCreateKeyExW(HKEY_CLASSES_ROOT, szLanConnectStatusUI, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) != ERROR_SUCCESS) - return SELFREG_E_CLASS; - - if (RegCreateKeyExW(hKey, L"InProcServer32", 0, NULL, 0, KEY_WRITE, NULL, &hSubKey, NULL) == ERROR_SUCCESS) - { - RegSetValueW(hSubKey, NULL, REG_SZ, &szName[1], (Offset+1) * sizeof(WCHAR)); - RegSetValueExW(hSubKey, L"ThreadingModel", 0, REG_SZ, (LPBYTE)L"Both", 10); - RegCloseKey(hSubKey); - } - - RegCloseKey(hKey); - - - return S_OK; + return __wine_register_resources(netshell_hInstance); } STDAPI DllUnregisterServer(void) { - SHDeleteKeyW(HKEY_CLASSES_ROOT, szNetConnectClass); - SHDeleteKeyW(HKEY_LOCAL_MACHINE, szNamespaceKey); - return S_OK; + return __wine_unregister_resources(netshell_hInstance); } STDAPI Modified: trunk/reactos/dll/shellext/netshell/netshell.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/nets… ============================================================================== --- trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/netshell.rc [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -21,6 +21,8 @@ IDI_NET_REC ICON "res/netrec.ico" IDI_NET_TRANS ICON "res/nettrans.ico" IDI_NET_TRANSREC ICON "res/nettrrec.ico" + +IDR_NETSHELL REGISTRY "res/netshell.rgs" /* UTF-8 */ #pragma code_page(65001) Added: trunk/reactos/dll/shellext/netshell/res/netshell.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/res/… ============================================================================== --- trunk/reactos/dll/shellext/netshell/res/netshell.rgs (added) +++ trunk/reactos/dll/shellext/netshell/res/netshell.rgs [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -0,0 +1,60 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {7007ACC7-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + DefaultIcon = s '%MODULE%' + ShellFolder + { + val Attributes = d '0x00000020' + } + val LocalizedString = s '@%MODULE%,-10000' + } + ForceRemove {7007ACC5-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + } + ForceRemove {7007ACCF-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + } + } +} +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Windows + { + NoRemove CurrentVersion + { + NoRemove Explorer + { + NoRemove MyComputer + { + NoRemove NameSpace + { + ForceRemove {7007ACC7-3202-11D1-AAD2-00805FC1270E} = s 'Network Connections' + { + } + } + } + } + } + } + } + } +} Modified: trunk/reactos/dll/shellext/netshell/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/netshell/reso… ============================================================================== --- trunk/reactos/dll/shellext/netshell/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/netshell/resource.h [iso-8859-1] Sat Feb 28 10:11:51 2015 @@ -94,3 +94,5 @@ #define IDS_WINS_SERVERS 10308 #define IDS_PROPERTY 10309 #define IDS_VALUE 10310 + +#define IDR_NETSHELL 20000

9 years, 9 months

[akhaldi] 66484: [CMAKE] Just check for ReactOS in CMake version for PCH, not a specific version.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Feb 28 09:59:39 2015 New Revision: 66484 URL: http://svn.reactos.org/svn/reactos?rev=66484&view=rev Log: [CMAKE] Just check for ReactOS in CMake version for PCH, not a specific version. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=66484&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Feb 28 09:59:39 2015 @@ -137,7 +137,7 @@ add_definitions(-D_WINKD_=1) endif() - if(CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS") + if(CMAKE_VERSION MATCHES "ReactOS") set(PCH 1 CACHE BOOL "Whether to use precompiled headers") else() set(PCH 0 CACHE BOOL "Whether to use precompiled headers")

9 years, 9 months

[janderwald] 66483: [USBCCGP] - reset interface count before loop - add extra checks

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Feb 28 09:48:16 2015 New Revision: 66483 URL: http://svn.reactos.org/svn/reactos?rev=66483&view=rev Log: [USBCCGP] - reset interface count before loop - add extra checks Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Sat Feb 28 09:48:16 2015 @@ -326,6 +326,11 @@ // count all interface descriptors // DescriptorCount = ConfigurationDescriptor->bNumInterfaces; + if (DescriptorCount == 0) + { + DPRINT1("[USBCCGP] DescriptorCount is zero\n"); + return STATUS_INVALID_PARAMETER; + } // // allocate array holding the interface descriptors @@ -338,6 +343,11 @@ // return STATUS_INSUFFICIENT_RESOURCES; } + + // + // reset interface list count + // + FDODeviceExtension->InterfaceListCount = 0; do { @@ -350,6 +360,7 @@ // // store in interface list // + ASSERT(FDODeviceExtension->InterfaceListCount < DescriptorCount); FDODeviceExtension->InterfaceList[FDODeviceExtension->InterfaceListCount].InterfaceDescriptor = InterfaceDescriptor; FDODeviceExtension->InterfaceListCount++; }

9 years, 9 months

[tfaber] 66482: [ROSAUTOTEST] - Avoid double-close of pipe handles

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 28 06:56:56 2015 New Revision: 66482 URL: http://svn.reactos.org/svn/reactos?rev=66482&view=rev Log: [ROSAUTOTEST] - Avoid double-close of pipe handles Modified: trunk/rostests/rosautotest/CPipe.cpp Modified: trunk/rostests/rosautotest/CPipe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipe.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/CPipe.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CPipe.cpp [iso-8859-1] Sat Feb 28 06:56:56 2015 @@ -42,6 +42,7 @@ if (!m_hReadPipe) FATAL("Trying to close already closed read pipe"); CloseHandle(m_hReadPipe); + m_hReadPipe = NULL; } /** @@ -53,6 +54,7 @@ if (!m_hWritePipe) FATAL("Trying to close already closed write pipe"); CloseHandle(m_hWritePipe); + m_hWritePipe = NULL; } /**

9 years, 9 months

[cfinck] 66481: [ROSAUTOTEST] - Check the environment variable ROSAUTOTEST_DIR for an alternative path to the test executables. Otherwise use the default %windir%\bin - Update the URL of the web se...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Feb 28 02:39:14 2015 New Revision: 66481 URL: http://svn.reactos.org/svn/reactos?rev=66481&view=rev Log: [ROSAUTOTEST] - Check the environment variable ROSAUTOTEST_DIR for an alternative path to the test executables. Otherwise use the default %windir%\bin - Update the URL of the web service Modified: trunk/rostests/rosautotest/CWebService.cpp trunk/rostests/rosautotest/CWineTest.cpp Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Sat Feb 28 02:39:14 2015 @@ -2,13 +2,13 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Class implementing the interface to the "testman" Web Service - * COPYRIGHT: Copyright 2009-2011 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2015 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" static const WCHAR szHostname[] = L"reactos.org"; -static const WCHAR szServerFile[] = L"testman/webservice/"; +static const WCHAR szServerFile[] = L"sites/all/modules/reactos/testman/webservice/"; /** * Constructs a CWebService object and immediately establishes a connection to the "testman" Web Service. Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Sat Feb 28 02:39:14 2015 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Automatic Testing Utility * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Class implementing functions for handling Wine tests - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2015 Colin Finck <colin(a)reactos.org> */ #include "precomp.h" @@ -13,19 +13,25 @@ * Constructs a CWineTest object. */ CWineTest::CWineTest() -{ - WCHAR WindowsDirectory[MAX_PATH]; - - /* Zero-initialize variables */ - m_hFind = NULL; - m_ListBuffer = NULL; + : m_hFind(NULL), m_ListBuffer(NULL) +{ + WCHAR wszDirectory[MAX_PATH]; /* Set up m_TestPath */ - if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) - FATAL("GetWindowsDirectoryW failed"); - - m_TestPath = WindowsDirectory; - m_TestPath += L"\\bin\\"; + if (GetEnvironmentVariableW(L"ROSAUTOTEST_DIR", wszDirectory, MAX_PATH)) + { + m_TestPath = wszDirectory; + if (*m_TestPath.rbegin() != L'\\') + m_TestPath += L'\\'; + } + else + { + if (!GetWindowsDirectoryW(wszDirectory, MAX_PATH)) + FATAL("GetWindowsDirectoryW failed"); + + m_TestPath = wszDirectory; + m_TestPath += L"\\bin\\"; + } } /**

9 years, 9 months

[cfinck] 66480: [CMAKE] Use the STRING(timestamp ...) command introduced in CMake 2.8.11 to get rid of our today macro and in particular the wmic dependency. wmic requires administrator privileges ...

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Feb 28 00:36:49 2015 New Revision: 66480 URL: http://svn.reactos.org/svn/reactos?rev=66480&view=rev Log: [CMAKE] Use the STRING(timestamp ...) command introduced in CMake 2.8.11 to get rid of our today macro and in particular the wmic dependency. wmic requires administrator privileges on NT 5.x Modified: trunk/reactos/include/reactos/version.cmake Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Sat Feb 28 00:36:49 2015 @@ -1,18 +1,3 @@ -macro(today RESULT) - if(CMAKE_HOST_WIN32) - execute_process(COMMAND wmic os get LocalDateTime OUTPUT_VARIABLE RAWDATE) - string(REPLACE "\n" ";" RAWDATE ${RAWDATE}) - LIST(GET RAWDATE 1 RAWDATE) - string(SUBSTRING ${RAWDATE} 0 8 ${RESULT}) - elseif(CMAKE_HOST_UNIX) - execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT}) - string(STRIP ${${RESULT}} ${RESULT}) - else() - message(SEND_ERROR "date not implemented") - set(${RESULT} 00000000) - endif() -endmacro() - macro(inttohex INTVALUE OUTPUT_VARIABLE) list(APPEND HEXLIST 0 1 2 3 4 5 6 7 8 9 a b c d e f) list(GET HEXLIST ${INTVALUE} ${OUTPUT_VARIABLE}) @@ -29,7 +14,7 @@ endwhile() endmacro() -today(KERNEL_VERSION_BUILD) +string(TIMESTAMP KERNEL_VERSION_BUILD %Y%m%d UTC) set(KERNEL_VERSION_MAJOR "0") set(KERNEL_VERSION_MINOR "4")

9 years, 9 months

[tfaber] 66479: [KMTESTS] - Add a test showing RtlUpcaseUnicodeString behavior with zero-length strings - Run all test cases against FsRtlIsNameInExpressionTest on checked builds, only the Dbcs ver...

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 27 22:42:35 2015 New Revision: 66479 URL: http://svn.reactos.org/svn/reactos?rev=66479&view=rev Log: [KMTESTS] - Add a test showing RtlUpcaseUnicodeString behavior with zero-length strings - Run all test cases against FsRtlIsNameInExpressionTest on checked builds, only the Dbcs version asserts CORE-9254 Modified: trunk/rostests/kmtests/include/kmt_platform.h trunk/rostests/kmtests/kmtest_drv/testlist.c trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c trunk/rostests/kmtests/rtl/RtlUnicodeString.c Modified: trunk/rostests/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_platf… ============================================================================== --- trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_platform.h [iso-8859-1] Fri Feb 27 22:42:35 2015 @@ -56,6 +56,7 @@ #define RtlCopyMemoryNonTemporal RtlCopyMemory #define RtlPrefetchMemoryNonTemporal(s, l) #define ExRaiseStatus RtlRaiseStatus +#define KmtIsCheckedBuild FALSE #endif /* defined KMT_EMULATE_KERNEL */ #endif /* defined KMT_USER_MODE */ Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Feb 27 22:42:35 2015 @@ -59,6 +59,7 @@ KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; +KMT_TESTFUNC Test_RtlUnicodeString; KMT_TESTFUNC Test_ZwAllocateVirtualMemory; KMT_TESTFUNC Test_ZwCreateSection; KMT_TESTFUNC Test_ZwMapViewOfSection; @@ -117,6 +118,7 @@ { "RtlMemoryKM", Test_RtlMemory }, { "RtlRegistryKM", Test_RtlRegistry }, { "RtlSplayTreeKM", Test_RtlSplayTree }, + { "RtlUnicodeStringKM", Test_RtlUnicodeString }, { "ZwAllocateVirtualMemory", Test_ZwAllocateVirtualMemory }, { "ZwCreateSection", Test_ZwCreateSection }, { "ZwMapViewOfSection", Test_ZwMapViewOfSection }, Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlE… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Fri Feb 27 22:42:35 2015 @@ -184,10 +184,6 @@ UNICODE_STRING Expression; UNICODE_STRING Name; - /* Don't run Tests which are known to assert in checked builds */ - if (KmtIsCheckedBuild && Tests[i].AssertsInChecked) - continue; - RtlInitUnicodeString(&Expression, Tests[i].Expression); RtlInitUnicodeString(&Name, Tests[i].Name); Modified: trunk/rostests/kmtests/rtl/RtlUnicodeString.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlUnicodeStr… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlUnicodeString.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlUnicodeString.c [iso-8859-1] Fri Feb 27 22:42:35 2015 @@ -87,7 +87,7 @@ Status = RtlFindCharInUnicodeString(7, &String, &Chars4, &Position); ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_uint(Position, 22); - + /* Show that Position is USHORT */ LongPosition = 0x55555555; Status = RtlFindCharInUnicodeString(8, &String, &String, (PUSHORT)&LongPosition); @@ -116,7 +116,7 @@ Status = RtlFindCharInUnicodeString(0, NULL, &String, &Position); KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); - + /* NULL for SearchString and invalid flags */ Position = 123; KmtStartSeh() @@ -150,7 +150,7 @@ KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); #endif - + /* NULL for MatchString and invalid flags */ Position = 123; KmtStartSeh() @@ -171,9 +171,89 @@ KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); #endif +} + +static +VOID +TestUpcaseUnicodeString(VOID) +{ + NTSTATUS Status; + UNICODE_STRING Lower; + UNICODE_STRING Upper; + PWCHAR Buffer; + + Buffer = KmtAllocateGuarded(sizeof(WCHAR)); + + if (!KmtIsCheckedBuild) + { + RtlInitEmptyUnicodeString(&Lower, NULL, 0); + RtlFillMemory(&Upper, sizeof(Upper), 0x55); + Status = RtlUpcaseUnicodeString(&Upper, &Lower, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Upper.Length, 0); + ok_eq_uint(Upper.MaximumLength, 0); + ok(Upper.Buffer != NULL, "Buffer = %p\n", Upper.Buffer); + RtlFreeUnicodeString(&Upper); + + RtlInitEmptyUnicodeString(&Lower, Buffer, 0); + RtlFillMemory(&Upper, sizeof(Upper), 0x55); + Status = RtlUpcaseUnicodeString(&Upper, &Lower, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Upper.Length, 0); + ok_eq_uint(Upper.MaximumLength, 0); + ok(Upper.Buffer != NULL, "Buffer = %p\n", Upper.Buffer); + RtlFreeUnicodeString(&Upper); + + RtlInitEmptyUnicodeString(&Lower, Buffer, sizeof(WCHAR)); + Buffer[0] = UNICODE_NULL; + RtlFillMemory(&Upper, sizeof(Upper), 0x55); + Status = RtlUpcaseUnicodeString(&Upper, &Lower, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Upper.Length, 0); + ok_eq_uint(Upper.MaximumLength, 0); + ok(Upper.Buffer != NULL, "Buffer = %p\n", Upper.Buffer); + RtlFreeUnicodeString(&Upper); + } + + RtlInitEmptyUnicodeString(&Lower, Buffer, sizeof(WCHAR)); + Lower.Length = sizeof(WCHAR); + Buffer[0] = UNICODE_NULL; + RtlFillMemory(&Upper, sizeof(Upper), 0x55); + Status = RtlUpcaseUnicodeString(&Upper, &Lower, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Upper.Length, sizeof(WCHAR)); + ok_eq_uint(Upper.MaximumLength, sizeof(WCHAR)); + ok(Upper.Buffer != NULL, "Buffer = %p\n", Upper.Buffer); + ok_eq_hex(Upper.Buffer[0], UNICODE_NULL); + RtlFreeUnicodeString(&Upper); + + RtlInitEmptyUnicodeString(&Lower, Buffer, sizeof(WCHAR)); + Lower.Length = sizeof(WCHAR); + Buffer[0] = 'a'; + RtlFillMemory(&Upper, sizeof(Upper), 0x55); + Status = RtlUpcaseUnicodeString(&Upper, &Lower, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Upper.Length, sizeof(WCHAR)); + ok_eq_uint(Upper.MaximumLength, sizeof(WCHAR)); + ok(Upper.Buffer != NULL, "Buffer = %p\n", Upper.Buffer); + ok_eq_hex(Upper.Buffer[0], 'A'); + RtlFreeUnicodeString(&Upper); + + RtlInitUnicodeString(&Lower, L"a"); + RtlFillMemory(&Upper, sizeof(Upper), 0x55); + Status = RtlUpcaseUnicodeString(&Upper, &Lower, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_uint(Upper.Length, sizeof(WCHAR)); + ok_eq_uint(Upper.MaximumLength, sizeof(WCHAR)); + ok(Upper.Buffer != NULL, "Buffer = %p\n", Upper.Buffer); + ok_eq_hex(Upper.Buffer[0], 'A'); + RtlFreeUnicodeString(&Upper); + + KmtFreeGuarded(Buffer); } START_TEST(RtlUnicodeString) { TestFindCharInUnicodeString(); + TestUpcaseUnicodeString(); }

9 years, 9 months

[tfaber] 66478: [CDFS] - Handle errors from CcInitializeCacheMap and CcCopyRead CORE-6501

by tfaber＠svn.reactos.org

Author: tfaber Date: Fri Feb 27 21:30:09 2015 New Revision: 66478 URL: http://svn.reactos.org/svn/reactos?rev=66478&view=rev Log: [CDFS] - Handle errors from CcInitializeCacheMap and CcCopyRead CORE-6501 Modified: trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Fri Feb 27 21:30:09 2015 @@ -19,6 +19,7 @@ add_library(cdfs SHARED ${SOURCE} cdfs.rc) set_module_type(cdfs kernelmodedriver) +target_link_libraries(cdfs ${PSEH_LIB}) add_importlibs(cdfs ntoskrnl hal) add_pch(cdfs cdfs.h SOURCE) add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Fri Feb 27 21:30:09 2015 @@ -3,6 +3,7 @@ #include <ntifs.h> #include <ntddcdrm.h> +#include <pseh/pseh2.h> #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Fri Feb 27 21:30:09 2015 @@ -255,11 +255,23 @@ Fcb->FileObject = FileObject; Fcb->DevExt = Vcb; - CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); + _SEH2_TRY + { + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + FileObject->FsContext2 = NULL; + ExFreePoolWithTag(newCCB, TAG_CCB); + ObDereferenceObject(FileObject); + Fcb->FileObject = NULL; + return _SEH2_GetExceptionCode(); + } + _SEH2_END; ObDereferenceObject(FileObject); Fcb->Flags |= FCB_CACHE_INITIALIZED; @@ -444,11 +456,21 @@ if (CdfsFCBIsDirectory(Fcb)) { - CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - FALSE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); + _SEH2_TRY + { + CcInitializeCacheMap(FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + FileObject->FsContext2 = NULL; + ExFreePoolWithTag(newCCB, TAG_CCB); + return _SEH2_GetExceptionCode(); + } + _SEH2_END; Fcb->Flags |= FCB_CACHE_INITIALIZED; } Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Fri Feb 27 21:30:09 2015 @@ -414,11 +414,20 @@ Fcb->Entry.ExtentLocationL = 0; Fcb->Entry.DataLengthL = (DeviceExt->CdInfo.VolumeSpaceSize + DeviceExt->CdInfo.VolumeOffset) * BLOCKSIZE; - CcInitializeCacheMap(DeviceExt->StreamFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - TRUE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); + _SEH2_TRY + { + CcInitializeCacheMap(DeviceExt->StreamFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + TRUE, + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + goto ByeBye; + } + _SEH2_END; ExInitializeResourceLite(&DeviceExt->VcbResource); Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Fri Feb 27 21:30:09 2015 @@ -91,20 +91,37 @@ Fcb->RFCB.ValidDataLength.HighPart, Fcb->RFCB.ValidDataLength.LowPart); - CcInitializeCacheMap(FileObject, - &FileSizes, - FALSE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); + _SEH2_TRY + { + CcInitializeCacheMap(FileObject, + &FileSizes, + FALSE, + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + return _SEH2_GetExceptionCode(); + } + _SEH2_END; } FileOffset.QuadPart = (LONGLONG)ReadOffset; - CcCopyRead(FileObject, - &FileOffset, - ToRead, - TRUE, - Buffer, - &IoStatus); + _SEH2_TRY + { + CcCopyRead(FileObject, + &FileOffset, + ToRead, + TRUE, + Buffer, + &IoStatus); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + IoStatus.Information = 0; + IoStatus.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; *LengthRead = IoStatus.Information; Status = IoStatus.Status;

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015