Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 28 Feb '15

28 Feb '15

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\\"; + } } /**

1 0

[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 28 Feb '15

28 Feb '15

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")

1 0

[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 27 Feb '15

27 Feb '15

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(); }

1 0

[tfaber] 66478: [CDFS] - Handle errors from CcInitializeCacheMap and CcCopyRead CORE-6501
by tfaber＠svn.reactos.org 27 Feb '15

27 Feb '15

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;

1 0

[tfaber] 66477: [CDFS] - Do not touch Irp after handing it off to FsRtlNotifyFullChangeDirectory CORE-8776 CORE-9274 #resolve
by tfaber＠svn.reactos.org 27 Feb '15

27 Feb '15

Author: tfaber Date: Fri Feb 27 12:39:27 2015 New Revision: 66477 URL: http://svn.reactos.org/svn/reactos?rev=66477&view=rev Log: [CDFS] - Do not touch Irp after handing it off to FsRtlNotifyFullChangeDirectory CORE-8776 CORE-9274 #resolve Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Fri Feb 27 12:39:27 2015 @@ -813,11 +813,10 @@ break; } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - if (Status != STATUS_PENDING) { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); } FsRtlExitFileSystem();

1 0

[hbelusca] 66476: [BUGCODES]: Add bugcheck 0xF7 DRIVER_OVERRAN_STACK_BUFFER (that encountered while debugging Windows), with description coming from what windbg gave to me.
by hbelusca＠svn.reactos.org 27 Feb '15

27 Feb '15

Author: hbelusca Date: Fri Feb 27 01:59:17 2015 New Revision: 66476 URL: http://svn.reactos.org/svn/reactos?rev=66476&view=rev Log: [BUGCODES]: Add bugcheck 0xF7 DRIVER_OVERRAN_STACK_BUFFER (that encountered while debugging Windows), with description coming from what windbg gave to me. Modified: trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Fri Feb 27 01:59:17 2015 @@ -1578,6 +1578,15 @@ The PCI driver has detected an error in a PCI device or BIOS being verified. . +MessageId=0xF7 +Severity=Success +Facility=System +SymbolicName=DRIVER_OVERRAN_STACK_BUFFER +Language=English +A driver has overrun a stack-based buffer. This overrun could potentially +allow a malicious user to gain control of this machine. +. + MessageId=0xF8 Severity=Success Facility=System

1 0

[hbelusca] 66475: [NTOS] - Check for command line validity in some places. - Correctly set the number of bitmap resources. Spotted by Thomas. CORE-6781
by hbelusca＠svn.reactos.org 27 Feb '15

27 Feb '15

Author: hbelusca Date: Fri Feb 27 01:39:49 2015 New Revision: 66475 URL: http://svn.reactos.org/svn/reactos?rev=66475&view=rev Log: [NTOS] - Check for command line validity in some places. - Correctly set the number of bitmap resources. Spotted by Thomas. CORE-6781 Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=664… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Fri Feb 27 01:39:49 2015 @@ -1377,13 +1377,13 @@ if (!HalInitSystem(1, LoaderBlock)) KeBugCheck(HAL1_INITIALIZATION_FAILED); /* Get the command line and upcase it */ - CommandLine = _strupr(LoaderBlock->LoadOptions); + CommandLine = (LoaderBlock->LoadOptions ? _strupr(LoaderBlock->LoadOptions) : NULL); /* Check if GUI Boot is enabled */ - NoGuiBoot = (strstr(CommandLine, "NOGUIBOOT")) ? TRUE: FALSE; + NoGuiBoot = (CommandLine && strstr(CommandLine, "NOGUIBOOT") != NULL); /* Get the SOS setting */ - SosEnabled = strstr(CommandLine, "SOS") ? TRUE: FALSE; + SosEnabled = (CommandLine && strstr(CommandLine, "SOS") != NULL); /* Setup the boot driver */ InbvEnableBootDriver(!NoGuiBoot); @@ -1406,11 +1406,11 @@ } /* Check if this is LiveCD (WinPE) mode */ - if (strstr(CommandLine, "MININT")) + if (CommandLine && strstr(CommandLine, "MININT") != NULL) { /* Setup WinPE Settings */ InitIsWinPEMode = TRUE; - InitWinPEModeType |= (strstr(CommandLine, "INRAM")) ? 0x80000000 : 1; + InitWinPEModeType |= (strstr(CommandLine, "INRAM") != NULL) ? 0x80000000 : 0x00000001; } /* Get the kernel's load entry */ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Fri Feb 27 01:39:49 2015 @@ -40,8 +40,8 @@ static INBV_PROGRESS_STATE InbvProgressState; static BT_PROGRESS_INDICATOR InbvProgressIndicator = {0, 25, 0}; static INBV_RESET_DISPLAY_PARAMETERS InbvResetDisplayParameters; -static ULONG ResourceCount; -static PUCHAR ResourceList[IDB_CLUSTER_SERVER + 1]; // The first entry in the table is the NULL pointer +static ULONG ResourceCount = 0; +static PUCHAR ResourceList[1 + IDB_CLUSTER_SERVER]; // First entry == NULL, followed by 'ResourceCount' entries. #ifdef INBV_ROTBAR_IMPLEMENTED static BOOLEAN RotBarThreadActive = FALSE; @@ -174,14 +174,14 @@ VidBitBlt(PaletteBitmapBuffer, 0, 0); - /* Wait for a bit. */ + /* Wait for a bit */ KeStallExecutionProcessor(PALETTE_FADE_TIME); } /* Release the lock */ InbvReleaseLock(); - /* Wait for a bit. */ + /* Wait for a bit */ KeStallExecutionProcessor(PALETTE_FADE_TIME); } } @@ -271,8 +271,8 @@ if (InbvDisplayState == INBV_DISPLAY_STATE_OWNED) { /* Check if we have a custom boot logo */ - CommandLine = _strupr(LoaderBlock->LoadOptions); - CustomLogo = strstr(CommandLine, "BOOTLOGO") ? TRUE: FALSE; + CommandLine = (LoaderBlock->LoadOptions ? _strupr(LoaderBlock->LoadOptions) : NULL); + CustomLogo = (CommandLine && strstr(CommandLine, "BOOTLOGO") != NULL); } /* Initialize the video */ @@ -283,7 +283,7 @@ VidResetDisplay(CustomLogo); /* Find bitmap resources in the kernel */ - ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList)); + ResourceCount = min(Count, RTL_NUMBER_OF(ResourceList) - 1); for (i = 1; i <= ResourceCount; i++) { /* Do the lookup */

1 0

[tfaber] 66474: [TASKMGR] - Add missing break that causes stack corruption
by tfaber＠svn.reactos.org 27 Feb '15

27 Feb '15

Author: tfaber Date: Fri Feb 27 00:08:26 2015 New Revision: 66474 URL: http://svn.reactos.org/svn/reactos?rev=66474&view=rev Log: [TASKMGR] - Add missing break that causes stack corruption Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Fri Feb 27 00:08:26 2015 @@ -427,6 +427,7 @@ break; } } + break; #if 0 case WM_NCPAINT: hdc = GetDC(hDlg);

1 0

[gadamopoulos] 66473: [BROWSEUI] - Moce CAutoComplete from shell32 to browseui where it belongs
by gadamopoulos＠svn.reactos.org 26 Feb '15

26 Feb '15

Author: gadamopoulos Date: Thu Feb 26 18:44:34 2015 New Revision: 66473 URL: http://svn.reactos.org/svn/reactos?rev=66473&view=rev Log: [BROWSEUI] - Moce CAutoComplete from shell32 to browseui where it belongs Added: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp - copied, changed from r66418, trunk/reactos/dll/win32/shell32/CAutoComplete.cpp trunk/reactos/dll/win32/browseui/CAutoComplete.h - copied unchanged from r66418, trunk/reactos/dll/win32/shell32/CAutoComplete.h trunk/reactos/dll/win32/browseui/res/autocomplete.rgs - copied unchanged from r66418, trunk/reactos/dll/win32/shell32/res/rgs/autocomplete.rgs Removed: trunk/reactos/dll/win32/shell32/CAutoComplete.cpp trunk/reactos/dll/win32/shell32/CAutoComplete.h trunk/reactos/dll/win32/shell32/res/rgs/autocomplete.rgs Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt trunk/reactos/dll/win32/browseui/browseui.cpp trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/browseui/precomp.h trunk/reactos/dll/win32/browseui/resource.h trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shell32.cpp trunk/reactos/dll/win32/shell32/shresdef.h Copied: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp (from r66418, trunk/reactos/dll/win32/shell32/CAutoComplete.cpp) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CAutoCo… ============================================================================== --- trunk/reactos/dll/win32/shell32/CAutoComplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -37,8 +37,6 @@ #include "precomp.h" -WINE_DEFAULT_DEBUG_CHANNEL(shell); - static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', 'c','o','m','p','l','e','t','e',' ', 'c','o','n','t','r','o','l',0}; @@ -169,7 +167,7 @@ if (key) { wcscpy(key, pwzsRegKeyPath); - value = const_cast<WCHAR *>(strrchrW(key, '\\')); + value = const_cast<WCHAR *>(wcsrchr(key, '\\')); if (value) { @@ -435,7 +433,7 @@ if (hr != S_OK) break; - if ((LPWSTR)strstrW(strs, hwndText) == strs) + if ((LPWSTR)wcsstr(strs, hwndText) == strs) { if (pThis->options & ACO_AUTOAPPEND) Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -17,6 +17,7 @@ brandband.cpp browseui.cpp browseuiord.cpp + CAutoComplete.cpp commonbrowser.cpp desktopipc.cpp explorerband.cpp Modified: trunk/reactos/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.cpp [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -27,6 +27,7 @@ BEGIN_OBJECT_MAP(ObjectMap) +OBJECT_ENTRY(CLSID_AutoComplete, CAutoComplete) OBJECT_ENTRY(CLSID_ACLMulti, CACLMulti) OBJECT_ENTRY(CLSID_SH_AddressBand, CAddressBand) OBJECT_ENTRY(CLSID_AddressEditBox, CAddressEditBox) Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rc [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -43,6 +43,7 @@ IDR_REGTREEOPTIONS REGISTRY "res/regtreeoptions.rgs" IDR_EXPLORERBAND REGISTRY "res/explorerband.rgs" IDR_PROGRESSDIALOG REGISTRY "res/progressdialog.rgs" +IDR_AUTOCOMPLETE REGISTRY "res/autocomplete.rgs" /* * Everything specific to any language goes Modified: trunk/reactos/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/precomp… ============================================================================== --- trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/precomp.h [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -20,6 +20,7 @@ #include <atlbase.h> #include <atlcom.h> #include <atlwin.h> +#include <undocuser.h> #include <perhist.h> #include <exdispid.h> #include <strsafe.h> @@ -35,6 +36,7 @@ #include "aclmulti.h" #include "addressband.h" #include "addresseditbox.h" +#include "CAutoComplete.h" #include "bandproxy.h" #include "bandsite.h" #include "bandsitemenu.h" Modified: trunk/reactos/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/resourc… ============================================================================== --- trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/resource.h [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -84,6 +84,7 @@ #define IDR_REGTREEOPTIONS 138 #define IDR_EXPLORERBAND 139 #define IDR_PROGRESSDIALOG 140 +#define IDR_AUTOCOMPLETE 141 #define IDS_SMALLICONS 12301 #define IDS_LARGEICONS 12302 Removed: trunk/reactos/dll/win32/shell32/CAutoComplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CAutoCom… ============================================================================== --- trunk/reactos/dll/win32/shell32/CAutoComplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CAutoComplete.cpp (removed) @@ -1,533 +0,0 @@ -/* - * AutoComplete interfaces implementation. - * - * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> - * Copyright 2009 Andrew Hill - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* - Implemented: - - ACO_AUTOAPPEND style - - ACO_AUTOSUGGEST style - - ACO_UPDOWNKEYDROPSLIST style - - - Handle pwzsRegKeyPath and pwszQuickComplete in Init - - TODO: - - implement ACO_SEARCH style - - implement ACO_FILTERPREFIXES style - - implement ACO_USETAB style - - implement ACO_RTLREADING style - - */ - -#include "precomp.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shell); - -static const WCHAR autocomplete_propertyW[] = {'W','i','n','e',' ','A','u','t','o', - 'c','o','m','p','l','e','t','e',' ', - 'c','o','n','t','r','o','l',0}; - -/************************************************************************** - * IAutoComplete_Constructor - */ -CAutoComplete::CAutoComplete() -{ - enabled = TRUE; - initialized = FALSE; - options = ACO_AUTOAPPEND; - wpOrigEditProc = NULL; - hwndListBox = NULL; - txtbackup = NULL; - quickComplete = NULL; - hwndEdit = NULL; - wpOrigLBoxProc = NULL; -} - -/************************************************************************** - * IAutoComplete_Destructor - */ -CAutoComplete::~CAutoComplete() -{ - TRACE(" destroying IAutoComplete(%p)\n", this); - HeapFree(GetProcessHeap(), 0, quickComplete); - HeapFree(GetProcessHeap(), 0, txtbackup); - RemovePropW(hwndEdit, autocomplete_propertyW); - SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR)wpOrigEditProc); - if (hwndListBox) - DestroyWindow(hwndListBox); -} - -/****************************************************************************** - * IAutoComplete_fnEnable - */ -HRESULT WINAPI CAutoComplete::Enable(BOOL fEnable) -{ - HRESULT hr = S_OK; - - TRACE("(%p)->(%s)\n", this, (fEnable) ? "true" : "false"); - - enabled = fEnable; - - return hr; -} - -/****************************************************************************** - * IAutoComplete_fnInit - */ -HRESULT WINAPI CAutoComplete::Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) -{ - static const WCHAR lbName[] = {'L','i','s','t','B','o','x',0}; - - TRACE("(%p)->(0x%08lx, %p, %s, %s)\n", - this, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); - - if (options & ACO_AUTOSUGGEST) - TRACE(" ACO_AUTOSUGGEST\n"); - if (options & ACO_AUTOAPPEND) - TRACE(" ACO_AUTOAPPEND\n"); - if (options & ACO_SEARCH) - FIXME(" ACO_SEARCH not supported\n"); - if (options & ACO_FILTERPREFIXES) - FIXME(" ACO_FILTERPREFIXES not supported\n"); - if (options & ACO_USETAB) - FIXME(" ACO_USETAB not supported\n"); - if (options & ACO_UPDOWNKEYDROPSLIST) - TRACE(" ACO_UPDOWNKEYDROPSLIST\n"); - if (options & ACO_RTLREADING) - FIXME(" ACO_RTLREADING not supported\n"); - - if (!hwndEdit || !punkACL) - return E_INVALIDARG; - - if (this->initialized) - { - WARN("Autocompletion object is already initialized\n"); - /* This->hwndEdit is set to NULL when the edit window is destroyed. */ - return this->hwndEdit ? E_FAIL : E_UNEXPECTED; - } - - if (!SUCCEEDED(punkACL->QueryInterface(IID_PPV_ARG(IEnumString,&enumstr)))) - { - TRACE("No IEnumString interface\n"); - return E_NOINTERFACE; - } - - this->hwndEdit = hwndEdit; - this->initialized = TRUE; - wpOrigEditProc = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); -// SetWindowLongPtrW(hwndEdit, GWLP_USERDATA, (LONG_PTR)this); - SetPropW( hwndEdit, autocomplete_propertyW, (HANDLE)this ); - - if (options & ACO_AUTOSUGGEST) - { - HWND hwndParent; - - hwndParent = GetParent(hwndEdit); - - /* FIXME : The listbox should be resizable with the mouse. WS_THICKFRAME looks ugly */ - hwndListBox = CreateWindowExW(0, lbName, NULL, - WS_BORDER | WS_CHILD | WS_VSCROLL | LBS_HASSTRINGS | LBS_NOTIFY | LBS_NOINTEGRALHEIGHT, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - hwndParent, NULL, - (HINSTANCE)GetWindowLongPtrW(hwndParent, GWLP_HINSTANCE), NULL); - - if (hwndListBox) - { - wpOrigLBoxProc = (WNDPROC)SetWindowLongPtrW(hwndListBox, GWLP_WNDPROC, (LONG_PTR)ACLBoxSubclassProc); - SetWindowLongPtrW(hwndListBox, GWLP_USERDATA, (LONG_PTR)this); - } - } - - if (pwzsRegKeyPath) - { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwzsRegKeyPath) + 1) * sizeof(WCHAR)); - - if (key) - { - wcscpy(key, pwzsRegKeyPath); - value = const_cast<WCHAR *>(strrchrW(key, '\\')); - - if (value) - { - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - - if (res != ERROR_SUCCESS) - { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - - if (res == ERROR_SUCCESS) - { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) - { - quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); - wcscpy(quickComplete, result); - } - RegCloseKey(hKey); - } - } - - HeapFree(GetProcessHeap(), 0, key); - } - else - { - TRACE("HeapAlloc Failed when trying to alloca %d bytes\n", (wcslen(pwzsRegKeyPath) + 1) * sizeof(WCHAR)); - return S_FALSE; - } - } - - if ((pwszQuickComplete) && (!quickComplete)) - { - quickComplete = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pwszQuickComplete) + 1) * sizeof(WCHAR)); - - if (quickComplete) - { - wcscpy(quickComplete, pwszQuickComplete); - } - else - { - TRACE("HeapAlloc Failed when trying to alloca %d bytes\n", (wcslen(pwszQuickComplete) + 1) * sizeof(WCHAR)); - return S_FALSE; - } - } - - return S_OK; -} - -/************************************************************************** - * IAutoComplete_fnGetOptions - */ -HRESULT WINAPI CAutoComplete::GetOptions(DWORD *pdwFlag) -{ - HRESULT hr = S_OK; - - TRACE("(%p) -> (%p)\n", this, pdwFlag); - - *pdwFlag = options; - - return hr; -} - -/************************************************************************** - * IAutoComplete_fnSetOptions - */ -HRESULT WINAPI CAutoComplete::SetOptions(DWORD dwFlag) -{ - HRESULT hr = S_OK; - - TRACE("(%p) -> (0x%x)\n", this, dwFlag); - - options = (AUTOCOMPLETEOPTIONS)dwFlag; - - return hr; -} - -/* - Window procedure for autocompletion - */ -LRESULT APIENTRY CAutoComplete::ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - CAutoComplete *pThis = static_cast<CAutoComplete *>(GetPropW(hwnd, autocomplete_propertyW));//GetWindowLongPtrW(hwnd, GWLP_USERDATA); - LPOLESTR strs; - HRESULT hr; - WCHAR hwndText[255]; - WCHAR *hwndQCText; - RECT r; - BOOL control, filled, displayall = FALSE; - int cpt, height, sel; - - if (!pThis->enabled) - { - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - } - - switch (uMsg) - { - case CB_SHOWDROPDOWN: - { - ShowWindow(pThis->hwndListBox, SW_HIDE); - }; break; - - case WM_KILLFOCUS: - { - if ((pThis->options & ACO_AUTOSUGGEST) && ((HWND)wParam != pThis->hwndListBox)) - { - ShowWindow(pThis->hwndListBox, SW_HIDE); - } - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - }; break; - - case WM_KEYUP: - { - GetWindowTextW(hwnd, (LPWSTR)hwndText, 255); - - switch(wParam) - { - case VK_RETURN: - { - /* If quickComplete is set and control is pressed, replace the string */ - control = GetKeyState(VK_CONTROL) & 0x8000; - if (control && pThis->quickComplete) - { - hwndQCText = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (wcslen(pThis->quickComplete)+wcslen(hwndText))*sizeof(WCHAR)); - sel = swprintf(hwndQCText, pThis->quickComplete, hwndText); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); - SendMessageW(hwnd, EM_SETSEL, 0, sel); - HeapFree(GetProcessHeap(), 0, hwndQCText); - } - - ShowWindow(pThis->hwndListBox, SW_HIDE); - return 0; - }; break; - - case VK_LEFT: - case VK_RIGHT: - { - return 0; - }; break; - - case VK_UP: - case VK_DOWN: - { - /* Two cases here : - - if the listbox is not visible, displays it - with all the entries if the style ACO_UPDOWNKEYDROPSLIST - is present but does not select anything. - - if the listbox is visible, change the selection - */ - if ( (pThis->options & (ACO_AUTOSUGGEST | ACO_UPDOWNKEYDROPSLIST)) - && (!IsWindowVisible(pThis->hwndListBox) && (! *hwndText)) ) - { - /* We must display all the entries */ - displayall = TRUE; - } - else - { - if (IsWindowVisible(pThis->hwndListBox)) - { - int count; - - count = SendMessageW(pThis->hwndListBox, LB_GETCOUNT, 0, 0); - /* Change the selection */ - sel = SendMessageW(pThis->hwndListBox, LB_GETCURSEL, 0, 0); - if (wParam == VK_UP) - sel = ((sel-1)<0)?count-1:sel-1; - else - sel = ((sel+1)>= count)?-1:sel+1; - - SendMessageW(pThis->hwndListBox, LB_SETCURSEL, sel, 0); - - if (sel != -1) - { - WCHAR *msg; - int len; - - len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, (LPARAM)NULL); - msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); - - if (msg) - { - SendMessageW(pThis->hwndListBox, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(hwnd, EM_SETSEL, wcslen(msg), wcslen(msg)); - - HeapFree(GetProcessHeap(), 0, msg); - } - else - { - TRACE("HeapAlloc failed to allocate %d bytes\n", (len + 1) * sizeof(WCHAR)); - } - } - else - { - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)pThis->txtbackup); - SendMessageW(hwnd, EM_SETSEL, wcslen(pThis->txtbackup), wcslen(pThis->txtbackup)); - } - } - return 0; - } - }; break; - - case VK_BACK: - case VK_DELETE: - { - if ((! *hwndText) && (pThis->options & ACO_AUTOSUGGEST)) - { - ShowWindow(pThis->hwndListBox, SW_HIDE); - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - } - - if (pThis->options & ACO_AUTOAPPEND) - { - DWORD b; - SendMessageW(hwnd, EM_GETSEL, (WPARAM)&b, (LPARAM)NULL); - if (b>1) - { - hwndText[b-1] = '\0'; - } - else - { - hwndText[0] = '\0'; - SetWindowTextW(hwnd, hwndText); - } - } - }; break; - - default: - ; - } - - SendMessageW(pThis->hwndListBox, LB_RESETCONTENT, 0, 0); - - HeapFree(GetProcessHeap(), 0, pThis->txtbackup); - - pThis->txtbackup = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(hwndText)+1)*sizeof(WCHAR)); - - if (pThis->txtbackup) - { - wcscpy(pThis->txtbackup, hwndText); - } - else - { - TRACE("HeapAlloc failed to allocate %d bytes\n", (wcslen(hwndText)+1)*sizeof(WCHAR)); - } - - /* Returns if there is no text to search and we doesn't want to display all the entries */ - if ((!displayall) && (! *hwndText) ) - break; - - pThis->enumstr->Reset(); - filled = FALSE; - - for(cpt = 0;;) - { - hr = pThis->enumstr->Next(1, &strs, NULL); - if (hr != S_OK) - break; - - if ((LPWSTR)strstrW(strs, hwndText) == strs) - { - - if (pThis->options & ACO_AUTOAPPEND) - { - SetWindowTextW(hwnd, strs); - SendMessageW(hwnd, EM_SETSEL, wcslen(hwndText), wcslen(strs)); - break; - } - - if (pThis->options & ACO_AUTOSUGGEST) - { - SendMessageW(pThis->hwndListBox, LB_ADDSTRING, 0, (LPARAM)strs); - filled = TRUE; - cpt++; - } - } - } - - if (pThis->options & ACO_AUTOSUGGEST) - { - if (filled) - { - height = SendMessageW(pThis->hwndListBox, LB_GETITEMHEIGHT, 0, 0); - SendMessageW(pThis->hwndListBox, LB_CARETOFF, 0, 0); - GetWindowRect(hwnd, &r); - SetParent(pThis->hwndListBox, HWND_DESKTOP); - /* It seems that Windows XP displays 7 lines at most - and otherwise displays a vertical scroll bar */ - SetWindowPos(pThis->hwndListBox, HWND_TOP, - r.left, r.bottom + 1, r.right - r.left, min(height * 7, height * (cpt + 1)), - SWP_SHOWWINDOW ); - } - else - { - ShowWindow(pThis->hwndListBox, SW_HIDE); - } - } - - }; break; - - default: - { - return CallWindowProcW(pThis->wpOrigEditProc, hwnd, uMsg, wParam, lParam); - } - - } - - return 0; -} - -LRESULT APIENTRY CAutoComplete::ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - CAutoComplete *pThis = reinterpret_cast<CAutoComplete *>(GetWindowLongPtrW(hwnd, GWLP_USERDATA)); - WCHAR *msg; - int sel, len; - - switch (uMsg) - { - case WM_MOUSEMOVE: - { - sel = SendMessageW(hwnd, LB_ITEMFROMPOINT, 0, lParam); - SendMessageW(hwnd, LB_SETCURSEL, (WPARAM)sel, (LPARAM)0); - }; break; - - case WM_LBUTTONDOWN: - { - sel = SendMessageW(hwnd, LB_GETCURSEL, 0, 0); - - if (sel < 0) - break; - - len = SendMessageW(pThis->hwndListBox, LB_GETTEXTLEN, sel, 0); - msg = (WCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (len + 1) * sizeof(WCHAR)); - - if (msg) - { - SendMessageW(hwnd, LB_GETTEXT, sel, (LPARAM)msg); - SendMessageW(pThis->hwndEdit, WM_SETTEXT, 0, (LPARAM)msg); - SendMessageW(pThis->hwndEdit, EM_SETSEL, 0, wcslen(msg)); - ShowWindow(hwnd, SW_HIDE); - - HeapFree(GetProcessHeap(), 0, msg); - } - else - { - TRACE("HeapAlloc failed to allocate %d bytes\n", (len + 1) * sizeof(WCHAR)); - } - - }; break; - - default: - return CallWindowProcW(pThis->wpOrigLBoxProc, hwnd, uMsg, wParam, lParam); - } - return 0; -} Removed: trunk/reactos/dll/win32/shell32/CAutoComplete.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CAutoCom… ============================================================================== --- trunk/reactos/dll/win32/shell32/CAutoComplete.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CAutoComplete.h (removed) @@ -1,66 +0,0 @@ -/* - * AutoComplete interfaces implementation. - * - * Copyright 2004 Maxime Bellengé <maxime.bellenge(a)laposte.net> - * Copyright 2009 Andrew Hill - * - * 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 St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef _AUTOCOMPLETE_H_ -#define _AUTOCOMPLETE_H_ - -class CAutoComplete : - public CComCoClass<CAutoComplete, &CLSID_AutoComplete>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IAutoComplete2 -{ -private: - BOOL enabled; - BOOL initialized; - HWND hwndEdit; - HWND hwndListBox; - WNDPROC wpOrigEditProc; - WNDPROC wpOrigLBoxProc; - WCHAR *txtbackup; - WCHAR *quickComplete; - CComPtr<IEnumString> enumstr; - AUTOCOMPLETEOPTIONS options; -public: - - CAutoComplete(); - ~CAutoComplete(); - - static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT APIENTRY ACLBoxSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - - // IAutoComplete2 - virtual HRESULT WINAPI Enable(BOOL fEnable); - virtual HRESULT WINAPI Init(HWND hwndEdit, IUnknown *punkACL, LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete); - virtual HRESULT WINAPI GetOptions(DWORD *pdwFlag); - virtual HRESULT WINAPI SetOptions(DWORD dwFlag); - -DECLARE_REGISTRY_RESOURCEID(IDR_AUTOCOMPLETE) -DECLARE_NOT_AGGREGATABLE(CAutoComplete) - -DECLARE_PROTECT_FINAL_CONSTRUCT() - -BEGIN_COM_MAP(CAutoComplete) - COM_INTERFACE_ENTRY_IID(IID_IAutoComplete, IAutoComplete) - COM_INTERFACE_ENTRY_IID(IID_IAutoComplete2, IAutoComplete2) -END_COM_MAP() -}; - -#endif /* _AUTOCOMPLETE_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] Thu Feb 26 18:44:34 2015 @@ -16,7 +16,6 @@ ${REACTOS_SOURCE_DIR}) list(APPEND SOURCE - CAutoComplete.cpp CMenuBand.cpp CMenuDeskBar.cpp CIDLDataObj.cpp 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] Thu Feb 26 18:44:34 2015 @@ -48,7 +48,6 @@ #include "CShellItem.h" #include "CShellLink.h" #include "CDropTargetHelper.h" -#include "CAutoComplete.h" #include "folders/CFSFolder.h" #include "folders/CDrivesFolder.h" #include "folders/CDesktopFolder.h" Removed: trunk/reactos/dll/win32/shell32/res/rgs/autocomplete.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/autocomplete.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/autocomplete.rgs (removed) @@ -1,13 +0,0 @@ -HKCR -{ - NoRemove CLSID - { - ForceRemove {00BB2763-6A77-11D0-A535-00C04FD7D062} = s 'Shell ReactOS AutoComplete' - { - InprocServer32 = s '%MODULE%' - { - val ThreadingModel = s 'Apartment' - } - } - } -} Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -1,7 +1,6 @@ /* REGISTRY */ IDR_ADMINFOLDERSHORTCUT REGISTRY "res/rgs/adminfoldershortcut.rgs" -IDR_AUTOCOMPLETE REGISTRY "res/rgs/autocomplete.rgs" IDR_CONTROLPANEL REGISTRY "res/rgs/controlpanel.rgs" IDR_DRAGDROPHELPER REGISTRY "res/rgs/dragdrophelper.rgs" IDR_FOLDEROPTIONS REGISTRY "res/rgs/folderoptions.rgs" Modified: trunk/reactos/dll/win32/shell32/shell32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.cpp [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -160,7 +160,6 @@ OBJECT_ENTRY(CLSID_ShellLink, CShellLink) OBJECT_ENTRY(CLSID_DragDropHelper, CDropTargetHelper) OBJECT_ENTRY(CLSID_ControlPanel, CControlPanelFolder) - OBJECT_ENTRY(CLSID_AutoComplete, CAutoComplete) OBJECT_ENTRY(CLSID_MyDocuments, CMyDocsFolder) OBJECT_ENTRY(CLSID_NetworkPlaces, CNetFolder) OBJECT_ENTRY(CLSID_FontsFolderShortcut, CFontsFolder) Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Feb 26 18:44:34 2015 @@ -540,7 +540,6 @@ /* Registrar scripts (RGS) */ #define IDR_ADMINFOLDERSHORTCUT 128 -#define IDR_AUTOCOMPLETE 129 #define IDR_CONTROLPANEL 130 #define IDR_DRAGDROPHELPER 131 #define IDR_FOLDEROPTIONS 132

1 0

[cwittich] 66472: [TASKMGR] fix keyboard navigation for the tabcontrol See issue 4245 for more details.
by cwittich＠svn.reactos.org 26 Feb '15

26 Feb '15

Author: cwittich Date: Thu Feb 26 16:16:36 2015 New Revision: 66472 URL: http://svn.reactos.org/svn/reactos?rev=66472&view=rev Log: [TASKMGR] fix keyboard navigation for the tabcontrol See issue 4245 for more details. Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Thu Feb 26 16:16:36 2015 @@ -47,6 +47,7 @@ int nOldHeight; /* Holds the previous client area height */ BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ +BOOL bWasKeyboardInput = FALSE; /* TabChange by Keyboard or Mouse ? */ TASKMANAGER_SETTINGS TaskManagerSettings; @@ -411,12 +412,21 @@ case WM_NOTIFY: pnmh = (LPNMHDR)lParam; if ((pnmh->hwndFrom == hTabWnd) && - (pnmh->idFrom == IDC_TAB) && - (pnmh->code == TCN_SELCHANGE)) + (pnmh->idFrom == IDC_TAB)) { - TaskManager_OnTabWndSelChange(); - } - break; + switch (pnmh->code) + { + case TCN_SELCHANGE: + TaskManager_OnTabWndSelChange(); + break; + case TCN_KEYDOWN: + bWasKeyboardInput = TRUE; + break; + case NM_CLICK: + bWasKeyboardInput = FALSE; + break; + } + } #if 0 case WM_NCPAINT: hdc = GetDC(hDlg); @@ -1045,7 +1055,8 @@ /* * Give the application list control focus */ - SetFocus(hApplicationPageListCtrl); + if (!bWasKeyboardInput) + SetFocus(hApplicationPageListCtrl); break; case 1: @@ -1070,7 +1081,8 @@ /* * Give the process list control focus */ - SetFocus(hProcessPageListCtrl); + if (!bWasKeyboardInput) + SetFocus(hProcessPageListCtrl); break; case 2: @@ -1116,7 +1128,8 @@ /* * Give the tab control focus */ - SetFocus(hTabWnd); + if (!bWasKeyboardInput) + SetFocus(hTabWnd); break; } }

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