Ros-diffs October 2010

ros-diffs@reactos.org

20 participants
435 discussions

[akhaldi] 49135: [CMAKE] - More work on the dlls. By Alexey Komarov.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 13 12:11:50 2010 New Revision: 49135 URL: http://svn.reactos.org/svn/reactos?rev=49135&view=rev Log: [CMAKE] - More work on the dlls. By Alexey Komarov. Added: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt (with props) branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt (with props) branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt (with props) branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt (with props) branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt (with props) branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt (with props) branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/access/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/console/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/input/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/main/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/ncpa/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/odbccp32/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt (with props) branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt (with props) branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt (with props) branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/CMakeLists.txt branches/cmake-bringup/gcc.cmake [This mail would be too long, it was shortened to contain the URLs only.] Added: branches/cmake-bringup/dll/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/CMak… Added: branches/cmake-bringup/dll/3rdparty/dxtn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/dxtn… Added: branches/cmake-bringup/dll/3rdparty/libjpeg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libj… Added: branches/cmake-bringup/dll/3rdparty/libpng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libp… Added: branches/cmake-bringup/dll/3rdparty/libtiff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libt… Added: branches/cmake-bringup/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/libx… Added: branches/cmake-bringup/dll/3rdparty/mesa32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/3rdparty/mesa… Modified: branches/cmake-bringup/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/CMakeLists.tx… Added: branches/cmake-bringup/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/CMakeList… Added: branches/cmake-bringup/dll/cpl/access/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/access/CM… Added: branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/appwiz/CM… Added: branches/cmake-bringup/dll/cpl/console/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/console/C… Added: branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/CMak… Added: branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/hdwwiz/CM… Added: branches/cmake-bringup/dll/cpl/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/input/CMa… Added: branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/intl/CMak… Added: branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/joy/CMake… Added: branches/cmake-bringup/dll/cpl/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/main/CMak… Added: branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/mmsys/CMa… Added: branches/cmake-bringup/dll/cpl/ncpa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/ncpa/CMak… Added: branches/cmake-bringup/dll/cpl/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/odbccp32/… Added: branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/powercfg/… Added: branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/sysdm/CMa… Added: branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/telephon/… Added: branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/timedate/… Added: branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/usrmgr/CM… Added: branches/cmake-bringup/dll/directx/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… Added: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… Added: branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… Added: branches/cmake-bringup/dll/keyboard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/CMak… Added: branches/cmake-bringup/dll/keyboard/kbda1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbda2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbda3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbdal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbdarme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbdarmw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbdaze/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbdazel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbda… Added: branches/cmake-bringup/dll/keyboard/kbdbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Added: branches/cmake-bringup/dll/keyboard/kbdbga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Added: branches/cmake-bringup/dll/keyboard/kbdbgm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Added: branches/cmake-bringup/dll/keyboard/kbdbgt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Added: branches/cmake-bringup/dll/keyboard/kbdblr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Added: branches/cmake-bringup/dll/keyboard/kbdbr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Added: branches/cmake-bringup/dll/keyboard/kbdbur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdb… Added: branches/cmake-bringup/dll/keyboard/kbdcan/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Added: branches/cmake-bringup/dll/keyboard/kbdcr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Added: branches/cmake-bringup/dll/keyboard/kbdcz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Added: branches/cmake-bringup/dll/keyboard/kbdcz1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdc… Added: branches/cmake-bringup/dll/keyboard/kbdda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdd… Added: branches/cmake-bringup/dll/keyboard/kbddv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdd… Added: branches/cmake-bringup/dll/keyboard/kbdes/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbde… Added: branches/cmake-bringup/dll/keyboard/kbdest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbde… Added: branches/cmake-bringup/dll/keyboard/kbdfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… Added: branches/cmake-bringup/dll/keyboard/kbdfi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… Added: branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdf… Added: branches/cmake-bringup/dll/keyboard/kbdgeo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Added: branches/cmake-bringup/dll/keyboard/kbdgerg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Added: branches/cmake-bringup/dll/keyboard/kbdgneo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Added: branches/cmake-bringup/dll/keyboard/kbdgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Added: branches/cmake-bringup/dll/keyboard/kbdgrist/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdg… Added: branches/cmake-bringup/dll/keyboard/kbdhe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… Added: branches/cmake-bringup/dll/keyboard/kbdheb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… Added: branches/cmake-bringup/dll/keyboard/kbdhu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdh… Added: branches/cmake-bringup/dll/keyboard/kbdic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdinasa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdinben/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdindev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdinguj/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdinmal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdir/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdi… Added: branches/cmake-bringup/dll/keyboard/kbdja/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdj… Added: branches/cmake-bringup/dll/keyboard/kbdkaz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdk… Added: branches/cmake-bringup/dll/keyboard/kbdko/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdk… Added: branches/cmake-bringup/dll/keyboard/kbdla/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… Added: branches/cmake-bringup/dll/keyboard/kbdlt1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… Added: branches/cmake-bringup/dll/keyboard/kbdlv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdl… Added: branches/cmake-bringup/dll/keyboard/kbdmac/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdm… Added: branches/cmake-bringup/dll/keyboard/kbdne/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdn… Added: branches/cmake-bringup/dll/keyboard/kbdno/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdn… Added: branches/cmake-bringup/dll/keyboard/kbdpl1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdp… Added: branches/cmake-bringup/dll/keyboard/kbdpo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdp… Added: branches/cmake-bringup/dll/keyboard/kbdro/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… Added: branches/cmake-bringup/dll/keyboard/kbdru/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… Added: branches/cmake-bringup/dll/keyboard/kbdru1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdr… Added: branches/cmake-bringup/dll/keyboard/kbdsg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Added: branches/cmake-bringup/dll/keyboard/kbdsk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Added: branches/cmake-bringup/dll/keyboard/kbdsk1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Added: branches/cmake-bringup/dll/keyboard/kbdsw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbds… Added: branches/cmake-bringup/dll/keyboard/kbdtat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Added: branches/cmake-bringup/dll/keyboard/kbdth0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Added: branches/cmake-bringup/dll/keyboard/kbdth1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Added: branches/cmake-bringup/dll/keyboard/kbdth2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Added: branches/cmake-bringup/dll/keyboard/kbdth3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Added: branches/cmake-bringup/dll/keyboard/kbdtuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Added: branches/cmake-bringup/dll/keyboard/kbdtuq/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdt… Added: branches/cmake-bringup/dll/keyboard/kbduk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdur/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdurs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdusa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdusl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdusr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdusx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbduzb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdu… Added: branches/cmake-bringup/dll/keyboard/kbdvntc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdv… Added: branches/cmake-bringup/dll/keyboard/kbdycc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdy… Added: branches/cmake-bringup/dll/keyboard/kbdycl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdy… Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=491…

14 years, 2 months

[akhaldi] 49134: [DDK] - Fix RtlStringCbPrintf prototypes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Oct 13 10:53:01 2010 New Revision: 49134 URL: http://svn.reactos.org/svn/reactos?rev=49134&view=rev Log: [DDK] - Fix RtlStringCbPrintf prototypes. Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Wed Oct 13 10:53:01 2010 @@ -221,7 +221,6 @@ static __inline NTSTATUS -NTAPI RtlStringCbPrintfA(OUT LPSTR Destination, IN SIZE_T Length, IN LPCSTR Format, @@ -251,7 +250,6 @@ static __inline NTSTATUS -NTAPI RtlStringCbPrintfExA(OUT LPSTR Destination, IN SIZE_T Length, OUT LPSTR *DestinationEnd OPTIONAL, @@ -409,7 +407,6 @@ static __inline NTSTATUS -NTAPI RtlStringCbPrintfW( LPWSTR pszDest, IN size_t cbDest,

14 years, 2 months

[sir_richard] 49133: [SMSS]: Remove the ROS_DOESNT_SUCK hack, and correctly started subsystem processes with the first MB reserved. [CSRSRV]: CSRSS was started with a free address space, and was ab...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Oct 12 21:17:58 2010 New Revision: 49133 URL: http://svn.reactos.org/svn/reactos?rev=49133&view=rev Log: [SMSS]: Remove the ROS_DOESNT_SUCK hack, and correctly started subsystem processes with the first MB reserved. [CSRSRV]: CSRSS was started with a free address space, and was able to map 0xA0000 into it by luck, because the ReactOS Mm allocator picks address ranges randomly, and it somehow managed to avoid the low 1MB addresses. Were this algorithm to change, or perhaps, were we to implement VADs for VM allocations, the 0xA0000 region might already be allocated (by an early-process-initialization allocation, such as the heap). This is what the flag referenced above was designed for, but it was not used. Using this flag, on the other hand, now makes CSRSS fail, because it attempts to map the RAM into 0xA0000, which fails since you can map a section on top of reserved memory. To work around this Brobdingnagian annoyance, CSRSS simply releases the first MB of memory that SMSS has nicely reserved for it, and then proceeds with the mapping. This fixes the issue of getting 0xA0000 by luck and now guarantees it can be mapped. Modified: trunk/reactos/base/system/smss/smapiexec.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c Modified: trunk/reactos/base/system/smss/smapiexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapiexec… ============================================================================== --- trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapiexec.c [iso-8859-1] Tue Oct 12 21:17:58 2010 @@ -108,11 +108,11 @@ __FUNCTION__, Status); return Status; } -#ifdef ROS_DOESNT_SUCK + /* Reserve lower 1Mb, if requested */ if (Flags & SM_CREATE_FLAG_RESERVE_1MB) ProcessParameters->Flags |= RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; -#endif + /* Create the user process */ Status = RtlCreateUserProcess (& ImagePathString, OBJ_CASE_INSENSITIVE, Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Tue Oct 12 21:17:58 2010 @@ -38,7 +38,20 @@ LARGE_INTEGER Offset; SIZE_T ViewSize; CHAR IVTAndBda[1024+256]; - + + /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ + BaseAddress = 0; + ViewSize = 1024 * 1024; + Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_RELEASE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't unmap reserved memory (%x)\n", Status); + return 0; + } + /* Open the physical memory section */ InitializeObjectAttributes(&ObjectAttributes, &PhysMemName,

14 years, 2 months

[ekohl] 49132: [WIDL] Update widl to version 1.3.4.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Oct 12 20:51:07 2010 New Revision: 49132 URL: http://svn.reactos.org/svn/reactos?rev=49132&view=rev Log: [WIDL] Update widl to version 1.3.4. Modified: trunk/reactos/media/doc/README.WINE trunk/reactos/tools/widl/expr.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl_ros.diff trunk/reactos/tools/widl/widltypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… Modified: trunk/reactos/tools/widl/expr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/expr.c?rev=4913… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=49… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=49… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=49… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=491… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=4… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=4913… Modified: trunk/reactos/tools/widl/widl_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl_ros.diff?r… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev…

14 years, 2 months

[pschweitzer] 49131: [NTOSKRNL] Implemented IopFetchConfigurationInformation(), IopCreateArcNamesCd(), IopCreateArcNamesDisk(), IopVerifyDiskSignature() Removed IopApplyRosCdromArcHack(), IopGetDis...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Oct 12 20:29:50 2010 New Revision: 49131 URL: http://svn.reactos.org/svn/reactos?rev=49131&view=rev Log: [NTOSKRNL] Implemented IopFetchConfigurationInformation(), IopCreateArcNamesCd(), IopCreateArcNamesDisk(), IopVerifyDiskSignature() Removed IopApplyRosCdromArcHack(), IopGetDiskInformation(), IopAssignArcNamesToCdrom() Finally, rewritten IopCreateArcNames() To make it short, this is the rewrite of ARC names handling in the kernel. This brings our kernel to a higher state of existence. Indeed, it's leaving NT4 design for a proper NT5.2 design, with less hacks, less ROS specific stuff and such. This code handles the mount manager we don't have yet. Modified: trunk/reactos/lib/sdk/wdmguid/wdmguid.c trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/lib/sdk/wdmguid/wdmguid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/wdmguid/wdmguid.c?… ============================================================================== --- trunk/reactos/lib/sdk/wdmguid/wdmguid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/wdmguid/wdmguid.c [iso-8859-1] Tue Oct 12 20:29:50 2010 @@ -10,5 +10,9 @@ /* FIXME: shouldn't go there! */ DEFINE_GUID(GUID_DEVICE_SYS_BUTTON, 0x4AFA3D53L, 0x74A7, 0x11d0, 0xbe, 0x5e, 0x00, 0xA0, 0xC9, 0x06, 0x28, 0x57); +DEFINE_GUID(GUID_DEVINTERFACE_DISK, + 0x53f56307L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); +DEFINE_GUID(GUID_DEVINTERFACE_CDROM, + 0x53f56308L, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Tue Oct 12 20:29:50 2010 @@ -741,6 +741,14 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +BOOLEAN +NTAPI +IopVerifyDiskSignature( + IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout, + IN PARC_DISK_SIGNATURE ArcDiskSignature, + OUT PULONG Signature +); + // // Device/Volume Routines // @@ -1165,8 +1173,17 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +// // Configuration Routines // +NTSTATUS +NTAPI +IopFetchConfigurationInformation(OUT PWSTR * SymbolicLinkList, + IN GUID Guid, + IN ULONG ExpectedInterfaces, + IN PULONG Interfaces +); + VOID NTAPI IopStoreSystemPartitionInformation(IN PUNICODE_STRING NtSystemPartitionDeviceName, Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Tue Oct 12 20:29:50 2010 @@ -5,6 +5,7 @@ * PURPOSE: ARC Path Initialization Functions * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl +* Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -17,429 +18,35 @@ UNICODE_STRING IoArcHalDeviceName, IoArcBootDeviceName; PCHAR IoLoaderArcBootDeviceName; -extern PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; /* FUNCTIONS *****************************************************************/ -BOOLEAN +NTSTATUS INIT_FUNCTION NTAPI -IopApplyRosCdromArcHack(IN ULONG i) -{ - ULONG DeviceNumber = -1; - OBJECT_ATTRIBUTES ObjectAttributes; - ANSI_STRING InstallName; - UNICODE_STRING DeviceName; - CHAR Buffer[128], RosSysPath[16]; - FILE_BASIC_INFORMATION FileInfo; - NTSTATUS Status; - PCHAR p, q; - PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); - extern BOOLEAN InitIsWinPEMode, ExpInTextModeSetup; - - /* Change this if you want ROS to boot properly from another directory */ - sprintf(RosSysPath, "%s", "reactos"); - - /* Only ARC Name left - Build full ARC Name */ - p = strstr(KeLoaderBlock->ArcBootDeviceName, "cdrom"); - if (p) - { - /* Build installer name */ - sprintf(Buffer, "\\Device\\CdRom%lu\\%s\\ntoskrnl.exe", i, RosSysPath); - RtlInitAnsiString(&InstallName, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &InstallName, TRUE); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Try to find the installer */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - - /* Free the string */ - RtlFreeUnicodeString(&DeviceName); - - /* Check if we found the file */ - if (NT_SUCCESS(Status)) - { - /* We did, save the device number */ - DeviceNumber = i; - } - else - { - /* Build live CD kernel name */ - sprintf(Buffer, - "\\Device\\CdRom%lu\\%s\\system32\\ntoskrnl.exe", - i, RosSysPath); - RtlInitAnsiString(&InstallName, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, - &InstallName, - TRUE); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Try to find it */ - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = ZwQueryAttributesFile(&ObjectAttributes, &FileInfo); - if (NT_SUCCESS(Status)) DeviceNumber = i; - - /* Free the string */ - RtlFreeUnicodeString(&DeviceName); - } - - if (!InitIsWinPEMode) - { - /* Build the name */ - sprintf(p, "cdrom(%lu)", DeviceNumber); - - /* Adjust original command line */ - q = strchr(p, ')'); - if (q) - { - q++; - strcpy(Buffer, q); - sprintf(p, "cdrom(%lu)", DeviceNumber); - strcat(p, Buffer); - } - } - } - - /* OK, how many disks are there? */ - DeviceNumber += ConfigInfo->DiskCount; - - /* Return whether this is the CD or not */ - if ((InitIsWinPEMode) || (ExpInTextModeSetup)) - { - return TRUE; - } - - /* Failed */ - return FALSE; -} - -BOOLEAN +IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +NTSTATUS INIT_FUNCTION NTAPI -IopGetDiskInformation(IN ULONG i, - OUT PULONG CheckSum, - OUT PULONG Signature, - OUT PULONG PartitionCount, - OUT PDEVICE_OBJECT *DiskDeviceObject) -{ - ULONG j, Checksum; - ANSI_STRING TempString; - CHAR Buffer[128]; - UNICODE_STRING DeviceName; - NTSTATUS Status; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - DISK_GEOMETRY DiskGeometry; - PDRIVE_LAYOUT_INFORMATION DriveLayout; - KEVENT Event; - PIRP Irp; - IO_STATUS_BLOCK StatusBlock; - LARGE_INTEGER PartitionOffset; - PULONG PartitionBuffer; - - /* Build the name */ - sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); - - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Get the device pointer */ - Status = IoGetDeviceObjectPointer(&DeviceName, - FILE_READ_ATTRIBUTES, - &FileObject, - &DeviceObject); - *DiskDeviceObject = DeviceObject; - - /* Free the string */ - RtlFreeUnicodeString(&DeviceName); - - /* Move on if we failed */ - if (!NT_SUCCESS(Status)) return FALSE; - - /* Build an IRP to determine the sector size */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, - DeviceObject, - NULL, - 0, - &DiskGeometry, - sizeof(DISK_GEOMETRY), - FALSE, - &Event, - &StatusBlock); - if (!Irp) - { - /* Try again */ - ObDereferenceObject(FileObject); - return FALSE; - } - - /* Call the driver and check if we have to wait on it */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait on the driver */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = StatusBlock.Status; - } - - /* Check if we failed */ - if (!NT_SUCCESS(Status)) - { - /* Try again */ - ObDereferenceObject(FileObject); - return FALSE; - } - - /* Read the partition table */ - Status = IoReadPartitionTable(DeviceObject, - DiskGeometry.BytesPerSector, - TRUE, - &DriveLayout); - - /* Dereference the file object */ - ObDereferenceObject(FileObject); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Set the offset to 0 */ - PartitionOffset.QuadPart = 0; - - /* Allocate a buffer for the partition */ - PartitionBuffer = ExAllocatePoolWithTag(NonPagedPool, - DiskGeometry.BytesPerSector, - TAG_IO); - if (!PartitionBuffer) - { - /* Try again */ - ExFreePoolWithTag(DriveLayout, TAG_FILE_SYSTEM); - return FALSE; - } - - /* Build an IRP to read the partition sector */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - DeviceObject, - PartitionBuffer, - DiskGeometry.BytesPerSector, - &PartitionOffset, - &Event, - &StatusBlock); - if (!Irp) - { - /* Try again */ - ExFreePoolWithTag(PartitionBuffer, TAG_IO); - ExFreePoolWithTag(DriveLayout, TAG_FILE_SYSTEM); - return FALSE; - } - - /* Call the driver and check if we have to wait */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait for completion */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = StatusBlock.Status; - } - - /* Check if we failed */ - if (!NT_SUCCESS(Status)) - { - /* Try again */ - ExFreePoolWithTag(PartitionBuffer, TAG_IO); - ExFreePoolWithTag(DriveLayout, TAG_FILE_SYSTEM); - return FALSE; - } - - /* Calculate the MBR checksum */ - Checksum = 0; - for (j = 0; j < 128; j++) Checksum += PartitionBuffer[j]; - - /* Save the signature and checksum */ - *CheckSum = ~Checksum + 1; - *Signature = DriveLayout->Signature; - *PartitionCount = DriveLayout->PartitionCount; - - /* Free the buffer */ - ExFreePoolWithTag(PartitionBuffer, TAG_IO); - ExFreePoolWithTag(DriveLayout, TAG_FILE_SYSTEM); - return TRUE; -} - -BOOLEAN -INIT_FUNCTION -NTAPI -IopAssignArcNamesToCdrom(IN PLOADER_PARAMETER_BLOCK LoaderBlock, - IN PULONG Buffer, - IN ULONG DiskNumber) -{ - CHAR ArcBuffer[128]; - ANSI_STRING TempString; - UNICODE_STRING DeviceName, ArcName; - NTSTATUS Status; - LARGE_INTEGER PartitionOffset; - KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - ULONG i, CheckSum = 0; - PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject; - PARC_DISK_INFORMATION ArcDiskInfo = LoaderBlock->ArcDiskInformation; - PLIST_ENTRY NextEntry; - PARC_DISK_SIGNATURE ArcDiskEntry; - BOOLEAN IsBootCdRom = FALSE; - - /* Build the device name */ - sprintf(ArcBuffer, "\\Device\\CdRom%lu", DiskNumber); - - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, ArcBuffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, &TempString, TRUE); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Get the device for it */ - Status = IoGetDeviceObjectPointer(&DeviceName, - FILE_READ_ATTRIBUTES, - &FileObject, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - /* Free the string and fail */ - RtlFreeUnicodeString(&DeviceName); - return FALSE; - } - - /* Setup the event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* Set the offset and build the read IRP */ - PartitionOffset.QuadPart = 0x8000; - Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, - DeviceObject, - Buffer, - 2048, - &PartitionOffset, - &Event, - &IoStatusBlock); - if (!Irp) - { - /* Free the string and fail */ - RtlFreeUnicodeString(&DeviceName); - return FALSE; - } - - /* Call the driver and check if we have to wait on it */ - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait for completion */ - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatusBlock.Status; - } - - /* Dereference the file object */ - ObDereferenceObject(FileObject); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Now calculate the checksum */ - for (i = 0; i < 2048 / sizeof(ULONG); i++) CheckSum += Buffer[i]; - -#ifndef _M_AMD64 - if (KeRosLoaderBlock) goto freeldrhack; -#endif - - /* Search if this device is the actual boot CD */ - for (NextEntry = ArcDiskInfo->DiskSignatureListHead.Flink; - NextEntry != &ArcDiskInfo->DiskSignatureListHead; - NextEntry = NextEntry->Flink) - { - /* Get the current ARC disk signature entry */ - ArcDiskEntry = CONTAINING_RECORD(NextEntry, - ARC_DISK_SIGNATURE, - ListEntry); - /* And check if checksums and arc names match */ - if (CheckSum + ArcDiskEntry->CheckSum == 0 && - strcmp(KeLoaderBlock->ArcBootDeviceName, ArcDiskEntry->ArcName) == 0) - { - IsBootCdRom = TRUE; - break; - } - } - goto checkbootcd; - -#ifndef _M_AMD64 -freeldrhack: -#endif - /* - * FIXME: In normal conditions, NTLDR/FreeLdr sends the *proper* CDROM - * ARC Path name, and what happens here is a comparision of both checksums - * in order to see if this is the actual boot CD. - * - * In ReactOS this doesn't currently happen, instead we have a hack on top - * of this file which scans the CD for the ntoskrnl.exe file, then modifies - * the LoaderBlock's ARC Path with the right CDROM path. Consequently, we - * get the same state as if NTLDR had properly booted us, except that we do - * not actually need to check the signature, since the hack already did the - * check for ntoskrnl.exe, which is just as good. - * - * The signature code stays however, because eventually FreeLDR will work - * like NTLDR, and, conversly, we do want to be able to be booted by NTLDR. - */ - IsBootCdRom = IopApplyRosCdromArcHack(DiskNumber); - -checkbootcd: - if (IsBootCdRom) - { - /* This is the boot CD-ROM, build the ARC name */ - sprintf(ArcBuffer, "\\ArcName\\%s", KeLoaderBlock->ArcBootDeviceName); - - /* Convert it to Unicode */ - RtlInitAnsiString(&TempString, ArcBuffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, &TempString, TRUE); - if (!NT_SUCCESS(Status)) return FALSE; - - /* Create the symbolic link and free the strings */ - IoAssignArcName(&ArcName, &DeviceName); - RtlFreeUnicodeString(&ArcName); - RtlFreeUnicodeString(&DeviceName); - - /* Let caller know that we've found the boot CD */ - return TRUE; - } - - /* No boot CD found */ - return FALSE; -} +IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN BOOLEAN SingleDisk, + IN PBOOLEAN FoundBoot +); NTSTATUS INIT_FUNCTION NTAPI IopCreateArcNames(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - PCONFIGURATION_INFORMATION ConfigInfo = IoGetConfigurationInformation(); PARC_DISK_INFORMATION ArcDiskInfo = LoaderBlock->ArcDiskInformation; CHAR Buffer[128]; - ANSI_STRING ArcBootString, ArcSystemString, ArcString; - UNICODE_STRING ArcName, BootPath, DeviceName; + ANSI_STRING ArcSystemString, ArcString; BOOLEAN SingleDisk; - ULONG i, j, Length; - PDEVICE_OBJECT DeviceObject; - ULONG Signature, Checksum, PartitionCount; - PLIST_ENTRY NextEntry; - PARC_DISK_SIGNATURE ArcDiskEntry; + ULONG Length; NTSTATUS Status; BOOLEAN FoundBoot = FALSE; - PULONG PartitionBuffer; /* Check if we only have one disk on the machine */ SingleDisk = ArcDiskInfo->DiskSignatureListHead.Flink->Flink == @@ -476,158 +83,704 @@ } /* Build the boot strings */ + RtlInitAnsiString(&ArcSystemString, LoaderBlock->ArcHalDeviceName); + + /* FIXME: Handle IoRemoteBootClient here and create appropriate symbolic link */ + + /* Loop every disk and try to find boot disk */ + Status = IopCreateArcNamesDisk(LoaderBlock, SingleDisk, &FoundBoot); + /* If it succeed but we didn't find boot device, try to browse Cds */ + if (NT_SUCCESS(Status) && !FoundBoot) + { + Status = IopCreateArcNamesCd(LoaderBlock); + } + + /* Return success */ + return Status; +} + +NTSTATUS +INIT_FUNCTION +NTAPI +IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + LARGE_INTEGER StartingOffset; + IO_STATUS_BLOCK IoStatusBlock; + PULONG PartitionBuffer = NULL; + CHAR Buffer[128], ArcBuffer[128]; + BOOLEAN NotEnabledPresent = FALSE; + STORAGE_DEVICE_NUMBER DeviceNumber; + ANSI_STRING DeviceStringA, ArcNameStringA; + PWSTR SymbolicLinkList, lSymbolicLinkList; + PARC_DISK_SIGNATURE ArcDiskSignature = NULL; + UNICODE_STRING DeviceStringW, ArcNameStringW; + ULONG DiskNumber, CdRomCount, CheckSum, i, EnabledDisks = 0; + PARC_DISK_INFORMATION ArcDiskInformation = LoaderBlock->ArcDiskInformation; + + /* Get all the Cds present in the system */ + CdRomCount = IoGetConfigurationInformation()->CdRomCount; + + /* Get enabled Cds and check if result matches + * For the record, enabled Cds (or even disk) are Cds/disks + * that have been successfully handled by MountMgr driver + * and that already own their device name. This is the "new" way + * to handle them, that came with NT5. + * Currently, Windows 2003 provides an arc names creation based + * on both enabled drives and not enabled drives (lack from + * the driver). + * Given the current ReactOS state, that's good for us. + * To sum up, this is NOT a hack or whatsoever. + */ + Status = IopFetchConfigurationInformation(&SymbolicLinkList, + GUID_DEVINTERFACE_CDROM, + CdRomCount, + &EnabledDisks); + if (!NT_SUCCESS(Status)) + { + NotEnabledPresent = TRUE; + } + /* Save symbolic link list address in order to free it after */ + lSymbolicLinkList = SymbolicLinkList; + /* For the moment, we won't fail */ + Status = STATUS_SUCCESS; + + /* Browse all the ARC devices trying to find the one matching boot device */ + for (NextEntry = ArcDiskInformation->DiskSignatureListHead.Flink; + NextEntry != &ArcDiskInformation->DiskSignatureListHead; + NextEntry = NextEntry->Flink) + { + ArcDiskSignature = CONTAINING_RECORD(NextEntry, + ARC_DISK_SIGNATURE, + ListEntry); + + if (strcmp(LoaderBlock->ArcBootDeviceName, ArcDiskSignature->ArcName) == 0) + { + break; + } + + ArcDiskSignature = NULL; + } + + /* Not found... Not booting from a Cd */ + if (!ArcDiskSignature) + { + DPRINT("Failed finding a cd that could match current boot device\n"); + goto Cleanup; + } + + /* Allocate needed space for reading Cd */ + PartitionBuffer = ExAllocatePoolWithTag(NonPagedPoolCacheAligned, 2048, TAG_IO); + if (!PartitionBuffer) + { + DPRINT("Failed allocating resources!\n"); + /* Here, we fail, BUT we return success, some Microsoft joke */ + goto Cleanup; + } + + /* If we have more enabled Cds, take that into account */ + if (EnabledDisks > CdRomCount) + { + CdRomCount = EnabledDisks; + } + + /* If we'll have to browse for none enabled Cds, fix higher count */ + if (NotEnabledPresent && !EnabledDisks) + { + CdRomCount += 5; + } + + /* Finally, if in spite of all that work, we still don't have Cds, leave */ + if (!CdRomCount) + { + goto Cleanup; + } + + /* Start browsing Cds */ + for (DiskNumber = 0, EnabledDisks = 0; DiskNumber < CdRomCount; DiskNumber++) + { + /* Check if we have an enabled disk */ + if (SymbolicLinkList && *SymbolicLinkList != UNICODE_NULL) + { + /* Create its device name using first symbolic link */ + RtlInitUnicodeString(&DeviceStringW, lSymbolicLinkList); + /* Then, update symbolic links list */ + lSymbolicLinkList += wcslen(lSymbolicLinkList) + (sizeof(UNICODE_NULL) / sizeof(WCHAR)); + + /* Get its associated device object and file object */ + Status = IoGetDeviceObjectPointer(&DeviceStringW, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + /* Failure? Good bye! */ + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Now, we'll ask the device its device number */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_STORAGE_GET_DEVICE_NUMBER, + DeviceObject, + NULL, + 0, + &DeviceNumber, + sizeof(STORAGE_DEVICE_NUMBER), + FALSE, + &Event, + &IoStatusBlock); + /* Failure? Good bye! */ + if (!Irp) + { + /* Dereference file object before leaving */ + ObDereferenceObject(FileObject); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Call the driver, and wait for it if needed */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + goto Cleanup; + } + + /* Finally, build proper device name */ + sprintf(Buffer, "\\Device\\CdRom%lu", DeviceNumber.DeviceNumber); + RtlInitAnsiString(&DeviceStringA, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + goto Cleanup; + } + } + else + { + /* Create device name for the cd */ + sprintf(Buffer, "\\Device\\CdRom%lu", EnabledDisks++); + RtlInitAnsiString(&DeviceStringA, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Get its device object */ + Status = IoGetDeviceObjectPointer(&DeviceStringW, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&DeviceStringW); + goto Cleanup; + } + } + + /* Initiate data for reading cd and compute checksum */ + StartingOffset.QuadPart = 0x8000; + CheckSum = 0; + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + PartitionBuffer, + 2048, + &StartingOffset, + &Event, + &IoStatusBlock); + if (Irp) + { + /* Call the driver, and wait for it if needed */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + /* Reading succeed, compute checksum by adding data, 2048 bytes checksum */ + if (NT_SUCCESS(Status)) + { + for (i = 0; i < 2048 / sizeof(ULONG); i++) + { + CheckSum += PartitionBuffer[i]; + } + } + } + + /* Dereference file object */ + ObDereferenceObject(FileObject); + + /* If checksums are matching, we have the proper cd */ + if (CheckSum + ArcDiskSignature->CheckSum == 0) + { + /* Create ARC name */ + sprintf(ArcBuffer, "\\ArcName\\%s", LoaderBlock->ArcBootDeviceName); + RtlInitAnsiString(&ArcNameStringA, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&ArcNameStringW, &ArcNameStringA, TRUE); + if (NT_SUCCESS(Status)) + { + /* Create symbolic link */ + IoCreateSymbolicLink(&ArcNameStringW, &DeviceStringW); + RtlFreeUnicodeString(&ArcNameStringW); + DPRINT1("Boot device found\n"); + } + + /* And quit, whatever happens */ + RtlFreeUnicodeString(&DeviceStringW); + goto Cleanup; + } + + /* Free string before trying another disk */ + RtlFreeUnicodeString(&DeviceStringW); + } + +Cleanup: + if (PartitionBuffer) + { + ExFreePoolWithTag(PartitionBuffer, TAG_IO); + } + + if (SymbolicLinkList) + { + ExFreePool(SymbolicLinkList); + } + + return Status; +} + +NTSTATUS +INIT_FUNCTION +NTAPI +IopCreateArcNamesDisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock, + IN BOOLEAN SingleDisk, + IN PBOOLEAN FoundBoot) +{ + PIRP Irp; + PVOID Data; + KEVENT Event; + NTSTATUS Status; + PLIST_ENTRY NextEntry; + PFILE_OBJECT FileObject; + DISK_GEOMETRY DiskGeometry; + PDEVICE_OBJECT DeviceObject; + LARGE_INTEGER StartingOffset; + PULONG PartitionBuffer = NULL; + IO_STATUS_BLOCK IoStatusBlock; + CHAR Buffer[128], ArcBuffer[128]; + BOOLEAN NotEnabledPresent = FALSE; + STORAGE_DEVICE_NUMBER DeviceNumber; + PARC_DISK_SIGNATURE ArcDiskSignature; + PWSTR SymbolicLinkList, lSymbolicLinkList; + PDRIVE_LAYOUT_INFORMATION_EX DriveLayout = NULL; + UNICODE_STRING DeviceStringW, ArcNameStringW, HalPathStringW; + ULONG DiskNumber, DiskCount, CheckSum, i, Signature, EnabledDisks = 0; + PARC_DISK_INFORMATION ArcDiskInformation = LoaderBlock->ArcDiskInformation; + ANSI_STRING ArcBootString, ArcSystemString, DeviceStringA, ArcNameStringA, HalPathStringA; + + /* Initialise device number */ + DeviceNumber.DeviceNumber = 0xFFFFFFFF; + /* Get all the disks present in the system */ + DiskCount = IoGetConfigurationInformation()->DiskCount; + + /* Get enabled disks and check if result matches */ + Status = IopFetchConfigurationInformation(&SymbolicLinkList, + GUID_DEVINTERFACE_DISK, + DiskCount, + &EnabledDisks); + if (!NT_SUCCESS(Status)) + { + NotEnabledPresent = TRUE; + } + + /* Save symbolic link list address in order to free it after */ + lSymbolicLinkList = SymbolicLinkList; + + /* Build the boot strings */ RtlInitAnsiString(&ArcBootString, LoaderBlock->ArcBootDeviceName); RtlInitAnsiString(&ArcSystemString, LoaderBlock->ArcHalDeviceName); - /* Loop every detected disk */ - for (i = 0; i < ConfigInfo->DiskCount; i++) - { - /* Get information about the disk */ - if (!IopGetDiskInformation(i, - &Checksum, - &Signature, - &PartitionCount, - &DeviceObject)) - { - /* Skip this disk */ + /* If we have more enabled disks, take that into account */ + if (EnabledDisks > DiskCount) + { + DiskCount = EnabledDisks; + } + + /* If we'll have to browse for none enabled disks, fix higher count */ + if (NotEnabledPresent && !EnabledDisks) + { + DiskCount += 20; + } + + /* Finally, if in spite of all that work, we still don't have disks, leave */ + if (!DiskCount) + { + goto Cleanup; + } + + /* Start browsing disks */ + for (DiskNumber = 0; DiskNumber < DiskCount; DiskNumber++) + { + /* Check if we have an enabled disk */ + if (lSymbolicLinkList && *lSymbolicLinkList != UNICODE_NULL) + { + /* Create its device name using first symbolic link */ + RtlInitUnicodeString(&DeviceStringW, lSymbolicLinkList); + /* Then, update symbolic links list */ + lSymbolicLinkList += wcslen(lSymbolicLinkList) + (sizeof(UNICODE_NULL) / sizeof(WCHAR)); + + /* Get its associated device object and file object */ + Status = IoGetDeviceObjectPointer(&DeviceStringW, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + if (NT_SUCCESS(Status)) + { + /* Now, we'll ask the device its device number */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_STORAGE_GET_DEVICE_NUMBER, + DeviceObject, + NULL, + 0, + &DeviceNumber, + sizeof(STORAGE_DEVICE_NUMBER), + FALSE, + &Event, + &IoStatusBlock); + /* Missing resources is a shame... No need to go farther */ + if (!Irp) + { + ObDereferenceObject(FileObject); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Call the driver, and wait for it if needed */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + /* If we didn't get the appriopriate data, just skip that disk */ + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + continue; + } + } + + /* End of enabled disks enumeration */ + if (NotEnabledPresent && *lSymbolicLinkList == UNICODE_NULL) + { + /* No enabled disk worked, reset field */ + if (DeviceNumber.DeviceNumber == 0xFFFFFFFF) + { + DeviceNumber.DeviceNumber = 0; + } + + /* Update disk number to enable the following not enabled disks */ + if (DeviceNumber.DeviceNumber > DiskNumber) + { + DiskNumber = DeviceNumber.DeviceNumber; + } + + /* Increase a bit more */ + DiskCount = DiskNumber + 20; + } + } + else + { + /* Create device name for the disk */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", DiskNumber); + RtlInitAnsiString(&DeviceStringA, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE); + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + + /* Get its device object */ + Status = IoGetDeviceObjectPointer(&DeviceStringW, + FILE_READ_ATTRIBUTES, + &FileObject, + &DeviceObject); + + RtlFreeUnicodeString(&DeviceStringW); + /* This is a security measure, to ensure DiskNumber will be used */ + DeviceNumber.DeviceNumber = 0xFFFFFFFF; + } + + /* Something failed somewhere earlier, just skip the disk */ + if (!NT_SUCCESS(Status)) + { continue; } - /* Loop ARC disks */ - for (NextEntry = ArcDiskInfo->DiskSignatureListHead.Flink; - NextEntry != &ArcDiskInfo->DiskSignatureListHead; + /* Let's ask the disk for its geometry */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY, + DeviceObject, + NULL, + 0, + &DiskGeometry, + sizeof(DISK_GEOMETRY), + FALSE, + &Event, + &IoStatusBlock); + /* Missing resources is a shame... No need to go farther */ + if (!Irp) + { + ObDereferenceObject(FileObject); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Call the driver, and wait for it if needed */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + /* Failure, skip disk */ + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + continue; + } + + /* Read the partition table */ + Status = IoReadPartitionTableEx(DeviceObject, + &DriveLayout); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + continue; + } + + /* Ensure we have at least 512 bytes per sector */ + if (DiskGeometry.BytesPerSector < 512) + { + DiskGeometry.BytesPerSector = 512; + } + + /* Check MBR type against EZ Drive type */ + StartingOffset.QuadPart = 0; + HalExamineMBR(DeviceObject, DiskGeometry.BytesPerSector, 0x55, &Data); + if (Data) + { + /* If MBR is of the EZ Drive type, we'll read after it */ + StartingOffset.QuadPart = DiskGeometry.BytesPerSector; + ExFreePool(Data); + } + + /* Allocate for reading enough data for checksum */ + PartitionBuffer = ExAllocatePoolWithTag(NonPagedPoolCacheAligned, DiskGeometry.BytesPerSector, TAG_IO); + if (!PartitionBuffer) + { + ObDereferenceObject(FileObject); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Read a sector for computing checksum */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + PartitionBuffer, + DiskGeometry.BytesPerSector, + &StartingOffset, + &Event, + &IoStatusBlock); + if (!Irp) + { + ObDereferenceObject(FileObject); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Call the driver to perform reading */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + if (!NT_SUCCESS(Status)) + { + ExFreePool(DriveLayout); + ExFreePoolWithTag(PartitionBuffer, TAG_IO); + ObDereferenceObject(FileObject); + continue; + } + + ObDereferenceObject(FileObject); + + /* Calculate checksum, that's an easy computation, just adds read data */ + for (i = 0, CheckSum = 0; i < 512 / sizeof(ULONG) ; i++) + { + CheckSum += PartitionBuffer[i]; + } + + /* Browse each ARC disk */ + for (NextEntry = ArcDiskInformation->DiskSignatureListHead.Flink; + NextEntry != &ArcDiskInformation->DiskSignatureListHead; NextEntry = NextEntry->Flink) { - /* Get the current ARC disk signature entry */ - ArcDiskEntry = CONTAINING_RECORD(NextEntry, - ARC_DISK_SIGNATURE, - ListEntry); - - /* - * Now check if the signature and checksum match, unless this is - * the only disk that was in the ARC list, and also in the device - * tree, in which case the check is bypassed and we accept the disk + ArcDiskSignature = CONTAINING_RECORD(NextEntry, + ARC_DISK_SIGNATURE, + ListEntry); + + /* If they matches, ie + * - There's only one disk for both BIOS and detected/enabled + * - Signatures are matching + * - Checksums are matching + * - This is MBR */ - if (((SingleDisk) && (ConfigInfo->DiskCount == 1)) || - ((Checksum == ArcDiskEntry->CheckSum) && - (Signature == ArcDiskEntry->Signature))) - { - /* Build the NT Device Name */ - sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", i); - - /* Convert it to Unicode */ - RtlInitAnsiString(&ArcString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, - &ArcString, - TRUE); - if (!NT_SUCCESS(Status)) continue; - - /* Build the ARC Device Name */ - sprintf(Buffer, "\\ArcName\\%s", ArcDiskEntry->ArcName); - - /* Convert it to Unicode */ - RtlInitAnsiString(&ArcString, Buffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, - &ArcString, - TRUE); - if (!NT_SUCCESS(Status)) continue; - - /* Create the symbolic link and free the strings */ - IoAssignArcName(&ArcName, &DeviceName); - RtlFreeUnicodeString(&ArcName); - RtlFreeUnicodeString(&DeviceName); - - /* Loop all the partitions */ - for (j = 0; j < PartitionCount; j++) + if (((SingleDisk && DiskCount == 1) || + (IopVerifyDiskSignature(DriveLayout, ArcDiskSignature, &Signature) && + (ArcDiskSignature->CheckSum + CheckSum == 0))) && + (DriveLayout->PartitionStyle == PARTITION_STYLE_MBR)) + { + /* Create device name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition0", (DeviceNumber.DeviceNumber != 0xFFFFFFFF) ? DeviceNumber.DeviceNumber : DiskNumber); + RtlInitAnsiString(&DeviceStringA, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE); + if (!NT_SUCCESS(Status)) { - /* Build the partition device name */ - sprintf(Buffer, - "\\Device\\Harddisk%lu\\Partition%lu", - i, - j + 1); - - /* Convert it to Unicode */ - RtlInitAnsiString(&ArcString, Buffer); - Status = RtlAnsiStringToUnicodeString(&DeviceName, - &ArcString, - TRUE); - if (!NT_SUCCESS(Status)) continue; - - /* Build the partial ARC name for this partition */ - sprintf(Buffer, - "%spartition(%lu)", - ArcDiskEntry->ArcName, - j + 1); - RtlInitAnsiString(&ArcString, Buffer); - - /* Check if this is the boot device */ - if (RtlEqualString(&ArcString, &ArcBootString, TRUE)) + goto Cleanup; + } + + /* Create ARC name */ + sprintf(ArcBuffer, "\\ArcName\\%s", ArcDiskSignature->ArcName); + RtlInitAnsiString(&ArcNameStringA, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&ArcNameStringW, &ArcNameStringA, TRUE); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&DeviceStringW); + goto Cleanup; + } + + /* Link both */ + IoCreateSymbolicLink(&ArcNameStringW, &DeviceStringW); + + /* And release resources */ + RtlFreeUnicodeString(&ArcNameStringW); + RtlFreeUnicodeString(&DeviceStringW); + + /* Now, browse for every partition */ + for (i = 1; i <= DriveLayout->PartitionCount; i++) + { + /* Create device name */ + sprintf(Buffer, "\\Device\\Harddisk%lu\\Partition%lu", (DeviceNumber.DeviceNumber != 0xFFFFFFFF) ? DeviceNumber.DeviceNumber : DiskNumber, i); + RtlInitAnsiString(&DeviceStringA, Buffer); + Status = RtlAnsiStringToUnicodeString(&DeviceStringW, &DeviceStringA, TRUE); + if (!NT_SUCCESS(Status)) { - /* Remember that we found a Hard Disk Boot Device */ - FoundBoot = TRUE; + goto Cleanup; } - /* Check if it's the system boot partition */ - if (RtlEqualString(&ArcString, &ArcSystemString, TRUE)) + /* Create partial ARC name */ + sprintf(ArcBuffer, "%spartition(%lu)", ArcDiskSignature->ArcName, i); + RtlInitAnsiString(&ArcNameStringA, ArcBuffer); + + /* Is that boot device? */ + if (RtlEqualString(&ArcNameStringA, &ArcBootString, TRUE)) { - /* It is, create a Unicode string for it */ - RtlInitAnsiString(&ArcString, - LoaderBlock->NtHalPathName); - Status = RtlAnsiStringToUnicodeString(&BootPath, - &ArcString, - TRUE); - if (NT_SUCCESS(Status)) + DPRINT("Found boot device\n"); + *FoundBoot = TRUE; + } + + /* Is that system partition? */ + if (RtlEqualString(&ArcNameStringA, &ArcSystemString, TRUE)) + { + /* Create HAL path name */ + RtlInitAnsiString(&HalPathStringA, LoaderBlock->NtHalPathName); + Status = RtlAnsiStringToUnicodeString(&HalPathStringW, &HalPathStringA, TRUE); + if (!NT_SUCCESS(Status)) { - /* Save in registry */ - IopStoreSystemPartitionInformation(&DeviceName, &BootPath); - - /* Free the string now */ - RtlFreeUnicodeString(&BootPath); + RtlFreeUnicodeString(&DeviceStringW); + goto Cleanup; } + + /* Then store those information to registry */ + IopStoreSystemPartitionInformation(&DeviceStringW, &HalPathStringW); + RtlFreeUnicodeString(&HalPathStringW); } - /* Build the full ARC name */ - sprintf(Buffer, - "\\ArcName\\%spartition(%lu)", - ArcDiskEntry->ArcName, - j + 1); - - /* Convert it to Unicode */ - RtlInitAnsiString(&ArcString, Buffer); - Status = RtlAnsiStringToUnicodeString(&ArcName, - &ArcString, - TRUE); - if (!NT_SUCCESS(Status)) continue; - - /* Create the symbolic link and free the strings */ - IoAssignArcName(&ArcName, &DeviceName); - RtlFreeUnicodeString(&ArcName); - RtlFreeUnicodeString(&DeviceName); + /* Create complete ARC name */ + sprintf(ArcBuffer, "\\ArcName\\%spartition(%lu)", ArcDiskSignature->ArcName, i); + RtlInitAnsiString(&ArcNameStringA, ArcBuffer); + Status = RtlAnsiStringToUnicodeString(&ArcNameStringW, &ArcNameStringA, TRUE); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString(&DeviceStringW); + goto Cleanup; + } + + /* Link device name & ARC name */ + IoCreateSymbolicLink(&ArcNameStringW, &DeviceStringW); + + /* Release strings */ + RtlFreeUnicodeString(&ArcNameStringW); + RtlFreeUnicodeString(&DeviceStringW); } } - } - } - - /* Check if we didn't find the boot disk */ - if (!FoundBoot) - { - /* Allocate a buffer for the CD-ROM MBR */ - PartitionBuffer = ExAllocatePoolWithTag(NonPagedPool, 2048, TAG_IO); - if (!PartitionBuffer) return STATUS_INSUFFICIENT_RESOURCES; - - /* Loop every CD-ROM */ - for (i = 0; i < ConfigInfo->CdRomCount; i++) - { - /* Give it an ARC name */ - if (IopAssignArcNamesToCdrom(LoaderBlock, PartitionBuffer, i)) break; - } - - /* Free the buffer */ + else + { + /* In case there's a valid partition, a matching signature, + BUT a none matching checksum, or there's a duplicate + signature, or even worse a virus played with partition + table */ + if (ArcDiskSignature->Signature == Signature && + (ArcDiskSignature->CheckSum + CheckSum != 0) && + ArcDiskSignature->ValidPartitionTable) + { + DPRINT("Be careful, or you have a duplicate disk signature, or a virus altered your MBR!\n"); + } + } + } + + /* Release memory before jumping to next item */ + ExFreePool(DriveLayout); + DriveLayout = NULL; ExFreePoolWithTag(PartitionBuffer, TAG_IO); - } - - /* Return success */ - return STATUS_SUCCESS; + PartitionBuffer = NULL; + } + + Status = STATUS_SUCCESS; + +Cleanup: + if (SymbolicLinkList) + { + ExFreePool(SymbolicLinkList); + } + + if (DriveLayout) + { + ExFreePool(DriveLayout); + } + + if (PartitionBuffer) + { + ExFreePoolWithTag(PartitionBuffer, TAG_IO); + } + + return Status; } NTSTATUS @@ -738,4 +891,54 @@ return TRUE; } +BOOLEAN +NTAPI +IopVerifyDiskSignature(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout, + IN PARC_DISK_SIGNATURE ArcDiskSignature, + OUT PULONG Signature) +{ + /* First condition: having a valid partition table */ + if (!ArcDiskSignature->ValidPartitionTable) + { + return FALSE; + } + + /* If that partition table is the MBR */ + if (DriveLayout->PartitionStyle == PARTITION_STYLE_MBR) + { + /* Then check MBR signature */ + if (DriveLayout->Mbr.Signature == ArcDiskSignature->Signature) + { + /* And return it */ + if (Signature) + { + *Signature = DriveLayout->Mbr.Signature; + } + + return TRUE; + } + } + /* If that partition table is the GPT */ + else if (DriveLayout->PartitionStyle == PARTITION_STYLE_GPT) + { + /* Check we are using GPT and compare GUID */ + if (ArcDiskSignature->IsGpt && + (((PULONG)ArcDiskSignature->GptSignature)[0] == DriveLayout->Gpt.DiskId.Data1 && + ((PUSHORT)ArcDiskSignature->GptSignature)[2] == DriveLayout->Gpt.DiskId.Data2 && + ((PUSHORT)ArcDiskSignature->GptSignature)[3] == DriveLayout->Gpt.DiskId.Data3 && + ((PULONGLONG)ArcDiskSignature->GptSignature)[1] == ((PULONGLONG)DriveLayout->Gpt.DiskId.Data4)[0])) + { + /* There's no signature to give, so we just zero output */ + if (Signature) + { + *Signature = 0; + } + return TRUE; + } + } + + /* If we fall here, it means that something went wrong, so return that */ + return FALSE; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Tue Oct 12 20:29:50 2010 @@ -651,6 +651,47 @@ return Status; } +NTSTATUS +NTAPI +IopFetchConfigurationInformation(OUT PWSTR * SymbolicLinkList, + IN GUID Guid, + IN ULONG ExpectedInterfaces, + IN PULONG Interfaces) +{ + NTSTATUS Status; + ULONG IntInterfaces = 0; + PWSTR IntSymbolicLinkList; + + /* Get the associated enabled interfaces with the given GUID */ + Status = IoGetDeviceInterfaces(&Guid, NULL, 0, SymbolicLinkList); + if (!NT_SUCCESS(Status)) + { + /* Zero output and leave */ + if (SymbolicLinkList != 0) + { + *SymbolicLinkList = 0; + } + + return STATUS_UNSUCCESSFUL; + } + + IntSymbolicLinkList = *SymbolicLinkList; + + /* Count the number of enabled interfaces by counting the number of symbolic links */ + while (*IntSymbolicLinkList != UNICODE_NULL) + { + IntInterfaces++; + IntSymbolicLinkList += wcslen(IntSymbolicLinkList) + (sizeof(UNICODE_NULL) / sizeof(WCHAR)); + } + + /* Matching result will define the result */ + Status = (IntInterfaces >= ExpectedInterfaces) ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; + /* Finally, give back to the caller the number of found interfaces */ + *Interfaces = IntInterfaces; + + return Status; +} + VOID NTAPI IopStoreSystemPartitionInformation(IN PUNICODE_STRING NtSystemPartitionDeviceName,

14 years, 2 months

[pschweitzer] 49130: [NTOSKRNL] Implemented FstubAllocateDiskInformation(), FstubDbgGuidToString(), FstubDbgPrintDriveLayoutEx(), FstubDbgPrintPartitionEx(), FstubDetectPartitionStyle(), FstubFreeD...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Oct 12 20:22:29 2010 New Revision: 49130 URL: http://svn.reactos.org/svn/reactos?rev=49130&view=rev Log: [NTOSKRNL] Implemented FstubAllocateDiskInformation(), FstubDbgGuidToString(), FstubDbgPrintDriveLayoutEx(), FstubDbgPrintPartitionEx(), FstubDetectPartitionStyle(), FstubFreeDiskInformation(), FstubGetDiskGeometry(), FstubReadPartitionTableMBR(), FstubReadSector() Stubbed FstubReadPartitionTableEFI() This leads to a correct & working implementation of IoReadPartitionTableEx(). As this state, it only handles MBR partition tables as EFI/GPT as been stubbed out. EFI/GPT support will come later. Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Tue Oct 12 20:22:29 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/fstub/fstubex.c * PURPOSE: Extended FSTUB Routines (not linked to HAL) -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +* PROGRAMMERS: Pierre Schweitzer (pierre.schweitzer(a)reactos.org) */ /* INCLUDES ******************************************************************/ @@ -12,6 +12,497 @@ #define NDEBUG #include <debug.h> +/* PRIVATE FUNCTIONS *********************************************************/ + +#define PARTITION_ENTRY_SIZE 128 +#define TAG_FSTUB 'BtsF' + +typedef struct _DISK_INFORMATION +{ + PDEVICE_OBJECT DeviceObject; + ULONG SectorSize; + DISK_GEOMETRY_EX DiskGeometry; + PUSHORT Buffer; + ULONGLONG SectorCount; +} DISK_INFORMATION, *PDISK_INFORMATION; + +/* Defines system type for MBR showing that a GPT is following */ +#define EFI_PMBR_OSTYPE_EFI 0xEE + +#define IS_VALID_DISK_INFO(Disk) \ + (Disk) && \ + (Disk->DeviceObject) && \ + (Disk->SectorSize) && \ + (Disk->Buffer) && \ + (Disk->SectorCount) + +VOID +NTAPI +FstubDbgPrintPartitionEx(IN PPARTITION_INFORMATION_EX PartitionEntry, + IN ULONG PartitionNumber +); + +NTSTATUS +NTAPI +FstubGetDiskGeometry(IN PDEVICE_OBJECT DeviceObject, + OUT PDISK_GEOMETRY_EX Geometry +); + +NTSTATUS +NTAPI +FstubReadSector(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONGLONG StartingSector OPTIONAL, + OUT PUSHORT Buffer +); + +NTSTATUS +NTAPI +FstubAllocateDiskInformation(IN PDEVICE_OBJECT DeviceObject, + OUT PDISK_INFORMATION * DiskBuffer, + PDISK_GEOMETRY_EX DiskGeometry OPTIONAL) +{ + NTSTATUS Status; + PDISK_INFORMATION DiskInformation; + PAGED_CODE(); + + ASSERT(DeviceObject); + ASSERT(DiskBuffer); + + /* Allocate internal structure */ + DiskInformation = ExAllocatePoolWithTag(NonPagedPool, sizeof(DISK_INFORMATION), TAG_FSTUB); + if (!DiskInformation) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* If caller don't pass needed information, let's get them */ + if (!DiskGeometry) + { + Status = FstubGetDiskGeometry(DeviceObject, &(DiskInformation->DiskGeometry)); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(DiskInformation, TAG_FSTUB); + return Status; + } + } + else + { + DiskInformation->DiskGeometry = *DiskGeometry; + } + + /* Ensure read/received information are correct */ + if (DiskInformation->DiskGeometry.Geometry.BytesPerSector == 0 || + DiskInformation->DiskGeometry.DiskSize.QuadPart == 0) + { + ExFreePoolWithTag(DiskInformation, TAG_FSTUB); + return STATUS_DEVICE_NOT_READY; + } + + /* Store vital information as well */ + DiskInformation->DeviceObject = DeviceObject; + DiskInformation->SectorSize = DiskInformation->DiskGeometry.Geometry.BytesPerSector; + DiskInformation->SectorCount = DiskInformation->DiskGeometry.DiskSize.QuadPart / DiskInformation->SectorSize; + + /* Finally, allocate the buffer that will be used for different read */ + DiskInformation->Buffer = ExAllocatePoolWithTag(NonPagedPoolCacheAligned, DiskInformation->SectorSize, TAG_FSTUB); + if (!DiskInformation->Buffer) + { + ExFreePoolWithTag(DiskInformation, TAG_FSTUB); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return allocated internal structure */ + *DiskBuffer = DiskInformation; + + return STATUS_SUCCESS; +} + +PCHAR +NTAPI +FstubDbgGuidToString(IN PGUID Guid, + OUT PCHAR String) +{ + sprintf(String, + "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + Guid->Data1, + Guid->Data2, + Guid->Data3, + Guid->Data4[0], + Guid->Data4[1], + Guid->Data4[2], + Guid->Data4[3], + Guid->Data4[4], + Guid->Data4[5], + Guid->Data4[6], + Guid->Data4[7]); + + return String; +} + +VOID +NTAPI +FstubDbgPrintDriveLayoutEx(IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout) +{ + ULONG i; + CHAR Guid[38]; + PAGED_CODE(); + + DPRINT1("FSTUB: DRIVE_LAYOUT_INFORMATION_EX: %p\n", DriveLayout); + switch (DriveLayout->PartitionStyle) + { + case PARTITION_STYLE_MBR: + if (DriveLayout->PartitionCount % 4 != 0) + { + DPRINT1("Warning: Partition count isn't a 4-factor: %ld!\n", DriveLayout->PartitionCount); + } + + DPRINT1("Signature: %8.8x\n", DriveLayout->Mbr.Signature); + for (i = 0; i < DriveLayout->PartitionCount; i++) + { + FstubDbgPrintPartitionEx(DriveLayout->PartitionEntry, i); + } + + break; + case PARTITION_STYLE_GPT: + FstubDbgGuidToString(&(DriveLayout->Gpt.DiskId), Guid); + DPRINT1("DiskId: %s\n", Guid); + DPRINT1("StartingUsableOffset: %I64x\n", DriveLayout->Gpt.StartingUsableOffset.QuadPart); + DPRINT1("UsableLength: %I64x\n", DriveLayout->Gpt.UsableLength.QuadPart); + DPRINT1("MaxPartitionCount: %ld\n", DriveLayout->Gpt.MaxPartitionCount); + for (i = 0; i < DriveLayout->PartitionCount; i++) + { + FstubDbgPrintPartitionEx(DriveLayout->PartitionEntry, i); + } + + break; + default: + DPRINT1("Unsupported partition style: %ld\n", DriveLayout->PartitionStyle); + } +} + +VOID +NTAPI +FstubDbgPrintPartitionEx(IN PPARTITION_INFORMATION_EX PartitionEntry, + IN ULONG PartitionNumber) +{ + CHAR Guid[38]; + PAGED_CODE(); + + DPRINT1("Printing partition %ld\n", PartitionNumber); + + switch (PartitionEntry[PartitionNumber].PartitionStyle) + { + case PARTITION_STYLE_MBR: + DPRINT1(" StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart); + DPRINT1(" PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart); + DPRINT1(" RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition); + DPRINT1(" PartitionType: %02x\n", PartitionEntry[PartitionNumber].Mbr.PartitionType); + DPRINT1(" BootIndicator: %d\n", PartitionEntry[PartitionNumber].Mbr.BootIndicator); + DPRINT1(" RecognizedPartition: %d\n", PartitionEntry[PartitionNumber].Mbr.RecognizedPartition); + DPRINT1(" HiddenSectors: %ld\n", PartitionEntry[PartitionNumber].Mbr.HiddenSectors); + + break; + case PARTITION_STYLE_GPT: + DPRINT1(" StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart); + DPRINT1(" PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart); + DPRINT1(" RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition); + FstubDbgGuidToString(&(PartitionEntry[PartitionNumber].Gpt.PartitionType), Guid); + DPRINT1(" PartitionType: %s\n", Guid); + FstubDbgGuidToString(&(PartitionEntry[PartitionNumber].Gpt.PartitionId), Guid); + DPRINT1(" PartitionId: %s\n", Guid); + DPRINT1(" Attributes: %16x\n", PartitionEntry[PartitionNumber].Gpt.Attributes); + DPRINT1(" Name: %ws\n", PartitionEntry[PartitionNumber].Gpt.Name); + + break; + default: + DPRINT1(" Unsupported partition style: %ld\n", PartitionEntry[PartitionNumber].PartitionStyle); + } +} + +NTSTATUS +NTAPI +FstubDetectPartitionStyle(IN PDISK_INFORMATION Disk, + IN PARTITION_STYLE * PartitionStyle) +{ + NTSTATUS Status; + PPARTITION_DESCRIPTOR PartitionDescriptor; + PAGED_CODE(); + + ASSERT(IS_VALID_DISK_INFO(Disk)); + ASSERT(PartitionStyle); + + /* Read disk first sector */ + Status = FstubReadSector(Disk->DeviceObject, + Disk->SectorSize, + 0, + Disk->Buffer); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Get the partition descriptor array */ + PartitionDescriptor = (PPARTITION_DESCRIPTOR) + &(Disk->Buffer[PARTITION_TABLE_OFFSET]); + /* If we have not the 0xAA55 then it's raw partition */ + if (Disk->Buffer[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) + { + *PartitionStyle = PARTITION_STYLE_RAW; + } + /* Check partitions types: if first is 0xEE and all the others 0, we have GPT */ + else if (PartitionDescriptor[0].PartitionType == EFI_PMBR_OSTYPE_EFI && + PartitionDescriptor[1].PartitionType == 0 && + PartitionDescriptor[2].PartitionType == 0 && + PartitionDescriptor[3].PartitionType == 0) + { + *PartitionStyle = PARTITION_STYLE_GPT; + } + /* Otherwise, partition table is in MBR */ + else + { + *PartitionStyle = PARTITION_STYLE_MBR; + } + + return STATUS_SUCCESS; +} + +VOID +NTAPI +FstubFreeDiskInformation(IN PDISK_INFORMATION DiskBuffer) +{ + if (DiskBuffer) + { + if (DiskBuffer->Buffer) + { + ExFreePoolWithTag(DiskBuffer->Buffer, TAG_FSTUB); + } + ExFreePoolWithTag(DiskBuffer, TAG_FSTUB); + } +} + +NTSTATUS +NTAPI +FstubGetDiskGeometry(IN PDEVICE_OBJECT DeviceObject, + OUT PDISK_GEOMETRY_EX Geometry) +{ + PIRP Irp; + NTSTATUS Status; + PKEVENT Event = NULL; + PDISK_GEOMETRY_EX DiskGeometry = NULL; + PIO_STATUS_BLOCK IoStatusBlock = NULL; + PAGED_CODE(); + + ASSERT(DeviceObject); + ASSERT(Geometry); + + /* Allocate needed components */ + DiskGeometry = ExAllocatePoolWithTag(NonPagedPool, sizeof(DISK_GEOMETRY_EX), TAG_FSTUB); + if (!DiskGeometry) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + IoStatusBlock = ExAllocatePoolWithTag(NonPagedPool, sizeof(IO_STATUS_BLOCK), TAG_FSTUB); + if (!IoStatusBlock) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_FSTUB); + if (!Event) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + /* Initialize the waiting event */ + KeInitializeEvent(Event, NotificationEvent, FALSE); + + /* Build the request to get disk geometry */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, + DeviceObject, + 0, + 0, + DiskGeometry, + sizeof(DISK_GEOMETRY_EX), + FALSE, + Event, + IoStatusBlock); + if (!Irp) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Cleanup; + } + + /* Call the driver and wait for completion if needed */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock->Status; + } + + /* In case of a success, return read data */ + if (NT_SUCCESS(Status)) + { + *Geometry = *DiskGeometry; + } + +Cleanup: + if (DiskGeometry) + { + ExFreePoolWithTag(DiskGeometry, TAG_FSTUB); + + if (NT_SUCCESS(Status)) + { + ASSERT(Geometry->Geometry.BytesPerSector % PARTITION_ENTRY_SIZE == 0); + } + } + + if (IoStatusBlock) + { + ExFreePoolWithTag(IoStatusBlock, TAG_FSTUB); + } + + if (Event) + { + ExFreePoolWithTag(Event, TAG_FSTUB); + } + + return Status; +} + +NTSTATUS +NTAPI +FstubReadPartitionTableEFI(IN PDISK_INFORMATION Disk, + IN BOOLEAN ReadBackupTable, + OUT struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +FstubReadPartitionTableMBR(IN PDISK_INFORMATION Disk, + IN BOOLEAN ReturnRecognizedPartitions, + OUT struct _DRIVE_LAYOUT_INFORMATION_EX** ReturnedDriveLayout) +{ + ULONG i; + NTSTATUS Status; + PDRIVE_LAYOUT_INFORMATION DriveLayout = NULL; + PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL; + PAGED_CODE(); + + ASSERT(IS_VALID_DISK_INFO(Disk)); + ASSERT(ReturnedDriveLayout); + + /* Zero output */ + *ReturnedDriveLayout = NULL; + + /* Read partition table the old way */ + Status = IoReadPartitionTable(Disk->DeviceObject, + Disk->SectorSize, + ReturnRecognizedPartitions, + &DriveLayout); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Allocate a DRIVE_LAYOUT_INFORMATION_EX struct big enough */ + DriveLayoutEx = ExAllocatePoolWithTag(NonPagedPool, + FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION_EX, PartitionEntry) + + DriveLayout->PartitionCount * sizeof(PARTITION_INFORMATION_EX), + TAG_FSTUB); + if (!DriveLayoutEx) + { + /* Let's not leak memory as in Windows 2003 */ + ExFreePool(DriveLayout); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Start converting the DRIVE_LAYOUT_INFORMATION structure */ + DriveLayoutEx->PartitionStyle = PARTITION_STYLE_MBR; + DriveLayoutEx->PartitionCount = DriveLayout->PartitionCount; + DriveLayoutEx->Mbr.Signature = DriveLayout->Signature; + + /* Convert each found partition */ + for (i = 0; i < DriveLayout->PartitionCount; i++) + { + DriveLayoutEx->PartitionEntry[i].PartitionStyle = PARTITION_STYLE_MBR; + DriveLayoutEx->PartitionEntry[i].StartingOffset = DriveLayout->PartitionEntry[i].StartingOffset; + DriveLayoutEx->PartitionEntry[i].PartitionLength = DriveLayout->PartitionEntry[i].PartitionLength; + DriveLayoutEx->PartitionEntry[i].PartitionNumber = DriveLayout->PartitionEntry[i].PartitionNumber; + DriveLayoutEx->PartitionEntry[i].RewritePartition = DriveLayout->PartitionEntry[i].RewritePartition; + DriveLayoutEx->PartitionEntry[i].Mbr.PartitionType = DriveLayout->PartitionEntry[i].PartitionType; + DriveLayoutEx->PartitionEntry[i].Mbr.BootIndicator = DriveLayout->PartitionEntry[i].BootIndicator; + DriveLayoutEx->PartitionEntry[i].Mbr.RecognizedPartition = DriveLayout->PartitionEntry[i].RecognizedPartition; + DriveLayoutEx->PartitionEntry[i].Mbr.HiddenSectors = DriveLayout->PartitionEntry[i].HiddenSectors; + } + + /* Finally, return data and free old structure */ + *ReturnedDriveLayout = DriveLayoutEx; + ExFreePool(DriveLayout); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FstubReadSector(IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN ULONGLONG StartingSector OPTIONAL, + OUT PUSHORT Buffer) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + LARGE_INTEGER StartingOffset; + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION IoStackLocation; + PAGED_CODE(); + + ASSERT(DeviceObject); + ASSERT(Buffer); + ASSERT(SectorSize); + + /* Compute starting offset */ + StartingOffset.QuadPart = StartingSector * SectorSize; + + /* Initialize waiting event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Prepare IRP */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_READ, + DeviceObject, + Buffer, + SectorSize, + &StartingOffset, + &Event, + &IoStatusBlock); + if (!Irp) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Override volume verify */ + IoStackLocation = IoGetNextIrpStackLocation(Irp); + IoStackLocation->Flags |= SL_OVERRIDE_VERIFY_VOLUME; + + /* Then call driver, and wait for completion if needed */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatusBlock.Status; + } + + return Status; +} + /* FUNCTIONS *****************************************************************/ /* @@ -52,15 +543,70 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI IoReadPartitionTableEx(IN PDEVICE_OBJECT DeviceObject, IN struct _DRIVE_LAYOUT_INFORMATION_EX** DriveLayout) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PDISK_INFORMATION Disk; + PARTITION_STYLE PartitionStyle; + PAGED_CODE(); + + ASSERT(DeviceObject); + ASSERT(DriveLayout); + + /* First of all, allocate internal structure */ + Status = FstubAllocateDiskInformation(DeviceObject, &Disk, 0); + if (!NT_SUCCESS(Status)) + { + return Status; + } + ASSERT(Disk); + + /* Then, detect partition style (MBR? GTP/EFI? RAW?) */ + Status = FstubDetectPartitionStyle(Disk, &PartitionStyle); + if (!NT_SUCCESS(Status)) + { + FstubFreeDiskInformation(Disk); + return Status; + } + + /* Here partition table is really read, depending on its style */ + switch (PartitionStyle) + { + case PARTITION_STYLE_MBR: + case PARTITION_STYLE_RAW: + Status = FstubReadPartitionTableMBR(Disk, FALSE, DriveLayout); + break; + + case PARTITION_STYLE_GPT: + /* Read primary table */ + Status = FstubReadPartitionTableEFI(Disk, FALSE, DriveLayout); + /* If it failed, try reading backup table */ + if (!NT_SUCCESS(Status)) + { + Status = FstubReadPartitionTableEFI(Disk, TRUE, DriveLayout); + } + break; + + default: + DPRINT("Unknown partition type\n"); + Status = STATUS_UNSUCCESSFUL; + } + + /* It's over, internal structure not needed anymore */ + FstubFreeDiskInformation(Disk); + + /* In case of success, print data */ + if (NT_SUCCESS(Status)) + { + FstubDbgPrintDriveLayoutEx(*DriveLayout); + } + + return Status; } /*

14 years, 2 months

[pschweitzer] 49129: [CLASS2] Switch use from DISK_GEOMETRY to DISK_GEOMETRY_EX. It's needed to handle some Windows 2003's kernel routines. [CDROM] Reflect changes in Class2. [DISK] Reflect changes...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Oct 12 20:17:55 2010 New Revision: 49129 URL: http://svn.reactos.org/svn/reactos?rev=49129&view=rev Log: [CLASS2] Switch use from DISK_GEOMETRY to DISK_GEOMETRY_EX. It's needed to handle some Windows 2003's kernel routines. [CDROM] Reflect changes in Class2. [DISK] Reflect changes in Class2. Also added support for IOCTL_DISK_GET_DRIVE_GEOMETRY_EX. Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/storage/class/disk/disk.c trunk/reactos/drivers/storage/class/include/class2.h Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Tue Oct 12 20:17:55 2010 @@ -955,7 +955,7 @@ // deviceExtension->DiskGeometry = - ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY)); + ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY_EX)); if (deviceExtension->DiskGeometry == NULL) { @@ -1006,7 +1006,7 @@ // status = ScsiClassReadDriveCapacity(deviceObject); - bps = deviceExtension->DiskGeometry->BytesPerSector; + bps = deviceExtension->DiskGeometry->Geometry.BytesPerSector; if (!NT_SUCCESS(status) || !bps) { @@ -1037,7 +1037,7 @@ bps = 1 << lastBit; } - deviceExtension->DiskGeometry->BytesPerSector = bps; + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; DebugPrint((2, "CreateCdRomDeviceObject: Calc'd bps = %x\n", bps)); // @@ -2828,12 +2828,12 @@ startingOffset.QuadPart = currentIrpStack->Parameters.Read.ByteOffset.QuadPart + transferByteCount; - if (!deviceExtension->DiskGeometry->BytesPerSector) { - deviceExtension->DiskGeometry->BytesPerSector = 2048; + if (!deviceExtension->DiskGeometry->Geometry.BytesPerSector) { + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 2048; } if ((startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) || - (transferByteCount & (deviceExtension->DiskGeometry->BytesPerSector - 1))) { + (transferByteCount & (deviceExtension->DiskGeometry->Geometry.BytesPerSector - 1))) { DebugPrint((1,"ScsiCdRomRead: Invalid I/O parameters\n")); DebugPrint((1, "\toffset %x:%x, Length %x:%x\n", @@ -2841,7 +2841,7 @@ startingOffset.u.LowPart, deviceExtension->PartitionLength.u.HighPart, deviceExtension->PartitionLength.u.LowPart)); - DebugPrint((1, "\tbps %x\n", deviceExtension->DiskGeometry->BytesPerSector)); + DebugPrint((1, "\tbps %x\n", deviceExtension->DiskGeometry->Geometry.BytesPerSector)); // // Fail request with status of invalid parameters. @@ -3059,11 +3059,11 @@ bps = 1 << lastBit; } - deviceExtension->DiskGeometry->BytesPerSector = bps; + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bps; DebugPrint((2, "CdRomDeviceControlCompletion: Calculated bps %#x\n", - deviceExtension->DiskGeometry->BytesPerSector)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); // // Copy last sector in reverse byte order. @@ -3082,7 +3082,7 @@ WHICH_BIT(bps, deviceExtension->SectorShift); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", - deviceExtension->DiskGeometry->BytesPerSector)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", lastSector + 1)); @@ -3097,7 +3097,7 @@ // Calculate number of cylinders. // - deviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); @@ -3108,7 +3108,7 @@ // This device supports removable media. // - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } else { @@ -3116,20 +3116,20 @@ // Assume media type is fixed disk. // - deviceExtension->DiskGeometry->MediaType = FixedMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; } // // Assume sectors per track are 32; // - deviceExtension->DiskGeometry->SectorsPerTrack = 32; + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; // // Assume tracks per cylinder (number of heads) is 64. // - deviceExtension->DiskGeometry->TracksPerCylinder = 64; + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; // // Copy the device extension's geometry info into the user buffer. @@ -6530,7 +6530,7 @@ // from = (PFOUR_BYTE) &readCapacityBuffer->BytesPerBlock; - to = (PFOUR_BYTE) &deviceExtension->DiskGeometry->BytesPerSector; + to = (PFOUR_BYTE) &deviceExtension->DiskGeometry->Geometry.BytesPerSector; to->Byte0 = from->Byte3; to->Byte1 = from->Byte2; to->Byte2 = from->Byte1; @@ -6540,7 +6540,7 @@ // Using the new BytesPerBlock, calculate and store the SectorShift. // - WHICH_BIT(deviceExtension->DiskGeometry->BytesPerSector, deviceExtension->SectorShift); + WHICH_BIT(deviceExtension->DiskGeometry->Geometry.BytesPerSector, deviceExtension->SectorShift); // // Copy last sector in reverse byte order. @@ -6558,22 +6558,22 @@ // Calculate number of cylinders. // - deviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; // // Assume sectors per track are 32; // - deviceExtension->DiskGeometry->SectorsPerTrack = 32; + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; // // Assume tracks per cylinder (number of heads) is 64. // - deviceExtension->DiskGeometry->TracksPerCylinder = 64; + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; } else { @@ -6660,11 +6660,11 @@ // originalIrp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY)); - deviceExtension->DiskGeometry->BytesPerSector = 2048; + RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY_EX)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 2048; deviceExtension->SectorShift = 11; deviceExtension->PartitionLength.QuadPart = (LONGLONG)(0x7fffffff); - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } } else { @@ -6672,11 +6672,11 @@ // Set up reasonable defaults // - RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY)); - deviceExtension->DiskGeometry->BytesPerSector = 2048; + RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY_EX)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 2048; deviceExtension->SectorShift = 11; deviceExtension->PartitionLength.QuadPart = (LONGLONG)(0x7fffffff); - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } } Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Oct 12 20:17:55 2010 @@ -748,16 +748,16 @@ // in reverse byte order. // - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte0 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte0 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte3; - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte1 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte1 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte2; - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte2 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte2 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte1; - ((PFOUR_BYTE)&deviceExtension->DiskGeometry->BytesPerSector)->Byte3 = + ((PFOUR_BYTE)&deviceExtension->DiskGeometry->Geometry.BytesPerSector)->Byte3 = ((PFOUR_BYTE)&readCapacityBuffer->BytesPerBlock)->Byte0; // @@ -780,10 +780,10 @@ // Calculate sector to byte shift. // - WHICH_BIT(deviceExtension->DiskGeometry->BytesPerSector, deviceExtension->SectorShift); + WHICH_BIT(deviceExtension->DiskGeometry->Geometry.BytesPerSector, deviceExtension->SectorShift); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Sector size is %d\n", - deviceExtension->DiskGeometry->BytesPerSector)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector)); DebugPrint((2,"SCSI ScsiClassReadDriveCapacity: Number of Sectors is %d\n", lastSector + 1)); @@ -798,7 +798,7 @@ // Calculate number of cylinders. // - deviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); @@ -809,7 +809,7 @@ // This device supports removable media. // - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } else { @@ -817,20 +817,20 @@ // Assume media type is fixed disk. // - deviceExtension->DiskGeometry->MediaType = FixedMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; } // // Assume sectors per track are 32; // - deviceExtension->DiskGeometry->SectorsPerTrack = 32; + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; // // Assume tracks per cylinder (number of heads) is 64. // - deviceExtension->DiskGeometry->TracksPerCylinder = 64; + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; } if (status == STATUS_VERIFY_REQUIRED) { @@ -860,8 +860,8 @@ // except for the bytes per sector and sector shift. // - RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY)); - deviceExtension->DiskGeometry->BytesPerSector = 512; + RtlZeroMemory(deviceExtension->DiskGeometry, sizeof(DISK_GEOMETRY_EX)); + deviceExtension->DiskGeometry->Geometry.BytesPerSector = 512; deviceExtension->SectorShift = 9; deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0; @@ -871,7 +871,7 @@ // This device supports removable media. // - deviceExtension->DiskGeometry->MediaType = RemovableMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = RemovableMedia; } else { @@ -879,7 +879,7 @@ // Assume media type is fixed disk. // - deviceExtension->DiskGeometry->MediaType = FixedMedia; + deviceExtension->DiskGeometry->Geometry.MediaType = FixedMedia; } } @@ -2752,7 +2752,7 @@ errorLogEntry->DeviceOffset.QuadPart = (LONGLONG) badSector; errorLogEntry->DeviceOffset = RtlExtendedIntegerMultiply( errorLogEntry->DeviceOffset, - deviceExtension->DiskGeometry->BytesPerSector); + deviceExtension->DiskGeometry->Geometry.BytesPerSector); } errorLogEntry->ErrorCode = logStatus; Modified: trunk/reactos/drivers/storage/class/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.c [iso-8859-1] Tue Oct 12 20:17:55 2010 @@ -652,7 +652,7 @@ NTSTATUS status; PDEVICE_OBJECT deviceObject = NULL; PDEVICE_OBJECT physicalDevice; - PDISK_GEOMETRY diskGeometry = NULL; + PDISK_GEOMETRY_EX diskGeometry = NULL; PDEVICE_EXTENSION deviceExtension = NULL; PDEVICE_EXTENSION physicalDeviceExtension; UCHAR pathId = LunInfo->PathId; @@ -880,7 +880,7 @@ // Allocate buffer for drive geometry. // - diskGeometry = ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY)); + diskGeometry = ExAllocatePool(NonPagedPool, sizeof(DISK_GEOMETRY_EX)); if (diskGeometry == NULL) { @@ -1065,7 +1065,7 @@ ULONG partitionNumber = 0; NTSTATUS status; PDEVICE_OBJECT deviceObject = NULL; - PDISK_GEOMETRY diskGeometry = NULL; + PDISK_GEOMETRY_EX diskGeometry = NULL; PDRIVE_LAYOUT_INFORMATION partitionList = NULL; PDEVICE_EXTENSION deviceExtension; PDEVICE_EXTENSION physicalDeviceExtension; @@ -1087,7 +1087,7 @@ physicalDeviceExtension = PhysicalDeviceObject->DeviceExtension; diskGeometry = physicalDeviceExtension->DiskGeometry; - bytesPerSector = diskGeometry->BytesPerSector; + bytesPerSector = diskGeometry->Geometry.BytesPerSector; // // Make sure sector size is not zero. @@ -1099,7 +1099,7 @@ // Default sector size for disk is 512. // - bytesPerSector = diskGeometry->BytesPerSector = 512; + bytesPerSector = diskGeometry->Geometry.BytesPerSector = 512; } sectorShift = physicalDeviceExtension->SectorShift; @@ -1118,7 +1118,7 @@ // HalExamineMBR(PhysicalDeviceObject, - physicalDeviceExtension->DiskGeometry->BytesPerSector, + physicalDeviceExtension->DiskGeometry->Geometry.BytesPerSector, (ULONG)0x54, (PVOID)&dmSkew); @@ -1149,7 +1149,7 @@ // status = IoReadPartitionTable(PhysicalDeviceObject, - physicalDeviceExtension->DiskGeometry->BytesPerSector, + physicalDeviceExtension->DiskGeometry->Geometry.BytesPerSector, TRUE, (PVOID)&partitionList); @@ -1432,7 +1432,7 @@ // deviceExtension->TimeOutValue = physicalDeviceExtension->TimeOutValue; - deviceExtension->DiskGeometry->BytesPerSector = bytesPerSector; + deviceExtension->DiskGeometry->Geometry.BytesPerSector = bytesPerSector; deviceExtension->SectorShift = sectorShift; deviceExtension->DeviceObject = deviceObject; deviceExtension->DeviceFlags |= physicalDeviceExtension->DeviceFlags; @@ -1512,7 +1512,7 @@ transferByteCount); if ((startingOffset.QuadPart > deviceExtension->PartitionLength.QuadPart) || - (transferByteCount & (deviceExtension->DiskGeometry->BytesPerSector - 1))) { + (transferByteCount & (deviceExtension->DiskGeometry->Geometry.BytesPerSector - 1))) { // // This error maybe caused by the fact that the drive is not ready. @@ -2014,6 +2014,7 @@ } case IOCTL_DISK_GET_DRIVE_GEOMETRY: + case IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: { PDEVICE_EXTENSION physicalDeviceExtension; @@ -2021,8 +2022,12 @@ BOOLEAN removable = FALSE; BOOLEAN listInitialized = FALSE; - if ( irpStack->Parameters.DeviceIoControl.OutputBufferLength < - sizeof( DISK_GEOMETRY ) ) { + if ((irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY && + irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof(DISK_GEOMETRY)) || + (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY_EX && + irpStack->Parameters.DeviceIoControl.OutputBufferLength < + sizeof(DISK_GEOMETRY_EX))) { status = STATUS_INFO_LENGTH_MISMATCH; break; @@ -2083,10 +2088,15 @@ RtlMoveMemory(Irp->AssociatedIrp.SystemBuffer, deviceExtension->DiskGeometry, - sizeof(DISK_GEOMETRY)); + (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? + sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY_EX)); status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); + Irp->IoStatus.Information = + (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_DISK_GET_DRIVE_GEOMETRY) ? + sizeof(DISK_GEOMETRY) : + sizeof(DISK_GEOMETRY_EX); } break; @@ -2285,7 +2295,7 @@ status = IoSetPartitionInformation( deviceExtension->PhysicalDevice, - deviceExtension->DiskGeometry->BytesPerSector, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, diskData->PartitionOrdinal, inputBuffer->PartitionType); @@ -2323,7 +2333,7 @@ // status = IoReadPartitionTable(deviceExtension->PhysicalDevice, - deviceExtension->DiskGeometry->BytesPerSector, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, FALSE, &partitionList); @@ -2504,9 +2514,9 @@ status = IoWritePartitionTable( deviceExtension->DeviceObject, - deviceExtension->DiskGeometry->BytesPerSector, - deviceExtension->DiskGeometry->SectorsPerTrack, - deviceExtension->DiskGeometry->TracksPerCylinder, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack, + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder, partitionList); } @@ -3455,7 +3465,7 @@ // Get sector size. // - sectorSize = DeviceExtension->DiskGeometry->BytesPerSector; + sectorSize = DeviceExtension->DiskGeometry->Geometry.BytesPerSector; // // Make sure sector size is at least 512 bytes. @@ -4102,9 +4112,11 @@ // Update the actual geometry information. // - DeviceExtension->DiskGeometry->SectorsPerTrack = sectorsPerTrack; - DeviceExtension->DiskGeometry->TracksPerCylinder = tracksPerCylinder; - DeviceExtension->DiskGeometry->Cylinders.QuadPart = (LONGLONG)cylinders; + DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack = sectorsPerTrack; + DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder; + DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)cylinders; + DeviceExtension->DiskGeometry->DiskSize.QuadPart = cylinders * tracksPerCylinder * sectorsPerTrack * + DeviceExtension->DiskGeometry->Geometry.BytesPerSector; DebugPrint((3, "SCSIDISK: UpdateGeometry: BIOS spt %x, #heads %x, #cylinders %x\n", @@ -4119,7 +4131,7 @@ if (!DeviceExtension->DMActive) { HalExamineMBR(DeviceExtension->DeviceObject, - DeviceExtension->DiskGeometry->BytesPerSector, + DeviceExtension->DiskGeometry->Geometry.BytesPerSector, (ULONG)0x55, &tmpPtr ); @@ -4155,18 +4167,19 @@ cylinders -= 1; - DeviceExtension->DiskGeometry->Cylinders.QuadPart = cylinders + 1; - DeviceExtension->DiskGeometry->TracksPerCylinder = tracksPerCylinder + 1; + DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = cylinders + 1; + DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder + 1; DeviceExtension->PartitionLength.QuadPart = - DeviceExtension->DiskGeometry->Cylinders.QuadPart * - DeviceExtension->DiskGeometry->SectorsPerTrack * - DeviceExtension->DiskGeometry->BytesPerSector * - DeviceExtension->DiskGeometry->TracksPerCylinder; + DeviceExtension->DiskGeometry->DiskSize.QuadPart = + DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart * + DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack * + DeviceExtension->DiskGeometry->Geometry.BytesPerSector * + DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder; if (DeviceExtension->DMActive) { - DeviceExtension->DMByteSkew = DeviceExtension->DMSkew * DeviceExtension->DiskGeometry->BytesPerSector; + DeviceExtension->DMByteSkew = DeviceExtension->DMSkew * DeviceExtension->DiskGeometry->Geometry.BytesPerSector; } @@ -4250,7 +4263,7 @@ // status = IoReadPartitionTable(deviceExtension->PhysicalDevice, - deviceExtension->DiskGeometry->BytesPerSector, + deviceExtension->DiskGeometry->Geometry.BytesPerSector, TRUE, &partitionList); Modified: trunk/reactos/drivers/storage/class/include/class2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/incl… ============================================================================== --- trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/include/class2.h [iso-8859-1] Tue Oct 12 20:17:55 2010 @@ -112,7 +112,7 @@ PCLASS_CREATE_CLOSE ClassCreateClose; PDRIVER_STARTIO ClassStartIo; PIO_SCSI_CAPABILITIES PortCapabilities; - PDISK_GEOMETRY DiskGeometry; + PDISK_GEOMETRY_EX DiskGeometry; PDEVICE_OBJECT PhysicalDevice; PSENSE_DATA SenseData; ULONG TimeOutValue;

14 years, 2 months

[ekohl] 49128: [D3D] Preparations for update to widl 1.3.4.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Oct 12 20:07:58 2010 New Revision: 49128 URL: http://svn.reactos.org/svn/reactos?rev=49128&view=rev Log: [D3D] Preparations for update to widl 1.3.4. Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Tue Oct 12 20:07:58 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" unicode="yes"> +<module name="d3d8" type="win32dll" installbase="system32" installname="d3d8.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="d3d8.spec" /> <include base="d3d8">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… ============================================================================== --- trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3d9/d3d9.rbuild [iso-8859-1] Tue Oct 12 20:07:58 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" unicode="yes"> +<module name="d3d9" type="win32dll" installbase="system32" installname="d3d9.dll" allowwarnings="true" unicode="yes"> <importlibrary definition="d3d9.spec" /> <include base="d3d9">.</include> <include base="ReactOS">include/reactos/wine</include>

14 years, 2 months

[cgutman] 49127: [HAL] - Check that the interrupt line is not 255 - Check that the interrupt pin is not 0 - Fixes a failed assertion that Caemyr experienced with an ATI Rage graphics card

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Oct 12 20:02:15 2010 New Revision: 49127 URL: http://svn.reactos.org/svn/reactos?rev=49127&view=rev Log: [HAL] - Check that the interrupt line is not 255 - Check that the interrupt pin is not 0 - Fixes a failed assertion that Caemyr experienced with an ATI Rage graphics card Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Tue Oct 12 20:02:15 2010 @@ -753,7 +753,9 @@ } /* Interrupt resource */ - if (0 != PciConfig.u.type0.InterruptLine) + if (0 != PciConfig.u.type0.InterruptPin && + 0 != PciConfig.u.type0.InterruptLine && + 0xFF != PciConfig.u.type0.InterruptLine) ResourceCount++; /* Allocate output buffer and initialize */ @@ -806,7 +808,9 @@ } } - if (0 != PciConfig.u.type0.InterruptLine) + if (0 != PciConfig.u.type0.InterruptPin && + 0 != PciConfig.u.type0.InterruptLine && + 0xFF != PciConfig.u.type0.InterruptLine) { Descriptor->Type = CmResourceTypeInterrupt; Descriptor->ShareDisposition = CmResourceShareShared; /* FIXME Just a guess */ Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Tue Oct 12 20:02:15 2010 @@ -785,7 +785,9 @@ if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x200) DbgPrint(" medium devsel,"); if ((PciData->Status & PCI_STATUS_DEVSEL) == 0x400) DbgPrint(" fast devsel,"); DbgPrint(" latency %d", PciData->LatencyTimer); - if (PciData->u.type0.InterruptLine) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); + if (PciData->u.type0.InterruptPin != 0 && + PciData->u.type0.InterruptLine != 0 && + PciData->u.type0.InterruptLine != 0xFF) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); DbgPrint("\n"); /* Scan addresses */

14 years, 2 months

[fireball] 49126: [HEAP] - Implement heap validation support.

by fireball＠svn.reactos.org

Author: fireball Date: Tue Oct 12 18:34:48 2010 New Revision: 49126 URL: http://svn.reactos.org/svn/reactos?rev=49126&view=rev Log: [HEAP] - Implement heap validation support. Modified: trunk/reactos/lib/rtl/heap_rewrite.c Modified: trunk/reactos/lib/rtl/heap_rewrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap_rewrite.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap_rewrite.c [iso-8859-1] Tue Oct 12 18:34:48 2010 @@ -66,6 +66,20 @@ return RtlpBitsClearLow[(Bits >> 24) & 0xFF] + 24; /* Highest byte */ } } + +/* Maximum size of a tail-filling pattern used for compare operation */ +UCHAR FillPattern[HEAP_ENTRY_SIZE] = +{ + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL, + HEAP_TAIL_FILL +}; + ULONG NTAPI RtlCompareMemoryUlong(PVOID Source, ULONG Length, ULONG Value); @@ -3160,6 +3174,437 @@ return EntrySize; } +BOOLEAN NTAPI +RtlpCheckInUsePattern(PHEAP_ENTRY HeapEntry) +{ + SIZE_T Size, Result; + PCHAR TailPart; + + /* Calculate size */ + if (HeapEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC) + Size = RtlpGetSizeOfBigBlock(HeapEntry); + else + Size = (HeapEntry->Size << HEAP_ENTRY_SHIFT) - HeapEntry->UnusedBytes; + + /* Calculate pointer to the tail part of the block */ + TailPart = (PCHAR)(HeapEntry + 1) + Size; + + /* Compare tail pattern */ + Result = RtlCompareMemory(TailPart, + FillPattern, + HEAP_ENTRY_SIZE); + + if (Result != HEAP_ENTRY_SIZE) + { + DPRINT1("HEAP: Heap entry (size %x) %p tail is modified at %p\n", Size, HeapEntry, TailPart + Result); + return FALSE; + } + + /* All is fine */ + return TRUE; +} + +BOOLEAN NTAPI +RtlpValidateHeapHeaders( + PHEAP Heap, + BOOLEAN Recalculate) +{ + // We skip header validation for now + return TRUE; +} + +BOOLEAN NTAPI +RtlpValidateHeapEntry( + PHEAP Heap, + PHEAP_ENTRY HeapEntry) +{ + BOOLEAN BigAllocation, EntryFound = FALSE; + PHEAP_SEGMENT Segment; + ULONG SegmentOffset; + + /* Perform various consistency checks of this entry */ + if (!HeapEntry) goto invalid_entry; + if ((ULONG_PTR)HeapEntry & (HEAP_ENTRY_SIZE - 1)) goto invalid_entry; + if (!(HeapEntry->Flags & HEAP_ENTRY_BUSY)) goto invalid_entry; + + BigAllocation = HeapEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC; + Segment = Heap->Segments[HeapEntry->SegmentOffset]; + + if (BigAllocation && + (((ULONG_PTR)HeapEntry & (PAGE_SIZE - 1)) != FIELD_OFFSET(HEAP_VIRTUAL_ALLOC_ENTRY, BusyBlock))) + goto invalid_entry; + + if (!BigAllocation && (HeapEntry->SegmentOffset >= HEAP_SEGMENTS || + !Segment || + HeapEntry < Segment->FirstEntry || + HeapEntry >= Segment->LastValidEntry)) + goto invalid_entry; + + if ((HeapEntry->Flags & HEAP_ENTRY_FILL_PATTERN) && + !RtlpCheckInUsePattern(HeapEntry)) + goto invalid_entry; + + /* Checks are done, if this is a virtual entry, that's all */ + if (HeapEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC) return TRUE; + + /* Go through segments and check if this entry fits into any of them */ + for (SegmentOffset = 0; SegmentOffset < HEAP_SEGMENTS; SegmentOffset++) + { + Segment = Heap->Segments[SegmentOffset]; + if (!Segment) continue; + + if ((HeapEntry >= Segment->FirstEntry) && + (HeapEntry < Segment->LastValidEntry)) + { + /* Got it */ + EntryFound = TRUE; + break; + } + } + + /* Return our result of finding entry in the segments */ + return EntryFound; + +invalid_entry: + DPRINT1("HEAP: Invalid heap entry %p in heap %p\n", HeapEntry, Heap); + return FALSE; +} + +BOOLEAN NTAPI +RtlpValidateHeapSegment( + PHEAP Heap, + PHEAP_SEGMENT Segment, + UCHAR SegmentOffset, + PULONG FreeEntriesCount, + PSIZE_T TotalFreeSize, + PSIZE_T TagEntries, + PSIZE_T PseudoTagEntries) +{ + PHEAP_UCR_DESCRIPTOR UcrDescriptor; + PLIST_ENTRY UcrEntry; + SIZE_T ByteSize, Size, Result; + PHEAP_ENTRY CurrentEntry; + ULONG UnCommittedPages; + ULONG UnCommittedRanges; + ULONG PreviousSize; + + UnCommittedPages = 0; + UnCommittedRanges = 0; + + if (IsListEmpty(&Segment->UCRSegmentList)) + { + UcrEntry = NULL; + UcrDescriptor = NULL; + } + else + { + UcrEntry = Segment->UCRSegmentList.Flink; + UcrDescriptor = CONTAINING_RECORD(UcrEntry, HEAP_UCR_DESCRIPTOR, SegmentEntry); + } + + if (Segment->BaseAddress == Heap) + CurrentEntry = &Heap->Entry; + else + CurrentEntry = &Segment->Entry; + + while (CurrentEntry < Segment->LastValidEntry) + { + if (UcrDescriptor && + ((PVOID)CurrentEntry >= UcrDescriptor->Address)) + { + DPRINT1("HEAP: Entry %p is not inside uncommited range [%p .. %p)\n", + CurrentEntry, UcrDescriptor->Address, + (PCHAR)UcrDescriptor->Address + UcrDescriptor->Size); + + return FALSE; + } + + PreviousSize = 0; + + while (CurrentEntry < Segment->LastValidEntry) + { + if (PreviousSize != CurrentEntry->PreviousSize) + { + DPRINT1("HEAP: Entry %p has incorrect PreviousSize %x instead of %x\n", + CurrentEntry, CurrentEntry->PreviousSize, PreviousSize); + + return FALSE; + } + + PreviousSize = CurrentEntry->Size; + Size = CurrentEntry->Size << HEAP_ENTRY_SHIFT; + + if (CurrentEntry->Flags & HEAP_ENTRY_BUSY) + { + if (TagEntries) + { + UNIMPLEMENTED; + } + + /* Check fill pattern */ + if (CurrentEntry->Flags & HEAP_ENTRY_FILL_PATTERN) + { + if (!RtlpCheckInUsePattern(CurrentEntry)) + return FALSE; + } + } + else + { + /* The entry is free, increase free entries count and total free size */ + *FreeEntriesCount = *FreeEntriesCount + 1; + *TotalFreeSize += CurrentEntry->Size; + + if ((Heap->Flags & HEAP_FREE_CHECKING_ENABLED) && + (CurrentEntry->Flags & HEAP_ENTRY_FILL_PATTERN)) + { + ByteSize = Size - sizeof(HEAP_FREE_ENTRY); + + if ((CurrentEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) && + (ByteSize > sizeof(HEAP_FREE_ENTRY_EXTRA))) + { + ByteSize -= sizeof(HEAP_FREE_ENTRY_EXTRA); + } + + Result = RtlCompareMemoryUlong((PCHAR)((PHEAP_FREE_ENTRY)CurrentEntry + 1), + ByteSize, + ARENA_FREE_FILLER); + + if (Result != ByteSize) + { + DPRINT1("HEAP: Free heap block %p modified at %p after it was freed\n", + CurrentEntry, + (PCHAR)(CurrentEntry + 1) + Result); + + return FALSE; + } + } + } + + if (CurrentEntry->SegmentOffset != SegmentOffset) + { + DPRINT1("HEAP: Heap entry %p SegmentOffset is incorrect %x (should be %x)\n", CurrentEntry, SegmentOffset, CurrentEntry->SegmentOffset); + return FALSE; + } + + /* Check if it's the last entry */ + if (CurrentEntry->Flags & HEAP_ENTRY_LAST_ENTRY) + { + CurrentEntry = (PHEAP_ENTRY)((PCHAR)CurrentEntry + Size); + + if (!UcrDescriptor) + { + /* Check if it's not really the last one */ + if (CurrentEntry != Segment->LastValidEntry) + { + DPRINT1("HEAP: Heap entry %p is not last block in segment (%x)\n", CurrentEntry, Segment->LastValidEntry); + return FALSE; + } + } + else if (CurrentEntry != UcrDescriptor->Address) + { + DPRINT1("HEAP: Heap entry %p does not match next uncommitted address (%p)\n", + CurrentEntry, UcrDescriptor->Address); + + return FALSE; + } + else + { + UnCommittedPages += (UcrDescriptor->Size / PAGE_SIZE); + UnCommittedRanges++; + + CurrentEntry = (PHEAP_ENTRY)((PCHAR)UcrDescriptor->Address + UcrDescriptor->Size); + + /* Go to the next UCR descriptor */ + UcrEntry = UcrEntry->Flink; + if (UcrEntry == &Segment->UCRSegmentList) + { + UcrEntry = NULL; + UcrDescriptor = NULL; + } + else + { + UcrDescriptor = CONTAINING_RECORD(UcrEntry, HEAP_UCR_DESCRIPTOR, SegmentEntry); + } + } + + break; + } + + /* Advance to the next entry */ + CurrentEntry = (PHEAP_ENTRY)((PCHAR)CurrentEntry + Size); + } + } + + /* Check total numbers of UCP and UCR */ + if (Segment->NumberOfUnCommittedPages != UnCommittedPages) + { + DPRINT1("HEAP: Segment %p NumberOfUnCommittedPages is invalid (%x != %x)\n", + Segment, Segment->NumberOfUnCommittedPages, UnCommittedPages); + + return FALSE; + } + + if (Segment->NumberOfUnCommittedRanges != UnCommittedRanges) + { + DPRINT1("HEAP: Segment %p NumberOfUnCommittedRanges is invalid (%x != %x)\n", + Segment, Segment->NumberOfUnCommittedRanges, UnCommittedRanges); + + return FALSE; + } + + return TRUE; +} + +BOOLEAN NTAPI +RtlpValidateHeap(PHEAP Heap, + BOOLEAN ForceValidation) +{ + PHEAP_SEGMENT Segment; + BOOLEAN EmptyList; + UCHAR SegmentOffset; + SIZE_T Size, TotalFreeSize; + ULONG PreviousSize; + PHEAP_VIRTUAL_ALLOC_ENTRY VirtualAllocBlock; + PLIST_ENTRY ListHead, NextEntry; + PHEAP_FREE_ENTRY FreeEntry; + ULONG FreeBlocksCount, FreeListEntriesCount; + + /* Check headers */ + if (!RtlpValidateHeapHeaders(Heap, FALSE)) + return FALSE; + + /* Skip validation if it's not needed */ + if (!ForceValidation && !(Heap->Flags & HEAP_VALIDATE_ALL_ENABLED)) + return TRUE; + + /* Check free lists bitmaps */ + FreeListEntriesCount = 0; + ListHead = &Heap->FreeLists[0]; + + for (Size = 0; Size < HEAP_FREELISTS; Size++) + { + if (Size) + { + /* This is a dedicated list. Check if it's empty */ + EmptyList = IsListEmpty(ListHead); + + if (Heap->u.FreeListsInUseBytes[Size >> 3] & (1 << (Size & 7))) + { + if (EmptyList) + { + DPRINT1("HEAP: Empty %x-free list marked as non-empty\n", Size); + return FALSE; + } + } + else + { + if (!EmptyList) + { + DPRINT1("HEAP: Non-empty %x-free list marked as empty\n", Size); + return FALSE; + } + } + } + + /* Now check this list entries */ + NextEntry = ListHead->Flink; + PreviousSize = 0; + + while (ListHead != NextEntry) + { + FreeEntry = CONTAINING_RECORD(NextEntry, HEAP_FREE_ENTRY, FreeList); + NextEntry = NextEntry->Flink; + + /* If there is an in-use entry in a free list - that's quite a big problem */ + if (FreeEntry->Flags & HEAP_ENTRY_BUSY) + { + DPRINT1("HEAP: %x-dedicated list free element %x is marked in-use\n", Size, FreeEntry); + return FALSE; + } + + /* Check sizes according to that specific list's size */ + if ((Size == 0) && (FreeEntry->Size < HEAP_FREELISTS)) + { + DPRINT1("HEAP: Non dedicated list free element %x has size %x which would fit a dedicated list\n", FreeEntry, FreeEntry->Size); + return FALSE; + } + else if (Size && (FreeEntry->Size != Size)) + { + DPRINT1("HEAP: %x-dedicated list free element %x has incorrect size %x\n", Size, FreeEntry, FreeEntry->Size); + return FALSE; + } + else if ((Size == 0) && (FreeEntry->Size < PreviousSize)) + { + DPRINT1("HEAP: Non dedicated list free element %x is not put in order\n", FreeEntry); + return FALSE; + } + + /* Remember previous size*/ + PreviousSize = FreeEntry->Size; + + /* Add up to the total amount of free entries */ + FreeListEntriesCount++; + } + + /* Go to the head of the next free list */ + ListHead++; + } + + /* Check big allocations */ + ListHead = &Heap->VirtualAllocdBlocks; + NextEntry = ListHead->Flink; + + while (ListHead != NextEntry) + { + VirtualAllocBlock = CONTAINING_RECORD(NextEntry, HEAP_VIRTUAL_ALLOC_ENTRY, Entry); + + /* We can only check the fill pattern */ + if (VirtualAllocBlock->BusyBlock.Flags & HEAP_ENTRY_FILL_PATTERN) + { + if (!RtlpCheckInUsePattern(&VirtualAllocBlock->BusyBlock)) + return FALSE; + } + + NextEntry = NextEntry->Flink; + } + + /* Check all segments */ + FreeBlocksCount = 0; + TotalFreeSize = 0; + + for (SegmentOffset = 0; SegmentOffset < HEAP_SEGMENTS; SegmentOffset++) + { + Segment = Heap->Segments[SegmentOffset]; + + /* Go to the next one if there is no segment */ + if (!Segment) continue; + + if (!RtlpValidateHeapSegment(Heap, + Segment, + SegmentOffset, + &FreeBlocksCount, + &TotalFreeSize, + NULL, + NULL)) + { + return FALSE; + } + } + + if (FreeListEntriesCount != FreeBlocksCount) + { + DPRINT1("HEAP: Free blocks count in arena (%d) does not match free blocks number in the free lists (%d)\n", FreeBlocksCount, FreeListEntriesCount); + return FALSE; + } + + if (Heap->TotalFreeSize != TotalFreeSize) + { + DPRINT1("HEAP: Total size of free blocks in arena (%d) does not equal to the one in heap header (%d)\n", TotalFreeSize, Heap->TotalFreeSize); + return FALSE; + } + + return TRUE; +} /*********************************************************************** * RtlValidateHeap @@ -3180,15 +3625,47 @@ * @implemented */ BOOLEAN NTAPI RtlValidateHeap( - HANDLE Heap, + HANDLE HeapPtr, ULONG Flags, PVOID Block ) { - UNIMPLEMENTED; - - /* Imitate success */ - return TRUE; + PHEAP Heap = (PHEAP)HeapPtr; + BOOLEAN HeapLocked = FALSE; + BOOLEAN HeapValid; + + // FIXME Check for special heap + + /* Check signature */ + if (Heap->Signature != HEAP_SIGNATURE) + { + DPRINT1("HEAP: Signature %x is invalid for heap %p\n", Heap->Signature, Heap); + return FALSE; + } + + /* Force flags */ + Flags = Heap->ForceFlags; + + /* Acquire the lock if necessary */ + if (!(Flags & HEAP_NO_SERIALIZE)) + { + RtlEnterHeapLock(Heap->LockVariable); + HeapLocked = TRUE; + } + + /* Either validate whole heap or just one entry */ + if (!Block) + HeapValid = RtlpValidateHeap(Heap, TRUE); + else + HeapValid = RtlpValidateHeapEntry(Heap, (PHEAP_ENTRY)Block - 1); + + /* Unlock if it's lockable */ + if (HeapLocked) + { + RtlLeaveHeapLock(Heap->LockVariable); + } + + return HeapValid; } VOID

14 years, 2 months

← Newer
1
...
23
24
25
26
27
28
29
...
44
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 October 2010