summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2017-01-26 00:48:32 +0000
committermidipix <writeonce@midipix.org>2017-01-26 18:57:02 -0500
commit701eb264ae48a2c020ddd63d3c159834af364077 (patch)
treeac46c9206724721b5b4e9d9aeb53175541dd838d /src
parenta62978be8c32bc19094f3db8d8059fd01e87358c (diff)
downloadntapi-701eb264ae48a2c020ddd63d3c159834af364077.tar.bz2
ntapi-701eb264ae48a2c020ddd63d3c159834af364077.tar.xz
guid <--> string conversion functions: normalized interfaces.
Diffstat (limited to 'src')
-rw-r--r--src/fs/ntapi_tt_mount.c2
-rw-r--r--src/guid/ntapi_tt_guid.c4
-rw-r--r--src/internal/ntapi.c4
-rw-r--r--src/internal/ntapi_fnapi.h8
-rw-r--r--src/object/ntapi_tt_keyed_object_directory.c2
-rw-r--r--src/port/ntapi_port_name_helper.c2
-rw-r--r--src/pty/ntapi_pty_fd.c2
-rw-r--r--src/vfd/ntapi_vfd_helper.c2
8 files changed, 13 insertions, 13 deletions
diff --git a/src/fs/ntapi_tt_mount.c b/src/fs/ntapi_tt_mount.c
index 2d8be0a..616f051 100644
--- a/src/fs/ntapi_tt_mount.c
+++ b/src/fs/ntapi_tt_mount.c
@@ -313,7 +313,7 @@ int32_t __stdcall __ntapi_tt_dev_mount_points_to_statfs(
&& (symlink[8] == 'm')
&& (symlink[9] == 'e')
&& (symlink[10] == '{')) {
- if ((status = __ntapi_tt_utf16_string_to_guid(
+ if ((status = __ntapi_tt_string_to_guid_utf16(
(nt_guid_str_utf16 *)&symlink[10],
&statfs->nt_volume_guid)))
return status;
diff --git a/src/guid/ntapi_tt_guid.c b/src/guid/ntapi_tt_guid.c
index 3542aa3..9fd27fa 100644
--- a/src/guid/ntapi_tt_guid.c
+++ b/src/guid/ntapi_tt_guid.c
@@ -26,7 +26,7 @@ void __fastcall __ntapi_tt_guid_copy(
}
-void __fastcall __ntapi_tt_guid_to_utf16_string(
+void __fastcall __ntapi_tt_guid_to_string_utf16(
__in const nt_guid * guid,
__out nt_guid_str_utf16 * guid_str)
{
@@ -99,7 +99,7 @@ int32_t __fastcall __ntapi_tt_guid_compare(
}
-int32_t __fastcall __ntapi_tt_utf16_string_to_guid(
+int32_t __fastcall __ntapi_tt_string_to_guid_utf16(
__out nt_guid_str_utf16 * guid_str,
__in nt_guid * guid)
{
diff --git a/src/internal/ntapi.c b/src/internal/ntapi.c
index 8456569..c3f5817 100644
--- a/src/internal/ntapi.c
+++ b/src/internal/ntapi.c
@@ -195,8 +195,8 @@ static int32_t __fastcall __ntapi_init_once(ntapi_vtbl ** pvtbl)
/* nt_guid.h */
__ntapi->tt_guid_copy = __ntapi_tt_guid_copy;
__ntapi->tt_guid_compare = __ntapi_tt_guid_compare;
- __ntapi->tt_guid_to_utf16_string = __ntapi_tt_guid_to_utf16_string;
- __ntapi->tt_utf16_string_to_guid = __ntapi_tt_utf16_string_to_guid;
+ __ntapi->tt_guid_to_string_utf16 = __ntapi_tt_guid_to_string_utf16;
+ __ntapi->tt_string_to_guid_utf16 = __ntapi_tt_string_to_guid_utf16;
/* nt_sysinfo.h */
__ntapi->tt_get_system_directory_native_path = __ntapi_tt_get_system_directory_native_path;
diff --git a/src/internal/ntapi_fnapi.h b/src/internal/ntapi_fnapi.h
index 1e2c8f4..75621f7 100644
--- a/src/internal/ntapi_fnapi.h
+++ b/src/internal/ntapi_fnapi.h
@@ -79,8 +79,8 @@ ntapi_tt_uintptr_to_hex_utf8 __ntapi_tt_uintptr_to_hex_utf8;
ntapi_wcslen __ntapi_tt_wcslen;
/* nt_guid.h */
-ntapi_tt_guid_to_utf16_string __ntapi_tt_guid_to_utf16_string;
-ntapi_tt_utf16_string_to_guid __ntapi_tt_utf16_string_to_guid;
+ntapi_tt_guid_to_string_utf16 __ntapi_tt_guid_to_string_utf16;
+ntapi_tt_string_to_guid_utf16 __ntapi_tt_string_to_guid_utf16;
/* nt_sysinfo.h */
ntapi_tt_get_system_directory_native_path __ntapi_tt_get_system_directory_native_path;
@@ -245,8 +245,8 @@ ntapi_tt_populate_hashed_import_table __ntapi_tt_populate_hashed_import_table;
/* nt_guid.h */
ntapi_tt_guid_copy __ntapi_tt_guid_copy;
ntapi_tt_guid_compare __ntapi_tt_guid_compare;
-ntapi_tt_guid_to_utf16_string __ntapi_tt_guid_to_utf16_string;
-ntapi_tt_utf16_string_to_guid __ntapi_tt_utf16_string_to_guid;
+ntapi_tt_guid_to_string_utf16 __ntapi_tt_guid_to_string_utf16;
+ntapi_tt_string_to_guid_utf16 __ntapi_tt_string_to_guid_utf16;
/* debug */
ntapi_dbg_write __dbg_write;
diff --git a/src/object/ntapi_tt_keyed_object_directory.c b/src/object/ntapi_tt_keyed_object_directory.c
index 311e051..7ecf094 100644
--- a/src/object/ntapi_tt_keyed_object_directory.c
+++ b/src/object/ntapi_tt_keyed_object_directory.c
@@ -45,7 +45,7 @@ static int32_t __stdcall __tt_create_keyed_object_directory(
prefix,
sizeof(objdir_name.prefix));
- __ntapi->tt_guid_to_utf16_string(
+ __ntapi->tt_guid_to_string_utf16(
guid,
(nt_guid_str_utf16 *)&objdir_name.objdir_guid);
diff --git a/src/port/ntapi_port_name_helper.c b/src/port/ntapi_port_name_helper.c
index ef87570..d8d5810 100644
--- a/src/port/ntapi_port_name_helper.c
+++ b/src/port/ntapi_port_name_helper.c
@@ -139,7 +139,7 @@ void __stdcall __ntapi_tt_port_name_from_attributes(
sizeof(name->svc_prefix));
/* port guid */
- __ntapi->tt_guid_to_utf16_string(
+ __ntapi->tt_guid_to_string_utf16(
&attr->guid,
(nt_guid_str_utf16 *)&name->port_guid);
diff --git a/src/pty/ntapi_pty_fd.c b/src/pty/ntapi_pty_fd.c
index fdb9ae4..b80de2a 100644
--- a/src/pty/ntapi_pty_fd.c
+++ b/src/pty/ntapi_pty_fd.c
@@ -205,7 +205,7 @@ static int32_t __ntapi_pty_open_impl(
guid_str = (nt_uuid_str_utf16 *)
((uintptr_t)obj_attr->obj_name->buffer + __DEVICE_PATH_PREFIX_LEN);
- if (__ntapi->tt_utf16_string_to_guid(guid_str,&guid))
+ if (__ntapi->tt_string_to_guid_utf16(guid_str,&guid))
return NT_STATUS_OBJECT_NAME_INVALID;
/* control block */
diff --git a/src/vfd/ntapi_vfd_helper.c b/src/vfd/ntapi_vfd_helper.c
index 0716bdd..7de4208 100644
--- a/src/vfd/ntapi_vfd_helper.c
+++ b/src/vfd/ntapi_vfd_helper.c
@@ -22,7 +22,7 @@ void __stdcall __ntapi_vfd_dev_name_init(
prefix[2] = 0x630069;
prefix[3] = 0x5C0065;
- __ntapi->tt_guid_to_utf16_string(
+ __ntapi->tt_guid_to_string_utf16(
guid,
&devname->guid);