dmlib: src/dmres.c annotate

annotate src/dmres.c @ 1150:6f7503231c17

Fix use-after-free case.

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 05 Mar 2015 04:59:40 +0200
parents	7842e977d3df
children	b3d3dafecfe0

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

Mercurial > hg > dmlib

annotate src/dmres.c @ 1150:6f7503231c17