[PATCH v2 4/4] kernelbase: Limit the maximum path length for DeleteFile.

[yaoyongjie]

From: yaoyongjie

In DeleteFile functions, by default, the file name
and path are limited to MAX_PATH characters. To extend this limit
to 32,767 wide characters, need prepend "\\?\" to the path.
---
 dlls/kernel32/tests/file.c | 8 ++++----
 dlls/kernelbase/file.c     | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index f9c4d5583c5..65107a09543 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -960,9 +960,9 @@ static void test_CopyFileW(void)
     ret = CopyFileExW(long_path_1, long_path_2, NULL, NULL, NULL, 0);
     ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "Expected CopyFileExW failed with ERROR_PATH_NOT_FOUND, but got %ld, copy %s -> %s\n", GetLastError(), wine_dbgstr_w(long_path_1), wine_dbgstr_w(long_path_2));
     ret = DeleteFileW(long_path_1);
-    todo_wine ok(!ret, "Unexpected DeleteFileW successed\n");
+    ok(!ret, "Unexpected DeleteFileW successed\n");
     ret = DeleteFileW(long_path_2);
-    todo_wine ok(!ret, "Unexpected DeleteFileW successed\n");
+    ok(!ret, "Unexpected DeleteFileW successed\n");

/* test long file name prepend "\?" */
     wcscpy(long_path_1, L"\\?\");
@@ -1293,9 +1293,9 @@ static void test_CopyFileEx(void)
     retok = CopyFileExA(long_path_1, long_path_2, NULL, NULL, NULL, 0);
     ok(!retok && GetLastError() == ERROR_PATH_NOT_FOUND, "Expected CopyFileExA failed with ERROR_PATH_NOT_FOUND, but got %ld, copy %s -> %s\n", GetLastError(), long_path_1, long_path_2);
     retok = DeleteFileA(long_path_1);
-    todo_wine ok(!retok, "Unexpected DeleteFileA successed\n");
+    ok(!retok, "Unexpected DeleteFileA successed\n");
     retok = DeleteFileA(long_path_2);
-    todo_wine ok(!retok, "Unexpected DeleteFileA successed\n");
+    ok(!retok, "Unexpected DeleteFileA successed\n");

/* test long file name prepend "\?" */
     strcpy(long_path_1, "\\?\");
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index ab601246d28..12532ce5328 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -1025,6 +1025,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileW( LPCWSTR path )

TRACE( "%s\n", debugstr_w(path) );

+    if (path && wcsncmp(path, L"\\?\", 4) && wcslen(path) >= MAX_PATH )
+    {
+        SetLastError( ERROR_PATH_NOT_FOUND );
+        return FALSE;
+    }
+
     if (!RtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ))
     {
         SetLastError( ERROR_PATH_NOT_FOUND );