Minor repairs.

mirus77 · Feb 23, 2017 · ec12c20 · ec12c20
1 parent 6957314
commit ec12c20
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/include/eet/u_EETSigner.pas b/include/eet/u_EETSigner.pas
@@ -319,9 +319,10 @@ procedure TEETSigner.InitXMLSec;
   if (xmlSecCryptoInit() < 0)
   then raise EEETSignerException.Create(sSignerXmlSecInitError);
 {$ELSE}
-  InitLibEETSigner('');
+  if not InitLibEETSigner('')
+  then raise EEETSignerException.Create(sSignerLibEETInitLibError);
   if (eetSignerInit < 0)
-  then raise EEETSignerException.Create(sSignerXmlSecInitError);
+  then raise EEETSignerException.Create(sSignerLibEETSignerInitError);
 {$ENDIF}
 end;
 

diff --git a/include/eet/u_EETSignerExceptions.pas b/include/eet/u_EETSignerExceptions.pas
@@ -18,6 +18,8 @@ interface
 //aSignerNoPFXCert = 'Privátní klíč není načten';
 sSignerInvalidPFXCert = 'Neplatný soukromý certifikát nebo heslo.';
 sSignerXmlSecInitError = 'Neúšpěšná inicializace xmlsec';
+sSignerLibEETInitLibError = 'Neúšpěšná inicializace libeet';
+sSignerLibEETSignerInitError = 'Neúšpěšná inicializace eetSignerInit';
 sSignerInitWrongDll = 'Neplatná verze knihovny xmlsec.dll.';
 sSignerInitNoXmlsecOpensslDll = 'EETSigner: Nenalezena potřebná crypto knihovna openssl.';
 sSignerInitNoXmlsecMSCryptoDll = 'EETSigner: Nenalezena potřebná crypto knihovna mscrypto.';

diff --git a/include/eet/u_libeet.pas b/include/eet/u_libeet.pas
@@ -848,6 +848,7 @@ function FreeLibEETSigner: Boolean;
 
     if (FlibeetHandle <> 0) and (ReferenceCount = 0) then
     begin
+      FreeLibrary(FlibeetHandle);
       FlibeetHandle := 0;
 
       {$IFDEF USE_LIBEET}