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

Jim Park's Unicode NSIS merging - Step 2 : merge TCHARs changes into trunk

Browse source 
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6037 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-03-26 17:18:17 +00:00
commit cdf7735a77
206 changed files with 8437 additions and 6403 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/zlib/DEFLATE.H
View file

@ -9,6 +9,8 @@
*
* This software is provided 'as-is', without any express or implied
* warranty.
*
* Reviewed for Unicode support by Jim Park -- 08/27/2007
*/
/* deflate.h -- internal compression state

26
Source/zlib/INFBLOCK.C
View file

@ -9,6 +9,10 @@
*
* This software is provided 'as-is', without any express or implied
* warranty.
*
* Unicode support by Jim Park -- 08/27/2007
* All messages and true strings turned into TCHARs for when we
* create viewable messages.
*/
#include "../Platform.h"
@ -367,14 +371,14 @@ int ZEXPORT inflate(z_streamp z)
switch (t >> 1)
{
case 0: /* stored */
Tracev((stderr, "inflate: stored block%s\n",
LAST ? " (last)" : ""));
Tracev((stderr, _T("inflate: stored block%s\n"),
LAST ? _T(" (last)") : _T("")));
DUMPBITS(k&7)
s->mode = LENS; /* get length of stored block */
break;
case 1: /* fixed */
Tracev((stderr, "inflate: fixed codes block%s\n",
LAST ? " (last)" : ""));
Tracev((stderr, _T("inflate: fixed codes block%s\n"),
LAST ? _T(" (last)") : _T("")));
{
if (!fixed_built)
{
@ -414,8 +418,8 @@ int ZEXPORT inflate(z_streamp z)
s->mode = CODES_START;
break;
case 2: /* dynamic */
Tracev((stderr, "inflate: dynamic codes block%s\n",
LAST ? " (last)" : ""));
Tracev((stderr, _T("inflate: dynamic codes block%s\n"),
LAST ? _T(" (last)") : _T("")));
s->mode = TABLE;
break;
case 3: /* illegal */
@ -427,7 +431,7 @@ int ZEXPORT inflate(z_streamp z)
NEEDBITS(16)
s->sub.left = (uInt)b & 0xffff;
b = k = 0; /* dump bits */
Tracev((stderr, "inflate: stored length %u\n", s->sub.left));
Tracev((stderr, _T("inflate: stored length %u\n"), s->sub.left));
s->mode = s->sub.left ? STORED : s->last;
break;
case STORED:
@ -457,7 +461,7 @@ int ZEXPORT inflate(z_streamp z)
//t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
DUMPBITS(14)
s->sub.trees.index = 0;
Tracev((stderr, "inflate: table sizes ok\n"));
Tracev((stderr, _T("inflate: table sizes ok\n")));
s->mode = BTREE;
case BTREE:
while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
@ -483,7 +487,7 @@ int ZEXPORT inflate(z_streamp z)
}
s->sub.trees.index = 0;
Tracev((stderr, "inflate: bits tree ok\n"));
Tracev((stderr, _T("inflate: bits tree ok\n")));
s->mode = DTREE;
case DTREE:
while (t = s->sub.trees.table,
@ -558,7 +562,7 @@ int ZEXPORT inflate(z_streamp z)
s->mode = BAD;
LEAVE(Z_DATA_ERROR);
}
Tracev((stderr, "inflate: trees ok\n"));
Tracev((stderr, _T("inflate: trees ok\n")));
//s->sub.decode.t_codes.mode = CODES_START;
s->sub.decode.t_codes.lbits = (Byte)bl;
@ -682,7 +686,7 @@ int ZEXPORT inflate(z_streamp z)
LEAVE(Z_OK)
if (s->mode == CODES_WASH)
{
Tracev((stderr, "inflate: codes end, %lu total out\n",
Tracev((stderr, _T("inflate: codes end, %lu total out\n"),
z->total_out + (q >= s->read ? q - s->read :
(s->end - s->read) + (q - s->window))));
}

4
Source/zlib/ZCONF.H
View file

@ -9,6 +9,8 @@
*
* This software is provided 'as-is', without any express or implied
* warranty.
*
* Reviewed for Unicode support by Jim Park -- 08/27/2007
*/
/* zconf.h -- configuration of the zlib compression library
@ -16,7 +18,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
/* @(#) $Id: ZCONF.H,v 1.2 2006/10/28 19:45:02 joostverburg Exp $ */
/* @(#) $Id: ZCONF.H,v 1.3 2007/01/13 17:28:23 kichik Exp $ */
#ifndef _ZCONF_H
#define _ZCONF_H

12
Source/zlib/ZLIB.H
View file

@ -9,6 +9,8 @@
*
* This software is provided 'as-is', without any express or implied
* warranty.
*
* Unicode support by Jim Park -- 08/27/2007
*/
/* zlib.h -- interface of the 'zlib' general purpose compression library
@ -175,7 +177,7 @@ typedef struct z_stream_s {
uLong total_out; /* total nb of bytes output so far */
#endif
// char *msg; /* last error message, NULL if no error */
// TCHAR *msg; /* last error message, NULL if no error */
//struct internal_state FAR *state; /* not visible by applications */
#ifdef EXEHEAD
struct inflate_blocks_state blocks; /* current inflate_blocks state */
@ -278,16 +280,16 @@ ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
* and the compiler's view of z_stream:
*/
ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
const char *version, int stream_size));
const TCHAR *version, int stream_size));
//ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
// const char *version, int stream_size));
// const TCHAR *version, int stream_size));
ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method,
int windowBits, int memLevel,
int strategy, const char *version,
int strategy, const TCHAR *version,
int stream_size));
#define deflateInit(strm, level) \
deflateInit_((strm), (level), "", sizeof(z_stream))
deflateInit_((strm), (level), _T(""), sizeof(z_stream))
#ifdef __cplusplus

8
Source/zlib/ZUTIL.H
View file

@ -9,6 +9,11 @@
*
* This software is provided 'as-is', without any express or implied
* warranty.
*
* Reviewed for Unicode support by Jim Park -- 08/27/2007
* The messages generated here are mostly #def'ed out, but are used
* when debugging. So in order for the messages to be viewable in
* Unicode version, using TCHAR macros.
*/
/* zutil.h -- internal interface and configuration of the compression library
@ -21,13 +26,14 @@
subject to change. Applications should only use zlib.h.
*/
/* @(#) $Id: ZUTIL.H,v 1.5 2007/01/13 17:28:23 kichik Exp $ */
/* @(#) $Id: ZUTIL.H,v 1.6 2007/01/25 18:07:40 kichik Exp $ */
#ifndef _Z_UTIL_H
#define _Z_UTIL_H
#include "../Platform.h"
#include "ZLIB.H"
#include "../tchar.h"
#ifndef local
# define local static