summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2017-01-06 18:27:15 -0500
committermidipix <writeonce@midipix.org>2017-01-07 09:02:35 -0500
commit6336c42970e39d7cc76071a93e7058ba3d8fda3e (patch)
treefdfb70e2a1fd21e23a0df7e492ceb7feae4d1e26
parente3e5a218e16e376c4ef18b5f5aba649e5e5063c0 (diff)
downloadntapi-6336c42970e39d7cc76071a93e7058ba3d8fda3e.tar.bz2
ntapi-6336c42970e39d7cc76071a93e7058ba3d8fda3e.tar.xz
framework: process parameters: renamed srv_ready --> hserver.
-rw-r--r--include/ntapi/nt_process.h2
-rw-r--r--src/process/ntapi_tt_create_remote_runtime_data.c12
-rw-r--r--src/tty/ntapi_tty_create_session.c16
3 files changed, 15 insertions, 15 deletions
diff --git a/include/ntapi/nt_process.h b/include/ntapi/nt_process.h
index 39e84e9..764c3cd 100644
--- a/include/ntapi/nt_process.h
+++ b/include/ntapi/nt_process.h
@@ -469,7 +469,7 @@ typedef struct _nt_runtime_data {
void * hready;
void * hsync;
void * hswap;
- void * srv_ready;
+ void * hserver;
nt_guid port_guid;
int32_t port_type;
int32_t port_subtype;
diff --git a/src/process/ntapi_tt_create_remote_runtime_data.c b/src/process/ntapi_tt_create_remote_runtime_data.c
index 7b85893..fa8e67c 100644
--- a/src/process/ntapi_tt_create_remote_runtime_data.c
+++ b/src/process/ntapi_tt_create_remote_runtime_data.c
@@ -24,7 +24,7 @@ int32_t __stdcall __ntapi_tt_create_remote_runtime_data(
nt_unicode_string rcmd_line;
uint32_t runtime_arg_hash;
nt_runtime_data * rtdata;
- void * srv_ready;
+ void * hserver;
#if (__SIZEOF_POINTER__ == 4)
wchar16_t runtime_arg[8] = {
@@ -115,17 +115,17 @@ int32_t __stdcall __ntapi_tt_create_remote_runtime_data(
/* session handles */
rtdata = 0;
- srv_ready = 0;
+ hserver = 0;
if (rtblock->flags & NT_RUNTIME_DATA_DUPLICATE_SESSION_HANDLES) {
rtdata = (nt_runtime_data *)rtblock->addr;
- srv_ready = rtdata->srv_ready;
+ hserver = rtdata->hserver;
if ((status = __ntapi->zw_duplicate_object(
NT_CURRENT_PROCESS_HANDLE,
- srv_ready,
+ hserver,
hprocess,
- &rtdata->srv_ready,
+ &rtdata->hserver,
0,0,
NT_DUPLICATE_SAME_ATTRIBUTES
|NT_DUPLICATE_SAME_ACCESS)))
@@ -142,7 +142,7 @@ int32_t __stdcall __ntapi_tt_create_remote_runtime_data(
/* restore rtdata */
if (rtdata)
- rtdata->srv_ready = srv_ready;
+ rtdata->hserver = hserver;
/* verify above remote write */
if (status)
diff --git a/src/tty/ntapi_tty_create_session.c b/src/tty/ntapi_tty_create_session.c
index 687d182..97e8a22 100644
--- a/src/tty/ntapi_tty_create_session.c
+++ b/src/tty/ntapi_tty_create_session.c
@@ -171,7 +171,7 @@ int32_t __stdcall __ntapi_tty_create_session(
&port_attr.guid);
if ((status = __ntapi->tt_create_private_event(
- &ssattr.srv_ready,
+ &ssattr.hserver,
NT_SYNCHRONIZATION_EVENT,
NT_EVENT_NOT_SIGNALED)))
return status;
@@ -191,32 +191,32 @@ int32_t __stdcall __ntapi_tty_create_session(
params.hsession = htty;
if ((status = __ntapi->tt_create_native_process(&params)))
- return __tty_create_session_return(ssattr.srv_ready,&params,status);
+ return __tty_create_session_return(ssattr.hserver,&params,status);
__ntapi->zw_wait_for_multiple_objects(
2,
- (void *[]){ssattr.srv_ready,params.hprocess},
+ (void *[]){ssattr.hserver,params.hprocess},
NT_WAIT_ANY,
NT_SYNC_NON_ALERTABLE,
0);
if ((status = __ntapi->zw_query_event(
- ssattr.srv_ready,
+ ssattr.hserver,
NT_EVENT_BASIC_INFORMATION,
&eready,
sizeof(eready),
&(size_t){0})))
- return __tty_create_session_return(ssattr.srv_ready,&params,status);
+ return __tty_create_session_return(ssattr.hserver,&params,status);
if (!eready.signal_state)
- return __tty_create_session_return(ssattr.srv_ready,&params,NT_STATUS_SYSTEM_PROCESS_TERMINATED);
+ return __tty_create_session_return(ssattr.hserver,&params,NT_STATUS_SYSTEM_PROCESS_TERMINATED);
/* connect to subsystem */
if ((status = __ntapi->tty_connect(
hport,
&port_name->base_named_objects[0],
NT_SECURITY_IMPERSONATION)))
- return __tty_create_session_return(ssattr.srv_ready,&params,status);
+ return __tty_create_session_return(ssattr.hserver,&params,status);
/* finalize primary session */
if (type == NT_TTY_SESSION_PRIMARY) {
@@ -230,5 +230,5 @@ int32_t __stdcall __ntapi_tty_create_session(
sizeof(*port_name));
};
- return __tty_create_session_return(ssattr.srv_ready,&params,NT_STATUS_SUCCESS);
+ return __tty_create_session_return(ssattr.hserver,&params,NT_STATUS_SUCCESS);
}