From 3dd17f128831e09c230a8d56e34495d3b31dbacb Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 27 Jan 2005 06:16:59 +0000 Subject: r5034: - added a type mapping function in pidl, so the type names in our IDL files don't need to match the type names in the generated headers - with this type mapping we no longer need definitions for the deprecated "int32", "uint8" etc form of types. We can now force everyone to use the standard types int32_t, uint8_t etc. - fixed all the code that used the deprecated types - converted the IDL types "int64" and "uint64" to "dlong" and "udlong". These are the 4 byte aligned 64 bit integers that Microsoft internally define as two 32 bit integers in a structure. After discussions with Ronnie Sahlberg we decided that calling these "int64" was confusing, as it implied a true 8 byte aligned type - fixed all the cases where we incorrectly used things like "NTTIME_hyper" in our C code. The generated API now uses a NTTIME for those. The fact that it is hyper-aligned on the wire is not relevant to the API, and should remain just a IDL property (This used to be commit f86521677d7ff16bdc4815f9524e5286026f10f3) --- source4/lib/dcom/common/dcom.h | 4 ++-- source4/lib/dcom/common/main.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/dcom/common/dcom.h b/source4/lib/dcom/common/dcom.h index d8e3797c73..0bc4a256f1 100644 --- a/source4/lib/dcom/common/dcom.h +++ b/source4/lib/dcom/common/dcom.h @@ -34,12 +34,12 @@ struct dcom_context struct dcom_object_exporter *prev, *next; struct STRINGARRAY resolver_address; struct DUALSTRINGARRAY bindings; - HYPER_T oxid; + uint64_t oxid; struct dcerpc_pipe *pipe; struct dcom_object { struct dcom_object *prev, *next; - HYPER_T oid; + uint64_t oid; void *private_data; } *objects; } *oxids; diff --git a/source4/lib/dcom/common/main.c b/source4/lib/dcom/common/main.c index 48b5ec946b..219c06a665 100644 --- a/source4/lib/dcom/common/main.c +++ b/source4/lib/dcom/common/main.c @@ -116,7 +116,7 @@ WERROR dcom_init(struct dcom_context **ctx, const char *domain, const char *user return WERR_OK; } -static struct dcom_object_exporter *oxid_mapping_by_oxid (struct dcom_context *ctx, HYPER_T oxid) +static struct dcom_object_exporter *oxid_mapping_by_oxid (struct dcom_context *ctx, uint64_t oxid) { struct dcom_object_exporter *m; @@ -345,7 +345,7 @@ NTSTATUS dcom_get_pipe (struct dcom_interface_p *iface, struct dcerpc_pipe **pp) { struct dcerpc_binding binding; struct GUID iid; - HYPER_T oxid; + uint64_t oxid; NTSTATUS status; int i; struct dcerpc_pipe *p; @@ -408,7 +408,7 @@ NTSTATUS dcom_get_pipe (struct dcom_interface_p *iface, struct dcerpc_pipe **pp) return NT_STATUS_OK; } -struct dcom_object *dcom_object_by_oid(struct dcom_object_exporter *ox, HYPER_T oid) +struct dcom_object *dcom_object_by_oid(struct dcom_object_exporter *ox, uint64_t oid) { struct dcom_object *o; @@ -544,7 +544,7 @@ NTSTATUS dcom_ifacep_from_OBJREF(struct dcom_context *ctx, struct dcom_interface return NT_STATUS_NOT_SUPPORTED; } -HYPER_T dcom_get_current_oxid(void) +uint64_t dcom_get_current_oxid(void) { return getpid(); } -- cgit