/[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 231
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{
35 return psiconv_buffer_add(buf,value); 41 return psiconv_buffer_add(buf,value);
36} 42}
37 43
38int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf,const psiconv_u16 value) 44int psiconv_write_u16(const psiconv_config config,psiconv_buffer buf,
45 int lev,const psiconv_u16 value)
39{ 46{
40 int res; 47 int res;
41 if ((res = psiconv_buffer_add(buf,value & 0xff))) 48 if ((res = psiconv_buffer_add(buf,value & 0xff)))
42 return res; 49 return res;
43 return psiconv_buffer_add(buf,(value & 0xff00) >> 8); 50 return psiconv_buffer_add(buf,(value & 0xff00) >> 8);
44} 51}
45 52
46int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf,const psiconv_u32 value) 53int psiconv_write_u32(const psiconv_config config,psiconv_buffer buf,
54 int lev,const psiconv_u32 value)
47{ 55{
48 int res; 56 int res;
49 if ((res = psiconv_buffer_add(buf,value & 0xff))) 57 if ((res = psiconv_buffer_add(buf,value & 0xff)))
50 return res; 58 return res;
51 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8))) 59 if ((res = psiconv_buffer_add(buf,(value & 0xff00) >> 8)))
… …
53 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16))) 61 if ((res = psiconv_buffer_add(buf,(value & 0xff0000) >> 16)))
54 return res; 62 return res;
55 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24); 63 return psiconv_buffer_add(buf,(value & 0xff000000) >> 24);
56} 64}
57 65
58int psiconv_write_S(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value) 66int psiconv_write_S(const psiconv_config config,psiconv_buffer buf,
67 int lev,const psiconv_u32 value)
59{ 68{
69 psiconv_progress(config,lev,0,"Writing S");
60 if (value < 0x40) 70 if (value < 0x40)
61 return psiconv_write_u8(config,buf,value * 4 + 2); 71 return psiconv_write_u8(config,buf,lev+1,value * 4 + 2);
62 else if (value < 0x2000) 72 else if (value < 0x2000)
63 return psiconv_write_u16(config,buf,value * 8 + 3); 73 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
64 else { 74 else {
65 psiconv_warn(config,0,psiconv_buffer_length(buf), 75 psiconv_error(config,0,psiconv_buffer_length(buf),
66 "Don't know how to write S value larger than 0x2000 " 76 "Don't know how to write S value larger than 0x2000 "
67 "(trying %x)",value); 77 "(trying %x)",value);
68 return -PSICONV_E_GENERATE; 78 return -PSICONV_E_GENERATE;
69 } 79 }
70} 80}
71 81
72int psiconv_write_X(const psiconv_config config,psiconv_buffer buf, const psiconv_u32 value) 82int psiconv_write_X(const psiconv_config config,psiconv_buffer buf,
83 int lev, const psiconv_u32 value)
73{ 84{
85 psiconv_progress(config,lev,0,"Writing X");
74 if (value < 0x80) 86 if (value < 0x80)
75 return psiconv_write_u8(config,buf,value * 2); 87 return psiconv_write_u8(config,buf,lev+1,value * 2);
76 else if (value < 0x4000) 88 else if (value < 0x4000)
77 return psiconv_write_u16(config,buf,value * 4 + 1); 89 return psiconv_write_u16(config,buf,lev+1,value * 4 + 1);
78 else if (value < 0x20000000) 90 else if (value < 0x20000000)
79 return psiconv_write_u16(config,buf,value * 8 + 3); 91 return psiconv_write_u16(config,buf,lev+1,value * 8 + 3);
80 else { 92 else {
81 psiconv_warn(config,0,psiconv_buffer_length(buf), 93 psiconv_error(config,0,psiconv_buffer_length(buf),
82 "Don't know how to write X value larger than 0x20000000 " 94 "Don't know how to write X value larger than 0x20000000 "
83 "(trying %x)",value); 95 "(trying %x)",value);
84 return -PSICONV_E_GENERATE; 96 return -PSICONV_E_GENERATE;
85 } 97 }
86} 98}
87 99
88int psiconv_write_length(const psiconv_config config,psiconv_buffer buf, const psiconv_length_t value) 100int psiconv_write_length(const psiconv_config config,psiconv_buffer buf,
101 int lev,const psiconv_length_t value)
89{ 102{
90 return psiconv_write_u32(config,buf,value * (1440.0/2.54) + 0.5); 103 return psiconv_write_u32(config,buf,lev+1,value * (1440.0/2.54) + 0.5);
91} 104}
92 105
93int psiconv_write_size(const psiconv_config config,psiconv_buffer buf, psiconv_size_t value) 106int psiconv_write_size(const psiconv_config config,psiconv_buffer buf,
107 int lev, psiconv_size_t value)
94{ 108{
95 return psiconv_write_u32(config,buf,value * 20.0 + 0.5); 109 return psiconv_write_u32(config,buf,lev+1,value * 20.0 + 0.5);
96} 110}
97 111
98int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf, const psiconv_bool_t value) 112int psiconv_write_bool(const psiconv_config config,psiconv_buffer buf,
113 int lev,const psiconv_bool_t value)
99{ 114{
100 if ((value != psiconv_bool_true) && (value != psiconv_bool_false)) 115 if ((value != psiconv_bool_true) && (value != psiconv_bool_false))
101 psiconv_warn(config,0,psiconv_buffer_length(buf), 116 psiconv_warn(config,0,psiconv_buffer_length(buf),
102 "Boolean has non-enum value (found %d)",value); 117 "Boolean has non-enum value (found %d)",value);
103 return psiconv_write_u8(config,buf,value == psiconv_bool_false?0:1); 118 return psiconv_write_u8(config,buf,lev+1,value == psiconv_bool_false?0:1);
104} 119}
105 120
106int psiconv_write_string(const psiconv_config config,psiconv_buffer buf, const psiconv_string_t value) 121int psiconv_write_string(const psiconv_config config,psiconv_buffer buf,
122 int lev, const psiconv_string_t value)
107{ 123{
108 int res,i; 124 int res;
125 psiconv_progress(config,lev,0,"Writing string");
126 res = psiconv_write_string_aux(config,buf,lev+1,value,-1);
127 if (res)
128 psiconv_error(config,lev,0,"Writing of string failed");
129 else
130 psiconv_progress(config,lev,0,"End of string");
131 return res;
132}
133
134int psiconv_write_short_string(const psiconv_config config,psiconv_buffer buf,
135 int lev,const psiconv_string_t value)
136{
137 int res;
138 psiconv_progress(config,lev,0,"Writing short string");
139 res = psiconv_write_string_aux(config,buf,lev+1,value,-2);
140 if (res)
141 psiconv_error(config,lev,0,"Writing of short string failed");
142 else
143 psiconv_progress(config,lev,0,"End of short string");
144 return res;
145}
146
147int psiconv_write_charlist(const psiconv_config config,psiconv_buffer buf,
148 int lev,const psiconv_string_t value)
149{
150 int res;
151 psiconv_progress(config,lev,0,"Writing charlist");
152 res = psiconv_write_string_aux(config,buf,lev+1,value,0);
153 if (res)
154 psiconv_error(config,lev,0,"Writing of charlist failed");
155 else
156 psiconv_progress(config,lev,0,"End of charlist");
157 return res;
158}
159
160
161int psiconv_write_string_aux(const psiconv_config config,psiconv_buffer buf,
162 int lev, const psiconv_string_t value,int kind)
163{
164 int res,i,len;
165
166 len = psiconv_unicode_strlen(value);
109 if (!value) { 167 if (!value) {
110 psiconv_warn(config,0,psiconv_buffer_length(buf), 168 psiconv_error(config,lev,0, "NULL string");
111 "NULL string");
112 return -PSICONV_E_GENERATE; 169 return -PSICONV_E_GENERATE;
113 } 170 }
171 if (kind == -1)
114 if ((res = psiconv_write_S(config,buf,strlen(value)))) 172 res = psiconv_write_S(config,buf,lev+1,len);
173 else if (kind == -2)
174 res = psiconv_write_u8(config,buf,lev+1,len);
175 else
176 res = 0;
177 if (res)
115 return res; 178 return res;
179
116 for (i = 0; i < strlen(value); i++) 180 for (i = 0; i < len; i++)
117 if ((res = psiconv_write_u8(config,buf,value[i]))) 181 if ((res = psiconv_unicode_write_char(config,buf,lev+1,value[i])))
118 return res; 182 return res;
119 return -PSICONV_E_OK; 183 return -PSICONV_E_OK;
120} 184}
121 185
122int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf, psiconv_u32 id) 186int psiconv_write_offset(const psiconv_config config,psiconv_buffer buf,
187 int lev,psiconv_u32 id)
123{ 188{
124 return psiconv_buffer_add_reference(buf,id); 189 return psiconv_buffer_add_reference(buf,id);
125} 190}
Legend:
Removed from v.168  
changed lines
  Added in v.231
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26