From f7b99942f85f4c8c35058f1a8b1194cd4468bc6d Mon Sep 17 00:00:00 2001 From: midipix Date: Wed, 29 Jun 2016 10:49:47 -0400 Subject: free-standing environment: remove fluff from the argv/envp parsing facility. --- include/ntapi/nt_argv.h | 22 ---------------------- include/ntapi/ntapi.h | 2 -- 2 files changed, 24 deletions(-) (limited to 'include') diff --git a/include/ntapi/nt_argv.h b/include/ntapi/nt_argv.h index eae5996..531c6c0 100644 --- a/include/ntapi/nt_argv.h +++ b/include/ntapi/nt_argv.h @@ -30,9 +30,7 @@ typedef struct _nt_program_option { int option_count; wchar16_t short_name_code; wchar16_t * long_name; - uint32_t long_name_hash; wchar16_t * value; - uint32_t value_hash; uint32_t flags; } nt_program_option; @@ -48,9 +46,7 @@ typedef struct _nt_program_options_meta { typedef struct _nt_env_var_meta_utf16 { wchar16_t * name; - uint32_t name_hash; wchar16_t * value; - uint32_t value_hash; int envp_index; uint32_t flags; } nt_env_var_meta_utf16; @@ -60,9 +56,7 @@ typedef struct _nt_cmd_option_meta_utf16 { wchar16_t * short_name; uint32_t short_name_code; wchar16_t * long_name; - uint32_t long_name_hash; wchar16_t * value; - uint32_t value_hash; int argv_index; uint32_t flags; } nt_cmd_option_meta_utf16; @@ -140,27 +134,11 @@ typedef int32_t __stdcall ntapi_tt_get_argv_envp_utf16( typedef int32_t __stdcall ntapi_tt_get_env_var_meta_utf16( - __in const uint32_t * crc32_table, __in wchar16_t * env_var_name, - __in uint32_t env_var_name_hash __optional, __in wchar16_t ** envp, __out nt_env_var_meta_utf16 * env_var_meta); -typedef int32_t __stdcall ntapi_tt_get_short_option_meta_utf16( - __in const uint32_t * crc32_table, - __in wchar16_t option_name, - __in wchar16_t * argv[], - __out nt_cmd_option_meta_utf16 * cmd_opt_meta); - - -typedef int32_t __stdcall ntapi_tt_get_long_option_meta_utf16( - __in const uint32_t * crc32_table, - __in wchar16_t * option_name, - __in uint32_t option_name_hash __optional, - __in wchar16_t * argv[], - __out nt_cmd_option_meta_utf16 * cmd_opt_meta); - typedef int32_t __stdcall ntapi_tt_array_copy_utf8( __out int * argc, __in const char ** argv, diff --git a/include/ntapi/ntapi.h b/include/ntapi/ntapi.h index a413e4e..8af844f 100644 --- a/include/ntapi/ntapi.h +++ b/include/ntapi/ntapi.h @@ -482,8 +482,6 @@ typedef struct _ntapi_vtbl { ntapi_tt_get_argv_envp_utf8 * tt_get_argv_envp_utf8; ntapi_tt_get_argv_envp_utf16 * tt_get_argv_envp_utf16; ntapi_tt_get_env_var_meta_utf16 * tt_get_env_var_meta_utf16; - ntapi_tt_get_short_option_meta_utf16 * tt_get_short_option_meta_utf16; - ntapi_tt_get_long_option_meta_utf16 * tt_get_long_option_meta_utf16; ntapi_tt_array_copy_utf8 * tt_array_copy_utf8; ntapi_tt_array_copy_utf16 * tt_array_copy_utf16; ntapi_tt_array_convert_utf8_to_utf16 * tt_array_convert_utf8_to_utf16; -- cgit v1.2.3