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

[Alexandre Julliard]

Akihiro Sagawa <sagawa.aki at gmail.com> writes:

> [v2] Fix test failures in mshtml.dll caused by npmshtml.dll.
> According to Gecko Plugin API Reference[1], plugin's version stamp must
> be set to English US and Windows Multilingual, i.e. "040904E4".
> [1] https://developer.mozilla.org/en-US/docs/Plugins/Guide/Plug-in_Development_Overview#MS_Windows
>
> Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
> ---
>  dlls/npmshtml/rsrc.rc           |  1 +
>  dlls/version/tests/info.c       |  2 --
>  include/wine/wine_common_ver.rc | 24 ++++++++++++++++++++++--
>  3 files changed, 23 insertions(+), 4 deletions(-)

It's still failing here:

../../../tools/runtest -q -P wine -T ../../.. -M mshtml.dll -p mshtml_test.exe.so htmldoc && touch htmldoc.ok
htmldoc.c:6287: Test failed: open failed: 80040152
wine: Unhandled page fault on read access to 0xdeadbeef at address 0x7ed051dd (thread 0154), starting debugger...
Unhandled exception: page fault on read access to 0xdeadbeef in 32-bit code (0x7ed051dd).
Register dump:
 CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b
 EIP:7ed051dd ESP:0033fc20 EBP:0033fc78 EFLAGS:00010202(  R- --  I   - - - )
 EAX:deadbeef EBX:7ed6a000 ECX:00000001 EDX:7ed80f00
 ESI:0000188d EDI:7ed4388a
Stack dump:
0x0033fc20:  00000001 7ed449d1 80040152 7ed050ad
0x0033fc30:  005e0000 00689650 005e8de8 00000000
0x0033fc40:  7ed39473 7ed7f1a0 80040152 7ed4388a
0x0033fc50:  005b4d80 7ed4388a 005e8de8 deadbeef
0x0033fc60:  7ed4521a 00000000 7ed04f0e 7ed6a000
0x0033fc70:  005b4d80 7ed4388a 0033fcd8 7ed0ddd9
Backtrace:
=>0 0x7ed051dd test_open_window+0x2dd(doc=<is not available>, do_block=0) [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/mshtml.h:51848] in mshtml_test (0x0033fc78)
  1 0x7ed0ddd9 test_HTMLDocument_http+0x678(with_wbapp=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/htmldoc.c:7877] in mshtml_test (0x0033fcd8)
  2 0x7ed128d9 func_htmldoc+0xda8() [/home/julliard/wine/wine/dlls/mshtml/tests/htmldoc.c:8742] in mshtml_test (0x0033fd58)
  3 0x7ecc305d main+0x25c(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/wine/test.h:589] in mshtml_test (0x0033fe08)
  4 0x7ed38d8b __wine_spec_exe_entry+0x4a(peb=<couldn't compute location>) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in mshtml_test (0x0033fe48)
  5 0x7b45e56c call_process_entry+0xb() in kernel32 (0x0033fe68)
  6 0x7b45f4a9 start_process+0x68(entry=<couldn't compute location>) [/home/julliard/wine/wine/dlls/kernel32/process.c:1116] in kernel32 (0x0033fea8)
  7 0x7bc8071c call_thread_func_wrapper+0xb() in ntdll (0x0033fec8)
  8 0x7bc834d9 call_thread_func+0xa8(entry=0x7b45f440, arg=0x7ed38d40, frame=0x33ffc8) [/home/julliard/wine/wine/dlls/ntdll/signal_i386.c:2759] in ntdll (0x0033ffa8)
  9 0x7bc806fa call_thread_entry_point+0x11() in ntdll (0x0033ffc8)
  10 0x7bc53f73 start_process+0x12(arg=0xffcb6418) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3054] in ntdll (0x0033ffe8)
  11 0xf756d8dd __x86.get_pc_thunk.di+0x2a() in libwine.so.1 (0x00000000)
  12 0xf756da40 wine_switch_to_stack+0x1f(func=0x7bc53f60, arg=0xffcb6418, stack=0x340000) [/home/julliard/wine/wine/libs/wine/port.c:77] in libwine.so.1 (0xffcb63e8)
  13 0x7bc59b26 LdrInitializeThunk+0x235(kernel_start=<couldn't compute location>, unknown2=<couldn't compute location>, unknown3=<couldn't compute location>, unknown4=<couldn't compute location>) [/home/julliard/wine/wine/dlls/ntdll/loader.c:3115] in ntdll (0xffcb6438)
  14 0x7b4653af __wine_kernel_init+0xa4e() [/home/julliard/wine/wine/dlls/kernel32/process.c:1310] in kernel32 (0xffcb7328)
  15 0x7bc5a983 __wine_process_init+0x152() [/home/julliard/wine/wine/dlls/ntdll/loader.c:3324] in ntdll (0xffcb7398)
  16 0xf756bb43 wine_init+0x2a2(argc=0x3, argv=0xffcb78e4, error="", error_size=0x400) [/home/julliard/wine/wine/libs/wine/loader.c:956] in libwine.so.1 (0xffcb73e8)
  17 0x7c000b58 main+0x97(argc=<is not available>, argv=<is not available>) [/home/julliard/wine/wine/loader/main.c:254] in <wine-loader> (0xffcb7838)
  18 0xf7375276 __libc_start_main+0xf5() in libc.so.6 (0x00000000)
0x7ed051dd test_open_window+0x2dd [/home/julliard/wine/wine/dlls/mshtml/tests/../../../include/mshtml.h:51848] in mshtml_test: movl	0x0(%eax),%edx
51848	    return This->lpVtbl->close(This);

-- 
Alexandre Julliard
julliard at winehq.org