From d2946eb5bb3692806bb67e6e8a8d981f0e599850 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 2 Aug 2012 21:21:45 +0000 Subject: removal of the rest of __DATE__ and __TIME__ git-svn-id: http://svn.miranda-ng.org/main/trunk@1332 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/!NotAdopted/SMS/main.cpp | 4 +- plugins/!NotAdopted/SmartAutoAway/saa.cpp | 12 ++-- plugins/!NotAdopted/SmartAutoAway/saani.c | 12 ++-- plugins/!NotAdopted/Tlen/tlen.c | 3 +- plugins/!NotAdopted/Tlen/tlen_czaty/mucc.cpp | 3 +- plugins/Clist_nicer/res/resource.rc | 1 - plugins/Clist_nicer/src/Include/resource.h | 1 - plugins/Clist_nicer/src/clui.cpp | 3 - .../ListeningTo/src/players/foo_mlt/foo_mlt.cpp | 20 +++--- plugins/New_GPG/src/init.cpp | 10 +-- plugins/New_GPG/src/utilities.cpp | 49 -------------- plugins/SendScreenshotPlus/res/resource.rc | 1 - plugins/SendScreenshotPlus/src/UAboutForm.cpp | 5 -- plugins/SendScreenshotPlus/src/global.h | 2 + plugins/SendScreenshotPlus/src/resource.h | 1 - plugins/SplashScreen/src/debug.h | 11 --- plugins/SplashScreen/src/main.cpp | 1 - plugins/StopSpamMod/src/init.cpp | 65 +----------------- plugins/Watrack_MPD/src/init.c | 16 +---- plugins/Watrack_MPD/src/utilities.c | 78 ---------------------- protocols/YAMN/filter/Base/maindll.cpp | 2 +- protocols/YAMN/filter/Simple/maindll.cpp | 6 +- src/core/stdhelp/about.cpp | 6 -- src/core/stdhelp/resource.rc | 1 - 24 files changed, 35 insertions(+), 278 deletions(-) diff --git a/plugins/!NotAdopted/SMS/main.cpp b/plugins/!NotAdopted/SMS/main.cpp index 64ff1a92f1..c056cbbc30 100644 --- a/plugins/!NotAdopted/SMS/main.cpp +++ b/plugins/!NotAdopted/SMS/main.cpp @@ -151,7 +151,7 @@ PLUGININFOEX pluginInfoEx={ sizeof(PLUGININFOEX), PROTOCOL_DISPLAY_NAME_ORIG" (Unicode)", PLUGIN_VERSION_DWORD, - "Send SMS text messages to mobile phones through the IM networks ("__DATE__" "__TIME__")", + "Send SMS text messages to mobile phones through the IM networks", "Richard Hughes, Improved by Ariel Shulman, rewritten by Rozhuk Ivan", "Rozhuk_I@mail.ru", "© 2001-2 Richard Hughes, 2003 Ariel Shulman, 2007-2009 Rozhuk Ivan (Rozhuk_I@mail.ru)", @@ -194,7 +194,7 @@ return(TRUE); __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - if (mirandaVersion +#include #include PLUGININFOEX pluginInfo = { @@ -55,9 +55,8 @@ __declspec(dllexport) PLUGININFOEX *MirandaPluginInfo(DWORD mirandaVersion) mirandaVersion&0xFF ); } - sprintf(description,"%s\r\n[Build %s %s]",description, __DATE__,__TIME__); pluginInfo.description = description; - return &pluginInfo; + return &pluginInfo; } __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirandaVersion) { @@ -65,7 +64,7 @@ __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD mirandaVersion) pluginInfo.cbSize = sizeof( PLUGININFOEX ); return MirandaPluginInfo(mirandaVersion); } - + extern "C" __declspec(dllexport) const MUUID interfaces[] = {MIID_IDLE, MIID_LAST}; __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void) { @@ -82,4 +81,3 @@ int __declspec(dllexport) Unload(void) // AutoAwayShutdown(0,0); return 0; //if 1 we dont want to shutdown because we have hooked ME_SYSTEM_SHUTDOWN } - diff --git a/plugins/!NotAdopted/Tlen/tlen.c b/plugins/!NotAdopted/Tlen/tlen.c index 2f8d860a64..8e062a54b0 100644 --- a/plugins/!NotAdopted/Tlen/tlen.c +++ b/plugins/!NotAdopted/Tlen/tlen.c @@ -58,7 +58,7 @@ PLUGININFOEX pluginInfoEx = { "Tlen Protocol", #endif PLUGIN_MAKE_VERSION(TLEN_MAJOR_VERSION,TLEN_MINOR_VERSION,TLEN_RELEASE_NUM,TLEN_BUILD_NUM), - "Tlen protocol plugin for Miranda IM (version: "TLEN_VERSION_STRING" ; compiled: "__DATE__" "__TIME__")", + "Tlen protocol plugin for Miranda IM (version: " TLEN_VERSION_STRING ")", "Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki", "the_leech@users.berlios.de", "(c) 2002-2012 Santithorn Bunchua, Piotr Piastucki", @@ -633,4 +633,3 @@ int __declspec(dllexport) Unload(void) { return 0; } - diff --git a/plugins/!NotAdopted/Tlen/tlen_czaty/mucc.cpp b/plugins/!NotAdopted/Tlen/tlen_czaty/mucc.cpp index e5c35c070a..7006437a2f 100644 --- a/plugins/!NotAdopted/Tlen/tlen_czaty/mucc.cpp +++ b/plugins/!NotAdopted/Tlen/tlen_czaty/mucc.cpp @@ -47,7 +47,7 @@ PLUGININFOEX pluginInfoEx = { "Tlen Czaty", #endif PLUGIN_MAKE_VERSION(MUCC_MAJOR_VERSION,MUCC_MINOR_VERSION,MUCC_RELEASE_NUM,MUCC_BUILD_NUM), - "Group chats GUI plugin for Miranda IM (formerly known as mucc.dll) (version: "MUCC_VERSION_STRING" ; compiled: "__DATE__" "__TIME__")", + "Group chats GUI plugin for Miranda IM (formerly known as mucc.dll) (version: " MUCC_VERSION_STRING ")", "Piotr Piastucki", "the_leech@users.berlios.de", "(c) 2004-2012 Piotr Piastucki", @@ -185,4 +185,3 @@ extern "C" int __declspec(dllexport) Unload(void) { return 0; } - diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc index 089dc0f5b4..3c3541a321 100644 --- a/plugins/Clist_nicer/res/resource.rc +++ b/plugins/Clist_nicer/res/resource.rc @@ -106,7 +106,6 @@ BEGIN CTEXT "Copyright © 2004-2010 by the Miranda IM project, 2012 by the Miranda NG project. More detailed copyright information can be found in the included README file.",IDC_COPYRIGHT,5,39,217,47 ICON 0,IDC_LOGO,201,2,20,20 LTEXT "Version",IDC_VERSION,5,19,150,15 - CTEXT "build time",IDC_BUILDTIME,37,105,150,11 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,117,228,1 CONTROL "Support and latest version information",IDC_SUPPORT, "Hyperlink",WS_TABSTOP | 0x1,18,91,192,12 diff --git a/plugins/Clist_nicer/src/Include/resource.h b/plugins/Clist_nicer/src/Include/resource.h index a2b1f5a072..0512a0dda0 100644 --- a/plugins/Clist_nicer/src/Include/resource.h +++ b/plugins/Clist_nicer/src/Include/resource.h @@ -111,7 +111,6 @@ #define IDC_LEFTMARGINSPIN 1092 #define IDC_NOGROUPICON 1102 #define IDC_ONECLK 1105 -#define IDC_BUILDTIME 1108 #define IDC_RIGHTMARGIN 1121 #define IDC_ROWGAP 1122 #define IDC_TRANSPARENT 1124 diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 9e5f2dbeac..83acd46531 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1977,8 +1977,6 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar DWORD v = pluginInfo.version; mir_snprintf(str, sizeof(str), "%s %d.%d.%d.%d", Translate("Version"), HIBYTE(HIWORD(v)), LOBYTE(HIWORD(v)), HIBYTE(LOWORD(v)), LOBYTE(LOWORD(v))); SetDlgItemTextA(hwndDlg, IDC_VERSION, str); - mir_snprintf(str, sizeof(str), Translate("Built %s %s"), __DATE__, __TIME__); - SetDlgItemTextA(hwndDlg, IDC_BUILDTIME, str); } hIcon = LoadIcon(GetModuleHandleA("miranda32.exe"), MAKEINTRESOURCE(102)); SendDlgItemMessage(hwndDlg, IDC_LOGO, STM_SETICON, (WPARAM)hIcon, 0); @@ -2001,7 +1999,6 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_WHITERECT) || (HWND)lParam == GetDlgItem(hwndDlg, IDC_CLNICER) || (HWND)lParam == GetDlgItem(hwndDlg, IDC_VERSION) - || (HWND)lParam == GetDlgItem(hwndDlg, IDC_BUILDTIME) || (HWND)lParam == GetDlgItem(hwndDlg, IDC_COPYRIGHT) || (HWND)lParam == GetDlgItem(hwndDlg, IDC_SUPPORT) || (HWND)lParam == GetDlgItem(hwndDlg, IDC_LOGO)) { diff --git a/plugins/ListeningTo/src/players/foo_mlt/foo_mlt.cpp b/plugins/ListeningTo/src/players/foo_mlt/foo_mlt.cpp index d358f02dfd..dde1dfe15d 100644 --- a/plugins/ListeningTo/src/players/foo_mlt/foo_mlt.cpp +++ b/plugins/ListeningTo/src/players/foo_mlt/foo_mlt.cpp @@ -1,4 +1,4 @@ -/* +/* Copyright (C) 2005-2009 Ricardo Pescuma Domenecci This is free software; you can redistribute it and/or @@ -14,7 +14,7 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this file; see the file license.txt. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. +Boston, MA 02111-1307, USA. */ #include "foobar2000/SDK/foobar2000.h" @@ -51,7 +51,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) { class_name[255] = _T('\0'); - if (lstrcmpi(MIRANDA_WINDOWCLASS, class_name) == 0) + if (lstrcmpi(MIRANDA_WINDOWCLASS, class_name) == 0) { COPYDATASTRUCT *cds = (COPYDATASTRUCT *) lParam; SendMessage(hwnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) cds); @@ -61,7 +61,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) return TRUE; } -inline void SendData(WCHAR *text) +inline void SendData(WCHAR *text) { static WCHAR lastMsg[DATA_SIZE] = L""; @@ -214,7 +214,7 @@ void SendDataMusic(const char *filename, const file_info *info) { Concat(data, size); } - else + else { const char *dot = strrchr(name, '.'); Concat(data, size, name + 1, dot == NULL ? 0 : dot - name - 1); @@ -299,7 +299,7 @@ class play_callback_miranda : public play_callback_static KillTimer(); if (IsRadio(p_track)) return; - + in_metadb_sync_fromhandle l_sync(p_track); const file_info *info; @@ -328,7 +328,7 @@ class play_callback_miranda : public play_callback_static } virtual void on_playback_edited(metadb_handle_ptr p_track) {} virtual void on_playback_dynamic_info(const file_info & info) {} - virtual void on_playback_dynamic_info_track(const file_info & info) + virtual void on_playback_dynamic_info_track(const file_info & info) { if (g_off) return; metadb_handle_ptr p_track; @@ -350,8 +350,8 @@ class play_callback_miranda : public play_callback_static } virtual void on_playback_time(double p_time) {} virtual void on_volume_change(float p_new_val) {}; - - virtual unsigned get_flags() + + virtual unsigned get_flags() { return flag_on_playback_new_track | flag_on_playback_pause | flag_on_playback_stop | flag_on_playback_dynamic_info_track; } @@ -383,7 +383,7 @@ static initquit_factory_t g_myinitquit_factory; DECLARE_COMPONENT_VERSION("Miranda ListeningTo foobar2000 Plugin", "1.1.1", -"compiled: " __DATE__ " with foo_SDK-2010-10-02\r\n\ +"compiled with foo_SDK-2010-10-02\r\n\ Sending listeningto information to Mitanda IM client\r\n\ if no foo_comserver2 is present.\r\n\ Copyright (C) 2006-2010 Ricardo Pescuma Domenecci\r\n\ diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 90030b0547..1313dc7edd 100755 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -26,7 +26,6 @@ HINSTANCE hInst; HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL, hSendKey = NULL, g_hCLIcon = NULL, hExportGpgKeys = NULL, hImportGpgKeys = NULL; IconExtraColumn g_IEC = {0}; static int OnModulesLoaded(WPARAM wParam,LPARAM lParam); -extern char *date(); RECT key_from_keyserver_rect = {0}, firstrun_rect = {0}, new_key_rect = {0}, key_gen_rect = {0}, load_key_rect = {0}, import_key_rect = {0}, key_password_rect = {0}, load_existing_key_rect = {0}; XML_API xi = {0}; int hLangpack = 0; @@ -39,7 +38,7 @@ std::map hcontact_data; PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), - 0, + "GPG", PLUGIN_MAKE_VERSION(0,0,0,11), "new GPG encryption support plugin, based on code from old gpg plugin and secureim", "sss", @@ -59,13 +58,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - static char plugname[52]; - strcpy(plugname, szGPGModuleName" ["); - strcat(plugname, date()); - strcat(plugname, " "); - strcat(plugname, __TIME__); - strcat(plugname, "]"); - pluginInfo.shortName = plugname; return &pluginInfo; } diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp index 242ccc4b67..6b84c07954 100755 --- a/plugins/New_GPG/src/utilities.cpp +++ b/plugins/New_GPG/src/utilities.cpp @@ -42,55 +42,6 @@ char* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,co return szRes; } - -char *date() -{ - setlocale( LC_ALL, "C" ); - static char d[11]; - char *tmp = __DATE__, m[4], mn[3] = "01"; - m[0]=tmp[0]; - m[1]=tmp[1]; - m[2]=tmp[2]; - if(strstr(m,"Jan")) - strcpy(mn,"01"); - else if(strstr(m,"Feb")) - strcpy(mn,"02"); - else if(strstr(m,"Mar")) - strcpy(mn,"03"); - else if(strstr(m,"Apr")) - strcpy(mn,"04"); - else if(strstr(m,"May")) - strcpy(mn,"05"); - else if(strstr(m,"Jun")) - strcpy(mn,"06"); - else if(strstr(m,"Jul")) - strcpy(mn,"07"); - else if(strstr(m,"Aug")) - strcpy(mn,"08"); - else if(strstr(m,"Sep")) - strcpy(mn,"09"); - else if(strstr(m,"Oct")) - strcpy(mn,"10"); - else if(strstr(m,"Nov")) - strcpy(mn,"11"); - else if(strstr(m,"Dec")) - strcpy(mn,"12"); - d[0]=tmp[7]; - d[1]=tmp[8]; - d[2]=tmp[9]; - d[3]=tmp[10]; - d[4]='.'; - d[5]=mn[0]; - d[6]=mn[1]; - d[7]='.'; - if (tmp[4] == ' ') - d[8] = '0'; - else - d[8]=tmp[4]; - d[9]=tmp[5]; - return d; -} - void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc) { TCHAR str[MAX_PATH+2] = {0}, *tmp; diff --git a/plugins/SendScreenshotPlus/res/resource.rc b/plugins/SendScreenshotPlus/res/resource.rc index 6a0a12a119..c52b467e53 100644 --- a/plugins/SendScreenshotPlus/res/resource.rc +++ b/plugins/SendScreenshotPlus/res/resource.rc @@ -88,7 +88,6 @@ BEGIN LTEXT "",IDC_WHITERECT,0,25,213,135,NOT WS_GROUP EDITTEXT IDC_LICENSE,5,37,204,95,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL EDITTEXT IDC_CREDIT,5,37,204,95,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL - EDITTEXT IDC_BUILDTIME,5,147,146,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,160,213,1 END diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.cpp b/plugins/SendScreenshotPlus/src/UAboutForm.cpp index f4ea2b6bc2..beb65fce08 100644 --- a/plugins/SendScreenshotPlus/src/UAboutForm.cpp +++ b/plugins/SendScreenshotPlus/src/UAboutForm.cpp @@ -40,7 +40,6 @@ LRESULT CALLBACK TfrmAbout::DlgTfrmAbout(HWND hWnd, UINT msg, WPARAM wParam, LPA if (msg == WM_CTLCOLOREDIT || msg == WM_CTLCOLORSTATIC) { switch ( GetWindowLongPtr(( HWND )lParam, GWL_ID )) { case IDC_WHITERECT: - case IDC_BUILDTIME: case IDC_CREDIT: case IDC_LICENSE: SetTextColor((HDC)wParam,GetSysColor(COLOR_WINDOWTEXT)); @@ -100,10 +99,6 @@ LRESULT TfrmAbout::wmInitdialog(WPARAM wParam, LPARAM lParam) { SetDlgItemText( m_hWnd, IDC_HEADERBAR, newTitle ); SendMessage(GetDlgItem(m_hWnd, IDC_HEADERBAR), WM_SETICON, 0, (WPARAM)IcoLib_GetIcon(ICO_PLUG_SSWINDOW1, true)); - //Buildtime - mir_sntprintf(newTitle,SIZEOF(newTitle),TranslateT("Built %s %s"),_T(__DATE__),_T(__TIME__)); - SetDlgItemText(m_hWnd,IDC_BUILDTIME,newTitle); - //License { mir_tcsadd(pszTitle ,_T(__COPYRIGHT)); mir_tcsadd(pszTitle ,_T("\r\n\r\n")); diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index 48586f83d3..bd1efd0809 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -33,6 +33,8 @@ Last change by : $Author: ing.u.horn $ #ifndef _GLOBAL_H_ #define _GLOBAL_H_ +#define _CRT_SECURE_NO_WARNINGS + #define WINVER 0x0700 #define _WIN32_WINNT 0x0700 #define _WIN32_IE 0x0601 diff --git a/plugins/SendScreenshotPlus/src/resource.h b/plugins/SendScreenshotPlus/src/resource.h index 6818f5b23f..c6f9742fe2 100644 --- a/plugins/SendScreenshotPlus/src/resource.h +++ b/plugins/SendScreenshotPlus/src/resource.h @@ -49,7 +49,6 @@ #define STATIC_LINE2 1103 #define ICO_DLGLOGO 1105 #define ICO_MSGDLG 1106 -#define IDC_BUILDTIME 1108 #define TXT_NAME 1114 #define TXT_MESSAGE 1126 #define ID_edtCaption 1201 diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h index 70c44e250e..70e36dfaed 100644 --- a/plugins/SplashScreen/src/debug.h +++ b/plugins/SplashScreen/src/debug.h @@ -47,17 +47,6 @@ int inline initLog() return 0; } -/* - * log timestamp - */ - -void inline logTimeStamp() -{ - FILE *f = _tfopen(szLogFile, _T("a")); - _ftprintf(f, _T("Time:\t\t\t\t%s\n"), _T(__TIME__)); - fclose(f); -} - /* * logging func */ diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 78d00bbb33..8289ce229d 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -85,7 +85,6 @@ void SplashMain() #ifdef _DEBUG mir_sntprintf(szLogFile, SIZEOF(szLogFile), _T("%s\\%s.log"), szMirDir, _T(__INTERNAL_NAME)); initLog(); - logTimeStamp(); TCHAR* mirandaVerString = mir_a2t(szVersion); logMessage(_T("Miranda version"), mirandaVerString); mir_free(mirandaVerString); diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index 8bccf59052..1ce5b12c79 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -68,7 +68,7 @@ extern int RemoveTmp(WPARAM,LPARAM); PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - 0, + pluginName" mod", PLUGIN_MAKE_VERSION(0, 0, 2, 0), pluginDescription, "Roman Miklashevsky, sss, Elzor", @@ -79,69 +79,8 @@ PLUGININFOEX pluginInfoEx = { MIID_STOPSPAM }; - -char *date() -{ - static char d[11]; - char *tmp = __DATE__, m[4], mn[3] = "01"; - m[0]=tmp[0]; - m[1]=tmp[1]; - m[2]=tmp[2]; - if(strstr(m,"Jan")) - strcpy(mn,"01"); - else if(strstr(m,"Feb")) - strcpy(mn,"02"); - else if(strstr(m,"Mar")) - strcpy(mn,"03"); - else if(strstr(m,"Apr")) - strcpy(mn,"04"); - else if(strstr(m,"May")) - strcpy(mn,"05"); - else if(strstr(m,"Jun")) - strcpy(mn,"06"); - else if(strstr(m,"Jul")) - strcpy(mn,"07"); - else if(strstr(m,"Aug")) - strcpy(mn,"08"); - else if(strstr(m,"Sep")) - strcpy(mn,"09"); - else if(strstr(m,"Oct")) - strcpy(mn,"10"); - else if(strstr(m,"Nov")) - strcpy(mn,"11"); - else if(strstr(m,"Dec")) - strcpy(mn,"12"); - d[0]=tmp[7]; - d[1]=tmp[8]; - d[2]=tmp[9]; - d[3]=tmp[10]; - d[4]='.'; - d[5]=mn[0]; - d[6]=mn[1]; - d[7]='.'; - if (tmp[4] == ' ') - d[8] = '0'; - else - d[8]=tmp[4]; - d[9]=tmp[5]; - return d; -} - - -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { - if ( mirandaVersion < PLUGIN_MAKE_VERSION( 0, 7, 0, 1 )) - return NULL; - { - static char plugname[52]; - strcpy(plugname, pluginName" mod ["); - strcat(plugname, date()); - strcat(plugname, " "); - strcat(plugname, __TIME__); - strcat(plugname, "]"); - pluginInfoEx.shortName = plugname; - } - return &pluginInfoEx; } diff --git a/plugins/Watrack_MPD/src/init.c b/plugins/Watrack_MPD/src/init.c index 4d4f9eba29..ca3d9e71b0 100755 --- a/plugins/Watrack_MPD/src/init.c +++ b/plugins/Watrack_MPD/src/init.c @@ -16,7 +16,6 @@ #include "commonheaders.h" - #define PLUGIN_NAME "Watrack_MPD" HINSTANCE hInst; @@ -26,10 +25,9 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam); extern char *date(); extern int WaMpdOptInit(WPARAM wParam,LPARAM lParam); - PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), - 0, + PLUGIN_NAME, PLUGIN_MAKE_VERSION(0,0,0,4), "Music Player Daemon support for watrack", "sss, others..", @@ -37,8 +35,7 @@ PLUGININFOEX pluginInfo={ "© 2009 sss, others...", "http://sss.chaoslab.ru:81/tracker/mim_plugs/", 1, //unicode - { 0x692e87d0, 0x6c71, 0x4cdc, { 0x9e, 0x36, 0x2b, 0x2d, 0x69, 0xfb, 0xdc, 0x4c } } - + { 0x692e87d0, 0x6c71, 0x4cdc, { 0x9e, 0x36, 0x2b, 0x2d, 0x69, 0xfb, 0xdc, 0x4c } } }; BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) @@ -49,15 +46,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) { - { - static char plugname[52]; - strcpy(plugname, PLUGIN_NAME" ["); - strcat(plugname, date()); - strcat(plugname, " "); - strcat(plugname, __TIME__); - strcat(plugname, "]"); - pluginInfo.shortName = plugname; - } return &pluginInfo; } diff --git a/plugins/Watrack_MPD/src/utilities.c b/plugins/Watrack_MPD/src/utilities.c index 444a6d210d..4d63f1f7f4 100755 --- a/plugins/Watrack_MPD/src/utilities.c +++ b/plugins/Watrack_MPD/src/utilities.c @@ -17,23 +17,6 @@ #include "commonheaders.h" -/*HANDLE CreateThreadEx(pThreadFuncEx AFunc, void* arg, DWORD* pThreadID) -{ - FORK_THREADEX_PARAMS params; - DWORD dwThreadId; - HANDLE hThread; - - params.pFunc = AFunc; - params.arg = arg; - params.iStackSize = 0; - params.threadID = &dwThreadId; - hThread = (HANDLE)CallService(MS_SYSTEM_FORK_THREAD_EX, 0, (LPARAM)¶ms); - if (pThreadID) - *pThreadID = dwThreadId; - - return hThread; -}*/ - TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef) { DBVARIANT dbv = {DBVT_DELETED}; @@ -46,67 +29,6 @@ TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,c return szRes; } -// case-insensitive _tcsstr -/*#define NEWTSTR_ALLOCA(A) (A==NULL)?NULL:_tcscpy((TCHAR*)alloca(sizeof(TCHAR)*(_tcslen(A)+1)),A) -const TCHAR *stristr( const TCHAR *str, const TCHAR *substr) -{ - TCHAR *p; - TCHAR *str_up = NEWTSTR_ALLOCA(str); - TCHAR *substr_up = NEWTSTR_ALLOCA(substr); - - CharUpperBuff(str_up, lstrlen(str_up)); - CharUpperBuff(substr_up, lstrlen(substr_up)); - - p = _tcsstr(str_up, substr_up); - return p ? (str + (p - str_up)) : NULL; -}*/ - -char *date() -{ - static char d[11]; - char *tmp = __DATE__, m[4], mn[3] = "01"; - m[0]=tmp[0]; - m[1]=tmp[1]; - m[2]=tmp[2]; - if(strstr(m,"Jan")) - strcpy(mn,"01"); - else if(strstr(m,"Feb")) - strcpy(mn,"02"); - else if(strstr(m,"Mar")) - strcpy(mn,"03"); - else if(strstr(m,"Apr")) - strcpy(mn,"04"); - else if(strstr(m,"May")) - strcpy(mn,"05"); - else if(strstr(m,"Jun")) - strcpy(mn,"06"); - else if(strstr(m,"Jul")) - strcpy(mn,"07"); - else if(strstr(m,"Aug")) - strcpy(mn,"08"); - else if(strstr(m,"Sep")) - strcpy(mn,"09"); - else if(strstr(m,"Oct")) - strcpy(mn,"10"); - else if(strstr(m,"Nov")) - strcpy(mn,"11"); - else if(strstr(m,"Dec")) - strcpy(mn,"12"); - d[0]=tmp[7]; - d[1]=tmp[8]; - d[2]=tmp[9]; - d[3]=tmp[10]; - d[4]='.'; - d[5]=mn[0]; - d[6]=mn[1]; - d[7]='.'; - if (tmp[4] == ' ') - d[8] = '0'; - else - d[8]=tmp[4]; - d[9]=tmp[5]; - return d; -} HANDLE NetLib_CreateConnection(HANDLE hUser, NETLIBOPENCONNECTION* nloc) //from icq ) { HANDLE hConnection; diff --git a/protocols/YAMN/filter/Base/maindll.cpp b/protocols/YAMN/filter/Base/maindll.cpp index d6a645bd14..1cb9d92338 100644 --- a/protocols/YAMN/filter/Base/maindll.cpp +++ b/protocols/YAMN/filter/Base/maindll.cpp @@ -42,7 +42,7 @@ YAMN_FILTERREGISTRATION FilterRegistration= //classical YAMN registration #else "Base filter plugin for YAMN", #endif - __DATE__, + "", "© majvan", "Classifies mails using the rules stored in file", "om3tn@psg.sk", diff --git a/protocols/YAMN/filter/Simple/maindll.cpp b/protocols/YAMN/filter/Simple/maindll.cpp index 62aa87b28d..44a277d4fa 100644 --- a/protocols/YAMN/filter/Simple/maindll.cpp +++ b/protocols/YAMN/filter/Simple/maindll.cpp @@ -26,7 +26,7 @@ YAMN_FILTERIMPORTFCN FilterFunctions= //we set for YAMN which is our filter func YAMN_FILTERREGISTRATION FilterRegistration= //classical YAMN registration { "Simple filter plugin for YAMN", - __DATE__, + "", "© porter+ majvan", "Classifies mails using the blacklist emails stored in file", "porterbox@hotmail.com", @@ -107,9 +107,9 @@ DWORD WINAPI FilterMail(HACCOUNT Account,DWORD AccountVer,HYAMNMAIL Mail,DWORD M if(fp != NULL) { if (!(Mail->Flags & YAMN_MSG_VIRTUAL)) for(Browser=Mail->MailData->TranslatedHeader;Browser!=NULL;Browser=Browser->Next) { //we browse all header stored in Mail->TranslatedHeader - if ((!lstrcmp(Browser->name,"Return-Path")) || (!lstrcmp(Browser->name,"From"))) { //and if we find + if ((!lstrcmp(Browser->name,"Return-Path")) || (!lstrcmp(Browser->name,"From"))) { //and if we find fseek(fp, 0L, SEEK_SET); - while(!feof(fp)) { + while(!feof(fp)) { if(fscanf(fp, "%255s", EmailSpam) != 0) { if (!feof(fp)) if(fscanf(fp, "%d", &spamLevel)==0) diff --git a/src/core/stdhelp/about.cpp b/src/core/stdhelp/about.cpp index e1a2e24b4d..ff87c595ad 100644 --- a/src/core/stdhelp/about.cpp +++ b/src/core/stdhelp/about.cpp @@ -61,9 +61,6 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar mir_sntprintf(newTitle, SIZEOF(newTitle), oldTitle, str); SetDlgItemText(hwndDlg, IDC_HEADERBAR, newTitle); } - - mir_sntprintf(str, SIZEOF(str), TranslateT("Built %s %s"), _T(__DATE__), _T(__TIME__)); - SetDlgItemText(hwndDlg, IDC_BUILDTIME, str); } ShowWindow(GetDlgItem(hwndDlg, IDC_CREDITSFILE), SW_HIDE); { @@ -102,14 +99,12 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar iState = 0; SetDlgItemText(hwndDlg, IDC_CONTRIBLINK, TranslateT("Credits >")); ShowWindow(GetDlgItem(hwndDlg, IDC_DEVS), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_BUILDTIME), SW_SHOW); ShowWindow(GetDlgItem(hwndDlg, IDC_CREDITSFILE), SW_HIDE); } else { iState = 1; SetDlgItemText(hwndDlg, IDC_CONTRIBLINK, TranslateT("< Copyright")); ShowWindow(GetDlgItem(hwndDlg, IDC_DEVS), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_BUILDTIME), SW_HIDE); ShowWindow(GetDlgItem(hwndDlg, IDC_CREDITSFILE), SW_SHOW); } break; @@ -120,7 +115,6 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar case WM_CTLCOLORSTATIC: switch (GetWindowLongPtr((HWND)lParam, GWL_ID)) { case IDC_WHITERECT: - case IDC_BUILDTIME: case IDC_CREDITSFILE: case IDC_DEVS: SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT)); diff --git a/src/core/stdhelp/resource.rc b/src/core/stdhelp/resource.rc index f35b8fb4e0..3ef26e954d 100644 --- a/src/core/stdhelp/resource.rc +++ b/src/core/stdhelp/resource.rc @@ -36,7 +36,6 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,152,112,55,14 CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,106,213,1 LTEXT "",IDC_DEVS,5,32,202,42 - EDITTEXT IDC_BUILDTIME,4,91,146,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER PUSHBUTTON "Credits >",IDC_CONTRIBLINK,5,112,55,14 EDITTEXT IDC_CREDITSFILE,4,32,202,67,ES_CENTER | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL END -- cgit v1.2.3