Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 55022: [NETSHELL] - Rewrite in C++ to improve readability
by rharabien＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: rharabien Date: Fri Jan 20 21:50:54 2012 New Revision: 55022 URL: http://svn.reactos.org/svn/reactos?rev=55022&view=rev Log: [NETSHELL] - Rewrite in C++ to improve readability Added: trunk/reactos/dll/win32/netshell/classfactory.cpp - copied, changed from r54998, trunk/reactos/dll/win32/netshell/classfactory.c trunk/reactos/dll/win32/netshell/connectmanager.cpp - copied, changed from r54998, trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/enumlist.cpp - copied, changed from r54998, trunk/reactos/dll/win32/netshell/enumlist.c trunk/reactos/dll/win32/netshell/lanconnectui.cpp - copied, changed from r54998, trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/lanstatusui.cpp - copied, changed from r54998, trunk/reactos/dll/win32/netshell/lanstatusui.c trunk/reactos/dll/win32/netshell/netshell.cpp - copied, changed from r54998, trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp - copied, changed from r54998, trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Removed: trunk/reactos/dll/win32/netshell/classfactory.c trunk/reactos/dll/win32/netshell/connectmanager.c trunk/reactos/dll/win32/netshell/enumlist.c trunk/reactos/dll/win32/netshell/lanconnectui.c trunk/reactos/dll/win32/netshell/lanstatusui.c trunk/reactos/dll/win32/netshell/netshell.c trunk/reactos/dll/win32/netshell/shfldr_netconnect.c Modified: trunk/reactos/dll/win32/netshell/CMakeLists.txt trunk/reactos/dll/win32/netshell/precomp.h trunk/reactos/include/psdk/netcon.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/CMakeLi… Removed: trunk/reactos/dll/win32/netshell/classfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/classfa… Copied: trunk/reactos/dll/win32/netshell/classfactory.cpp (from r54998, trunk/reactos/dll/win32/netshell/classfactory.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/classfa… Removed: trunk/reactos/dll/win32/netshell/connectmanager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… Copied: trunk/reactos/dll/win32/netshell/connectmanager.cpp (from r54998, trunk/reactos/dll/win32/netshell/connectmanager.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/connect… Removed: trunk/reactos/dll/win32/netshell/enumlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… Copied: trunk/reactos/dll/win32/netshell/enumlist.cpp (from r54998, trunk/reactos/dll/win32/netshell/enumlist.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/enumlis… Removed: trunk/reactos/dll/win32/netshell/lanconnectui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… Copied: trunk/reactos/dll/win32/netshell/lanconnectui.cpp (from r54998, trunk/reactos/dll/win32/netshell/lanconnectui.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanconn… Removed: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… Copied: trunk/reactos/dll/win32/netshell/lanstatusui.cpp (from r54998, trunk/reactos/dll/win32/netshell/lanstatusui.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… Removed: trunk/reactos/dll/win32/netshell/netshell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… Copied: trunk/reactos/dll/win32/netshell/netshell.cpp (from r54998, trunk/reactos/dll/win32/netshell/netshell.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/netshel… Modified: trunk/reactos/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/precomp… Removed: trunk/reactos/dll/win32/netshell/shfldr_netconnect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… Copied: trunk/reactos/dll/win32/netshell/shfldr_netconnect.cpp (from r54998, trunk/reactos/dll/win32/netshell/shfldr_netconnect.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/shfldr_… Modified: trunk/reactos/include/psdk/netcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=…

1 0

[cgutman] 55021: [USB-BRINGUP-TRUNK] - Remove outdated cmake attribute
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 21:28:33 2012 New Revision: 55021 URL: http://svn.reactos.org/svn/reactos?rev=55021&view=rev Log: [USB-BRINGUP-TRUNK] - Remove outdated cmake attribute Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -17,5 +17,4 @@ add_importlibs(hidclass ntoskrnl hidparse hal) -add_cab_target(hidclass 2) add_importlib_target(hidclass.spec) Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -11,9 +11,6 @@ set_module_type(hidparse kernelmodedriver) add_importlibs(hidparse ntoskrnl) -add_cab_target(hidparse 2) - -add_cab_target(hidparse 2) add_importlib_target(hidparse.spec) target_link_libraries(hidparse hidparser) Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -6,6 +6,4 @@ add_library(hidusb SHARED ${SOURCE}) set_module_type(hidusb kernelmodedriver) -add_importlibs(hidusb hidclass ntoskrnl usbd hal) - -add_cab_target(hidusb 2) +add_importlibs(hidusb hidclass ntoskrnl usbd hal) Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -7,7 +7,3 @@ set_module_type(kbdhid kernelmodedriver) add_importlibs(kbdhid ntoskrnl hal hidparse) -add_cab_target(kbdhid 2) - -add_cab_target(kbdhid 2) - Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -7,7 +7,4 @@ set_module_type(mouhid kernelmodedriver) add_importlibs(mouhid ntoskrnl hal hidparse) -add_cab_target(mouhid 2) -add_cab_target(mouhid 2) - Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -17,5 +17,3 @@ set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal) - -add_cab_target(usbehci 2) Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -30,6 +30,4 @@ endif(MSVC) set_module_type(usbehci kernelmodedriver) -add_importlibs(usbehci ntoskrnl ks drmk hal) - -add_cab_target(usbehci 2) +add_importlibs(usbehci ntoskrnl ks drmk hal) Modified: branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -11,5 +11,3 @@ set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal usbd) - -add_cab_target(usbhub 2) Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -9,4 +9,3 @@ set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal usbd) -add_cab_target(usbhub 2) Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -30,6 +30,4 @@ endif(MSVC) set_module_type(usbohci kernelmodedriver) -add_importlibs(usbohci ntoskrnl ks drmk hal usbd) - -add_cab_target(usbohci 2) +add_importlibs(usbohci ntoskrnl ks drmk hal usbd) Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Fri Jan 20 21:28:33 2012 @@ -7,4 +7,3 @@ set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) -add_cab_target(usbstor 2)

1 0

[cgutman] 55020: [USB-BRINGUP-TRUNK] - Merge 54115-54859
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 21:19:37 2012 New Revision: 55020 URL: http://svn.reactos.org/svn/reactos?rev=55020&view=rev Log: [USB-BRINGUP-TRUNK] - Merge 54115-54859 Added: branches/usb-bringup-trunk/drivers/hid/ (props changed) - copied from r54753, branches/usb-bringup/drivers/hid/ branches/usb-bringup-trunk/drivers/hid/CMakeLists.txt - copied, changed from r54757, branches/usb-bringup/drivers/hid/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidclass/ (props changed) - copied from r54759, branches/usb-bringup/drivers/hid/hidclass/ branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c - copied, changed from r54787, branches/usb-bringup/drivers/hid/hidclass/fdo.c branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c - copied, changed from r54791, branches/usb-bringup/drivers/hid/hidclass/pdo.c branches/usb-bringup-trunk/drivers/hid/hidparse/ (props changed) - copied from r54756, branches/usb-bringup/drivers/hid/hidparse/ branches/usb-bringup-trunk/drivers/hid/hidusb/ (props changed) - copied from r54754, branches/usb-bringup/drivers/hid/hidusb/ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.rc - copied unchanged from r54759, branches/usb-bringup/drivers/hid/hidusb/hidusb.rc branches/usb-bringup-trunk/drivers/hid/kbdhid/ (props changed) - copied from r54850, branches/usb-bringup/drivers/hid/kbdhid/ branches/usb-bringup-trunk/drivers/hid/mouhid/ (props changed) - copied from r54762, branches/usb-bringup/drivers/hid/mouhid/ branches/usb-bringup-trunk/lib/drivers/hidparser/ (props changed) - copied from r54834, branches/usb-bringup/lib/drivers/hidparser/ branches/usb-bringup-trunk/media/inf/input.inf - copied, changed from r54838, branches/usb-bringup/media/inf/input.inf Removed: branches/usb-bringup-trunk/drivers/usb/hidparse/ branches/usb-bringup-trunk/drivers/usb/hidusb/ Modified: branches/usb-bringup-trunk/ (props changed) branches/usb-bringup-trunk/drivers/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c branches/usb-bringup-trunk/drivers/hid/hidclass/precomp.h branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rc branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbohci/ (props changed) branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp branches/usb-bringup-trunk/include/ddk/hidclass.h branches/usb-bringup-trunk/include/ddk/hidpddi.h branches/usb-bringup-trunk/include/ddk/hidport.h branches/usb-bringup-trunk/include/psdk/hidusage.h branches/usb-bringup-trunk/lib/drivers/CMakeLists.txt branches/usb-bringup-trunk/lib/drivers/hidparser/api.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h branches/usb-bringup-trunk/media/inf/CMakeLists.txt branches/usb-bringup-trunk/media/inf/msmouse.inf branches/usb-bringup-trunk/media/inf/syssetup.inf.tpl branches/usb-bringup-trunk/ntoskrnl/ob/obname.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/usb-bringup-trunk/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/CMake… Copied: branches/usb-bringup-trunk/drivers/hid/CMakeLists.txt (from r54757, branches/usb-bringup/drivers/hid/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/C… Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Copied: branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c (from r54787, branches/usb-bringup/drivers/hid/hidclass/fdo.c) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Copied: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c (from r54791, branches/usb-bringup/drivers/hid/hidclass/pdo.c) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidparse/hidparse.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/C… Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/h… Modified: branches/usb-bringup-trunk/include/ddk/hidpddi.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/h… Modified: branches/usb-bringup-trunk/include/ddk/hidport.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/ddk/h… Modified: branches/usb-bringup-trunk/include/psdk/hidusage.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/… Modified: branches/usb-bringup-trunk/lib/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/C… Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… Modified: branches/usb-bringup-trunk/lib/drivers/hidparser/parser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/lib/drivers/h… Modified: branches/usb-bringup-trunk/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/CMa… Copied: branches/usb-bringup-trunk/media/inf/input.inf (from r54838, branches/usb-bringup/media/inf/input.inf) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/inp… Modified: branches/usb-bringup-trunk/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/msm… Modified: branches/usb-bringup-trunk/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/sys… Modified: branches/usb-bringup-trunk/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/ob/o…

1 0

[cgutman] 55019: [USB-BRINGUP-TRUNK] - Merge 51335-53500
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 21:07:56 2012 New Revision: 55019 URL: http://svn.reactos.org/svn/reactos?rev=55019&view=rev Log: [USB-BRINGUP-TRUNK] - Merge 51335-53500 Added: branches/usb-bringup-trunk/drivers/usb/hidparse/ (props changed) - copied from r54388, branches/usb-bringup/drivers/usb/hidparse/ branches/usb-bringup-trunk/drivers/usb/hidusb/ (props changed) - copied from r54388, branches/usb-bringup/drivers/usb/hidusb/ branches/usb-bringup-trunk/drivers/usb/usbehci_new/ (props changed) - copied from r51335, branches/usb-bringup/drivers/usb/usbehci_new/ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h - copied, changed from r51365, branches/usb-bringup/drivers/usb/usbehci_new/hardware.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp - copied, changed from r51355, branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp - copied, changed from r51369, branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/misc.cpp - copied, changed from r51343, branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/purecall.cpp - copied unchanged from r51348, branches/usb-bringup/drivers/usb/usbehci_new/purecall.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp - copied, changed from r51372, branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp branches/usb-bringup-trunk/drivers/usb/usbhub_new/ - copied from r54388, branches/usb-bringup/drivers/usb/usbhub_new/ branches/usb-bringup-trunk/drivers/usb/usbohci/ (props changed) - copied from r54388, branches/usb-bringup/drivers/usb/usbohci/ branches/usb-bringup-trunk/drivers/usb/usbstor/descriptor.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/descriptor.c branches/usb-bringup-trunk/drivers/usb/usbstor/disk.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup-trunk/drivers/usb/usbstor/error.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/error.c branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/fdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/misc.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/misc.c branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/pdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/queue.c branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c - copied unchanged from r54388, branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup-trunk/include/ddk/hidpddi.h - copied unchanged from r54388, branches/usb-bringup/include/ddk/hidpddi.h branches/usb-bringup-trunk/include/ddk/hidport.h - copied unchanged from r54388, branches/usb-bringup/include/ddk/hidport.h Modified: branches/usb-bringup-trunk/ (props changed) branches/usb-bringup-trunk/dll/win32/hid/hid.c branches/usb-bringup-trunk/dll/win32/hid/stubs.c branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/usb-bringup-trunk/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/dll/win32/hid… Modified: branches/usb-bringup-trunk/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/dll/win32/hid… Modified: branches/usb-bringup-trunk/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/C… Modified: branches/usb-bringup-trunk/drivers/usb/usbd/usbd.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h (from r51365, branches/usb-bringup/drivers/usb/usbehci_new/hardware.h) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp (from r51355, branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/memory_manager.cpp (from r51369, branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/misc.cpp (from r51343, branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Copied: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp (from r51372, branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp) URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u…

1 0

[cgutman] 55018: [USB-BRINGUP-TRUNK] - Create a branch to do a proper merge of USB work from a trunk base instead of from cmake-bringup - In the future, DO NOT under any circumstances branch anothe...
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 20:58:46 2012 New Revision: 55018 URL: http://svn.reactos.org/svn/reactos?rev=55018&view=rev Log: [USB-BRINGUP-TRUNK] - Create a branch to do a proper merge of USB work from a trunk base instead of from cmake-bringup - In the future, DO NOT under any circumstances branch another branch. This leads to merge problems! Added: branches/usb-bringup-trunk/ (props changed) - copied from r55017, trunk/reactos/ Propchange: branches/usb-bringup-trunk/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jan 20 20:58:46 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup-trunk/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup-trunk/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup-trunk/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jan 20 20:58:46 2012 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/usb-bringup-trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri Jan 20 20:58:46 2012 @@ -1,0 +1,13 @@ +/branches/GSoC_2011/GSoC_Network:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver:51550 +/branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 +/branches/GSoC_Network:51545-51546 +/branches/cmake-bringup:50484,50693,50719,51544-52564 +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652,53661,53700 +/branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 +/branches/wlan-bringup:54809-54998 Propchange: branches/usb-bringup-trunk/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[pschweitzer] 55017: [RTL] - Reimplement RtlSetCurrentDirectory_U. This fixes bugs & implements references count - Fix the FIXME in RtlpDosPathNameToRelativeNtPathName_Ustr by incrementing referenc...
by pschweitzer＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: pschweitzer Date: Fri Jan 20 20:21:16 2012 New Revision: 55017 URL: http://svn.reactos.org/svn/reactos?rev=55017&view=rev Log: [RTL] - Reimplement RtlSetCurrentDirectory_U. This fixes bugs & implements references count - Fix the FIXME in RtlpDosPathNameToRelativeNtPathName_Ustr by incrementing references count Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=55017&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Fri Jan 20 20:21:16 2012 @@ -6,6 +6,8 @@ * PROGRAMMERS: Wine team * Thomas Weidenmueller * Gunnar Dalsnes + * Alex Ionescu (alex.ionescu(a)reactos.org) + * Pierre Schweitzer (pierre(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -20,6 +22,11 @@ #define MAX_PFX_SIZE 16 #define IS_PATH_SEPARATOR(x) (((x)==L'\\')||((x)==L'/')) + +#define RTL_CURDIR_IS_REMOVABLE 0x1 +#define RTL_CURDIR_DROP_OLD_HANDLE 0x2 +#define RTL_CURDIR_ALL_FLAGS (RTL_CURDIR_DROP_OLD_HANDLE | RTL_CURDIR_IS_REMOVABLE) // 0x3 +C_ASSERT(RTL_CURDIR_ALL_FLAGS == OBJ_HANDLE_TAGBITS); /* GLOBALS ********************************************************************/ @@ -617,7 +624,7 @@ if (InputPathType == RtlPathTypeRelative) { /* Get current directory */ - CurrentDirectory = (PCURDIR)&(NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath); + CurrentDirectory = &(NtCurrentPeb()->ProcessParameters->CurrentDirectory); if (CurrentDirectory->Handle) { Status = RtlInitUnicodeStringEx(&FullPath, Buffer); @@ -660,7 +667,7 @@ RelativeName->CurDirRef = RtlpCurDirRef; if (RelativeName->CurDirRef) { - /* FIXME: Increment reference count */ + InterlockedIncrement(&RtlpCurDirRef->RefCount); } RelativeName->ContainingDirectory = CurrentDirectory->Handle; @@ -831,8 +838,13 @@ /* Check if a directory reference was grabbed */ if (RelativeName->CurDirRef) { - /* FIXME: Not yet supported */ - UNIMPLEMENTED; + /* Decrease reference count */ + if (!InterlockedDecrement(&RelativeName->CurDirRef->RefCount)) + { + /* If no one uses it any longer, close handle & free */ + NtClose(RelativeName->CurDirRef->Handle); + RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeName->CurDirRef); + } RelativeName->CurDirRef = NULL; } } @@ -984,89 +996,201 @@ /* * @implemented */ -NTSTATUS NTAPI -RtlSetCurrentDirectory_U(PUNICODE_STRING dir) -{ - UNICODE_STRING full; - FILE_FS_DEVICE_INFORMATION device_info; - OBJECT_ATTRIBUTES Attr; - IO_STATUS_BLOCK iosb; - PCURDIR cd; - NTSTATUS Status; - USHORT size; - HANDLE handle = NULL; - PWSTR ptr; - - DPRINT("RtlSetCurrentDirectory %wZ\n", dir); - - full.Buffer = NULL; - - RtlAcquirePebLock (); - - cd = (PCURDIR)&NtCurrentPeb ()->ProcessParameters->CurrentDirectory.DosPath; - - if (!RtlDosPathNameToNtPathName_U (dir->Buffer, &full, 0, 0)) - { - RtlReleasePebLock (); - return STATUS_OBJECT_NAME_INVALID; - } - - DPRINT("RtlSetCurrentDirectory: full %wZ\n",&full); - - InitializeObjectAttributes (&Attr, - &full, - OBJ_CASE_INSENSITIVE | OBJ_INHERIT, - NULL, - NULL); - - Status = ZwOpenFile (&handle, - SYNCHRONIZE | FILE_TRAVERSE, - &Attr, - &iosb, - FILE_SHARE_READ | FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); - - if (!NT_SUCCESS(Status)) - { - RtlFreeUnicodeString( &full); - RtlReleasePebLock (); - return Status; - } - - /* don't keep the directory handle open on removable media */ - if (NT_SUCCESS(ZwQueryVolumeInformationFile( handle, &iosb, &device_info, - sizeof(device_info), FileFsDeviceInformation )) && - (device_info.Characteristics & FILE_REMOVABLE_MEDIA)) - { - DPRINT1("don't keep the directory handle open on removable media\n"); - ZwClose( handle ); - handle = 0; - } - - if (cd->Handle) - ZwClose(cd->Handle); - cd->Handle = handle; - - /* append trailing \ if missing */ - size = full.Length / sizeof(WCHAR); - ptr = full.Buffer; - ptr += 4; /* skip \??\ prefix */ - size -= 4; - - /* This is ok because RtlDosPathNameToNtPathName_U returns a nullterminated string. - * So the nullterm is replaced with \ - * -Gunnar - */ - if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; - - memcpy( cd->DosPath.Buffer, ptr, size * sizeof(WCHAR)); - cd->DosPath.Buffer[size] = 0; - cd->DosPath.Length = size * sizeof(WCHAR); - - RtlFreeUnicodeString( &full); - RtlReleasePebLock(); - - return STATUS_SUCCESS; +NTSTATUS +NTAPI +RtlSetCurrentDirectory_U(IN PUNICODE_STRING Path) +{ + PCURDIR CurDir; + NTSTATUS Status; + RTL_PATH_TYPE PathType; + IO_STATUS_BLOCK IoStatusBlock; + UNICODE_STRING FullPath, NtName; + PRTLP_CURDIR_REF OldCurDir = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + FILE_FS_DEVICE_INFORMATION FileFsDeviceInfo; + ULONG SavedLength, CharLength, FullPathLength; + HANDLE OldHandle = 0, CurDirHandle, OldCurDirHandle = 0; + + DPRINT("RtlSetCurrentDirectory_U %wZ\n", Path); + + /* Can't set current directory on DOS device */ + if (RtlIsDosDeviceName_Ustr(Path)) + { + return STATUS_NOT_A_DIRECTORY; + } + + /* Get current directory */ + RtlAcquirePebLock(); + CurDir = &NtCurrentPeb()->ProcessParameters->CurrentDirectory; + + /* Check if we have to drop current handle */ + if (((ULONG_PTR)(CurDir->Handle) & RTL_CURDIR_ALL_FLAGS) == RTL_CURDIR_DROP_OLD_HANDLE) + { + OldHandle = CurDir->Handle; + CurDir->Handle = NULL; + } + + /* Allocate a buffer for full path (using max possible length */ + FullPath.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, CurDir->DosPath.MaximumLength); + if (!FullPath.Buffer) + { + Status = STATUS_NO_MEMORY; + goto Leave; + } + + /* Init string */ + FullPath.Length = 0; + FullPath.MaximumLength = CurDir->DosPath.MaximumLength; + + /* Get new directory full path */ + FullPathLength = RtlGetFullPathName_Ustr(Path, FullPath.MaximumLength, FullPath.Buffer, NULL, NULL, &PathType); + if (!FullPathLength) + { + Status = STATUS_OBJECT_NAME_INVALID; + goto Leave; + } + + SavedLength = FullPath.MaximumLength; + CharLength = FullPathLength / sizeof(WCHAR); + + if (FullPathLength > FullPath.MaximumLength) + { + Status = STATUS_NAME_TOO_LONG; + goto Leave; + } + + /* Translate it to NT name */ + if (!RtlDosPathNameToNtPathName_U(FullPath.Buffer, &NtName, NULL, NULL)) + { + Status = STATUS_OBJECT_NAME_INVALID; + goto Leave; + } + + InitializeObjectAttributes(&ObjectAttributes, &NtName, + OBJ_CASE_INSENSITIVE | OBJ_INHERIT, + NULL, NULL); + + /* If previous current directory was removable, then check it for dropping */ + if (((ULONG_PTR)(CurDir->Handle) & RTL_CURDIR_ALL_FLAGS) == RTL_CURDIR_ALL_FLAGS) + { + /* Get back normal handle */ + CurDirHandle = (HANDLE)((ULONG_PTR)(CurDir->Handle) & ~RTL_CURDIR_ALL_FLAGS); + CurDir->Handle = 0; + + /* Get device information */ + Status = NtQueryVolumeInformationFile(CurDirHandle, + &IoStatusBlock, + &FileFsDeviceInfo, + sizeof(FileFsDeviceInfo), + FileFsDeviceInformation); + /* Retry without taking care of removable device */ + if (!NT_SUCCESS(Status)) + { + Status = RtlSetCurrentDirectory_U(Path); + goto Leave; + } + } + else + { + /* Open directory */ + Status = NtOpenFile(&CurDirHandle, + SYNCHRONIZE | FILE_TRAVERSE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) goto Leave; + + /* Get device information */ + Status = NtQueryVolumeInformationFile(CurDirHandle, + &IoStatusBlock, + &FileFsDeviceInfo, + sizeof(FileFsDeviceInfo), + FileFsDeviceInformation); + if (!NT_SUCCESS(Status)) goto Leave; + } + + /* If device is removable, mark handle */ + if (FileFsDeviceInfo.Characteristics & FILE_REMOVABLE_MEDIA) + { + CurDirHandle = (HANDLE)((ULONG_PTR)CurDirHandle | RTL_CURDIR_IS_REMOVABLE); + } + + FullPath.Length = FullPathLength; + + /* If full path isn't \ terminated, do it */ + if (FullPath.Buffer[CharLength - 1] != L'\\') + { + if ((CharLength + 1) * sizeof(WCHAR) > SavedLength) + { + Status = STATUS_NAME_TOO_LONG; + goto Leave; + } + + FullPath.Buffer[CharLength] = L'\\'; + FullPath.Buffer[CharLength + 1] = UNICODE_NULL; + FullPath.Length += sizeof(WCHAR); + } + + /* If we have previous current directory with only us as reference, save it */ + if (RtlpCurDirRef != NULL && RtlpCurDirRef->RefCount == 1) + { + OldCurDirHandle = RtlpCurDirRef->Handle; + } + else + { + /* Allocate new current directory struct saving previous one */ + OldCurDir = RtlpCurDirRef; + RtlpCurDirRef = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(RTLP_CURDIR_REF)); + if (!RtlpCurDirRef) + { + RtlpCurDirRef = OldCurDir; + OldCurDir = NULL; + Status = STATUS_NO_MEMORY; + goto Leave; + } + + /* Set reference to 1 (us) */ + RtlpCurDirRef->RefCount = 1; + } + + /* Save new data */ + CurDir->Handle = CurDirHandle; + RtlpCurDirRef->Handle = CurDirHandle; + CurDirHandle = 0; + + /* Copy full path */ + RtlCopyMemory(CurDir->DosPath.Buffer, FullPath.Buffer, FullPath.Length + sizeof(WCHAR)); + CurDir->DosPath.Length = FullPath.Length; + + Status = STATUS_SUCCESS; + +Leave: + RtlReleasePebLock(); + + if (FullPath.Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, FullPath.Buffer); + } + + if (NtName.Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtName.Buffer); + } + + if (CurDirHandle) NtClose(CurDirHandle); + + if (OldHandle) NtClose(OldHandle); + + if (OldCurDirHandle) NtClose(OldCurDirHandle); + + if (OldCurDir && InterlockedDecrement(&OldCurDir->RefCount) == 0) + { + NtClose(OldCurDir->Handle); + RtlFreeHeap(RtlGetProcessHeap(), 0, OldCurDir); + } + + return Status; }

1 0

[pschweitzer] 55016: [NDK] Properly define RTLP_CURDIR_REF
by pschweitzer＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: pschweitzer Date: Fri Jan 20 20:18:31 2012 New Revision: 55016 URL: http://svn.reactos.org/svn/reactos?rev=55016&view=rev Log: [NDK] Properly define RTLP_CURDIR_REF Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Fri Jan 20 20:18:31 2012 @@ -1080,7 +1080,12 @@ HANDLE Handle; } CURDIR, *PCURDIR; -typedef struct _RTLP_CURDIR_REF *PRTLP_CURDIR_REF; +typedef struct _RTLP_CURDIR_REF +{ + LONG RefCount; + HANDLE Handle; +} RTLP_CURDIR_REF, *PRTLP_CURDIR_REF; + typedef struct _RTL_RELATIVE_NAME_U { UNICODE_STRING RelativeName;

1 0

[tfaber] 55015: [HAL] - Do not truncate PCI device names in debug dump; misc fixes [PCI] - Get rid of some magic numbers
by tfaber＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: tfaber Date: Fri Jan 20 19:53:00 2012 New Revision: 55015 URL: http://svn.reactos.org/svn/reactos?rev=55015&view=rev Log: [HAL] - Do not truncate PCI device names in debug dump; misc fixes [PCI] - Get rid of some magic numbers Modified: trunk/reactos/drivers/bus/pci/pdo.c trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Fri Jan 20 19:53:00 2012 @@ -214,7 +214,9 @@ return FALSE; } - BaseValue = (OrigValue & 0x00000001) ? (OrigValue & ~0x3) : (OrigValue & ~0xF); + BaseValue = (OrigValue & PCI_ADDRESS_IO_SPACE) + ? (OrigValue & PCI_ADDRESS_IO_ADDRESS_MASK) + : (OrigValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK); *Base = BaseValue; @@ -267,33 +269,35 @@ return TRUE; } - XLength = ~((NewValue & 0x00000001) ? (NewValue & ~0x3) : (NewValue & ~0xF)) + 1; + XLength = ~((NewValue & PCI_ADDRESS_IO_SPACE) + ? (NewValue & PCI_ADDRESS_IO_ADDRESS_MASK) + : (NewValue & PCI_ADDRESS_MEMORY_ADDRESS_MASK)) + 1; #if 0 DbgPrint("BaseAddress 0x%08lx Length 0x%08lx", BaseValue, XLength); - if (NewValue & 0x00000001) + if (NewValue & PCI_ADDRESS_IO_SPACE) { DbgPrint(" IO range"); } else { DbgPrint(" Memory range"); - if ((NewValue & 0x00000006) == 0) + if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 0) { DbgPrint(" in 32-Bit address space"); } - else if ((NewValue & 0x00000006) == 2) + else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 2) { DbgPrint(" below 1BM "); } - else if ((NewValue & 0x00000006) == 4) + else if ((NewValue & PCI_ADDRESS_MEMORY_TYPE_MASK) == 4) { DbgPrint(" in 64-Bit address space"); } - if (NewValue & 0x00000008) + if (NewValue & PCI_ADDRESS_MEMORY_PREFETCHABLE) { DbgPrint(" prefetchable"); } @@ -303,7 +307,9 @@ #endif *Length = XLength; - *Flags = (NewValue & 0x00000001) ? (NewValue & 0x3) : (NewValue & 0xF); + *Flags = (NewValue & PCI_ADDRESS_IO_SPACE) + ? (NewValue & ~PCI_ADDRESS_IO_ADDRESS_MASK) + : (NewValue & ~PCI_ADDRESS_MEMORY_ADDRESS_MASK); return TRUE; } Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Fri Jan 20 19:53:00 2012 @@ -29,7 +29,7 @@ IN ULONG BusSpecificData) { PBUS_HANDLER Bus; - + /* Register the bus handler */ HalRegisterBusHandler(InterfaceType, BusDataType, @@ -40,7 +40,7 @@ NULL, &Bus); if (!Bus) return NULL; - + /* Check for a valid interface */ if (InterfaceType != InterfaceTypeUndefined) { @@ -49,7 +49,7 @@ sizeof(SUPPORTED_RANGES), ' laH'); RtlZeroMemory(Bus->BusAddresses, sizeof(SUPPORTED_RANGES)); - + /* Build the data structure */ Bus->BusAddresses->Version = HAL_SUPPORTED_RANGE_VERSION; Bus->BusAddresses->Dma.Limit = 7; @@ -58,7 +58,7 @@ Bus->BusAddresses->IO.SystemAddressSpace = 1; Bus->BusAddresses->PrefetchMemory.Base = 1; } - + /* Return the bus address */ return Bus; } @@ -69,13 +69,13 @@ HalpRegisterInternalBusHandlers(VOID) { PBUS_HANDLER Bus; - + /* Only do processor 1 */ if (KeGetCurrentPrcb()->Number) return; - + /* Register root support */ HalpInitBusHandler(); - + /* Allocate the system bus */ Bus = HalpAllocateBusHandler(Internal, ConfigurationSpaceUndefined, @@ -87,9 +87,9 @@ { /* Set it up */ Bus->GetInterruptVector = HalpGetSystemInterruptVector; - Bus->TranslateBusAddress = HalpTranslateSystemBusAddress; - } - + Bus->TranslateBusAddress = HalpTranslateSystemBusAddress; + } + /* Allocate the CMOS bus */ Bus = HalpAllocateBusHandler(InterfaceTypeUndefined, Cmos, @@ -103,7 +103,7 @@ Bus->GetBusData = HalpcGetCmosData; Bus->SetBusData = HalpcSetCmosData; } - + /* Allocate the CMOS bus */ Bus = HalpAllocateBusHandler(InterfaceTypeUndefined, Cmos, @@ -147,7 +147,7 @@ UNICODE_STRING KeyString; ULONG Data = OverrideEnable; HANDLE KeyHandle, Handle; - + /* Open CCS key */ RtlInitUnicodeString(&KeyString, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); @@ -161,27 +161,27 @@ &KeyString, KEY_ALL_ACCESS, TRUE); - + /* Close root key */ ZwClose(Handle); - + /* Check if PNP BIOS key exists */ if (NT_SUCCESS(Status)) { /* Set the override value */ - RtlInitUnicodeString(&KeyString, L"FullDecodeChipsetOverride"); + RtlInitUnicodeString(&KeyString, L"FullDecodeChipsetOverride"); Status = ZwSetValueKey(KeyHandle, &KeyString, 0, REG_DWORD, &Data, sizeof(Data)); - + /* Close subkey */ ZwClose(KeyHandle); } } - + /* Return status */ return Status; } @@ -195,7 +195,7 @@ { PBUS_HANDLER Bus; PPCIPBUSDATA BusData; - + /* Allocate the bus handler */ Bus = HalpAllocateBusHandler(PCIBus, PCIConfiguration, @@ -203,7 +203,7 @@ Internal, 0, sizeof(PCIPBUSDATA)); - + /* Set it up */ Bus->GetBusData = (PGETSETBUSDATA)HalpGetPCIData; Bus->SetBusData = (PGETSETBUSDATA)HalpSetPCIData; @@ -211,10 +211,10 @@ Bus->AdjustResourceList = (PADJUSTRESOURCELIST)HalpAdjustPCIResourceList; Bus->AssignSlotResources = (PASSIGNSLOTRESOURCES)HalpAssignPCISlotResources; Bus->BusAddresses->Dma.Limit = 0; - + /* Get our custom bus data */ BusData = (PPCIPBUSDATA)Bus->BusData; - + /* Setup custom bus data */ BusData->CommonData.Tag = PCI_DATA_TAG; BusData->CommonData.Version = PCI_DATA_VERSION; @@ -224,45 +224,45 @@ BusData->CommonData.Line2Pin = (PciLine2Pin)HalpPCIISALine2Pin; BusData->MaxDevice = PCI_MAX_DEVICES; BusData->GetIrqRange = (PciIrqRange)HalpGetISAFixedPCIIrq; - + /* Initialize the bitmap */ RtlInitializeBitMap(&BusData->DeviceConfigured, BusData->ConfiguredBits, 256); - + /* Check the type of PCI bus */ switch (PciType) { /* Type 1 PCI Bus */ case 1: - + /* Copy the Type 1 handler data */ RtlCopyMemory(&PCIConfigHandler, &PCIConfigHandlerType1, sizeof(PCIConfigHandler)); - + /* Set correct I/O Ports */ BusData->Config.Type1.Address = PCI_TYPE1_ADDRESS_PORT; BusData->Config.Type1.Data = PCI_TYPE1_DATA_PORT; break; - + /* Type 2 PCI Bus */ case 2: - + /* Copy the Type 1 handler data */ RtlCopyMemory(&PCIConfigHandler, &PCIConfigHandlerType2, sizeof (PCIConfigHandler)); - + /* Set correct I/O Ports */ BusData->Config.Type2.CSE = PCI_TYPE2_CSE_PORT; BusData->Config.Type2.Forward = PCI_TYPE2_FORWARD_PORT; BusData->Config.Type2.Base = PCI_TYPE2_ADDRESS_BASE; - + /* Only 16 devices supported, not 32 */ BusData->MaxDevice = 16; break; - + default: - + /* Invalid type */ DbgPrint("HAL: Unnkown PCI type\n"); } @@ -281,10 +281,10 @@ PPCI_COMMON_CONFIG PciHeader = (PVOID)DataBuffer; ULONG i; ULONG_PTR Address; - + /* Read the PCI header */ HalpReadPCIConfig(BusHandler, Slot, PciHeader, 0, PCI_COMMON_HDR_LENGTH); - + /* Make sure it's a valid device */ if ((PciHeader->VendorID == PCI_INVALID_VENDORID) || (PCI_CONFIGURATION_TYPE(PciHeader) != PCI_DEVICE_TYPE)) @@ -292,7 +292,7 @@ /* Bail out */ return FALSE; } - + /* Make sure interrupt numbers make sense */ if (((PciHeader->u.type0.InterruptPin) && (PciHeader->u.type0.InterruptPin > 4)) || @@ -301,7 +301,7 @@ /* Bail out */ return FALSE; } - + /* Now scan PCI BARs */ for (i = 0; i < PCI_TYPE0_ADDRESSES; i++) { @@ -317,7 +317,7 @@ /* MMIO should be higher than 0x80000 */ if ((Address > 0xF) && (Address < 0x80000)) return FALSE; } - + /* Is this a 64-bit address? */ if (!(Address & PCI_ADDRESS_IO_SPACE) && ((Address & PCI_ADDRESS_MEMORY_TYPE_MASK) == PCI_TYPE_64BIT)) @@ -348,7 +348,7 @@ WCHAR Buffer[32]; KEY_VALUE_PARTIAL_INFORMATION PartialInfo; ULONG ResultLength; - + /* Setup the object attributes for the key */ RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\" @@ -358,11 +358,11 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - + /* Open the key */ Status = ZwOpenKey(&KeyHandle, KEY_READ, &ObjectAttributes); if (!NT_SUCCESS(Status)) return Status; - + /* Query value */ swprintf(Buffer, L"%04X%04X", VendorId, DeviceId); RtlInitUnicodeString(&ValueName, Buffer); @@ -379,7 +379,7 @@ *HackFlags = *(PULONG)PartialInfo.Data; DbgPrint("\t\tHack Flags: %lx (Hack Revision: %lx-Your Revision: %lx)\n", *HackFlags, HALP_REVISION_FROM_HACK_FLAGS(*HackFlags), RevisionId); - + /* Does it apply to this revision? */ if ((RevisionId) && (RevisionId >= (HALP_REVISION_FROM_HACK_FLAGS(*HackFlags)))) { @@ -391,7 +391,7 @@ *HackFlags = HALP_HACK_FLAGS(*HackFlags); if (!*HackFlags) DbgPrint("\tNo HackFlags for your chipset's revision!\n"); } - + /* Close the handle and return */ ZwClose(KeyHandle); return Status; @@ -406,7 +406,7 @@ { ULONG ElementCount, i; PPCI_CARD_DESCRIPTOR CardDescriptor; - + /* How many PCI Cards that we know about? */ ElementCount = PciRegistryInfo->ElementCount; if (!ElementCount) return FALSE; @@ -417,7 +417,7 @@ { /* Check for flag match */ if (CardDescriptor->Flags != Flags) continue; - + /* Check for VID-PID match */ if ((CardDescriptor->VendorID != PciData->VendorID) || (CardDescriptor->DeviceID != PciData->DeviceID)) @@ -433,16 +433,16 @@ /* Skip */ continue; } - + /* Check what kind of device this is */ switch (PCI_CONFIGURATION_TYPE(PciData)) { /* CardBUS Bridge */ case PCI_CARDBUS_BRIDGE_TYPE: - + /* This means the real device header is in the device-specific data */ PciData = (PPCI_COMMON_CONFIG)PciData->DeviceSpecific; - + /* Normal PCI device */ case PCI_DEVICE_TYPE: @@ -453,7 +453,7 @@ /* Skip */ continue; } - + /* Check for subsystem match, if requested */ if ((CardDescriptor->Flags & HALP_CHECK_CARD_SUBSYSTEM_ID) && (CardDescriptor->SubsystemID != PciData->u.type0.SubSystemID)) @@ -461,19 +461,19 @@ /* Skip */ continue; } - + /* You made it! */ return TRUE; - + /* PCI Bridge -- don't bother */ case PCI_BRIDGE_TYPE: default: - + /* Recognize it */ return TRUE; } } - + /* This means the card isn't recognized */ return FALSE; } @@ -490,43 +490,43 @@ /* The device is nice enough to admit it */ return TRUE; } - + /* Symphony 82C101 */ if (PciData->VendorID == 0x1C1C) return TRUE; - + /* ALi MS4803 or M5219 */ if ((PciData->VendorID == 0x10B9) && ((PciData->DeviceID == 0x5215) || (PciData->DeviceID == 0x5219))) { return TRUE; } - + /* Appian Technology */ if ((PciData->VendorID == 0x1097) && (PciData->DeviceID == 0x38)) return TRUE; - + /* Compaq Triflex Dual EIDE Controller */ if ((PciData->VendorID == 0xE11) && (PciData->DeviceID == 0xAE33)) return TRUE; - + /* Micron PC Tech RZ1000 */ if ((PciData->VendorID == 0x1042) && (PciData->DeviceID == 0x1000)) return TRUE; - + /* SiS 85C601 or 5513 [IDE] */ if ((PciData->VendorID == 0x1039) && ((PciData->DeviceID == 0x601) || (PciData->DeviceID == 0x5513))) { return TRUE; } - + /* Symphony Labs W83769F */ if ((PciData->VendorID == 0x10AD) && ((PciData->DeviceID == 0x1) || (PciData->DeviceID == 0x150))) { return TRUE; } - + /* UMC UM8673F */ if ((PciData->VendorID == 0x1060) && (PciData->DeviceID == 0x101)) return TRUE; - + /* You've survived */ return FALSE; } @@ -544,7 +544,7 @@ (PciData->BaseClass == PCI_CLASS_BRIDGE_DEV) && (PciData->SubClass == PCI_SUBCLASS_BR_CARDBUS))); } - + BOOLEAN NTAPI INIT_FUNCTION @@ -556,14 +556,14 @@ UCHAR DataBuffer[PCI_COMMON_HDR_LENGTH]; PPCI_COMMON_CONFIG PciData = (PPCI_COMMON_CONFIG)DataBuffer; PBUS_HANDLER BusHandler; - + /* Loop PCI buses */ PciSlot.u.bits.Reserved = 0; for (i = 0; i < *BusCount; i++) { /* Get the bus handler */ BusHandler = HalHandlerForBus(PCIBus, i); - + /* Loop every device */ for (j = 0; j < PCI_MAX_DEVICES; j++) { @@ -573,27 +573,27 @@ { /* Build the final slot structure */ PciSlot.u.bits.FunctionNumber = k; - + /* Read the configuration information */ HalpReadPCIConfig(BusHandler, PciSlot, PciData, 0, PCI_COMMON_HDR_LENGTH); - + /* Skip if this is an invalid function */ if (PciData->VendorID == PCI_INVALID_VENDORID) continue; - + /* Make sure that this is a PCI bridge or a cardbus bridge */ if (!HalpIsBridgeDevice(PciData)) continue; - + /* Not supported */ if (!WarningsGiven[2]++) DPRINT1("Your machine has a PCI-to-PCI or CardBUS Bridge. PCI devices may fail!\n"); continue; } } } - + /* If we exited the loop, then there's no bridge to worry about */ return FALSE; } @@ -611,7 +611,7 @@ { /* Get PCI bus handler */ Bus = HalHandlerForBus(PCIBus, i); - + /* Loop all parent buses */ ParentBus = Bus->ParentHandler; while (ParentBus) @@ -629,7 +629,7 @@ { /* Get PCI bus handler */ Bus = HalHandlerForBus(PCIBus, i); - + /* Check if this is a PCI 2.2 Bus with Subtractive Decode */ if (!((PPCIPBUSDATA)Bus->BusData)->Subtractive) { @@ -643,7 +643,7 @@ /* Should trim addresses */ if (!WarningsGiven[1]++) DPRINT1("Found parent PCI Bus (indicating PCI-to-PCI Bridge). PCI devices may fail!\n"); } - + /* Check the next parent */ ParentBus = ParentBus->ParentHandler; } @@ -655,7 +655,7 @@ { /* Get the PCI bus handler */ Bus = HalHandlerForBus(PCIBus, i); - + /* Sort and combine (trim) bus address range information */ DPRINT("Warning: Bus addresses not being optimized!\n"); } @@ -673,7 +673,7 @@ DbgPrint("%d", (int) x); } else if (x < 1048576) - { + { DbgPrint("%dK", (int)(x / 1024)); } else if (x < 0x80000000) @@ -694,16 +694,16 @@ IN ULONG j, IN ULONG k, IN PPCI_COMMON_CONFIG PciData) -{ +{ extern CHAR ClassTable[3922]; extern CHAR VendorTable[642355]; PCHAR p, ClassName, SubClassName, VendorName, ProductName, SubVendorName; ULONG Length; CHAR LookupString[16] = ""; - CHAR bSubClassName[32] = ""; - CHAR bVendorName[32] = ""; - CHAR bProductName[32] = "Unknown device"; - CHAR bSubVendorName[32] = "Unknown"; + CHAR bSubClassName[64] = ""; + CHAR bVendorName[64] = ""; + CHAR bProductName[128] = "Unknown device"; + CHAR bSubVendorName[128] = "Unknown"; ULONG Size, Mem, b; /* Isolate the class name */ @@ -739,7 +739,7 @@ if (Length >= sizeof(bVendorName)) Length = sizeof(bVendorName) - 1; strncpy(bVendorName, VendorName, Length); bVendorName[Length] = '\0'; - + /* Isolate the product name */ sprintf(LookupString, "\t%04x", PciData->DeviceID); ProductName = strstr(VendorName, LookupString); @@ -752,7 +752,7 @@ if (Length >= sizeof(bProductName)) Length = sizeof(bProductName) - 1; strncpy(bProductName, ProductName, Length); bProductName[Length] = '\0'; - + /* Isolate the subvendor and subsystem name */ sprintf(LookupString, "\t\t%04x %04x ", @@ -789,13 +789,15 @@ bSubVendorName, PciData->u.type0.SubVendorID, PciData->u.type0.SubSystemID); - + /* Print out and decode flags */ DbgPrint("\tFlags:"); if (PciData->Command & PCI_ENABLE_BUS_MASTER) DbgPrint(" bus master,"); if (PciData->Status & PCI_STATUS_66MHZ_CAPABLE) DbgPrint(" 66MHz,"); + if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x000) DbgPrint(" fast devsel,"); if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x200) DbgPrint(" medium devsel,"); - if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x400) DbgPrint(" fast devsel,"); + if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x400) DbgPrint(" slow devsel,"); + if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x600) DbgPrint(" unknown devsel,"); DbgPrint(" latency %d", PciData->LatencyTimer); if (PciData->u.type0.InterruptPin != 0 && PciData->u.type0.InterruptLine != 0 && @@ -809,24 +811,24 @@ /* Check for a BAR */ Mem = PciData->u.type0.BaseAddresses[b]; if (Mem) - { + { /* Decode the address type */ if (Mem & PCI_ADDRESS_IO_SPACE) { - /* Decode the size */ + /* Guess the size */ Size = 1 << 2; while (!(Mem & Size) && (Size)) Size <<= 1; - + /* Print it out */ DbgPrint("\tI/O ports at %04lx", Mem & PCI_ADDRESS_IO_ADDRESS_MASK); ShowSize(Size); } else { - /* Decode the size */ + /* Guess the size */ Size = 1 << 8; while (!(Mem & Size) && (Size)) Size <<= 1; - + /* Print it out */ DbgPrint("\tMemory at %08lx (%d-bit, %sprefetchable)", Mem & PCI_ADDRESS_MEMORY_ADDRESS_MASK, @@ -855,24 +857,24 @@ ULONG HackFlags; BOOLEAN ExtendedAddressDecoding = FALSE; NTSTATUS Status; - + /* Query registry information */ PciRegistryInfo = HalpQueryPciRegistryInfo(); if (!PciRegistryInfo) return; - + /* Initialize the PCI configuration lock */ KeInitializeSpinLock(&HalpPCIConfigLock); - + /* Get the type and free the info structure */ PciType = PciRegistryInfo->HardwareMechanism & 0xF; - + /* Check if this is a type 2 PCI bus with at least one bus */ if ((PciRegistryInfo->NoBuses) && (PciType == 2)) { /* Setup the PCI slot */ PciSlot.u.bits.Reserved = 0; PciSlot.u.bits.FunctionNumber = 0; - + /* Loop all slots */ for (i = 0; i < 32; i++) { @@ -880,26 +882,26 @@ PciType = 2; BusHandler = HalpAllocateAndInitPciBusHandler(2, 0, TRUE); if (!BusHandler) break; - + /* Now check if it's valid */ if (HalpIsValidPCIDevice(BusHandler, PciSlot)) break; - + /* Heh, the BIOS lied... try Type 1 */ PciType = 1; BusHandler = HalpAllocateAndInitPciBusHandler(1, 0, TRUE); if (!BusHandler) break; - + /* Now check if it's valid */ if (HalpIsValidPCIDevice(BusHandler, PciSlot)) break; - + /* Keep trying */ PciType = 2; } - + /* Now allocate the correct kind of handler */ HalpAllocateAndInitPciBusHandler(PciType, 0, FALSE); } - + /* Okay, now loop all PCI bridges */ do { @@ -915,10 +917,10 @@ } /* Go to the next bridge */ } while (HalpGetPciBridgeConfig(PciType, &PciRegistryInfo->NoBuses)); - + /* Now build correct address range informaiton */ HalpFixupPciSupportedRanges(PciRegistryInfo->NoBuses); - + /* Loop every bus */ DbgPrint("\n====== PCI BUS HARDWARE DETECTION =======\n\n"); PciSlot.u.bits.Reserved = 0; @@ -936,20 +938,20 @@ { /* Build the final slot structure */ PciSlot.u.bits.FunctionNumber = k; - + /* Read the configuration information */ HalpReadPCIConfig(BusHandler, PciSlot, PciData, 0, PCI_COMMON_HDR_LENGTH); - + /* Skip if this is an invalid function */ if (PciData->VendorID == PCI_INVALID_VENDORID) continue; - + /* Print out the entry */ HalpDebugPciDumpBus(i, j, k, PciData); - + /* Check if this is a Cardbus bridge */ if (PCI_CONFIGURATION_TYPE(PciData) == PCI_CARDBUS_BRIDGE_TYPE) { @@ -957,12 +959,12 @@ DbgPrint("\tDevice is a PCI Cardbus Bridge. It will not work!\n"); continue; } - + /* Check if this is a PCI device */ if (PCI_CONFIGURATION_TYPE(PciData) != PCI_BRIDGE_TYPE) { /* Check if it has an interrupt pin and line registered */ - if ((PciData->u.type1.InterruptPin) && + if ((PciData->u.type1.InterruptPin) && (PciData->u.type1.InterruptLine)) { /* Check if this interrupt line is connected to the bus */ @@ -979,7 +981,7 @@ } } } - + /* Check for broken Intel chips */ if (PciData->VendorID == 0x8086) { @@ -991,7 +993,7 @@ DbgPrint("\tDevice is a broken Intel 82430 PCI Controller. It will not work!\n\n"); continue; } - + /* Check for broken 82378 PCI-to-ISA Bridge */ if ((PciData->DeviceID == 0x0484) && (PciData->RevisionID <= 3)) @@ -1000,7 +1002,7 @@ DbgPrint("\tDevice is a broken Intel 82378 PCI-to-ISA Bridge. It will not work!\n\n"); continue; } - + /* Check for broken 82450 PCI Bridge */ if ((PciData->DeviceID == 0x84C4) && (PciData->RevisionID <= 4)) @@ -1009,7 +1011,7 @@ continue; } } - + /* Do we know this card? */ if (!ExtendedAddressDecoding) { @@ -1023,7 +1025,7 @@ ExtendedAddressDecoding = TRUE; } } - + /* Check if this is a USB controller */ if ((PciData->BaseClass == PCI_CLASS_SERIAL_BUS_CTLR) && (PciData->SubClass == PCI_SUBCLASS_SB_USB)) @@ -1034,14 +1036,14 @@ DbgPrint("\tDevice is an OHCI (USB) PCI Expansion Card. Turn off Legacy USB in your BIOS!\n\n"); continue; } - + /* Check for Intel UHCI controller */ if (PciData->VendorID == 0x8086) { DbgPrint("\tDevice is an Intel UHCI (USB) Controller. Turn off Legacy USB in your BIOS!\n\n"); continue; } - + /* Check for VIA UHCI controller */ if (PciData->VendorID == 0x1106) { @@ -1049,7 +1051,7 @@ continue; } } - + /* Now check the registry for chipset hacks */ Status = HalpGetChipHacks(PciData->VendorID, PciData->DeviceID, @@ -1063,21 +1065,21 @@ DbgPrint("This chipset has broken ACPI IRQ Routing! Be aware!\n\n"); continue; } - + /* Check for broken ACPI timer */ if (HackFlags & HAL_PCI_CHIP_HACK_BROKEN_ACPI_TIMER) { DbgPrint("This chipset has a broken ACPI timer! Be aware!\n\n"); continue; } - + /* Check for hibernate-disable */ if (HackFlags & HAL_PCI_CHIP_HACK_DISABLE_HIBERNATE) { DbgPrint("This chipset has a broken PCI device which is incompatible with hibernation. Be aware!\n\n"); continue; } - + /* Check for USB controllers that generate SMIs */ if (HackFlags & HAL_PCI_CHIP_HACK_USB_SMI_DISABLE) { @@ -1085,19 +1087,19 @@ continue; } } - + /* Terminate the entry */ DbgPrint("\n"); } } } - + /* Initialize NMI Crash Flag */ HalpGetNMICrashFlag(); - + /* Free the registry data */ ExFreePoolWithTag(PciRegistryInfo, TAG_HAL); - + /* Tell PnP if this hard supports correct decoding */ HalpMarkChipsetDecode(ExtendedAddressDecoding); DbgPrint("====== PCI BUS DETECTION COMPLETE =======\n\n"); @@ -1147,7 +1149,7 @@ NTSTATUS Status; PAGED_CODE(); DPRINT1("Slot assignment for %d on bus %d\n", BusType, BusNumber); - + /* Find the handler */ Handler = HalReferenceHandlerForBus(BusType, BusNumber); if (!Handler) return STATUS_NOT_FOUND; @@ -1161,7 +1163,7 @@ DeviceObject, SlotNumber, AllocatedResources); - + /* Dereference the handler and return */ HalDereferenceBusHandler(Handler); return Status; @@ -1183,24 +1185,24 @@ /* Make sure we have a context */ if (!Context) return FALSE; ASSERT((*Context) || (NextBus == TRUE)); - + /* Read the context */ ContextValue = *Context; - + /* Find the bus handler */ Handler = HalpContextToBusHandler(ContextValue); if (!Handler) return FALSE; - + /* Check if this is an ongoing lookup */ if (NextBus) { /* Get the HAL bus handler */ BusHandler = CONTAINING_RECORD(Handler, HAL_BUS_HANDLER, Handler); NextEntry = &BusHandler->AllHandlers; - + /* Get the next one if we were already with one */ if (ContextValue) NextEntry = NextEntry->Flink; - + /* Start scanning */ while (TRUE) { @@ -1211,7 +1213,7 @@ *Context = 1; return FALSE; } - + /* Call this translator */ BusHandler = CONTAINING_RECORD(NextEntry, HAL_BUS_HANDLER, AllHandlers); if (HalTranslateBusAddress(BusHandler->Handler.InterfaceType, @@ -1219,23 +1221,23 @@ BusAddress, AddressSpace, TranslatedAddress)) break; - + /* Try the next one */ NextEntry = NextEntry->Flink; } - + /* If we made it, we're done */ *Context = (ULONG_PTR)Handler; return TRUE; } - + /* Try the first one through */ if (!HalTranslateBusAddress(Handler->InterfaceType, Handler->BusNumber, BusAddress, AddressSpace, TranslatedAddress)) return FALSE; - + /* Remember for next time */ *Context = (ULONG_PTR)Handler; return TRUE; @@ -1251,7 +1253,7 @@ { PBUS_HANDLER Handler; BOOLEAN Status; - + /* Find the handler */ Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); if (!(Handler) || !(Handler->TranslateBusAddress)) @@ -1259,14 +1261,14 @@ DPRINT1("No translator Interface: %x, Bus: %x, Handler: %x!\n", InterfaceType, BusNumber, Handler); return FALSE; } - + /* Do the assignment */ Status = Handler->TranslateBusAddress(Handler, Handler, BusAddress, AddressSpace, TranslatedAddress); - + /* Dereference the handler and return */ HalDereferenceBusHandler(Handler); return Status; @@ -1284,17 +1286,17 @@ PBUS_HANDLER Handler; ULONG Status; PAGED_CODE(); - + /* Find the handler */ Handler = HalReferenceHandlerForBus((*ResourceList)->InterfaceType, (*ResourceList)->BusNumber); if (!Handler) return STATUS_SUCCESS; - + /* Do the assignment */ Status = Handler->AdjustResourceList(Handler, Handler, ResourceList); - + /* Dereference the handler and return */ HalDereferenceBusHandler(Handler); return Status; @@ -1315,7 +1317,7 @@ IN OUT PCM_RESOURCE_LIST *AllocatedResources) { PAGED_CODE(); - + /* Check the bus type */ if (BusType != PCIBus) { @@ -1377,11 +1379,11 @@ { PBUS_HANDLER Handler; ULONG Status; - + /* Find the handler */ Handler = HaliReferenceHandlerForConfigSpace(BusDataType, BusNumber); if (!Handler) return 0; - + /* Do the assignment */ Status = Handler->GetBusData(Handler, Handler, @@ -1389,7 +1391,7 @@ Buffer, Offset, Length); - + /* Dereference the handler and return */ HalDereferenceBusHandler(Handler); return Status; @@ -1410,15 +1412,15 @@ PBUS_HANDLER Handler; ULONG Vector; PAGED_CODE(); - + /* Defaults */ *Irql = 0; *Affinity = 0; - + /* Find the handler */ Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); if (!Handler) return 0; - + /* Do the assignment */ Vector = Handler->GetInterruptVector(Handler, Handler, @@ -1435,7 +1437,7 @@ VECTOR2IRQL(IRQ2VECTOR(BusInterruptLevel)), IRQ2VECTOR(BusInterruptLevel)); } - + /* Dereference the handler and return */ HalDereferenceBusHandler(Handler); return Vector; @@ -1475,11 +1477,11 @@ { PBUS_HANDLER Handler; ULONG Status; - + /* Find the handler */ Handler = HaliReferenceHandlerForConfigSpace(BusDataType, BusNumber); if (!Handler) return 0; - + /* Do the assignment */ Status = Handler->SetBusData(Handler, Handler, @@ -1487,7 +1489,7 @@ Buffer, Offset, Length); - + /* Dereference the handler and return */ HalDereferenceBusHandler(Handler); return Status;

1 0

[tkreuzer] 55014: [HAL] - Implement IrqlToSoftVector() macro and use it in HalRequestSoftwareInterrupt, so that on amd64 the correct interrupt is triggered. - Really start at the lowest vector for ...
by tkreuzer＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: tkreuzer Date: Fri Jan 20 16:32:43 2012 New Revision: 55014 URL: http://svn.reactos.org/svn/reactos?rev=55014&view=rev Log: [HAL] - Implement IrqlToSoftVector() macro and use it in HalRequestSoftwareInterrupt, so that on amd64 the correct interrupt is triggered. - Really start at the lowest vector for the IRQL in HalpAllocateSystemInterrupt - Small code refactoring Modified: trunk/reactos/hal/halx86/apic/apic.c trunk/reactos/hal/halx86/apic/apic.h Modified: trunk/reactos/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Fri Jan 20 16:32:43 2012 @@ -186,7 +186,7 @@ VOID FORCEINLINE -ApicRaiseIrql(KIRQL Irql) +ApicSetIrql(KIRQL Irql) { #ifdef _M_AMD64 __writecr8(Irql); @@ -197,14 +197,13 @@ ApicWrite(APIC_TPR, IrqlToTpr(Irql)); #endif } - +#define ApicRaiseIrql ApicSetIrql + +#ifdef APIC_LAZY_IRQL VOID FORCEINLINE ApicLowerIrql(KIRQL Irql) { -#ifdef _M_AMD64 - __writecr8(Irql); -#elif defined(APIC_LAZY_IRQL) __writefsbyte(FIELD_OFFSET(KPCR, Irql), Irql); /* Is the new Irql lower than set in the TPR? */ @@ -216,11 +215,10 @@ /* Need to lower it back */ ApicWrite(APIC_TPR, IrqlToTpr(Irql)); } +} #else - /* Convert IRQL and write the TPR */ - ApicWrite(APIC_TPR, IrqlToTpr(Irql)); -#endif -} +#define ApicLowerIrql ApicSetIrql +#endif UCHAR FASTCALL @@ -394,7 +392,7 @@ ApicWrite(APIC_ERRLVTR, LvtEntry.Long); /* Set the IRQL from the PCR */ - ApicWrite(APIC_TPR, IrqlToTpr(KeGetPcr()->Irql)); + ApicSetIrql(KeGetPcr()->Irql); #ifdef APIC_LAZY_IRQL /* Save the new hard IRQL in the IRR field */ KeGetPcr()->IRR = KeGetPcr()->Irql; @@ -410,8 +408,8 @@ IOAPIC_REDIRECTION_REGISTER ReDirReg; IN UCHAR Vector; - /* Start with low vector */ - Vector = IrqlToTpr(Irql); + /* Start with lowest vector */ + Vector = IrqlToTpr(Irql) & 0xF0; /* Find an empty vector */ while (HalpVectorToIndex[Vector] != 0xFF) @@ -653,7 +651,7 @@ HalRequestSoftwareInterrupt(IN KIRQL Irql) { /* Convert irql to vector and request an interrupt */ - ApicRequestInterrupt(IrqlToTpr(Irql), APIC_TGM_Edge); + ApicRequestInterrupt(IrqlToSoftVector(Irql), APIC_TGM_Edge); } VOID Modified: trunk/reactos/hal/halx86/apic/apic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.h?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.h [iso-8859-1] Fri Jan 20 16:32:43 2012 @@ -14,6 +14,7 @@ #define APIC_PROFILE_VECTOR 0xFD // IRQL 31 #define APIC_NMI_VECTOR 0xFF #define IrqlToTpr(Irql) (Irql << 4) +#define IrqlToSoftVector(Irql) ((Irql << 4)|0xf) #define TprToIrql(Tpr) ((KIRQL)(Tpr >> 4)) #define CLOCK2_LEVEL CLOCK_LEVEL #else @@ -31,6 +32,7 @@ #define APIC_PROFILE_VECTOR 0xFD // IRQL 31 #define APIC_NMI_VECTOR 0xFF #define IrqlToTpr(Irql) (HalpIRQLtoTPR[Irql]) +#define IrqlToSoftVector(Irql) IrqlToTpr(Irql) #define TprToIrql(Tpr) (HalVectorToIRQL[Tpr >> 4]) #endif

1 0

[cgutman] 55013: [FASTFAT] - Check the return value of CcPinRead
by cgutman＠svn.reactos.org 20 Jan '12

20 Jan '12

Author: cgutman Date: Fri Jan 20 00:32:47 2012 New Revision: 55013 URL: http://svn.reactos.org/svn/reactos?rev=55013&view=rev Log: [FASTFAT] - Check the return value of CcPinRead Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Fri Jan 20 00:32:47 2012 @@ -98,9 +98,11 @@ { CcUnpinData(Context); } - /* FIXME: check return value */ - CcPinRead(pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, - TRUE, &Context, (PVOID*)&pFatEntry); + if (!CcPinRead(pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, + TRUE, &Context, (PVOID*)&pFatEntry)) + { + return FALSE; + } FileOffset.u.LowPart += DeviceExt->FatInfo.BytesPerCluster; } if (ENTRY_END(DeviceExt, pFatEntry)) @@ -152,8 +154,11 @@ /* clear the new dir cluster */ FileOffset.u.LowPart = (ULONG)(pDirFcb->RFCB.FileSize.QuadPart - DeviceExt->FatInfo.BytesPerCluster); - CcPinRead(pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, - TRUE, &Context, (PVOID*)&pFatEntry); + if (!CcPinRead(pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, + TRUE, &Context, (PVOID*)&pFatEntry)) + { + return FALSE; + } if (DeviceExt->Flags & VCB_IS_FATX) memset(pFatEntry, 0xff, DeviceExt->FatInfo.BytesPerCluster); else @@ -163,8 +168,11 @@ { /* clear the entry after the last new entry */ FileOffset.u.LowPart = (*start + nbSlots) * SizeDirEntry; - CcPinRead(pDirFcb->FileObject, &FileOffset, SizeDirEntry, - TRUE, &Context, (PVOID*)&pFatEntry); + if (!CcPinRead(pDirFcb->FileObject, &FileOffset, SizeDirEntry, + TRUE, &Context, (PVOID*)&pFatEntry)) + { + return FALSE; + } if (DeviceExt->Flags & VCB_IS_FATX) memset(pFatEntry, 0xff, SizeDirEntry); else @@ -437,8 +445,12 @@ if (DirContext.StartIndex / i == DirContext.DirIndex / i) { /* one cluster */ - CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), - TRUE, &Context, (PVOID*)&pFatEntry); + if (!CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), + TRUE, &Context, (PVOID*)&pFatEntry)) + { + ExFreePoolWithTag(Buffer, TAG_VFAT); + return STATUS_UNSUCCESSFUL; + } if (nbSlots > 1) { RtlCopyMemory(pFatEntry, Buffer, (nbSlots - 1) * sizeof(FAT_DIR_ENTRY)); @@ -451,15 +463,23 @@ size = DeviceExt->FatInfo.BytesPerCluster - (DirContext.StartIndex * sizeof(FAT_DIR_ENTRY)) % DeviceExt->FatInfo.BytesPerCluster; i = size / sizeof(FAT_DIR_ENTRY); - CcPinRead(ParentFcb->FileObject, &FileOffset, size, TRUE, - &Context, (PVOID*)&pFatEntry); + if (!CcPinRead(ParentFcb->FileObject, &FileOffset, size, TRUE, + &Context, (PVOID*)&pFatEntry)) + { + ExFreePoolWithTag(Buffer, TAG_VFAT); + return STATUS_UNSUCCESSFUL; + } RtlCopyMemory(pFatEntry, Buffer, size); CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); FileOffset.u.LowPart += size; - CcPinRead(ParentFcb->FileObject, &FileOffset, + if (!CcPinRead(ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY) - size, - TRUE, &Context, (PVOID*)&pFatEntry); + TRUE, &Context, (PVOID*)&pFatEntry)) + { + ExFreePoolWithTag(Buffer, TAG_VFAT); + return STATUS_UNSUCCESSFUL; + } if (nbSlots - 1 > i) { RtlCopyMemory(pFatEntry, (PVOID)(Buffer + size), (nbSlots - 1 - i) * sizeof(FAT_DIR_ENTRY)); @@ -482,8 +502,12 @@ if (RequestedOptions & FILE_DIRECTORY_FILE) { FileOffset.QuadPart = 0; - CcPinRead((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, - &Context, (PVOID*)&pFatEntry); + if (!CcPinRead((*Fcb)->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, + &Context, (PVOID*)&pFatEntry)) + { + ExFreePoolWithTag(Buffer, TAG_VFAT); + return STATUS_UNSUCCESSFUL; + } /* clear the new directory cluster */ RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster); /* create '.' and '..' */ @@ -581,8 +605,11 @@ /* add entry into parent directory */ FileOffset.u.HighPart = 0; FileOffset.u.LowPart = Index * sizeof(FATX_DIR_ENTRY); - CcPinRead(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), - TRUE, &Context, (PVOID*)&pFatXDirEntry); + if (!CcPinRead(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), + TRUE, &Context, (PVOID*)&pFatXDirEntry)) + { + return STATUS_UNSUCCESSFUL; + } RtlCopyMemory(pFatXDirEntry, &DirContext.DirEntry.FatX, sizeof(FATX_DIR_ENTRY)); CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); @@ -638,8 +665,11 @@ CcUnpinData(Context); } Offset.u.LowPart = (i * sizeof(FAT_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; - CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FAT_DIR_ENTRY), TRUE, - &Context, (PVOID*)&pDirEntry); + if (!CcPinRead(pFcb->parentFcb->FileObject, &Offset, sizeof(FAT_DIR_ENTRY), TRUE, + &Context, (PVOID*)&pDirEntry)) + { + return STATUS_UNSUCCESSFUL; + } } pDirEntry[i % (PAGE_SIZE / sizeof(FAT_DIR_ENTRY))].Filename[0] = 0xe5; if (i == pFcb->dirIndex) Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Fri Jan 20 00:32:47 2012 @@ -281,12 +281,18 @@ { FileOffset.u.HighPart = 0; FileOffset.u.LowPart = VolumeLabelDirIndex * SizeDirEntry; - CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry, - TRUE, &Context, (PVOID*)&Entry); - RtlCopyMemory(Entry, &VolumeLabelDirEntry, SizeDirEntry); - CcSetDirtyPinnedData(Context, NULL); - CcUnpinData(Context); - Status = STATUS_SUCCESS; + if (!CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry, + TRUE, &Context, (PVOID*)&Entry)) + { + Status = STATUS_UNSUCCESSFUL; + } + else + { + RtlCopyMemory(Entry, &VolumeLabelDirEntry, SizeDirEntry); + CcSetDirtyPinnedData(Context, NULL); + CcUnpinData(Context); + Status = STATUS_SUCCESS; + } } }

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