From: yaoyongjie yaoyongjie@uniontech.com
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 | 22 +++++++++++----------- dlls/kernelbase/file.c | 12 ++++++++++++ 2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index be19a248bb4..b7a7d978359 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1055,9 +1055,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 "\?" */ @@ -1079,39 +1079,39 @@ static void test_CopyFileW(void) wcscpy(long_path_1, temp_path); wcscat(long_path_1, a); ret = DeleteFileW(long_path_1); - todo_wine ok(ret, "DeleteFileW: error %ld\n", GetLastError()); + ok(ret, "DeleteFileW: error %ld\n", GetLastError()); wcscpy(long_path_2, temp_path); wcscat(long_path_2, b); ret = DeleteFileW(long_path_2); - todo_wine ok(ret, "DeleteFileW: error %ld\n", GetLastError()); + ok(ret, "DeleteFileW: error %ld\n", GetLastError()); } else { wcscpy(long_path_1, temp_path); wcscat(long_path_1, a); ret = DeleteFileW(long_path_1); - todo_wine ok(!ret, "Unexpected DeleteFileW successed, %s\n", wine_dbgstr_w(long_path_1)); + ok(!ret, "Unexpected DeleteFileW successed, %s\n", wine_dbgstr_w(long_path_1)); wcscpy(long_path_2, temp_path); wcscat(long_path_2, b); ret = DeleteFileW(long_path_2); - todo_wine ok(!ret, "Unexpected DeleteFileW successed, %s\n", wine_dbgstr_w(long_path_1)); + ok(!ret, "Unexpected DeleteFileW successed, %s\n", wine_dbgstr_w(long_path_1));
wcscpy(long_path_1, L"\\?\"); wcscat(long_path_1, temp_path); wcscat(long_path_1, a); SetLastError(0xdeadbeef); ret = DeleteFileW(long_path_1); - todo_wine ok(ret, "DeleteFileW: error %ld\n", GetLastError()); + ok(ret, "DeleteFileW: error %ld\n", GetLastError()); wcscpy(long_path_2, L"\\?\"); wcscat(long_path_2, temp_path); wcscat(long_path_2, b); SetLastError(0xdeadbeef); ret = DeleteFileW(long_path_2); - todo_wine ok(ret, "DeleteFileW: error %ld\n", GetLastError()); + ok(ret, "DeleteFileW: error %ld\n", GetLastError()); }
ret = DeleteFileW(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND for DeleteFileW(NULL), but got error %ld\n", GetLastError()); + ok(!ret && GetLastError() == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND for DeleteFileW(NULL), but got error %ld\n", GetLastError());
ret = DeleteFileW(source); ok(ret, "DeleteFileW: error %ld\n", GetLastError()); @@ -1484,11 +1484,11 @@ static void test_CopyFileEx(void) strcpy(long_path_1, temp_path); strcat(long_path_1, a); ret = DeleteFileA(long_path_1); - todo_wine ok(!ret, "Unexpected DeleteFileA successed, %s\n", long_path_1); + ok(!ret, "Unexpected DeleteFileA successed, %s\n", long_path_1); strcpy(long_path_2, temp_path); strcat(long_path_2, b); ret = DeleteFileA(long_path_2); - todo_wine ok(!ret, "Unexpected DeleteFileA successed, %s\n", long_path_2); + ok(!ret, "Unexpected DeleteFileA successed, %s\n", long_path_2);
strcpy(long_path_1, "\\?\"); strcat(long_path_1, temp_path); diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 20b6c5dafac..af0187f9ebc 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1027,6 +1027,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH DeleteFileW( LPCWSTR path )
TRACE( "%s\n", debugstr_w(path) );
+ if (!path) + { + SetLastError( ERROR_PATH_NOT_FOUND ); + return FALSE; + } + + if (!RtlGetCurrentPeb()->IsLongPathAwareProcess && 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 );