From 572b2a2ff38510f2282996c70b5e578fab7948fc Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 8 Nov 2014 15:06:02 +0000 Subject: removed not used info about weather ini files git-svn-id: http://svn.miranda-ng.org/main/trunk@10928 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/VersionInfo/src/CVersionInfo.cpp | 81 -------------------------------- plugins/VersionInfo/src/CVersionInfo.h | 2 - 2 files changed, 83 deletions(-) (limited to 'plugins') diff --git a/plugins/VersionInfo/src/CVersionInfo.cpp b/plugins/VersionInfo/src/CVersionInfo.cpp index 29b77f68af..ff6acb98b9 100644 --- a/plugins/VersionInfo/src/CVersionInfo.cpp +++ b/plugins/VersionInfo/src/CVersionInfo.cpp @@ -429,80 +429,6 @@ bool CVersionInfo::GetLangpackInfo() return true; } -/*bool CVersionInfo::GetWeatherInfo() -{ - TCHAR path[MAX_PATH]; - GetModuleFileName(NULL, path, MAX_PATH); - - LPTSTR fname = _tcsrchr(path, TEXT('\\')); - if (fname == NULL) - fname = path; - _tcscat(fname, _T("\\plugins\\weather\\*.ini")); - - WIN32_FIND_DATA FindFileData; - HANDLE hFind = FindFirstFile(path, &FindFileData); - if (hFind == INVALID_HANDLE_VALUE) return; - - do - { - if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; - - crs_sntprintf(fname, MAX_PATH-(fname-path), TEXT("\\plugins\\weather\\%s"), FindFileData.cFileName); - HANDLE hDumpFile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hDumpFile != INVALID_HANDLE_VALUE) - { - char buf[8192]; - - DWORD bytes = 0; - ReadFile(hDumpFile, buf, 8190, &bytes, NULL); - buf[bytes] = 0; - - char* ver = strstr(buf, "Version="); - if (ver != NULL) - { - char *endid = strchr(ver, '\r'); - if (endid != NULL) *endid = 0; - else - { - endid = strchr(ver, '\n'); - if (endid != NULL) *endid = 0; - } - ver += 8; - } - - char *id = strstr(buf, "Name="); - if (id != NULL) - { - char *endid = strchr(id, '\r'); - if (endid != NULL) *endid = 0; - else - { - endid = strchr(id, '\n'); - if (endid != NULL) *endid = 0; - } - id += 5; - } - - TCHAR timebuf[30] = TEXT(""); - GetLastWriteTime(&FindFileData.ftLastWriteTime, timebuf, 30); - - - static const TCHAR format[] = TEXT(" %s v.%s%S%s [%s] - %S\r\n"); - - buffer.appendfmt(format, FindFileData.cFileName, - (flags & VI_FLAG_FORMAT) ? TEXT("[b]") : TEXT(""), - ver, - (flags & VI_FLAG_FORMAT) ? TEXT("[/b]") : TEXT(""), - timebuf, id); - CloseHandle(hDumpFile); - } - } - while (FindNextFile(hFind, &FindFileData)); - FindClose(hFind); -}*/ - std::tstring GetPluginTimestamp(FILETIME *fileTime) { SYSTEMTIME sysTime; @@ -529,7 +455,6 @@ bool CVersionInfo::GetPluginLists() DWORD loadError; // SYSTEMTIME sysTime; //for timestamp - bWeatherPlugin = false; mirandaVersion = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0); { GetModuleFileName(GetModuleHandle(NULL), szMirandaPath, SIZEOF(szMirandaPath)); @@ -554,9 +479,6 @@ bool CVersionInfo::GetPluginLists() if (!ValidExtension(fd.cFileName, _T("dll"))) continue; //do not report plugins that do not have extension .dll - if (_tcsicmp(fd.cFileName, _T("weather.dll")) == 0) - bWeatherPlugin = true; - hInstPlugin = GetModuleHandle(fd.cFileName); //try to get the handle of the module if (hInstPlugin) //if we got it then the dll is loaded (enabled) @@ -950,9 +872,6 @@ std::tstring CVersionInfo::GetInformationsAsString(int bDisableForumStyle) { out.append(GetListAsString(listUnloadablePlugins, flags, beautify)); BeautifyReport(beautify, normalPluginsEnd, _T(""), out); } - if (bWeatherPlugin) { - out.append(_T("\r\nWeather ini files:\r\n-------------------------------------------------------------------------------\r\n")); - } AddInfoFooter(suppressHeader, forumStyle, beautify, out); return out; diff --git a/plugins/VersionInfo/src/CVersionInfo.h b/plugins/VersionInfo/src/CVersionInfo.h index 11eadb078f..6bff2dd8bd 100644 --- a/plugins/VersionInfo/src/CVersionInfo.h +++ b/plugins/VersionInfo/src/CVersionInfo.h @@ -61,7 +61,6 @@ class CVersionInfo unsigned int luiEvents; unsigned int luiUnreadEvents; unsigned int luiDBSize; - bool bWeatherPlugin; //Configuration bool GetLinkedModulesInfo(TCHAR *moduleName, std::tstring &linkedModules); @@ -78,7 +77,6 @@ class CVersionInfo bool GetLangpackInfo(); bool GetPluginLists(); bool GetEventCount(); //TODO - bool GetWeatherInfo(); //OSInformations bool GetOSVersion(); bool GetHWSettings(); -- cgit v1.2.3