Skip to content

Commit 5ec361a

Browse files
committed
Fix regression deleting files with mapped references winsiderss#794
1 parent 872a59d commit 5ec361a

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

phlib/native.c

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8470,26 +8470,28 @@ NTSTATUS PhDeleteFileWin32(
84708470
NTSTATUS status;
84718471
HANDLE fileHandle;
84728472

8473-
if (WindowsVersion >= WINDOWS_10_RS5)
8474-
{
8475-
status = PhCreateFileWin32(
8476-
&fileHandle,
8477-
FileName,
8478-
DELETE,
8479-
FILE_ATTRIBUTE_NORMAL,
8480-
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
8481-
FILE_OPEN,
8482-
FILE_NON_DIRECTORY_FILE
8483-
);
8484-
8485-
if (!NT_SUCCESS(status))
8486-
return status;
8487-
8488-
status = PhDeleteFile(fileHandle);
8489-
8490-
NtClose(fileHandle);
8491-
}
8492-
else
8473+
// Disabled due to an error deleting files with mapped references
8474+
// such as the mapped geoip database. See GH #794 (dmex)
8475+
//if (WindowsVersion >= WINDOWS_10_RS5)
8476+
//{
8477+
// status = PhCreateFileWin32(
8478+
// &fileHandle,
8479+
// FileName,
8480+
// DELETE,
8481+
// FILE_ATTRIBUTE_NORMAL,
8482+
// FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
8483+
// FILE_OPEN,
8484+
// FILE_NON_DIRECTORY_FILE
8485+
// );
8486+
//
8487+
// if (!NT_SUCCESS(status))
8488+
// return status;
8489+
//
8490+
// status = PhDeleteFile(fileHandle);
8491+
//
8492+
// NtClose(fileHandle);
8493+
//}
8494+
//else
84938495
{
84948496
status = PhCreateFileWin32(
84958497
&fileHandle,

0 commit comments

Comments
 (0)