wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve stub for NtQueryInformationJobObject and add tests.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-07-31 07:01:43 +02:00
parent 113a63d374
commit 6d60acbb21
5 changed files with 151 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
patches/ntdll-JobObjects/0001-ntdll-Improve-stub-for-NtQueryInformationJobObject.patch Normal file
View File

@@ -0,0 +1,57 @@
From bd3dde0e7077535723fc12ec0e0c16e2e4f91cd9 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 31 Jul 2015 06:56:04 +0200
Subject: ntdll: Improve stub for NtQueryInformationJobObject.
---
dlls/ntdll/sync.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 04c6de30..b0329ab 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -636,7 +636,39 @@ NTSTATUS WINAPI NtQueryInformationJobObject( HANDLE handle, JOBOBJECTINFOCLASS c
ULONG len, PULONG ret_len )
{
FIXME( "stub: %p %u %p %u %p\n", handle, class, info, len, ret_len );
- return STATUS_NOT_IMPLEMENTED;
+
+ if (class >= MaxJobObjectInfoClass)
+ return STATUS_INVALID_PARAMETER;
+
+ switch (class)
+ {
+ case JobObjectExtendedLimitInformation:
+ {
+ JOBOBJECT_EXTENDED_LIMIT_INFORMATION *extended_limit;
+ if (len < sizeof(*extended_limit))
+ return STATUS_INFO_LENGTH_MISMATCH;
+
+ extended_limit = (JOBOBJECT_EXTENDED_LIMIT_INFORMATION *)info;
+ memset(extended_limit, 0, sizeof(*extended_limit));
+ if (ret_len) *ret_len = sizeof(*extended_limit);
+ return STATUS_SUCCESS;
+ }
+
+ case JobObjectBasicLimitInformation:
+ {
+ JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit;
+ if (len < sizeof(*basic_limit))
+ return STATUS_INFO_LENGTH_MISMATCH;
+
+ basic_limit = (JOBOBJECT_BASIC_LIMIT_INFORMATION *)info;
+ memset(basic_limit, 0, sizeof(*basic_limit));
+ if (ret_len) *ret_len = sizeof(*basic_limit);
+ return STATUS_SUCCESS;
+ }
+
+ default:
+ return STATUS_NOT_IMPLEMENTED;
+ }
}
/******************************************************************************
--
2.5.0

61
patches/ntdll-JobObjects/0002-kernel32-tests-Add-basic-tests-for-QueryInformationJ.patch Normal file
View File

@@ -0,0 +1,61 @@
From b3fa2403b0179adbed187dc1cf7e044beb8d620a Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 31 Jul 2015 06:58:14 +0200
Subject: kernel32/tests: Add basic tests for QueryInformationJobObject with
JobObject*LimitInformation info class.
---
dlls/kernel32/tests/process.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
index 9f62e13..113ec35 100644
--- a/dlls/kernel32/tests/process.c
+++ b/dlls/kernel32/tests/process.c
@@ -2304,6 +2304,8 @@ static void test_QueryInformationJobObject(void)
{
char buf[FIELD_OFFSET(JOBOBJECT_BASIC_PROCESS_ID_LIST, ProcessIdList[5])];
PJOBOBJECT_BASIC_PROCESS_ID_LIST pid_list = (JOBOBJECT_BASIC_PROCESS_ID_LIST *)buf;
+ JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info;
+ JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation;
DWORD dwret, ret_len;
PROCESS_INFORMATION pi[2];
HANDLE job;
@@ -2374,6 +2376,34 @@ static void test_QueryInformationJobObject(void)
}
}
+ /* test JobObjectBasicLimitInformation */
+ ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info,
+ sizeof(*basic_limit_info) - 1, &ret_len);
+ ok(!ret, "QueryInformationJobObject expected failure\n");
+ expect_eq_d(ERROR_BAD_LENGTH, GetLastError());
+
+ ret_len = 0xdeadbeef;
+ memset(basic_limit_info, 0x11, sizeof(*basic_limit_info));
+ ret = pQueryInformationJobObject(job, JobObjectBasicLimitInformation, basic_limit_info,
+ sizeof(*basic_limit_info), &ret_len);
+ ok(ret, "QueryInformationJobObject error %u\n", GetLastError());
+ ok(ret_len == sizeof(*basic_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len);
+ expect_eq_d(0, basic_limit_info->LimitFlags);
+
+ /* test JobObjectExtendedLimitInformation */
+ ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info,
+ sizeof(ext_limit_info) - 1, &ret_len);
+ ok(!ret, "QueryInformationJobObject expected failure\n");
+ expect_eq_d(ERROR_BAD_LENGTH, GetLastError());
+
+ ret_len = 0xdeadbeef;
+ memset(&ext_limit_info, 0x11, sizeof(ext_limit_info));
+ ret = pQueryInformationJobObject(job, JobObjectExtendedLimitInformation, &ext_limit_info,
+ sizeof(ext_limit_info), &ret_len);
+ ok(ret, "QueryInformationJobObject error %u\n", GetLastError());
+ ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len);
+ expect_eq_d(0, basic_limit_info->LimitFlags);
+
TerminateProcess(pi[0].hProcess, 0);
CloseHandle(pi[0].hProcess);
CloseHandle(pi[0].hThread);
--
2.5.0

1
patches/ntdll-JobObjects/definition Normal file
View File

@@ -0,0 +1 @@
Fixes: Multiple applications needs better NtQueryInformationJobObject stub