From: Akihiro Sagawa Subject: [3/4] Use CP 1200 (Unicode) for Win32/Win64 version info. Message-Id: <20170213234129.8284.375B48EC@gmail.com> Date: Mon, 13 Feb 2017 23:46:10 +0900 Signed-off-by: Akihiro Sagawa --- dlls/version/tests/info.c | 2 -- include/wine/wine_common_ver.rc | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index d3420bc..c033aa9 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -664,7 +664,6 @@ static void test_GetFileVersionInfoEx(void) todo_wine_if(lang != english) ok(LOWORD(translation) == lang, "got %u, expected lang is %u\n", LOWORD(translation), lang); - todo_wine ok(HIWORD(translation) == unicode, "got %u, expected codepage is %u\n", HIWORD(translation), unicode); @@ -706,7 +705,6 @@ static void test_GetFileVersionInfoEx(void) else ok(LOWORD(translation) == english, "[%u] got %u, expected lang is %u\n", i, LOWORD(translation), english); - todo_wine ok(HIWORD(translation) == unicode, "[%u] got %u, expected codepage is %u\n", i, HIWORD(translation), unicode); diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index 76ddabf..d021988 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -104,7 +104,11 @@ FILESUBTYPE WINE_FILESUBTYPE { BLOCK "StringFileInfo" { - BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */ +#ifdef _WIN32 + BLOCK "040904B0" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1200 (Unicode) */ +#else + BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 for Win16 */ +#endif { VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */ VALUE "FileDescription", WINE_FILEDESCRIPTION_STR @@ -119,6 +123,10 @@ FILESUBTYPE WINE_FILESUBTYPE } BLOCK "VarFileInfo" { +#ifdef _WIN32 + VALUE "Translation", 0x0409, 0x04B0 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1200 */ +#else VALUE "Translation", 0x0409, 0x04E4 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */ +#endif } }