Alexandre Julliard : ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation).
Alexandre Julliard
julliard at winehq.org
Thu Jul 1 15:53:50 CDT 2021
Module: wine
Branch: master
Commit: bf4105b731b84c053c20796ad122f229fa3889ec
URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4105b731b84c053c20796ad122f229fa3889ec
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Jul 1 15:29:55 2021 +0200
ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation).
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/unix/process.c | 16 +++++++++++++++-
include/wine/server_protocol.h | 5 +++--
server/process.c | 1 +
server/protocol.def | 1 +
server/request.h | 7 ++++---
server/trace.c | 1 +
6 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c
index 140e7fc8e0d..90bf01d76fd 100644
--- a/dlls/ntdll/unix/process.c
+++ b/dlls/ntdll/unix/process.c
@@ -987,7 +987,6 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
UNIMPLEMENTED_INFO_CLASS(ProcessWx86Information);
UNIMPLEMENTED_INFO_CLASS(ProcessPriorityBoost);
UNIMPLEMENTED_INFO_CLASS(ProcessDeviceMap);
- UNIMPLEMENTED_INFO_CLASS(ProcessSessionInformation);
UNIMPLEMENTED_INFO_CLASS(ProcessForegroundInformation);
UNIMPLEMENTED_INFO_CLASS(ProcessLUIDDeviceMapsEnabled);
UNIMPLEMENTED_INFO_CLASS(ProcessBreakOnTermination);
@@ -1272,6 +1271,21 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class
else ret = STATUS_INFO_LENGTH_MISMATCH;
break;
+ case ProcessSessionInformation:
+ len = sizeof(DWORD);
+ if (size == len)
+ {
+ SERVER_START_REQ(get_process_info)
+ {
+ req->handle = wine_server_obj_handle( handle );
+ if (!(ret = wine_server_call( req )))
+ *(DWORD *)info = reply->session_id;
+ }
+ SERVER_END_REQ;
+ }
+ else ret = STATUS_INFO_LENGTH_MISMATCH;
+ break;
+
case ProcessWow64Information:
len = sizeof(ULONG_PTR);
if (size != len) ret = STATUS_INFO_LENGTH_MISMATCH;
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 32cbc928c76..92ceaf9f8a4 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -1004,11 +1004,12 @@ struct get_process_info_reply
client_ptr_t peb;
timeout_t start_time;
timeout_t end_time;
+ unsigned int session_id;
int exit_code;
int priority;
unsigned short machine;
/* VARARG(image,pe_image_info); */
- char __pad_58[6];
+ char __pad_62[2];
};
@@ -6251,7 +6252,7 @@ union generic_reply
/* ### protocol_version begin ### */
-#define SERVER_PROTOCOL_VERSION 721
+#define SERVER_PROTOCOL_VERSION 722
/* ### protocol_version end ### */
diff --git a/server/process.c b/server/process.c
index ad79a5ed640..8ca19122e74 100644
--- a/server/process.c
+++ b/server/process.c
@@ -1456,6 +1456,7 @@ DECL_HANDLER(get_process_info)
reply->peb = process->peb;
reply->start_time = process->start_time;
reply->end_time = process->end_time;
+ reply->session_id = process->session_id;
reply->machine = process->machine;
if (get_reply_max_size())
{
diff --git a/server/protocol.def b/server/protocol.def
index ae9a54197a1..952f5b193b2 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -957,6 +957,7 @@ typedef struct
client_ptr_t peb; /* PEB address in process address space */
timeout_t start_time; /* process start time */
timeout_t end_time; /* process end time */
+ unsigned int session_id; /* process session id */
int exit_code; /* process exit code */
int priority; /* priority class */
unsigned short machine; /* process architecture */
diff --git a/server/request.h b/server/request.h
index 342f8d159f1..19e5a2a84f1 100644
--- a/server/request.h
+++ b/server/request.h
@@ -781,9 +781,10 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, affinity) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, peb) == 24 );
C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 );
C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 );
-C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 );
-C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 );
-C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 56 );
+C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, session_id) == 48 );
+C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 52 );
+C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 56 );
+C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 60 );
C_ASSERT( sizeof(struct get_process_info_reply) == 64 );
C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_request, handle) == 12 );
C_ASSERT( sizeof(struct get_process_debug_info_request) == 16 );
diff --git a/server/trace.c b/server/trace.c
index d5d58c21588..dee0a893e77 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1584,6 +1584,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re
dump_uint64( ", peb=", &req->peb );
dump_timeout( ", start_time=", &req->start_time );
dump_timeout( ", end_time=", &req->end_time );
+ fprintf( stderr, ", session_id=%08x", req->session_id );
fprintf( stderr, ", exit_code=%d", req->exit_code );
fprintf( stderr, ", priority=%d", req->priority );
fprintf( stderr, ", machine=%04x", req->machine );
More information about the wine-cvs
mailing list