Cambiata icona authoriz

git-svn-id: svn://10.65.10.50/branches/R_10_00@22630 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2012-04-10 07:47:37 +00:00
parent 70511857eb
commit 9131478f5f
4 changed files with 11 additions and 34 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -354,10 +354,8 @@ inline void reset_bit(unsigned short& w, unsigned char b)
extern "C" extern "C"
{ {
__declspec(dllimport) int Login(const char* session, const char* product); #include "..\ssa\h\ssadll.h"
__declspec(dllimport) int ApriModulo(const char* session, const char* product); #include "..\ssa\h\ssaerr.h"
__declspec(dllimport) int ChiudiModulo(const char* session, const char* product);
__declspec(dllimport) int Logout(const char* session, const char* product);
} }
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
@ -680,8 +678,8 @@ wxString TDongle::GetSessionId() const
bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles)) bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
{ {
const wxString u = GetSessionId(); const wxString u = GetSessionId();
const bool ok1 = ::Login(u, "Campo") == 0; const bool ok1 = SSA_Login(u, "Campo") == 0;
const bool ok2 = ::Login(u, "Enterprise") != 0; // Test for dll tampering const bool ok2 = SSA_Login(u, "Enterprise") != 0; // Test for dll tampering
const bool ok = ok1 && ok2; const bool ok = ok1 && ok2;
if (ok) if (ok)
@ -696,10 +694,10 @@ bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
for (size_t m = 0; m < _code.GetCount(); m++) for (size_t m = 0; m < _code.GetCount(); m++)
{ {
const wxString c = ModuleNumberToCode(m); const wxString c = ModuleNumberToCode(m);
if (::ApriModulo(u, c) == 0) if (SSA_ApriModulo(u, c) == 0)
{ {
_module.set(m); _module.set(m);
::ChiudiModulo(u, c); SSA_ChiudiModulo(u, c);
unsigned short& mu = _user[m]; unsigned short& mu = _user[m];
mu = ComputeMaxUsers(m); mu = ComputeMaxUsers(m);
if (mu > _max_users && mu < 128) if (mu > _max_users && mu < 128)
@ -713,7 +711,7 @@ bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
bool TDongle::ssa_logout() bool TDongle::ssa_logout()
{ {
return ::Logout(GetSessionId(), "Campo") == 0; return SSA_Logout(GetSessionId(), "Campo") == 0;
} }
@ -1065,13 +1063,13 @@ unsigned short TDongle::ComputeMaxUsers(size_t module) const
for (n = 0; n < 32; n++) for (n = 0; n < 32; n++)
{ {
u.Printf("DummyDongle:%d", n); u.Printf("DummyDongle:%d", n);
if (::Login(u, "Campo") != 0 || ::ApriModulo(u, m) != 0) if (SSA_Login(u, "Campo") != 0 || SSA_ApriModulo(u, m) != 0)
break; break;
} }
for (short i = 0; i < n; i++) for (short i = 0; i < n; i++)
{ {
u.Printf("DummyDongle:%d", i); u.Printf("DummyDongle:%d", i);
::Logout(u, "Campo"); SSA_Logout(u, "Campo");
} }
} }
return n < 32 ? n : -1; return n < 32 ? n : -1;
@ -1095,7 +1093,7 @@ bool TDongle::OpenModule(size_t module)
{ {
const wxString u = GetSessionId(); const wxString u = GetSessionId();
const wxString m = ModuleNumberToCode(module); const wxString m = ModuleNumberToCode(module);
if (::ApriModulo(u, m) != 0) if (SSA_ApriModulo(u, m) != 0)
return false; return false;
} }

View File

@ -1,4 +1,4 @@
soap ICON "soap.ico" soap ICON "../res/CampoSrv.ico"
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"

View File

@ -7,20 +7,6 @@ Run=authoriz.exe
Port=1883 Port=1883
Donglehw=2 Donglehw=2
[Coffee]
Run=coffee.exe
Icon=coffee.gif
Port=3887
[DataBase]
Port=3885
Icon=DataBase.gif
Run=DataBase.exe
LogFile=
LogVerbose=
Dsn=
Query=
[Dictionary] [Dictionary]
Icon=diction.gif Icon=diction.gif
Run=diction.exe Run=diction.exe
@ -29,13 +15,6 @@ Dictionary=english.xml
LogFile= LogFile=
LogVerbose= LogVerbose=
[Postman]
Icon=postman.gif
Run=postman.exe
Port=8080
LogFile=
LogVerbose=
[Lurch] [Lurch]
Run=lurch.exe Run=lurch.exe
Port=10000 Port=10000