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