diff --git a/setup/aga.ico b/setup/aga.ico deleted file mode 100755 index 4069588e4..000000000 Binary files a/setup/aga.ico and /dev/null differ diff --git a/setup/agaCln.ico b/setup/agaCln.ico deleted file mode 100755 index 0249fd93b..000000000 Binary files a/setup/agaCln.ico and /dev/null differ diff --git a/setup/agaCln_256.ico b/setup/agaCln_256.ico deleted file mode 100755 index c8bed3199..000000000 Binary files a/setup/agaCln_256.ico and /dev/null differ diff --git a/setup/agaSrv.ico b/setup/agaSrv.ico deleted file mode 100755 index d11670fc4..000000000 Binary files a/setup/agaSrv.ico and /dev/null differ diff --git a/setup/agaSrv_256.ico b/setup/agaSrv_256.ico deleted file mode 100755 index a02e42dc4..000000000 Binary files a/setup/agaSrv_256.ico and /dev/null differ diff --git a/setup/aga_256.ico b/setup/aga_256.ico deleted file mode 100755 index 50ed0cf3b..000000000 Binary files a/setup/aga_256.ico and /dev/null differ diff --git a/setup/dninst.txt b/setup/dninst.txt index aae1d64e1..095f789f8 100755 --- a/setup/dninst.txt +++ b/setup/dninst.txt @@ -10,9 +10,9 @@ Owner=PrassiNapoli OEM=0 MustCall=22-09-2011 [202] -pl2001 -?=31-12-2012 +pl2001 -?=31-12-3000 Owner=Tassan -pl1048 -?=31-12-2012 +pl1048 -?=31-12-3000 OEM=4 [203] Owner=Com.Int. Srl @@ -62,7 +62,7 @@ Owner=GeiSoft OEM=3 MustCall=22-09-2011 [405] -Owner=Francesco chicazzoe'? +Owner=Francesco OEM=3 MustCall=22-09-2011 [406] @@ -131,6 +131,9 @@ OEM=8 [803] Owner=Meta Calabria (ex-prassi calabria) OEM=8 +[883] +Owner=Roberto Corradi (Prove) +OEM=1 [1005] Owner=Nuova Gafm OEM=0 @@ -338,7 +341,6 @@ OEM=1 Owner=THUGA LAGHI S.R.L. OEM=1 [5920] -*=31-12-2008 Owner=MEDIA PADANIA SRL OEM=1 [5934] @@ -1509,7 +1511,7 @@ MustCall=20-09-2011 Owner=F.LLI BARONCHELLI SRL OEM=1 [7974] -Owner=IMMOBILVAL SRL +Owner=TREVIT SRL OEM=1 [7975] Owner=IMMOBILVAL SRL @@ -1997,6 +1999,9 @@ MustCall=31-12-2010 *=31-12-2008 Owner=AGENZIA RADIO TRAFFIC S.R.L OEM=1 +[8424] +Owner=ASSOCIAZIONE COMP. OPERE MILANO +OEM=1 [8430] Owner=NEW LIFE S.R.L. OEM=1 @@ -2038,6 +2043,7 @@ Owner=Habilita OEM=1 pd6342 -?=31-12-3000 [8452] +*=31-12-2012 Owner=T e CS SERVICES SRL OEM=1 [8453] @@ -2525,7 +2531,6 @@ OEM=1 [8683] Owner=Panificio Campari OEM=0 -MustCall=31-12-2011 [8685] Owner=Violetti Arnaldo OEM=0 @@ -2955,8 +2960,10 @@ OEM=1 Owner=LIG OEM=1 [8854] -Owner=New Cleaning -OEM=2 +pl2001 -?=31-12-3000 +Owner=Tassan +pl1048 -?=31-12-3000 +OEM=4 [8855] Owner=Hard Soft Team srl OEM=1 @@ -3072,8 +3079,9 @@ OEM=4 Owner=BILA STORE SRL OEM=1 [8892] -Owner=LeMura lavanderia -OEM=4 +Owner=Martina per l'infanzia +OEM=1 +MustCall=31-01-2013 [8893] Owner=Perfetta Soc. Coopertativa OEM=1 @@ -3087,8 +3095,7 @@ OEM=1 Owner=Perfetta Soc. Coopertativa OEM=1 [8897] -*=31-12-2011 -Owner=ComTek +Owner=ALPS SOC. COOP. ARL OEM=1 [8898] Owner=SICIM SPA @@ -3150,8 +3157,9 @@ OEM=1 Owner=Nuova Sant'Ambrogio Srl OEM=1 [8921] -Owner=Tassan II(la mummia!) -OEM=4 +Owner=Martina per l'infanzia +OEM=1 +MustCall=31-01-2013 [8922] Owner=SICIM SPA OEM=1 @@ -3287,6 +3295,9 @@ OEM=8 [8975] Owner=Petrolo Santina OEM=8 +[8976] +Owner=CALOR CASA SAS +OEM=8 [8989] Owner=Guimatrag OEM=0 @@ -3400,6 +3411,12 @@ OEM=1 pd0300 -0=31-12-3000 Owner=Dassi OEM=1 +[12001] +Owner=LAM S. AMBROGIO +OEM=1 +[12002] +Owner=IL CARRO-COOP SOCIALE ONLUS +OEM=1 [20006] Owner=SMEG spa OEM=0 diff --git a/setup/utils.cpp b/setup/utils.cpp index 7db1a3844..162b566ce 100755 --- a/setup/utils.cpp +++ b/setup/utils.cpp @@ -394,7 +394,7 @@ bool CampoIniFile::GetNextGroup(wxString& strGroup, long& nIndex) bool CampoIniFile::DeleteGroup(const wxString strGroup) { - return WritePrivateProfileString(m_strGroup, NULL, NULL, m_strIniName) != 0; + return ::WritePrivateProfileString(m_strGroup, NULL, NULL, m_strIniName) != 0; } bool CampoIniFile::GetFirstEntry(wxString& strEntry, long& nIndex) @@ -449,7 +449,7 @@ bool CampoIniFile::GetBool(const wxString strVariable) const int CampoIniFile::GetInt(const wxString strVariable) const { - return atoi(Get(strVariable)); + return wxAtoi(Get(strVariable)); } bool CampoIniFile::Set(const wxString strVariable, const wxString strValue) @@ -528,7 +528,7 @@ void CheckAndMakeDir(const wxString& strDir, const wxString& strMsg) strError += strMsg; strError += " "; strError += strCartella; - strError += "\nAssicurarsi di avere il permesso di scrittura sul disco e che vi sia spazio a sufficienza"; + strError += "\nAssicurarsi di avere i permessi di scrittura e che vi sia spazio a sufficienza"; ErrorBox(strMsg); return; } @@ -555,14 +555,12 @@ bool CopiaFile(const wxString& strFileSrc, const wxString& strFileDest) bool ok = ::wxCopyFile(strFileSrc, strFileDest); if(ok) { -#ifdef WIN32 DWORD dwFileAttribs = ::GetFileAttributes(strFileDest); if (dwFileAttribs & FILE_ATTRIBUTE_READONLY) { dwFileAttribs &= ~FILE_ATTRIBUTE_READONLY; ::SetFileAttributes(strFileDest, dwFileAttribs); } -#endif } else {