From 67791b207f8965759200625242b65ae956648594 Mon Sep 17 00:00:00 2001 From: luca Date: Tue, 15 Dec 2009 11:55:49 +0000 Subject: [PATCH] =?UTF-8?q?Patch=20level=20=20=20=20=20=20=20=20=20:10.0?= =?UTF-8?q?=20Files=20correlati=20=20=20=20=20:=20Ricompilazione=20Demo=20?= =?UTF-8?q?:=20[=20]=20Commento=20=20=20=20=20=20=20=20=20=20=20=20:=20Pro?= =?UTF-8?q?cedura=20di=20salvataggio=20del=20corrente=20OEM=20(reseller)?= =?UTF-8?q?=20del=20prg=20gi=C3=A0=20installato;=20in=20questo=20modo=20an?= =?UTF-8?q?che=20mandando=20un=20CD=20AGA=20(che=20generalmente=20funziona?= =?UTF-8?q?!)=20ad=20un=20cliente=20di=20un=20distributore=20non=20AGA,=20?= =?UTF-8?q?il=20reseller=20.a=20video=20non=20cambia.=20Per=20cambiare=20r?= =?UTF-8?q?eseller=20si=20dovr=C3=A0=20intervenire=20a=20mano=20sull'oem.i?= =?UTF-8?q?ni=20cambiando=20il=20valore=20di=20OEM=20dopo=20l'installazion?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.65.10.50/trunk@19779 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- setup/Setup.cpp | 17 +++++++++++++++++ setup/gestione_lurch_by_setup.doc | Bin 29184 -> 30720 bytes setup/key.cpp | 6 +++--- setup/key.h | 1 + setup/utils.cpp | 6 +++--- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/setup/Setup.cpp b/setup/Setup.cpp index e8942840a..c4b046e15 100755 --- a/setup/Setup.cpp +++ b/setup/Setup.cpp @@ -1227,7 +1227,21 @@ void CampoSetup::NormalSetup() { const wxString strSetupCDPath = strPrgCDPath + "/setup"; const wxString strSetupLocPath = strPrgLocPath + "/setup"; + //Procedura di salvataggio del corrente OEM (reseller) del prg già installato; in questo modo anche.. + //..mandando un CD AGA (che generalmente funziona!) ad un cliente di un distributore non AGA, il reseller.. + //..a video non cambia. Per cambiare reseller si dovrà intervenire a mano sull'oem.ini cambiando il valore.. + //..di OEM dopo l'installazione + const wxString strOemLocPath = strSetupLocPath + "/oem.ini"; + CampoIniFile CampoIniOem(strOemLocPath, "MAIN"); + const int nOldOem = CampoIniOem.GetInt("OEM"); + //svuota proprio la directory setup in modo da non coservare files indesiderati + EmptyOutDir(strOemLocPath); + //copia la directory setup da CD a locale CopyDir(strSetupCDPath, strSetupLocPath); + //rimette a posto la candela...cioè, il reseller + CampoIniOem.Set("OEM", nOldOem); + //..Fine dell'aggiornamento della cartella setup + UnzipModule(strPrgLocPath, strPrgCDPath, "sy"); UnzipModule(strPrgLocPath, strPrgCDPath, "sr"); } @@ -1418,6 +1432,9 @@ void CampoSetup::OnTimer(wxTimerEvent& WXUNUSED(e)) m_bLurchWasRunning = LurchRunning(); if (m_bLurchWasRunning) { + //cazzone + const unsigned short sCazzoni = ServerLoggedUsers("127.0.0.1"); + //fine cazzone wxString msg; msg << "Per poter aggiornare/installare il programma " << PRODUCT << " deve temporaneamente essere disattivato il gestore delle licenze!\n" diff --git a/setup/gestione_lurch_by_setup.doc b/setup/gestione_lurch_by_setup.doc index 19bd0a3b5623326e18ee0c04e94546f3e596bcc2..c805b914bc4043915d3d4cbd3377d5f65faa90d3 100755 GIT binary patch literal 30720 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 diff --git a/setup/key.cpp b/setup/key.cpp index 0ae353b8b..a8aa7bc79 100755 --- a/setup/key.cpp +++ b/setup/key.cpp @@ -211,7 +211,7 @@ static unsigned short InquireSocketNumber(wxSocketClient& sc, const wxString& st //metodo per sapere dal server di chiave quanti sono gli utonti connessi;non funziona finchè ai servers non.. //..viene aggiunto il metodo NumberActiveUsers (è qui come segnaposto futuro) -unsigned short InquireActiveUsers(const wxString& strSrvName) +unsigned short ServerLoggedUsers(const wxString& strSrvName) { unsigned short nUtonti = 0; wxIPV4address ip; @@ -220,8 +220,8 @@ unsigned short InquireActiveUsers(const wxString& strSrvName) wxSocketClient& sc = m_bordello.Zoccola(ip); if (sc.IsConnected() || sc.Connect(ip)) //il computer remoto risponde { - // quanti utonti sono appesi? - nUtonti = InquireSocketNumber(sc, "NumberActiveUsers()"); + // quante licenze sono loggate al momento (utonti connessi) + nUtonti = InquireSocketNumber(sc, "DongleLoggedLicenses"); } } return nUtonti; diff --git a/setup/key.h b/setup/key.h index 79001a88d..60ebc661f 100755 --- a/setup/key.h +++ b/setup/key.h @@ -8,6 +8,7 @@ void EncodeEutronPassword(char* str); unsigned short EutronLogin(int& year); unsigned short ServerLogin(int& year, wxString& strSrvName); +unsigned short ServerLoggedUsers(const wxString& strSrvName); bool DictionaryLogin(const wxString& strSrvName); #endif \ No newline at end of file diff --git a/setup/utils.cpp b/setup/utils.cpp index e91454638..b19cccc36 100755 --- a/setup/utils.cpp +++ b/setup/utils.cpp @@ -420,7 +420,7 @@ wxString CampoIniFile::Get(const wxString strVariable) const { wxString strOutString; char* buffer = strOutString.GetWriteBuf(256); - GetPrivateProfileString(m_strGroup, strVariable, "", buffer, 256, m_strIniName); + ::GetPrivateProfileString(m_strGroup, strVariable, "", buffer, 256, m_strIniName); strOutString.UngetWriteBuf(); //sblocca la memoria senno' la stringa resta per sempre!!! return strOutString; @@ -439,14 +439,14 @@ int CampoIniFile::GetInt(const wxString strVariable) const bool CampoIniFile::Set(const wxString strVariable, const wxString strValue) { - return WritePrivateProfileString(m_strGroup, strVariable, strValue, m_strIniName) != 0; + return ::WritePrivateProfileString(m_strGroup, strVariable, strValue, m_strIniName) != 0; } bool CampoIniFile::Set(const wxString strVariable, const int uValue) { wxString strValue; strValue << uValue; - return WritePrivateProfileString(m_strGroup, strVariable, strValue, m_strIniName) != 0; + return ::WritePrivateProfileString(m_strGroup, strVariable, strValue, m_strIniName) != 0; } //costruttore