From e53b020018a365cd23fcb897980da5f6a0075e16 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 14 Jun 2012 18:27:05 +0000 Subject: 10 bytes that shattered the core git-svn-id: http://svn.miranda-ng.org/main/trunk@415 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/clistmenus.cpp | 12 ++++++------ src/modules/icolib/skin2icons.cpp | 8 ++++---- src/modules/netlib/netlibbind.cpp | 2 +- src/modules/srfile/fileexistsdlg.cpp | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index acc9485e41..83e1243404 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -467,7 +467,7 @@ INT_PTR StatusMenuCheckService(WPARAM wParam, LPARAM) CLISTMENUITEM mi2 = {0}; mi2.cbSize = sizeof(mi2); mi2.flags = CMIM_NAME | CMIF_TCHAR; - mi2.ptszName = timi->mi.hIcon ? timi->mi.ptszName : TranslateT("Custom status"); + mi2.ptszName = timi->mi.hIcon ? timi->mi.ptszName : LPGENT("Custom status"); timiParent = MO_GetIntMenuItem( timi->mi.root ); @@ -587,7 +587,7 @@ INT_PTR StatusMenuExecService(WPARAM wParam, LPARAM) TCHAR buf[256]; pimi->mi.flags|=CMIF_CHECKED; if ( cli.bDisplayLocked ) { - mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s (locked)"), acc->tszAccountName); + mir_sntprintf(buf, SIZEOF(buf), LPGENT("%s (locked)"), acc->tszAccountName); pimi->mi.ptszName = mir_tstrdup( buf ); root->mi.ptszName = mir_tstrdup( buf ); } @@ -881,7 +881,7 @@ void RebuildMenuOrder( void ) tmi.hIcon = ic = (HICON)CallProtoService( pa->szModuleName, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0 ); if ( Proto_IsAccountLocked( pa ) && cli.bDisplayLocked ) { - mir_sntprintf( tbuf, SIZEOF(tbuf), TranslateT("%s (locked)"), pa->tszAccountName ); + mir_sntprintf( tbuf, SIZEOF(tbuf), LPGENT("%s (locked)"), pa->tszAccountName ); tmi.ptszName = tbuf; } else tmi.ptszName = pa->tszAccountName; @@ -912,7 +912,7 @@ void RebuildMenuOrder( void ) tmi.flags |= CMIF_CHECKED; if (( tmi.flags & CMIF_CHECKED ) && cli.bDisplayLocked ) { - mir_sntprintf( tbuf, SIZEOF(tbuf), TranslateT("%s (locked)"), pa->tszAccountName ); + mir_sntprintf( tbuf, SIZEOF(tbuf), LPGENT("%s (locked)"), pa->tszAccountName ); tmi.ptszName = tbuf; } else tmi.ptszName = pa->tszAccountName; @@ -1005,7 +1005,7 @@ void RebuildMenuOrder( void ) TCHAR buf[ 256 ], hotkeyName[ 100 ]; WORD hotKey = GetHotkeyValue( statusHotkeys[j] ); HotkeyToName( hotkeyName, SIZEOF(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey)); - mir_sntprintf( buf, SIZEOF( buf ), TranslateT("%s\t%s"), + mir_sntprintf( buf, SIZEOF( buf ), LPGENT("%s\t%s"), cli.pfnGetStatusModeDescription( statusModeList[j], 0 ), hotkeyName ); tmi.ptszName = buf; tmi.hotKey = MAKELONG(HIBYTE(hotKey), LOBYTE(hotKey)); @@ -1035,7 +1035,7 @@ static int sttRebuildHotkeys( WPARAM, LPARAM ) TCHAR buf[ 256 ], hotkeyName[ 100 ]; WORD hotKey = GetHotkeyValue( statusHotkeys[j] ); HotkeyToName( hotkeyName, SIZEOF(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey)); - mir_sntprintf( buf, SIZEOF( buf ), TranslateT("%s\t%s"), + mir_sntprintf( buf, SIZEOF( buf ), LPGENT("%s\t%s"), cli.pfnGetStatusModeDescription( statusModeList[j], 0 ), hotkeyName ); tmi.ptszName = buf; tmi.hotKey = MAKELONG(HIBYTE(hotKey), LOBYTE(hotKey)); diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 0993e7ef10..29d69ad8f4 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -363,7 +363,7 @@ IconSourceItem* GetIconSourceItemFromPath( const TCHAR* path, int cxIcon, int cy return NULL; lstrcpyn( file, path, SIZEOF( file )); - comma = _tcsrchr( file, ', ' ); + comma = _tcsrchr( file, ',' ); if ( !comma ) n = 0; else { @@ -429,7 +429,7 @@ static HICON ExtractIconFromPath( const TCHAR *path, int cxIcon, int cyIcon ) return (HICON)NULL; lstrcpyn( file, path, SIZEOF( file )); - comma = _tcsrchr( file, ', ' ); + comma = _tcsrchr( file, ',' ); if ( !comma ) n = 0; else { @@ -955,7 +955,7 @@ static void LoadSectionIcons(TCHAR *filename, SectionItem* sectionActive) HICON hIcon; int indx; - mir_sntprintf( path, SIZEOF(path), _T("%s, "), filename ); + mir_sntprintf( path, SIZEOF(path), _T("%s,"), filename ); suffIndx = lstrlen( path ); EnterCriticalSection( &csIconList ); @@ -1366,7 +1366,7 @@ INT_PTR CALLBACK DlgProcIconImport(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lvi.mask=LVIF_PARAM; lvi.iItem = dragItem; lvi.iSubItem = 0; ListView_GetItem(hPreview, &lvi); - mir_sntprintf(path, MAX_PATH, _T("%s, %d"), filename, (int)lvi.lParam); + mir_sntprintf(path, MAX_PATH, _T("%s,%d"), filename, (int)lvi.lParam); SendMessage(hwndParent, DM_CHANGEICON, dropHiLite, (LPARAM)path); ListView_SetItemState(GetDlgItem(hwndParent, IDC_PREVIEW), dropHiLite, 0, LVIS_DROPHILITED); } } diff --git a/src/modules/netlib/netlibbind.cpp b/src/modules/netlib/netlibbind.cpp index 7e5724994d..22e3876e42 100644 --- a/src/modules/netlib/netlibbind.cpp +++ b/src/modules/netlib/netlibbind.cpp @@ -55,7 +55,7 @@ bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn) for (psz=szPorts;*psz;) { - while (*psz == ' ' || *psz == ', ') psz++; + while (*psz == ' ' || *psz == ',') psz++; portMin = strtol(psz, &pszEnd, 0); if (pszEnd == psz) break; while (*pszEnd == ' ') pszEnd++; diff --git a/src/modules/srfile/fileexistsdlg.cpp b/src/modules/srfile/fileexistsdlg.cpp index a6b5dfd3c2..5fd82cb76b 100644 --- a/src/modules/srfile/fileexistsdlg.cpp +++ b/src/modules/srfile/fileexistsdlg.cpp @@ -187,7 +187,7 @@ void __cdecl LoadIconsAndTypesThread(void* param) if ( szIconFile[0]) { int iconIndex; HICON hIcon; - TCHAR *pszComma = _tcsrchr(szIconFile, ', '); + TCHAR *pszComma = _tcsrchr(szIconFile, ','); if ( pszComma == NULL ) iconIndex=0; else { -- cgit v1.2.3