From b50ad1e5ec35de2cb7a25edaad3e678ea0a7b2bf Mon Sep 17 00:00:00 2001
From: Hartmut Birr <osexpert@googlemail.com>
Date: Tue, 31 Aug 2004 14:40:50 +0000
Subject: [PATCH] - Fixed some wchar to char translations.

svn path=/trunk/; revision=10751
---
 reactos/lib/msvcrt/misc/environ.c  | 8 ++++----
 reactos/lib/msvcrt/stdlib/putenv.c | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/reactos/lib/msvcrt/misc/environ.c b/reactos/lib/msvcrt/misc/environ.c
index 3e63fd6e76a..6a9fd1af740 100644
--- a/reactos/lib/msvcrt/misc/environ.c
+++ b/reactos/lib/msvcrt/misc/environ.c
@@ -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)
       {
diff --git a/reactos/lib/msvcrt/stdlib/putenv.c b/reactos/lib/msvcrt/stdlib/putenv.c
index aa7a7480cb0..8921ee78cac 100644
--- a/reactos/lib/msvcrt/stdlib/putenv.c
+++ b/reactos/lib/msvcrt/stdlib/putenv.c
@@ -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;