[PATCH v2] kernel32: Ignore FileIoPriorityHintInfo return success

Greg Smith codedonewell at gmail.com
Fri Nov 16 21:09:18 CST 2018


There is no requirement to act on FileIoPriorityHintInfo
Return success when this is passed to SetFileInformationByHandle.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46130
Signed-off-by: Greg Smith <codedonewell at gmail.com>
---
v2: Updated test to move the file test before the file is marked
    for deletion, and reset last error before testing.
---
 dlls/kernel32/file.c       | 5 ++++-
 dlls/kernel32/tests/file.c | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c
index eeccf67e15..80f4a2190d 100644
--- a/dlls/kernel32/file.c
+++ b/dlls/kernel32/file.c
@@ -1103,7 +1103,6 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c
     case FileStreamInfo:
     case FileIdBothDirectoryInfo:
     case FileIdBothDirectoryRestartInfo:
-    case FileIoPriorityHintInfo:
     case FileFullDirectoryInfo:
     case FileFullDirectoryRestartInfo:
     case FileStorageInfo:
@@ -1119,6 +1118,10 @@ BOOL WINAPI SetFileInformationByHandle( HANDLE file, FILE_INFO_BY_HANDLE_CLASS c
         status = NtSetInformationFile( file, &io, info, size, FileDispositionInformation );
         break;
 
+    case FileIoPriorityHintInfo:
+        FIXME( "Ignoring file IO priority hint: %p, %u, %p, %u\n", file, class, info, size );
+        return TRUE;
+
     case FileStandardInfo:
     case FileCompressionInfo:
     case FileAttributeTagInfo:
diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c
index 168bdd5e7b..4b95c95a7f 100644
--- a/dlls/kernel32/tests/file.c
+++ b/dlls/kernel32/tests/file.c
@@ -4914,6 +4914,7 @@ static void test_SetFileInformationByHandle(void)
     FILE_STANDARD_INFO stdinfo = { {{0}},{{0}},0,FALSE,FALSE };
     FILE_COMPRESSION_INFO compressinfo;
     FILE_DISPOSITION_INFO dispinfo;
+    FILE_IO_PRIORITY_HINT_INFO hintinfo;
     char tempFileName[MAX_PATH];
     char tempPath[MAX_PATH];
     HANDLE file;
@@ -4957,6 +4958,13 @@ static void test_SetFileInformationByHandle(void)
     ret = pSetFileInformationByHandle(file, FileRemoteProtocolInfo, &protinfo, sizeof(protinfo));
     ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "got %d, error %d\n", ret, GetLastError());
 
+    /* FileIoPriorityHintInfo: Star Citizen installer fails when this call does not return sucess */
+    SetLastError(0xdeadbeef);
+    memset(&hintinfo,0,sizeof(hintinfo));
+    hintinfo.PriorityHint = IoPriorityHintNormal;
+    ret = pSetFileInformationByHandle(file, FileIoPriorityHintInfo, &hintinfo, sizeof(hintinfo));
+    ok(ret, "setting FileIoPriorityHintInfo got %d, error %d\n", ret, GetLastError());
+
     /* test FileDispositionInfo, additional details already covered by ntdll tests */
     SetLastError(0xdeadbeef);
     ret = pSetFileInformationByHandle(file, FileDispositionInfo, &dispinfo, 0);
-- 
2.17.1




More information about the wine-devel mailing list