/[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 142 Revision 184
… …
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
26#ifdef DMALLOC 30#ifdef DMALLOC
27#include <dmalloc.h> 31#include <dmalloc.h>
28#endif 32#endif
29 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);
30 37
31int psiconv_write_u8(psiconv_buffer buf,const psiconv_u8 value) 38int psiconv_write_u8(const psiconv_config config,psiconv_buffer buf,
39 int lev,const psiconv_u8 value)
32{ 40{
41 psiconv_progress(config,lev,0,"Writing u8");
33 return psiconv_buffer_add(buf,value); 42 return psiconv_buffer_add(buf,value);
34} 43}
35 44
36int 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)
37{ 47{
38 int res; 48 int res;
49 psiconv_progress(config,lev,0,"Writing u16");
39 if ((res = psiconv_buffer_add(buf,value & 0xff))) 50 if ((res = psiconv_buffer_add(buf,value & 0xff)))
40 return res; 51 return res;
41 return psiconv_buffer_add(buf,(value & 0xff00) >> 8); 52 return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
42} 53}
43 54
44int 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)
45{ 57{
46 int res; 58 int res;
59 psiconv_progress(config,lev,0,"Writing u32");
47 if ((res = psiconv_buffer_add(buf,value & 0xff))) 60 if ((res = psiconv_buffer_add(buf,value & 0xff)))
48 return res; 61 return res;
49 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 62 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
50 return res; 63 return res;
51 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 64 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16)))
52 return res; 65 return res;
53 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24); 66 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
54} 67}
55 68
56int 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)
57{ 71{
72 psiconv_progress(config,lev,0,"Writing S");
58 if (value < 0x40) 73 if (value < 0x40)
59 return psiconv_write_u8(buf,value * 4 + 2); 74 return psiconv_write_u8(config,buf,lev+1,value * 4 + 2);
60 else if (value < 0x2000) 75 else if (value < 0x2000)
61 return psiconv_write_u16(buf,value * 8 + 3); 76 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
62 else { 77 else {
63 psiconv_warn(0,psiconv_buffer_length(buf), 78 psiconv_error(config,0,psiconv_buffer_length(buf),
64 "Don't know how to write S value larger than 0x2000 " 79 "Don't know how to write S value larger than 0x2000 "
65 "(trying %x)",value); 80 "(trying %x)",value);
66 return -PSICONV_E_GENERATE; 81 return -PSICONV_E_GENERATE;
67 } 82 }
68} 83}
69 84
70int 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)
71{ 87{
88 psiconv_progress(config,lev,0,"Writing X");
72 if (value < 0x80) 89 if (value < 0x80)
73 return psiconv_write_u8(buf,value * 2); 90 return psiconv_write_u8(config,buf,lev+1,value * 2);
74 else if (value < 0x4000) 91 else if (value < 0x4000)
75 return psiconv_write_u16(buf,value * 4 + 1); 92 return psiconv_write_u16(config,buf,lev+1,value * 4 + 1);
76 else if (value < 0x20000000) 93 else if (value < 0x20000000)
77 return psiconv_write_u16(buf,value * 8 + 3); 94 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
78 else { 95 else {
79 psiconv_warn(0,psiconv_buffer_length(buf), 96 psiconv_error(config,0,psiconv_buffer_length(buf),
80 "Don't know how to write X value larger than 0x20000000 " 97 "Don't know how to write X value larger than 0x20000000 "
81 "(trying %x)",value); 98 "(trying %x)",value);
82 return -PSICONV_E_GENERATE; 99 return -PSICONV_E_GENERATE;
83 } 100 }
84} 101}
85 102
86int 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)
87{ 105{
106 psiconv_progress(config,lev,0,"Writing length");
88 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);
89} 108}
90 109
91int 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)
92{ 112{
113 psiconv_progress(config,lev,0,"Writing size");
93 return psiconv_write_u32(buf,value * 20.0 + 0.5); 114 return psiconv_write_u32(config,buf,lev+1,value * 20.0 + 0.5);
94} 115}
95 116
96int 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)
97{ 119{
120 psiconv_progress(config,lev,0,"Writing bool");
98 if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 121 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
99 psiconv_warn(0,psiconv_buffer_length(buf), 122 psiconv_warn(config,0,psiconv_buffer_length(buf),
100 "Boolean has non-enum value (found %d)",value); 123 "Boolean has non-enum value (found %d)",value);
101 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);
102} 125}
103 126
104int 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)
105{ 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{
106 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);
107 if (!value) { 157 if (!value) {
108 psiconv_warn(0,psiconv_buffer_length(buf), 158 psiconv_error(config,0,psiconv_buffer_length(buf),
109 "NULL string"); 159 "NULL string");
110 return -PSICONV_E_GENERATE; 160 return -PSICONV_E_GENERATE;
111 } 161 }
112 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)
113 return res; 169 return res;
170
171 if ((res = psiconv_unicode_to_chars(config,value,&output)))
172 return res;
173
114 for (i = 0; i < strlen(value); i++) 174 for (i = 0; i < len; i++)
115 if ((res = psiconv_write_u8(buf,value[i]))) 175 if ((res = psiconv_write_u8(config,buf,lev+1,output[i]))) {
176 free(output);
116 return res; 177 return res;
178 }
179 free(output);
117 return -PSICONV_E_OK; 180 return -PSICONV_E_OK;
118} 181}
119 182
120int 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)
121{ 185{
186 psiconv_progress(config,lev,0,"Writing offset");
122 return psiconv_buffer_add_reference(buf,id); 187 return psiconv_buffer_add_reference(buf,id);
123} 188}
Legend:
Removed from v.142  
changed lines
  Added in v.184
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26