xlsxwriter 0.2.1.pre.2 → 0.2.3.pre.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (123) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +4 -3
  3. data/ext/xlsxwriter/chart.c +84 -20
  4. data/ext/xlsxwriter/chart.h +1 -0
  5. data/ext/xlsxwriter/chartsheet.c +34 -13
  6. data/ext/xlsxwriter/common.h +5 -5
  7. data/ext/xlsxwriter/extconf.rb +8 -8
  8. data/ext/xlsxwriter/libxlsxwriter/License.txt +24 -2
  9. data/ext/xlsxwriter/libxlsxwriter/Makefile +46 -12
  10. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/app.h +1 -1
  11. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/chart.h +196 -30
  12. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/chartsheet.h +3 -3
  13. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/comment.h +76 -0
  14. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/common.h +24 -5
  15. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/content_types.h +5 -1
  16. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/core.h +1 -1
  17. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/custom.h +1 -1
  18. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/drawing.h +6 -17
  19. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/format.h +20 -6
  20. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/hash_table.h +1 -1
  21. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/packager.h +3 -1
  22. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/relationships.h +1 -1
  23. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/shared_strings.h +1 -1
  24. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/styles.h +11 -5
  25. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/theme.h +1 -1
  26. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/third_party/md5.h +43 -0
  27. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/utility.h +42 -3
  28. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/vml.h +55 -0
  29. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/workbook.h +83 -18
  30. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/worksheet.h +1519 -109
  31. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter/xmlwriter.h +4 -2
  32. data/ext/xlsxwriter/libxlsxwriter/include/xlsxwriter.h +3 -2
  33. data/ext/xlsxwriter/libxlsxwriter/src/Makefile +25 -7
  34. data/ext/xlsxwriter/libxlsxwriter/src/app.c +1 -1
  35. data/ext/xlsxwriter/libxlsxwriter/src/chart.c +332 -48
  36. data/ext/xlsxwriter/libxlsxwriter/src/chartsheet.c +20 -19
  37. data/ext/xlsxwriter/libxlsxwriter/src/comment.c +443 -0
  38. data/ext/xlsxwriter/libxlsxwriter/src/content_types.c +20 -1
  39. data/ext/xlsxwriter/libxlsxwriter/src/core.c +2 -2
  40. data/ext/xlsxwriter/libxlsxwriter/src/custom.c +1 -1
  41. data/ext/xlsxwriter/libxlsxwriter/src/drawing.c +58 -20
  42. data/ext/xlsxwriter/libxlsxwriter/src/format.c +98 -25
  43. data/ext/xlsxwriter/libxlsxwriter/src/hash_table.c +1 -1
  44. data/ext/xlsxwriter/libxlsxwriter/src/packager.c +269 -12
  45. data/ext/xlsxwriter/libxlsxwriter/src/relationships.c +1 -1
  46. data/ext/xlsxwriter/libxlsxwriter/src/shared_strings.c +2 -4
  47. data/ext/xlsxwriter/libxlsxwriter/src/styles.c +334 -48
  48. data/ext/xlsxwriter/libxlsxwriter/src/theme.c +1 -1
  49. data/ext/xlsxwriter/libxlsxwriter/src/utility.c +71 -8
  50. data/ext/xlsxwriter/libxlsxwriter/src/vml.c +1032 -0
  51. data/ext/xlsxwriter/libxlsxwriter/src/workbook.c +343 -27
  52. data/ext/xlsxwriter/libxlsxwriter/src/worksheet.c +3759 -478
  53. data/ext/xlsxwriter/libxlsxwriter/src/xmlwriter.c +81 -2
  54. data/ext/xlsxwriter/libxlsxwriter/third_party/md5/Makefile +42 -0
  55. data/ext/xlsxwriter/libxlsxwriter/third_party/md5/md5.c +291 -0
  56. data/ext/xlsxwriter/libxlsxwriter/third_party/md5/md5.h +43 -0
  57. data/ext/xlsxwriter/rich_string.c +28 -9
  58. data/ext/xlsxwriter/shared_strings.c +75 -0
  59. data/ext/xlsxwriter/shared_strings.h +15 -0
  60. data/ext/xlsxwriter/workbook.c +87 -13
  61. data/ext/xlsxwriter/workbook.h +1 -0
  62. data/ext/xlsxwriter/workbook_properties.c +2 -2
  63. data/ext/xlsxwriter/worksheet.c +75 -23
  64. data/ext/xlsxwriter/worksheet.h +1 -0
  65. data/ext/xlsxwriter/xlsxwriter.c +2 -0
  66. data/lib/xlsxwriter/rich_string.rb +0 -2
  67. data/lib/xlsxwriter/version.rb +1 -1
  68. data/lib/xlsxwriter/worksheet.rb +2 -2
  69. data/test/{run-test.rb → run_test.rb} +3 -3
  70. data/test/support/chart_test.rb +3 -3
  71. data/test/support/with_xlsx_file.rb +4 -2
  72. data/test/support/xlsx_comparable.rb +40 -26
  73. data/test/test_array_formula.rb +42 -0
  74. data/test/test_autofilter.rb +72 -0
  75. data/test/{test-chart-area.rb → test_chart_area.rb} +2 -2
  76. data/test/{test-chart-axis.rb → test_chart_axis.rb} +16 -16
  77. data/test/test_chart_bar.rb +382 -0
  78. data/test/test_chart_blank.rb +27 -0
  79. data/test/{test-chart-column.rb → test_chart_column.rb} +2 -2
  80. data/test/{test-chart-doughnut.rb → test_chart_doughnut.rb} +2 -2
  81. data/test/{test-chart-legend.rb → test_chart_legend.rb} +2 -2
  82. data/test/{test-chart-pie.rb → test_chart_pie.rb} +2 -2
  83. data/test/{test-chart-scatter.rb → test_chart_scatter.rb} +3 -4
  84. data/test/{test-chart-size.rb → test_chart_size.rb} +2 -2
  85. data/test/{test-chart-title.rb → test_chart_title.rb} +3 -3
  86. data/test/{test-chartsheet.rb → test_chartsheet.rb} +2 -2
  87. data/test/{test-data.rb → test_data.rb} +1 -1
  88. data/test/{test-data-validation.rb → test_data_validation.rb} +23 -24
  89. data/test/{test-default-row.rb → test_default_row.rb} +1 -1
  90. data/test/{test-defined-name.rb → test_defined_name.rb} +12 -12
  91. data/test/{test-escapes.rb → test_escapes.rb} +5 -2
  92. data/test/{test-fit-to-pages.rb → test_fit_to_pages.rb} +6 -6
  93. data/test/{test-formatting.rb → test_formatting.rb} +10 -10
  94. data/test/{test-gridlines.rb → test_gridlines.rb} +3 -3
  95. data/test/{test-hyperlink.rb → test_hyperlink.rb} +22 -11
  96. data/test/{test-image.rb → test_image.rb} +6 -4
  97. data/test/{test-macro.rb → test_macro.rb} +1 -1
  98. data/test/{test-merge-range.rb → test_merge_range.rb} +1 -1
  99. data/test/{test-misc.rb → test_misc.rb} +2 -2
  100. data/test/{test-optimize.rb → test_optimize.rb} +2 -4
  101. data/test/{test-outline.rb → test_outline.rb} +14 -14
  102. data/test/{test-page-breaks.rb → test_page_breaks.rb} +2 -2
  103. data/test/{test-page-setup.rb → test_page_setup.rb} +2 -2
  104. data/test/{test-panes.rb → test_panes.rb} +1 -1
  105. data/test/{test-print-area.rb → test_print_area.rb} +3 -3
  106. data/test/{test-print-options.rb → test_print_options.rb} +7 -7
  107. data/test/{test-print-scale.rb → test_print_scale.rb} +2 -2
  108. data/test/{test-properties.rb → test_properties.rb} +2 -2
  109. data/test/{test-protect.rb → test_protect.rb} +3 -3
  110. data/test/{test-repeat.rb → test_repeat.rb} +3 -3
  111. data/test/{test-rich-string.rb → test_rich_string.rb} +5 -9
  112. data/test/{test-row-col-format.rb → test_row_col_format.rb} +1 -1
  113. data/test/{test-ruby-worksheet.rb → test_ruby_worksheet.rb} +2 -2
  114. data/test/{test-set-selection.rb → test_set_selection.rb} +2 -2
  115. data/test/{test-set-start-page.rb → test_set_start_page.rb} +2 -2
  116. data/test/{test-simple.rb → test_simple.rb} +10 -10
  117. data/test/{test-types.rb → test_types.rb} +1 -1
  118. data/test/{xlsx-func-testcase.rb → xlsx_func_testcase.rb} +1 -0
  119. metadata +127 -106
  120. data/test/test-array-formula.rb +0 -35
  121. data/test/test-autofilter.rb +0 -72
  122. data/test/test-chart-bar.rb +0 -74
  123. /data/test/{test-errors.rb → test_errors.rb} +0 -0
@@ -3,13 +3,14 @@
3
3
  *
4
4
  * Used in conjunction with the libxlsxwriter library.
5
5
  *
6
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
6
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
7
7
  *
8
8
  */
9
9
 
10
10
  #include <stdio.h>
11
11
  #include <string.h>
12
12
  #include <stdlib.h>
13
+ #include <ctype.h>
13
14
  #include "xlsxwriter/xmlwriter.h"
14
15
 
15
16
  #define LXW_AMP "&amp;"
@@ -227,7 +228,24 @@ lxw_escape_data(const char *data)
227
228
  }
228
229
 
229
230
  /*
230
- * Escape control characters in strings with with _xHHHH_.
231
+ * Check for control characters in strings.
232
+ */
233
+ uint8_t
234
+ lxw_has_control_characters(const char *string)
235
+ {
236
+ while (string) {
237
+ /* 0xE0 == 0b11100000 masks values > 0x19 == 0b00011111. */
238
+ if (!(*string & 0xE0) && *string != 0x0A && *string != 0x09)
239
+ return LXW_TRUE;
240
+
241
+ string++;
242
+ }
243
+
244
+ return LXW_FALSE;
245
+ }
246
+
247
+ /*
248
+ * Escape control characters in strings with _xHHHH_.
231
249
  */
232
250
  char *
233
251
  lxw_escape_control_characters(const char *string)
@@ -283,6 +301,67 @@ lxw_escape_control_characters(const char *string)
283
301
  return encoded;
284
302
  }
285
303
 
304
+ /*
305
+ * Escape special characters in URL strings with with %XX.
306
+ */
307
+ char *
308
+ lxw_escape_url_characters(const char *string, uint8_t escape_hash)
309
+ {
310
+
311
+ size_t escape_len = sizeof("%XX") - 1;
312
+ size_t encoded_len = (strlen(string) * escape_len + 1);
313
+
314
+ char *encoded = (char *) calloc(encoded_len, 1);
315
+ char *p_encoded = encoded;
316
+
317
+ while (*string) {
318
+ switch (*string) {
319
+ case (' '):
320
+ case ('"'):
321
+ case ('<'):
322
+ case ('>'):
323
+ case ('['):
324
+ case (']'):
325
+ case ('`'):
326
+ case ('^'):
327
+ case ('{'):
328
+ case ('}'):
329
+ lxw_snprintf(p_encoded, escape_len + 1, "%%%2x", *string);
330
+ p_encoded += escape_len;
331
+ break;
332
+ case ('#'):
333
+ /* This is only escaped for "external:" style links. */
334
+ if (escape_hash) {
335
+ lxw_snprintf(p_encoded, escape_len + 1, "%%%2x", *string);
336
+ p_encoded += escape_len;
337
+ }
338
+ else {
339
+ *p_encoded = *string;
340
+ p_encoded++;
341
+ }
342
+ break;
343
+ case ('%'):
344
+ /* Only escape % if it isn't already an escape. */
345
+ if (!isxdigit(*(string + 1)) || !isxdigit(*(string + 2))) {
346
+ lxw_snprintf(p_encoded, escape_len + 1, "%%%2x", *string);
347
+ p_encoded += escape_len;
348
+ }
349
+ else {
350
+ *p_encoded = *string;
351
+ p_encoded++;
352
+ }
353
+ break;
354
+ default:
355
+ *p_encoded = *string;
356
+ p_encoded++;
357
+ break;
358
+ }
359
+ string++;
360
+ }
361
+
362
+ return encoded;
363
+ }
364
+
286
365
  /* Write out escaped attributes. */
287
366
  STATIC void
288
367
  _fprint_escaped_attributes(FILE * xmlfile,
@@ -0,0 +1,42 @@
1
+ ###############################################################################
2
+ #
3
+ # Simplied Makefile to build the openwall md5 library for the libxlsxwriter.
4
+ #
5
+
6
+ # Keep the output quiet by default.
7
+ Q=@
8
+ ifdef V
9
+ Q=
10
+ endif
11
+
12
+ UNAME := $(shell uname)
13
+
14
+ # Check for MinGW/MinGW64/Cygwin environments.
15
+ ifneq (,$(findstring MINGW, $(UNAME)))
16
+ MING_LIKE = y
17
+ endif
18
+ ifneq (,$(findstring MSYS, $(UNAME)))
19
+ MING_LIKE = y
20
+ endif
21
+ ifneq (,$(findstring CYGWIN, $(UNAME)))
22
+ MING_LIKE = y
23
+ endif
24
+
25
+ FPIC = -fPIC
26
+
27
+ # Change make options on MinGW/MinGW64/Cygwin.
28
+ ifdef MING_LIKE
29
+ FPIC =
30
+ CC = gcc
31
+ endif
32
+
33
+ all: md5.o md5.so
34
+
35
+ %.o : %.c
36
+ $(Q)$(CC) -c $(CFLAGS) $<
37
+
38
+ %.so : %.c
39
+ $(Q)$(CC) $(FPIC) -c $(CFLAGS) $< -o $@
40
+
41
+ clean:
42
+ $(Q)/bin/rm -f *.o *.so
@@ -0,0 +1,291 @@
1
+ /*
2
+ * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
3
+ * MD5 Message-Digest Algorithm (RFC 1321).
4
+ *
5
+ * Homepage:
6
+ * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
7
+ *
8
+ * Author:
9
+ * Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
10
+ *
11
+ * This software was written by Alexander Peslyak in 2001. No copyright is
12
+ * claimed, and the software is hereby placed in the public domain.
13
+ * In case this attempt to disclaim copyright and place the software in the
14
+ * public domain is deemed null and void, then the software is
15
+ * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
16
+ * general public under the following terms:
17
+ *
18
+ * Redistribution and use in source and binary forms, with or without
19
+ * modification, are permitted.
20
+ *
21
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
22
+ *
23
+ * (This is a heavily cut-down "BSD license".)
24
+ *
25
+ * This differs from Colin Plumb's older public domain implementation in that
26
+ * no exactly 32-bit integer data type is required (any 32-bit or wider
27
+ * unsigned integer data type will do), there's no compile-time endianness
28
+ * configuration, and the function prototypes match OpenSSL's. No code from
29
+ * Colin Plumb's implementation has been reused; this comment merely compares
30
+ * the properties of the two independent implementations.
31
+ *
32
+ * The primary goals of this implementation are portability and ease of use.
33
+ * It is meant to be fast, but not as fast as possible. Some known
34
+ * optimizations are not included to reduce source code size and avoid
35
+ * compile-time configuration.
36
+ */
37
+
38
+ #ifndef HAVE_OPENSSL
39
+
40
+ #include <string.h>
41
+
42
+ #include "md5.h"
43
+
44
+ /*
45
+ * The basic MD5 functions.
46
+ *
47
+ * F and G are optimized compared to their RFC 1321 definitions for
48
+ * architectures that lack an AND-NOT instruction, just like in Colin Plumb's
49
+ * implementation.
50
+ */
51
+ #define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
52
+ #define G(x, y, z) ((y) ^ ((z) & ((x) ^ (y))))
53
+ #define H(x, y, z) (((x) ^ (y)) ^ (z))
54
+ #define H2(x, y, z) ((x) ^ ((y) ^ (z)))
55
+ #define I(x, y, z) ((y) ^ ((x) | ~(z)))
56
+
57
+ /*
58
+ * The MD5 transformation for all four rounds.
59
+ */
60
+ #define STEP(f, a, b, c, d, x, t, s) \
61
+ (a) += f((b), (c), (d)) + (x) + (t); \
62
+ (a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \
63
+ (a) += (b);
64
+
65
+ /*
66
+ * SET reads 4 input bytes in little-endian byte order and stores them in a
67
+ * properly aligned word in host byte order.
68
+ *
69
+ * The check for little-endian architectures that tolerate unaligned memory
70
+ * accesses is just an optimization. Nothing will break if it fails to detect
71
+ * a suitable architecture.
72
+ *
73
+ * Unfortunately, this optimization may be a C strict aliasing rules violation
74
+ * if the caller's data buffer has effective type that cannot be aliased by
75
+ * MD5_u32plus. In practice, this problem may occur if these MD5 routines are
76
+ * inlined into a calling function, or with future and dangerously advanced
77
+ * link-time optimizations. For the time being, keeping these MD5 routines in
78
+ * their own translation unit avoids the problem.
79
+ */
80
+ #if defined(__i386__) || defined(__x86_64__) || defined(__vax__)
81
+ #define SET(n) \
82
+ (*(uint32_t *)&ptr[(n) * 4])
83
+ #define GET(n) \
84
+ SET(n)
85
+ #else
86
+ #define SET(n) \
87
+ (ctx->block[(n)] = \
88
+ (uint32_t)ptr[(n) * 4] | \
89
+ ((uint32_t)ptr[(n) * 4 + 1] << 8) | \
90
+ ((uint32_t)ptr[(n) * 4 + 2] << 16) | \
91
+ ((uint32_t)ptr[(n) * 4 + 3] << 24))
92
+ #define GET(n) \
93
+ (ctx->block[(n)])
94
+ #endif
95
+
96
+ /*
97
+ * This processes one or more 64-byte data blocks, but does NOT update the bit
98
+ * counters. There are no alignment requirements.
99
+ */
100
+ static const void *body(lxw_md5_ctx *ctx, const void *data, unsigned long size)
101
+ {
102
+ const unsigned char *ptr;
103
+ uint32_t a, b, c, d;
104
+ uint32_t saved_a, saved_b, saved_c, saved_d;
105
+
106
+ ptr = (const unsigned char *)data;
107
+
108
+ a = ctx->a;
109
+ b = ctx->b;
110
+ c = ctx->c;
111
+ d = ctx->d;
112
+
113
+ do {
114
+ saved_a = a;
115
+ saved_b = b;
116
+ saved_c = c;
117
+ saved_d = d;
118
+
119
+ /* Round 1 */
120
+ STEP(F, a, b, c, d, SET(0), 0xd76aa478, 7)
121
+ STEP(F, d, a, b, c, SET(1), 0xe8c7b756, 12)
122
+ STEP(F, c, d, a, b, SET(2), 0x242070db, 17)
123
+ STEP(F, b, c, d, a, SET(3), 0xc1bdceee, 22)
124
+ STEP(F, a, b, c, d, SET(4), 0xf57c0faf, 7)
125
+ STEP(F, d, a, b, c, SET(5), 0x4787c62a, 12)
126
+ STEP(F, c, d, a, b, SET(6), 0xa8304613, 17)
127
+ STEP(F, b, c, d, a, SET(7), 0xfd469501, 22)
128
+ STEP(F, a, b, c, d, SET(8), 0x698098d8, 7)
129
+ STEP(F, d, a, b, c, SET(9), 0x8b44f7af, 12)
130
+ STEP(F, c, d, a, b, SET(10), 0xffff5bb1, 17)
131
+ STEP(F, b, c, d, a, SET(11), 0x895cd7be, 22)
132
+ STEP(F, a, b, c, d, SET(12), 0x6b901122, 7)
133
+ STEP(F, d, a, b, c, SET(13), 0xfd987193, 12)
134
+ STEP(F, c, d, a, b, SET(14), 0xa679438e, 17)
135
+ STEP(F, b, c, d, a, SET(15), 0x49b40821, 22)
136
+
137
+ /* Round 2 */
138
+ STEP(G, a, b, c, d, GET(1), 0xf61e2562, 5)
139
+ STEP(G, d, a, b, c, GET(6), 0xc040b340, 9)
140
+ STEP(G, c, d, a, b, GET(11), 0x265e5a51, 14)
141
+ STEP(G, b, c, d, a, GET(0), 0xe9b6c7aa, 20)
142
+ STEP(G, a, b, c, d, GET(5), 0xd62f105d, 5)
143
+ STEP(G, d, a, b, c, GET(10), 0x02441453, 9)
144
+ STEP(G, c, d, a, b, GET(15), 0xd8a1e681, 14)
145
+ STEP(G, b, c, d, a, GET(4), 0xe7d3fbc8, 20)
146
+ STEP(G, a, b, c, d, GET(9), 0x21e1cde6, 5)
147
+ STEP(G, d, a, b, c, GET(14), 0xc33707d6, 9)
148
+ STEP(G, c, d, a, b, GET(3), 0xf4d50d87, 14)
149
+ STEP(G, b, c, d, a, GET(8), 0x455a14ed, 20)
150
+ STEP(G, a, b, c, d, GET(13), 0xa9e3e905, 5)
151
+ STEP(G, d, a, b, c, GET(2), 0xfcefa3f8, 9)
152
+ STEP(G, c, d, a, b, GET(7), 0x676f02d9, 14)
153
+ STEP(G, b, c, d, a, GET(12), 0x8d2a4c8a, 20)
154
+
155
+ /* Round 3 */
156
+ STEP(H, a, b, c, d, GET(5), 0xfffa3942, 4)
157
+ STEP(H2, d, a, b, c, GET(8), 0x8771f681, 11)
158
+ STEP(H, c, d, a, b, GET(11), 0x6d9d6122, 16)
159
+ STEP(H2, b, c, d, a, GET(14), 0xfde5380c, 23)
160
+ STEP(H, a, b, c, d, GET(1), 0xa4beea44, 4)
161
+ STEP(H2, d, a, b, c, GET(4), 0x4bdecfa9, 11)
162
+ STEP(H, c, d, a, b, GET(7), 0xf6bb4b60, 16)
163
+ STEP(H2, b, c, d, a, GET(10), 0xbebfbc70, 23)
164
+ STEP(H, a, b, c, d, GET(13), 0x289b7ec6, 4)
165
+ STEP(H2, d, a, b, c, GET(0), 0xeaa127fa, 11)
166
+ STEP(H, c, d, a, b, GET(3), 0xd4ef3085, 16)
167
+ STEP(H2, b, c, d, a, GET(6), 0x04881d05, 23)
168
+ STEP(H, a, b, c, d, GET(9), 0xd9d4d039, 4)
169
+ STEP(H2, d, a, b, c, GET(12), 0xe6db99e5, 11)
170
+ STEP(H, c, d, a, b, GET(15), 0x1fa27cf8, 16)
171
+ STEP(H2, b, c, d, a, GET(2), 0xc4ac5665, 23)
172
+
173
+ /* Round 4 */
174
+ STEP(I, a, b, c, d, GET(0), 0xf4292244, 6)
175
+ STEP(I, d, a, b, c, GET(7), 0x432aff97, 10)
176
+ STEP(I, c, d, a, b, GET(14), 0xab9423a7, 15)
177
+ STEP(I, b, c, d, a, GET(5), 0xfc93a039, 21)
178
+ STEP(I, a, b, c, d, GET(12), 0x655b59c3, 6)
179
+ STEP(I, d, a, b, c, GET(3), 0x8f0ccc92, 10)
180
+ STEP(I, c, d, a, b, GET(10), 0xffeff47d, 15)
181
+ STEP(I, b, c, d, a, GET(1), 0x85845dd1, 21)
182
+ STEP(I, a, b, c, d, GET(8), 0x6fa87e4f, 6)
183
+ STEP(I, d, a, b, c, GET(15), 0xfe2ce6e0, 10)
184
+ STEP(I, c, d, a, b, GET(6), 0xa3014314, 15)
185
+ STEP(I, b, c, d, a, GET(13), 0x4e0811a1, 21)
186
+ STEP(I, a, b, c, d, GET(4), 0xf7537e82, 6)
187
+ STEP(I, d, a, b, c, GET(11), 0xbd3af235, 10)
188
+ STEP(I, c, d, a, b, GET(2), 0x2ad7d2bb, 15)
189
+ STEP(I, b, c, d, a, GET(9), 0xeb86d391, 21)
190
+
191
+ a += saved_a;
192
+ b += saved_b;
193
+ c += saved_c;
194
+ d += saved_d;
195
+
196
+ ptr += 64;
197
+ } while (size -= 64);
198
+
199
+ ctx->a = a;
200
+ ctx->b = b;
201
+ ctx->c = c;
202
+ ctx->d = d;
203
+
204
+ return ptr;
205
+ }
206
+
207
+ void lxw_md5_init(lxw_md5_ctx *ctx)
208
+ {
209
+ ctx->a = 0x67452301;
210
+ ctx->b = 0xefcdab89;
211
+ ctx->c = 0x98badcfe;
212
+ ctx->d = 0x10325476;
213
+
214
+ ctx->lo = 0;
215
+ ctx->hi = 0;
216
+ }
217
+
218
+ void lxw_md5_update(lxw_md5_ctx *ctx, const void *data, unsigned long size)
219
+ {
220
+ uint32_t saved_lo;
221
+ unsigned long used, available;
222
+
223
+ saved_lo = ctx->lo;
224
+ if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
225
+ ctx->hi++;
226
+ ctx->hi += size >> 29;
227
+
228
+ used = saved_lo & 0x3f;
229
+
230
+ if (used) {
231
+ available = 64 - used;
232
+
233
+ if (size < available) {
234
+ memcpy(&ctx->buffer[used], data, size);
235
+ return;
236
+ }
237
+
238
+ memcpy(&ctx->buffer[used], data, available);
239
+ data = (const unsigned char *)data + available;
240
+ size -= available;
241
+ body(ctx, ctx->buffer, 64);
242
+ }
243
+
244
+ if (size >= 64) {
245
+ data = body(ctx, data, size & ~(unsigned long)0x3f);
246
+ size &= 0x3f;
247
+ }
248
+
249
+ memcpy(ctx->buffer, data, size);
250
+ }
251
+
252
+ #define OUT(dst, src) \
253
+ (dst)[0] = (unsigned char)(src); \
254
+ (dst)[1] = (unsigned char)((src) >> 8); \
255
+ (dst)[2] = (unsigned char)((src) >> 16); \
256
+ (dst)[3] = (unsigned char)((src) >> 24);
257
+
258
+ void lxw_md5_final(unsigned char *result, lxw_md5_ctx *ctx)
259
+ {
260
+ unsigned long used, available;
261
+
262
+ used = ctx->lo & 0x3f;
263
+
264
+ ctx->buffer[used++] = 0x80;
265
+
266
+ available = 64 - used;
267
+
268
+ if (available < 8) {
269
+ memset(&ctx->buffer[used], 0, available);
270
+ body(ctx, ctx->buffer, 64);
271
+ used = 0;
272
+ available = 64;
273
+ }
274
+
275
+ memset(&ctx->buffer[used], 0, available - 8);
276
+
277
+ ctx->lo <<= 3;
278
+ OUT(&ctx->buffer[56], ctx->lo)
279
+ OUT(&ctx->buffer[60], ctx->hi)
280
+
281
+ body(ctx, ctx->buffer, 64);
282
+
283
+ OUT(&result[0], ctx->a)
284
+ OUT(&result[4], ctx->b)
285
+ OUT(&result[8], ctx->c)
286
+ OUT(&result[12], ctx->d)
287
+
288
+ memset(ctx, 0, sizeof(*ctx));
289
+ }
290
+
291
+ #endif
@@ -0,0 +1,43 @@
1
+ /*
2
+ * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
3
+ * MD5 Message-Digest Algorithm (RFC 1321).
4
+ *
5
+ * Homepage:
6
+ * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
7
+ *
8
+ * Author:
9
+ * Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
10
+ *
11
+ * This software was written by Alexander Peslyak in 2001. No copyright is
12
+ * claimed, and the software is hereby placed in the public domain.
13
+ * In case this attempt to disclaim copyright and place the software in the
14
+ * public domain is deemed null and void, then the software is
15
+ * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
16
+ * general public under the following terms:
17
+ *
18
+ * Redistribution and use in source and binary forms, with or without
19
+ * modification, are permitted.
20
+ *
21
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
22
+ *
23
+ * See md5.c for more information.
24
+ */
25
+
26
+ #ifndef __LXW_MD5_H__
27
+ #define __LXW_MD5_H__
28
+
29
+ /* Any 32-bit or wider unsigned integer data type will do */
30
+ typedef unsigned int uint32_t;
31
+
32
+ typedef struct {
33
+ uint32_t lo, hi;
34
+ uint32_t a, b, c, d;
35
+ unsigned char buffer[64];
36
+ uint32_t block[16];
37
+ } lxw_md5_ctx;
38
+
39
+ extern void lxw_md5_init(lxw_md5_ctx *ctx);
40
+ extern void lxw_md5_update(lxw_md5_ctx *ctx, const void *data, unsigned long size);
41
+ extern void lxw_md5_final(unsigned char *result, lxw_md5_ctx *ctx);
42
+
43
+ #endif
@@ -5,22 +5,39 @@
5
5
 
6
6
  VALUE cRichString;
7
7
 
8
+ void rich_string_clear(void *p);
8
9
  void rich_string_free(void *p);
9
10
 
11
+ size_t
12
+ rich_string_size(const void *data) {
13
+ return sizeof(lxw_rich_string_tuple *);
14
+ }
15
+
16
+ const rb_data_type_t rich_string_type = {
17
+ .wrap_struct_name = "lxw_rich_string_tuple",
18
+ .function =
19
+ {
20
+ .dmark = NULL,
21
+ .dfree = rich_string_free,
22
+ .dsize = rich_string_size,
23
+ },
24
+ .data = NULL,
25
+ .flags = RUBY_TYPED_FREE_IMMEDIATELY,
26
+ };
10
27
 
11
28
  VALUE
12
29
  rich_string_alloc(VALUE klass) {
13
30
  VALUE obj;
14
31
  lxw_rich_string_tuple **ptr;
15
32
 
16
- obj = Data_Make_Struct(klass, lxw_rich_string_tuple *, NULL, rich_string_free, ptr);
33
+ obj = TypedData_Make_Struct(klass, lxw_rich_string_tuple *, &rich_string_type, ptr);
17
34
  *ptr = NULL;
18
35
 
19
36
  return obj;
20
37
  }
21
38
 
22
39
  void
23
- rich_string_free(void *p) {
40
+ rich_string_clear(void *p) {
24
41
  lxw_rich_string_tuple **ptr = p;
25
42
  if (*ptr) {
26
43
  ruby_xfree(*ptr);
@@ -28,16 +45,18 @@ rich_string_free(void *p) {
28
45
  }
29
46
  }
30
47
 
48
+ void
49
+ rich_string_free(void *p) {
50
+ rich_string_clear(p);
51
+ ruby_xfree(p);
52
+ }
53
+
31
54
  VALUE
32
55
  rich_string_cached_p(VALUE self) {
33
56
  lxw_rich_string_tuple **ptr;
34
- Data_Get_Struct(self, lxw_rich_string_tuple *, ptr);
57
+ TypedData_Get_Struct(self, lxw_rich_string_tuple *, &rich_string_type, ptr);
35
58
 
36
- if (*ptr) {
37
- return Qtrue;
38
- } else {
39
- return Qfalse;
40
- }
59
+ return (*ptr ? Qtrue : Qfalse);
41
60
  }
42
61
 
43
62
  lxw_rich_string_tuple **
@@ -48,7 +67,7 @@ serialize_rich_string(VALUE rs) {
48
67
  int len = RARRAY_LEN(arr);
49
68
 
50
69
  lxw_rich_string_tuple **ptr;
51
- Data_Get_Struct(rs, lxw_rich_string_tuple *, ptr);
70
+ TypedData_Get_Struct(rs, lxw_rich_string_tuple *, &rich_string_type, ptr);
52
71
 
53
72
  if (*ptr) { // cached
54
73
  return (lxw_rich_string_tuple **) *ptr;
@@ -0,0 +1,75 @@
1
+ #include <ruby.h>
2
+ #include <xlsxwriter.h>
3
+
4
+ #include "xlsxwriter_ext.h"
5
+ #include "shared_strings.h"
6
+
7
+ struct sst {
8
+ lxw_sst *sst;
9
+ };
10
+
11
+ VALUE cSharedStringsTable;
12
+
13
+ size_t sst_size(const void *data) {
14
+ return sizeof(struct sst);
15
+ }
16
+
17
+ const rb_data_type_t sst_type = {
18
+ .wrap_struct_name = "lxw_rich_string_tuple",
19
+ .function =
20
+ {
21
+ .dmark = NULL,
22
+ .dfree = ruby_xfree,
23
+ .dsize = sst_size,
24
+ },
25
+ .data = NULL,
26
+ .flags = RUBY_TYPED_FREE_IMMEDIATELY,
27
+ };
28
+
29
+ /* :nodoc: */
30
+ VALUE
31
+ sst_alloc(VALUE klass) {
32
+ VALUE obj;
33
+ struct sst *sst_ptr;
34
+ obj = TypedData_Make_Struct(klass, struct sst, &sst_type, sst_ptr);
35
+ sst_ptr->sst = NULL;
36
+
37
+ return obj;
38
+ }
39
+
40
+ VALUE
41
+ alloc_shared_strings_table_by_ref(struct lxw_sst *sst) {
42
+ if (!sst)
43
+ return Qnil;
44
+
45
+ VALUE object = rb_obj_alloc(cSharedStringsTable);
46
+ struct sst *sst_ptr;
47
+ TypedData_Get_Struct(object, struct sst, &sst_type, sst_ptr);
48
+ sst_ptr->sst = sst;
49
+ return object;
50
+ }
51
+
52
+ VALUE
53
+ sst_string_count_get_(VALUE self) {
54
+ struct sst *sst_ptr;
55
+ TypedData_Get_Struct(self, struct sst, &sst_type, sst_ptr);
56
+ return INT2NUM(sst_ptr->sst->string_count);
57
+ }
58
+
59
+ VALUE
60
+ sst_string_count_set_(VALUE self, VALUE val) {
61
+ struct sst *sst_ptr;
62
+ TypedData_Get_Struct(self, struct sst, &sst_type, sst_ptr);
63
+
64
+ sst_ptr->sst->string_count = NUM2INT(val);
65
+ return val;
66
+ }
67
+
68
+ void
69
+ init_xlsxwriter_shared_strings_table() {
70
+ cSharedStringsTable = rb_define_class_under(mXlsxWriter, "SharedStringsTable", rb_cObject);
71
+
72
+ rb_define_alloc_func(cSharedStringsTable, sst_alloc);
73
+ rb_define_method(cSharedStringsTable, "string_count", sst_string_count_get_, 0);
74
+ rb_define_method(cSharedStringsTable, "string_count=", sst_string_count_set_, 1);
75
+ }
@@ -0,0 +1,15 @@
1
+ #include <ruby.h>
2
+ #include <xlsxwriter.h>
3
+
4
+ #ifndef __SHARED_STRINGS__
5
+ #define __SHARED_STRINGS__
6
+
7
+ void
8
+ init_xlsxwriter_shared_strings_table();
9
+
10
+ extern VALUE cSharedStringsTable;
11
+
12
+ VALUE
13
+ alloc_shared_strings_table_by_ref(struct lxw_sst *);
14
+
15
+ #endif // __SHARED_STRINGS__