Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: Shared/PluginSettings.cpp

Issue 9422198: Exe updater support and bug fixes (Closed)
Patch Set: Created Feb. 28, 2013, 10:37 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Shared/PluginClassThread.cpp ('k') | Shared/PluginUserSettings.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include <Wbemidl.h> 3 #include <Wbemidl.h>
4 #include <time.h> 4 #include <time.h>
5 #include "PluginIniFileW.h" 5 #include "PluginIniFileW.h"
6 #include "PluginIniFile.h" 6 #include "PluginIniFile.h"
7 #include "PluginSettings.h" 7 #include "PluginSettings.h"
8 #include "PluginDictionary.h" 8 #include "PluginDictionary.h"
9 #include "PluginClient.h" 9 #include "PluginClient.h"
10 #include "PluginChecksum.h" 10 #include "PluginChecksum.h"
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 CString filename = ""; 428 CString filename = "";
429 if (fni != fileNamesList.end()) 429 if (fni != fileNamesList.end())
430 { 430 {
431 filename = fni->second; 431 filename = fni->second;
432 } 432 }
433 else 433 else
434 { 434 {
435 filename = downloadFilterName.Trim().Right(downloadFilte rName.GetLength() - downloadFilterName.ReverseFind('/') - 1).Trim(); 435 filename = downloadFilterName.Trim().Right(downloadFilte rName.GetLength() - downloadFilterName.ReverseFind('/') - 1).Trim();
436 } 436 }
437 int version = it->second; 437 int version = it->second;
438
439 DEBUG_GENERAL("*** before FilterShouldLoad: " + downloadFilterNa me);
440
438 if ((this->FilterShouldLoad(downloadFilterName))) 441 if ((this->FilterShouldLoad(downloadFilterName)))
439 { 442 {
440 filterAvailable = true; 443 filterAvailable = true;
444 DEBUG_GENERAL("*** before FilterlistExpired: " + downloa dFilterName);
441 if (this->FilterlistExpired(downloadFilterName)) 445 if (this->FilterlistExpired(downloadFilterName))
442 { 446 {
447 DEBUG_GENERAL("*** before DownloadFilterFile: " + downloadFilterName);
443 CPluginFilter::DownloadFilterFile(downloadFilter Name, filename); 448 CPluginFilter::DownloadFilterFile(downloadFilter Name, filename);
444 this->SetFilterRefreshDate(downloadFilterName, t ime(NULL) + (5 * 24 * 60 * 60) * ((rand() % 100) / 100 * 0.4 + 0.8)); 449 this->SetFilterRefreshDate(downloadFilterName, t ime(NULL) + (5 * 24 * 60 * 60) * ((rand() % 100) / 100 * 0.4 + 0.8));
445 } 450 }
446 } 451 }
447 else 452 else
448 { 453 {
449 //Cleanup, since we don't need the filter definition 454 //Cleanup, since we don't need the filter definition
450 DeleteFile(CPluginSettings::GetDataPath(filename)); 455 DeleteFile(CPluginSettings::GetDataPath(filename));
451 this->SetFilterRefreshDate(downloadFilterName, 0); 456 this->SetFilterRefreshDate(downloadFilterName, 0);
452 } 457 }
(...skipping 1786 matching lines...) Expand 10 before | Expand all | Expand 10 after
2239 osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); 2244 osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
2240 bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi); 2245 bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
2241 2246
2242 m_WindowsBuildNumber = osvi.dwBuildNumber; 2247 m_WindowsBuildNumber = osvi.dwBuildNumber;
2243 } 2248 }
2244 2249
2245 return m_WindowsBuildNumber; 2250 return m_WindowsBuildNumber;
2246 } 2251 }
2247 2252
2248 #endif // SUPPORT_WHITELIST 2253 #endif // SUPPORT_WHITELIST
OLDNEW
« no previous file with comments | « Shared/PluginClassThread.cpp ('k') | Shared/PluginUserSettings.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld