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