November 2017 - Wine-Commits

Marcus Meissner : shell32: Avoid a crash in testsuite.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 5350eea78dec539919babcdd6ca841117e24f24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5350eea78dec539919babcdd6… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Nov 13 13:31:31 2017 +0100 shell32: Avoid a crash in testsuite. This happens on wow32 builds, we try to call a 64bit program via the generic typelib marshalling and disp is NULL. We still fail, just do not pop up the crash dialog. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelldispatch.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 9825c3a..ce3b1a3 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1088,6 +1088,9 @@ todo_wine { IUnknown *unk; ok(disp != NULL, "got %p\n", disp); + + if (disp == NULL) goto skip_disp_tests; + ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ @@ -1165,6 +1168,7 @@ if (hr == S_OK) { IServiceProvider_Release(sp); IDispatch_Release(disp); } +skip_disp_tests: disp = (void*)0xdeadbeef; ret = 0xdead;

1 0

Alexandre Julliard : kernel32: Keep the sublanguage specified by the script name when looking for the default.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: c5a39bd98f5388d48b728d19ce466665fa37bfbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a39bd98f5388d48b728d19c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 19:43:13 2017 +0100 kernel32: Keep the sublanguage specified by the script name when looking for the default. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 38 +++++++++++++++++++++----------------- dlls/kernel32/tests/locale.c | 24 +++++++++++------------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 47d0c89..53bd8a4 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -362,31 +362,36 @@ static UINT find_charset( const WCHAR *name ) return 0; } -static WORD get_default_sublang(LCID lang) +static LANGID get_default_sublang( LANGID lang ) { - switch (PRIMARYLANGID(lang)) + switch (lang) { - case LANG_SPANISH: - return SUBLANG_SPANISH_MODERN; - case LANG_CHINESE: - return SUBLANG_CHINESE_SIMPLIFIED; - default: - return SUBLANG_DEFAULT; + case MAKELANGID( LANG_SPANISH, SUBLANG_NEUTRAL ): + return MAKELANGID( LANG_SPANISH, SUBLANG_SPANISH_MODERN ); + case MAKELANGID( LANG_CHINESE, SUBLANG_NEUTRAL ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SINGAPORE ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ); + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL ): + case MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_MACAU ): + return MAKELANGID( LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ); } + if (SUBLANGID( lang ) == SUBLANG_NEUTRAL) lang = MAKELANGID( PRIMARYLANGID(lang), SUBLANG_DEFAULT ); + return lang; } /*********************************************************************** * find_locale_id_callback */ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, - LPCWSTR name, WORD LangID, LPARAM lParam ) + LPCWSTR name, LANGID lang, LPARAM lParam ) { struct locale_name *data = (struct locale_name *)lParam; WCHAR buffer[128]; int matches = 0; - LCID lcid = MAKELCID( LangID, SORT_DEFAULT ); /* FIXME: handle sort order */ + LCID lcid = MAKELCID( lang, SORT_DEFAULT ); /* FIXME: handle sort order */ - if (PRIMARYLANGID(LangID) == LANG_NEUTRAL) return TRUE; /* continue search */ + if (PRIMARYLANGID(lang) == LANG_NEUTRAL) return TRUE; /* continue search */ /* first check exact name */ if (data->win_name[0] && @@ -435,7 +440,8 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, } else /* match default language */ { - if (SUBLANGID(LangID) == get_default_sublang( LangID )) matches++; + LANGID def_lang = data->script ? lang : MAKELANGID( PRIMARYLANGID(lang), LANG_NEUTRAL ); + if (lang == get_default_sublang( def_lang )) matches++; } if (data->codepage) @@ -1720,8 +1726,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) lang_id = LANGIDFROMLCID( lcid ); /* replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */ - if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) - lang_id = MAKELANGID(PRIMARYLANGID(lang_id), get_default_sublang( lang_id )); + if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) lang_id = get_default_sublang( lang_id ); if (!(hrsrc = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, ULongToPtr((lctype >> 4) + 1), lang_id ))) @@ -2846,7 +2851,7 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid ) langid = LANGIDFROMLCID(lcid); if (SUBLANGID(langid) == SUBLANG_NEUTRAL) { - langid = MAKELANGID(PRIMARYLANGID(langid), get_default_sublang( langid )); + langid = get_default_sublang( langid ); lcid = MAKELCID(langid, SORTIDFROMLCID(lcid)); } } @@ -4281,8 +4286,7 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz /* FIXME: Is it correct to use the system default langid? */ langId = GetSystemDefaultLangID(); - if (SUBLANGID(langId) == SUBLANG_NEUTRAL) - langId = MAKELANGID(PRIMARYLANGID(langId), get_default_sublang( langId )); + if (SUBLANGID(langId) == SUBLANG_NEUTRAL) langId = get_default_sublang( langId ); hResource = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, szResourceName, langId ); diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 11a5788..97ed6fa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2781,36 +2781,35 @@ static void test_LocaleNameToLCID(void) /* zh-Hant has LCID 0x7c04, but LocaleNameToLCID actually returns 0x0c04, which is the LCID of zh-HK */ lcid = pLocaleNameToLCID(zhHantW, 0); - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHantW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); - todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); /* check that 0x7c04 also works and is mapped to zh-HK */ ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE_TRADITIONAL, SUBLANG_CHINESE_TRADITIONAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); todo_wine ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHantW), ret); - todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHantW), wine_dbgstr_w(buffer)); /* zh-hant */ lcid = pLocaleNameToLCID(zhhantW, 0); - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), - "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhantW), - MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT)); + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_HONGKONG), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhantW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhhantW), ret); - todo_wine ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhhkW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhhantW), wine_dbgstr_w(buffer)); /* zh-Hans has LCID 0x0004, but LocaleNameToLCID actually returns 0x0804, which is the LCID of zh-CN */ lcid = pLocaleNameToLCID(zhHansW, 0); /* check that LocaleNameToLCID actually returns 0x0804 */ - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhHansW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhHansW), ret); - todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhHansW), wine_dbgstr_w(buffer)); /* check that 0x0004 also works and is mapped to zh-CN */ ret = pLCIDToLocaleName(MAKELANGID(LANG_CHINESE, SUBLANG_NEUTRAL), buffer, sizeof(buffer)/sizeof(WCHAR), 0); @@ -2820,12 +2819,11 @@ static void test_LocaleNameToLCID(void) /* zh-hans */ lcid = pLocaleNameToLCID(zhhansW, 0); - todo_wine ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), - "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhansW), - MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT)); + ok(lcid == MAKELCID(MAKELANGID(LANG_CHINESE_SIMPLIFIED, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), + "%s: got wrong lcid 0x%04x\n", wine_dbgstr_w(zhhansW), lcid); ret = pLCIDToLocaleName(lcid, buffer, sizeof(buffer)/sizeof(WCHAR), 0); ok(ret > 0, "%s: got %d\n", wine_dbgstr_w(zhhansW), ret); - todo_wine ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", + ok(!lstrcmpW(zhcnW, buffer), "%s: got wrong locale name %s\n", wine_dbgstr_w(zhhansW), wine_dbgstr_w(buffer)); } }

1 0

Kimmo Myllyvirta : xaudio2: Add support for float formats with more than 2 channels.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 8b94c5b51c2c706dd8fa42cec4631f386f3a8562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b94c5b51c2c706dd8fa42cec… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sun Nov 12 12:35:34 2017 +0200 xaudio2: Add support for float formats with more than 2 channels. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a091629..13f5916 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -499,6 +499,14 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) return AL_FORMAT_MONO_FLOAT32; case 2: return AL_FORMAT_STEREO_FLOAT32; + case 4: + return AL_FORMAT_QUAD32; + case 6: + return AL_FORMAT_51CHN32; + case 7: + return AL_FORMAT_61CHN32; + case 8: + return AL_FORMAT_71CHN32; } } }

1 0

Dmitry Timoshkov : server: Deliver an async io APC to any thread alive in the process.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 9b0c222f39f8c5cd6634394b3aae8804db87d937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0c222f39f8c5cd6634394b3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 7 11:11:10 2017 +0800 server: Deliver an async io APC to any thread alive in the process. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 +----- server/async.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4cbc1e9..cb8b7ce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11292,15 +11292,13 @@ static void iocp_async_read_thread_closesocket(SOCKET src) ok(!ret, "got %d\n", ret); todo_wine ok(GetLastError() == ERROR_CONNECTION_ABORTED || GetLastError() == ERROR_NETNAME_DELETED /* XP */, "got %u\n", GetLastError()); -todo_wine ok(!bytes, "got bytes %u\n", bytes); -todo_wine ok(key == 0x12345678, "got key %#lx\n", key); -todo_wine ok(ovl_iocp == &recv_info.ovl, "got ovl %p\n", ovl_iocp); if (ovl_iocp) { ok(!ovl_iocp->InternalHigh, "got %#lx\n", ovl_iocp->InternalHigh); +todo_wine ok(ovl_iocp->Internal == (ULONG)STATUS_CONNECTION_ABORTED || ovl_iocp->Internal == (ULONG)STATUS_LOCAL_DISCONNECT /* XP */, "got %#lx\n", ovl_iocp->Internal); } @@ -11417,7 +11415,6 @@ static void iocp_async_read_thread(SOCKET src, SOCKET dst) Sleep(100); memset(&msg, 0, sizeof(msg)); ret = PeekMessageA(&msg, hwnd, WM_SOCKET, WM_SOCKET, PM_REMOVE); -todo_wine ok(!ret || broken(msg.hwnd == hwnd) /* XP */, "got %04x,%08lx,%08lx\n", msg.message, msg.wParam, msg.lParam); if (ret) /* document XP behaviour */ { @@ -11432,7 +11429,6 @@ todo_wine ovl_iocp = (void *)0xdeadbeef; SetLastError(0xdeadbeef); ret = GetQueuedCompletionStatus(port, &bytes, &key, &ovl_iocp, 100); -todo_wine ok(ret || broken(GetLastError() == WAIT_TIMEOUT) /* XP */, "got %u\n", GetLastError()); if (ret) { diff --git a/server/async.c b/server/async.c index 4e89e1e..4f1bcf1 100644 --- a/server/async.c +++ b/server/async.c @@ -167,7 +167,7 @@ void async_terminate( struct async *async, unsigned int status ) data.async_io.user = async->data.user; data.async_io.sb = async->data.iosb; data.async_io.status = status; - thread_queue_apc( NULL, async->thread, &async->obj, &data ); + thread_queue_apc( async->thread->process, async->thread, &async->obj, &data ); } else async_set_result( &async->obj, STATUS_SUCCESS, 0 ); }

1 0

Andrey Semakin : winemine: Add confirmation to reset results button.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 247faa857fff9e929c5c7e74859af38aa889035f URL: http://source.winehq.org/git/wine.git/?a=commit;h=247faa857fff9e929c5c7e748… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sat Nov 11 00:24:03 2017 +0100 winemine: Add confirmation to reset results button. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 54 +++++++++++++++++++++++-------------------- po/bg.po | 54 +++++++++++++++++++++++-------------------- po/ca.po | 54 +++++++++++++++++++++++-------------------- po/cs.po | 54 +++++++++++++++++++++++-------------------- po/da.po | 54 +++++++++++++++++++++++-------------------- po/de.po | 54 +++++++++++++++++++++++-------------------- po/el.po | 54 +++++++++++++++++++++++-------------------- po/en.po | 54 +++++++++++++++++++++++-------------------- po/en_US.po | 54 +++++++++++++++++++++++-------------------- po/eo.po | 54 +++++++++++++++++++++++-------------------- po/es.po | 54 +++++++++++++++++++++++-------------------- po/fa.po | 54 +++++++++++++++++++++++-------------------- po/fi.po | 54 +++++++++++++++++++++++-------------------- po/fr.po | 54 +++++++++++++++++++++++-------------------- po/he.po | 54 +++++++++++++++++++++++-------------------- po/hi.po | 54 +++++++++++++++++++++++-------------------- po/hr.po | 54 +++++++++++++++++++++++-------------------- po/hu.po | 54 +++++++++++++++++++++++-------------------- po/it.po | 54 +++++++++++++++++++++++-------------------- po/ja.po | 54 +++++++++++++++++++++++-------------------- po/ko.po | 54 +++++++++++++++++++++++-------------------- po/lt.po | 54 +++++++++++++++++++++++-------------------- po/ml.po | 54 +++++++++++++++++++++++-------------------- po/nb_NO.po | 54 +++++++++++++++++++++++-------------------- po/nl.po | 54 +++++++++++++++++++++++-------------------- po/or.po | 54 +++++++++++++++++++++++-------------------- po/pa.po | 54 +++++++++++++++++++++++-------------------- po/pl.po | 54 +++++++++++++++++++++++-------------------- po/pt_BR.po | 54 +++++++++++++++++++++++-------------------- po/pt_PT.po | 54 +++++++++++++++++++++++-------------------- po/rm.po | 54 +++++++++++++++++++++++-------------------- po/ro.po | 54 +++++++++++++++++++++++-------------------- po/ru.po | 54 +++++++++++++++++++++++-------------------- po/sk.po | 54 +++++++++++++++++++++++-------------------- po/sl.po | 54 +++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 54 +++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 54 +++++++++++++++++++++++-------------------- po/sv.po | 54 +++++++++++++++++++++++-------------------- po/te.po | 54 +++++++++++++++++++++++-------------------- po/th.po | 54 +++++++++++++++++++++++-------------------- po/tr.po | 54 +++++++++++++++++++++++-------------------- po/uk.po | 54 +++++++++++++++++++++++-------------------- po/wa.po | 54 +++++++++++++++++++++++-------------------- po/wine.pot | 54 +++++++++++++++++++++++-------------------- po/zh_CN.po | 54 +++++++++++++++++++++++-------------------- po/zh_TW.po | 54 +++++++++++++++++++++++-------------------- programs/winemine/dialog.c | 8 +++++++ programs/winemine/resource.h | 3 +++ programs/winemine/winemine.rc | 8 ++++--- 49 files changed, 1350 insertions(+), 1153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=247faa857fff9e929c5c7…

1 0

Michael Müller : advapi32: Implement GetExplicitEntriesFromAclW.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 07b629e8e4472785809bcdf9820922c2b874c313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b629e8e4472785809bcdf98… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Nov 10 15:50:31 2017 -0600 advapi32: Implement GetExplicitEntriesFromAclW. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 84 ++++++++++++++++++++++-- dlls/advapi32/tests/security.c | 142 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07b629e8e4472785809bc…

1 0

Alexandre Julliard : kernel32: Also match script name when looking for a locale.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: de7e687801e3e66c27c0b9822767e37f52d93c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7e687801e3e66c27c0b9822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 19:04:04 2017 +0100 kernel32: Also match script name when looking for a locale. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 64966e5..47d0c89 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -406,6 +406,24 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, if (strcmpiW( buffer, data->lang )) return TRUE; matches++; /* language name matched */ + if (data->script) + { + if (GetLocaleInfoW( lcid, LOCALE_SSCRIPTS | LOCALE_NOUSEROVERRIDE, + buffer, sizeof(buffer)/sizeof(WCHAR) )) + { + const WCHAR *p = buffer; + unsigned int len = strlenW( data->script ); + while (*p) + { + if (!strncmpiW( p, data->script, len ) && (!p[len] || p[len] == ';')) break; + if (!(p = strchrW( p, ';'))) goto done; + p++; + } + if (!*p) goto done; + matches++; /* script matched */ + } + } + if (data->country) { if (GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME|LOCALE_NOUSEROVERRIDE, @@ -489,16 +507,24 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) strcpyW( name->win_name, name->lang ); *p++ = 0; name->country = p; - if (!(p = strpbrkW( p, winsepW ))) goto done; - if (*p == '-') + if ((p = strpbrkW( p, winsepW )) && *p == '-') { *p++ = 0; name->script = name->country; name->country = p; - if (!(p = strpbrkW( p, winsepW ))) goto done; + p = strpbrkW( p, winsepW ); + } + if (p) + { + *p++ = 0; + name->modifier = p; + } + /* second value can be script or country, check length to resolve the ambiguity */ + if (!name->script && strlenW( name->country ) == 4) + { + name->script = name->country; + name->country = NULL; } - *p++ = 0; - name->modifier = p; } else /* Unix format */ {

1 0

Piotr Caban : msvcrt/tests: Rewrite clock() tests.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 20a11fd6ccef0bb3f96e86dc89a60e002a04b5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a11fd6ccef0bb3f96e86dc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 13 15:22:50 2017 +0100 msvcrt/tests: Rewrite clock() tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 6865e3d..bc1c6c8 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -875,18 +875,18 @@ static void test__tzset(void) static void test_clock(void) { - static const int THRESH = 50; - clock_t s, e; - int i; - - for (i = 0; i < 10; i++) - { - s = clock(); - Sleep(1000); - e = clock(); - - ok(abs((e-s) - 1000) < THRESH, "clock off on loop %i: %i\n", i, e-s); - } + static const int THRESH = 100; + FILETIME start, cur; + int c, expect; + + ok(GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur), + "GetProcessTimes failed with error: %d\n", GetLastError()); + GetSystemTimeAsFileTime(&cur); + expect = (((LONGLONG)cur.dwHighDateTime<<32)+cur.dwLowDateTime - + ((LONGLONG)start.dwHighDateTime<<32)-start.dwLowDateTime) / 10000; + + c = clock(); + ok(abs(c-expect) < THRESH, "clock() = %d, expected %d\n", c, expect); } START_TEST(time)

1 0

Rafał Harabień : kernel32/tests: Check last error after successful Tls/FlsGetValue calls.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 56424c5b6fdabc59de188a1971d17beccfff73b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56424c5b6fdabc59de188a197… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Mon Nov 13 00:32:19 2017 +0100 kernel32/tests: Check last error after successful Tls/FlsGetValue calls. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 334bdf4..5918a58 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1325,10 +1325,12 @@ static DWORD WINAPI LS_ThreadProc(LPVOID p) ok(LS_index0 != LS_index1, "%s failed\n", LS_AllocFuncName); /* Both slots should be initialized to NULL */ + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index0); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index1); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); @@ -1337,10 +1339,12 @@ static DWORD WINAPI LS_ThreadProc(LPVOID p) if (sync_threads_and_run_one(0, id)) { + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index0); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index1); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); @@ -1351,10 +1355,12 @@ static DWORD WINAPI LS_ThreadProc(LPVOID p) ret = LS_SetValueFunc(LS_index1, (LPVOID) 2); ok(ret, "%s failed\n", LS_SetValueFuncName); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index0); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == (LPVOID) 1, "Slot not initialized correctly\n"); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index1); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == (LPVOID) 2, "Slot not initialized correctly\n");

1 0

Nikolay Sivov : uxtheme: Return NULL file handle on OpenThemeFile() failure.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 3fd8a8f2095a0de132890423d8db8b994ac9c8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd8a8f2095a0de132890423d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 13 13:49:20 2017 +0300 uxtheme: Return NULL file handle on OpenThemeFile() failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 16cfbf5..e471c3c 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -188,6 +188,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST return S_OK; invalid_theme: + *tf = NULL; if(hTheme) FreeLibrary(hTheme); return hr; }

1 0

Dmitry Timoshkov : user32/tests: Add a bunch of WS_EX_TOPMOST tests.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: ed7513f9c2570bfae46553a1a0d3d6e7d5bfcfde URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7513f9c2570bfae46553a1a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:15:31 2017 +0800 user32/tests: Add a bunch of WS_EX_TOPMOST tests. The tests most of the time pass cleanly here under MATE environment, but sometimes there are intermittent failures (like in some other tests) without visible reason, and another 'make test' runs cleanly again. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 381 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 375 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed7513f9c2570bfae4655…

1 0

Dmitry Timoshkov : user32/tests: Fix test failures under Windows.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 825d2337b51420c3d5afdb96a349440399bcbd48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825d2337b51420c3d5afdb96a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:12:48 2017 +0800 user32/tests: Fix test failures under Windows. Without SetForegroundWindow() these tests fail in some testbot runs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eace140..992fbf4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2909,6 +2909,13 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E, DWORD style) { HWND hwnd_A, hwnd_B, hwnd_C, hwnd_F; + /* Give current thread foreground state otherwise the tests may fail. */ + if (!SetForegroundWindow(hwnd_D)) + { + skip("SetForegroundWindow not working\n"); + return; + } + trace("hwnd_D %p, hwnd_E %p\n", hwnd_D, hwnd_E); SetWindowPos(hwnd_E, hwnd_D, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE);

1 0

Dmitry Timoshkov : user32/tests: Don't leave a stray test window behind.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 5aafd080d1941904e3ae9ad1b0705cea973919f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aafd080d1941904e3ae9ad1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:11:56 2017 +0800 user32/tests: Don't leave a stray test window behind. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index feca2be..eace140 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4932,6 +4932,7 @@ static void test_dialog_parent(void) ok(!IsWindowEnabled(other), "other is enabled\n"); EnableWindow(other, TRUE); + DestroyWindow(other); DestroyWindow(parent); }

1 0

Dmitry Timoshkov : user32/tests: Make WS_EX_TOPMOST tests more generic.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 82cf34562e661e513ace5579c9f884d8f5288154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cf34562e661e513ace5579c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:14:30 2017 +0800 user32/tests: Make WS_EX_TOPMOST tests more generic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fdfdf92..d9491f5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9856,20 +9856,29 @@ static void test_desktop( void ) } } -static void test_topmost(HWND hwnd) +static BOOL is_topmost(HWND hwnd) +{ + return (GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; +} + +static void swp_after(HWND hwnd, HWND after) { BOOL ret; - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, after, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "SetWindowPos failed\n"); +} + +static void test_topmost(HWND hwnd) +{ + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + + swp_after(hwnd, HWND_TOPMOST); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_TOP); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); } START_TEST(win)

1 0

Dmitry Timoshkov : user32/tests: Separate WS_EX_TOPMOST tests from SetWindowPos ones.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 91b09e0c5bbd17f0633331e40be4f83b47cfc982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b09e0c5bbd17f0633331e40… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:13:46 2017 +0800 user32/tests: Separate WS_EX_TOPMOST tests from SetWindowPos ones. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 992fbf4..fdfdf92 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2573,17 +2573,6 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) orig_win_rc.right, orig_win_rc.bottom, 0); ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - hwnd_desktop = GetDesktopWindow(); ok(!!hwnd_desktop, "Failed to get hwnd_desktop window (%d).\n", GetLastError()); hwnd_child = create_tool_window(WS_VISIBLE|WS_CHILD, hwnd); @@ -9867,6 +9856,22 @@ static void test_desktop( void ) } } +static void test_topmost(HWND hwnd) +{ + BOOL ret; + + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); +} + START_TEST(win) { char **argv; @@ -9944,6 +9949,7 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ + test_topmost(hwndMain); test_child_window_from_point(); test_window_from_point(argv[0]); test_thick_child_size(hwndMain);

1 0

Marcus Meissner : ws2_32/tests: Avoid crashes on flaky/ non-present network.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 0e18800f3955718dbf47a162810495e7ad4f477b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e18800f3955718dbf47a1628… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Nov 12 20:50:45 2017 +0100 ws2_32/tests: Avoid crashes on flaky/non-present network. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 179ace4..4cbc1e9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7657,10 +7657,13 @@ static void test_GetAddrInfoExW(void) ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); ok(result != NULL, "result == NULL\n"); - ok(!result->ai_blob, "ai_blob != NULL\n"); - ok(!result->ai_bloblen, "ai_bloblen != 0\n"); - ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); - pFreeAddrInfoExW(result); + if (result != NULL) + { + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + } result = (void*)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped));

1 0

Jeremy Newman : Revert "remove wine patches list from forums page"
by Jeremy Newman Nov. 13, 2017

Nov. 13, 2017

Module: website Branch: master Commit: 27872268f722394cf18d83538ef70f3920dd7477 URL: http://source.winehq.org/git/website.git/?a=commit;h=27872268f722394cf18d83… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 13 09:53:17 2017 -0600 Revert "remove wine patches list from forums page" This reverts commit c7c702733f607203d34c67ab58deb9e54f199353. --- templates/en/forums.template | 9 +++++++++ templates/fr/forums.template | 9 +++++++++ templates/pl/forums.template | 8 ++++++++ templates/pt/forums.template | 8 ++++++++ templates/tr/forums.template | 9 +++++++++ templates/zh-cn/forums.template | 9 +++++++++ 6 files changed, 52 insertions(+) diff --git a/templates/en/forums.template b/templates/en/forums.template index cb211d7..f21dad4 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -71,6 +71,15 @@ mailing list software. </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + A medium traffic (45/day) open list for submitting patches only. + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/fr/forums.template b/templates/fr/forums.template index fcd87b6..e82b6c6 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -54,6 +54,15 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Dés-)inscription</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via un lecteur de nouvelles</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Une liste moyen trafic (45 messages par jour) destinée uniquement à l'envoi de patchs. + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/pl/forums.template b/templates/pl/forums.template index 0f019d2..e260341 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -60,6 +60,14 @@ oprogramowanie listy mailingowej. WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Wy-/Za-)pisz</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Archiwum 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archiwum 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">przez czytnik aktualności</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Średni ruch (45/dziennie) otwarta lista przeznaczona wyłącznie do wysyłania łatek. + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Wy-/Za-)pisz</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archiwum 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archiwum 2</a>] diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 83bf596..f109f50 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -62,6 +62,14 @@ do contrário o seu email será tratado como um possível spam pelo software da WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Des-)Inscrever</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Arquivo 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arquivo 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Uma lista aberta de tráfego médio (45/dia) para submeter patches apenas. + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Des-)Inscrever</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arquivo 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arquivo 2</a>] diff --git a/templates/tr/forums.template b/templates/tr/forums.template index 7a917c7..dcee48c 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -54,6 +54,15 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">Abone ol/iptal et</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">Arşiv 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arşiv 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">haber okuyucu ile</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + Sadece yamaları göndermek için kullanılan orta trafikli (45/gün) bir liste + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">Abone ol/iptal et</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arşiv 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arşiv 2</a>] diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index f7e9140..a50ba3b 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -61,6 +61,15 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 </li> <li> + [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] + [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] + [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] + [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] + <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> + 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 + </li> + + <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>]

1 0

Jeremy Newman : remove wine patches list from forums page
by Jeremy Newman Nov. 13, 2017

Nov. 13, 2017

Module: website Branch: master Commit: c7c702733f607203d34c67ab58deb9e54f199353 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7c702733f607203d34c67… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 13 09:01:01 2017 -0600 remove wine patches list from forums page --- templates/en/forums.template | 9 --------- templates/fr/forums.template | 9 --------- templates/pl/forums.template | 8 -------- templates/pt/forums.template | 8 -------- templates/tr/forums.template | 9 --------- templates/zh-cn/forums.template | 9 --------- 6 files changed, 52 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f21dad4..cb211d7 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -71,15 +71,6 @@ mailing list software. </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - A medium traffic (45/day) open list for submitting patches only. - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Un-)Subscribe</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/fr/forums.template b/templates/fr/forums.template index e82b6c6..fcd87b6 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -54,15 +54,6 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via un lecteur de nouvelles</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Une liste moyen trafic (45 messages par jour) destinée uniquement à l'envoi de patchs. - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archive 2</a>] diff --git a/templates/pl/forums.template b/templates/pl/forums.template index e260341..0f019d2 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -60,14 +60,6 @@ oprogramowanie listy mailingowej. WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archiwum 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archiwum 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">przez czytnik aktualności</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Średni ruch (45/dziennie) otwarta lista przeznaczona wyłącznie do wysyłania łatek. - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Wy-/Za-)pisz</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archiwum 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Archiwum 2</a>] diff --git a/templates/pt/forums.template b/templates/pt/forums.template index f109f50..83bf596 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -62,14 +62,6 @@ do contrário o seu email será tratado como um possível spam pelo software da WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arquivo 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arquivo 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Uma lista aberta de tráfego médio (45/dia) para submeter patches apenas. - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Des-)Inscrever</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arquivo 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arquivo 2</a>] diff --git a/templates/tr/forums.template b/templates/tr/forums.template index dcee48c..7a917c7 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -54,15 +54,6 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arşiv 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arşiv 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">haber okuyucu ile</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Sadece yamaları göndermek için kullanılan orta trafikli (45/gün) bir liste - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">Abone ol/iptal et</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arşiv 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">Arşiv 2</a>] diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index a50ba3b..f7e9140 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -61,15 +61,6 @@ WWW</a>，或者发送一封标题为“subscribe”的邮件到 指定列表 </li> <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - 一个中等流量（45封/天）的开放性列表，只用于提交 patches。 - </li> - - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">存档 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.cvs">存档 2</a>]

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman Nov. 13, 2017

Nov. 13, 2017

Module: website Branch: master Commit: 395b9509ba916948dd1342cff40eb5ceb96098d9 URL: http://source.winehq.org/git/website.git/?a=commit;h=395b9509ba916948dd1342… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Nov 13 09:01:25 2017 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexandre Julliard : Wine release 2.21
by Alexandre Julliard Nov. 11, 2017

Nov. 11, 2017

Module: website Branch: master Commit: de12b434237d5226dc9724cadc42f08f1ee4c42a URL: http://source.winehq.org/git/website.git/?a=commit;h=de12b434237d5226dc9724… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 11 10:30:07 2017 +0100 Wine release 2.21 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017111101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2017111101.xml b/news/en/2017111101.xml new file mode 100644 index 0000000..5185a95 --- /dev/null +++ b/news/en/2017111101.xml @@ -0,0 +1,18 @@ +<news> +<date>November 11, 2017</date> +<title>Wine 2.21 Released</title> +<body> + The Wine development release 2.21 is now available. + <a href="{$root}/announce/2.21">What's new</a> in this release: +<ul> + <li>Still more metafile support in GdiPlus.</li> + <li>Indirect draws support in Direct 3D.</li> + <li>Calling convention fixes on ARM.</li> + <li>Improved serial port detection on Linux.</li> + <li>Services fixes on WoW64.</li> + <li>Better DPI scaling in the Shell Explorer.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.21.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 2.21.
by Alexandre Julliard Nov. 11, 2017

Nov. 11, 2017

Module: wine Branch: master Commit: 53290d2ec483006656987352d53842ffc1852c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53290d2ec483006656987352d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 11 10:27:31 2017 +0100 Release 2.21. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 522 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 283 insertions(+), 262 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53290d2ec483006656987…

1 0

Tag wine-2.21 : Alexandre Julliard : Release 2.21
by Alexandre Julliard Nov. 11, 2017

Nov. 11, 2017

Module: wine Branch: refs/tags/wine-2.21 Tag: 789cc923c7236d3365295dcb28d062235a832cd8 URL: http://source.winehq.org/git/wine.git/?a=tag;h=789cc923c7236d3365295dcb28d0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 11 10:27:31 2017 +0100 Release 2.21

1 0

Paul Gofman : d3dx9: Zero constantinfo_reserved on error in get_constants_desc().
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: dc9607978451689d99c023add3a069d25b6eb038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc9607978451689d99c023add… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 10 10:33:30 2017 +0300 d3dx9: Zero constantinfo_reserved on error in get_constants_desc(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e3e91c6..78e4868 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -539,6 +539,8 @@ static HRESULT get_ctab_constant_desc(ID3DXConstantTable *ctab, D3DXHANDLE hc, D if (!constant) { FIXME("Could not get constant desc.\n"); + if (constantinfo_reserved) + *constantinfo_reserved = 0; return D3DERR_INVALIDCALL; } *desc = constant->desc;

1 0

Alex Henrie : d3dx9/tests: Use a helper function to set matrix values in math tests.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: eaf9a28741284f6314517c63dc3101292b743477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf9a28741284f6314517c63d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 10 20:56:42 2017 +0100 d3dx9/tests: Use a helper function to set matrix values in math tests. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 363 +++++++++++++++++++++++++-------------------- 1 file changed, 205 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaf9a28741284f6314517…

1 0

Andrey Gusev : d3dx11: Fix D3DX11CompileFromMemory spec entry.
by Alexandre Julliard Nov. 10, 2017

Nov. 10, 2017

Module: wine Branch: master Commit: 26b57fae39f81f49f9c791324b4d620d75d2826d URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b57fae39f81f49f9c791324… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 10 17:46:13 2017 +0200 d3dx11: Fix D3DX11CompileFromMemory spec entry. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index 12d4429..eaec2fc 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) -@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index a4e85af..1cafaa6 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stdcall D3DX11CompileFromFileA(str ptr ptr str str long long ptr ptr ptr ptr) @ stdcall D3DX11CompileFromFileW(wstr ptr ptr str str long long ptr ptr ptr ptr) -@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) +@ stdcall D3DX11CompileFromMemory(ptr long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap

1 0