Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 53599: [NTOS] - Fix IoCheckEaBufferValidity (IntEaLength must be signed, otherwise loop exiting condition may not trigger). - SEH-protect ObQueryNameString (by Dmitry Chapyshev's request).
by fireball＠svn.reactos.org 05 Sep '11

05 Sep '11

Author: fireball Date: Mon Sep 5 15:05:56 2011 New Revision: 53599 URL: http://svn.reactos.org/svn/reactos?rev=53599&view=rev Log: [NTOS] - Fix IoCheckEaBufferValidity (IntEaLength must be signed, otherwise loop exiting condition may not trigger). - SEH-protect ObQueryNameString (by Dmitry Chapyshev's request). Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/util.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Mon Sep 5 15:05:56 2011 @@ -166,7 +166,8 @@ OUT PULONG ErrorOffset) { PFILE_FULL_EA_INFORMATION EaBufferEnd; - ULONG NextEaBufferOffset, IntEaLength; + ULONG NextEaBufferOffset; + LONG IntEaLength; PAGED_CODE(); Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Mon Sep 5 15:05:56 2011 @@ -986,6 +986,7 @@ ULONG NameSize; PWCH ObjectName; BOOLEAN ObjectIsNamed; + NTSTATUS Status = STATUS_SUCCESS; /* Get the Kernel Meta-Structures */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -994,28 +995,57 @@ /* Check if a Query Name Procedure is available */ if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) { - /* Call the procedure */ + /* Call the procedure inside SEH */ ObjectIsNamed = ((LocalInfo) && (LocalInfo->Name.Length > 0)); - return ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, + + _SEH2_TRY + { + Status = ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, ObjectIsNamed, ObjectNameInfo, Length, ReturnLength, KernelMode); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; } /* Check if the object doesn't even have a name */ if (!(LocalInfo) || !(LocalInfo->Name.Buffer)) { - /* We're returning the name structure */ - *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); - - /* Check if we were given enough space */ - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; - - /* Return an empty buffer */ - RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + + _SEH2_TRY + { + /* We're returning the name structure */ + *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); + + /* Check if we were given enough space */ + if (*ReturnLength > Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + /* Return an empty buffer */ + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; } /* @@ -1025,126 +1055,136 @@ * enough right at the beginning, not work our way through * and find out at the end */ - if (Object == ObpRootDirectoryObject) - { - /* Size of the '\' string */ - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); - } - else - { - /* Get the Object Directory and add name of Object */ - ParentDirectory = LocalInfo->Directory; - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; - - /* Loop inside the directory to get the top-most one (meaning root) */ - while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) - { - /* Get the Name Information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); - - /* Add the size of the Directory Name */ - if (LocalInfo && LocalInfo->Directory) - { - /* Size of the '\' string + Directory Name */ - NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + - LocalInfo->Name.Length; - - /* Move to next parent Directory */ - ParentDirectory = LocalInfo->Directory; - } - else - { - /* Directory with no name. We append "...\" */ - NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); - break; - } - } - } - - /* Finally, add the name of the structure and the null char */ - *ReturnLength = NameSize + - sizeof(OBJECT_NAME_INFORMATION) + - sizeof(UNICODE_NULL); - - /* Check if we were given enough space */ - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; - - /* - * Now we will actually create the name. We work backwards because - * it's easier to start off from the Name we have and walk up the - * parent directories. We use the same logic as Name Length calculation. - */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); - *--ObjectName = UNICODE_NULL; - - /* Check if the object is actually the Root directory */ - if (Object == ObpRootDirectoryObject) - { - /* This is already the Root Directory, return "\\" */ - *--ObjectName = OBJ_NAME_PATH_SEPARATOR; - ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + - sizeof(UNICODE_NULL)); - ObjectNameInfo->Name.Buffer = ObjectName; - return STATUS_SUCCESS; - } - else - { - /* Start by adding the Object's Name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - - LocalInfo->Name.Length); - RtlCopyMemory(ObjectName, - LocalInfo->Name.Buffer, - LocalInfo->Name.Length); - - /* Now parse the Parent directories until we reach the top */ - ParentDirectory = LocalInfo->Directory; - while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) - { - /* Get the name information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); - - /* Add the "\" */ + _SEH2_TRY + { + if (Object == ObpRootDirectoryObject) + { + /* Size of the '\' string */ + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); + } + else + { + /* Get the Object Directory and add name of Object */ + ParentDirectory = LocalInfo->Directory; + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; + + /* Loop inside the directory to get the top-most one (meaning root) */ + while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) + { + /* Get the Name Information */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + + /* Add the size of the Directory Name */ + if (LocalInfo && LocalInfo->Directory) + { + /* Size of the '\' string + Directory Name */ + NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + + LocalInfo->Name.Length; + + /* Move to next parent Directory */ + ParentDirectory = LocalInfo->Directory; + } + else + { + /* Directory with no name. We append "...\" */ + NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); + break; + } + } + } + + /* Finally, add the name of the structure and the null char */ + *ReturnLength = NameSize + + sizeof(OBJECT_NAME_INFORMATION) + + sizeof(UNICODE_NULL); + + /* Check if we were given enough space */ + if (*ReturnLength > Length) _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); + + /* + * Now we will actually create the name. We work backwards because + * it's easier to start off from the Name we have and walk up the + * parent directories. We use the same logic as Name Length calculation. + */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); + *--ObjectName = UNICODE_NULL; + + /* Check if the object is actually the Root directory */ + if (Object == ObpRootDirectoryObject) + { + /* This is already the Root Directory, return "\\" */ + *--ObjectName = OBJ_NAME_PATH_SEPARATOR; + ObjectNameInfo->Name.Length = (USHORT)NameSize; + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.Buffer = ObjectName; + _SEH2_YIELD(return STATUS_SUCCESS); + } + else + { + /* Start by adding the Object's Name */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlCopyMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); + + /* Now parse the Parent directories until we reach the top */ + ParentDirectory = LocalInfo->Directory; + while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) + { + /* Get the name information */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + + /* Add the "\" */ + *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; + + /* Add the Parent Directory's Name */ + if (LocalInfo && LocalInfo->Name.Buffer) + { + /* Add the name */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlCopyMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); + + /* Move to next parent */ + ParentDirectory = LocalInfo->Directory; + } + else + { + /* Directory without a name, we add "..." */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + sizeof(L"...") + + sizeof(UNICODE_NULL)); + RtlCopyMemory(ObjectName, + L"...", + sizeof(L"...") + sizeof(UNICODE_NULL)); + break; + } + } + + /* Add Root Directory Name */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - - /* Add the Parent Directory's Name */ - if (LocalInfo && LocalInfo->Name.Buffer) - { - /* Add the name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - - LocalInfo->Name.Length); - RtlCopyMemory(ObjectName, - LocalInfo->Name.Buffer, - LocalInfo->Name.Length); - - /* Move to next parent */ - ParentDirectory = LocalInfo->Directory; - } - else - { - /* Directory without a name, we add "..." */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - - sizeof(L"...") + sizeof(UNICODE_NULL)); - RtlCopyMemory(ObjectName, - L"...", - sizeof(L"...") + sizeof(UNICODE_NULL)); - break; - } - } - - /* Add Root Directory Name */ - *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + - sizeof(UNICODE_NULL)); - ObjectNameInfo->Name.Buffer = ObjectName; - } + ObjectNameInfo->Name.Length = (USHORT)NameSize; + ObjectNameInfo->Name.MaximumLength = + (USHORT)(NameSize + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.Buffer = ObjectName; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Return success */ - return STATUS_SUCCESS; + return Status; } VOID

1 0

[fireball] 53598: [NTOS/EX] - Remove redundant check for a previous mode. Spotted by PVS.
by fireball＠svn.reactos.org 05 Sep '11

05 Sep '11

Author: fireball Date: Mon Sep 5 14:27:48 2011 New Revision: 53598 URL: http://svn.reactos.org/svn/reactos?rev=53598&view=rev Log: [NTOS/EX] - Remove redundant check for a previous mode. Spotted by PVS. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon Sep 5 14:27:48 2011 @@ -1948,17 +1948,10 @@ FStatus = CallQS [SystemInformationClass].Query(SystemInformation, Length, &ResultLength); - if (UnsafeResultLength != NULL) - { - if (PreviousMode != KernelMode) - { - *UnsafeResultLength = ResultLength; - } - else - { - *UnsafeResultLength = ResultLength; - } - } + + /* Save the result length to the caller */ + if (UnsafeResultLength) + *UnsafeResultLength = ResultLength; } } _SEH2_EXCEPT(ExSystemExceptionFilter())

1 0

[spetreolle] 53597: [CMAKE] Don't assume CMAKE_SHARED_LIBRARY_ASM_FLAGS exists.
by spetreolle＠svn.reactos.org 05 Sep '11

05 Sep '11

Author: spetreolle Date: Mon Sep 5 12:41:18 2011 New Revision: 53597 URL: http://svn.reactos.org/svn/reactos?rev=53597&view=rev Log: [CMAKE] Don't assume CMAKE_SHARED_LIBRARY_ASM_FLAGS exists. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53597&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Sep 5 12:41:18 2011 @@ -9,7 +9,9 @@ add_compile_flags("-Werror") # For some reason, cmake sets -fPIC, and we don't want it -string(REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_ASM_FLAGS ${CMAKE_SHARED_LIBRARY_ASM_FLAGS}) +if(DEFINED CMAKE_SHARED_LIBRARY_ASM_FLAGS) + string(REPLACE "-fPIC" "" CMAKE_SHARED_LIBRARY_ASM_FLAGS ${CMAKE_SHARED_LIBRARY_ASM_FLAGS}) +endif() # Tuning if(ARCH MATCHES i386)

1 0

[fireball] 53596: [NTOS/CONFIG] - Remove unnecessary assignments. Spotted by PVS and Dmitry Chapyshev. This may change the behaviour of that codepath, so test results are going to be observed.
by fireball＠svn.reactos.org 05 Sep '11

05 Sep '11

Author: fireball Date: Mon Sep 5 09:54:20 2011 New Revision: 53596 URL: http://svn.reactos.org/svn/reactos?rev=53596&view=rev Log: [NTOS/CONFIG] - Remove unnecessary assignments. Spotted by PVS and Dmitry Chapyshev. This may change the behaviour of that codepath, so test results are going to be observed. Modified: trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c [iso-8859-1] Mon Sep 5 09:54:20 2011 @@ -49,7 +49,6 @@ PHHIVE Hive; PCACHED_CHILD_LIST ChildList; HCELL_INDEX CellToRelease; - PCM_KEY_NODE KeyNode; /* Set defaults */ *ValueListToRelease = HCELL_NIL; @@ -58,8 +57,6 @@ /* Get the hive and value cache */ Hive = Kcb->KeyHive; ChildList = &Kcb->ValueCache; - KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); - ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the value is cached */ if (CmpIsValueCached(ChildList->ValueList)) @@ -212,7 +209,6 @@ BOOLEAN IndexIsCached; ULONG i = 0; HCELL_INDEX Cell = HCELL_NIL; - PCM_KEY_NODE KeyNode; /* Set defaults */ *CellToRelease = HCELL_NIL; @@ -221,8 +217,6 @@ /* Get the hive and child list */ Hive = Kcb->KeyHive; ChildList = &Kcb->ValueCache; - KeyNode = (PCM_KEY_NODE)HvGetCell(Hive, Kcb->KeyCell); - ChildList = (PCACHED_CHILD_LIST)&KeyNode->ValueList; /* Check if the child list has any entries */ if (ChildList->Count != 0)

1 0

[jimtabor] 53595: [User32] - Fixed over check conditions for deleting regions in set window region. - Disabled offsets with window region. Fixes wine tests..
by jimtabor＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jimtabor Date: Sun Sep 4 21:54:57 2011 New Revision: 53595 URL: http://svn.reactos.org/svn/reactos?rev=53595&view=rev Log: [User32] - Fixed over check conditions for deleting regions in set window region. - Disabled offsets with window region. Fixes wine tests.. Modified: trunk/reactos/dll/win32/user32/windows/paint.c Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c [iso-8859-1] Sun Sep 4 21:54:57 2011 @@ -208,7 +208,7 @@ if (!Hook) { Ret = NtUserSetWindowRgn(hWnd, hRgn, bRedraw); - if (hRgn && Ret) + if (Ret) DeleteObject(hRgn); return Ret; } @@ -285,10 +285,10 @@ if (!Ret) return ERROR; - +/* if (hWnd != GetDesktopWindow()) // pWnd->fnid != FNID_DESKTOP) Ret = OffsetRgn(hRgn, -pWnd->rcWindow.left, -pWnd->rcWindow.top); - +*/ if (pWnd->ExStyle & WS_EX_LAYOUTRTL) MirrorRgn(hWnd, hRgn); @@ -319,10 +319,10 @@ if (!Ret) return ERROR; - +/* if (hWnd != GetDesktopWindow()) // pWnd->fnid != FNID_DESKTOP) OffsetRect(lprc, -pWnd->rcWindow.left, -pWnd->rcWindow.top); - +*/ if (pWnd->ExStyle & WS_EX_LAYOUTRTL) MirrorWindowRect(pWnd, lprc);

1 0

[akhaldi] 53594: [CMAKE] * Properly use add_target_compile_flags.
by akhaldi＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: akhaldi Date: Sun Sep 4 21:52:37 2011 New Revision: 53594 URL: http://svn.reactos.org/svn/reactos?rev=53594&view=rev Log: [CMAKE] * Properly use add_target_compile_flags. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53594&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Sep 4 21:52:37 2011 @@ -360,5 +360,5 @@ endfunction() function(allow_warnings __module) - add_target_compile_flags(${__module} -Wno-error) -endfunction() + add_target_compile_flags(${__module} "-Wno-error") +endfunction()

1 0

[jgardou] 53593: [BUSLOGIC] - woops, revert some accident of 53591
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 21:08:29 2011 New Revision: 53593 URL: http://svn.reactos.org/svn/reactos?rev=53593&view=rev Log: [BUSLOGIC] - woops, revert some accident of 53591 Modified: trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c Modified: trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c [iso-8859-1] Sun Sep 4 21:08:29 2011 @@ -293,7 +293,7 @@ if (!Buslogic_InitBT958(deviceExtension,ConfigInfo)) // harware specific initializations. Find what's for our card { - (deviceExtension, + ScsiPortLogError(deviceExtension, NULL, 0, 0,

1 0

[jgardou] 53592: [CMAKE] - fix msvc build
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 21:06:02 2011 New Revision: 53592 URL: http://svn.reactos.org/svn/reactos?rev=53592&view=rev Log: [CMAKE] - fix msvc build Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Sun Sep 4 21:06:02 2011 @@ -50,7 +50,8 @@ target_link_libraries(kernel32_winetest wine) set_module_type(kernel32_winetest win32cui) add_importlibs(kernel32_winetest user32 advapi32 msvcrt kernel32 ntdll) - -allow_warnings(kernel32_winetest) +if(NOT MSVC) + allow_warnings(kernel32_winetest) +endif() add_cd_file(TARGET kernel32_winetest DESTINATION reactos/bin FOR all)

1 0

[jgardou] 53591: [BUSLOGIC] - get rid of unused variable
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 21:04:26 2011 New Revision: 53591 URL: http://svn.reactos.org/svn/reactos?rev=53591&view=rev Log: [BUSLOGIC] - get rid of unused variable Modified: trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c Modified: trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/port/buslogic/BusLogic958.c [iso-8859-1] Sun Sep 4 21:04:26 2011 @@ -207,7 +207,7 @@ // static UCHAR k = 0; PACCESS_RANGE accessRange; // PCI_COMMON_CONFIG PCICommonConfig; - PUCHAR pciAddress, portFound; + PUCHAR pciAddress; char NumPort = 0; DebugPrint((TRACE,"\n BusLogic - Inside the Find Adapter Routine\n")); @@ -291,11 +291,9 @@ // Should we change this to double-word aligned to increase performance ConfigInfo->AlignmentMask = 0x0; - portFound = hcsp->IO_Address; - if (!Buslogic_InitBT958(deviceExtension,ConfigInfo)) // harware specific initializations. Find what's for our card { - ScsiPortLogError(deviceExtension, + (deviceExtension, NULL, 0, 0,

1 0

[jgardou] 53590: [ATAPI] - get rid of unused variable
by jgardou＠svn.reactos.org 04 Sep '11

04 Sep '11

Author: jgardou Date: Sun Sep 4 20:51:52 2011 New Revision: 53590 URL: http://svn.reactos.org/svn/reactos?rev=53590&view=rev Log: [ATAPI] - get rid of unused variable Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] Sun Sep 4 20:51:52 2011 @@ -1383,7 +1383,6 @@ } else if (!(deviceExtension->DeviceFlags[i] & DFLAGS_CHANGER_INITED)){ ULONG j; - BOOLEAN isSanyo = FALSE; UCHAR vendorId[26]; // @@ -1415,7 +1414,6 @@ deviceExtension->DeviceFlags[i] |= (DFLAGS_CHANGER_INITED | DFLAGS_SANYO_ATAPI_CHANGER); deviceExtension->DiscsPresent[i] = 3; - isSanyo = TRUE; } } }

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