From 9131478f5fbe82ba8c8f75468e44276e871a455d Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Tue, 10 Apr 2012 07:47:37 +0000
Subject: [PATCH] Cambiata icona authoriz

git-svn-id: svn://10.65.10.50/branches/R_10_00@22630 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 server/autho.gif   | Bin 380 -> 2855 bytes
 server/dongle.cpp  |  22 ++++++++++------------
 server/server.rc   |   2 +-
 server/servers.ini |  21 ---------------------
 4 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/server/autho.gif b/server/autho.gif
index 4ab1748103510b27892507fed1983ce15afa3559..4c02d18a0c09675b90267471f2e0cb875db4f035 100755
GIT binary patch
literal 2855
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
F06Y9}KR^Hg

literal 380
zcmV-?0fYWWNk%w1VITk?0P+9;0001hfB^sh0Emc)ySux{w8;Pe{{R30A^8LW000F5
zA^s>qa$#d=Zf|gCX>4g>AUYsubaZe!FE4j@cP?RaVPj}+Z)s#MV{dH$EC2ui03ZM$
z000C2Si0OCFt|w@6j%UI`@<0-1e~{>A3>gkT2jDZ%tILnZc0u=@6(*y&XQ}$W(GoS
z79716f#O2e+9-W7;ZqSEDyW254{3-2oR01jEKY_2t(q4qEr1Q|9$dMJ_+1cRZc1)3
z1$#9B0RxMTfQ)u-c#>90a*UXZeV80zU<65SHJPN1j3rcepe=l4u5OxBmXfPA8Mn8V
za|2g{Rk*+yDm4te#-TN=%F7~3Ua4Wmw!y%|FVHbcVa(h(rwn3*+Go_b)(zR%+|1s)
z<Kg7x8RvrIWxRXqtnE*5_{L%6-J-W3U4e1>l<_O}Zk)h*v8J#Ba4+D)h2X;28Rr(K
aqeo&6P)$5RvLs0lhcu#G367<M1OPj)1EY%o

diff --git a/server/dongle.cpp b/server/dongle.cpp
index 3f417ca25..42b2e37b2 100755
--- a/server/dongle.cpp
+++ b/server/dongle.cpp
@@ -354,10 +354,8 @@ inline void reset_bit(unsigned short& w, unsigned char b)
 
 extern "C"
 {
-__declspec(dllimport) int Login(const char* session, const char* product);
-__declspec(dllimport) int ApriModulo(const char* session, const char* product);
-__declspec(dllimport) int ChiudiModulo(const char* session, const char* product);
-__declspec(dllimport) int Logout(const char* session, const char* product);
+#include "..\ssa\h\ssadll.h"
+#include "..\ssa\h\ssaerr.h"
 }
 
 ///////////////////////////////////////////////////////////
@@ -680,8 +678,8 @@ wxString TDongle::GetSessionId() const
 bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
 {
   const wxString u = GetSessionId();
-  const bool ok1 = ::Login(u, "Campo") == 0;
-  const bool ok2 = ::Login(u, "Enterprise") != 0; // Test for dll tampering
+  const bool ok1 = SSA_Login(u, "Campo") == 0;
+  const bool ok2 = SSA_Login(u, "Enterprise") != 0; // Test for dll tampering
   const bool ok = ok1 && ok2;
 
   if (ok)
@@ -696,10 +694,10 @@ bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
     for (size_t m = 0; m < _code.GetCount(); m++)
     {
       const wxString c = ModuleNumberToCode(m);
-      if (::ApriModulo(u, c) == 0)
+      if (SSA_ApriModulo(u, c) == 0)
       {
         _module.set(m);
-        ::ChiudiModulo(u, c);
+        SSA_ChiudiModulo(u, c);
         unsigned short& mu = _user[m];
         mu = ComputeMaxUsers(m);
         if (mu > _max_users && mu < 128)
@@ -713,7 +711,7 @@ bool TDongle::ssa_login(bool WXUNUSED(test_all_dongles))
 
 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++)
     {
       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;
     }
     for (short i = 0; i < n; i++)
     {
       u.Printf("DummyDongle:%d", i);
-      ::Logout(u, "Campo");
+      SSA_Logout(u, "Campo");
     }
   }
   return n < 32 ? n : -1;
@@ -1095,7 +1093,7 @@ bool TDongle::OpenModule(size_t module)
   {
     const wxString u = GetSessionId();
     const wxString m = ModuleNumberToCode(module);
-    if (::ApriModulo(u, m) != 0)
+    if (SSA_ApriModulo(u, m) != 0)
       return false;
   }
 
diff --git a/server/server.rc b/server/server.rc
index da37be4e2..a6017dde4 100755
--- a/server/server.rc
+++ b/server/server.rc
@@ -1,4 +1,4 @@
-soap ICON "soap.ico"
+soap ICON "../res/CampoSrv.ico"
 #include "wx/msw/wx.rc"
 
 
diff --git a/server/servers.ini b/server/servers.ini
index 275c48fe1..e7bafc442 100755
--- a/server/servers.ini
+++ b/server/servers.ini
@@ -7,20 +7,6 @@ Run=authoriz.exe
 Port=1883
 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]
 Icon=diction.gif
 Run=diction.exe
@@ -29,13 +15,6 @@ Dictionary=english.xml
 LogFile=
 LogVerbose=
 
-[Postman]
-Icon=postman.gif
-Run=postman.exe
-Port=8080
-LogFile=
-LogVerbose=
-
 [Lurch]
 Run=lurch.exe
 Port=10000