branch update for HEAD-2003050101

[reactos.git] / lib / kernel32 / misc / env.c

diff --git a/lib/kernel32/misc/env.c b/lib/kernel32/misc/env.c
index 0e32c9e..03021cf 100644 (file)
--- a/lib/kernel32/misc/env.c
+++ b/lib/kernel32/misc/env.c
@@ -309,11 +309,8 @@ GetVersionExA(
    gives extra work to RtlUnicodeStringToAnsiString, but spares us an
    RtlInitUnicodeString round
   */
-   sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion) *
-   sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion[0]) -
-   1,
-   sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion) *
-   sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion[0]),
+  0,
+  sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion),
   oviVerInfo.szCSDVersion
  };
 
@@ -321,9 +318,7 @@ GetVersionExA(
  ANSI_STRING strVerStr =
  {
   0,
-   sizeof(((LPOSVERSIONINFOA)NULL)->szCSDVersion) *
-   sizeof(((LPOSVERSIONINFOA)NULL)->szCSDVersion[0]) -
-   1,
+  sizeof(((LPOSVERSIONINFOA)NULL)->szCSDVersion),
   lpVersionInformation->szCSDVersion
  };
 
@@ -355,10 +350,11 @@ GetVersionExA(
  /* null-terminate, just in case */
  oviVerInfo.szCSDVersion
  [
-  sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion) *
+  sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion) /
   sizeof(((LPOSVERSIONINFOW)NULL)->szCSDVersion[0]) -
   1
  ] = 0;
+ wstrVerStr.Length = wcslen(wstrVerStr.Buffer) * sizeof(WCHAR);
 
  /* convert the version string */
  nErrCode = RtlUnicodeStringToAnsiString(&strVerStr, &wstrVerStr, FALSE);