From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AutoShutdown/src/watcher.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/AutoShutdown/src/watcher.cpp') diff --git a/plugins/AutoShutdown/src/watcher.cpp b/plugins/AutoShutdown/src/watcher.cpp index efb456a82a..65a69c73f9 100644 --- a/plugins/AutoShutdown/src/watcher.cpp +++ b/plugins/AutoShutdown/src/watcher.cpp @@ -63,7 +63,7 @@ static void __inline ShutdownAndStopWatcher(void) /************************* Msg Shutdown *******************************/ // ppBlob might get reallocated, must have been allocated using mir_alloc() -static TCHAR* GetMessageText(BYTE **ppBlob, DWORD *pcbBlob) +static wchar_t* GetMessageText(BYTE **ppBlob, DWORD *pcbBlob) { (*ppBlob)[*pcbBlob] = 0; size_t cb = mir_strlen((char*)*ppBlob); @@ -102,8 +102,8 @@ static int MsgEventAdded(WPARAM, LPARAM hDbEvent) DBVARIANT dbv; if (!db_get_ts(NULL, "AutoShutdown", "Message", &dbv)) { TrimString(dbv.ptszVal); - TCHAR *pszMsg = GetMessageText(&dbe.pBlob, &dbe.cbBlob); - if (pszMsg != NULL && _tcsstr(pszMsg, dbv.ptszVal) != NULL) + wchar_t *pszMsg = GetMessageText(&dbe.pBlob, &dbe.cbBlob); + if (pszMsg != NULL && wcsstr(pszMsg, dbv.ptszVal) != NULL) ShutdownAndStopWatcher(); /* msg with specified text recvd */ mir_free(dbv.ptszVal); /* does NULL check */ } -- cgit v1.2.3