Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 20:50:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB] Introduce and use a UnMapAndCloseFile() macro that calls UnMapFile() and NtClose() on handles returned by the OpenAndMapFile() function.

Browse source 
svn path=/branches/setup_improvements/; revision=75651
svn path=/branches/setup_improvements/; revision=75657
This commit is contained in:
Hermès Bélusca-Maïto 2017-08-23 12:20:15 +00:00
parent 29fe31df1b
commit a80f803a2a
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
5 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
base/setup/lib/bldrsup.c
View file

@ -461,8 +461,9 @@ OpenIniBootLoaderStore(
DPRINT1("IniCacheLoadFromMemory() failed (Status 0x%08lx)\n", Status); DPRINT1("IniCacheLoadFromMemory() failed (Status 0x%08lx)\n", Status);
/* Finally, unmap and close the file */ /* Finally, unmap and close the file */
UnMapFile(BootStore->SectionHandle, BootStore->ViewBase); UnMapAndCloseFile(BootStore->FileHandle,
NtClose(BootStore->FileHandle); BootStore->SectionHandle,
BootStore->ViewBase);
RtlFreeHeap(ProcessHeap, 0, BootStore); RtlFreeHeap(ProcessHeap, 0, BootStore);
return Status; return Status;
@ -715,8 +716,9 @@ Quit:
if (BootStore->SectionHandle) if (BootStore->SectionHandle)
{ {
/* Finally, unmap and close the file */ /* Finally, unmap and close the file */
UnMapFile(BootStore->SectionHandle, BootStore->ViewBase); UnMapAndCloseFile(BootStore->FileHandle,
NtClose(BootStore->FileHandle); BootStore->SectionHandle,
BootStore->ViewBase);
} }
else // if (BootStore->FileHandle) else // if (BootStore->FileHandle)
{ {

6
base/setup/lib/filesup.h
View file

@ -100,4 +100,10 @@ UnMapFile(
IN HANDLE SectionHandle, IN HANDLE SectionHandle,
IN PVOID BaseAddress); IN PVOID BaseAddress);
#define UnMapAndCloseFile(FileHandle, SectionHandle, BaseAddress) \
do { \
UnMapFile((SectionHandle), (BaseAddress)); \
NtClose(FileHandle); \
} while (0)
/* EOF */ /* EOF */

9
base/setup/lib/osdetect.c
View file

@ -284,7 +284,7 @@ CheckForValidPEAndVendor(
{ {
DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", PathNameToFile); DPRINT1("File '%S' does not seem to be a valid PE, bail out\n", PathNameToFile);
Status = STATUS_INVALID_IMAGE_FORMAT; Status = STATUS_INVALID_IMAGE_FORMAT;
goto UnmapFile; goto UnmapCloseFile;
} }
/* /*
@ -295,7 +295,7 @@ CheckForValidPEAndVendor(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", PathNameToFile, Status); DPRINT1("Failed to get version resource for file '%S', Status 0x%08lx\n", PathNameToFile, Status);
goto UnmapFile; goto UnmapCloseFile;
} }
Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen); Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen);
@ -333,10 +333,9 @@ CheckForValidPEAndVendor(
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
DPRINT1("No version vendor found for file '%S'\n", PathNameToFile); DPRINT1("No version vendor found for file '%S'\n", PathNameToFile);
UnmapFile: UnmapCloseFile:
/* Finally, unmap and close the file */ /* Finally, unmap and close the file */
UnMapFile(SectionHandle, ViewBase); UnMapAndCloseFile(FileHandle, SectionHandle, ViewBase);
NtClose(FileHandle);
return Success; return Success;
} }

2
base/setup/lib/partlist.c
View file

@ -841,7 +841,7 @@ SetDiskSignature(
continue; continue;
} }
/* check if the signature already exist */ /* Check if the signature already exist */
/* FIXME: /* FIXME:
* Check also signatures from disks, which are * Check also signatures from disks, which are
* not visible (bootable) by the bios. * not visible (bootable) by the bios.

3
base/setup/lib/setuplib.c
View file

@ -373,8 +373,7 @@ Quit:
} }
/* Finally, unmap and close the file */ /* Finally, unmap and close the file */
UnMapFile(SectionHandle, ViewBase); UnMapAndCloseFile(UnattendFileHandle, SectionHandle, ViewBase);
NtClose(UnattendFileHandle);
NtClose(FileHandle); NtClose(FileHandle);
#endif #endif