dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Jim Park's Unicode NSIS merging - Step 4 : merging more TCHAR stuff that shouldn't have any impact

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6041 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-29 14:24:47 +00:00
parent 8ab72b9ece
commit acf9a8c21f
41 changed files with 937 additions and 586 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Contrib/Makensisw/toolbar.cpp
View file

@ -123,8 +123,8 @@ void UpdateToolBarCompressorButton()
{
int iBitmap;
int iString;
TCHAR szBuffer[64];
TCHAR temp[32];
TCHAR szBuffer[124]; // increased to 124 for good measure, also.
TCHAR temp[64]; // increased to 64. Hit limit 08/20/2007 -- Jim Park.
TOOLINFO ti;
my_memset(&ti, 0, sizeof(TOOLINFO));
@ -139,14 +139,14 @@ void UpdateToolBarCompressorButton()
LoadString(g_sdata.hInstance,
IDS_COMPRESSOR,
temp,
sizeof(temp));
_countof(temp));
my_memset(szBuffer, 0, sizeof(szBuffer));
lstrcat(szBuffer,temp);
lstrcat(szBuffer,_T(" ["));
LoadString(g_sdata.hInstance,
iString,
temp,
sizeof(temp));
_countof(temp));
lstrcat(szBuffer,temp);
lstrcat(szBuffer,_T("]"));
@ -181,7 +181,7 @@ void AddToolBarButtonTooltip(int id, int iString)
LoadString(g_sdata.hInstance,
iString,
szBuffer,
sizeof(szBuffer));
_countof(szBuffer));
ti.lpszText = (LPTSTR) szBuffer;
ti.rect.left =rect.left;
ti.rect.top = rect.top;