Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b027a7db
Commit
b027a7db
authored
Mar 06, 2017
by
Akihiro Sagawa
Committed by
Alexandre Julliard
Mar 06, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use CP 1200 (Unicode) for Win32/Win64 version info.
Signed-off-by:
Akihiro Sagawa
<
sagawa.aki@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
79d01be4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
4 deletions
+23
-4
rsrc.rc
dlls/npmshtml/rsrc.rc
+1
-0
info.c
dlls/version/tests/info.c
+0
-2
wine_common_ver.rc
include/wine/wine_common_ver.rc
+22
-2
No files found.
dlls/npmshtml/rsrc.rc
View file @
b027a7db
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
#define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin"
#define WINE_FILEDESCRIPTION_STR "Wine ActiveX plugin"
#define WINE_FILENAME_STR "npmshtml.dll"
#define WINE_FILENAME_STR "npmshtml.dll"
#define WINE_CODEPAGE 04E4 /* need to set "Windows Multilingual" */
#define WINE_EXTRAVALUES \
#define WINE_EXTRAVALUES \
VALUE "OLESelfRegister", "" \
VALUE "OLESelfRegister", "" \
VALUE "MIMEType", "application/x-oleobject"
VALUE "MIMEType", "application/x-oleobject"
...
...
dlls/version/tests/info.c
View file @
b027a7db
...
@@ -664,7 +664,6 @@ static void test_GetFileVersionInfoEx(void)
...
@@ -664,7 +664,6 @@ static void test_GetFileVersionInfoEx(void)
todo_wine_if
(
lang
!=
english
)
todo_wine_if
(
lang
!=
english
)
ok
(
LOWORD
(
translation
)
==
lang
,
"got %u, expected lang is %u
\n
"
,
ok
(
LOWORD
(
translation
)
==
lang
,
"got %u, expected lang is %u
\n
"
,
LOWORD
(
translation
),
lang
);
LOWORD
(
translation
),
lang
);
todo_wine
ok
(
HIWORD
(
translation
)
==
unicode
,
"got %u, expected codepage is %u
\n
"
,
ok
(
HIWORD
(
translation
)
==
unicode
,
"got %u, expected codepage is %u
\n
"
,
HIWORD
(
translation
),
unicode
);
HIWORD
(
translation
),
unicode
);
...
@@ -706,7 +705,6 @@ static void test_GetFileVersionInfoEx(void)
...
@@ -706,7 +705,6 @@ static void test_GetFileVersionInfoEx(void)
else
else
ok
(
LOWORD
(
translation
)
==
english
,
"[%u] got %u, expected lang is %u
\n
"
,
ok
(
LOWORD
(
translation
)
==
english
,
"[%u] got %u, expected lang is %u
\n
"
,
i
,
LOWORD
(
translation
),
english
);
i
,
LOWORD
(
translation
),
english
);
todo_wine
ok
(
HIWORD
(
translation
)
==
unicode
,
"[%u] got %u, expected codepage is %u
\n
"
,
ok
(
HIWORD
(
translation
)
==
unicode
,
"[%u] got %u, expected codepage is %u
\n
"
,
i
,
HIWORD
(
translation
),
unicode
);
i
,
HIWORD
(
translation
),
unicode
);
...
...
include/wine/wine_common_ver.rc
View file @
b027a7db
...
@@ -48,6 +48,8 @@ never complain.
...
@@ -48,6 +48,8 @@ never complain.
#define WINE_VER_STRINGIZE2(x) #x
#define WINE_VER_STRINGIZE2(x) #x
#define WINE_VER_STRINGIZE(x) WINE_VER_STRINGIZE2(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
#ifndef WINE_FILEVERSION_STR
#define WINE_FILEVERSION_STR WINE_VER_STRINGIZE(WINE_FILEVERSION_MAJOR.WINE_FILEVERSION_MINOR.WINE_FILEVERSION_BUILD.WINE_FILEVERSION_PLATFORMID)
#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.
...
@@ -93,6 +95,22 @@ never complain.
#define WINE_EXTRAVALUES
#define WINE_EXTRAVALUES
#endif
#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
VS_VERSION_INFO VERSIONINFO
FILEVERSION WINE_FILEVERSION
FILEVERSION WINE_FILEVERSION
PRODUCTVERSION WINE_PRODUCTVERSION
PRODUCTVERSION WINE_PRODUCTVERSION
...
@@ -104,7 +122,8 @@ FILESUBTYPE WINE_FILESUBTYPE
...
@@ -104,7 +122,8 @@ FILESUBTYPE WINE_FILESUBTYPE
{
{
BLOCK "StringFileInfo"
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 "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */
VALUE "FileDescription", WINE_FILEDESCRIPTION_STR
VALUE "FileDescription", WINE_FILEDESCRIPTION_STR
...
@@ -119,6 +138,7 @@ FILESUBTYPE WINE_FILESUBTYPE
...
@@ -119,6 +138,7 @@ FILESUBTYPE WINE_FILESUBTYPE
}
}
BLOCK "VarFileInfo"
BLOCK "VarFileInfo"
{
{
VALUE "Translation", 0x0409, 0x04E4 /* LANG_ENGLISH/SUBLANG_DEFAULT, CP 1252 */
/* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */
VALUE "Translation", 0x0409, WINE_CODEPAGE_HEX
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment