marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Calculate SystemProcessInformation's ReturnLength and return it.

oldstable
Akihiro Sagawa 2012-10-23 23:52:35 +09:00 committed by Alexandre Julliard
parent 3fc4e88473
commit bb4a31a8ed
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ntdll/nt.c
View File

@ -1739,9 +1739,8 @@ NTSTATUS WINAPI NtQuerySystemInformation(
/* spi->ti will be set later on */
len += procstructlen;
}
else ret = STATUS_INFO_LENGTH_MISMATCH;
len += procstructlen;
}
}
SERVER_END_REQ;
@ -1751,7 +1750,8 @@ NTSTATUS WINAPI NtQuerySystemInformation(
if (ret == STATUS_NO_MORE_FILES) ret = STATUS_SUCCESS;
break;
}
else /* Length is already checked for */
if (Length >= len)
{
int i, j;
@ -1799,6 +1799,7 @@ NTSTATUS WINAPI NtQuerySystemInformation(
}
}
if (ret == STATUS_SUCCESS && last) last->NextEntryOffset = 0;
if (len > Length) ret = STATUS_INFO_LENGTH_MISMATCH;
if (hSnap) NtClose(hSnap);
}
break;

2
dlls/ntdll/tests/info.c
View File

@ -289,7 +289,7 @@ static void test_query_process(void)
ReturnLength = 0;
status = pNtQuerySystemInformation(SystemProcessInformation, NULL, 0, &ReturnLength);
ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_LENGTH_MISMATCH got %08x\n", status);
todo_wine ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */,
ok( ReturnLength > 0 || broken(ReturnLength == 0) /* NT4, Win2K */,
"Expected a ReturnLength to show the needed length\n");
/* W2K3 and later returns the needed length, the rest returns 0, so we have to loop */