Need to W->A convert the ReactOS version string too Modified: trunk/reactos/lib/kernel32/misc/env.c _____
Modified: trunk/reactos/lib/kernel32/misc/env.c --- trunk/reactos/lib/kernel32/misc/env.c 2005-02-20 10:43:00 UTC (rev 13669) +++ trunk/reactos/lib/kernel32/misc/env.c 2005-02-20 10:48:44 UTC (rev 13670) @@ -336,6 +336,7 @@
lpVersionInformation->dwBuildNumber = viw.dwBuildNumber; lpVersionInformation->dwPlatformId = viw.dwPlatformId;
+ /* convert the win version string */ RtlInitUnicodeString(&CSDVersionW, viw.szCSDVersion);
CSDVersionA.Length = 0; @@ -343,6 +344,16 @@ 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 */ if(viw.dwOSVersionInfoSize == sizeof(OSVERSIONINFOEXW))