dmlib: src/dmres.c annotate

annotate src/dmres.c @ 1044:1ec6ae223941

Sanitize resource data freeing.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 01 Mar 2015 17:47:35 +0200
parents	d0f80f6a0c65
children	1f37239172ad

rev	line source
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1 /*
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	2 * dmlib
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * -- Resource management
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	4 * Programmed and designed by Matti 'ccr' Hamalainen
863 27949209238b Update copyrights. Matti Hamalainen <ccr@tnsp.org> parents: 812 diff changeset	5 * (C) Copyright 2003-2015 Tecnic Software productions (TNSP)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	6 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7 #include "dmres.h"
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8 #include <time.h>
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9
719 eb4bd1f7b679 Sanitize some more includes. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	10 #ifdef DM_USE_PACKFS
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	11 # ifdef DM_USE_ZLIB
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	12 # include <zlib.h>
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	13 # else
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	14 # include "dmzlib.h"
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	15 # endif
719 eb4bd1f7b679 Sanitize some more includes. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	16 #endif
eb4bd1f7b679 Sanitize some more includes. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	17
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	18 #ifdef DM_USE_STDIO
989 d66b0b6c8bf8 Indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	19 # include <sys/types.h>
d66b0b6c8bf8 Indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	20 # include <sys/stat.h>
d66b0b6c8bf8 Indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	21 # include <unistd.h>
d66b0b6c8bf8 Indentation cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 958 diff changeset	22 # include <dirent.h>
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	23 #endif
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	24
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	26 DMResource dmResourceNew(DMResourceLib lib, const char *filename, const size_t size, const int flags)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 {
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	28 DMResource *node = dmMalloc0(sizeof(DMResource));
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	29 if (node == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	32 node->lib = lib;
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	33 node->filename = dm_strdup(filename);
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	34 node->rawSize = size;
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	35 node->flags = flags;
1041 d0f80f6a0c65 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1040 diff changeset	36
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	37 return node;
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	38 }
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	39
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	40
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	41 void dmResourceFreeResData(DMResource *node)
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	42 {
1044 1ec6ae223941 Sanitize resource data freeing. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	43 if (node->resData != NULL)
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	44 {
1044 1ec6ae223941 Sanitize resource data freeing. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	45 if (node->rops != NULL &&
1ec6ae223941 Sanitize resource data freeing. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	46 node->rops->free != NULL)
1ec6ae223941 Sanitize resource data freeing. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	47 node->rops->free(node);
1ec6ae223941 Sanitize resource data freeing. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	48 else
1ec6ae223941 Sanitize resource data freeing. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	49 dmFree(node->resData);
1ec6ae223941 Sanitize resource data freeing. Matti Hamalainen <ccr@tnsp.org> parents: 1041 diff changeset	50 node->resData = NULL;
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	51 }
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	52 node->flags &= ~DMF_LOADED_RES;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	56 void dmResourceFreeRawData(DMResource *node)
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	57 {
731 0e164aaa7409 Work on getting the resource subsystem working again .. Matti Hamalainen <ccr@tnsp.org> parents: 730 diff changeset	58 if ((node->flags & DMF_UNALLOCATED) == 0)
0e164aaa7409 Work on getting the resource subsystem working again .. Matti Hamalainen <ccr@tnsp.org> parents: 730 diff changeset	59 {
0e164aaa7409 Work on getting the resource subsystem working again .. Matti Hamalainen <ccr@tnsp.org> parents: 730 diff changeset	60 dmFree(node->rawData);
0e164aaa7409 Work on getting the resource subsystem working again .. Matti Hamalainen <ccr@tnsp.org> parents: 730 diff changeset	61 node->rawData = NULL;
0e164aaa7409 Work on getting the resource subsystem working again .. Matti Hamalainen <ccr@tnsp.org> parents: 730 diff changeset	62 node->flags &= ~DMF_LOADED_RAW;
0e164aaa7409 Work on getting the resource subsystem working again .. Matti Hamalainen <ccr@tnsp.org> parents: 730 diff changeset	63 }
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	64 }
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	65
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	66
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	67 void dmResourceFree(DMResource *node)
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	68 {
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	69 if (node != NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	71 dmResourceFreeResData(node);
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	72 dmResourceFreeRawData(node);
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	73 dmFree(node->filename);
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	74 dmFree(node);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	76 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	77
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	79 void dmResourceInsert(DMResourceLib lib, DMResource node)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 {
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	81 if (lib == NULL \|\| node == NULL)
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	82 return;
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	83
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	84 node->lib = lib;
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	85
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	86 if (lib->resources != NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 {
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	88 node->prev = lib->resources->prev;
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	89 lib->resources->prev->next = node;
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	90 lib->resources->prev = node;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	91 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 {
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	94 lib->resources = node->prev = node;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 node->next = NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	101 void dmResourceDelete(DMResourceLib lib, DMResource node)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 {
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	103 if (lib == NULL)
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	104 return;
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	105
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	106 if (node->prev)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	107 node->prev->next = node->next;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 if (node->next)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 node->next->prev = node->prev;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 else
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	112 lib->resources->prev = node->prev;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 node->prev = node->next = NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	118 DMResource * dmResourceFind(DMResourceLib lib, const char filename)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 DMResource node, found = NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	122 if (lib == NULL)
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	123 return NULL;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	125 dmMutexLock(lib->mutex);
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	126
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	127 for (node = lib->resources; node != NULL; node = node->next)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 if (strcmp(node->filename, filename) == 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 found = node;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	133 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	134 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	136 dmMutexUnlock(lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	137
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 return found;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141
124 d5cfd29c87c4 Rename some conditional compilation directives. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	142 #ifdef DM_USE_STDIO
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 /* Basic stdio file routines
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 static int dm_stdio_fopen(DMResource *handle)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	147 char *rfilename = dm_strdup_printf("%s%s", DMRES_DATA_PATH, handle->filename);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	148 if (rfilename == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	149 return DMERR_MALLOC;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 handle->fh = fopen(rfilename, "rb");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 dmFree(rfilename);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 handle->error = dmGetErrno();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 return (handle->fh != NULL) ? DMERR_OK : DMERR_FOPEN;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 static void dm_stdio_fclose(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	160 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 if (f->fh != NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	163 fclose(f->fh);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 f->fh = NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	165 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	166 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	167
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	168
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	169 static int dm_stdio_ferror(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	170 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 return f->error;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	174
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	175 static Sint64 dm_stdio_ftell(DMResource * f)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 {
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	177 return DM_FTELL64(f->fh);
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	178 }
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	179
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	180
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	181 static int dm_stdio_fseek(DMResource *f, const Sint64 pos, const int whence)
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	182 {
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	183 int ret = DM_FSEEK64(f->fh, pos, whence);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 f->error = dmGetErrno();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 return ret;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	189 static int dm_stdio_freset(DMResource * f)
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	190 {
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	191 if (f->fh != NULL)
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	192 return dm_stdio_fseek(f, 0, SEEK_SET);
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	193 else
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	194 return DMERR_OK;
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	195 }
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	196
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	197
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 static off_t dm_stdio_fsize(DMResource *f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 off_t savePos, fileSize;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 // Check if the size is cached
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	203 if (f->rawSize != 0)
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	204 return f->rawSize;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206 // Get file size
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	207 savePos = dm_stdio_ftell(f);
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	208 if (dm_stdio_fseek(f, 0, SEEK_END) != 0)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 return -1;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	211 fileSize = dm_stdio_ftell(f);
1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	212 if (dm_stdio_fseek(f, savePos, SEEK_SET) != 0)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	213 return -1;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	215 f->rawSize = fileSize;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216 return fileSize;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	218
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	219
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 static BOOL dm_stdio_feof(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222 return feof(f->fh);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	225
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226 static int dm_stdio_fgetc(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	227 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228 int ret = fgetc(f->fh);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229 f->error = dmGetErrno();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	230 return ret;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	234 static int dm_stdio_fputc(int v, DMResource * f)
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	235 {
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	236 int ret = fputc(v, f->fh);
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	237 f->error = dmGetErrno();
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	238 return ret;
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	239 }
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	240
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	241
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	242 static size_t dm_stdio_fread(void ptr, size_t size, size_t nmemb, DMResource f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	243 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	244 size_t ret = fread(ptr, size, nmemb, f->fh);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	245 f->error = dmGetErrno();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246 return ret;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	247 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	248
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	250 static size_t dm_stdio_fwrite(void ptr, size_t size, size_t nmemb, DMResource f)
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	251 {
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	252 size_t ret = fwrite(ptr, size, nmemb, f->fh);
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	253 f->error = dmGetErrno();
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	254 return ret;
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	255 }
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	256
c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	257
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258 static int dm_stdio_preload(DMResource *handle)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 int ret = dm_stdio_fopen(handle);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261 if (ret != DMERR_OK)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 return ret;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264 dm_stdio_fsize(handle);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	266 handle->rawData = dmMalloc(handle->rawSize);
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	267 if (handle->rawData == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 return DMERR_MALLOC;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	270 if (dm_stdio_fread(handle->rawData, sizeof(Uint8), handle->rawSize, handle) != handle->rawSize)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 return DMERR_FREAD;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273 return DMERR_OK;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 DMResourceOps dfStdioFileOps =
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	279 "Stdio",
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	280
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	281 dm_stdio_freset,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282 dm_stdio_ferror,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283 dm_stdio_fseek,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 dm_stdio_fsize,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285 dm_stdio_ftell,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286 dm_stdio_feof,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 dm_stdio_fgetc,
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	288 dm_stdio_fputc,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 dm_stdio_fread,
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	290 dm_stdio_fwrite,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 dm_stdio_fopen,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293 dm_stdio_fclose,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294 dm_stdio_preload
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 };
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 DMResourceOps dfStdioFHOps =
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	298 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	299 "StdioFH",
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	300
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	301 dm_stdio_freset,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 dm_stdio_ferror,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 dm_stdio_fseek,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 dm_stdio_fsize,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 dm_stdio_ftell,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 dm_stdio_feof,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307 dm_stdio_fgetc,
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	308 dm_stdio_fputc,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 dm_stdio_fread,
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	310 dm_stdio_fwrite,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	311
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	312 NULL,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313 NULL,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 NULL
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	315 };
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	318
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319 // Some mingw/windows headers define these as macros, which is bad for us
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 #ifdef __WIN32
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 #undef ferror
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322 #undef feof
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 /*
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 * PACK file routines
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 */
124 d5cfd29c87c4 Rename some conditional compilation directives. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	329 #ifdef DM_USE_PACKFS
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	330
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	331 #ifdef DM_USE_ZLIB
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	332
995 aeafd6d44465 Move and rename a constant define. Matti Hamalainen <ccr@tnsp.org> parents: 993 diff changeset	333 #define DMRES_TMPBUF_SIZE (128 * 1024)
aeafd6d44465 Move and rename a constant define. Matti Hamalainen <ccr@tnsp.org> parents: 993 diff changeset	334
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	335 static int dm_pack_decompress(DMResource handle, DMPackEntry node)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	336 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	337 int res = DMERR_OK, cres, cdataLeft;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	338 Uint8 * cbuffer = NULL;
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	339 z_stream zstr;
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	340 BOOL zinit = FALSE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342 // Allocate a structures and buffers
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	343 if ((cbuffer = dmMalloc(DMRES_TMPBUF_SIZE)) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 res = DMERR_MALLOC;
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	346 goto out;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 // Initialize decompression
1038 3c1ca37809e3 Oops, 100L. Matti Hamalainen <ccr@tnsp.org> parents: 1036 diff changeset	350 memset(&zstr, 0, sizeof(zstr));
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	351 zstr.next_out = handle->rawData;
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	352 zstr.avail_out = handle->rawSize;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 cdataLeft = node->length;
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	354
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	355 if (inflateInit(&zstr) != Z_OK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	357 res = dmError(DMERR_INIT_FAIL,
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	358 "Could not initialize zlib stream decompression.\n");
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	359 goto out;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 }
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	361 zinit = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 // Uncompress the data
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	364 while (cdataLeft > 0 && zstr.avail_out > 0 && cres == Z_OK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 {
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	366 zstr.avail_in = fread(
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367 cbuffer, sizeof(Uint8),
995 aeafd6d44465 Move and rename a constant define. Matti Hamalainen <ccr@tnsp.org> parents: 993 diff changeset	368 (cdataLeft >= DMRES_TMPBUF_SIZE) ? DMRES_TMPBUF_SIZE : cdataLeft,
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	369 handle->lib->packFile->file);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	371 cdataLeft -= zstr.avail_in;
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	372 zstr.next_in = cbuffer;
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	373 cres = inflate(&zstr, Z_FULL_FLUSH);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	374 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	375
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	376
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	377 out:
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378 // Cleanup
1015 5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	379 if (zinit)
5101766dd95c Error handling consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1014 diff changeset	380 inflateEnd(&zstr);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	382 dmFree(cbuffer);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383 return res;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	386 #else
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	387
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	388 static int dm_pack_decompress(DMResource handle, DMPackEntry node)
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	389 {
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	390 DMZLibContext ctx;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	391 Uint8 *inBuf = NULL;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	392 int ret;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	393
1016 b1d22289af24 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 1015 diff changeset	394 // Allocate buuffer for compressed data
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	395 if ((inBuf = dmMalloc(node->length)) == NULL)
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	396 {
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	397 ret = DMERR_MALLOC;
1010 ffd1ca99e456 Rename label. Matti Hamalainen <ccr@tnsp.org> parents: 995 diff changeset	398 goto out;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	399 }
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	400
1016 b1d22289af24 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 1015 diff changeset	401 // Read compressed data
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	402 if (fread(inBuf, sizeof(Uint8), node->length, handle->lib->packFile->file) != node->length)
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	403 {
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	404 ret = DMERR_FREAD;
1010 ffd1ca99e456 Rename label. Matti Hamalainen <ccr@tnsp.org> parents: 995 diff changeset	405 goto out;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	406 }
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	407
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	408 {
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	409 }
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	410
1016 b1d22289af24 Comments. Matti Hamalainen <ccr@tnsp.org> parents: 1015 diff changeset	411 // Initialize decompression structures
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	412 ctx.zbuffer = inBuf;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	413 ctx.zbufferEnd = inBuf + node->length;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	414
1017 6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	415 ctx.zout = ctx.zoutStart = handle->rawData;
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	416 ctx.zoutEnd = handle->rawData + node->size;
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	417 ctx.expandable = FALSE;
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	418
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	419 // Attempt decompression
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	420 if ((ret = dmZLibParseHeader(&ctx, TRUE)) != DMERR_OK)
1010 ffd1ca99e456 Rename label. Matti Hamalainen <ccr@tnsp.org> parents: 995 diff changeset	421 goto out;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	422
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	423 if ((ret = dmZLibDecode(&ctx)) != DMERR_OK)
1010 ffd1ca99e456 Rename label. Matti Hamalainen <ccr@tnsp.org> parents: 995 diff changeset	424 goto out;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	425
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	426 handle->rawData = ctx.zoutStart;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	427 handle->rawSize = ctx.zout - ctx.zoutStart;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	428
1017 6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	429 out:
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	430 dmFree(inBuf);
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	431 return ret;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	432 }
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	433
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	434 #endif
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	435
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	436
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	437 static int dm_pack_preload(DMResource *handle)
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	438 {
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	439 DMPackEntry *node;
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	440 int ret = DMERR_OK;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	441
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	442 if (handle->lib == NULL \|\| handle->lib->packFile == NULL)
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	443 return DMERR_NULLPTR;
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	444
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	445 // Search PACK nodelist for file
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	446 if ((node = dmPackFind(handle->lib->packFile->entries, handle->filename)) == NULL)
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	447 {
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	448 ret = dmError(DMERR_NOT_FOUND,
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	449 "Entry '%s' not found in PACK file.\n",
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	450 handle->filename);
1010 ffd1ca99e456 Rename label. Matti Hamalainen <ccr@tnsp.org> parents: 995 diff changeset	451 goto out;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	452 }
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	453
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	454 // Seek to entry
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	455 if (DM_FSEEK64(handle->lib->packFile->file, node->offset, SEEK_SET) == -1)
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	456 {
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	457 ret = dmError(DMERR_FSEEK,
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	458 "Could not seek node position in PACK file.\n");
1010 ffd1ca99e456 Rename label. Matti Hamalainen <ccr@tnsp.org> parents: 995 diff changeset	459 goto out;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	460 }
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	461
1017 6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	462 // Allocate memory for the node
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	463 if ((handle->rawData = dmMalloc(node->size)) == NULL)
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	464 {
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	465 ret = dmError(DMERR_MALLOC,
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	466 "Failed to allocate node data for '%s' (%d bytes).\n",
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	467 handle->filename, node->size);
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	468 goto out;
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	469 }
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	470
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	471 // Check if the entry is compressed
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	472 if (handle->flags & DMF_COMPRESSED)
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	473 {
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	474 if ((ret = dm_pack_decompress(handle, node)) != DMERR_OK)
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	475 goto out;
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	476
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	477 if (handle->rawSize != node->size)
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	478 {
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	479 ret = dmError(DMERR_COMPRESSION,
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	480 "Decompressed data size for '%s' does not match size stored in PACK entry (%d <> %d).\n",
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	481 handle->filename, handle->rawSize, node->size);
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	482 }
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	483 }
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	484 else
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	485 {
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	486 if (node->size != node->length)
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	487 {
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	488 ret = dmError(DMERR_INVALID_DATA,
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	489 "Node '%s' raw size and length fields differ for uncompressed node: %d <> %d.\n",
ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	490 handle->filename, node->size, node->length);
1017 6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	491 goto out;
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	492 }
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	493 if (fread(handle->rawData, sizeof(Uint8), node->size, handle->lib->packFile->file) != node->size)
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	494 {
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	495 ret = dmError(DMERR_FREAD,
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	496 "Error reading node data.\n");
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	497 goto out;
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	498 }
6436d80ae0fc Add DMF_COMPRESSED flag for resource nodes and support for raw data nodes. Matti Hamalainen <ccr@tnsp.org> parents: 1016 diff changeset	499 }
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	500
1010 ffd1ca99e456 Rename label. Matti Hamalainen <ccr@tnsp.org> parents: 995 diff changeset	501 out:
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	502 return ret;
993 5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	503 }
5bcd219ddde3 Some work towards dmzlib decompression support for resources. Matti Hamalainen <ccr@tnsp.org> parents: 989 diff changeset	504
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	506 static int dm_pack_fopen(DMResource * f)
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	507 {
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	508 if ((f->flags & DMF_LOADED_RAW) == 0)
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	509 {
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	510 int ret = dm_pack_preload(f);
501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	511 if (ret == DMERR_OK)
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	512 f->flags \|= DMF_LOADED_RAW;
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	513
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	514 return ret;
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	515 }
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	516 else
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	517 return DMERR_OK;
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	518 }
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	519
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	520
166 112eb95f2fba Improve build system granularity. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	521 static void dm_pack_fclose(DMResource * f)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	522 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	523 if ((f->flags & DMF_PERSIST) == 0)
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	524 dmResourceFreeRawData(f);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525 }
166 112eb95f2fba Improve build system granularity. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	526 #endif
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	529 static int dm_mem_freset(DMResource * f)
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	530 {
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	531 f->rawOffset = 0;
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	532 return DMERR_OK;
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	533 }
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	534
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	535
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 static int dm_mem_ferror(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538 return f->error;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	539 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	541
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	542 static int dm_mem_fseek(DMResource * f, const Sint64 offset, const int whence)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	544 off_t newPos;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546 // Calculate the new position
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 switch (whence)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	548 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549 case SEEK_SET:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550 newPos = offset;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 case SEEK_CUR:
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	554 newPos = f->rawOffset + offset;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	556
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	557 case SEEK_END:
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	558 newPos = f->rawSize + offset;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561 default:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	562 return -1;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 // Set the new position
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	566 f->rawOffset = newPos;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	567
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 // Check the new position
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	569 if (newPos < 0 && (size_t) newPos >= f->rawSize)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	570 return -1;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572 return 0;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	573 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576 static off_t dm_mem_fsize(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	577 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	578 return f->rawSize;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	582 static Sint64 dm_mem_ftell(DMResource * f)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	584 return f->rawOffset;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	586
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	587
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588 static BOOL dm_mem_feof(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	589 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590 // Check for EOF
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	591 if ((size_t) f->rawOffset <= f->rawSize)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 return FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594 return TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	598 static int dm_mem_fgetc(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	600 // Check for EOF
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	601 if ((size_t) f->rawOffset < f->rawSize)
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	602 return f->rawData[f->rawOffset++];
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	603 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	604 return EOF;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	605 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	606
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	607
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	608 static size_t dm_mem_fread(void buf, size_t size, size_t nmemb, DMResource f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	609 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	610 size_t length = (size * nmemb);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	611
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 // Check if we can read the whole chunk
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	613 if (((size_t) f->rawOffset + length) >= f->rawSize)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	615 nmemb = (f->rawSize - f->rawOffset) / size;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 length = size * nmemb;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	618
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	619 memcpy(buf, f->rawData + f->rawOffset, length);
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	620 f->rawOffset += length;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	621 return nmemb;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	622 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	624
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	625 static int dm_mem_fputc(int ch, DMResource * f)
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	626 {
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	627 // Check for EOF
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	628 if ((size_t) f->rawOffset < f->rawSize)
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	629 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	630 f->rawData[f->rawOffset++] = ch;
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	631 return ch;
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	632 }
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	633 else
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	634 return EOF;
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	635 }
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	636
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	637
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	638 static size_t dm_mem_fwrite(void buf, size_t size, size_t nmemb, DMResource f)
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	639 {
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	640 size_t length = (size * nmemb);
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	641
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	642 // Check if we can write the whole chunk
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	643 if (((size_t) f->rawOffset + length) >= f->rawSize)
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	644 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	645 nmemb = (f->rawSize - f->rawOffset) / size;
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	646 length = size * nmemb;
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	647 }
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	648
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	649 if (length > 0)
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	650 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	651 memcpy(f->rawData + f->rawOffset, buf, length);
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	652 f->rawOffset += length;
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	653 }
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	654 return nmemb;
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	655 }
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	656
bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	657
166 112eb95f2fba Improve build system granularity. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	658 #ifdef DM_USE_PACKFS
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659 DMResourceOps dfPackFileOps =
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	660 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	661 "PackFS",
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	662
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	663 dm_mem_freset,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	664 dm_mem_ferror,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	665 dm_mem_fseek,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	666 dm_mem_fsize,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	667 dm_mem_ftell,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	668 dm_mem_feof,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	669 dm_mem_fgetc,
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	670 NULL,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	671 dm_mem_fread,
59 c560703e85ed Add resource writing functions (only work for stdio backend) Matti Hamalainen <ccr@tnsp.org> parents: 33 diff changeset	672 NULL,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	673
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	674 dm_pack_fopen,
166 112eb95f2fba Improve build system granularity. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	675 dm_pack_fclose,
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	676 dm_pack_preload,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	677 };
166 112eb95f2fba Improve build system granularity. Matti Hamalainen <ccr@tnsp.org> parents: 124 diff changeset	678 #endif
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	679
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	680
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681 DMResourceOps dfMemIOFileOps =
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	682 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	683 "MemIO",
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	684
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	685 dm_mem_freset,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	686 dm_mem_ferror,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	687 dm_mem_fseek,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	688 dm_mem_fsize,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	689 dm_mem_ftell,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 dm_mem_feof,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691 dm_mem_fgetc,
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	692 dm_mem_fputc,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693 dm_mem_fread,
439 bc1da1f4cb4b Implement fwrite and fputc in memio resources. They will only operate on pre-allocated memory area, thus not grow-as-write. Matti Hamalainen <ccr@tnsp.org> parents: 437 diff changeset	694 dm_mem_fwrite,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	695
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 NULL,
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	697 dmResourceFree,
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698 NULL
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	699 };
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	702 /* FS file handling functions. These functions call the actual
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 * functions depending on where the file is located.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	704 */
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	705 static int dmResourcePreload(DMResource *handle)
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	706 {
733 b505b81a43de Fix resource loading. Matti Hamalainen <ccr@tnsp.org> parents: 732 diff changeset	707 int ret = DMERR_OK;
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	708
e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	709 // Check if we want to preload raw data?
737 897646df1de1 Handle preloading of resources that do not have rops. Matti Hamalainen <ccr@tnsp.org> parents: 736 diff changeset	710 if ((handle->lib->flags & DRF_PRELOAD_RAW) \|\|
897646df1de1 Handle preloading of resources that do not have rops. Matti Hamalainen <ccr@tnsp.org> parents: 736 diff changeset	711 handle->rops == NULL \|\| handle->rops->load == NULL)
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	712 {
602 c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	713 if (handle->flags & DMF_LOADED_RAW)
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	714 ret = DMERR_OK;
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	715 else
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	716 if (handle->fops->preload != NULL)
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	717 {
602 c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	718 ret = handle->fops->preload(handle);
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	719 if (ret == DMERR_OK)
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	720 handle->flags \|= DMF_LOADED_RAW \| DMF_PERSIST;
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	721 }
733 b505b81a43de Fix resource loading. Matti Hamalainen <ccr@tnsp.org> parents: 732 diff changeset	722 else
b505b81a43de Fix resource loading. Matti Hamalainen <ccr@tnsp.org> parents: 732 diff changeset	723 ret = DMERR_INIT_FAIL;
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	724
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	725 dmfreset(handle);
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	726 }
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	727
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	728 // Check if resource data is to be preloaded
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	729 if (handle->lib->flags & DRF_PRELOAD_RES)
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	730 {
602 c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	731 if (handle->flags & DMF_LOADED_RES)
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	732 ret = DMERR_OK;
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	733 else
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	734 if (handle->rops != NULL &&
c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	735 handle->rops->load != NULL)
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	736 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	737 if ((ret = handle->fops->fopen(handle)) == DMERR_OK)
602 c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	738 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	739 ret = handle->rops->load(handle);
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	740 handle->fops->fclose(handle);
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	741 }
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	742
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	743 if (ret == DMERR_OK)
602 c1a5652e473d Sanitize resource preloading function a bit. Matti Hamalainen <ccr@tnsp.org> parents: 553 diff changeset	744 handle->flags \|= DMF_LOADED_RES;
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	745 }
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	746
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	747 dmfreset(handle);
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	748 }
e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	749
e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	750 return ret;
e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	751 }
e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	752
e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	753
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	754 int dmf_open(DMResourceLib lib, const char filename, DMResource **phandle)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 {
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	756 DMResource *handle;
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	757 int ret;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	758
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	759 // Check master directory for resource
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	760 if ((*phandle = handle = dmResourceFind(lib, filename)) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 {
124 d5cfd29c87c4 Rename some conditional compilation directives. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	762 #ifdef DM_USE_STDIO
613 15cd5b8a29b2 Add DRF_USE_STDIO flag for resources. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	763 if (lib->flags & DRF_USE_STDIO)
15cd5b8a29b2 Add DRF_USE_STDIO flag for resources. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	764 {
15cd5b8a29b2 Add DRF_USE_STDIO flag for resources. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	765 // Hmm.. does not exist? Fall back to a stdio file
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	766 *phandle = handle = dmResourceNew(lib, filename, 0, 0);
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	767 if (handle == NULL)
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	768 return DMERR_MALLOC;
613 15cd5b8a29b2 Add DRF_USE_STDIO flag for resources. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	769
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	770 handle->fops = &dfStdioFileOps;
613 15cd5b8a29b2 Add DRF_USE_STDIO flag for resources. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	771 }
15cd5b8a29b2 Add DRF_USE_STDIO flag for resources. Matti Hamalainen <ccr@tnsp.org> parents: 609 diff changeset	772 else
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	773 return DMERR_INIT_FAIL;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 #else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	775 // Stdio not enabled, fail
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	776 return DMERR_INIT_FAIL;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	778 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 // Check if the data is preloaded
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	781 if ((ret = handle->fops->fopen(handle)) == DMERR_OK)
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	782 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	783 dmResourceRef(handle);
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	784 if (handle->flags & DMF_TEMPORARY)
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	785 {
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	786 handle->flags &= ~DMF_TEMPORARY;
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	787 dmResourceInsert(lib, handle);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	788 }
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	789 }
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	790 else
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	791 if (handle->flags & DMF_TEMPORARY)
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	792 {
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	793 dmResourceFree(handle);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	794 *phandle = handle = NULL;
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	795 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	796
737 897646df1de1 Handle preloading of resources that do not have rops. Matti Hamalainen <ccr@tnsp.org> parents: 736 diff changeset	797 dmfreset(handle);
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	798 return ret;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	800
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	802 int dmf_create_memio(DMResourceLib lib, const char filename,
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	803 Uint8 buf, const size_t size, DMResource *phandle)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	805 DMResource *handle;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	806
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	807 // Check master directory for resource
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	808 if ((*phandle = handle = dmResourceFind(lib, filename)) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 {
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	810 if ((*phandle = handle = dmResourceNew(
ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	811 lib, filename, size, DMF_LOADED_RAW \| DMF_UNALLOCATED)) == NULL)
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	812 return DMERR_MALLOC;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	813
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	814 handle->fops = &dfMemIOFileOps;
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	815 handle->rawData = buf;
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	816 dmResourceInsert(lib, handle);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	818
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	819 // Increase refcount
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	820 dmResourceRef(handle);
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	821 dmfreset(handle);
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	822 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	823 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	824
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	825
124 d5cfd29c87c4 Rename some conditional compilation directives. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	826 #ifdef DM_USE_STDIO
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	827 int dmf_create_stdio(const char filename, const char mode, DMResource **phandle)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	828 {
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	829 DMResource *handle;
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	830 if ((*phandle = handle = dmResourceNew(NULL, filename, 0, 0)) == NULL)
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	831 return DMERR_MALLOC;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	832
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	833 handle->fops = &dfStdioFileOps;
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	834 handle->fh = fopen(filename, mode);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	835 handle->error = dmGetErrno();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	836
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	837 if (handle->fh == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	838 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	839 dmResourceFree(handle);
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	840 return handle->error;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	841 }
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	842
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	843 dmResourceRef(handle);
3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	844 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	845 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	846
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	847
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	848 int dmf_create_stdio_stream(FILE fh, DMResource *phandle)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	849 {
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	850 DMResource *handle;
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	851 if ((*phandle = handle = dmResourceNew(NULL, "", 0, 0)) == NULL)
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	852 return DMERR_MALLOC;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	853
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	854 handle->fops = &dfStdioFHOps;
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	855 handle->fh = fh;
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	856 dmResourceRef(handle);
730 3d813c81f33c More work on resources API. Matti Hamalainen <ccr@tnsp.org> parents: 728 diff changeset	857 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	858 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	859 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	860
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	861
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	862 void dmf_close(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	863 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	864 if (f == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	865 return;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	866
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	867 if (f->fops->fclose != NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	868 f->fops->fclose(f);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	869
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	870 dmResourceUnref(f);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	871 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	872
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	873
732 2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	874 int dmfreset(DMResource *f)
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	875 {
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	876 if (f == NULL)
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	877 return DMERR_NULLPTR;
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	878
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	879 if (f->fops == NULL \|\| f->fops->freset == NULL)
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	880 return DMERR_OK;
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	881
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	882 return f->fops->freset(f);
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	883 }
2f02d9b4caa3 More work. Matti Hamalainen <ccr@tnsp.org> parents: 731 diff changeset	884
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	885 int dmferror(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	886 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	887 f->atime = time(NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	888 return f->fops->ferror(f);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	889 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	890
1036 1a0a327d8fed Use 64bit file offsets. Matti Hamalainen <ccr@tnsp.org> parents: 1034 diff changeset	891 int dmfseek(DMResource * f, Sint64 offset, int whence)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	892 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	893 f->atime = time(NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	894 return f->fops->fseek(f, offset, whence);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	895 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	896
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	897 off_t dmfsize(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	898 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	899 f->atime = time(NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	900 return f->fops->fsize(f);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	901 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	902
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	903 off_t dmftell(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	904 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	905 f->atime = time(NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	906 return f->fops->ftell(f);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	907 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	908
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	909 BOOL dmfeof(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	910 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	911 f->atime = time(NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	912 return f->fops->feof(f);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	913 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	914
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	915 int dmfgetc(DMResource * f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	916 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	917 f->atime = time(NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	918 return f->fops->fgetc(f);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	919 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	920
74 23ac82365a65 Add file mode to dmf_create_stdio(). Matti Hamalainen <ccr@tnsp.org> parents: 72 diff changeset	921 int dmfputc(int v, DMResource * f)
72 be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	922 {
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	923 f->atime = time(NULL);
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	924 return f->fops->fputc(v, f);
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	925 }
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	926
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	927 size_t dmfread(void ptr, size_t size, size_t nmemb, DMResource f)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	928 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	929 f->atime = time(NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	930 return f->fops->fread(ptr, size, nmemb, f);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	931 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	932
72 be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	933 size_t dmfwrite(void ptr, size_t size, size_t nmemb, DMResource f)
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	934 {
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	935 f->atime = time(NULL);
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	936 return f->fops->fwrite(ptr, size, nmemb, f);
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	937 }
be6160981428 Improve and finish write functions in resource subsystem. Matti Hamalainen <ccr@tnsp.org> parents: 59 diff changeset	938
235 4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	939 char dmfgets(char s, int size, DMResource * f)
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	940 {
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	941 char *p = s, c;
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	942 int n = 0;
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	943
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	944 while ((c = f->fops->fgetc(f)) != EOF)
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	945 {
237 6d9d43bb68eb Oops, another silly issue in dmfgets(). Matti Hamalainen <ccr@tnsp.org> parents: 236 diff changeset	946 n++;
235 4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	947 if (c == '\n')
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	948 break;
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	949 else
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	950 if (n < size - 1)
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	951 *p++ = c;
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	952 }
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	953 *p = 0;
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	954
236 8189be40ed7c Oops, dmfgets() had a nasty think-o and counted the remaining buffer space Matti Hamalainen <ccr@tnsp.org> parents: 235 diff changeset	955 return (n > 0) ? s : NULL;
235 4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	956 }
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	957
4a672d96978f Add dmfgets() function. Matti Hamalainen <ccr@tnsp.org> parents: 208 diff changeset	958
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	959 int dmResourceRef(DMResource *node)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	960 {
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	961 if (node->lib != NULL) dmMutexLock(node->lib->mutex);
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	962 node->atime = time(NULL);
21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	963 node->refcount++;
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	964 if (node->lib != NULL) dmMutexUnlock(node->lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	965
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	966 return node->refcount;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	967 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	968
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	969
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	970 int dmResourceUnref(DMResource *node)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	971 {
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	972 if (node->lib != NULL) dmMutexLock(node->lib->mutex);
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	973 node->refcount--;
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	974 if (node->lib != NULL) dmMutexUnlock(node->lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	975
27 21c14afbf63d Modularize the resource system a bit. Matti Hamalainen <ccr@tnsp.org> parents: 26 diff changeset	976 return node->refcount;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	978
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	980 #ifdef DM_USE_STDIO
727 3d74dc794a0a Fix function name. Matti Hamalainen <ccr@tnsp.org> parents: 722 diff changeset	981 static int dmResourcesLoadDirectory(DMResourceLib lib, const char path)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982 {
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	983 int ret = DMERR_OK;
630 6e2b53f2878b Win32 compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	984 struct dirent *dh;
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	985 DIR *hdir = opendir(path);
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	986 if (hdir == NULL)
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	987 return dmGetErrno();
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	989 dmMutexLock(lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	990
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	991 do
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 {
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	993 DMResource *node = NULL;
630 6e2b53f2878b Win32 compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	994 dh = readdir(hdir);
6e2b53f2878b Win32 compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	995 if (dh != NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	996 {
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	997 struct stat sbuf;
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	998 char *fname = dm_strdup_printf("%s/%s", path, dh->d_name);
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	999 if (stat(fname, &sbuf) == -1)
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1000 {
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	1001 ret = dmError(dmGetErrno(),
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1002 "Could not stat() %s, #%d: %s\n",
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	1003 fname, ret, dmErrorStr(ret));
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1004 dmFree(fname);
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1005 goto out;
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1006 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1007
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1008 if (S_ISREG(sbuf.st_mode))
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	1009 node = dmResourceNew(lib, dh->d_name, sbuf.st_size, 0);
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1010 }
630 6e2b53f2878b Win32 compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	1011
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1012 if (node != NULL)
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1013 {
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1014 node->fops = &dfStdioFileOps;
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1015 dmResourceInsert(lib, node);
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1016 }
630 6e2b53f2878b Win32 compatibility. Matti Hamalainen <ccr@tnsp.org> parents: 629 diff changeset	1017 } while (dh != NULL);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1019 out:
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1020 dmMutexUnlock(lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1021
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1022 #ifdef __WIN32
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1023 #else
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1024 closedir(hdir);
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1025 #endif
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1026
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	1027 return ret;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1028 }
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1029 #endif
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1030
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1031
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1032 /* Resources subsystem initialization and shutdown routines
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1033 */
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1034 int dmResourcesInit(DMResourceLib *plib, const char filename, const char path, const int flags, int (classifier)(DMResource *))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1035 {
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1036 DMResourceLib *lib;
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1037 BOOL initialized = FALSE;
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1038
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1039 // Allocate the resource library structure
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1040 if ((*plib = lib = dmMalloc0(sizeof(DMResourceLib))) == NULL)
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1041 return DMERR_MALLOC;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1042
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1043 // Basic data
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1044 lib->mutex = dmCreateMutex();
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1045 lib->flags = flags;
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1046 lib->resPath = dm_strdup((path != NULL) ? path : DMRES_DATA_PATH);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1047
107 1c2ff205fa0e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	1048
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1049 #ifdef DM_USE_PACKFS
734 56c1d288f0e2 Add some debugging. Matti Hamalainen <ccr@tnsp.org> parents: 733 diff changeset	1050 if (flags & DRF_USE_PACK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1051 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1052 int ret;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1053 DMPackEntry *node;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1054
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1055 lib->packFilename = dm_strdup((filename != NULL) ? filename : DMRES_DATA_PACK);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1056
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1057 // Initialize PACK, open as read-only
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1058 ret = dmPackOpen(lib->packFilename, &lib->packFile, TRUE);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1059 if (ret != DMERR_OK)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1060 {
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1061 if ((flags & DRF_USE_STDIO) == 0)
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1062 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1063 return dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1064 "Error opening PACK file '%s', #%d: %s\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1065 lib->packFilename, ret, dmErrorStr(ret));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1066 }
734 56c1d288f0e2 Add some debugging. Matti Hamalainen <ccr@tnsp.org> parents: 733 diff changeset	1067 else
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1068 {
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1069 // Non-fatal
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1070 dmError(DMERR_INIT_FAIL,
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1071 "Failed to open PACK, falling back to STDIO, '%s' %d: %s\n",
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1072 lib->packFilename, ret, dmErrorStr(ret));
985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1073 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1074 }
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1075 else
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1076 {
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1077 // Initialize resources from a PACK file
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1078 for (node = lib->packFile->entries; node != NULL; node = node->next)
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1079 {
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	1080 DMResource *res = dmResourceNew(lib, node->filename, node->size, node->flags & DMF_PACK_MASK);
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1081 if (res == NULL)
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1082 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1083 return dmError(DMERR_INIT_FAIL,
1040 ebabf5aefb76 Work on resource handling. Matti Hamalainen <ccr@tnsp.org> parents: 1038 diff changeset	1084 "Could not allocate memory for resource node '%s' [0x%08x], %d bytes.\n",
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1085 node->filename, node->flags, node->size);
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1086 }
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1087
736 ea42faa02a9a Set packfile fileops in the appropriate handles. Matti Hamalainen <ccr@tnsp.org> parents: 734 diff changeset	1088 res->fops = &dfPackFileOps;
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1089 dmResourceInsert(lib, res);
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1090 }
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1091
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1092 initialized = TRUE;
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1093 }
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1094 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1095 #endif
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1096
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1097 #ifdef DM_USE_STDIO
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1098 if (!initialized && (flags & DRF_USE_STDIO))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1099 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1100 // Initialize resources from a resource directory
727 3d74dc794a0a Fix function name. Matti Hamalainen <ccr@tnsp.org> parents: 722 diff changeset	1101 int ret = dmResourcesLoadDirectory(lib, lib->resPath);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1102 if (ret != DMERR_OK)
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1103 return ret;
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1104 initialized = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1105 }
625 e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1106 #endif
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1107
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1108 if (!initialized)
e8fc083b7499 More work on resource management. Matti Hamalainen <ccr@tnsp.org> parents: 613 diff changeset	1109 return DMERR_INIT_FAIL;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1110
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1111 // Okay, classify resources
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1112 if (lib->resources != NULL && classifier != NULL)
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1113 {
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1114 DMResource *node;
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1115 for (node = lib->resources; node != NULL; node = node->next)
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1116 {
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1117 int ret = classifier(node);
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1118 if (ret != DMERR_OK)
107 1c2ff205fa0e Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 74 diff changeset	1119 return ret;
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1120 }
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1121 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1122
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1123 // Initialization complete
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1124 return DMERR_OK;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1125 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1126
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1127
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1128 int dmResourcesClose(DMResourceLib *lib)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1129 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1130 DMResource *node;
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1131
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1132 if (lib == NULL)
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1133 return DMERR_NULLPTR;
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1134
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1135 dmMutexLock(lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1136
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1137 // Shutdown possible subsystems
124 d5cfd29c87c4 Rename some conditional compilation directives. Matti Hamalainen <ccr@tnsp.org> parents: 114 diff changeset	1138 #ifdef DM_USE_PACKFS
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1139 if (lib->flags & DRF_USE_PACK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1140 {
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	1141 int ret = dmPackClose(lib->packFile);
501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	1142 if (ret != DMERR_OK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1143 {
1014 501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	1144 dmError(ret, "Error closing PACK, #%i: %s\n",
501ee5f0c043 Rename variables for consistency. Matti Hamalainen <ccr@tnsp.org> parents: 1010 diff changeset	1145 ret, dmErrorStr(ret));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1146 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1147
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1148 dmFree(lib->packFilename);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1149 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1150 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1151
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1152 // Free resource entries
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1153 node = lib->resources;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1154 while (node != NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1155 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1156 DMResource *next = node->next;
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1157 dmResourceFree(node);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1158 node = next;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1159 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1160
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1161 // Etc.
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1162 dmFree(lib->resPath);
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1163 dmMutexUnlock(lib->mutex);
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1164 dmDestroyMutex(lib->mutex);
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1165 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1166 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1167
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1168
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1169 int dmResourcesPreload(DMResourceLib lib, BOOL start, int loaded, int *total)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1170 {
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1171 int ret = DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1172
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1173 dmMutexLock(lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1174
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1175 // Initialize preloading
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1176 if (lib->preload == NULL \|\| start)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1177 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1178 DMResource *node;
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1179
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1180 lib->preload = lib->resources;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1181 *loaded = 0;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1182 *total = 0;
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1183
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1184 // Calculate total number of resources to be preloaded
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1185 if (lib->flags & (DRF_PRELOAD_RAW \| DRF_PRELOAD_RES))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1186 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1187 for (node = lib->resources; node != NULL; node = node->next)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1188 (*total)++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1189 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1190 }
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1191 else
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1192 if (lib->preload != NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1193 {
728 867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	1194 // Attempt to preload the resource
867fc7f205a8 More work on resource handling cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 727 diff changeset	1195 if ((ret = dmResourcePreload(lib->preload)) != DMERR_OK)
628 0533f94e843b Add error message to failed preloading. Matti Hamalainen <ccr@tnsp.org> parents: 627 diff changeset	1196 {
958 985225a93aeb Add error code parameter to dmError() and dmErrorVA(). Matti Hamalainen <ccr@tnsp.org> parents: 872 diff changeset	1197 dmError(ret, "Error preloading '%s', %d: %s\n",
628 0533f94e843b Add error message to failed preloading. Matti Hamalainen <ccr@tnsp.org> parents: 627 diff changeset	1198 lib->preload->filename, ret, dmErrorStr(ret));
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	1199 goto error;
628 0533f94e843b Add error message to failed preloading. Matti Hamalainen <ccr@tnsp.org> parents: 627 diff changeset	1200 }
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1201
29 e9f562f07cb0 Modularize some more and fix a nasty bug when raw data is not preloaded but Matti Hamalainen <ccr@tnsp.org> parents: 27 diff changeset	1202 (*loaded)++;
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1203 lib->preload = lib->preload->next;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1204 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1205
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1206 dmMutexUnlock(lib->mutex);
59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1207 return (lib->preload == NULL) ? DMERR_OK : DMERR_PROGRESS;
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1208
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1209 error:
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1210 dmMutexUnlock(lib->mutex);
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1211 return ret;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1212 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1213
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1214
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1215 void dmResourcePrune(DMResourceLib *lib, const int agems, int const flags)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1216 {
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1217 DMResource *node;
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1218 const int stamp = time(NULL);
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1219 dmMutexLock(lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1220
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1221 for (node = lib->resources; node != NULL; node = node->next)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1222 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1223 // Check if node has refcount of 0 and is
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1224 // not marked as persistent resource
26 2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1225 if (node->refcount == 0 &&
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1226 (node->flags & DMF_PERSIST) == 0 &&
2f463a59d732 Implement rudimentary resource system. Matti Hamalainen <ccr@tnsp.org> parents: 4 diff changeset	1227 (node->flags & (DMF_LOADED_RES \| DMF_LOADED_RAW)))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1228 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1229 if (((flags & DMPRUNE_ATIME) && stamp - node->atime >= agems) \|\|
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1230 ((flags & DMPRUNE_MTIME) && stamp - node->mtime >= agems))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1231 {
721 bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1232 dmResourceFreeResData(node);
bb14d7907eb2 Rename many pack & resource handling functions. Matti Hamalainen <ccr@tnsp.org> parents: 630 diff changeset	1233 dmResourceFreeRawData(node);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1234 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1235 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1236 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1237
359 59045853853d Make resource management re-entrant. Matti Hamalainen <ccr@tnsp.org> parents: 237 diff changeset	1238 dmMutexUnlock(lib->mutex);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1240
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1241
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1242 /* Helper resource access routines
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1243 */
553 b60220fd1669 s/Uint8/void/ in dmf_{read,write}_str(). Matti Hamalainen <ccr@tnsp.org> parents: 439 diff changeset	1244 int dmf_read_str(DMResource f, void s, size_t l)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1245 {
553 b60220fd1669 s/Uint8/void/ in dmf_{read,write}_str(). Matti Hamalainen <ccr@tnsp.org> parents: 439 diff changeset	1246 return dmfread(s, 1, l, f) == l;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1247 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1248
437 3d9c044ec08d Add dmf_{write,read}_byte() convenience functions. Matti Hamalainen <ccr@tnsp.org> parents: 406 diff changeset	1249 BOOL dmf_read_byte(DMResource f, Uint8 val)
3d9c044ec08d Add dmf_{write,read}_byte() convenience functions. Matti Hamalainen <ccr@tnsp.org> parents: 406 diff changeset	1250 {
3d9c044ec08d Add dmf_{write,read}_byte() convenience functions. Matti Hamalainen <ccr@tnsp.org> parents: 406 diff changeset	1251 int tmp = dmfgetc(f);
3d9c044ec08d Add dmf_{write,read}_byte() convenience functions. Matti Hamalainen <ccr@tnsp.org> parents: 406 diff changeset	1252 *val = tmp;
3d9c044ec08d Add dmf_{write,read}_byte() convenience functions. Matti Hamalainen <ccr@tnsp.org> parents: 406 diff changeset	1253 return tmp != EOF;
3d9c044ec08d Add dmf_{write,read}_byte() convenience functions. Matti Hamalainen <ccr@tnsp.org> parents: 406 diff changeset	1254 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256 #define DM_DEFINE_FUNC(xname, xtype, xmacro) \
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257 BOOL dmf_read_ ## xname (DMResource f, xtype v) { \
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1258 xtype result; \
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1259 if (dmfread(&result, sizeof( xtype ), 1, f) != 1) \
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1260 return FALSE; \
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1261 *v = DM_ ## xmacro ## _TO_NATIVE (result); \
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1262 return TRUE; \
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1263 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1264
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1265 DM_DEFINE_FUNC(le16, Uint16, LE16)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1266 DM_DEFINE_FUNC(le32, Uint32, LE32)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1267
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1268 DM_DEFINE_FUNC(be16, Uint16, BE16)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1269 DM_DEFINE_FUNC(be32, Uint32, BE32)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1270
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1271 DM_DEFINE_FUNC(le64, Uint64, LE64)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1272 DM_DEFINE_FUNC(be64, Uint64, BE64)

Mercurial > hg > dmlib

annotate src/dmres.c @ 1044:1ec6ae223941