Jim Park's Unicode NSIS merging - Step 4 : merging more TCHAR stuff that shouldn't have any impact
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6041 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
8ab72b9ece
commit
acf9a8c21f
41 changed files with 937 additions and 586 deletions
|
@ -151,18 +151,21 @@ void system_pushint(int value)
|
|||
system_pushstring(buffer);
|
||||
}
|
||||
|
||||
TCHAR *copymem(TCHAR *output, TCHAR *input, int size)
|
||||
void *copymem(void *output, void *input, size_t cbSize)
|
||||
{
|
||||
TCHAR *out = output;
|
||||
if ((input != NULL) && (output != NULL))
|
||||
while (size-- > 0) *(out++) = *(input++);
|
||||
return output;
|
||||
BYTE *out = (BYTE*) output;
|
||||
BYTE *in = (BYTE*) input;
|
||||
if ((input != NULL) && (output != NULL))
|
||||
{
|
||||
while (cbSize-- > 0) *(out++) = *(in++);
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
HANDLE GlobalCopy(HANDLE Old)
|
||||
{
|
||||
SIZE_T size = GlobalSize(Old);
|
||||
return copymem(GlobalAlloc(GPTR, size), Old, (int) size);
|
||||
size_t size = GlobalSize(Old);
|
||||
return copymem(GlobalAlloc(GPTR, size), Old, size);
|
||||
}
|
||||
|
||||
UINT_PTR NSISCallback(enum NSPIM msg)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue