root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiunto supporto per testare moduli esterni a CAMPO con ssa

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@23047 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2015-02-24 08:45:22 +00:00
parent 7a2b3f956e
commit 445f9c96ce
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xvaga/xvaga.cpp
View File

@ -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 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; int flags = wxFILE | wxDIR;
if (dirs) if (dirs)
@ -1884,7 +1886,6 @@ SLIST xvt_fsys_list_files(const char *type, const char *pat, BOOLEAN dirs)
if (f.StartsWith(".\\") || f.StartsWith("./")) if (f.StartsWith(".\\") || f.StartsWith("./"))
f = f.Mid(2); f = f.Mid(2);
xvt_slist_add_at_elt(list, NULL, f, 0L); xvt_slist_add_at_elt(list, NULL, f, 0L);
f = ::wxFindNextFile(); f = ::wxFindNextFile();
} }
} }
@ -2002,9 +2003,9 @@ XVT_IMAGE xvt_image_capture(WINDOW win, const RCT* src)
else else
r = RCT2Rect(src); r = RCT2Rect(src);
wxBitmap bmp(r.GetWidth(), r.GetHeight());
CAST_DC(win, wdc); CAST_DC(win, wdc);
wxBitmap bmp(r.GetWidth(), r.GetHeight());
wxMemoryDC mdc(bmp); wxMemoryDC mdc(bmp);
mdc.Blit(wxPoint(0,0), r.GetSize(), &wdc, r.GetPosition()); 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) XVT_IMAGE xvt_image_read(const char* filenamep)
{ {
TXVT_IMAGE* i = NULL; TXVT_IMAGE* i = NULL;
#ifdef __WXMSW__
const wxString name = filenamep; const wxString name = filenamep;
#else
wxString name;
if (isalpha(filenamep[0u]))
{
name = _startup_dir;
name += "/";
}
name += filenamep;
#endif
if (::wxFileExists(name)) if (::wxFileExists(name))
{ {
i = new TXVT_IMAGE; i = new TXVT_IMAGE;

20
xvaga/xvt_ssa.cpp
View File

@ -156,16 +156,26 @@ int xvt_dongle_sa_logout(const char* module)
int xvt_dongle_sa_test(const char* module) int xvt_dongle_sa_test(const char* module)
{ {
int err = _ssa_serial; int err = SSA_PROD_NOTFOUND;
if (err >= 0 && module && *module) if (module && *module)
{ {
wxString p = _ssa_product;
wxString m = module; 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(); m.MakeUpper();
err = SSA_VerificaModulo(_ssa_product, m); err = SSA_VerificaModulo(p, m);
} }
} }
return err; return err;
} }