/*
- * upkg: tool for manipulating Unreal Tournament packages.
- * Copyright © 2009-2011 Nick Bowler
+ * upkg: tool for manipulating Unreal Tournament packages.
+ * Copyright © 2009-2012, 2015, 2020, 2022 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <math.h>
#include <stdarg.h>
-#include <stdbool.h>
#include <inttypes.h>
#include <assert.h>
#include <glib-object.h>
#define U_OBJECT_GET_PRIV(o) \
G_TYPE_INSTANCE_GET_PRIVATE(o, U_TYPE_OBJECT, struct u_object_priv)
+#ifndef SIZE_MAX
+# define SIZE_MAX ((size_t)-1)
+#endif
struct prop_head {
const char *prop_name, *struct_name;
unsigned long size, array_idx;
- bool tag_msb;
+ gboolean tag_msb;
enum {
PROPERTY_END,
return obj;
}
+GObject *u_object_get_by_link(GObject *go, long index)
+{
+ g_return_val_if_fail(IS_U_OBJECT(go), NULL);
+ UObject *uo = U_OBJECT(go);
+
+ if (index == 0)
+ return NULL;
+
+ if (index < 0) {
+ return get_import_object(uo, -(index+1));
+ }
+
+ return u_object_new_from_package(uo->pkg, index-1);
+}
+
static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
{
struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
int rc;
rc = upkg_decode_index(&index, priv->buf+len, priv->nbuf-len);
- if (rc == 0 || index == 0)
+ if (rc == 0)
return -1;
- if (index < 0) {
- obj = get_import_object(uo, -(index+1));
- } else {
- obj = u_object_new_from_package(uo->pkg, index-1);
- }
-
+ obj = u_object_get_by_link(G_OBJECT(uo), index);
g_value_init(val, U_TYPE_OBJECT);
g_value_take_object(val, obj);
return 0;
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);
if (rc != 0)
return 0;
g_object_set_property(G_OBJECT(uo), head->prop_name, &val);
+
+ /*
+ * g_object_set_property increments refcount,
+ * release our reference.
+ */
+ g_object_unref(g_value_get_object(&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, u_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;
{
g_return_val_if_fail(IS_U_PKG(pkg), NULL);
- const char *class, *package;
+ const struct upkg_export *export;
GObject *obj = NULL;
GType type;
- class = upkg_export_class(U_PKG(pkg)->pkg, 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, pkg, idx) != 0) {
/* Logging helpers that automatically prepend the UObject class information. */
void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap)
{
- g_return_if_fail(IS_U_OBJECT(o));
- UObject *uo = U_OBJECT(o);
- char *new_fmt = NULL;
-
- if (uo->pkg_name) {
- new_fmt = prepend_fmt(uo->pkg_name, fmt);
- if (!new_fmt) {
- g_log(G_OBJECT_TYPE_NAME(o), level, "%s",
- uo->pkg_file->name);
- } else {
+ 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);
projects / upkg.git / blobdiff