X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/5944f3d64f5675df6eb8bd82ab45cc5ad31504a7..5fe7c42921be9f911805b4006f59a0910c9404d0:/src/uobject.c

diff --git a/src/uobject.c b/src/uobject.c
index a52a3ef..64e7c4c 100644
--- a/src/uobject.c
+++ b/src/uobject.c
@@ -1,15 +1,34 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright (C) 2009 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 2 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.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <glib-object.h>
 
-#include "uobject.h"
+#include <uobject/uobject.h>
 #include "upkg.h"
 #include "pack.h"
 
 #define U_OBJECT_GET_PRIV(o) \
-	G_TYPE_INSTANCE_GET_PRIVATE(o, U_OBJECT_TYPE, struct uobject_priv)
+	G_TYPE_INSTANCE_GET_PRIVATE(o, U_OBJECT_TYPE, struct u_object_priv)
 
 enum {
 	PROPERTY_BYTE = 1,
@@ -29,12 +48,7 @@ enum {
 	PROPERTY_FIXEDARRAY,
 };
 
-struct uobject_property {
-	const char *name;
-	GValue val;
-};
-
-struct uobject_priv {
+struct u_object_priv {
 	struct upkg_file *f;
 	size_t base, len;
 
@@ -42,6 +56,8 @@ struct uobject_priv {
 	unsigned long nbuf;
 };
 
+G_DEFINE_TYPE(UObject, u_object, G_TYPE_OBJECT);
+
 static unsigned long
 get_real_size(unsigned long *real, unsigned size, unsigned char *buf, size_t n)
 {
@@ -74,7 +90,7 @@ get_real_size(unsigned long *real, unsigned size, unsigned char *buf, size_t n)
 static unsigned long
 decode_property(UObject *o, const char *name, struct upkg_file *f, unsigned long len)
 {
-	struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
+	struct u_object_priv *priv = U_OBJECT_GET_PRIV(o);
 	unsigned long real_size, rc;
 	int type, size, top;
 	GValue val = {0};
@@ -128,7 +144,7 @@ decode_property(UObject *o, const char *name, struct upkg_file *f, unsigned long
 /* Deserialize properties from an Unreal package. */
 static int deserialize(UObject *o, struct upkg_file *f)
 {
-	struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
+	struct u_object_priv *priv = U_OBJECT_GET_PRIV(o);
 	unsigned long rc, tot_len = 0;
 
 	while (1) {
@@ -141,7 +157,7 @@ static int deserialize(UObject *o, struct upkg_file *f)
 			void  *buf = priv->buf + priv->nbuf;
 			size_t amt = sizeof priv->buf - priv->nbuf;
 			rc = upkg_export_read(f, buf, amt);
-			if (rc == 0)
+			if (rc == 0 && priv->nbuf == 0)
 				return -1;
 			priv->nbuf += rc;
 		}
@@ -175,22 +191,54 @@ static int deserialize(UObject *o, struct upkg_file *f)
 	return 0;
 }
 
-int u_object_deserialize(GObject *obj, struct upkg_file *f)
+int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
 {
 	g_return_val_if_fail(IS_U_OBJECT(obj), -1);
-	U_OBJECT_GET_CLASS(obj)->deserialize(U_OBJECT(obj), f);
+	UObject *uo = U_OBJECT(obj);
+	struct upkg_file *f;
+	int rc;
+
+	g_return_val_if_fail(uo->pkg_file == NULL, -1);
+	f = upkg_export_open(pkg, idx);
+	if (!f) {
+		return -1;
+	}
+
+	rc = U_OBJECT_GET_CLASS(obj)->deserialize(uo, f);
+	if (rc != 0) {
+		upkg_export_close(f);
+	} else {
+		uo->pkg      = pkg;
+		uo->pkg_idx  = idx;
+		uo->pkg_file = f;
+	}
+
+	return rc;
 }
 
 static void u_object_init(UObject *o)
 {
-	struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
+	o->pkg      = NULL;
+	o->pkg_file = NULL;
+	o->pkg_idx  = 0;
+}
+
+static void u_object_finalize(GObject *o)
+{
+	UObject *uo = U_OBJECT(o);
+
+	if (uo->pkg_file) {
+		upkg_export_close(uo->pkg_file);
+	}
+
+	G_OBJECT_CLASS(u_object_parent_class)->finalize(o);
 }
 
 static void u_object_class_init(UObjectClass *class)
 {
-	g_type_class_add_private(class, sizeof (struct uobject_priv));
+	g_type_class_add_private(class, sizeof (struct u_object_priv));
+	GObjectClass *go = G_OBJECT_CLASS(class);
 
 	class->deserialize = deserialize;
+	go->finalize       = u_object_finalize;
 }
-
-G_DEFINE_TYPE(UObject, u_object, G_TYPE_OBJECT);