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

Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.

Browse source 
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:
wizou 2010-03-24 17:22:56 +00:00
parent 4e48722b63
commit 752d7d239a
209 changed files with 9698 additions and 7658 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Contrib/System/Source/Plugin.c
View file

@ -1,3 +1,5 @@
// Unicode support by Jim Park -- 08/23/2007
#include "stdafx.h"
#include "Plugin.h"
#include "Buffers.h"
@ -5,19 +7,19 @@
HWND g_hwndParent;
char *AllocString()
TCHAR *AllocString()
{
return (char*) GlobalAlloc(GPTR,g_stringsize);
return (TCHAR*) GlobalAlloc(GPTR,g_stringsize*sizeof(TCHAR));
}
char *AllocStr(char *str)
TCHAR *AllocStr(TCHAR *str)
{
return lstrcpy(AllocString(), str);
}
char* system_popstring()
TCHAR* system_popstring()
{
char *str;
TCHAR *str;
stack_t *th;
if (!g_stacktop || !*g_stacktop) return NULL;
@ -31,24 +33,24 @@ char* system_popstring()
return str;
}
char *system_pushstring(char *str)
TCHAR *system_pushstring(TCHAR *str)
{
stack_t *th;
if (!g_stacktop) return str;
th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize);
th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+(g_stringsize*sizeof(TCHAR)));
lstrcpyn(th->text,str,g_stringsize);
th->next=*g_stacktop;
*g_stacktop=th;
return str;
}
char *system_getuservariable(int varnum)
TCHAR *system_getuservariable(int varnum)
{
if (varnum < 0 || varnum >= __INST_LAST) return AllocString();
return AllocStr(g_variables+varnum*g_stringsize);
}
char *system_setuservariable(int varnum, char *var)
TCHAR *system_setuservariable(int varnum, TCHAR *var)
{
if (var != NULL && varnum >= 0 && varnum < __INST_LAST) {
lstrcpy (g_variables + varnum*g_stringsize, var);
@ -57,31 +59,31 @@ char *system_setuservariable(int varnum, char *var)
}
// Updated for int64 and simple bitwise operations
__int64 myatoi64(char *s)
__int64 myatoi64(TCHAR *s)
{
__int64 v=0;
// Check for right input
if (!s) return 0;
if (*s == '0' && (s[1] == 'x' || s[1] == 'X'))
if (*s == _T('0') && (s[1] == _T('x') || s[1] == _T('X')))
{
s++;
for (;;)
{
int c=*(++s);
if (c >= '0' && c <= '9') c-='0';
else if (c >= 'a' && c <= 'f') c-='a'-10;
else if (c >= 'A' && c <= 'F') c-='A'-10;
if (c >= _T('0') && c <= _T('9')) c-=_T('0');
else if (c >= _T('a') && c <= _T('f')) c-=_T('a')-10;
else if (c >= _T('A') && c <= _T('F')) c-=_T('A')-10;
else break;
v<<=4;
v+=c;
}
}
else if (*s == '0' && s[1] <= '7' && s[1] >= '0')
else if (*s == _T('0') && s[1] <= _T('7') && s[1] >= _T('0'))
{
for (;;)
{
int c=*(++s);
if (c >= '0' && c <= '7') c-='0';
if (c >= _T('0') && c <= _T('7')) c-=_T('0');
else break;
v<<=3;
v+=c;
@ -90,10 +92,10 @@ __int64 myatoi64(char *s)
else
{
int sign=0;
if (*s == '-') sign++; else s--;
if (*s == _T('-')) sign++; else s--;
for (;;)
{
int c=*(++s) - '0';
int c=*(++s) - _T('0');
if (c < 0 || c > 9) break;
v*=10;
v+=c;
@ -102,7 +104,7 @@ __int64 myatoi64(char *s)
}
// Support for simple ORed expressions
if (*s == '|')
if (*s == _T('|'))
{
v |= myatoi64(s+1);
}
@ -110,21 +112,21 @@ __int64 myatoi64(char *s)
return v;
}
void myitoa64(__int64 i, char *buffer)
void myitoa64(__int64 i, TCHAR *buffer)
{
char buf[128], *b = buf;
TCHAR buf[128], *b = buf;
if (i < 0)
{
*(buffer++) = '-';
*(buffer++) = _T('-');
i = -i;
}
if (i == 0) *(buffer++) = '0';
if (i == 0) *(buffer++) = _T('0');
else
{
while (i > 0)
{
*(b++) = '0' + ((char) (i%10));
*(b++) = _T('0') + ((TCHAR) (i%10));
i /= 10;
}
while (b > buf) *(buffer++) = *(--b);
@ -135,7 +137,7 @@ void myitoa64(__int64 i, char *buffer)
int popint64()
{
int value;
char *str;
TCHAR *str;
if ((str = system_popstring()) == NULL) return -1;
value = (int) myatoi64(str);
GlobalFree(str);
@ -144,14 +146,14 @@ int popint64()
void system_pushint(int value)
{
char buffer[1024];
wsprintf(buffer, "%d", value);
TCHAR buffer[1024];
wsprintf(buffer, _T("%d"), value);
system_pushstring(buffer);
}
char *copymem(char *output, char *input, int size)
TCHAR *copymem(TCHAR *output, TCHAR *input, int size)
{
char *out = output;
TCHAR *out = output;
if ((input != NULL) && (output != NULL))
while (size-- > 0) *(out++) = *(input++);
return output;