May 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : user32: Read "Layout Id" from registry in LoadKeyboardLayoutW.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 3e2b225428137fd425f677ef182204f3d553afab URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e2b225428137fd425f677ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 7 10:29:46 2021 +0200 user32: Read "Layout Id" from registry in LoadKeyboardLayoutW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index fc928af6723..5d9bbe14cd6 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1540,7 +1540,9 @@ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) */ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) { - DWORD tmp; + WCHAR layout_path[MAX_PATH], value[5]; + DWORD value_size, tmp; + HKEY hkey; HKL layout; FIXME_(keyboard)( "name %s, flags %x, semi-stub!\n", debugstr_w( name ), flags ); @@ -1548,6 +1550,18 @@ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) tmp = wcstoul( name, NULL, 16 ); layout = UlongToHandle( tmp ); + wcscpy( layout_path, L"System\\CurrentControlSet\\Control\\Keyboard Layouts\\" ); + wcscat( layout_path, name ); + + if (!RegOpenKeyW( HKEY_LOCAL_MACHINE, layout_path, &hkey )) + { + value_size = sizeof(value); + if (!RegGetValueW( hkey, NULL, L"Layout Id", RRF_RT_REG_SZ, NULL, (void *)&value, &value_size )) + layout = UlongToHandle( MAKELONG( LOWORD( tmp ), 0xf000 | (wcstoul( value, NULL, 16 ) & 0xfff) ) ); + + RegCloseKey( hkey ); + } + if ((flags & KLF_ACTIVATE) && ActivateKeyboardLayout( layout, 0 )) return layout; /* FIXME: semi-stub: returning default layout */

1 0

Rémi Bernon : user32: Cache current keyboard layout name.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 30460460e52731ef2979c4b528cb4fdc86dacac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30460460e52731ef2979c4b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 7 10:29:43 2021 +0200 user32: Cache current keyboard layout name. To avoid iterating the registry every time GetKeyboardLayoutNameW is called. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 10 ++++++++++ dlls/user32/user_private.h | 1 + 2 files changed, 11 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index adeb4f66804..1b2360ea083 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1129,6 +1129,7 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) */ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) { + struct user_thread_info *info = get_user_thread_info(); WCHAR klid[KL_NAMELENGTH], value[5]; DWORD value_size, tmp, i = 0; HKEY hkey; @@ -1142,6 +1143,12 @@ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) return FALSE; } + if (info->kbd_layout_id) + { + swprintf( name, KL_NAMELENGTH, L"%08X", info->kbd_layout_id ); + return TRUE; + } + layout = GetKeyboardLayout( 0 ); tmp = HandleToUlong( layout ); if (HIWORD( tmp ) == LOWORD( tmp )) tmp = LOWORD( tmp ); @@ -1166,6 +1173,8 @@ BOOL WINAPI GetKeyboardLayoutNameW( WCHAR *name ) RegCloseKey( hkey ); } + info->kbd_layout_id = wcstoul( name, NULL, 16 ); + TRACE_(keyboard)( "ret %s\n", debugstr_w( name ) ); return TRUE; } @@ -1394,6 +1403,7 @@ HKL WINAPI ActivateKeyboardLayout( HKL layout, UINT flags ) old_layout = info->kbd_layout; info->kbd_layout = layout; + if (old_layout != layout) info->kbd_layout_id = 0; if (!old_layout) return get_locale_kbd_layout(); return old_layout; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1c7ac3355bc..1bc41888891 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -198,6 +198,7 @@ struct user_thread_info ULONG_PTR GetMessageExtraInfoVal; /* Value for GetMessageExtraInfo */ struct user_key_state_info *key_state; /* Cache of global key state */ HKL kbd_layout; /* Current keyboard layout */ + DWORD kbd_layout_id; /* Current keyboard layout ID */ HWND top_window; /* Desktop window */ HWND msg_window; /* HWND_MESSAGE parent window */ struct rawinput_thread_data *rawinput; /* RawInput thread local data / buffer */

1 0

Jacek Caban : kernel32/tests: Add syscall context handling tests.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 058e9c773c157f1425d47bd61fb0070922194980 URL: https://source.winehq.org/git/wine.git/?a=commit;h=058e9c773c157f1425d47bd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 7 17:37:39 2021 +0200 kernel32/tests: Add syscall context handling tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 177 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 171 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=058e9c773c157f1425d4…

1 0

Rémi Bernon : user32: Implement KLF_ACTIVATE flag in LoadKeyboardLayoutW.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: bda517c08517f048b68a6f7cf152ef836b21a715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bda517c08517f048b68a6f7c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 7 10:29:45 2021 +0200 user32: Implement KLF_ACTIVATE flag in LoadKeyboardLayoutW. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 6f4636dffdb..fc928af6723 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1540,7 +1540,16 @@ BOOL WINAPI UnregisterHotKey(HWND hwnd,INT id) */ HKL WINAPI LoadKeyboardLayoutW( const WCHAR *name, UINT flags ) { + DWORD tmp; + HKL layout; + FIXME_(keyboard)( "name %s, flags %x, semi-stub!\n", debugstr_w( name ), flags ); + + tmp = wcstoul( name, NULL, 16 ); + layout = UlongToHandle( tmp ); + + if ((flags & KLF_ACTIVATE) && ActivateKeyboardLayout( layout, 0 )) return layout; + /* FIXME: semi-stub: returning default layout */ return get_locale_kbd_layout(); }

1 0

Tag wine-6.8 : Alexandre Julliard : Release 6.8
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: refs/tags/wine-6.8 Tag: 6a2ffce10cb2ba65869d6e596df19cf3241aeeaf URL: https://source.winehq.org/git/wine.git/?a=tag;h=6a2ffce10cb2ba65869d6e596df… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:40:28 2021 +0200 Release 6.8

1 0

Alexandre Julliard : Release 6.8.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 99e47361a37a4bf16de131401a0c231f86214a43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99e47361a37a4bf16de13140… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 7 22:40:28 2021 +0200 Release 6.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 970 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 462 insertions(+), 528 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=99e47361a37a4bf16de1…

1 0

Francois Gouget : user32/tests: Remove the Cygwin/XFree86 checks.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 07293cfe7db3e2d921049e19fc1f1dc86629f90a URL: https://source.winehq.org/git/wine.git/?a=commit;h=07293cfe7db3e2d921049e19… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 7 19:39:12 2021 +0200 user32/tests: Remove the Cygwin/XFree86 checks. They are very old and likely no longer relevant. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d49d69989f6..8fab62c951e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -821,13 +821,6 @@ static void test_SPI_SETBORDER( void ) /* 6 */ "Control Panel\\Desktop\\WindowMetrics","CaptionWidth", dpi); ncmsave.iCaptionWidth = CaptionWidth; - /* These tests hang when XFree86 4.0 for Windows is running (tested on - * WinNT, SP2, Cygwin/XFree 4.1.0. Skip the test when XFree86 is - * running. - */ - if (FindWindowA( NULL, "Cygwin/XFree86" )) - return; - trace("testing SPI_{GET,SET}BORDER\n"); SetLastError(0xdeadbeef); @@ -1127,13 +1120,6 @@ static void test_SPI_SETICONTITLEWRAP( void ) /* 26 */ unsigned int i; ICONMETRICSA im; - /* These tests hang when XFree86 4.0 for Windows is running (tested on - * WinNT, SP2, Cygwin/XFree 4.1.0. Skip the test when XFree86 is - * running. - */ - if (FindWindowA( NULL, "Cygwin/XFree86" )) - return; - trace("testing SPI_{GET,SET}ICONTITLEWRAP\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &old_b, 0 );

1 0

Piotr Caban : api-ms-win-core-console-l1-2-0: Add dll.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 24aba09015eb3ecbce99d148ac4b48cb173aba80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24aba09015eb3ecbce99d148… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 7 11:24:44 2021 +0200 api-ms-win-core-console-l1-2-0: Add dll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-console-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-console-l1-2-0.spec | 17 +++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 22 insertions(+) diff --git a/configure b/configure index c77184d996c..27d2b8505a3 100755 --- a/configure +++ b/configure @@ -934,6 +934,7 @@ enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_com_private_l1_1_0 enable_api_ms_win_core_comm_l1_1_0 enable_api_ms_win_core_console_l1_1_0 +enable_api_ms_win_core_console_l1_2_0 enable_api_ms_win_core_console_l2_1_0 enable_api_ms_win_core_crt_l1_1_0 enable_api_ms_win_core_crt_l2_1_0 @@ -20140,6 +20141,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_c wine_fn_config_makefile dlls/api-ms-win-core-com-private-l1-1-0 enable_api_ms_win_core_com_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-comm-l1-1-0 enable_api_ms_win_core_comm_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-core-console-l1-2-0 enable_api_ms_win_core_console_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-console-l2-1-0 enable_api_ms_win_core_console_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l1-1-0 enable_api_ms_win_core_crt_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-crt-l2-1-0 enable_api_ms_win_core_crt_l2_1_0 diff --git a/configure.ac b/configure.ac index b6e7b2e74f0..5578ee98edf 100644 --- a/configure.ac +++ b/configure.ac @@ -2802,6 +2802,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-com-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-comm-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-console-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-crt-l2-1-0) diff --git a/dlls/api-ms-win-core-console-l1-2-0/Makefile.in b/dlls/api-ms-win-core-console-l1-2-0/Makefile.in new file mode 100644 index 00000000000..2939ab875c6 --- /dev/null +++ b/dlls/api-ms-win-core-console-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-console-l1-2-0.dll diff --git a/dlls/api-ms-win-core-console-l1-2-0/api-ms-win-core-console-l1-2-0.spec b/dlls/api-ms-win-core-console-l1-2-0/api-ms-win-core-console-l1-2-0.spec new file mode 100644 index 00000000000..3720d6ca8c5 --- /dev/null +++ b/dlls/api-ms-win-core-console-l1-2-0/api-ms-win-core-console-l1-2-0.spec @@ -0,0 +1,17 @@ +@ stdcall AllocConsole() kernel32.AllocConsole +@ stdcall AttachConsole(long) kernel32.AttachConsole +@ stdcall FreeConsole() kernel32.FreeConsole +@ stdcall GetConsoleCP() kernel32.GetConsoleCP +@ stdcall GetConsoleMode(long ptr) kernel32.GetConsoleMode +@ stdcall GetConsoleOutputCP() kernel32.GetConsoleOutputCP +@ stdcall GetNumberOfConsoleInputEvents(long ptr) kernel32.GetNumberOfConsoleInputEvents +@ stdcall PeekConsoleInputA(ptr ptr long ptr) kernel32.PeekConsoleInputA +@ stdcall PeekConsoleInputW(ptr ptr long ptr) kernel32.PeekConsoleInputW +@ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA +@ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA +@ stdcall ReadConsoleInputW(long ptr long ptr) kernel32.ReadConsoleInputW +@ stdcall ReadConsoleW(long ptr long ptr ptr) kernel32.ReadConsoleW +@ stdcall SetConsoleCtrlHandler(ptr long) kernel32.SetConsoleCtrlHandler +@ stdcall SetConsoleMode(long long) kernel32.SetConsoleMode +@ stdcall WriteConsoleA(long ptr long ptr ptr) kernel32.WriteConsoleA +@ stdcall WriteConsoleW(long ptr long ptr ptr) kernel32.WriteConsoleW diff --git a/tools/make_specfiles b/tools/make_specfiles index 4e79d56667e..ef723fedd3a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -230,6 +230,7 @@ my @dll_groups = "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-synch-l1-2-1", "api-ms-win-core-console-l1-1-0", + "api-ms-win-core-console-l1-2-0", "api-ms-win-core-console-l2-1-0", "api-ms-win-core-file-l1-1-0", "api-ms-win-core-file-l1-2-1",

1 0

Nikolay Sivov : mfplat: Added MFCreateAudioMediaType().
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 85d4cabc84d93bae3e914a5869a81154fcc97de4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85d4cabc84d93bae3e914a58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 7 15:21:22 2021 +0300 mfplat: Added MFCreateAudioMediaType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 27 +++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index fb90053c605..92d219f26e1 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -3063,6 +3063,33 @@ HRESULT WINAPI MFCreateVideoMediaTypeFromSubtype(const GUID *subtype, IMFVideoMe return S_OK; } +/*********************************************************************** + * MFCreateAudioMediaType (mfplat.@) + */ +HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *format, IMFAudioMediaType **media_type) +{ + struct media_type *object; + HRESULT hr; + + TRACE("%p, %p.\n", format, media_type); + + if (!media_type) + return E_INVALIDARG; + + if (FAILED(hr = create_media_type(&object))) + return hr; + + if (FAILED(hr = MFInitMediaTypeFromWaveFormatEx(&object->IMFMediaType_iface, format, sizeof(*format) + format->cbSize))) + { + IMFMediaType_Release(&object->IMFMediaType_iface); + return hr; + } + + *media_type = &object->IMFAudioMediaType_iface; + + return S_OK; +} + static void media_type_get_ratio(IMFMediaType *media_type, const GUID *attr, UINT32 *numerator, UINT32 *denominator) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index e8dc01c200c..9a78c2fb0bc 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -43,7 +43,7 @@ @ stdcall MFCreateAlignedMemoryBuffer(long long ptr) @ stdcall MFCreateAsyncResult(ptr ptr ptr ptr) rtworkq.RtwqCreateAsyncResult @ stdcall MFCreateAttributes(ptr long) -@ stub MFCreateAudioMediaType +@ stdcall MFCreateAudioMediaType(ptr ptr) @ stdcall MFCreateCollection(ptr) @ stdcall MFCreateDXGIDeviceManager(ptr ptr) @ stdcall MFCreateDXGISurfaceBuffer(ptr ptr long long ptr) diff --git a/include/mfapi.h b/include/mfapi.h index 986f5b9e3e4..2ac70793d7a 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -508,6 +508,7 @@ HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BO HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IMFMediaBuffer **buffer); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **result); +HRESULT WINAPI MFCreateAudioMediaType(const WAVEFORMATEX *audioformat, IMFAudioMediaType **mediatype); HRESULT WINAPI MFCreateCollection(IMFCollection **collection); HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **manager); HRESULT WINAPI MFCreateDXGISurfaceBuffer(REFIID riid, IUnknown *surface, UINT subresource, BOOL bottomup,

1 0

Francois Gouget : urlmon/tests: Check that .Net is present in the user-agent string.
by Alexandre Julliard May 7, 2021

May 7, 2021

Module: wine Branch: master Commit: 516a6f731797cf74aa15b623faffe943780d07d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516a6f731797cf74aa15b623… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 7 15:20:01 2021 +0200 urlmon/tests: Check that .Net is present in the user-agent string. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/misc.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 2b3df65d5fc..2142e4a79e7 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1529,6 +1529,8 @@ static void test_user_agent(void) if(i < 8 && i != 1) ok(!strcmp(ua, str2), "unexpected UA for version %u %s, expected %s\n", i, wine_dbgstr_a(ua), wine_dbgstr_a(str2)); + if (winetest_debug > 1) + trace("version=%u user-agent=%s\n", i, wine_dbgstr_a(ua)); p += check_prefix(p, "Mozilla/"); p += check_prefix(p, i < 9 ? "4.0 (" : "5.0 ("); @@ -1544,6 +1546,7 @@ static void test_user_agent(void) }else if(sizeof(void*) == 8) { p += check_prefix(p, "Win64; "); #ifdef __x86_64__ + todo_wine p += check_prefix(p, "x64; "); #endif } @@ -1559,12 +1562,17 @@ static void test_user_agent(void) } if(i == 11) { p += check_prefix(p, "; rv:11.0) like Gecko"); + }else if (i >= 9) { + p += check_prefix(p, ")"); }else { - if(i != 1) - ok(*p == ';' || *p == ')', "unexpected suffix %s for version %u\n", - wine_dbgstr_a(p), i); - if(i < 9) - p = strchr(p, ')'); +#ifdef __x86_64__ + todo_wine +#endif + /* This assumes that either p points at some property before + * '; .NET', or that there is more than one such occurence. + */ + ok(strstr(p, "; .NET") != NULL, "no '; .NET' in %s\n", wine_dbgstr_a(p)); + p = strchr(p, ')'); p += check_prefix(p, ")"); }

1 0