IoStatusBlock is _not_ an optional parameter.

svn path=/trunk/; revision=6545
This commit is contained in:
Eric Kohl 2003-11-06 16:42:16 +00:00
parent 28977a473c
commit 5c34e6b32e
5 changed files with 16 additions and 13 deletions

View file

@ -275,7 +275,7 @@ NdisOpenFile(
NDIS_STRING FullFileName;
OBJECT_ATTRIBUTES ObjectAttributes;
PNDIS_HANDLE_OBJECT FileHandleObject = NULL;
//IO_STATUS_BLOCK IoStatusBlock;
IO_STATUS_BLOCK IoStatusBlock;
ASSERT_IRQL(PASSIVE_LEVEL);
@ -317,7 +317,7 @@ NdisOpenFile(
&FileHandleObject->FileHandle,
FILE_READ_DATA|SYNCHRONIZE,
&ObjectAttributes,
NULL, //&IoStatusBlock, // PIO_STATUS_BLOCK
&IoStatusBlock,
NULL, // PLARGE_INTEGER AllocationSize
0, // ULONG FileAttributes
FILE_SHARE_READ, // ULONG ShareAccess

View file

@ -1,4 +1,4 @@
/* $Id: utils.c,v 1.72 2003/10/30 15:52:29 arty Exp $
/* $Id: utils.c,v 1.73 2003/11/06 16:42:16 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -346,6 +346,7 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
PIMAGE_NT_HEADERS NTHeaders;
PVOID ImageBase;
ULONG ImageSize;
IO_STATUS_BLOCK IoStatusBlock;
NTSTATUS Status;
DPRINT("LdrpMapDllImageFile() called\n");
@ -390,7 +391,7 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
Status = ZwOpenFile(&FileHandle,
FILE_ALL_ACCESS,
&FileObjectAttributes,
NULL,
&IoStatusBlock,
0,
0);
if (!NT_SUCCESS(Status))
@ -406,7 +407,7 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
0,
0,
0,
0,
&IoStatusBlock,
BlockBuffer,
sizeof(BlockBuffer),
0,

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: arcname.c,v 1.14 2003/10/12 17:05:44 hbirr Exp $
/* $Id: arcname.c,v 1.15 2003/11/06 16:36:43 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -184,9 +184,9 @@ IopCheckCdromDevices(PULONG DeviceNumber)
HANDLE Handle;
ULONG i;
NTSTATUS Status;
IO_STATUS_BLOCK IoStatusBlock;
#if 0
PFILE_FS_VOLUME_INFORMATION FileFsVolume;
IO_STATUS_BLOCK IoStatusBlock;
USHORT Buffer[FS_VOLUME_BUFFER_SIZE];
FileFsVolume = (PFILE_FS_VOLUME_INFORMATION)Buffer;
@ -211,7 +211,7 @@ IopCheckCdromDevices(PULONG DeviceNumber)
Status = NtOpenFile(&Handle,
FILE_ALL_ACCESS,
&ObjectAttributes,
NULL,
&IoStatusBlock,
0,
0);
DPRINT("NtOpenFile() DeviceNumber %lu Status %lx\n", i, Status);
@ -252,7 +252,7 @@ IopCheckCdromDevices(PULONG DeviceNumber)
Status = NtOpenFile(&Handle,
FILE_ALL_ACCESS,
&ObjectAttributes,
NULL,
&IoStatusBlock,
0,
0);
DPRINT("NtOpenFile() DeviceNumber %lu Status %lx\n", i, Status);
@ -277,6 +277,7 @@ NTSTATUS INIT_FUNCTION
IoCreateSystemRootLink(PCHAR ParameterLine)
{
OBJECT_ATTRIBUTES ObjectAttributes;
IO_STATUS_BLOCK IoStatusBlock;
UNICODE_STRING LinkName;
UNICODE_STRING DeviceName;
UNICODE_STRING ArcName;
@ -435,7 +436,7 @@ IoCreateSystemRootLink(PCHAR ParameterLine)
Status = NtOpenFile(&Handle,
FILE_ALL_ACCESS,
&ObjectAttributes,
NULL,
&IoStatusBlock,
0,
0);
if (!NT_SUCCESS(Status))

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: init.c,v 1.41 2003/10/12 17:05:45 hbirr Exp $
/* $Id: init.c,v 1.42 2003/11/06 16:37:28 ekohl Exp $
*
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/ldr/init.c
@ -63,6 +63,7 @@ LdrpMapProcessImage(PHANDLE SectionHandle,
PUNICODE_STRING ImagePath)
{
OBJECT_ATTRIBUTES ObjectAttributes;
IO_STATUS_BLOCK IoStatusBlock;
HANDLE FileHandle;
NTSTATUS Status;
@ -77,7 +78,7 @@ LdrpMapProcessImage(PHANDLE SectionHandle,
Status = NtOpenFile(&FileHandle,
FILE_ALL_ACCESS,
&ObjectAttributes,
NULL,
&IoStatusBlock,
0,
0);
if (!NT_SUCCESS(Status))

View file

@ -101,7 +101,7 @@ NTSTATUS LdrpMapSystemDll(HANDLE ProcessHandle,
Status = ZwOpenFile(&FileHandle,
FILE_ALL_ACCESS,
&FileObjectAttributes,
NULL,
&Iosb,
FILE_SHARE_READ,
FILE_SYNCHRONOUS_IO_NONALERT);
if (!NT_SUCCESS(Status))