/[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 183 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#include <string.h>
21 20
22#include "config.h" 21#include "config.h"
23#include "compat.h" 22#include "compat.h"
23
24#include <string.h>
25#include <stdlib.h>
24 26
25#include "generate_routines.h" 27#include "generate_routines.h"
26#include "error.h" 28#include "error.h"
27 29
28#ifdef DMALLOC 30#ifdef DMALLOC
29#include <dmalloc.h> 31#include <dmalloc.h>
30#endif 32#endif
31 33
32static int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value,int kind); 34static int psiconv_write_string_aux(const psiconv_config config,
35 psiconv_buffer buf, int lev,
36 const psiconv_string_t value,int kind);
33 37
34int psiconv_write_u8(const psiconv_config config,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)
35{ 40{
41 psiconv_progress(config,lev,0,"Writing u8");
36 return psiconv_buffer_add(buf,value); 42 return psiconv_buffer_add(buf,value);
37} 43}
38 44
39int psiconv_write_u16(const psiconv_config config,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)
40{ 47{
41 int res; 48 int res;
49 psiconv_progress(config,lev,0,"Writing u16");
42 if ((res = psiconv_buffer_add(buf,value & 0xff))) 50 if ((res = psiconv_buffer_add(buf,value & 0xff)))
43 return res; 51 return res;
44 return psiconv_buffer_add(buf,(value & 0xff00) >> 8); 52 return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
45} 53}
46 54
47int psiconv_write_u32(const psiconv_config config,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)
48{ 57{
49 int res; 58 int res;
59 psiconv_progress(config,lev,0,"Writing u32");
50 if ((res = psiconv_buffer_add(buf,value & 0xff))) 60 if ((res = psiconv_buffer_add(buf,value & 0xff)))
51 return res; 61 return res;
52 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 62 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
53 return res; 63 return res;
54 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 64 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16)))
55 return res; 65 return res;
56 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24); 66 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
57} 67}
58 68
59int psiconv_write_S(const psiconv_config config,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)
60{ 71{
72 psiconv_progress(config,lev,0,"Writing S");
61 if (value < 0x40) 73 if (value < 0x40)
62 return psiconv_write_u8(config,buf,value * 4 + 2); 74 return psiconv_write_u8(config,buf,lev+1,value * 4 + 2);
63 else if (value < 0x2000) 75 else if (value < 0x2000)
64 return psiconv_write_u16(config,buf,value * 8 + 3); 76 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
65 else { 77 else {
66 psiconv_warn(config,0,psiconv_buffer_length(buf), 78 psiconv_error(config,0,psiconv_buffer_length(buf),
67 "Don't know how to write S value larger than 0x2000 " 79 "Don't know how to write S value larger than 0x2000 "
68 "(trying %x)",value); 80 "(trying %x)",value);
69 return -PSICONV_E_GENERATE; 81 return -PSICONV_E_GENERATE;
70 } 82 }
71} 83}
72 84
73int psiconv_write_X(const psiconv_config config,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)
74{ 87{
88 psiconv_progress(config,lev,0,"Writing X");
75 if (value < 0x80) 89 if (value < 0x80)
76 return psiconv_write_u8(config,buf,value * 2); 90 return psiconv_write_u8(config,buf,lev+1,value * 2);
77 else if (value < 0x4000) 91 else if (value < 0x4000)
78 return psiconv_write_u16(config,buf,value * 4 + 1); 92 return psiconv_write_u16(config,buf,lev+1,value * 4 + 1);
79 else if (value < 0x20000000) 93 else if (value < 0x20000000)
80 return psiconv_write_u16(config,buf,value * 8 + 3); 94 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
81 else { 95 else {
82 psiconv_warn(config,0,psiconv_buffer_length(buf), 96 psiconv_error(config,0,psiconv_buffer_length(buf),
83 "Don't know how to write X value larger than 0x20000000 " 97 "Don't know how to write X value larger than 0x20000000 "
84 "(trying %x)",value); 98 "(trying %x)",value);
85 return -PSICONV_E_GENERATE; 99 return -PSICONV_E_GENERATE;
86 } 100 }
87} 101}
88 102
89int psiconv_write_length(const psiconv_config config,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)
90{ 105{
106 psiconv_progress(config,lev,0,"Writing length");
91 return psiconv_write_u32(config,buf,value * (1440.0/2.54) + 0.5); 107 return psiconv_write_u32(config,buf,lev+1,value * (1440.0/2.54) + 0.5);
92} 108}
93 109
94int psiconv_write_size(const psiconv_config config,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)
95{ 112{
113 psiconv_progress(config,lev,0,"Writing size");
96 return psiconv_write_u32(config,buf,value * 20.0 + 0.5); 114 return psiconv_write_u32(config,buf,lev+1,value * 20.0 + 0.5);
97} 115}
98 116
99int psiconv_write_bool(const psiconv_config config,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)
100{ 119{
120 psiconv_progress(config,lev,0,"Writing bool");
101 if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 121 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
102 psiconv_warn(config,0,psiconv_buffer_length(buf), 122 psiconv_warn(config,0,psiconv_buffer_length(buf),
103 "Boolean has non-enum value (found %d)",value); 123 "Boolean has non-enum value (found %d)",value);
104 return psiconv_write_u8(config,buf,value == psiconv_bool_false?0:1); 124 return psiconv_write_u8(config,buf,lev+1,value == psiconv_bool_false?0:1);
105} 125}
106 126
107int psiconv_write_string(const psiconv_config config,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)
108{ 129{
130 psiconv_progress(config,lev,0,"Writing string");
109 return psiconv_write_string_aux(config,buf,value,0); 131 return psiconv_write_string_aux(config,buf,lev+1,value,-1);
110} 132}
111 133
112int psiconv_write_short_string(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value) 134int psiconv_write_short_string(const psiconv_config config,psiconv_buffer buf,
135 int lev,const psiconv_string_t value)
113{ 136{
137 psiconv_progress(config,lev,0,"Writing short string");
114 return psiconv_write_string_aux(config,buf,value,1); 138 return psiconv_write_string_aux(config,buf,lev+1,value,-2);
115} 139}
116 140
117int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value,int kind) 141int psiconv_write_charlist(const psiconv_config config,psiconv_buffer buf,
142 int lev,const psiconv_string_t value)
118{ 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{
119 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);
120 if (!value) { 157 if (!value) {
121 psiconv_warn(config,0,psiconv_buffer_length(buf), 158 psiconv_error(config,0,psiconv_buffer_length(buf),
122 "NULL string"); 159 "NULL string");
123 return -PSICONV_E_GENERATE; 160 return -PSICONV_E_GENERATE;
124 } 161 }
125 if (kind == 0) 162 if (kind == -1)
126 res = psiconv_write_S(config,buf,strlen(value)); 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);
127 else 166 else
128 res = psiconv_write_u8(config,buf,strlen(value)); 167 res = 0;
129 if (res) 168 if (res)
130 return res; 169 return res;
170
171 if ((res = psiconv_unicode_to_chars(config,value,&output)))
172 return res;
173
131 for (i = 0; i < strlen(value); i++) 174 for (i = 0; i < len; i++)
132 if ((res = psiconv_write_u8(config,buf,value[i]))) 175 if ((res = psiconv_write_u8(config,buf,lev+1,output[i]))) {
176 free(output);
133 return res; 177 return res;
178 }
179 free(output);
134 return -PSICONV_E_OK; 180 return -PSICONV_E_OK;
135} 181}
136 182
137int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf, psiconv_u32 id) 183int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf,
184 int lev,psiconv_u32 id)
138{ 185{
186 psiconv_progress(config,lev,0,"Writing offset");
139 return psiconv_buffer_add_reference(buf,id); 187 return psiconv_buffer_add_reference(buf,id);
140} 188}

Legend:
Removed from v.183  
changed lines
  Added in v.184

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26