X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/4b25e119e06befc931d8392985d5a61d1949fadb..f65f3bf537e517fb5231ff894e198eeb89d727ed:/src/uobject/uobject.c
diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 9174005..c3cc246 100644
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -1,6 +1,6 @@
/*
* upkg: tool for manipulating Unreal Tournament packages.
- * Copyright © 2009-2011 Nick Bowler
+ * Copyright © 2009-2012, 2015 Nick Bowler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,15 +16,20 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
+#include
+#include
#include
+#include
#include
#include
#include
#include
+#include
#include "upkg.h"
#include "pack.h"
@@ -172,7 +177,7 @@ decode_prop_header(struct upkg *upkg, struct prop_head *head,
}
rc = decode_tag_size(&head->size, tag_size, buf+len, n-len);
- if (head->size == 0)
+ if (rc == 0 && head->size == 0)
return 0;
len += rc;
@@ -187,6 +192,93 @@ decode_prop_header(struct upkg *upkg, struct prop_head *head,
return len;
}
+/*
+ * TODO: Make this use the uobject_module stuff so packages are not loaded
+ * more than once.
+ */
+static GTypeModule *
+open_import_package(UObject *uo, const struct upkg_import *i)
+{
+ GTypeModule *pkg;
+
+ assert(i->parent == NULL);
+
+ if (strcmp(i->class_package, "Core") != 0
+ || strcmp(i->class_name, "Package") != 0) {
+ u_err(uo, "import root must be Core.Package");
+ return NULL;
+ }
+
+ pkg = u_pkg_open(i->name);
+ if (!pkg || !g_type_module_use(pkg)) {
+ u_err(uo, "failed to open package: %s", i->name);
+ return NULL;
+ }
+
+ if (!U_PKG(pkg)->pkg) {
+ g_type_module_unuse(pkg);
+ u_err(uo, "failed to open package: %s", pkg->name);
+ return NULL;
+ }
+
+ return pkg;
+}
+
+/* Find the export index of a package based on the import chain from another
+ * package. Returns the (non-negative) offset on success, or a negative value
+ * on failure. */
+static long resolve_import(struct upkg *pkg, const struct upkg_import *import)
+{
+ long current, index;
+
+ if (!import->parent)
+ return -1;
+
+ current = resolve_import(pkg, import->parent);
+ if (current != -1 && current >= 0)
+ return -42;
+
+ index = upkg_export_find(pkg, current, import->name);
+ if (index < 0)
+ return -42;
+
+ return index;
+}
+
+static GObject *get_import_object(UObject *uo, unsigned long index)
+{
+ const struct upkg_import *import;
+ GObject *obj = NULL;
+ GTypeModule *pkg;
+ long obj_index;
+
+ import = upkg_get_import(uo->pkg_file->pkg, index);
+ if (!import) {
+ u_err(uo, "invalid package import: %ld", index);
+ return NULL;
+ }
+
+ /* Get the package name at the top of the hierarchy. */
+ for (const struct upkg_import *i = import; i; i = i->parent) {
+ if (i->parent == NULL) {
+ pkg = open_import_package(uo, i);
+ if (!pkg)
+ return NULL;
+ }
+ }
+
+ obj_index = resolve_import(U_PKG(pkg)->pkg, import);
+ if (obj_index < 0) {
+ u_err(uo, "could not find import in package: %s", pkg->name);
+ goto out;
+ }
+
+ obj = u_object_new_from_package(pkg, obj_index);
+out:
+ g_type_module_unuse(pkg);
+ return obj;
+}
+
static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
{
struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
@@ -199,7 +291,7 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
return -1;
if (index < 0) {
- fprintf(stderr, "Imports not supported yet.\n");
+ obj = get_import_object(uo, -(index+1));
} else {
obj = u_object_new_from_package(uo->pkg, index-1);
}
@@ -209,13 +301,48 @@ static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
return 0;
}
+/*
+ * Deserialize an IEEE 754 binary32 value in "little endian" (for whatever
+ * that term is worth in this context). That is, when interpreted as a little
+ * endian 32-bit unsigned integer: bit 31 is the sign, bits 30-23 are the
+ * (biased) exponent, and bits 22-0 are the encoded part of the significand.
+ *
+ * The implementation is designed to be agnostic of the platform's actual
+ * float type, but the conversion may be lossy if "float" is not itself a
+ * binary32 format. NaN payloads are not preserved.
+ */
+static float unpack_binary32_le(const unsigned char *buf)
+{
+ unsigned long raw;
+ long significand;
+ int exponent;
+ float result;
+
+ raw = unpack_32_le(buf);
+ exponent = (raw & 0x7f800000) >> 23;
+ significand = (raw & 0x007fffff) >> 0;
+
+ switch (exponent) {
+ case 255:
+ result = significand ? NAN : INFINITY;
+ break;
+ default:
+ significand |= 0x00800000;
+ /* fall through */
+ case 0:
+ result = ldexpf(significand, exponent-126-24);
+ }
+
+ return copysignf(result, raw & 0x80000000 ? -1 : 1);
+}
+
static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
{
struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
unsigned long rc, len = 0;
GValue val = {0};
- rc = decode_prop_header(uo->pkg, head, priv->buf, priv->nbuf);
+ rc = decode_prop_header(uo->pkg_file->pkg, head, priv->buf, priv->nbuf);
if (rc == 0)
return 0;
len += rc;
@@ -224,28 +351,42 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
case PROPERTY_END:
break;
case PROPERTY_BYTE:
- if (priv->nbuf-len < 1)
+ if (head->size != 1 || priv->nbuf-len < head->size)
return 0;
g_value_init(&val, G_TYPE_UCHAR);
g_value_set_uchar(&val, priv->buf[len]);
g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
break;
case PROPERTY_INTEGER:
- if (priv->nbuf-len < 4)
+ if (head->size != 4 || priv->nbuf-len < head->size)
return 0;
g_value_init(&val, G_TYPE_ULONG);
g_value_set_ulong(&val, unpack_32_le(priv->buf+len));
g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
break;
+ case PROPERTY_BOOLEAN:
+ if (head->size != 0)
+ return 0;
+ g_value_init(&val, G_TYPE_BOOLEAN);
+ g_value_set_boolean(&val, head->tag_msb);
+ g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
+ break;
case PROPERTY_OBJECT:
rc = decode_object_property(uo, &val, len);
if (rc != 0)
return 0;
g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
break;
+ case PROPERTY_FLOAT:
+ if (head->size != 4 || priv->nbuf-len < head->size)
+ return 0;
+ g_value_init(&val, G_TYPE_FLOAT);
+ g_value_set_float(&val, unpack_binary32_le(priv->buf+len));
+ g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
+ break;
default:
- fprintf(stderr, "Unhandled property type %x\n",
- (unsigned)head->type);
+ u_warn(uo, "%s: unsupported property type %u",
+ head->prop_name, (unsigned)head->type);
}
len += head->size;
@@ -304,22 +445,73 @@ static int deserialize(UObject *uo)
return 0;
}
-int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
+/*
+ * Get the full hierarchical object name for an export, used for diagnostics.
+ * The package name is passed in pname.
+ *
+ * Returns a buffer allocated by malloc on success, or NULL on failure.
+ */
+static char *get_obj_fullname(const char *pname, const struct upkg_export *e)
+{
+ size_t total_len = strlen(pname) + 1, len;
+ char *fullname;
+
+ assert(e != NULL);
+
+ for (const struct upkg_export *c = e; c; c = c->parent) {
+ len = strlen(c->name) + 1;
+ if (total_len > SIZE_MAX - len)
+ return NULL;
+ total_len += len;
+ }
+
+ fullname = malloc(total_len);
+ if (!fullname)
+ return NULL;
+
+ for (const struct upkg_export *c = e; c; c = c->parent) {
+ len = strlen(c->name);
+ assert(total_len > len);
+
+ total_len -= len + 1;
+ memcpy(fullname + total_len, c->name, len);
+ fullname[total_len + len] = c == e ? '\0' : '.';
+ }
+
+ assert(total_len == strlen(pname)+1);
+ memcpy(fullname, pname, total_len-1);
+ fullname[total_len-1] = '.';
+
+ return fullname;
+}
+
+int u_object_deserialize(GObject *obj, GTypeModule *pkg, unsigned long idx)
{
g_return_val_if_fail(IS_U_OBJECT(obj), -1);
+ g_return_val_if_fail(IS_U_PKG(pkg), -1);
+
UObject *uo = U_OBJECT(obj);
+ struct upkg *upkg = U_PKG(pkg)->pkg;
+ const struct upkg_export *e;
struct upkg_file *f;
int rc;
g_return_val_if_fail(uo->pkg_file == NULL, -1);
- f = upkg_export_open(pkg, idx);
+ f = upkg_export_open(upkg, idx);
if (!f) {
return -1;
}
- uo->pkg = pkg;
+ uo->pkg = pkg;
uo->pkg_file = f;
+ e = upkg_get_export(upkg, idx);
+ if (!e)
+ return -1;
+ uo->pkg_name = get_obj_fullname(pkg->name, e);
+ if (!uo->pkg_name)
+ return -1;
+
rc = U_OBJECT_GET_CLASS(obj)->deserialize(uo);
if (rc != 0) {
upkg_export_close(f);
@@ -329,19 +521,24 @@ int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
return rc;
}
-GObject *u_object_new_from_package(struct upkg *upkg, unsigned long idx)
+GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx)
{
+ g_return_val_if_fail(IS_U_PKG(pkg), NULL);
+
const struct upkg_export *export;
- const char *class, *package;
GObject *obj = NULL;
GType type;
- class = upkg_export_class(upkg, idx, &package);
+ export = upkg_get_export(U_PKG(pkg)->pkg, idx);
+ if (!export) {
+ u_err(pkg, "invalid package export: %lu", idx);
+ return NULL;
+ }
- type = u_object_module_get_class(package, class);
+ type = u_object_module_get_class(pkg, export->class);
if (type) {
obj = g_object_new(type, NULL);
- if (u_object_deserialize(obj, upkg, idx) != 0) {
+ if (u_object_deserialize(obj, pkg, idx) != 0) {
g_object_unref(obj);
return NULL;
}
@@ -364,6 +561,8 @@ static void u_object_finalize(GObject *o)
upkg_export_close(uo->pkg_file);
}
+ free(uo->pkg_name);
+
G_OBJECT_CLASS(u_object_parent_class)->finalize(o);
}
@@ -375,3 +574,72 @@ static void u_object_class_init(UObjectClass *class)
class->deserialize = deserialize;
go->finalize = u_object_finalize;
}
+
+/*
+ * Prepend a prefix to a printf-style format string. Unfortunately, there's
+ * no way to construct va_list values on the fly in C, so we cannot simply
+ * prepend %s and pass the prefix as an argument. Any % characters in the
+ * prefix will be escaped.
+ *
+ * Returns a pointer to a newly allocated string, which should be freed by the
+ * caller, or NULL otherwise.
+ */
+static char *prepend_fmt(const char *prefix, const char *fmt)
+{
+ size_t prefix_len = strlen(prefix), fmt_len = strlen(fmt);
+ char *new_fmt;
+
+ if (prefix_len > SIZE_MAX/2 - sizeof ": ")
+ return NULL;
+ if (2*prefix_len > SIZE_MAX - fmt_len)
+ return NULL;
+
+ new_fmt = malloc(2*prefix_len + fmt_len + 1);
+ if (new_fmt) {
+ size_t offset = 0;
+
+ for (size_t i = 0; i < prefix_len; i++) {
+ if (prefix[i] == '%')
+ new_fmt[offset++] = '%';
+ new_fmt[offset++] = prefix[i];
+ }
+
+ new_fmt[offset++] = ':';
+ new_fmt[offset++] = ' ';
+ strcpy(new_fmt+offset, fmt);
+ }
+
+ return new_fmt;
+}
+
+/* Logging helpers that automatically prepend the UObject class information. */
+void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap)
+{
+ char *new_fmt = NULL, *obj_prefix = NULL;
+
+ if (IS_U_OBJECT(o)) {
+ obj_prefix = U_OBJECT(o)->pkg_name;
+ } else if (G_IS_TYPE_MODULE(o)) {
+ obj_prefix = G_TYPE_MODULE(o)->name;
+ }
+
+ if (obj_prefix) {
+ new_fmt = prepend_fmt(obj_prefix, fmt);
+ if (!new_fmt)
+ g_log(G_OBJECT_TYPE_NAME(o), level, "%s", obj_prefix);
+ else
+ fmt = new_fmt;
+ }
+
+ g_logv(G_OBJECT_TYPE_NAME(o), level, fmt, ap);
+ free(new_fmt);
+}
+
+void u_log_full(GObject *o, GLogLevelFlags level, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ u_vlog_full(o, level, fmt, ap);
+ va_end(ap);
+}