diff --git a/GeoIP/GeoIP_143.vcxproj b/GeoIP/GeoIP_143.vcxproj index 456e26378..37127c326 100644 --- a/GeoIP/GeoIP_143.vcxproj +++ b/GeoIP/GeoIP_143.vcxproj @@ -22,7 +22,7 @@ GeoIP {DFAB04E0-9275-42FB-BCBB-2F153EB7D253} GeoIP - 10.0.19041.0 + 10.0 diff --git a/HashLib/HashLib_143.vcxproj b/HashLib/HashLib_143.vcxproj index b1661e392..12a090036 100644 --- a/HashLib/HashLib_143.vcxproj +++ b/HashLib/HashLib_143.vcxproj @@ -23,7 +23,7 @@ {196C99FC-9A4E-421F-B44C-8E3FD177122F} HashLib Win32Proj - 10.0.19041.0 + 10.0 diff --git a/MiniUPnPc/MiniUPnPc_143.vcxproj b/MiniUPnPc/MiniUPnPc_143.vcxproj index 51e581464..1613e268a 100644 --- a/MiniUPnPc/MiniUPnPc_143.vcxproj +++ b/MiniUPnPc/MiniUPnPc_143.vcxproj @@ -23,7 +23,7 @@ Win32Proj MiniUPnPc MiniUPnPc - 10.0.19041.0 + 10.0 diff --git a/RegExp/RegExp_143.vcxproj b/RegExp/RegExp_143.vcxproj index b7cd6f63d..50e66b986 100644 --- a/RegExp/RegExp_143.vcxproj +++ b/RegExp/RegExp_143.vcxproj @@ -23,7 +23,7 @@ {71284D5B-49F0-46FA-9C8B-C887C119738D} RegExp Win32Proj - 10.0.19041.0 + 10.0 diff --git a/TorrentWizard/TorrentWizard_143.vcxproj b/TorrentWizard/TorrentWizard_143.vcxproj index b29476361..70b391ea6 100644 --- a/TorrentWizard/TorrentWizard_143.vcxproj +++ b/TorrentWizard/TorrentWizard_143.vcxproj @@ -23,7 +23,7 @@ {F02EDE36-E2AC-40E8-B6DC-76B1D53F9A5A} TorrentWizard MFCProj - 10.0.19041.0 + 10.0 @@ -309,4 +309,4 @@ - + \ No newline at end of file diff --git a/bzlib/bzlib_143.vcxproj b/bzlib/bzlib_143.vcxproj index 847a2a097..a27ed6f4d 100644 --- a/bzlib/bzlib_143.vcxproj +++ b/bzlib/bzlib_143.vcxproj @@ -23,7 +23,7 @@ {A14F5E46-C04C-4F32-9985-2E15819A722A} bzlib Win32Proj - 10.0.19041.0 + 10.0 diff --git a/plugins/7ZipBuilder/7ZipBuilder_143.vcxproj b/plugins/7ZipBuilder/7ZipBuilder_143.vcxproj index d618f9bc1..4a93cf7dc 100644 --- a/plugins/7ZipBuilder/7ZipBuilder_143.vcxproj +++ b/plugins/7ZipBuilder/7ZipBuilder_143.vcxproj @@ -23,7 +23,7 @@ {B69F80CD-FB15-45E8-B359-92A41CC571A7} 7ZipBuilder AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/DocumentReader/DocumentReader_143.vcxproj b/plugins/DocumentReader/DocumentReader_143.vcxproj index b527edf7a..30ab143e2 100644 --- a/plugins/DocumentReader/DocumentReader_143.vcxproj +++ b/plugins/DocumentReader/DocumentReader_143.vcxproj @@ -23,7 +23,7 @@ {0B9C08B4-0C49-4473-B46A-A0291FA844E8} DocumentReader AtlProj - 10.0.19041.0 + 10.0 @@ -366,4 +366,4 @@ - + \ No newline at end of file diff --git a/plugins/GFLImageServices/GFLImageServices_143.vcxproj b/plugins/GFLImageServices/GFLImageServices_143.vcxproj index afc64c6de..ca84f16d2 100644 --- a/plugins/GFLImageServices/GFLImageServices_143.vcxproj +++ b/plugins/GFLImageServices/GFLImageServices_143.vcxproj @@ -23,7 +23,7 @@ {4B685EDA-C0D9-43E9-8822-9CA35947C11B} GFLImageServices AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/GFLLibraryBuilder/GFLLibraryBuilder_143.vcxproj b/plugins/GFLLibraryBuilder/GFLLibraryBuilder_143.vcxproj index cf0eaad83..f13cd757b 100644 --- a/plugins/GFLLibraryBuilder/GFLLibraryBuilder_143.vcxproj +++ b/plugins/GFLLibraryBuilder/GFLLibraryBuilder_143.vcxproj @@ -23,7 +23,7 @@ {76CC356F-EFFD-4926-8DB3-D54AF496D431} GFLLibraryBuilder AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/ImageViewer/ImageViewer_143.vcxproj b/plugins/ImageViewer/ImageViewer_143.vcxproj index 6bb13fcdd..0a202f052 100644 --- a/plugins/ImageViewer/ImageViewer_143.vcxproj +++ b/plugins/ImageViewer/ImageViewer_143.vcxproj @@ -23,7 +23,7 @@ {DBF979BF-E64E-402E-AE56-ACF58E543C38} ImageViewer AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/MediaImageServices/MediaImageServices_143.vcxproj b/plugins/MediaImageServices/MediaImageServices_143.vcxproj index b886a73d2..793b5712c 100644 --- a/plugins/MediaImageServices/MediaImageServices_143.vcxproj +++ b/plugins/MediaImageServices/MediaImageServices_143.vcxproj @@ -23,7 +23,7 @@ {4351215D-CBA6-4F34-A99E-2FA87F969CA5} MediaImageServices AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/MediaLibraryBuilder/MediaLibraryBuilder_143.vcxproj b/plugins/MediaLibraryBuilder/MediaLibraryBuilder_143.vcxproj index e4da7eb20..ffc1c0bb9 100644 --- a/plugins/MediaLibraryBuilder/MediaLibraryBuilder_143.vcxproj +++ b/plugins/MediaLibraryBuilder/MediaLibraryBuilder_143.vcxproj @@ -23,7 +23,7 @@ {6591E1B2-D3E7-4B83-9A40-67AC0E98B255} MediaLibraryBuilder AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/MediaPlayer/MediaPlayer_143.vcxproj b/plugins/MediaPlayer/MediaPlayer_143.vcxproj index 57d9a373c..a502c40de 100644 --- a/plugins/MediaPlayer/MediaPlayer_143.vcxproj +++ b/plugins/MediaPlayer/MediaPlayer_143.vcxproj @@ -23,7 +23,7 @@ {10123040-AFB5-4741-9548-36C6B7B337C4} MediaPlayer AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/Preview/Preview_143.vcxproj b/plugins/Preview/Preview_143.vcxproj index 4976c491b..141d857db 100644 --- a/plugins/Preview/Preview_143.vcxproj +++ b/plugins/Preview/Preview_143.vcxproj @@ -23,7 +23,7 @@ {2209B566-8043-49BF-81B5-4C171E1E5EB1} Preview AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/RatDVDPlugin/RatDVDReader_143.vcxproj b/plugins/RatDVDPlugin/RatDVDReader_143.vcxproj index 40bd1bde2..aa8928c44 100644 --- a/plugins/RatDVDPlugin/RatDVDReader_143.vcxproj +++ b/plugins/RatDVDPlugin/RatDVDReader_143.vcxproj @@ -23,7 +23,7 @@ {86944913-9269-4B41-AA2F-C2A37E68C50E} RatDVDReader AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/RazaWebHook/RazaWebHook32_143.vcxproj b/plugins/RazaWebHook/RazaWebHook32_143.vcxproj index 6653d9214..7389bab8e 100644 --- a/plugins/RazaWebHook/RazaWebHook32_143.vcxproj +++ b/plugins/RazaWebHook/RazaWebHook32_143.vcxproj @@ -23,7 +23,7 @@ {7030A905-13CF-40FF-A7CC-9FBA3B6EDF92} RazaWebHook32 AtlProj - 10.0.19041.0 + 10.0 @@ -324,4 +324,4 @@ - + \ No newline at end of file diff --git a/plugins/RazaWebHook/RazaWebHook64_143.vcxproj b/plugins/RazaWebHook/RazaWebHook64_143.vcxproj index a055c1a3c..351c7f498 100644 --- a/plugins/RazaWebHook/RazaWebHook64_143.vcxproj +++ b/plugins/RazaWebHook/RazaWebHook64_143.vcxproj @@ -23,7 +23,7 @@ {3001CCC3-3996-410c-A5C5-4D04D3A8A4AB} RazaWebHook64 AtlProj - 10.0.19041.0 + 10.0 @@ -324,4 +324,4 @@ - + \ No newline at end of file diff --git a/plugins/SWFPlugin/SWFPlugin_143.vcxproj b/plugins/SWFPlugin/SWFPlugin_143.vcxproj index c6b765431..994eae570 100644 --- a/plugins/SWFPlugin/SWFPlugin_143.vcxproj +++ b/plugins/SWFPlugin/SWFPlugin_143.vcxproj @@ -23,7 +23,7 @@ {4491782A-4BD5-45E3-AD2F-F03EE6CE3F9E} SWFPlugin AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/SearchExport/SearchExport_143.vcxproj b/plugins/SearchExport/SearchExport_143.vcxproj index fa6aef729..9af30fad6 100644 --- a/plugins/SearchExport/SearchExport_143.vcxproj +++ b/plugins/SearchExport/SearchExport_143.vcxproj @@ -23,7 +23,7 @@ {5386DFF4-2E92-4932-8706-AB5BD79E04FE} SearchExport AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/ShortURL/ShortURL_143.vcxproj b/plugins/ShortURL/ShortURL_143.vcxproj index 5f6850b64..5f140d332 100644 --- a/plugins/ShortURL/ShortURL_143.vcxproj +++ b/plugins/ShortURL/ShortURL_143.vcxproj @@ -23,7 +23,7 @@ {D7D7FE07-A029-4B4D-A92E-7A25503F08EE} ShortURL AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/SkinScanSKS/SkinScanSKS_143.vcxproj b/plugins/SkinScanSKS/SkinScanSKS_143.vcxproj index e193c186f..213bc050c 100644 --- a/plugins/SkinScanSKS/SkinScanSKS_143.vcxproj +++ b/plugins/SkinScanSKS/SkinScanSKS_143.vcxproj @@ -23,7 +23,7 @@ {A4F1E383-B493-4580-8DB6-5CC89CBAAC53} SkinScanSKS AtlProj - 10.0.19041.0 + 10.0 @@ -385,4 +385,4 @@ - + \ No newline at end of file diff --git a/plugins/VirusTotal/VirusTotal_143.vcxproj b/plugins/VirusTotal/VirusTotal_143.vcxproj index bf07cd4c8..1471ab37d 100644 --- a/plugins/VirusTotal/VirusTotal_143.vcxproj +++ b/plugins/VirusTotal/VirusTotal_143.vcxproj @@ -23,7 +23,7 @@ {F61F2F18-7F7A-4C44-8762-8D4565CC987F} VirusTotal AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/WindowsThumbnail/WindowsThumbnail_143.vcxproj b/plugins/WindowsThumbnail/WindowsThumbnail_143.vcxproj index 3e5bffc90..2919f697d 100644 --- a/plugins/WindowsThumbnail/WindowsThumbnail_143.vcxproj +++ b/plugins/WindowsThumbnail/WindowsThumbnail_143.vcxproj @@ -23,7 +23,7 @@ {A3CA6023-3655-4BBB-95CC-5ED4EA8075C8} WindowsThumbnail AtlProj - 10.0.19041.0 + 10.0 diff --git a/plugins/ZIPBuilder/ZIPBuilder_143.vcxproj b/plugins/ZIPBuilder/ZIPBuilder_143.vcxproj index a6ca6c859..4b7cf4b74 100644 --- a/plugins/ZIPBuilder/ZIPBuilder_143.vcxproj +++ b/plugins/ZIPBuilder/ZIPBuilder_143.vcxproj @@ -23,7 +23,7 @@ {2F74AA28-2498-4805-911A-04C39858D529} ZIPBuilder AtlProj - 10.0.19041.0 + 10.0 @@ -376,4 +376,4 @@ - + \ No newline at end of file diff --git a/shareaza/Shareaza.h b/shareaza/Shareaza.h index 561b9007a..7afecbbe6 100644 --- a/shareaza/Shareaza.h +++ b/shareaza/Shareaza.h @@ -452,6 +452,7 @@ __int64 GetRandomNum<__int64>(const __int64& min, const __int64& max); #define WEB_SITE "https://github.com/ansani/Shareaza/releases" #define WEB_SITE_T _T( WEB_SITE ) +#define CONNECTION_SITE_T _T("https://connectiontest.kirurusec.com/") // URLs used by Shareaza // ----------------------------------------------------------------------- diff --git a/shareaza/Shareaza_143.vcxproj b/shareaza/Shareaza_143.vcxproj index df25d9479..417cc1217 100644 --- a/shareaza/Shareaza_143.vcxproj +++ b/shareaza/Shareaza_143.vcxproj @@ -23,7 +23,7 @@ {F9C719B3-35FB-427D-A795-91105DFECAAF} Shareaza MFCProj - 10.0.19041.0 + 10.0 diff --git a/shareaza/WndMain.cpp b/shareaza/WndMain.cpp index 2606f925f..00743f4a5 100644 --- a/shareaza/WndMain.cpp +++ b/shareaza/WndMain.cpp @@ -2910,8 +2910,8 @@ void CMainWnd::OnHelpFaq() void CMainWnd::OnHelpConnectiontest() { CString strWebSite; - strWebSite.Format( _T("%shelp/test/?port=%u&lang=%s&Version=%s"), - WEB_SITE_T, Settings.Connection.InPort, + strWebSite.Format( _T("%s?port=%u&lang=%s&Version=%s"), + CONNECTION_SITE_T, Settings.Connection.InPort, (LPCTSTR)Settings.General.Language, (LPCTSTR)theApp.m_sVersion ); ShellExecute( GetSafeHwnd(), _T("open"), strWebSite, NULL, NULL, SW_SHOWNORMAL ); diff --git a/shareaza/revision.js b/shareaza/revision.js index 5f812c1d4..d9392819f 100644 --- a/shareaza/revision.js +++ b/shareaza/revision.js @@ -22,58 +22,30 @@ // This scipt compares current directory revision and revision saved in // revision.h file using TortoiseSVN COM-interface. +// #TODO: Fix the revision + var fso = WScript.CreateObject( "Scripting.FileSystemObject" ); var fpath = fso.GetAbsolutePathName( "." ) var fname = fso.GetAbsolutePathName( "revision.h" ); -var revision, date, changed; -try -{ - var rev = new ActiveXObject( "SubWCRev.object" ); - rev.GetWCInfo( fpath, 0, 0 ); - revision = rev.Revision; - changed = rev.HasModifications; - revision += changed ? "M" : ""; - date = rev.Date; - WScript.Echo( "Current revision \"" + revision + "\" at \"" + date + "\""); -} -catch(e) -{ - WScript.Echo( "TortoiseSVN COM-interface failed. (Re)Install it from: http://tortoisesvn.net/" ); - WScript.Quit( 1 ); -} +var date = Date.now; +var revision = "TODO:FIX" -var modified; try { - var tsr = fso.OpenTextFile( fname, 1, false ); - modified = tsr.ReadLine().substr( 7 ); // Parsing "// rev.XXXXX" - tsr.Close(); + var tsw = fso.OpenTextFile( fname, 2, true ); + tsw.WriteLine( "// rev." + revision ); + tsw.WriteLine( "" ); + tsw.WriteLine( "#pragma once" ); + tsw.WriteLine( "" ); + tsw.WriteLine( "#define __REVISION__\t\t\"" + revision + "\"" ); + tsw.WriteLine( "#define __REVISION_DATE__\t\"" + date + "\"" ); + tsw.Close(); } catch(e) { + WScript.Echo( "Update failed: \"" + fname + "\"" ); + WScript.Quit( 1 ); } -if ( revision != modified ) -{ - WScript.Echo( "Updating from \"" + modified + "\" to \"" + revision + "\"..."); - try - { - var tsw = fso.OpenTextFile( fname, 2, true ); - tsw.WriteLine( "// rev." + revision ); - tsw.WriteLine( "" ); - tsw.WriteLine( "#pragma once" ); - tsw.WriteLine( "" ); - tsw.WriteLine( "#define __REVISION__\t\t\"" + revision + "\"" ); - tsw.WriteLine( "#define __REVISION_DATE__\t\"" + date + "\"" ); - tsw.Close(); - } - catch(e) - { - WScript.Echo( "Update failed: \"" + fname + "\"" ); - WScript.Quit( 1 ); - } -} -else - WScript.Echo( "Already up to date." ); WScript.Quit( 0 ); diff --git a/skin-installer/Skin_143.vcxproj b/skin-installer/Skin_143.vcxproj index 423460f8a..0cb5d6fe7 100644 --- a/skin-installer/Skin_143.vcxproj +++ b/skin-installer/Skin_143.vcxproj @@ -22,7 +22,7 @@ Skin {CAA6FCC8-27B1-42B9-B647-976E7BE79C70} Skin - 10.0.19041.0 + 10.0 @@ -253,4 +253,4 @@ - + \ No newline at end of file diff --git a/sqlite3/sqlite3_143.vcxproj b/sqlite3/sqlite3_143.vcxproj index 10272845a..514a87de1 100644 --- a/sqlite3/sqlite3_143.vcxproj +++ b/sqlite3/sqlite3_143.vcxproj @@ -23,7 +23,7 @@ {0A0B10C7-CDF6-4A48-8F7B-B66A88154AAE} sqlite3 Win32Proj - 10.0.19041.0 + 10.0