From 445f9c96ce2295fc8c653ad42f921c8af1ed3fac Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 24 Feb 2015 08:45:22 +0000
Subject: [PATCH] Aggiunto supporto per testare moduli esterni a CAMPO con ssa

git-svn-id: svn://10.65.10.50/branches/R_10_00@23047 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 xvaga/xvaga.cpp   | 17 ++++-------------
 xvaga/xvt_ssa.cpp | 20 +++++++++++++++-----
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/xvaga/xvaga.cpp b/xvaga/xvaga.cpp
index 53ddc2970..61d1cf12b 100755
--- a/xvaga/xvaga.cpp
+++ b/xvaga/xvaga.cpp
@@ -1825,7 +1825,9 @@ static bool xvt_sys_ftp_passive_mode(const char* server)
 
 SLIST xvt_fsys_list_files(const char *type, const char *pat, BOOLEAN dirs)
 {
-	SLIST list = xvt_slist_create();
+  wxBusyCursor hourglass;
+	
+  SLIST list = xvt_slist_create();
 
   int flags = wxFILE | wxDIR;
 	if (dirs)
@@ -1884,7 +1886,6 @@ SLIST xvt_fsys_list_files(const char *type, const char *pat, BOOLEAN dirs)
       if (f.StartsWith(".\\") || f.StartsWith("./"))
         f = f.Mid(2);
       xvt_slist_add_at_elt(list, NULL, f, 0L);
-
 		  f = ::wxFindNextFile();
 	  }
   }
@@ -2002,9 +2003,9 @@ XVT_IMAGE xvt_image_capture(WINDOW win, const RCT* src)
   else
     r = RCT2Rect(src);
 
-  wxBitmap bmp(r.GetWidth(), r.GetHeight());
   CAST_DC(win, wdc);
 
+  wxBitmap bmp(r.GetWidth(), r.GetHeight());
   wxMemoryDC mdc(bmp); 
   mdc.Blit(wxPoint(0,0), r.GetSize(), &wdc, r.GetPosition());
 
@@ -2123,17 +2124,7 @@ COLOR xvt_image_get_pixel(XVT_IMAGE image, short x, short y)
 XVT_IMAGE xvt_image_read(const char* filenamep)
 {
 	TXVT_IMAGE* i = NULL;
-#ifdef __WXMSW__
 	const wxString name = filenamep;
-#else
-	wxString name;
-	if (isalpha(filenamep[0u]))
-	{
-		name = _startup_dir;
-		name += "/";
-	}
-	name += filenamep;
-#endif
 	if (::wxFileExists(name))
 	{
 		i = new TXVT_IMAGE;
diff --git a/xvaga/xvt_ssa.cpp b/xvaga/xvt_ssa.cpp
index 4e77e586f..7aa51c94e 100644
--- a/xvaga/xvt_ssa.cpp
+++ b/xvaga/xvt_ssa.cpp
@@ -156,16 +156,26 @@ int xvt_dongle_sa_logout(const char* module)
 
 int xvt_dongle_sa_test(const char* module)
 {
-  int err = _ssa_serial; 
-  if (err >= 0 && module && *module)
+  int err = SSA_PROD_NOTFOUND; 
+  if (module && *module)
   {
+    wxString p = _ssa_product;
     wxString m = module;
-    err = SSA_VerificaModulo(_ssa_product, m);
-    if (err != 0 && *module >= 'a')
+
+    const int dot = m.Find('.');
+    if (dot > 0)
+    {
+      p = m.Left(dot);
+      m = m.Mid(dot+1);
+    }  
+    err = SSA_VerificaModulo(p, m);
+    if (err <= SSA_MOD_NOTFOUND && m[0] >= 'a')
     {
       m.MakeUpper();
-      err = SSA_VerificaModulo(_ssa_product, m);
+      err = SSA_VerificaModulo(p, m);
     }
   }
   return err;
 }
+
+