/[public]/psiconv/trunk/lib/psiconv/generate_simple.c
ViewVC logotype

Diff of /psiconv/trunk/lib/psiconv/generate_simple.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 80 Revision 196
1/* 1/*
2 generate_simple.c - Part of psiconv, a PSION 5 file formats converter 2 generate_simple.c - Part of psiconv, a PSION 5 file formats converter
3 Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl> 3 Copyright (c) 2000-2004 Frodo Looijaard <frodol@dds.nl>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
18*/ 18*/
19 19
20
20#include "config.h" 21#include "config.h"
21#include "compat.h" 22#include "compat.h"
23
24#include <string.h>
25#include <stdlib.h>
22 26
23#include "generate_routines.h" 27#include "generate_routines.h"
24#include "error.h" 28#include "error.h"
25 29
26int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value) 30#ifdef DMALLOC
31#include <dmalloc.h>
32#endif
33
34static int psiconv_write_string_aux(const psiconv_config config,
35 psiconv_buffer buf, int lev,
36 const psiconv_string_t value,int kind);
37
38int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf,
39 int lev,const psiconv_u8 value)
27{ 40{
41 psiconv_progress(config,lev,0,"Writing u8");
28 return psiconv_buffer_add(buf,value); 42 return psiconv_buffer_add(buf,value);
29} 43}
30 44
31int psiconv_write_u16(psiconv_buffer buf,const psiconv_u16 value) 45int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf,
46 int lev,const psiconv_u16 value)
32{ 47{
33 int res; 48 int res;
49 psiconv_progress(config,lev,0,"Writing u16");
34 if ((res = psiconv_buffer_add(buf,value & 0xff))) 50 if ((res = psiconv_buffer_add(buf,value & 0xff)))
35 return res; 51 return res;
36 return psiconv_buffer_add(buf,(value & 0xff00) >> 8); 52 return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
37} 53}
38 54
39int psiconv_write_u32(psiconv_buffer buf,const psiconv_u32 value) 55int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf,
56 int lev,const psiconv_u32 value)
40{ 57{
41 int res; 58 int res;
59 psiconv_progress(config,lev,0,"Writing u32");
42 if ((res = psiconv_buffer_add(buf,value & 0xff))) 60 if ((res = psiconv_buffer_add(buf,value & 0xff)))
43 return res; 61 return res;
44 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 62 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
45 return res; 63 return res;
46 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 64 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16)))
47 return res; 65 return res;
48 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24); 66 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
49} 67}
50 68
51int psiconv_write_S(psiconv_buffer buf, const psiconv_u32 value) 69int psiconv_write_S(const psiconv_config config,psiconv_buffer buf,
70 int lev,const psiconv_u32 value)
52{ 71{
72 psiconv_progress(config,lev,0,"Writing S");
53 if (value < 0x40) 73 if (value < 0x40)
54 return psiconv_write_u8(buf,value * 4 + 2); 74 return psiconv_write_u8(config,buf,lev+1,value * 4 + 2);
55 else if (value < 0x2000) 75 else if (value < 0x2000)
56 return psiconv_write_u16(buf,value * 8 + 3); 76 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
57 else { 77 else {
58 psiconv_warn(0,psiconv_buffer_length(buf), 78 psiconv_error(config,0,psiconv_buffer_length(buf),
59 "Don't know how to write S value larger than 0x2000 " 79 "Don't know how to write S value larger than 0x2000 "
60 "(trying %x)",value); 80 "(trying %x)",value);
61 return -PSICONV_E_GENERATE; 81 return -PSICONV_E_GENERATE;
62 } 82 }
63} 83}
64 84
65int psiconv_write_X(psiconv_buffer buf, const psiconv_u32 value) 85int psiconv_write_X(const psiconv_config config,psiconv_buffer buf,
86 int lev, const psiconv_u32 value)
66{ 87{
88 psiconv_progress(config,lev,0,"Writing X");
67 if (value < 0x80) 89 if (value < 0x80)
68 return psiconv_write_u8(buf,value * 2); 90 return psiconv_write_u8(config,buf,lev+1,value * 2);
69 else if (value < 0x4000) 91 else if (value < 0x4000)
70 return psiconv_write_u16(buf,value * 4 + 1); 92 return psiconv_write_u16(config,buf,lev+1,value * 4 + 1);
71 else if (value < 0x20000000) 93 else if (value < 0x20000000)
72 return psiconv_write_u16(buf,value * 8 + 3); 94 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
73 else { 95 else {
74 psiconv_warn(0,psiconv_buffer_length(buf), 96 psiconv_error(config,0,psiconv_buffer_length(buf),
75 "Don't know how to write X value larger than 0x20000000 " 97 "Don't know how to write X value larger than 0x20000000 "
76 "(trying %x)",value); 98 "(trying %x)",value);
77 return -PSICONV_E_GENERATE; 99 return -PSICONV_E_GENERATE;
78 } 100 }
79} 101}
80 102
81int psiconv_write_length(psiconv_buffer buf, const psiconv_length_t value) 103int psiconv_write_length(const psiconv_config config,psiconv_buffer buf,
104 int lev,const psiconv_length_t value)
82{ 105{
106 psiconv_progress(config,lev,0,"Writing length");
83 return psiconv_write_u32(buf,value * (1440.0/2.54) + 0.5); 107 return psiconv_write_u32(config,buf,lev+1,value * (1440.0/2.54) + 0.5);
84} 108}
85 109
86int psiconv_write_size(psiconv_buffer buf, psiconv_size_t value) 110int psiconv_write_size(const psiconv_config config,psiconv_buffer buf,
111 int lev, psiconv_size_t value)
87{ 112{
113 psiconv_progress(config,lev,0,"Writing size");
88 return psiconv_write_u32(buf,value * 20.0 + 0.5); 114 return psiconv_write_u32(config,buf,lev+1,value * 20.0 + 0.5);
89} 115}
90 116
91int psiconv_write_bool(psiconv_buffer buf, const psiconv_bool_t value) 117int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf,
118 int lev,const psiconv_bool_t value)
92{ 119{
120 psiconv_progress(config,lev,0,"Writing bool");
93 if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 121 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
94 psiconv_warn(0,psiconv_buffer_length(buf), 122 psiconv_warn(config,0,psiconv_buffer_length(buf),
95 "Boolean has non-enum value (found %d)",value); 123 "Boolean has non-enum value (found %d)",value);
96 return psiconv_write_u8(buf,value == psiconv_bool_false?0:1); 124 return psiconv_write_u8(config,buf,lev+1,value == psiconv_bool_false?0:1);
97} 125}
98 126
99int psiconv_write_string(psiconv_buffer buf, const psiconv_string_t value) 127int psiconv_write_string(const psiconv_config config,psiconv_buffer buf,
128 int lev, const psiconv_string_t value)
100{ 129{
130 psiconv_progress(config,lev,0,"Writing string");
131 return psiconv_write_string_aux(config,buf,lev+1,value,-1);
132}
133
134int psiconv_write_short_string(const psiconv_config config,psiconv_buffer buf,
135 int lev,const psiconv_string_t value)
136{
137 psiconv_progress(config,lev,0,"Writing short string");
138 return psiconv_write_string_aux(config,buf,lev+1,value,-2);
139}
140
141int psiconv_write_charlist(const psiconv_config config,psiconv_buffer buf,
142 int lev,const psiconv_string_t value)
143{
144 psiconv_progress(config,lev,0,"Writing short string");
145 return psiconv_write_string_aux(config,buf,lev+1,value,0);
146}
147
148
149int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf,
150 int lev, const psiconv_string_t value,int kind)
151{
101 int res,i; 152 int res,i,len;
153 psiconv_u8 *output;
154
155 psiconv_progress(config,lev,0,"Writing string (auxiliary)");
156 len = psiconv_unicode_strlen(value);
102 if (!value) { 157 if (!value) {
103 psiconv_warn(0,psiconv_buffer_length(buf), 158 psiconv_error(config,0,psiconv_buffer_length(buf),
104 "NULL string"); 159 "NULL string");
105 return -PSICONV_E_GENERATE; 160 return -PSICONV_E_GENERATE;
106 } 161 }
107 if ((res = psiconv_write_S(buf,strlen(value)))) 162 if (kind == -1)
163 res = psiconv_write_S(config,buf,lev+1,len);
164 else if (kind == -2)
165 res = psiconv_write_u8(config,buf,lev+1,len);
166 else
167 res = 0;
168 if (res)
108 return res; 169 return res;
170
171 if ((res = psiconv_unicode_to_chars(config,value,&output)))
172 return res;
173
109 for (i = 0; i < strlen(value); i++) 174 for (i = 0; i < len; i++)
110 if ((res = psiconv_write_u8(buf,value[i]))) 175 if ((res = psiconv_write_u8(config,buf,lev+1,output[i]))) {
176 free(output);
111 return res; 177 return res;
178 }
179 free(output);
112 return -PSICONV_E_OK; 180 return -PSICONV_E_OK;
113} 181}
114 182
115int psiconv_write_offset(psiconv_buffer buf, psiconv_u32 id) 183int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf,
184 int lev,psiconv_u32 id)
116{ 185{
186 psiconv_progress(config,lev,0,"Writing offset");
117 return psiconv_buffer_add_reference(buf,id); 187 return psiconv_buffer_add_reference(buf,id);
118} 188}
Legend:
Removed from v.80  
changed lines
  Added in v.196
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26