Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-02 12:32:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

CreateFileMappingA/CreateFileMappingW: a NULL size argument for this function should result in the filesize being used. Patch by Gero Kuehn (gero.kuehn@gkware.com).

Browse source 
svn path=/trunk/; revision=8088
This commit is contained in:
Jason Filby 2004-02-08 10:42:15 +00:00
parent 2535445a70
commit 7715328fc5
1 changed files with 40 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
reactos/lib/kernel32/mem/section.c
View file

@ -1,4 +1,4 @@
/* $Id: section.c,v 1.23 2004/01/23 21:16:03 ekohl Exp $ /* $Id: section.c,v 1.24 2004/02/08 10:42:15 jfilby Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -37,6 +37,8 @@ CreateFileMappingA(HANDLE hFile,
ANSI_STRING AnsiName; ANSI_STRING AnsiName;
UNICODE_STRING UnicodeName; UNICODE_STRING UnicodeName;
PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_DESCRIPTOR SecurityDescriptor;
IO_STATUS_BLOCK IoStatusBlock;
FILE_STANDARD_INFORMATION FileStandard;
if ((flProtect & (MASK_PAGE_FLAGS | MASK_SEC_FLAGS)) != flProtect) if ((flProtect & (MASK_PAGE_FLAGS | MASK_SEC_FLAGS)) != flProtect)
{ {
@ -53,8 +55,26 @@ CreateFileMappingA(HANDLE hFile,
SecurityDescriptor = NULL; SecurityDescriptor = NULL;
} }
MaximumSize.u.LowPart = dwMaximumSizeLow; if((dwMaximumSizeLow==0)&&(dwMaximumSizeHigh==0))
MaximumSize.u.HighPart = dwMaximumSizeHigh; {
// MSDN: If dwMaximumSizeLow and dwMaximumSizeHigh are zero, the maximum size of the
// file-mapping object is equal to the current size of the file identified by hFile.
Status = NtQueryInformationFile(hFile,
&IoStatusBlock,
&FileStandard,
sizeof(FILE_STANDARD_INFORMATION),
FileStandardInformation);
if (!NT_SUCCESS(Status))
{
DPRINT("Status 0x%08x obtaining FileStandardInformation for source\n", errCode);
SetLastErrorByStatus(Status);
return NULL;
}
MaximumSize = FileStandard.EndOfFile;
} else {
MaximumSize.u.LowPart = dwMaximumSizeLow;
MaximumSize.u.HighPart = dwMaximumSizeHigh;
}
RtlInitAnsiString(&AnsiName, RtlInitAnsiString(&AnsiName,
(LPSTR)lpName); (LPSTR)lpName);
RtlAnsiStringToUnicodeString(&UnicodeName, RtlAnsiStringToUnicodeString(&UnicodeName,
@ -100,6 +120,8 @@ CreateFileMappingW(HANDLE hFile,
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING UnicodeName; UNICODE_STRING UnicodeName;
PSECURITY_DESCRIPTOR SecurityDescriptor; PSECURITY_DESCRIPTOR SecurityDescriptor;
IO_STATUS_BLOCK IoStatusBlock;
FILE_STANDARD_INFORMATION FileStandard;
if ((flProtect & (MASK_PAGE_FLAGS | MASK_SEC_FLAGS)) != flProtect) if ((flProtect & (MASK_PAGE_FLAGS | MASK_SEC_FLAGS)) != flProtect)
{ {
@ -118,7 +140,21 @@ CreateFileMappingW(HANDLE hFile,
if ((dwMaximumSizeLow == 0) && (dwMaximumSizeHigh == 0)) if ((dwMaximumSizeLow == 0) && (dwMaximumSizeHigh == 0))
{ {
MaximumSizePointer = NULL; // MSDN: If dwMaximumSizeLow and dwMaximumSizeHigh are zero, the maximum size of the
// file-mapping object is equal to the current size of the file identified by hFile.
Status = NtQueryInformationFile(hFile,
&IoStatusBlock,
&FileStandard,
sizeof(FILE_STANDARD_INFORMATION),
FileStandardInformation);
if (!NT_SUCCESS(Status))
{
DPRINT("Status 0x%08x obtaining FileStandardInformation for source\n", errCode);
SetLastErrorByStatus(Status);
return NULL;
}
MaximumSize = FileStandard.EndOfFile;
MaximumSizePointer = &MaximumSize;
} }
else else
{ {