Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

merged in MDL fix and a makefile mod from the 0.1.4 release branch. This represents the last of the merging from the branch and officially closes it out.

Browse source 
svn path=/trunk/; revision=6332
This commit is contained in:
Vizzini 2003-10-15 22:16:44 +00:00
parent 194a827c38
commit 46fe6c1b84
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/Makefile
View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.174 2003/10/07 07:47:21 gvg Exp $
# $Id: Makefile,v 1.175 2003/10/15 22:16:43 vizzini Exp $
#
# Global makefile
#
@ -166,7 +166,6 @@ bootcd_directory_layout: freeldr
$(CP) ${FREELDR_DIR}/bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin
$(CP) ${FREELDR_DIR}/bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin
$(CP) ${FREELDR_DIR}/freeldr/obj/i386/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys
$(CP) ${FREELDR_DIR}/FREELDR.INI ${BOOTCD_DIR}/loader/freeldr.ini
$(CP) ${FREELDR_DIR}/freeldr/obj/i386/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys
bootcd_bootstrap_files: $(COMPONENTS:%=%_bootcd) $(HALS:%=%_bootcd) $(BUS:%=%_bootcd) \

4
reactos/drivers/storage/class2/class2.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: class2.c,v 1.40 2003/09/20 22:44:22 weiden Exp $
/* $Id: class2.c,v 1.41 2003/10/15 22:16:44 vizzini Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -1880,7 +1880,7 @@ ScsiClassSplitRequest(IN PDEVICE_OBJECT DeviceObject,
DeviceExtension = DeviceObject->DeviceExtension;
CurrentStack = IoGetCurrentIrpStackLocation(Irp);
NextStack = IoGetNextIrpStackLocation(Irp);
DataBuffer = MmGetMdlVirtualAddress(Irp->MdlAddress);
DataBuffer = MmGetSystemAddressForMdl(Irp->MdlAddress);
/* Initialize transfer data for first request */
Offset = CurrentStack->Parameters.Read.ByteOffset;