Replace original libxml2, xmlsec, openssl with self compiled DLLs wit…

…h Visual Studio 2013.
mirus77 · May 31, 2017 · 71d2bc1 · 71d2bc1
1 parent 266d43a
commit 71d2bc1
Show file tree

Hide file tree

Showing 26 changed files with 40 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -16,12 +16,19 @@ openssl 1.0.x (libeay32.dll, ssleay32.dll) libs for Indy Https comunication
 Delphi project Options for demo TestEET.dpr with USE_LIBEET
 
 ```
-  Delphi Compiler Options -> Conditional Defines : 
+  Delphi Compiler Options -> Conditional Defines :
+      USE_LIBEET - for using with libeetsigner
       USE_INDY - for using in Windows XP required. This is not usable for Delphi Starter Edition.
       USE_DIRECTINDY - enable function with direct usage indy for post request and receive response.
-      USE_LIBEET - for using with libeetsigner
+      USE_VS_LIBS - use libxml2 and xmlsec compiled with Visual Studio
+                 solution for time_t compatibility
+                 VS 2013 and lower using MSVCRxxx.dll
+                 VS 2015 and higher VCRUNTIME140.dll (ucrtbase.dll)
+
+ For x64 binaries of demo use directive USE_LIBEET
+
   Delphi Compiler Options -> Output Directory: ..\bin
-  Delphi Compiler Options -> Search Path: 
+  Delphi Compiler Options -> Search Path:
       $(BDS)\source\soap;..\include\databinding;
       ..\include\eet;..\include\vcruntime
   Delphi Compiler Options -> Unit Output Directory: .\dcu
@@ -30,6 +37,8 @@ Delphi project Options for demo TestEET.dpr with USE_LIBEET
 
 ## Use without USE_LIBEET
 Demo need libxml2 and libxmlsec library from : ftp://ftp.zlatkovic.com/libxml/64bit/
+or self compiled libXML, XMLSEC with Visual Studio (build scripts at https://github.com/mirus77/build_xmlsoft).
+
 ```
 libcharset-1.dll
 libeay32.dll
@@ -52,11 +61,16 @@ zlib1.dll
 Delphi project Options for demo TestEET.dpr
 
 ```
-  Delphi Compiler Options -> Conditional Defines : 
+  Delphi Compiler Options -> Conditional Defines :
       USE_INDY - for using in Windows XP required. This is not usable for Delphi Starter Edition.
-      USE_DIRECTINDY - enable function with direct usage indy for post request and receive response.       
+      USE_DIRECTINDY - enable function with direct usage indy for post request and receive response.
+      USE_VS_LIBS - use libeetsigner.dll in debug mode
+      Default c-runtime msvcrt.dll for MinGW xmlsec1.
+
+  For x64 binaries of demo use directive USE_LIBEET
+
   Delphi Compiler Options -> Output Directory: ..\bin
-  Delphi Compiler Options -> Search Path: 
+  Delphi Compiler Options -> Search Path:
       $(BDS)\source\soap;..\include\databinding;
       ..\include\eet;..\include\synapse;..\include\szutils;
       ..\include\xmlsec;..\include\vcruntime

diff --git a/bin/libcharset-1.dll b/bin/libcharset-1.dll
diff --git a/bin/libeay32.dll b/bin/libeay32.dll
diff --git a/bin/libeetsigner.dll b/bin/libeetsigner.dll
diff --git a/bin/libexslt-0.dll b/bin/libexslt-0.dll
diff --git a/bin/libgcc_s_dw2-1.dll b/bin/libgcc_s_dw2-1.dll
diff --git a/bin/libiconv-2.dll b/bin/libiconv-2.dll
diff --git a/bin/libintl-8.dll b/bin/libintl-8.dll
diff --git a/bin/libltdl-7.dll b/bin/libltdl-7.dll
diff --git a/bin/libwinpthread-1.dll b/bin/libwinpthread-1.dll
diff --git a/bin/libxml2-2.dll b/bin/libxml2-2.dll
diff --git a/bin/libxmlsec1-openssl.dll b/bin/libxmlsec1-openssl.dll
diff --git a/bin/libxmlsec1.dll b/bin/libxmlsec1.dll
diff --git a/bin/libxslt-1.dll b/bin/libxslt-1.dll
diff --git a/bin/openssl.exe b/bin/openssl.exe
diff --git a/bin/ssleay32.dll b/bin/ssleay32.dll
diff --git a/bin/xmlsec1.exe b/bin/xmlsec1.exe
diff --git a/bin/zlib1.dll b/bin/zlib1.dll
diff --git a/bin64/libeetsigner.dll b/bin64/libeetsigner.dll
diff --git a/demo/TestEET.dpr b/demo/TestEET.dpr
@@ -14,10 +14,13 @@ program TestEET;
        USE_INDY - recompile SOAP comunications with Indy
        USE_LIBEET - use wrapper libeetsigner.dll - static compiled into one library (libxml2, xmlsec, openssl)
                     compiled with Visual Studio 2013 U5 Express - VC12 (VS Runtime 2013) needed MSVCR120.dll
-       USE_UCRT_LIBS - use libxml2 and xmlsec compiled with Visual Studio
+       USE_VS_LIBS - use libxml2 and xmlsec compiled with Visual Studio
                   solution for time_t compatibility
                   VS 2013 and lower using MSVCRxxx.dll
                   VS 2015 and higher VCRUNTIME140.dll (ucrtbase.dll)
+       Default c-rutntime msvcrt.dll for MinGW xmlsec1.
+
+  For x64 binaries of demo use directive USE_LIBEET
 
   (for other)
   Delphi Compiler Options -> Output Directory: ..\bin

diff --git a/demo/TestEET.res b/demo/TestEET.res
diff --git a/include/vcruntime/vcruntime.pas b/include/vcruntime/vcruntime.pas
@@ -4,24 +4,22 @@ interface
 
 const
 {$IFDEF USE_LIBEET}
-  {$IFDEF USE_UCRT_LIBS}
-  LIBMSVCRT   = 'ucrtbase.dll';
-  {$ELSE}
+//  LIBMSVCRT   = 'ucrtbase.dll';  // Visual Studio 2015 and higher
   LIBMSVCRT   = 'msvcr120.dll'; // Visual Studio 2013
-  {$ENDIF}
 {$ELSE}
-  {$IFDEF USE_UCRT_LIBS}
-  LIBMSVCRT   = 'ucrtbase.dll';
+  {$IFDEF USE_VS_LIBS}
+  LIBMSVCRT   = 'msvcr120.dll'; // Visual Studio 2013
+//  LIBMSVCRT   = 'ucrtbase.dll';   // Visual Studio 2015 and higher
   {$ELSE}
-  LIBMSVCRT   = 'msvcrt.dll';
+  LIBMSVCRT   = 'msvcrt.dll'; // MinGW32 libs
   {$ENDIF}
 {$ENDIF}
 
 type
   PFILE = Pointer;
 
 var
-// msvcrt.dll utils
+// crtuntime utils
 
   crt_fopen : function (const filename, mode: PAnsiChar): PFILE; cdecl;
 

diff --git a/include/xmlsec/libxml2.pas b/include/xmlsec/libxml2.pas
@@ -11,7 +11,7 @@ interface
 
 const
 {$IFDEF MSWINDOWS}
-  LIBXML2_SO = {$IFNDEF USE_UCRT_LIBS}'libxml2-2.dll'{$ELSE}'libxml2.dll'{$ENDIF};
+  LIBXML2_SO = {$IFNDEF USE_VS_LIBS}'libxml2-2.dll'{$ELSE}'libxml2.dll'{$ENDIF};
 {$ELSE}
   LIBXML2_SO = 'libxml2.so';
 {$ENDIF}
@@ -4412,7 +4412,7 @@       xmlNs = record
 
 implementation
 uses
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
   Windows,
 {$ENDIF}
   SysUtils;

diff --git a/include/xmlsec/libxmlsec.pas b/include/xmlsec/libxmlsec.pas
@@ -11,12 +11,13 @@ interface
 
 const
 {$IFDEF MSWINDOWS}
-  LIBXMLSEC_SO = {$IFDEF USE_UCRT_LIBS}'libxmlsec.dll'{$ELSE}'libxmlsec1.dll'{$ENDIF};
+  LIBXMLSEC_SO = {$IFDEF USE_VS_LIBS}'libxmlsec.dll'{$ELSE}'libxmlsec1.dll'{$ENDIF};
 {$ELSE}
   LIBXMLSEC_SO = 'libxmlsec.so';
 {$ENDIF}
 
-{$IFNDEF USE_UCRT_LIBS}
+{$IFNDEF USE_VS_LIBS}
+  // for MinGW runtime
   {$DEFINE _USE_32BIT_TIME_T}
 {$ENDIF}
 
@@ -1680,7 +1681,7 @@       _xmlSecTransformKlass = record
 
 implementation
 uses
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
   Windows,
 {$ENDIF}
   SysUtils;

diff --git a/include/xmlsec/libxmlsec_openssl.pas b/include/xmlsec/libxmlsec_openssl.pas
@@ -8,8 +8,8 @@ interface
 uses SysUtils, Classes, {TimeSpan,}  libxml2, libxmlsec, libeay32;
 
 const
-{$IFDEF WIN32}
-  LIBXMLSECOPENSSL_SO = {$IFNDEF USE_UCRT_LIBS}'libxmlsec1-openssl.dll'{$ELSE}'libxmlsec-openssl.dll'{$ENDIF};
+{$IFDEF MSWINDOWS}
+  LIBXMLSECOPENSSL_SO = {$IFNDEF USE_VS_LIBS}'libxmlsec1-openssl.dll'{$ELSE}'libxmlsec-openssl.dll'{$ENDIF};
 {$ELSE}
   LIBXMLSECOPENSSL_SO = 'libxmlsec-openssl.so';
 {$ENDIF}

diff --git a/include/xmlsec/libxslt.pas b/include/xmlsec/libxslt.pas
@@ -10,7 +10,7 @@ interface
 uses libxml2;
 
 const
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
   LIBXSLT_SO = 'libxslt.dll';
 {$ELSE}
   LIBXSLT_SO = 'libxslt.so';
@@ -1093,7 +1093,7 @@       xsltVarInfo = record
   xsltConstXSLTAttrMarker = 'LRE XLST Attr';
 implementation
 uses
-{$IFDEF WIN32}
+{$IFDEF MSWINDOWS}
   Windows,
 {$ENDIF}
   SysUtils;