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