system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00
Code Issues Projects Releases Wiki Activity

Use CP 1200 (Unicode) for Win32/Win64 version info.

Browse Source 
Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Akihiro Sagawa 2017-03-06 23:49:43 +09:00 committed by Alexandre Julliard
parent 79d01be436
commit b027a7db50
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/npmshtml/rsrc.rc
View File

@ -18,6 +18,7 @@
#define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin"
#define WINE_FILENAME_STR "npmshtml.dll"
#define WINE_CODEPAGE 04E4 /* need to set "Windows Multilingual" */
#define WINE_EXTRAVALUES \
VALUE "OLESelfRegister", "" \
VALUE "MIMEType", "application/x-oleobject"

2
dlls/version/tests/info.c
View File

@ -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);

24
include/wine/wine_common_ver.rc
View File

@ -48,6 +48,8 @@ never complain.
#define WINE_VER_STRINGIZE2(x) #x
#define WINE_VER_STRINGIZE(x) WINE_VER_STRINGIZE2(x)
#define WINE_VER_HEXPREFIX2(x) 0x ## x
#define WINE_VER_HEXPREFIX(x) WINE_VER_HEXPREFIX2(x)
#ifndef WINE_FILEVERSION_STR
#define WINE_FILEVERSION_STR WINE_VER_STRINGIZE(WINE_FILEVERSION_MAJOR.WINE_FILEVERSION_MINOR.WINE_FILEVERSION_BUILD.WINE_FILEVERSION_PLATFORMID)
@ -93,6 +95,22 @@ never complain.
#define WINE_EXTRAVALUES
#endif
#ifndef WINE_CODEPAGE
#ifdef _WIN32
#define WINE_CODEPAGE 04B0 /* CP1200 (Unicode) */
#else
#define WINE_CODEPAGE 04E4 /* CP1252 for Win16 */
#endif
#endif
#ifndef WINE_CODEPAGE_STR
#define WINE_CODEPAGE_STR WINE_VER_STRINGIZE(WINE_CODEPAGE)
#endif
#ifndef WINE_CODEPAGE_HEX
#define WINE_CODEPAGE_HEX WINE_VER_HEXPREFIX(WINE_CODEPAGE)
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION WINE_FILEVERSION
PRODUCTVERSION WINE_PRODUCTVERSION
@ -104,7 +122,8 @@ FILESUBTYPE WINE_FILESUBTYPE
{
BLOCK "StringFileInfo"
{
BLOCK "040904E4" /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */
/* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */
BLOCK "0409" WINE_CODEPAGE_STR
{
VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */
VALUE "FileDescription", WINE_FILEDESCRIPTION_STR
@ -119,6 +138,7 @@ FILESUBTYPE WINE_FILESUBTYPE
}
BLOCK "VarFileInfo"
{
VALUE "Translation", 0x0409, 0x04E4 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */
/* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */
VALUE "Translation", 0x0409, WINE_CODEPAGE_HEX
}
}