From 702adfc3af34db67fe8dad4809c891cb04d7684e Mon Sep 17 00:00:00 2001 From: midipix Date: Jun 18 2019 23:57:25 +0000 Subject: subsystem interfaces: removed unsued / not-implemented vms bits. --- diff --git a/include/ntapi/nt_tty.h b/include/ntapi/nt_tty.h index 58d9521..efeccdc 100644 --- a/include/ntapi/nt_tty.h +++ b/include/ntapi/nt_tty.h @@ -127,9 +127,6 @@ typedef enum _nt_tty_opcode { NT_TTY_AFL_TRACE, NT_TTY_AFL_TRANSFER, NT_TTY_AFL_WAIT, - /* virtual mount system */ - NT_TTY_VMS_QUERY, - NT_TTY_VMS_REQUEST, /* exclusive upper limit */ NT_TTY_CLIENT_OPCODE_CAP } nt_tty_opcode; @@ -241,16 +238,6 @@ typedef struct __attr_ptr_size_aligned__ _nt_tty_section_info { } nt_tty_section_info; -typedef struct __attr_ptr_size_aligned__ _nt_tty_vms_info { - void * hroot; - uint32_t hash; - uint32_t flags; - int64_t key; - nt_guid vms_guid; - nt_port_keys vms_keys; -} nt_tty_vms_info; - - typedef struct __attr_ptr_size_aligned__ _nt_tty_peer_info { uint32_t opcode; uint32_t flags; @@ -415,15 +402,6 @@ typedef struct __attr_ptr_size_aligned__ _nt_tty_section_msg { } nt_tty_section_msg; -typedef struct __attr_ptr_size_aligned__ _nt_tty_vms_msg { - nt_port_message header; - struct { - nt_tty_msg_info ttyinfo; - nt_tty_vms_info vmsinfo; - } data; -} nt_tty_vms_msg; - - typedef struct __attr_ptr_size_aligned__ _nt_tty_peer_msg { nt_port_message header; struct { @@ -546,7 +524,6 @@ typedef struct __attr_ptr_size_aligned__ _nt_tty_port_msg { nt_tty_msg_info ttyinfo; union { nt_tty_register_info reginfo; - nt_tty_vms_info vmsinfo; nt_tty_peer_info peerinfo; nt_tty_sigctl_info ctlinfo; nt_tty_ipc_info ipcinfo; @@ -569,13 +546,11 @@ typedef struct __attr_ptr_size_aligned__ _nt_tty_port_msg { __assert_aligned_size(nt_tty_msg_info, __SIZEOF_POINTER__); __assert_aligned_size(nt_tty_register_info, __SIZEOF_POINTER__); -__assert_aligned_size(nt_tty_vms_info, __SIZEOF_POINTER__); __assert_aligned_size(nt_tty_peer_info, __SIZEOF_POINTER__); __assert_aligned_size(nt_tty_sigctl_info, __SIZEOF_POINTER__); __assert_aligned_size(nt_pty_fd_info, __SIZEOF_POINTER__); __assert_aligned_size(nt_pty_io_info, __SIZEOF_POINTER__); __assert_aligned_size(nt_tty_register_msg, __SIZEOF_POINTER__); -__assert_aligned_size(nt_tty_vms_msg, __SIZEOF_POINTER__); __assert_aligned_size(nt_tty_peer_msg, __SIZEOF_POINTER__); __assert_aligned_size(nt_pty_sigctl_msg, __SIZEOF_POINTER__); __assert_aligned_size(nt_pty_fd_msg, __SIZEOF_POINTER__); @@ -794,14 +769,4 @@ typedef int32_t __stdcall ntapi_tty_request_peer( __in nt_port_attr * peer); -/* virtual mount system */ -typedef int32_t __stdcall ntapi_tty_vms_query( - __in void * hport, - __in nt_tty_vms_info * vmsinfo); - - -typedef int32_t __stdcall ntapi_tty_vms_request( - __in void * hport, - __in nt_tty_vms_info * vmsinfo); - #endif diff --git a/include/ntapi/ntapi.h b/include/ntapi/ntapi.h index 634dd56..ab82ac7 100644 --- a/include/ntapi/ntapi.h +++ b/include/ntapi/ntapi.h @@ -610,8 +610,6 @@ typedef struct _ntapi_vtbl { ntapi_tty_query_information_service * tty_query_information_service; ntapi_tty_query_server_pts_slot_info * tty_query_server_pts_slot_info; ntapi_tty_request_peer * tty_request_peer; - ntapi_tty_vms_query * tty_vms_query; - ntapi_tty_vms_request * tty_vms_request; ntapi_pty_open * pty_open; ntapi_pty_open_pair * pty_open_pair; ntapi_pty_reopen * pty_reopen; diff --git a/project/common.mk b/project/common.mk index e581e9d..5350b61 100644 --- a/project/common.mk +++ b/project/common.mk @@ -136,8 +136,6 @@ COMMON_SRCS = \ src/tty/ntapi_tty_query_information_service.c \ src/tty/ntapi_tty_query_server_pts_slot_info.c \ src/tty/ntapi_tty_request_peer.c \ - src/tty/ntapi_tty_vms_query.c \ - src/tty/ntapi_tty_vms_request.c \ src/unicode/ntapi_uc_unicode_conversion_from_utf16.c \ src/unicode/ntapi_uc_unicode_conversion_from_utf8.c \ src/unicode/ntapi_uc_unicode_validation.c \ diff --git a/src/internal/ntapi.c b/src/internal/ntapi.c index 94b6604..7fa5ceb 100644 --- a/src/internal/ntapi.c +++ b/src/internal/ntapi.c @@ -394,8 +394,6 @@ static int32_t __fastcall __ntapi_init_once(ntapi_vtbl ** pvtbl) __ntapi->tty_query_information_service = __ntapi_tty_query_information_service; __ntapi->tty_query_server_pts_slot_info = __ntapi_tty_query_server_pts_slot_info; __ntapi->tty_request_peer = __ntapi_tty_request_peer; - __ntapi->tty_vms_query = __ntapi_tty_vms_query; - __ntapi->tty_vms_request = __ntapi_tty_vms_request; __ntapi->pty_open = __ntapi_pty_open; __ntapi->pty_open_pair = __ntapi_pty_open_pair; __ntapi->pty_reopen = __ntapi_pty_reopen; diff --git a/src/internal/ntapi_fnapi.h b/src/internal/ntapi_fnapi.h index 5d5f0f6..767e1f3 100644 --- a/src/internal/ntapi_fnapi.h +++ b/src/internal/ntapi_fnapi.h @@ -264,8 +264,6 @@ NTAPI_UFN(tty_query_information_server); NTAPI_UFN(tty_query_information_service); NTAPI_UFN(tty_query_server_pts_slot_info); NTAPI_UFN(tty_request_peer); -NTAPI_UFN(tty_vms_query); -NTAPI_UFN(tty_vms_request); NTAPI_UFN(pty_open); NTAPI_UFN(pty_open_pair); NTAPI_UFN(pty_reopen); diff --git a/src/tty/ntapi_tty_vms_query.c b/src/tty/ntapi_tty_vms_query.c deleted file mode 100644 index cfcfe16..0000000 --- a/src/tty/ntapi_tty_vms_query.c +++ /dev/null @@ -1,40 +0,0 @@ -/********************************************************/ -/* ntapi: Native API core library */ -/* Copyright (C) 2013--2017 Z. Gilboa */ -/* Released under GPLv2 and GPLv3; see COPYING.NTAPI. */ -/********************************************************/ - -#include -#include -#include -#include "ntapi_impl.h" - -int32_t __stdcall __ntapi_tty_vms_query( - __in void * hport, - __in nt_tty_vms_info * vmsinfo) -{ - int32_t status; - nt_tty_vms_msg msg; - - hport = hport ? hport : __ntapi_internals()->hport_tty_session; - - __ntapi->tt_aligned_block_memset( - &msg,0,sizeof(msg)); - - msg.header.msg_type = NT_LPC_NEW_MESSAGE; - msg.header.data_size = sizeof(msg.data); - msg.header.msg_size = sizeof(msg); - msg.data.ttyinfo.opcode = NT_TTY_VMS_QUERY; - - if ((status = __ntapi->zw_request_wait_reply_port(hport,&msg,&msg))) - return status; - else if (msg.data.ttyinfo.status) - return msg.data.ttyinfo.status; - - __ntapi->tt_aligned_block_memcpy( - (uintptr_t *)vmsinfo, - (uintptr_t *)&(msg.data.vmsinfo), - sizeof(*vmsinfo)); - - return NT_STATUS_SUCCESS; -} diff --git a/src/tty/ntapi_tty_vms_request.c b/src/tty/ntapi_tty_vms_request.c deleted file mode 100644 index 5a7f2e0..0000000 --- a/src/tty/ntapi_tty_vms_request.c +++ /dev/null @@ -1,46 +0,0 @@ -/********************************************************/ -/* ntapi: Native API core library */ -/* Copyright (C) 2013--2017 Z. Gilboa */ -/* Released under GPLv2 and GPLv3; see COPYING.NTAPI. */ -/********************************************************/ - -#include -#include -#include -#include "ntapi_impl.h" - -int32_t __stdcall __ntapi_tty_vms_request( - __in void * hport, - __in nt_tty_vms_info * vmsinfo) -{ - int32_t status; - nt_tty_vms_msg msg; - - hport = hport ? hport : __ntapi_internals()->hport_tty_session; - - __ntapi->tt_aligned_block_memset( - &msg,0, - sizeof(nt_port_message) + sizeof(nt_tty_msg_info)); - - msg.header.msg_type = NT_LPC_NEW_MESSAGE; - msg.header.data_size = sizeof(msg.data); - msg.header.msg_size = sizeof(msg); - msg.data.ttyinfo.opcode = NT_TTY_VMS_REQUEST; - - __ntapi->tt_aligned_block_memcpy( - (uintptr_t *)&(msg.data.vmsinfo), - (uintptr_t *)vmsinfo, - sizeof(*vmsinfo)); - - if ((status = __ntapi->zw_request_wait_reply_port(hport,&msg,&msg))) - return status; - else if (msg.data.ttyinfo.status) - return msg.data.ttyinfo.status; - - __ntapi->tt_aligned_block_memcpy( - (uintptr_t *)vmsinfo, - (uintptr_t *)&(msg.data.vmsinfo), - sizeof(*vmsinfo)); - - return NT_STATUS_SUCCESS; -}