Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 16:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed some wchar to char translations.

Browse source 
svn path=/trunk/; revision=10751
This commit is contained in:
Hartmut Birr 2004-08-31 14:40:50 +00:00
parent d4aa975e56
commit b50ad1e5ec
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/lib/msvcrt/misc/environ.c
View file

@ -1,4 +1,4 @@
/* $Id: environ.c,v 1.10 2004/08/27 03:08:23 navaraf Exp $
/* $Id: environ.c,v 1.11 2004/08/31 14:40:50 hbirr Exp $
*
* dllmain.c
*
@ -232,7 +232,7 @@ int SetEnv(const wchar_t *option)
}
/* Create a copy of the option name. */
name = malloc(epos - option + 1);
name = malloc((epos - option + 1) * sizeof(wchar_t));
if (name == NULL)
return -1;
memcpy(name, option, (epos - option) * sizeof(wchar_t));
@ -285,7 +285,7 @@ int SetEnv(const wchar_t *option)
}
/* Create a multibyte copy of the option. */
size = WideCharToMultiByte(CP_ACP, 0, option, 0, NULL, 0, NULL, NULL);
size = WideCharToMultiByte(CP_ACP, 0, option, -1, NULL, 0, NULL, NULL);
mboption = malloc(size);
if (mboption == NULL)
{
@ -293,7 +293,7 @@ int SetEnv(const wchar_t *option)
free(woption);
return -1;
}
WideCharToMultiByte(CP_ACP, 0, option, 0, mboption, size, NULL, NULL);
WideCharToMultiByte(CP_ACP, 0, option, -1, mboption, size, NULL, NULL);
if (found)
{

6
reactos/lib/msvcrt/stdlib/putenv.c
View file

@ -16,11 +16,11 @@ int _putenv(const char* val)
int size, result;
wchar_t *woption;
size = MultiByteToWideChar(CP_ACP, 0, val, 0, NULL, 0);
woption = malloc(size);
size = MultiByteToWideChar(CP_ACP, 0, val, -1, NULL, 0);
woption = malloc(size* sizeof(wchar_t));
if (woption == NULL)
return -1;
MultiByteToWideChar(CP_ACP, 0, val, 0, woption, size);
MultiByteToWideChar(CP_ACP, 0, val, -1, woption, size);
result = SetEnv(woption);
free(woption);
return result;