Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.
Compiler output is identical before & after this step git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/branches/wizou@6036 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
4e48722b63
commit
752d7d239a
209 changed files with 9698 additions and 7658 deletions
|
@ -11,6 +11,8 @@
|
|||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty.
|
||||
*
|
||||
* Reviewed for Unicode support by Jim Park -- 08/27/2007
|
||||
*/
|
||||
|
||||
#include "bzlib.h"
|
||||
|
@ -217,7 +219,7 @@ void fallbackQSort3 ( UInt32* fmap,
|
|||
fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--;
|
||||
}
|
||||
|
||||
AssertD ( unHi == unLo-1, "fallbackQSort3(2)" );
|
||||
AssertD ( unHi == unLo-1, _T("fallbackQSort3(2)") );
|
||||
|
||||
if (gtHi < ltLo) continue;
|
||||
|
||||
|
@ -400,7 +402,7 @@ static Bool mainGtU ( UInt32 i1,
|
|||
UChar c1, c2;
|
||||
UInt16 s1, s2;
|
||||
|
||||
AssertD ( i1 != i2, "mainGtU" );
|
||||
AssertD ( i1 != i2, _T("mainGtU") );
|
||||
/* 1 */
|
||||
c1 = block[i1]; c2 = block[i2];
|
||||
if (c1 != c2) return (c1 > c2);
|
||||
|
@ -730,7 +732,7 @@ void mainQSort3 ( UInt32* ptr,
|
|||
mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--;
|
||||
}
|
||||
|
||||
AssertD ( unHi == unLo-1, "mainQSort3(2)" );
|
||||
AssertD ( unHi == unLo-1, _T("mainQSort3(2)") );
|
||||
|
||||
if (gtHi < ltLo) {
|
||||
mpush(lo, hi, d+1 );
|
||||
|
@ -751,8 +753,8 @@ void mainQSort3 ( UInt32* ptr,
|
|||
if (mnextsize(1) < mnextsize(2)) mnextswap(1,2);
|
||||
if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
|
||||
|
||||
AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" );
|
||||
AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" );
|
||||
AssertD (mnextsize(0) >= mnextsize(1), _T("mainQSort3(8)") );
|
||||
AssertD (mnextsize(1) >= mnextsize(2), _T("mainQSort3(9)") );
|
||||
|
||||
mpush (nextLo[0], nextHi[0], nextD[0]);
|
||||
mpush (nextLo[1], nextHi[1], nextD[1]);
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty.
|
||||
*
|
||||
* Reviewed for Unicode support by Jim Park -- 08/23/2007
|
||||
*/
|
||||
|
||||
#include "bzlib.h"
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty.
|
||||
*
|
||||
* Reviewed for Unicode support by Jim Park -- 08/27/2007
|
||||
*/
|
||||
|
||||
/*-------------------------------------------------------------*/
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty.
|
||||
*
|
||||
* Reviewed for Unicode support by Jim Park -- 08/27/2007
|
||||
*/
|
||||
|
||||
/*-------------------------------------------------------------*/
|
||||
|
@ -218,10 +220,10 @@ void generateMTFValues ( EState* s )
|
|||
|
||||
for (i = 0; i < s->nblock; i++) {
|
||||
UChar ll_i;
|
||||
AssertD ( wr <= i, "generateMTFValues(1)" );
|
||||
AssertD ( wr <= i, _T("generateMTFValues(1)") );
|
||||
j = ptr[i]-1; if (j < 0) j += s->nblock;
|
||||
ll_i = s->unseqToSeq[block[j]];
|
||||
AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" );
|
||||
AssertD ( ll_i < s->nInUse, _T("generateMTFValues(2a)") );
|
||||
|
||||
if (yy[0] == ll_i) {
|
||||
zPend++;
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty.
|
||||
*
|
||||
* Reviewed for Unicode support by Jim Park -- 08/27/2007
|
||||
*/
|
||||
|
||||
#include "bzlib.h"
|
||||
|
|
|
@ -11,6 +11,8 @@
|
|||
*
|
||||
* This software is provided 'as-is', without any express or implied
|
||||
* warranty.
|
||||
*
|
||||
* Reviewed for Unicode support by Jim Park -- 08/27/2007
|
||||
*/
|
||||
|
||||
#include "bzlib.h"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue