wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Alexandre Julliard : ntdll: Implement NtQueryInformationToken(TokenSessionId).
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: eb69da2a9cbbc4f9893ca6ae43420c71f9b63571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb69da2a9cbbc4f9893ca6ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 16:22:26 2021 +0200 ntdll: Implement NtQueryInformationToken(TokenSessionId). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46595 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 7 +++++-- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 11 ++++++----- server/token.c | 1 + server/trace.c | 1 + 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index 6a088e84e4d..b998750d798 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -418,10 +418,13 @@ NTSTATUS WINAPI NtQueryInformationToken( HANDLE token, TOKEN_INFORMATION_CLASS c break; case TokenSessionId: + SERVER_START_REQ( get_token_info ) { - *(DWORD *)info = 0; - FIXME("QueryInformationToken( ..., TokenSessionId, ...) semi-stub\n"); + req->handle = wine_server_obj_handle( token ); + status = wine_server_call( req ); + if (!status) *(DWORD *)info = reply->session_id; } + SERVER_END_REQ; break; case TokenVirtualizationEnabled: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d6815b7e349..867f99a7627 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4913,12 +4913,12 @@ struct get_token_info_reply struct reply_header __header; luid_t token_id; luid_t modified_id; + unsigned int session_id; int primary; int impersonation_level; int elevation; int group_count; int privilege_count; - char __pad_44[4]; }; @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 723 +#define SERVER_PROTOCOL_VERSION 724 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 8eb7e3e99ca..10402ca2db3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3432,6 +3432,7 @@ struct handle_info @REPLY luid_t token_id; /* locally-unique identifier of the token */ luid_t modified_id; /* locally-unique identifier of the modified version of the token */ + unsigned int session_id; /* token session id */ int primary; /* is the token primary or impersonation? */ int impersonation_level; /* level of impersonation */ int elevation; /* elevation type */ diff --git a/server/request.h b/server/request.h index 19e5a2a84f1..a5490fd215a 100644 --- a/server/request.h +++ b/server/request.h @@ -2088,11 +2088,12 @@ C_ASSERT( FIELD_OFFSET(struct get_token_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_token_info_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, token_id) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, modified_id) == 16 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, primary) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, impersonation_level) == 28 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, elevation) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, group_count) == 36 ); -C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, privilege_count) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, session_id) == 24 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, primary) == 28 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, impersonation_level) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, elevation) == 36 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, group_count) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_token_info_reply, privilege_count) == 44 ); C_ASSERT( sizeof(struct get_token_info_reply) == 48 ); C_ASSERT( FIELD_OFFSET(struct create_linked_token_request, handle) == 12 ); C_ASSERT( sizeof(struct create_linked_token_request) == 16 ); diff --git a/server/token.c b/server/token.c index 9c72c2a6bed..5d2fc9555a2 100644 --- a/server/token.c +++ b/server/token.c @@ -1601,6 +1601,7 @@ DECL_HANDLER(get_token_info) { reply->token_id = token->token_id; reply->modified_id = token->modified_id; + reply->session_id = token->session_id; reply->primary = token->primary; reply->impersonation_level = token->impersonation_level; reply->elevation = token->elevation; diff --git a/server/trace.c b/server/trace.c index f27cc47170b..c65694ad644 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4251,6 +4251,7 @@ static void dump_get_token_info_reply( const struct get_token_info_reply *req ) { dump_luid( " token_id=", &req->token_id ); dump_luid( ", modified_id=", &req->modified_id ); + fprintf( stderr, ", session_id=%08x", req->session_id ); fprintf( stderr, ", primary=%d", req->primary ); fprintf( stderr, ", impersonation_level=%d", req->impersonation_level ); fprintf( stderr, ", elevation=%d", req->elevation );

1 0

Alexandre Julliard : server: Store the session id in the process token.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 2b5cefc92e1bc78b9e5d73a54454a3cba771b19f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b5cefc92e1bc78b9e5d73a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 16:20:08 2021 +0200 server: Store the session id in the process token. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 4 ++-- server/security.h | 3 ++- server/token.c | 19 +++++++++++++------ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/server/process.c b/server/process.c index c2131a2d7e2..15387a2affa 100644 --- a/server/process.c +++ b/server/process.c @@ -664,7 +664,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla if (!parent) { process->handles = alloc_handle_table( process, 0 ); - process->token = token_create_admin( TRUE, -1, TokenElevationTypeFull ); + process->token = token_create_admin( TRUE, -1, TokenElevationTypeFull, default_session_id ); process->affinity = ~0; } else @@ -686,7 +686,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; - process->session_id = default_session_id; + process->session_id = token_get_session_id( process->token ); /* Assign a high security label to the token. The default would be medium * but Wine provides admin access to all applications right now so high diff --git a/server/security.h b/server/security.h index f7e644aa1b7..5388bc9c419 100644 --- a/server/security.h +++ b/server/security.h @@ -54,7 +54,7 @@ extern const PSID security_high_label_sid; /* token functions */ extern struct token *get_token_obj( struct process *process, obj_handle_t handle, unsigned int access ); -extern struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation ); +extern struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation, unsigned int session_id ); extern int token_assign_label( struct token *token, PSID label ); extern struct token *token_duplicate( struct token *src_token, unsigned primary, int impersonation_level, const struct security_descriptor *sd, @@ -66,6 +66,7 @@ extern int token_check_privileges( struct token *token, int all_required, extern const ACL *token_get_default_dacl( struct token *token ); extern const SID *token_get_user( struct token *token ); extern const SID *token_get_primary_group( struct token *token ); +extern unsigned int token_get_session_id( struct token *token ); extern int token_sid_present( struct token *token, const SID *sid, int deny); static inline const ACE_HEADER *ace_next( const ACE_HEADER *ace ) diff --git a/server/token.c b/server/token.c index fed7d93753e..9c72c2a6bed 100644 --- a/server/token.c +++ b/server/token.c @@ -122,7 +122,8 @@ struct token SID *user; /* SID of user this token represents */ SID *owner; /* SID of owner (points to user or one of groups) */ SID *primary_group; /* SID of user's primary group (points to one of groups) */ - unsigned primary; /* is this a primary or impersonation token? */ + unsigned int primary; /* is this a primary or impersonation token? */ + unsigned int session_id; /* token session id */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ TOKEN_SOURCE source; /* source of the token */ int impersonation_level; /* impersonation level this token is capable of if non-primary token */ @@ -537,7 +538,7 @@ static void token_destroy( struct object *obj ) * modified_id may be NULL, indicating that a new modified_id luid should be * allocated. */ -static struct token *create_token( unsigned primary, const SID *user, +static struct token *create_token( unsigned int primary, unsigned int session_id, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, const ACL *default_dacl, TOKEN_SOURCE source, @@ -557,6 +558,7 @@ static struct token *create_token( unsigned primary, const SID *user, list_init( &token->privileges ); list_init( &token->groups ); token->primary = primary; + token->session_id = session_id; /* primary tokens don't have impersonation levels */ if (primary) token->impersonation_level = -1; @@ -677,7 +679,7 @@ struct token *token_duplicate( struct token *src_token, unsigned primary, return NULL; } - token = create_token( primary, src_token->user, NULL, 0, + token = create_token( primary, src_token->session_id, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl, src_token->source, modified_id, impersonation_level, src_token->elevation ); @@ -830,7 +832,7 @@ struct token *get_token_obj( struct process *process, obj_handle_t handle, unsig return (struct token *)get_handle_obj( process, handle, access, &token_ops ); } -struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation ) +struct token *token_create_admin( unsigned primary, int impersonation_level, int elevation, unsigned int session_id ) { struct token *token = NULL; static const SID_IDENTIFIER_AUTHORITY nt_authority = { SECURITY_NT_AUTHORITY }; @@ -890,7 +892,7 @@ struct token *token_create_admin( unsigned primary, int impersonation_level, int { logon_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY|SE_GROUP_LOGON_ID }, }; static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; - token = create_token( primary, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), + token = create_token( primary, session_id, user_sid, admin_groups, ARRAY_SIZE( admin_groups ), admin_privs, ARRAY_SIZE( admin_privs ), default_dacl, admin_source, NULL, impersonation_level, elevation ); /* we really need a primary group */ @@ -1197,6 +1199,11 @@ const SID *token_get_primary_group( struct token *token ) return token->primary_group; } +unsigned int token_get_session_id( struct token *token ) +{ + return token->session_id; +} + int check_object_access(struct token *token, struct object *obj, unsigned int *access) { generic_map_t mapping; @@ -1669,7 +1676,7 @@ DECL_HANDLER(create_linked_token) release_object( token ); return; } - if ((linked = token_create_admin( FALSE, SecurityIdentification, elevation ))) + if ((linked = token_create_admin( FALSE, SecurityIdentification, elevation, token->session_id ))) { reply->linked = alloc_handle( current->process, linked, TOKEN_ALL_ACCESS, 0 ); release_object( linked );

1 0

Alexandre Julliard : ntdll: Return the session id in NtQuerySystemInformation(SystemProcessInformation).
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: b20cbd0d571302e33ab602fa6670a131ae4353ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20cbd0d571302e33ab602fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 16:15:26 2021 +0200 ntdll: Return the session id in NtQuerySystemInformation(SystemProcessInformation). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 1 + include/wine/server_protocol.h | 4 ++-- server/process.c | 1 + server/protocol.def | 2 +- server/trace.c | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 0e601beec15..6bd642c30d1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2294,6 +2294,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, nt_process->dwBasePriority = server_process->priority; nt_process->UniqueProcessId = UlongToHandle(server_process->pid); nt_process->ParentProcessId = UlongToHandle(server_process->parent_pid); + nt_process->SessionId = server_process->session_id; nt_process->HandleCount = server_process->handle_count; get_thread_times( server_process->unix_pid, -1, &nt_process->KernelTime, &nt_process->UserTime ); fill_vm_counters( &nt_process->vmCounters, server_process->unix_pid ); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 92ceaf9f8a4..d6815b7e349 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2010,9 +2010,9 @@ struct process_info int priority; process_id_t pid; process_id_t parent_pid; + unsigned int session_id; int handle_count; int unix_pid; - int __pad; }; @@ -6252,7 +6252,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 722 +#define SERVER_PROTOCOL_VERSION 723 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 8ca19122e74..c2131a2d7e2 100644 --- a/server/process.c +++ b/server/process.c @@ -1874,6 +1874,7 @@ DECL_HANDLER(list_processes) process_info->priority = process->priority; process_info->pid = process->id; process_info->parent_pid = process->parent_id; + process_info->session_id = process->session_id; process_info->handle_count = get_handle_table_count(process); process_info->unix_pid = process->unix_pid; pos += sizeof(*process_info); diff --git a/server/protocol.def b/server/protocol.def index 952f5b193b2..8eb7e3e99ca 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1609,9 +1609,9 @@ struct process_info int priority; process_id_t pid; process_id_t parent_pid; + unsigned int session_id; int handle_count; int unix_pid; - int __pad; /* VARARG(name,unicode_str,name_len); */ /* VARARG(threads,struct thread_info,thread_count); */ }; diff --git a/server/trace.c b/server/trace.c index dee0a893e77..f27cc47170b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1220,9 +1220,9 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) if (size - pos < sizeof(*process)) break; if (pos) fputc( ',', stderr ); dump_timeout( "{start_time=", &process->start_time ); - fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%u,unix_pid=%d,", + fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,session_id=%08x,handle_count=%u,unix_pid=%d,", process->thread_count, process->priority, process->pid, - process->parent_pid, process->handle_count, process->unix_pid ); + process->parent_pid, process->session_id, process->handle_count, process->unix_pid ); pos += sizeof(*process); pos = dump_inline_unicode_string( "name=L\"", pos, process->name_len, size );

1 0

Alexandre Julliard : ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation).
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: bf4105b731b84c053c20796ad122f229fa3889ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf4105b731b84c053c20796a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 15:29:55 2021 +0200 ntdll: Implement NtQueryInformationProcess(ProcessSessionInformation). Signed-off-by: Alexandre Julliard <julliard(a)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 );

1 0

Alexandre Julliard : server: Store session id in the process and return it at process init time.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: ad93413c71b8f36c3303988af524230660ebd154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad93413c71b8f36c3303988a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 1 15:26:47 2021 +0200 server: Store session id in the process and return it at process init time. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 1 - dlls/ntdll/unix/server.c | 1 + include/wine/server_protocol.h | 4 ++-- server/directory.c | 2 +- server/process.c | 1 + server/process.h | 3 +++ server/protocol.def | 1 + server/request.h | 3 ++- server/thread.c | 1 + server/trace.c | 1 + 10 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 5d5562e27c0..077c0058c83 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2006,7 +2006,6 @@ static void init_peb( RTL_USER_PROCESS_PARAMETERS *params, void *module ) peb->ImageSubSystem = main_image_info.SubSystemType; peb->ImageSubSystemMajorVersion = main_image_info.MajorSubsystemVersion; peb->ImageSubSystemMinorVersion = main_image_info.MinorSubsystemVersion; - peb->SessionId = 1; if (NtCurrentTeb()->WowTebOffset) { diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 5e3d7347a24..567f50d0ad7 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1513,6 +1513,7 @@ size_t server_init_process(void) ret = wine_server_call( req ); pid = reply->pid; tid = reply->tid; + peb->SessionId = reply->session_id; info_size = reply->info_size; server_start_time = reply->server_start; supported_machines_count = wine_server_reply_size( reply ) / sizeof(*supported_machines); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d73f493edd3..32cbc928c76 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -933,9 +933,9 @@ struct init_first_thread_reply process_id_t pid; thread_id_t tid; timeout_t server_start; + unsigned int session_id; data_size_t info_size; /* VARARG(machines,ushorts); */ - char __pad_28[4]; }; @@ -6251,7 +6251,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 720 +#define SERVER_PROTOCOL_VERSION 721 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index 30d69459984..ec8187b425a 100644 --- a/server/directory.c +++ b/server/directory.c @@ -462,7 +462,7 @@ void init_directories( struct fd *intl_fd ) /* sessions */ create_session( 0 ); - create_session( 1 ); + create_session( default_session_id ); /* object types */ diff --git a/server/process.c b/server/process.c index 9288bcc27d5..ad79a5ed640 100644 --- a/server/process.c +++ b/server/process.c @@ -686,6 +686,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->affinity = parent->affinity; } if (!process->handles || !process->token) goto error; + process->session_id = default_session_id; /* Assign a high security label to the token. The default would be medium * but Wine provides admin access to all applications right now so high diff --git a/server/process.h b/server/process.h index 0e1a83859d9..55e4d6dced6 100644 --- a/server/process.h +++ b/server/process.h @@ -51,6 +51,7 @@ struct process struct fd *msg_fd; /* fd for sendmsg/recvmsg */ process_id_t id; /* id of the process */ process_id_t group_id; /* group id of the process */ + unsigned int session_id; /* session id */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ @@ -142,4 +143,6 @@ static inline int is_process_init_done( struct process *process ) return process->startup_state == STARTUP_DONE; } +static const unsigned int default_session_id = 1; + #endif /* __WINE_SERVER_PROCESS_H */ diff --git a/server/protocol.def b/server/protocol.def index 59ed5632503..ae9a54197a1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -911,6 +911,7 @@ typedef struct process_id_t pid; /* process id of the new thread's process */ thread_id_t tid; /* thread id of the new thread */ timeout_t server_start; /* server start time */ + unsigned int session_id; /* process session id */ data_size_t info_size; /* total size of startup info */ VARARG(machines,ushorts); /* array of supported machines */ @END diff --git a/server/request.h b/server/request.h index 63b09358612..342f8d159f1 100644 --- a/server/request.h +++ b/server/request.h @@ -752,7 +752,8 @@ C_ASSERT( sizeof(struct init_first_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, pid) == 8 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, server_start) == 16 ); -C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, info_size) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, session_id) == 24 ); +C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, info_size) == 28 ); C_ASSERT( sizeof(struct init_first_thread_reply) == 32 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, unix_tid) == 12 ); C_ASSERT( FIELD_OFFSET(struct init_thread_request, reply_fd) == 16 ); diff --git a/server/thread.c b/server/thread.c index f9535a7b25b..e0c520ee37c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1431,6 +1431,7 @@ DECL_HANDLER(init_first_thread) reply->pid = get_process_id( process ); reply->tid = get_thread_id( current ); + reply->session_id = process->session_id; reply->info_size = get_process_startup_info_size( process ); reply->server_start = server_start_time; set_reply_data( supported_machines, diff --git a/server/trace.c b/server/trace.c index b3eea846453..d5d58c21588 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1530,6 +1530,7 @@ static void dump_init_first_thread_reply( const struct init_first_thread_reply * fprintf( stderr, " pid=%04x", req->pid ); fprintf( stderr, ", tid=%04x", req->tid ); dump_timeout( ", server_start=", &req->server_start ); + fprintf( stderr, ", session_id=%08x", req->session_id ); fprintf( stderr, ", info_size=%u", req->info_size ); dump_varargs_ushorts( ", machines=", cur_size ); }

1 0

Huw Davies : nsiproxy: Implement NDIS ifinfo get_parameter for a few parameters.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: f5238be33012c31af8a7c40023ec65c82e7a1456 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5238be33012c31af8a7c400… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:08 2021 +0100 nsiproxy: Implement NDIS ifinfo get_parameter for a few parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 13 +++++++-- dlls/nsiproxy.sys/ndis.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 207d3941c0d..d7f6ac9c739 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -113,9 +113,7 @@ static void test_nsi_api( void ) err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); -todo_wine ok( !err, "got %d\n", err ); - if (err) continue; ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); @@ -362,12 +360,23 @@ static void test_ndis_ifinfo( void ) ok( !err, "got %d\n", err ); ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + luid_get.Value = ~0u; err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), &rw_get, rw_size, &dyn_get, sizeof(dyn_get), &stat_get, sizeof(stat_get) ); ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), + NSI_PARAM_TYPE_STATIC, &stat_get.if_guid, sizeof(stat_get.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); + FreeMibTable( table ); NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 8e5eccbbf23..647fd650cd3 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -515,6 +515,75 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void return status; } +static NTSTATUS ifinfo_get_rw_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_rw, alias ): + { + IF_COUNTED_STRING *str = (IF_COUNTED_STRING *)data; + if (data_size != sizeof(*str)) return STATUS_INVALID_PARAMETER; + if_counted_string_init( str, entry->if_name ); + return STATUS_SUCCESS; + } + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_static_parameter( struct if_entry *entry, void *data, DWORD data_size, DWORD data_offset ) +{ + switch (data_offset) + { + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_index ): + if (data_size != sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + *(DWORD *)data = entry->if_index; + return STATUS_SUCCESS; + + case FIELD_OFFSET( struct nsi_ndis_ifinfo_static, if_guid ): + if (data_size != sizeof(GUID)) return STATUS_INVALID_PARAMETER; + *(GUID *)data = entry->if_guid; + return STATUS_SUCCESS; + + default: + FIXME( "Offset %#x not handled\n", data_offset ); + } + return STATUS_INVALID_PARAMETER; +} + +static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_luid( (const NET_LUID *)key ); + if (entry) + { + switch (param_type) + { + case NSI_PARAM_TYPE_RW: + status = ifinfo_get_rw_parameter( entry, data, data_size, data_offset ); + break; + case NSI_PARAM_TYPE_STATIC: + status = ifinfo_get_static_parameter( entry, data, data_size, data_offset ); + break; + } + } + + LeaveCriticalSection( &if_list_cs ); + + return status; +} + static const struct module_table tables[] = { { @@ -525,6 +594,7 @@ static const struct module_table tables[] = }, ifinfo_enumerate_all, ifinfo_get_all_parameters, + ifinfo_get_parameter }, { ~0u } };

1 0

Huw Davies : nsi: Implement NsiGetParameterEx().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 794ecdc52406d3b39fa8ac60115ce7460e681639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=794ecdc52406d3b39fa8ac60… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:07 2021 +0100 nsi: Implement NsiGetParameterEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d94222aecfc..08aec49257a 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -257,7 +257,7 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table { struct nsi_get_parameter_ex params; - FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + TRACE( "%d %p %d %p %d %d %p %d %d\n", unk, module, table, key, key_size, param_type, data, data_size, data_offset ); params.unknown[0] = 0; @@ -277,5 +277,32 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table DWORD WINAPI NsiGetParameterEx( struct nsi_get_parameter_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + HANDLE device = get_nsi_device(); + struct nsiproxy_get_parameter *in; + ULONG in_size = FIELD_OFFSET( struct nsiproxy_get_parameter, key[params->key_size] ), received; + DWORD err = ERROR_SUCCESS; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + in = heap_alloc( in_size ); + if (!in) + { + err = ERROR_OUTOFMEMORY; + goto err; + } + in->module = *params->module; + in->first_arg = params->first_arg; + in->table = params->table; + in->key_size = params->key_size; + in->param_type = params->param_type; + in->data_offset = params->data_offset; + memcpy( in->key, params->key, params->key_size ); + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_PARAMETER, in, in_size, params->data, params->data_size, &received, NULL )) + err = GetLastError(); + +err: + heap_free( in ); + CloseHandle( device ); + return err; }

1 0

Huw Davies : nsiproxy: Introduce IOCTL_NSIPROXY_WINE_GET_PARAMETER.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 8f7f4f13279d26badf326f4667404074a962378d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f7f4f13279d26badf326f46… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:06 2021 +0100 nsiproxy: Introduce IOCTL_NSIPROXY_WINE_GET_PARAMETER. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/device.c | 37 ++++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 18 ++++++++++++++++++ dlls/nsiproxy.sys/nsiproxy_private.h | 3 +++ include/wine/nsi.h | 13 +++++++++++++ 4 files changed, 71 insertions(+) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 88c65ff4602..aa1d7a08bf7 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -123,6 +123,39 @@ static void nsiproxy_get_all_parameters( IRP *irp ) irp->IoStatus.Information = (irp->IoStatus.u.Status == STATUS_SUCCESS) ? out_len : 0; } +static void nsiproxy_get_parameter( IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_get_parameter *in = (struct nsiproxy_get_parameter *)irp->AssociatedIrp.SystemBuffer; + DWORD in_len = irpsp->Parameters.DeviceIoControl.InputBufferLength; + void *out = irp->AssociatedIrp.SystemBuffer; + DWORD out_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + struct nsi_get_parameter_ex get_param; + + if (in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[0]) || + in_len < FIELD_OFFSET(struct nsiproxy_get_parameter, key[in->key_size])) + { + irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; + return; + } + + get_param.unknown[0] = 0; + get_param.unknown[1] = 0; + get_param.first_arg = in->first_arg; + get_param.unknown2 = 0; + get_param.module = &in->module; + get_param.table = in->table; + get_param.key = in->key; + get_param.key_size = in->key_size; + get_param.param_type = in->param_type; + get_param.data = out; + get_param.data_size = out_len; + get_param.data_offset = in->data_offset; + + irp->IoStatus.u.Status = nsi_get_parameter_ex( &get_param ); + irp->IoStatus.Information = irp->IoStatus.u.Status == STATUS_SUCCESS ? out_len : 0; +} + static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -142,6 +175,10 @@ static NTSTATUS WINAPI nsi_ioctl( DEVICE_OBJECT *device, IRP *irp ) nsiproxy_get_all_parameters( irp ); break; + case IOCTL_NSIPROXY_WINE_GET_PARAMETER: + nsiproxy_get_parameter( irp ); + break; + default: FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index 2bd8f32fdd7..e4286b5fc93 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -99,3 +99,21 @@ NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) return entry->get_all_parameters( params->key, params->key_size, rw, params->rw_size, dyn, params->dynamic_size, stat, params->static_size ); } + +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) +{ + const struct module_table *entry = get_module_table( params->module, params->table ); + + if (!entry || !entry->get_parameter) + { + WARN( "table not found\n" ); + return STATUS_INVALID_PARAMETER; + } + + if (params->param_type > 2) return STATUS_INVALID_PARAMETER; + if (params->key_size != entry->sizes[0]) return STATUS_INVALID_PARAMETER; + if (params->data_offset + params->data_size > entry->sizes[params->param_type + 1]) + return STATUS_INVALID_PARAMETER; + return entry->get_parameter( params->key, params->key_size, params->param_type, + params->data, params->data_size, params->data_offset ); +} diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index 37cbbd118c0..0cd2a79d59f 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -20,6 +20,7 @@ NTSTATUS nsi_enumerate_all_ex( struct nsi_enumerate_all_ex *params ) DECLSPEC_HIDDEN; NTSTATUS nsi_get_all_parameters_ex( struct nsi_get_all_parameters_ex *params ) DECLSPEC_HIDDEN; +NTSTATUS nsi_get_parameter_ex( struct nsi_get_parameter_ex *params ) DECLSPEC_HIDDEN; struct module_table { @@ -31,6 +32,8 @@ struct module_table NTSTATUS (*get_all_parameters)( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); + NTSTATUS (*get_parameter)( const void *key, DWORD key_size, DWORD param_type, + void *data, DWORD data_size, DWORD data_offset ); }; struct module diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 82183d78190..3327b1f7403 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,7 @@ struct nsi_ndis_ifinfo_static #define IOCTL_NSIPROXY_WINE_ENUMERATE_ALL CTL_CODE(FILE_DEVICE_NETWORK, 0x400, METHOD_BUFFERED, 0) #define IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS CTL_CODE(FILE_DEVICE_NETWORK, 0x401, METHOD_BUFFERED, 0) +#define IOCTL_NSIPROXY_WINE_GET_PARAMETER CTL_CODE(FILE_DEVICE_NETWORK, 0x402, METHOD_BUFFERED, 0) /* input for IOCTL_NSIPROXY_WINE_ENUMERATE_ALL */ struct nsiproxy_enumerate_all @@ -126,6 +127,18 @@ struct nsiproxy_get_all_parameters BYTE key[1]; /* key_size */ }; +/* input for IOCTL_NSIPROXY_WINE_GET_PARAMETER */ +struct nsiproxy_get_parameter +{ + NPI_MODULEID module; + DWORD first_arg; + DWORD table; + DWORD key_size; + DWORD param_type; + DWORD data_offset; + BYTE key[1]; /* key_size */ +}; + /* Undocumented Nsi api */ #define NSI_PARAM_TYPE_RW 0

1 0

Huw Davies : nsiproxy: Implement NDIS ifinfo get_all_parameters.
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: b0ceee347648fea055c550b56da342e3af2d12cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ceee347648fea055c550b5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:05 2021 +0100 nsiproxy: Implement NDIS ifinfo get_all_parameters. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++------ dlls/nsiproxy.sys/ndis.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 35ca0bb07c9..207d3941c0d 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -66,9 +66,7 @@ static void test_nsi_api( void ) err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); -todo_wine ok( !err, "got %d\n", err ); - if (err) break; /* test a selection of members */ ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); @@ -115,7 +113,9 @@ todo_wine err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); +todo_wine ok( !err, "got %d\n", err ); + if (err) continue; ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); @@ -257,11 +257,11 @@ static void test_ndis_ifinfo( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), sizeof(struct nsi_ndis_ifinfo_rw) }; - struct nsi_ndis_ifinfo_rw *rw_tbl; - struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2; - struct nsi_ndis_ifinfo_static *stat_tbl; + struct nsi_ndis_ifinfo_rw *rw_tbl, rw_get; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn_tbl_2, dyn_get; + struct nsi_ndis_ifinfo_static *stat_tbl, stat_get; DWORD err, count, i, rw_size; - NET_LUID *luid_tbl, *luid_tbl_2; + NET_LUID *luid_tbl, *luid_tbl_2, luid_get; MIB_IF_TABLE2 *table; /* Contents of GetIfTable2() keyed by luids */ @@ -356,6 +356,17 @@ static void test_ndis_ifinfo( void ) /* OutQLen */ winetest_pop_context(); } + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl, sizeof(*luid_tbl), + &rw_get, rw_size, &dyn_get, sizeof(dyn_get), + &stat_get, sizeof(stat_get) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &stat_tbl[0].if_guid, &stat_get.if_guid ), "mismatch\n" ); + + luid_get.Value = ~0u; + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, &luid_get, sizeof(luid_get), + &rw_get, rw_size, &dyn_get, sizeof(dyn_get), + &stat_get, sizeof(stat_get) ); + ok( err == ERROR_FILE_NOT_FOUND, "got %d\n", err ); FreeMibTable( table ); NsiFreeTable( luid_tbl_2, NULL, dyn_tbl_2, NULL ); diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index 356a32635a3..8e5eccbbf23 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -118,6 +118,16 @@ static struct if_entry *find_entry_from_index( DWORD index ) return NULL; } +static struct if_entry *find_entry_from_luid( const NET_LUID *luid ) +{ + struct if_entry *entry; + + LIST_FOR_EACH_ENTRY( entry, &if_list, struct if_entry, entry ) + if (entry->if_luid.Value == luid->Value) return entry; + + return NULL; +} + #if defined (SIOCGIFHWADDR) && defined (HAVE_STRUCT_IFREQ_IFR_HWADDR) static NTSTATUS if_get_physical( const char *name, DWORD *type, IF_PHYSICAL_ADDRESS *phys_addr ) { @@ -479,6 +489,32 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d return status; } +static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void *rw_data, DWORD rw_size, + void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + struct if_entry *entry; + NTSTATUS status = STATUS_OBJECT_NAME_NOT_FOUND; + + TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, + dynamic_data, dynamic_size, static_data, static_size ); + + EnterCriticalSection( &if_list_cs ); + + update_if_table(); + + entry = find_entry_from_luid( (const NET_LUID *)key ); + if (entry) + { + ifinfo_fill_entry( entry, NULL, rw_data, dynamic_data, static_data ); + status = STATUS_SUCCESS; + } + + LeaveCriticalSection( &if_list_cs ); + + return status; +} + static const struct module_table tables[] = { { @@ -488,6 +524,7 @@ static const struct module_table tables[] = sizeof(struct nsi_ndis_ifinfo_dynamic), sizeof(struct nsi_ndis_ifinfo_static) }, ifinfo_enumerate_all, + ifinfo_get_all_parameters, }, { ~0u } };

1 0

Huw Davies : nsi: Implement NsiGetAllParametersEx().
by Alexandre Julliard 01 Jul '21

01 Jul '21

Module: wine Branch: master Commit: 0f25a946724324585cfae0e1326a472caf3071be URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f25a946724324585cfae0e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 1 09:27:04 2021 +0100 nsi: Implement NsiGetAllParametersEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 37054dd0de6..d94222aecfc 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -184,7 +184,7 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t { struct nsi_get_all_parameters_ex params; - FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, + TRACE( "%d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); params.unknown[0] = 0; @@ -207,7 +207,49 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) { - return ERROR_CALL_NOT_IMPLEMENTED; + HANDLE device = get_nsi_device(); + struct nsiproxy_get_all_parameters *in; + ULONG in_size = FIELD_OFFSET( struct nsiproxy_get_all_parameters, key[params->key_size] ), received; + ULONG out_size = params->rw_size + params->dynamic_size + params->static_size; + DWORD err = ERROR_SUCCESS; + BYTE *out, *ptr; + + if (device == INVALID_HANDLE_VALUE) return GetLastError(); + + in = heap_alloc( in_size ); + out = heap_alloc( out_size ); + if (!in || !out) + { + err = ERROR_OUTOFMEMORY; + goto err; + } + + in->module = *params->module; + in->first_arg = params->first_arg; + in->table = params->table; + in->key_size = params->key_size; + in->rw_size = params->rw_size; + in->dynamic_size = params->dynamic_size; + in->static_size = params->static_size; + memcpy( in->key, params->key, params->key_size ); + + if (!DeviceIoControl( device, IOCTL_NSIPROXY_WINE_GET_ALL_PARAMETERS, in, in_size, out, out_size, &received, NULL )) + err = GetLastError(); + if (err == ERROR_SUCCESS) + { + ptr = out; + if (params->rw_size) memcpy( params->rw_data, ptr, params->rw_size ); + ptr += params->rw_size; + if (params->dynamic_size) memcpy( params->dynamic_data, ptr, params->dynamic_size ); + ptr += params->dynamic_size; + if (params->static_size) memcpy( params->static_data, ptr, params->static_size ); + } + +err: + heap_free( out ); + heap_free( in ); + CloseHandle( device ); + return err; } DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021