dmlib: src/dmres.c annotate

annotate src/dmres.c @ 1040:ebabf5aefb76

Work on resource handling.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sun, 01 Mar 2015 17:17:36 +0200
parents	3c1ca37809e3
children	d0f80f6a0c65

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

Mercurial > hg > dmlib

annotate src/dmres.c @ 1040:ebabf5aefb76