Main static built

.appveyor.yml

@@ -182,6 +182,54 @@ environment:
       PHP_VER: 8.0.0
       ZLIB_VER: 1.2.11
       TS: 1
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x64
+      VC: vs16
+      PHP_VER: 8.1.9
+      ZLIB_VER: 1.2.11
+      TS: 0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x64
+      VC: vs16
+      PHP_VER: 8.1.9
+      ZLIB_VER: 1.2.11
+      TS: 1
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x86
+      VC: vs16
+      PHP_VER: 8.1.9
+      ZLIB_VER: 1.2.11
+      TS: 0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x86
+      VC: vs16
+      PHP_VER: 8.1.9
+      ZLIB_VER: 1.2.11
+      TS: 1
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x64
+      VC: vs16
+      PHP_VER: 8.2.5
+      ZLIB_VER: 1.2.11
+      TS: 0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x64
+      VC: vs16
+      PHP_VER: 8.2.5
+      ZLIB_VER: 1.2.11
+      TS: 1
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x86
+      VC: vs16
+      PHP_VER: 8.2.5
+      ZLIB_VER: 1.2.11
+      TS: 0
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      ARCH: x86
+      VC: vs16
+      PHP_VER: 8.2.5
+      ZLIB_VER: 1.2.11
+      TS: 1
 
 build_script:
   ps: |

config.m4

@@ -7,6 +7,12 @@ PHP_ARG_WITH(libxlsxwriter, system libxlsxwriter,
 PHP_ARG_WITH(libxlsxio, system libxlsxio,
 [  --with-libxlsxio=DIR     Use system libxlsxio], no, no)
 
+PHP_ARG_WITH(openssl_md5, openssl MD5,
+[  --with-openssl-md5=DIR   Use openssl MD5], no, no)
+
+PHP_ARG_WITH(bundled_md5, bundled MD5,
+[  --with-bundled-md5       Use bundled MD5], no, no)
+
 PHP_ARG_ENABLE(reader, enable xlsx reader support,
 [  --enable-reader          Enable xlsx reader?], yes, yes)
 
@@ -37,9 +43,12 @@ if test "$PHP_XLSWRITER" != "no"; then
     library/libxlsxwriter/third_party/minizip/zip.c \
     "
 
+   md5_sources="
+   library/libxlsxwriter/third_party/md5/md5.c \
+   "
+
     libxlsxwriter_sources="
     library/libxlsxwriter/third_party/tmpfileplus/tmpfileplus.c \
-    library/libxlsxwriter/third_party/md5/md5.c \
     library/libxlsxwriter/src/app.c \
     library/libxlsxwriter/src/chart.c \
     library/libxlsxwriter/src/chartsheet.c \
@@ -78,9 +87,44 @@ if test "$PHP_XLSWRITER" != "no"; then
     "
 
     AC_MSG_CHECKING([Check libxlsxwriter library])
-    if test "$PHP_LIBXLSXWRITER" != "no"; then
 
-        for i in $PHP_LIBXLSXWRITER /usr/local /usr; do
+    if test "$PHP_OPENSSL_MD5" != "no"; then
+        AC_MSG_RESULT([use the openssl md5 library])
+        for i in $PHP_OPENSSL_MD5 /usr/local /usr /usr/local/opt; do
+            if test -r $i/include/openssl/md5.h; then
+                OPENSSL_DIR=$i
+                AC_MSG_RESULT([found in $i])
+                break
+            fi
+        done
+
+        if test -z "$OPENSSL_DIR"; then
+            AC_MSG_ERROR([openssl library not found])
+        else
+            PHP_ADD_INCLUDE($OPENSSL_DIR/include)
+
+            PHP_CHECK_LIBRARY(crypto, MD5_Init,
+            [
+                PHP_ADD_LIBRARY_WITH_PATH(crypto, $OPENSSL_DIR/lib, XLSWRITER_SHARED_LIBADD)
+            ],[
+                AC_MSG_ERROR([Wrong openssl MD5_Init not found])
+            ],[
+                -L$OPENSSL_DIR/lib -lcrypto
+            ])
+
+            AC_DEFINE(USE_OPENSSL_MD5, 1, [ use openssl md5 ])
+        fi
+
+        PHP_BUNDLED_MD5=no
+    fi
+
+    if test "$PHP_BUNDLED_MD5" != "no"; then
+        AC_MSG_RESULT([use the bundled md5 library])
+        xls_writer_sources="$xls_writer_sources $md5_sources"
+    fi
+
+    if test "$PHP_LIBXLSXWRITER" != "no"; then
+        for i in $PHP_LIBXLSXWRITER /usr/local /usr /usr/local/opt; do
             if test -r $i/include/xlsxwriter.h; then
                 XLSXWRITER_DIR=$i
                 AC_MSG_RESULT([found in $i])
@@ -116,7 +160,7 @@ if test "$PHP_XLSWRITER" != "no"; then
         PHP_ADD_INCLUDE([PHP_EXT_SRCDIR/library/libxlsxwriter/include])
 
         dnl see library/CMakeLists.txt
-        LIBOPT="-DNOCRYPT -DNOUNCRYPT"
+        LIBOPT="$LIBOPT -DNOCRYPT -DNOUNCRYPT"
     fi
 
     if test "$PHP_READER" = "yes"; then

include/chart.h

@@ -13,6 +13,8 @@
 #ifndef PHP_EXT_EXCEL_EXPORT_CHART_H
 #define PHP_EXT_EXCEL_EXPORT_CHART_H
 
+#include "common.h"
+
 extern zend_class_entry *vtiful_chart_ce;
 
 VTIFUL_STARTUP_FUNCTION(chart);

include/common.h

@@ -0,0 +1,44 @@
+/*
+  +----------------------------------------------------------------------+
+  | XlsWriter Extension                                                  |
+  +----------------------------------------------------------------------+
+  | Copyright (c) 2017-2018 The Viest                                    |
+  +----------------------------------------------------------------------+
+  | http://www.viest.me                                                  |
+  +----------------------------------------------------------------------+
+  | Author: viest <dev@service.viest.me>                                 |
+  +----------------------------------------------------------------------+
+*/
+
+#ifndef PHP_EXT_XLS_WRITER_COMMON_H
+#define PHP_EXT_XLS_WRITER_COMMON_H
+
+#ifdef PHP_WIN32
+#	define PHP_VTIFUL_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_VTIFUL_API __attribute__ ((visibility("default")))
+#else
+#	define PHP_VTIFUL_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+#if PHP_VERSION_ID >= 80000
+#define TSRMLS_D	void
+#define TSRMLS_DC
+#define TSRMLS_C
+#define TSRMLS_CC
+#endif
+
+#define VTIFUL_RESOURCE_NAME "xlsx"
+
+#define VTIFUL_STARTUP_MODULE(module) ZEND_MODULE_STARTUP_N(xlsxwriter_##module)(INIT_FUNC_ARGS_PASSTHRU)
+#define VTIFUL_STARTUP_FUNCTION(module) ZEND_MINIT_FUNCTION(xlsxwriter_##module)
+
+#if defined(ZTS) && defined(COMPILE_DL_VTIFUL)
+ZEND_TSRMLS_CACHE_EXTERN();
+#endif
+
+#endif

include/csv.h

@@ -13,6 +13,8 @@
 #ifndef PHP_EXT_XLS_WRITER_CSV_H
 #define PHP_EXT_XLS_WRITER_CSV_H
 
+#include "common.h"
+
 unsigned int xlsx_to_csv(
         zval *stream_resource,
         const char *delimiter_str, int delimiter_str_len,

include/excel.h

@@ -13,6 +13,8 @@
 #ifndef VTIFUL_XLS_H
 #define VTIFUL_XLS_H
 
+#include "common.h"
+
 #define V_XLS_HANDLE "handle"
 #define V_XLS_FIL    "fileName"
 #define V_XLS_COF    "config"

include/exception.h

@@ -13,6 +13,8 @@
 #ifndef VTIFUL_XLS_EXCEPTION_H
 #define VTIFUL_XLS_EXCEPTION_H
 
+#include "common.h"
+
 extern zend_class_entry *vtiful_exception_ce;
 
 VTIFUL_STARTUP_FUNCTION(exception);

include/format.h

@@ -13,6 +13,8 @@
 #ifndef PHP_EXT_XLS_EXPORT_FORMAT_H
 #define PHP_EXT_XLS_EXPORT_FORMAT_H
 
+#include "common.h"
+
 extern zend_class_entry *vtiful_format_ce;
 
 VTIFUL_STARTUP_FUNCTION(format);

include/help.h

@@ -13,6 +13,8 @@
 #ifndef PHP_EXT_XLS_EXPORT_HELP_H
 #define PHP_EXT_XLS_EXPORT_HELP_H
 
+#include "common.h"
+
 unsigned int file_exists(const char *path);
 unsigned int directory_exists(const char *path);
 zend_long date_double_to_timestamp(double value);

include/read.h

@@ -13,6 +13,8 @@
 #ifndef PHP_READ_INCLUDE_H
 #define PHP_READ_INCLUDE_H
 
+#include "common.h"
+
 #define READ_SKIP_ROW 0
 #define READ_ROW 0x01
 #define SKIP_EMPTY_VALUE 0x100

include/rich_string.h

@@ -13,6 +13,8 @@
 #ifndef PHP_EXT_XLS_EXPORT_RICH_STRING_H
 #define PHP_EXT_XLS_EXPORT_RICH_STRING_H
 
+#include "common.h"
+
 extern zend_class_entry *vtiful_rich_string_ce;
 
 VTIFUL_STARTUP_FUNCTION(rich_string);

include/validation.h

@@ -13,6 +13,8 @@
 #ifndef PHP_EXT_XLS_WRITER_VALIDATION_H
 #define PHP_EXT_XLS_WRITER_VALIDATION_H
 
+#include "common.h"
+
 extern zend_class_entry *vtiful_validation_ce;
 
 VTIFUL_STARTUP_FUNCTION(validation);

include/xlswriter.h

@@ -30,6 +30,7 @@
 #include "xlsxwriter/packager.h"
 #include "xlsxwriter/format.h"
 
+#include "common.h"
 #include "php_xlswriter.h"
 #include "excel.h"
 #include "validation.h"

kernel/write.c

@@ -622,7 +622,7 @@ workbook_file(xls_resource_write_t *self)
 
 void _php_vtiful_xls_close(zend_resource *rsrc TSRMLS_DC)
 {
-
+    //
 }
 
 /*

package.xml

@@ -50,6 +50,7 @@
  <contents>
   <dir name="/">
    <file md5sum="1cf796971bf051dce46bb715ab550289" name="include/chart.h" role="src" />
+   <file md5sum="" name="include/common.h" role="src" />
    <file md5sum="7e182a4b3e7d46e2a075b4500c62441a" name="include/csv.h" role="src" />
    <file md5sum="230bb9471b8c6f884c35e6279ec52df9" name="include/excel.h" role="src" />
    <file md5sum="07719d1125f1db8889ffceffa37feea6" name="include/exception.h" role="src" />

php_xlswriter.h

@@ -21,38 +21,10 @@ extern zend_module_entry xlswriter_module_entry;
 #define PHP_XLSWRITER_VERSION "1.5.4"
 #define PHP_XLSWRITER_AUTHOR  "Jiexing.Wang (wjx@php.net)"
 
-#ifdef PHP_WIN32
-#	define PHP_VTIFUL_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
-#	define PHP_VTIFUL_API __attribute__ ((visibility("default")))
-#else
-#	define PHP_VTIFUL_API
-#endif
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#if PHP_VERSION_ID >= 80000
-#define TSRMLS_D	void
-#define TSRMLS_DC
-#define TSRMLS_C
-#define TSRMLS_CC
-#endif
-
-#define VTIFUL_RESOURCE_NAME "xlsx"
-
 extern int le_xls_writer;
 
-#define VTIFUL_STARTUP_MODULE(module) ZEND_MODULE_STARTUP_N(xlsxwriter_##module)(INIT_FUNC_ARGS_PASSTHRU)
-#define VTIFUL_STARTUP_FUNCTION(module) ZEND_MINIT_FUNCTION(xlsxwriter_##module)
-
 void _php_vtiful_xls_close(zend_resource *rsrc TSRMLS_DC);
 
-#if defined(ZTS) && defined(COMPILE_DL_VTIFUL)
-ZEND_TSRMLS_CACHE_EXTERN();
-#endif
-
 PHP_MINIT_FUNCTION(xlswriter);
 PHP_MSHUTDOWN_FUNCTION(xlswriter);
 PHP_RINIT_FUNCTION(xlswriter);