Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[jgardou] 55778: [CMAKE] - get rid of the no longer needed importlibs directory - exclude importlibs from all target in MSVC build

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 21 15:03:19 2012 New Revision: 55778 URL: http://svn.reactos.org/svn/reactos?rev=55778&view=rev Log: [CMAKE] - get rid of the no longer needed importlibs directory - exclude importlibs from all target in MSVC build Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=55778&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Feb 21 15:03:19 2012 @@ -222,7 +222,5 @@ file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) - file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) - add_dependency_footer() endif() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55778&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Feb 21 15:03:19 2012 @@ -82,13 +82,6 @@ else() set(ARCH2 ${ARCH}) endif() - -# Linking -if(ARCH MATCHES i386) - link_directories(${REACTOS_SOURCE_DIR}/importlibs) -endif() - -link_directories(${REACTOS_BINARY_DIR}/lib/sdk/crt) get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=55778… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Feb 21 15:03:19 2012 @@ -43,8 +43,6 @@ else() set(SPEC2DEF_ARCH i386) endif() - -link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt) set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") @@ -149,7 +147,7 @@ # add our library # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other - add_library(lib${_name} STATIC + add_library(lib${_name} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm) # Add necessary importlibs for redirections. Still necessary ? @@ -188,8 +186,6 @@ set(COMMAND_MC mc ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc) endmacro() -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) - #pseh workaround set(PSEH_LIB "pseh")

12 years, 10 months

[jgardou] 55777: [CMAKE] - fix MSVC build

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 21 14:56:36 2012 New Revision: 55777 URL: http://svn.reactos.org/svn/reactos?rev=55777&view=rev Log: [CMAKE] - fix MSVC build Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=55777… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Feb 21 14:56:36 2012 @@ -133,7 +133,7 @@ #define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") - +set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /Fo<OBJECT> /c /Ta <SOURCE>") # Thanks MS for creating a stupid linker function(add_importlib_target _exports_file _implib_name) @@ -145,7 +145,7 @@ COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_implib_name} -d=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_exp.def -l=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) # be clear about the language - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm PROPERTIES LANGUAGE "ASM") + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm PROPERTIES LANGUAGE "STUB_ASM") # add our library # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other

12 years, 10 months

[jgardou] 55776: [CMAKE] - generate 'real' libraries for import libraries This way only the link step relies on them. Should avoid rebuilding half of the tree next time Alex changes ntdll.spec A re...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 21 14:32:05 2012 New Revision: 55776 URL: http://svn.reactos.org/svn/reactos?rev=55776&view=rev Log: [CMAKE] - generate 'real' libraries for import libraries This way only the link step relies on them. Should avoid rebuilding half of the tree next time Alex changes ntdll.spec A relinking orgy is more than enough Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Feb 21 14:32:05 2012 @@ -271,7 +271,7 @@ add_target_compile_definitions(${_module} _DLL __USE_CRTIMP) target_link_libraries(${_module} msvcrtex) endif() - target_link_libraries(${_module} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}${CMAKE_STATIC_LIBRARY_SUFFIX}) + target_link_libraries(${_module} lib${LIB}) add_dependencies(${_module} lib${LIB}) add_dependency_edge(${_module} ${LIB}) endforeach() Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55776&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Feb 21 14:32:05 2012 @@ -182,8 +182,7 @@ function(add_delay_importlibs MODULE) foreach(LIB ${ARGN}) - target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}_delayed.a) - add_dependencies(${MODULE} lib${LIB}_delayed) + target_link_libraries(${MODULE} lib${LIB}_delayed) endforeach() target_link_libraries(${MODULE} delayimp) endfunction() @@ -192,50 +191,32 @@ set(DECO_OPTION "-@") endif() +# Cute little hack to produce import libs +set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-lib=<TARGET>") +set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-delaylib=<TARGET>") function(add_importlib_target _exports_file _implib_name) - get_filename_component(_name ${_exports_file} NAME_WE) get_filename_component(_extension ${_exports_file} EXT) if(${_extension} STREQUAL ".spec") - # Normal importlib creation + # generate .def add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} - COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) - - # Delayed importlib creation - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a - COMMAND native-spec2def -n=${_implib_name} -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} - COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_BINARY_DIR}/${_name}_delayed_implib.def --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) - - elseif(${_extension} STREQUAL ".def") - message("Use of def files for import libs is deprecated: ${_exports_file}") - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a - COMMAND ${CMAKE_DLLTOOL} --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) + + #create normal importlib + add_library(lib${_name} STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def) + set_target_properties(lib${_name} PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") + + #create delayed importlib + add_library(lib${_name}_delayed STATIC EXCLUDE_FROM_ALL ${CMAKE_CURRENT_BINARY_DIR}/${_name}_implib.def) + set_target_properties(lib${_name}_delayed PROPERTIES LINKER_LANGUAGE "IMPLIB" PREFIX "") else() message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") endif() - - # Normal importlib target - add_custom_target( - lib${_name} - DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a) - # Delayed importlib target - add_custom_target( - lib${_name}_delayed - DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a) - endfunction() function(spec2def _dllname _spec_file) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=55776… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Feb 21 14:32:05 2012 @@ -131,6 +131,9 @@ set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) endfunction() +#define those for having real libraries +set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") + # Thanks MS for creating a stupid linker function(add_importlib_target _exports_file _implib_name) @@ -138,43 +141,31 @@ # Generate the asm stub file and the export def file add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def - COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_implib_name} -d=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def -l=${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_exp.def + COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib -n=${_implib_name} -d=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_exp.def -l=${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} native-spec2def) - - # Assemble the stub file - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj - COMMAND ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm - DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm") - - # Add neccessary importlibs for redirections - set(_libraries "") - set(_dependencies "") - foreach(_lib ${ARGN}) - list(APPEND _libraries "${CMAKE_BINARY_DIR}/importlibs/${_lib}.lib") - list(APPEND _dependencies ${_lib}) - endforeach() - - # Build the importlib - add_custom_command( - OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib - COMMAND LINK /LIB /NOLOGO /DEF:${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def /OUT:${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${_libraries} - DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_exp.def) - - # Add the importlib target - add_custom_target( - lib${_name} - DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.lib) - - add_dependencies(lib${_name} asm ${_dependencies}) + # be clear about the language + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm PROPERTIES LANGUAGE "ASM") + + # add our library + # NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other + add_library(lib${_name} STATIC + ${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm) + + # Add necessary importlibs for redirections. Still necessary ? + if(ARGN) + target_link_libraries(lib${_name} ${ARGN}) + endif() + + # set correct link rule + set_target_properties(lib${_name} PROPERTIES LINKER_LANGUAGE "IMPLIB" + STATIC_LIBRARY_FLAGS "/DEF:${CMAKE_CURRENT_BINARY_DIR}\\lib${_name}_exp.def") endfunction() macro(add_delay_importlibs MODULE) foreach(LIB ${ARGN}) add_target_link_flags(${MODULE} "/DELAYLOAD:${LIB}.dll") - target_link_libraries(${MODULE} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}.LIB) - add_dependencies(${MODULE} lib${LIB}) + target_link_libraries(${MODULE} lib${LIB}) endforeach() target_link_libraries(${MODULE} delayimp) endmacro()

12 years, 10 months

[janderwald] 55775: [USBCCGP] - Send unconfigure request when the device is removed [USBOHCI] - Handle unconfigure request

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 21 03:03:27 2012 New Revision: 55775 URL: http://svn.reactos.org/svn/reactos?rev=55775&view=rev Log: [USBCCGP] - Send unconfigure request when the device is removed [USBOHCI] - Handle unconfigure request Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c trunk/reactos/drivers/usb/usbohci/usb_device.cpp Modified: trunk/reactos/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/fdo.c [iso-8859-1] Tue Feb 21 03:03:27 2012 @@ -409,6 +409,52 @@ } NTSTATUS +FDO_CloseConfiguration( + IN PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PURB Urb; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // get device extension + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // + // now allocate the urb + // + Urb = USBD_CreateConfigurationRequestEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->InterfaceList); + if (!Urb) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // clear configuration descriptor to make it an unconfigure request + // + Urb->UrbSelectConfiguration.ConfigurationDescriptor = NULL; + + // + // submit urb + // + Status = USBCCGP_SyncUrbRequest(FDODeviceExtension->NextDeviceObject, Urb); + if (!NT_SUCCESS(Status)) + { + // + // failed to set configuration + // + DPRINT1("USBCCGP_SyncUrbRequest failed to unconfigure device\n", Status); + } + + ExFreePool(Urb); + return Status; +} + + +NTSTATUS FDO_HandlePnp( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -429,6 +475,12 @@ { case IRP_MN_REMOVE_DEVICE: { + // + // unconfigure device + // + DPRINT1("[USBCCGP] FDO IRP_MN_REMOVE\n"); + FDO_CloseConfiguration(DeviceObject); + /* Send the IRP down the stack */ Status = USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); if (NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Tue Feb 21 03:03:27 2012 @@ -1103,29 +1103,48 @@ ULONG InterfaceIndex, PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; - - // - // sanity checks - // - ASSERT(ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); - ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->iConfiguration); - - // - // sanity check - // - ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->bNumInterfaces); + UCHAR bConfigurationValue = 0; + + if (ConfigurationDescriptor) + { + // + // sanity checks + // + ASSERT(ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->iConfiguration); + + // + // sanity check + // + ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->bNumInterfaces); + + // + // get configuration value + // + bConfigurationValue = ConfigurationDescriptor->bConfigurationValue; + } // // now build setup packet // RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; - CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue; + CtrlSetup.wValue.W = bConfigurationValue; // // select configuration // Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); + + if (!ConfigurationDescriptor) + { + // + // unconfigure request + // + DPRINT1("CUsbDevice::SelectConfiguration Unconfigure Request Status %x\n", Status); + m_ConfigurationIndex = 0; + return Status; + } // // informal debug print

12 years, 10 months

[cgutman] 55774: [HIVESYS] - Load FS drivers on demand instead of boot start because WinLdr already adds the boot FS driver to the start list

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Feb 21 02:19:04 2012 New Revision: 55774 URL: http://svn.reactos.org/svn/reactos?rev=55774&view=rev Log: [HIVESYS] - Load FS drivers on demand instead of boot start because WinLdr already adds the boot FS driver to the start list Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Feb 21 02:19:04 2012 @@ -9,9 +9,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\PnP",,0x00000012 ; Critical Device Database - -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\acpipic_up","ClassGUID",0x00000000,"{4D36E966-E325-11CE-BFC1-08002BE10318}" -HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\e_isa_up","ClassGUID",0x00000000,"{4D36E966-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","Service",0x00000000,"pci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" @@ -1287,7 +1284,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Group",0x00000000,"File System" HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","ImagePath",0x00020000,"system32\drivers\cdfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Cdfs","Type",0x00010001,0x00000002 ; Cdrom class driver @@ -1803,7 +1800,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ImagePath",0x00020000,"system32\drivers\fastfat.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 ; RAM Disk class driver @@ -1817,7 +1814,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ImagePath",0x00020000,"system32\drivers\ext2.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000004 +HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Start",0x00010001,0x00000003 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Type",0x00010001,0x00000002 ; VBE SVGA driver

12 years, 10 months

[cgutman] 55773: [NTOSKRNL] - Add prints to unloading functions because things seem very wonky here - This exposes some previously unknown behavior of fastfat actually being unloaded in early boot ...

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Feb 21 01:26:29 2012 New Revision: 55773 URL: http://svn.reactos.org/svn/reactos?rev=55773&view=rev Log: [NTOSKRNL] - Add prints to unloading functions because things seem very wonky here - This exposes some previously unknown behavior of fastfat actually being unloaded in early boot (with uniata and buslogic failing unload due to missing DriverUnload) Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Tue Feb 21 01:26:29 2012 @@ -364,6 +364,13 @@ PDEVICE_NODE DeviceNode; BOOLEAN SafeToUnload = TRUE; + /* We can't unload unless there's an unload handler */ + if (!DriverObject->DriverUnload) + { + DPRINT1("No DriverUnload function! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); + return; + } + /* Check if removal is pending */ ThisExtension = IoGetDevObjExtension(DeviceObject); if (ThisExtension->ExtensionFlags & DOE_REMOVE_PENDING) @@ -463,11 +470,13 @@ DeviceObject = DeviceObject->NextDevice; } + DPRINT1("Unloading driver '%wZ' (automatic)\n", &DriverObject->DriverName); + /* Set the unload invoked flag */ DriverObject->Flags |= DRVO_UNLOAD_INVOKED; /* Unload it */ - if (DriverObject->DriverUnload) DriverObject->DriverUnload(DriverObject); + DriverObject->DriverUnload(DriverObject); /* Make object temporary so it can be deleted */ ObMakeTemporaryObject(DriverObject); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Feb 21 01:26:29 2012 @@ -57,6 +57,8 @@ PDRIVER_OBJECT DriverObject = ObjectBody; PIO_CLIENT_EXTENSION DriverExtension, NextDriverExtension; PAGED_CODE(); + + DPRINT1("Deleting driver object '%wZ'\n", &DriverObject->DriverName); /* Get the extension and loop them */ DriverExtension = IoGetDrvObjExtension(DriverObject)-> @@ -1284,6 +1286,8 @@ return STATUS_SUCCESS; } + DPRINT1("Unloading driver '%wZ' (manual)\n", &DriverObject->DriverName); + /* Set the unload invoked flag */ DriverObject->Flags |= DRVO_UNLOAD_INVOKED; @@ -1323,6 +1327,8 @@ } else { + DPRINT1("No DriverUnload function! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); + /* Dereference one time (refd inside this function) */ ObDereferenceObject(DriverObject);

12 years, 10 months

[janderwald] 55772: [HIDCLASS] - Call mini driver for pnp events - Wait for all pending irps to complete [HIDUSB] - Fix bug when removing device object found by Cameron Gutman [USBOHCI] - Remove as...

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 21 01:16:56 2012 New Revision: 55772 URL: http://svn.reactos.org/svn/reactos?rev=55772&view=rev Log: [HIDCLASS] - Call mini driver for pnp events - Wait for all pending irps to complete [HIDUSB] - Fix bug when removing device object found by Cameron Gutman [USBOHCI] - Remove assert - Delete configuration descriptors when device is deleted Modified: trunk/reactos/drivers/hid/hidclass/fdo.c trunk/reactos/drivers/hid/hidclass/hidclass.c trunk/reactos/drivers/hid/hidclass/precomp.h trunk/reactos/drivers/hid/hidusb/hidusb.c trunk/reactos/drivers/hid/hidusb/hidusb.h trunk/reactos/drivers/usb/usbohci/hub_controller.cpp trunk/reactos/drivers/usb/usbohci/usb_device.cpp Modified: trunk/reactos/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/fdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/fdo.c [iso-8859-1] Tue Feb 21 01:16:56 2012 @@ -384,17 +384,21 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PHIDCLASS_FDO_EXTENSION FDODeviceExtension = DeviceObject->DeviceExtension; - NTSTATUS Status; - - /* Pass the IRP down */ + NTSTATUS Status; + + /* FIXME cleanup */ + + // + // dispatch to minidriver + // IoSkipCurrentIrpStackLocation(Irp); - Status = IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); - - /* Now teardown our portion of the device stack */ - IoDetachDevice(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject); - IoDeleteDevice(DeviceObject); - + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + + // + // complete request + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -533,6 +537,7 @@ { PIO_STACK_LOCATION IoStack; PHIDCLASS_FDO_EXTENSION FDODeviceExtension; + NTSTATUS Status; // // get device extension @@ -554,45 +559,34 @@ { return HidClassFDO_RemoveDevice(DeviceObject, Irp); } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + return HidClassFDO_DeviceRelations(DeviceObject, Irp); + } case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: - { - // - // set status to succes - // - Irp->IoStatus.Status = STATUS_SUCCESS; - - // - // forward to lower device - // - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); - } case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE: { // - // set status to succes + // set status to success and fall through // Irp->IoStatus.Status = STATUS_SUCCESS; - - // - // forward to lower device - // - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); - } - case IRP_MN_QUERY_DEVICE_RELATIONS: - { - return HidClassFDO_DeviceRelations(DeviceObject, Irp); - } + } default: { // - // dispatch to lower device + // dispatch to mini driver // - IoSkipCurrentIrpStackLocation(Irp); - return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); + IoSkipCurrentIrpStackLocation(Irp); + Status = HidClassFDO_DispatchRequestSynchronous(DeviceObject, Irp); + + // + // complete request + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; } } } Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Tue Feb 21 01:16:56 2012 @@ -203,6 +203,7 @@ KeInitializeSpinLock(&Context->Lock); InitializeListHead(&Context->ReadPendingIrpListHead); InitializeListHead(&Context->IrpCompletedListHead); + KeInitializeEvent(&Context->IrpReadComplete, NotificationEvent, FALSE); // // store context @@ -226,7 +227,11 @@ { PIO_STACK_LOCATION IoStack; PHIDCLASS_COMMON_DEVICE_EXTENSION CommonDeviceExtension; - PHIDCLASS_IRP_CONTEXT IrpContext; + PHIDCLASS_FILEOP_CONTEXT IrpContext; + BOOLEAN IsRequestPending = FALSE; + KIRQL OldLevel; + PLIST_ENTRY Entry; + PIRP ListIrp; // // get device extension @@ -260,12 +265,79 @@ // // get irp context // - IrpContext = (PHIDCLASS_IRP_CONTEXT)IoStack->FileObject->FsContext; - - // - // cancel pending irps - // - UNIMPLEMENTED + IrpContext = (PHIDCLASS_FILEOP_CONTEXT)IoStack->FileObject->FsContext; + ASSERT(IrpContext); + + // + // acquire lock + // + KeAcquireSpinLock(&IrpContext->Lock, &OldLevel); + + if (!IsListEmpty(&IrpContext->ReadPendingIrpListHead)) + { + // + // FIXME cancel irp + // + IsRequestPending = TRUE; + } + + // + // signal stop + // + IrpContext->StopInProgress = TRUE; + + // + // release lock + // + KeReleaseSpinLock(&IrpContext->Lock, OldLevel); + + if (IsRequestPending) + { + // + // wait for request to complete + // + DPRINT1("[HIDCLASS] Waiting for read irp completion...\n"); + KeWaitForSingleObject(&IrpContext->IrpReadComplete, Executive, KernelMode, FALSE, NULL); + } + + // + // acquire lock + // + KeAcquireSpinLock(&IrpContext->Lock, &OldLevel); + + // + // sanity check + // + ASSERT(IsListEmpty(&IrpContext->ReadPendingIrpListHead)); + + // + // now free all irps + // + while(!IsListEmpty(&IrpContext->IrpCompletedListHead)) + { + // + // remove head irp + // + Entry = RemoveHeadList(&IrpContext->IrpCompletedListHead); + + // + // get irp + // + ListIrp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + + // + // free the irp + // + IoFreeIrp(ListIrp); + } + + // + // release lock + // + KeReleaseSpinLock(&IrpContext->Lock, OldLevel); + + + // // remove context @@ -323,19 +395,20 @@ ULONG Offset; PHIDP_COLLECTION_DESC CollectionDescription; PHIDP_REPORT_IDS ReportDescription; + BOOLEAN IsEmpty; // // get irp context // IrpContext = (PHIDCLASS_IRP_CONTEXT)Ctx; - DPRINT("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); - DPRINT("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); - DPRINT("HidClass_ReadCompleteIrp Length %lu\n", Irp->IoStatus.Information); - DPRINT("HidClass_ReadCompleteIrp Irp %p\n", Irp); - DPRINT("HidClass_ReadCompleteIrp InputReportBuffer %p\n", IrpContext->InputReportBuffer); - DPRINT("HidClass_ReadCompleteIrp InputReportBufferLength %li\n", IrpContext->InputReportBufferLength); - DPRINT("HidClass_ReadCompleteIrp OriginalIrp %p\n", IrpContext->OriginalIrp); + DPRINT1("HidClass_ReadCompleteIrp Irql %lu\n", KeGetCurrentIrql()); + DPRINT1("HidClass_ReadCompleteIrp Status %lx\n", Irp->IoStatus.Status); + DPRINT1("HidClass_ReadCompleteIrp Length %lu\n", Irp->IoStatus.Information); + DPRINT1("HidClass_ReadCompleteIrp Irp %p\n", Irp); + DPRINT1("HidClass_ReadCompleteIrp InputReportBuffer %p\n", IrpContext->InputReportBuffer); + DPRINT1("HidClass_ReadCompleteIrp InputReportBufferLength %li\n", IrpContext->InputReportBufferLength); + DPRINT1("HidClass_ReadCompleteIrp OriginalIrp %p\n", IrpContext->OriginalIrp); // // copy result @@ -403,6 +476,11 @@ RemoveEntryList(&Irp->Tail.Overlay.ListEntry); // + // is list empty + // + IsEmpty = IsListEmpty(&IrpContext->FileOp->ReadPendingIrpListHead); + + // // insert into completed list // InsertTailList(&IrpContext->FileOp->IrpCompletedListHead, &Irp->Tail.Overlay.ListEntry); @@ -416,6 +494,17 @@ // complete original request // IoCompleteRequest(IrpContext->OriginalIrp, IO_NO_INCREMENT); + + + DPRINT1("StopInProgress %x IsEmpty %x\n", IrpContext->FileOp->StopInProgress, IsEmpty); + if (IrpContext->FileOp->StopInProgress && IsEmpty) + { + // + // last pending irp + // + DPRINT1("[HIDCLASS] LastPendingTransfer Signalling\n"); + KeSetEvent(&IrpContext->FileOp->IrpReadComplete, 0, FALSE); + } // // free irp context @@ -643,6 +732,19 @@ // FIXME support polled devices // ASSERT(Context->DeviceExtension->Common.DriverExtension->DevicesArePolled == FALSE); + + if (Context->StopInProgress) + { + // + // stop in progress + // + DPRINT1("[HIDCLASS] Stop In Progress\n"); + Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_CANCELLED; + + } + // // build irp request Modified: trunk/reactos/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/preco… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/precomp.h [iso-8859-1] Tue Feb 21 01:16:56 2012 @@ -136,6 +136,16 @@ // LIST_ENTRY IrpCompletedListHead; + // + // stop in progress indicator + // + BOOLEAN StopInProgress; + + // + // read complete event + // + KEVENT IrpReadComplete; + }HIDCLASS_FILEOP_CONTEXT, *PHIDCLASS_FILEOP_CONTEXT; typedef struct Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Tue Feb 21 01:16:56 2012 @@ -1576,10 +1576,10 @@ // // free resources // - if (HidDeviceExtension->HidDescriptor) + if (HidDeviceExtension->ConfigurationDescriptor) { - ExFreePool(HidDeviceExtension->HidDescriptor); - HidDeviceExtension->HidDescriptor = NULL; + ExFreePool(HidDeviceExtension->ConfigurationDescriptor); + HidDeviceExtension->ConfigurationDescriptor = NULL; } // Modified: trunk/reactos/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.… ============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.h [iso-8859-1] Tue Feb 21 01:16:56 2012 @@ -45,6 +45,7 @@ // hid descriptor // PHID_DESCRIPTOR HidDescriptor; + }HID_USB_DEVICE_EXTENSION, *PHID_USB_DEVICE_EXTENSION; typedef struct Modified: trunk/reactos/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hub_co… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Tue Feb 21 01:16:56 2012 @@ -1012,7 +1012,6 @@ // reset port feature // Status = m_Hardware->SetPortFeature(PortId, PORT_RESET); - PC_ASSERT(Status == STATUS_SUCCESS); break; } default: Modified: trunk/reactos/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Tue Feb 21 01:16:56 2012 @@ -65,7 +65,7 @@ // constructor / destructor CUSBDevice(IUnknown *OuterUnknown){} - virtual ~CUSBDevice(){} + virtual ~CUSBDevice(); protected: LONG m_Ref; @@ -84,6 +84,73 @@ PUSB_CONFIGURATION m_ConfigurationDescriptors; }; + +CUSBDevice::~CUSBDevice() +{ + ULONG Index, InterfaceIndex, EndpointIndex; + //NTSTATUS Status; + + if (!m_ConfigurationDescriptors) + { + // + // nothing to do + // + return; + } + + + // + // clean up resources + // + for(Index = 0; Index < m_DeviceDescriptor.bNumConfigurations; Index++) + { + for(InterfaceIndex = 0; InterfaceIndex < m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) + { + // + // are there any endpoint descriptors + // + for(EndpointIndex = 0; EndpointIndex < m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints; EndpointIndex++) + { + // + // abort pipe + // + //Status = AbortPipe((PUSB_ENDPOINT_DESCRIPTOR)&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndpointIndex]); + //DPRINT1("[USBOHCI] Deleting Device Abort Pipe Status %x\n", Status); + } + + if (m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints) + { + // + // free endpoints + // + ExFreePool(m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints); + } + } + + if (m_ConfigurationDescriptors[Index].ConfigurationDescriptor->bNumInterfaces) + { + // + // free interface descriptors + // + ExFreePool(m_ConfigurationDescriptors[Index].Interfaces); + } + + if (m_ConfigurationDescriptors[Index].ConfigurationDescriptor) + { + // + // free configuration descriptor + // + ExFreePool(m_ConfigurationDescriptors[Index].ConfigurationDescriptor); + } + } + + // + // free configuration descriptor + // + ExFreePool(m_ConfigurationDescriptors); +} + + //---------------------------------------------------------------------------------------- NTSTATUS

12 years, 10 months

[jgardou] 55771: if A ASSERT B => ASSERT(B or not A)

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 21 00:46:18 2012 New Revision: 55771 URL: http://svn.reactos.org/svn/reactos?rev=55771&view=rev Log: if A ASSERT B => ASSERT(B or not A) Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Feb 21 00:46:18 2012 @@ -931,11 +931,8 @@ ASSERT(Pfn1->u3.e2.ReferenceCount != 0); if (Pfn1->u3.e2.ReferenceCount == 1) { - if(Pfn1->u3.e1.PrototypePte == 0) - { - /* In ReactOS, this path should always be hit with a deleted PFN */ - ASSERT(MI_IS_PFN_DELETED(Pfn1) == TRUE); - } + /* In ReactOS, this path should always be hit with a deleted PFN */ + ASSERT((MI_IS_PFN_DELETED(Pfn1) == TRUE) || (Pfn1->u3.e1.PrototypePte == 1)); /* Clear the last reference */ Pfn1->u3.e2.ReferenceCount = 0;

12 years, 10 months

[jgardou] 55770: [NTOSKRNL/MM] - finally, release user shared data at process address space cleanup. - release PDE pages that might not be freed at process end. - Let the caller handle PDE release ...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Feb 21 00:32:24 2012 New Revision: 55770 URL: http://svn.reactos.org/svn/reactos?rev=55770&view=rev Log: [NTOSKRNL/MM] - finally, release user shared data at process address space cleanup. - release PDE pages that might not be freed at process end. - Let the caller handle PDE release when deleting a PTE - restore Richard's ASSERT : All user PDE pages are now freed! Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/balance.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Tue Feb 21 00:32:24 2012 @@ -931,8 +931,11 @@ ASSERT(Pfn1->u3.e2.ReferenceCount != 0); if (Pfn1->u3.e2.ReferenceCount == 1) { - /* In ReactOS, this path should always be hit with a deleted PFN */ - ASSERT(MI_IS_PFN_DELETED(Pfn1) == TRUE); + if(Pfn1->u3.e1.PrototypePte == 0) + { + /* In ReactOS, this path should always be hit with a deleted PFN */ + ASSERT(MI_IS_PFN_DELETED(Pfn1) == TRUE); + } /* Clear the last reference */ Pfn1->u3.e2.ReferenceCount = 0; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Tue Feb 21 00:32:24 2012 @@ -1349,6 +1349,8 @@ /* Free the VAD memory */ ExFreePool(Vad); } + /* Delete the shared user data section */ + MiDeleteVirtualAddresses(USER_SHARED_DATA, USER_SHARED_DATA, NULL); /* Release the address space */ MmUnlockAddressSpace(&Process->Vm); @@ -1363,14 +1365,6 @@ PFN_NUMBER PageFrameIndex; //ASSERT(Process->CommitCharge == 0); - - /* Delete the shared user data section (Should be done in clean, not delete) */ - ASSERT(MmHighestUserAddress > (PVOID)USER_SHARED_DATA); - KeAttachProcess(&Process->Pcb); - //DPRINT1("Killing shared user data page no longer works -- has someone changed ARM3 in a way to make this fail now?\n"); - //MiDeleteVirtualAddresses(USER_SHARED_DATA, USER_SHARED_DATA, NULL); - //DPRINT1("Done\n"); - KeDetachProcess(); /* Acquire the PFN lock */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -1407,11 +1401,8 @@ MiDecrementShareCount(Pfn1, PageFrameIndex); MiDecrementShareCount(Pfn1, PageFrameIndex); - /* HACK: In Richard's original patch this ASSERT did work */ - //DPRINT1("Ref count: %lx %lx\n", Pfn1->u3.e2.ReferenceCount, Pfn1->u2.ShareCount); - //ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); - if(!((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress))) - DPRINT1("Ref count: %lx %lx\n", Pfn1->u3.e2.ReferenceCount, Pfn1->u2.ShareCount); + /* Page table is now dead. Bye bye... */ + ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); } else { Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Feb 21 00:32:24 2012 @@ -258,9 +258,6 @@ #if (_MI_PAGING_LEVELS == 2) } #endif - /* Drop the reference on the page table. */ - MiDecrementShareCount(MiGetPfnEntry(PFN_FROM_PTE(PointerPde)), PFN_FROM_PTE(PointerPde)); - /* Drop the share count */ MiDecrementShareCount(Pfn1, PageFrameIndex); Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Tue Feb 21 00:32:24 2012 @@ -250,6 +250,9 @@ { /* Clean up the unused PDEs */ ULONG_PTR Address; + PEPROCESS Process = PsGetCurrentProcess(); + + /* Acquire PFN lock */ KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); PMMPDE pointerPde; for(Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; @@ -260,10 +263,11 @@ { pointerPde = MiAddressToPde(Address); if(pointerPde->u.Hard.Valid) - MiDeletePte(pointerPde, MiPdeToPte(pointerPde), PsGetCurrentProcess(), NULL); + MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); ASSERT(pointerPde->u.Hard.Valid == 0); } } + /* Release lock */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } #endif Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Feb 21 00:32:24 2012 @@ -248,6 +248,10 @@ PMMPDE PdeBase; ULONG PdeOffset = MiGetPdeOffset(Address); + /* Nobody but page fault should ask for creating the PDE, + * Which imples that Process is the current one */ + ASSERT(Create == FALSE); + PdeBase = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); if (PdeBase == NULL) { @@ -256,24 +260,8 @@ PointerPde = PdeBase + PdeOffset; if (PointerPde->u.Hard.Valid == 0) { - /* Nobody but page fault should ask for creating the PDE, - * Which imples that Process is the current one */ MmDeleteHyperspaceMapping(PdeBase); - if(Create == FALSE) - return NULL; - else - { - KAPC_STATE ApcState; - PULONG ret; - /* Attach to process */ - KeStackAttachProcess(&Process->Pcb, &ApcState); - - /* Retry */ - ret = MmGetPageTableForProcess(Process, Address, TRUE); - - /* Get Back to original process */ - KeUnstackDetachProcess(&ApcState); - } + return NULL; } else { @@ -717,9 +705,10 @@ KeBugCheck(MEMORY_MANAGEMENT); } - Pt = MmGetPageTableForProcess(Process, Address, TRUE); + Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { + /* Nobody should page out an address that hasn't even been mapped */ KeBugCheck(MEMORY_MANAGEMENT); } Pte = InterlockedExchangePte(Pt, SwapEntry << 1); Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Tue Feb 21 00:32:24 2012 @@ -1066,6 +1066,37 @@ KeBugCheck(MEMORY_MANAGEMENT); } } + +#if (_MI_PAGING_LEVELS == 2) + { + KIRQL OldIrql; + PMMPDE pointerPde; + /* Attach to Process */ + KeAttachProcess(&Process->Pcb); + + /* Acquire PFN lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + for(Address = MI_LOWEST_VAD_ADDRESS; + Address < MM_HIGHEST_VAD_ADDRESS; + Address =(PVOID)((ULONG_PTR)Address + (PAGE_SIZE * PTE_COUNT))) + { + /* At this point all references should be dead */ + ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0); + pointerPde = MiAddressToPde(Address); + /* Unlike in ARM3, we don't necesarrily free the PDE page as soon as reference reaches 0, + * so we must clean up a bit when process closes */ + if(pointerPde->u.Hard.Valid) + MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); + ASSERT(pointerPde->u.Hard.Valid == 0); + } + /* Release lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Detach */ + KeDetachProcess(); + } +#endif MmUnlockAddressSpace(&Process->Vm); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Feb 21 00:32:24 2012 @@ -119,6 +119,7 @@ ULONG Offset; BOOLEAN WasDirty; BOOLEAN Private; + PEPROCESS CallingProcess; } MM_SECTION_PAGEOUT_CONTEXT; @@ -2052,10 +2053,11 @@ } #if (_MI_PAGING_LEVELS == 2) - if(Address < MmSystemRangeStart) + /* If this is for the calling process, we take care of te reference in the main function */ + if((Address < MmSystemRangeStart) && (Process != PageOutContext->CallingProcess)) { - if(Process->VmDeleted) DPRINT1("deleted!!!"); Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); } #endif @@ -2091,6 +2093,7 @@ */ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; + Context.CallingProcess = Process; Context.Offset = (ULONG)((ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset); @@ -2223,6 +2226,14 @@ } if (!Context.WasDirty && SwapEntry != 0) { +#if (_MI_PAGING_LEVELS == 2) + /* We keep the pagefile index global to the segment, not in the PTE */ + if(Address < MmSystemRangeStart) + { + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + } +#endif MmSetSavedSwapEntryPage(Page, 0); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, MAKE_SWAP_SSE(SwapEntry)); MmReleasePageMemoryConsumer(MC_USER, Page); @@ -2241,6 +2252,14 @@ } if (!Context.WasDirty || SwapEntry != 0) { +#if (_MI_PAGING_LEVELS == 2) + /* We keep the pagefile index global to the segment, not in the PTE */ + if(Address < MmSystemRangeStart) + { + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + } +#endif MmSetSavedSwapEntryPage(Page, 0); if (SwapEntry != 0) { @@ -2254,6 +2273,14 @@ } else if (!Context.Private && DirectMapped) { +#if (_MI_PAGING_LEVELS == 2) + /* Read only page, no need for a pagefile entry -> PDE-- */ + if(Address < MmSystemRangeStart) + { + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + } +#endif if (SwapEntry != 0) { DPRINT1("Found a swapentry for a non private and direct mapped page (address %x)\n", @@ -2282,6 +2309,14 @@ Address); KeBugCheck(MEMORY_MANAGEMENT); } +#if (_MI_PAGING_LEVELS == 2) + /* Non dirty, non private, non direct-mapped -> PDE-- */ + if(Address < MmSystemRangeStart) + { + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + } +#endif MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -2291,13 +2326,6 @@ { MmSetSavedSwapEntryPage(Page, 0); MmLockAddressSpace(AddressSpace); - #if (_MI_PAGING_LEVELS == 2) - /* Page table was dereferenced while deleting the RMAP */ - if(Address < MmSystemRangeStart) - { - AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - } -#endif Status = MmCreatePageFileMapping(Process, Address, SwapEntry); @@ -2325,13 +2353,6 @@ /* * For private pages restore the old mappings. */ - #if (_MI_PAGING_LEVELS == 2) - /* Page table was dereferenced while deleting the RMAP */ - if(Address < MmSystemRangeStart) - { - AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - } -#endif if (Context.Private) { Status = MmCreateVirtualMapping(Process, @@ -2382,13 +2403,6 @@ * As above: undo our actions. * FIXME: Also free the swap page. */ -#if (_MI_PAGING_LEVELS == 2) - /* Page table was dereferenced while deleting the RMAP */ - if(Address < MmSystemRangeStart) - { - AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - } -#endif MmLockAddressSpace(AddressSpace); if (Context.Private) { @@ -2440,13 +2454,6 @@ if (Context.Private) { MmLockAddressSpace(AddressSpace); - #if (_MI_PAGING_LEVELS == 2) - /* Page table was dereferenced while deleting the RMAP */ - if(Address < MmSystemRangeStart) - { - AddressSpace->VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - } -#endif Status = MmCreatePageFileMapping(Process, Address, SwapEntry); @@ -2458,6 +2465,14 @@ } else { +#if (_MI_PAGING_LEVELS == 2) + /* We keep the pagefile index global to the segment, not in the PTE */ + if(Address < MmSystemRangeStart) + { + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + } +#endif Entry = MAKE_SWAP_SSE(SwapEntry); MmSetPageEntrySectionSegment(Context.Segment, Context.Offset, Entry); }

12 years, 10 months

[khornicek] 55769: [TRANSLATION] da-da -> da-dk

by khornicek＠svn.reactos.org

Author: khornicek Date: Tue Feb 21 00:15:25 2012 New Revision: 55769 URL: http://svn.reactos.org/svn/reactos?rev=55769&view=rev Log: [TRANSLATION] da-da -> da-dk Added: trunk/reactos/base/applications/cacls/lang/da-DK.rc - copied unchanged from r55757, trunk/reactos/base/applications/cacls/lang/da-DA.rc Removed: trunk/reactos/base/applications/cacls/lang/da-DA.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc Removed: trunk/reactos/base/applications/cacls/lang/da-DA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/da-DA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/lang/da-DA.rc (removed) @@ -1,79 +1,0 @@ -/* - * Danish language file by Daniel Reimer <EmuandCo> 2006-06-15 - */ - -LANGUAGE LANG_DANISH, SUBLANG_DEFAULT - -STRINGTABLE DISCARDABLE -BEGIN - -IDS_HELP, "Ãndringer fil-ACL'er (Access Control List) eller viser dem.\n\n\ -CACLS Filenavn [/T] [/E] [/C] [/G Bruger:Adgang] [/R Bruger [...]]\n\ - [/P Bruger:Adgang [...]] [/D Bruger [...]]\n\ - Filnavn Viser ACL'er for angivet filer.\n\ - /T Ãndre ACL'er for angivene filer i mapper\n\ - og alle undermapper.\n\ - /E Bearbejde ACL i stedet for at erstatte.\n\ - /C Forandre ACL'er ved adgangfejl videre.\n\ - /G Bruger:Adgang Tillade angivene adgangsformer.\n\ - Adgang kan vÃ¦re: R lÃ¦se\n\ - W skrive\n\ - C Ã¦ndre (At skrive)\n\ - F Fuld adgang\n\ - /R Bruger Fjerne adgangsrette af brugeren (kun gyldig med /E).\n\ - /P Bruger:Adgang Erstatte adgangsretterne af brugeren.\n\ - Adgang kan vÃ¦re: N Ingen\n\ - R LÃ¦se\n\ - W Skrive\n\ - C Ã¦ndre (Skrive)\n\ - F fuld adgang\n\ - /D Bruger Forbyde adgang for brugeren.\n\ -Mellemrum(Wildcards) bliver understÃ¸ttet i filenavn.\n\ -Man kan angive flere bruger i en kommando.\n\n\ -Forkortninger:\n\ - CI - Container overtagelse.\n\ - ACE-Bidragen bliver overtaget fra mapperne.\n\ - OI - Objekt overtagelse.\n\ - ACE-Bidragen bliver overtaget fra filerne.\n\ - IO - Kun overtagelse.\n\ - ACE'ens egenskab passer ikke sammen med\n\ - de aktuelle filer/mapper.\n" - -IDS_ABBR_CI, "(CI)" -IDS_ABBR_OI, "(OI)" -IDS_ABBR_IO, "(IO)" -IDS_ABBR_FULL, "F" -IDS_ABBR_READ, "R" -IDS_ABBR_WRITE, "W" -IDS_ABBR_CHANGE, "C" -IDS_ABBR_NONE, "N" -IDS_ALLOW, "" -IDS_DENY, "(DENY)" -IDS_SPECIAL_ACCESS, "(special access:)" -IDS_GENERIC_READ, "GENERIC_READ" -IDS_GENERIC_WRITE, "GENERIC_WRITE" -IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" -IDS_GENERIC_ALL, "GENERIC_ALL" -IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" -IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" -IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" -IDS_FILE_READ_DATA, "FILE_READ_DATA" -IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" -IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" -IDS_FILE_READ_EA, "FILE_READ_EA" -IDS_FILE_WRITE_EA, "FILE_WRITE_EA" -IDS_FILE_EXECUTE, "FILE_EXECUTE" -IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" -IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" -IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" -IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" -IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" -IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" -IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" -IDS_SYNCHRONIZE, "SYNCHRONIZE" -IDS_WRITE_OWNER, "WRITE_OWNER" -IDS_WRITE_DAC, "WRITE_DAC" -IDS_READ_CONTROL, "READ_CONTROL" -IDS_DELETE, "DELETE" -IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" -END Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc [iso-8859-1] Tue Feb 21 00:15:25 2012 @@ -3,7 +3,7 @@ #include "lang/bg-BG.rc" #include "lang/ca-ES.rc" #include "lang/cs-CZ.rc" -#include "lang/da-DA.rc" +#include "lang/da-DK.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" #include "lang/en-US.rc"

12 years, 10 months

← Newer
1
...
14
15
16
17
18
19
20
...
58
Older →

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 2012