From 4d728cef69cb2727c1e3f665cceff13b8ab9c19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Sun, 20 Feb 2005 10:48:44 +0000 Subject: [PATCH] Need to W->A convert the ReactOS version string too svn path=/trunk/; revision=13670 --- reactos/lib/kernel32/misc/env.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/reactos/lib/kernel32/misc/env.c b/reactos/lib/kernel32/misc/env.c index 09f2c720a03..239448f782c 100644 --- a/reactos/lib/kernel32/misc/env.c +++ b/reactos/lib/kernel32/misc/env.c @@ -336,12 +336,23 @@ GetVersionExA( lpVersionInformation->dwBuildNumber = viw.dwBuildNumber; lpVersionInformation->dwPlatformId = viw.dwPlatformId; + /* convert the win version string */ RtlInitUnicodeString(&CSDVersionW, viw.szCSDVersion); CSDVersionA.Length = 0; CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion); CSDVersionA.Buffer = lpVersionInformation->szCSDVersion; + RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE); + + /* convert the ReactOS version string */ + CSDVersionW.Buffer = viw.szCSDVersion + CSDVersionW.Length / sizeof(WCHAR) + 1; + CSDVersionW.MaximumLength = sizeof(viw.szCSDVersion) - (CSDVersionW.Length + sizeof(WCHAR)); + CSDVersionW.Length = wcslen(CSDVersionW.Buffer) * sizeof(WCHAR); + CSDVersionA.Buffer = lpVersionInformation->szCSDVersion + CSDVersionA.Length + 1; + CSDVersionA.MaximumLength = sizeof(lpVersionInformation->szCSDVersion) - (CSDVersionA.Length + 1); + CSDVersionA.Length = 0; + RtlUnicodeStringToAnsiString(&CSDVersionA, &CSDVersionW, FALSE); /* copy back the extended fields */