December 2019 - Wine-Devel - list.winehq.org

[PATCH v3] dmcompos/tests: Add Chord track GetParam/SetParam tests
by Michael Stefaniuc Dec. 26, 2019

Dec. 26, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v3: Fix a wrong test dlls/dmcompos/tests/dmcompos.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index e5cb7da8ad..f041d0ac34 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -267,6 +267,7 @@ static void test_chordmaptrack(void) { IDirectMusicTrack8 *dmt8; IPersistStream *ps; + IDirectMusicChordMap *chordmap; CLSID class; ULARGE_INTEGER size; HRESULT hr; @@ -331,11 +332,29 @@ static void test_chordmaptrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_NOT_FOUND, + "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void **)&chordmap); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); + ok(hr == S_OK, "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + IDirectMusicChordMap_Release(chordmap); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); + todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); -- 2.24.1

1 0

[PATCH] msvcr90: Fix compilation warning in __AdjustPointer tests.
by Piotr Caban Dec. 26, 2019

Dec. 26, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcr90/tests/msvcr90.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)

1 0

[PATCH v3] ucrtbase: Fix handling of tab and non-breaking space in iswctype().
by Chip Davis Dec. 26, 2019

Dec. 26, 2019

It's just these two that are handled specially AFAICT. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Fix build. v3: Fix sign extension bug. dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr110/tests/msvcr110.c | 30 +++++++++++++++++++++++++ dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 28 +++++++++++++++++++++++ dlls/msvcrt/wcs.c | 29 +++++++++++++++++------- dlls/ucrtbase/tests/misc.c | 41 +++++++++++++++++++++++++++++----- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 123 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 560e14b33b8..177b67298b2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1719,7 +1719,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 2316535e5d1..376c36cd159 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2077,7 +2077,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr110/tests/msvcr110.c b/dlls/msvcr110/tests/msvcr110.c index 09876131f07..862d2bfce74 100644 --- a/dlls/msvcr110/tests/msvcr110.c +++ b/dlls/msvcr110/tests/msvcr110.c @@ -33,6 +33,7 @@ static char* (CDECL *p_setlocale)(int category, const char* locale); static size_t (CDECL *p___strncnt)(const char *str, size_t count); +static int (CDECL *p_iswctype)(wchar_t, wctype_t); static unsigned int (CDECL *p_CurrentScheduler_GetNumberOfVirtualProcessors)(void); static unsigned int (CDECL *p__CurrentScheduler__GetNumberOfVirtualProcessors)(void); @@ -52,6 +53,7 @@ static BOOL init(void) p_setlocale = (void*)GetProcAddress(module, "setlocale"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p_CurrentScheduler_GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?GetNumberOfVirtualProcessors(a)CurrentScheduler@Concurrency@@SAIXZ"); p__CurrentScheduler__GetNumberOfVirtualProcessors = (void*)GetProcAddress(module, "?_GetNumberOfVirtualProcessors(a)_CurrentScheduler@details(a)Concurrency@@SAIXZ"); p_CurrentScheduler_Id = (void*)GetProcAddress(module, "?Id(a)CurrentScheduler@Concurrency@@SAIXZ"); @@ -143,10 +145,38 @@ static void test___strncnt(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(msvcr110) { if (!init()) return; test_CurrentScheduler(); /* MUST be first (at least among Concurrency tests) */ test_setlocale(); test___strncnt(); + test_iswctype(); } diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 903f4b7ce38..f04a0ec3494 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2230,7 +2230,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index a014cf50365..d1457e8a32e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -754,7 +754,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 21b73d3a75c..72f292e64f0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -750,7 +750,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 402e6efc109..9e5f03685ce 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1401,7 +1401,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8a079abe254..8c54c5f762d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1374,7 +1374,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b97..0d6b17eb6d8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1340,7 +1340,7 @@ @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 1be4dcb129c..5b215728ad4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4024,6 +4024,33 @@ static void test_iswdigit(void) } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, C1_BLANK }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + START_TEST(string) { char mem[100]; @@ -4167,4 +4194,5 @@ START_TEST(string) test_C_locale(); test_strstr(); test_iswdigit(); + test_iswctype(); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1ae292423c0..e54e2bb8d1f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1845,6 +1845,27 @@ MSVCRT_size_t CDECL MSVCRT_wcrtomb( char *dst, MSVCRT_wchar_t ch, MSVCRT_mbstate return MSVCRT_wctomb(dst, ch); } +/********************************************************************* + * _iswctype_l (MSVCRT.@) + */ +int CDECL MSVCRT__iswctype_l(MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale) +{ + int ret = (get_char_typeW(wc) & 0xffff) & type; + +#if _MSVCR_VER >= 140 + if (wc == '\t' || wc == 0x00a0) ret &= ~MSVCRT__BLANK; +#endif + return ret; +} + +/********************************************************************* + * iswctype (MSVCRT.@) + */ +int CDECL MSVCRT_iswctype(MSVCRT_wchar_t wc, MSVCRT_wctype_t type) +{ + return MSVCRT__iswctype_l( wc, type, NULL ); +} + /********************************************************************* * iswalnum (MSVCRT.@) */ @@ -2021,14 +2042,6 @@ int CDECL MSVCRT__iswxdigit_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) return isxdigitW( wc ); } -/********************************************************************* - * _iswctype_l (MSVCRT.@) - */ -INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__locale_t locale ) -{ - return (get_char_typeW(wc) & 0xffff) & type; -} - /********************************************************************* * _iswblank_l (MSVCRT.@) */ diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index f637997a0d1..c9b04b7dd47 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -33,6 +33,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include "wine/test.h" #define DEFINE_EXPECT(func) \ @@ -154,6 +155,7 @@ static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); +static int (CDECL *p_iswctype)(int,int); static int (CDECL *p__iswctype_l)(int,int,_locale_t); static int (CDECL *p_iswblank)(int); static int (CDECL *p__iswblank_l)(wint_t,_locale_t); @@ -531,6 +533,7 @@ static BOOL init(void) p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); + p_iswctype = (void*)GetProcAddress(module, "iswctype"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); p_iswblank = (void*)GetProcAddress(module, "iswblank"); p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); @@ -647,21 +650,46 @@ static void test_isblank(void) for(c = 0; c <= 0xffff; c++) { if(c == '\t' || c == ' ' || c == 0x3000 || c == 0xfeff) { if(c == '\t') - todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); + ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); ok(p_iswblank(c), "%d should be blank\n", c); ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { - todo_wine_if(c == 0xa0) { - ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); - ok(!p_iswblank(c), "%d shouldn't be blank\n", c); - ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); - } + ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!p_iswblank(c), "%d shouldn't be blank\n", c); + ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } } +static void test_iswctype(void) +{ + static const struct { + WCHAR c; + int t; + int r; + } tests[] = { + { '0', C1_DIGIT, C1_DIGIT }, + { '9', C1_DIGIT, C1_DIGIT }, + { 'a', C1_DIGIT, 0 }, + { 'a', C1_LOWER, C1_LOWER }, + { 0xa0, C1_BLANK, 0 }, + { 0xe0, _ALPHA, C1_ALPHA|C1_LOWER }, + { 0xff16, C1_DIGIT, C1_DIGIT }, + { 0x0660, C1_DIGIT, C1_DIGIT }, + { 0x0ce6, C1_DIGIT, C1_DIGIT } + }; + int i, r; + + p_setlocale(LC_ALL, "C"); + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + r = p_iswctype(tests[i].c, tests[i].t); + ok(r == tests[i].r, "iswctype returned %x for %x\n", r, tests[i].c); + } +} + static struct MSVCRT__exception exception; static int CDECL matherr_callback(struct MSVCRT__exception *e) @@ -1460,6 +1488,7 @@ START_TEST(misc) test__sopen_s(); test_lldiv(); test_isblank(); + test_iswctype(); test_math_errors(); test_asctime(); test_strftime(); diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1293dd62f16..ca474dce9f9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2364,7 +2364,7 @@ @ cdecl iswascii(long) MSVCRT_iswascii @ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl -@ cdecl iswctype(long long) ntdll.iswctype +@ cdecl iswctype(long long) MSVCRT_iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit @ cdecl iswgraph(long) MSVCRT_iswgraph @ cdecl iswlower(long) MSVCRT_iswlower -- 2.21.0

2 1

[PATCH] msvcrt: Fix the btowc() function.
by Chip Davis Dec. 26, 2019

Dec. 26, 2019

This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: v2: Actually run the tests. Add new tests. Make them pass. dlls/msvcrt/locale.c | 8 +++-- dlls/msvcrt/tests/string.c | 61 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 11ad9ed5f5f..c2dd10667f7 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -787,9 +787,11 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(!get_locinfo()->lc_codepage) + return c <= 255 ? c : MSVCRT_WEOF; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index f4c4657791c..1be4dcb129c 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -87,6 +87,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2829,6 +2830,64 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(0); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4007,6 +4066,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4083,6 +4143,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp(); -- 2.24.0

2 1

[PATCH v3 1/3] user32/tests: Move TEST_MOUSEACTIVATE to test_defwinproc.
by Rémi Bernon Dec. 26, 2019

Dec. 26, 2019

This test is actually testing the reply from DefWindowProcA, as the window it was sent to is not handling this particular message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- We are going to handle the message in the next patch, this avoids an unnecessary test change. dlls/user32/tests/msg.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/tests/win.c | 32 -------------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c0ba5834cf9..b1095037066 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15623,6 +15623,38 @@ static void test_defwinproc(void) ok(!res, "WM_NCXBUTTONUP returned %ld\n", res); ok_sequence(WmEmptySeq, "WM_NCXBUTTONUP with invalid button", FALSE); + /* Test WM_MOUSEACTIVATE */ +#define TEST_MOUSEACTIVATE(A,B,C) \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ + res = DefWindowProcA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + + TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); + TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); + SetEvent( data.wndproc_finished ); WaitForSingleObject( thread, 1000 ); CloseHandle( data.wndproc_finished ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b9309a8cba6..3f64d53958e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3935,38 +3935,6 @@ static void test_mouse_input(HWND hwnd) msg.hwnd, popup, msg.message); ok(peek_message(&msg), "no message available\n"); - /* Test WM_MOUSEACTIVATE */ -#define TEST_MOUSEACTIVATE(A,B,C) \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ - ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ - res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ - ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); - - TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); - TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); - ShowWindow(popup, SW_HIDE); /* Test sending double click to the non-client area, while capturing the window after -- 2.24.1

2 4

[PATCH] winex11.drv: ignore .dwAspect in FORMATETC during XDnD
by Damjan Jovanovic Dec. 26, 2019

Dec. 26, 2019

Some applications pass FORMATETC.dwAspect=0 to IDataObject_[Query]GetData() during drag and drop, which is not a valid DVASPECT_* value. Tests show that Windows Explorer completely ignores .dwAspect for CF_HDROP when it is the drag source, treating all values as DVASPECT_CONTENT instead. Do the same. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43368 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/winex11.drv/xdnd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

1 0

[PATCH v2] winex11.drv: Send HTMENU instead of HTCAPTION to query window activation.
by Rémi Bernon Dec. 26, 2019

Dec. 26, 2019

Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented: WM_MOUSEACTIVATE now replies MA_NOACTIVATE by default when using HTCAPTION. We use the WM_MOUSEACTIVATE -although Windows does not- regardless of the way focus is changed to check whether a window wants focus, and Windows sometimes changes focus regardless of the message reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending just this one as the other seems too risky and has been deferred. I have looked for matching bugs, but couldn't find any for sure, and I'm not sure if opening a bug just for it now is worth it. The dinput mouse test is going to be broken again until a proper fix is found -not because of the focus on mouse hover as I first thought but because of the CreateWindow / X11 focus message race condition, as described in: https://source.winehq.org/patches/data/176093 dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..07f7a1ad502 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -706,7 +706,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); + MAKELONG( HTMENU, WM_LBUTTONDOWN ) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { set_focus( event->display, hwnd, event_time ); -- 2.24.1

2 1

[PATCH] ntoskrnl: Add KeSetImportanceDpc stub
by Alex Henrie Dec. 26, 2019

Dec. 26, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48358 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 93c9720e96..36637331c1 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3031,6 +3031,14 @@ VOID WINAPI KeInitializeDpc(PRKDPC Dpc, PKDEFERRED_ROUTINE DeferredRoutine, PVOI FIXME("stub\n"); } +/*********************************************************************** + * KeSetImportanceDpc (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeSetImportanceDpc(PRKDPC dpc, KDPC_IMPORTANCE importance) +{ + FIXME("%p, %d stub\n", dpc, importance); +} + /*********************************************************************** * KeSetTargetProcessorDpc (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 695b375698..a39247811e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -626,7 +626,7 @@ @ stdcall KeSetEvent(ptr long long) @ stub KeSetEventBoostPriority @ stub KeSetIdealProcessorThread -@ stub KeSetImportanceDpc +@ stdcall KeSetImportanceDpc(ptr long) @ stub KeSetKernelStackSwapEnable @ stdcall KeSetPriorityThread(ptr long) @ stub KeSetProfileIrql diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a092216b82..5152a89842 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -91,6 +91,13 @@ typedef struct _KDPC { PULONG_PTR Lock; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; +typedef enum _KDPC_IMPORTANCE { + LowImportance, + MediumImportance, + HighImportance, + MediumHighImportance +} KDPC_IMPORTANCE; + typedef struct _KDEVICE_QUEUE_ENTRY { LIST_ENTRY DeviceListEntry; ULONG SortKey; -- 2.24.1

1 0

[PATCH] include: Add GUID_DEVINTERFACE_MONITOR.
by Zhiyi Zhang Dec. 26, 2019

Dec. 26, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/ntddvdeo.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index d2c078084a..9523e37f7b 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -20,5 +20,6 @@ #define _NTDDVDEO_ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); +DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); #endif -- 2.24.0

1 0

[PATCH v2] dmcompos/tests: Add Chord track GetParam/SetParam tests
by Michael Stefaniuc Dec. 25, 2019

Dec. 25, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: Get rid of the buf variable dlls/dmcompos/tests/dmcompos.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index e5cb7da8ad..66379fdae2 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -267,6 +267,7 @@ static void test_chordmaptrack(void) { IDirectMusicTrack8 *dmt8; IPersistStream *ps; + IDirectMusicChordMap *chordmap; CLSID class; ULARGE_INTEGER size; HRESULT hr; @@ -331,11 +332,31 @@ static void test_chordmaptrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_NOT_FOUND, + "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void **)&chordmap); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + /* Unsupported but crashes on non interface pointer passed in */ + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); + ok(hr != DMUS_E_SET_UNSUPPORTED, + "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", hr); + IDirectMusicChordMap_Release(chordmap); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, chordmap); + todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); -- 2.24.1

1 0

[PATCH] dmcompos/tests: Add Chord Map track GetParam/SetParam tests
by Michael Stefaniuc Dec. 25, 2019

Dec. 25, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index e5cb7da8ad..e97f5dc983 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -267,8 +267,10 @@ static void test_chordmaptrack(void) { IDirectMusicTrack8 *dmt8; IPersistStream *ps; + IDirectMusicChordMap *chordmap; CLSID class; ULARGE_INTEGER size; + char buf[64] = { 0 }; HRESULT hr; #define X(guid) &guid, #guid const struct { @@ -331,11 +333,31 @@ static void test_chordmaptrack(void) ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); hr = IDirectMusicTrack8_IsParamSupported(dmt8, &GUID_IDirectMusicChordMap); ok(hr == S_OK, "IsParamSupported(GUID_IDirectMusicChordMap) failed: %08x, expected S_OK\n", hr); + hr = IDirectMusicTrack8_GetParam(dmt8, &GUID_IDirectMusicChordMap, 0, NULL, &chordmap); + todo_wine ok(hr == DMUS_E_NOT_FOUND, + "GetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_NOT_FOUND\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicChordMap, (void **)&chordmap); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + /* Unsupported but crashes on non interface pointer passed in */ + hr = IDirectMusicTrack8_SetParam(dmt8, &GUID_IDirectMusicChordMap, 0, chordmap); + ok(hr != DMUS_E_SET_UNSUPPORTED, + "SetParam(GUID_IDirectMusicChordMap) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", hr); + IDirectMusicChordMap_Release(chordmap); + for (i = 0; i < ARRAY_SIZE(unsupported); i++) { hr = IDirectMusicTrack8_IsParamSupported(dmt8, unsupported[i].type); ok(hr == DMUS_E_TYPE_UNSUPPORTED, "IsParamSupported(%s) failed: %08x, expected DMUS_E_TYPE_UNSUPPORTED\n", unsupported[i].name, hr); + hr = IDirectMusicTrack8_GetParam(dmt8, unsupported[i].type, 0, NULL, buf); + todo_wine ok(hr == DMUS_E_GET_UNSUPPORTED, + "GetParam(%s) failed: %08x, expected DMUS_E_GET_UNSUPPORTED\n", + unsupported[i].name, hr); + hr = IDirectMusicTrack8_SetParam(dmt8, unsupported[i].type, 0, buf); + todo_wine ok(hr == DMUS_E_SET_UNSUPPORTED, + "SetParam(%s) failed: %08x, expected DMUS_E_SET_UNSUPPORTED\n", + unsupported[i].name, hr); } hr = IDirectMusicTrack8_AddNotificationType(dmt8, NULL); -- 2.24.1

1 0

[PATCH v2] include: Fix SetupDiOpenDeviceInterfaceRegKey() prototype.
by Zhiyi Zhang Dec. 24, 2019

Dec. 24, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 176126 include/setupapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/setupapi.h b/include/setupapi.h index 818cc12599..48060edf91 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1615,7 +1615,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO, PCWSTR, HWND, DWORD, PSP_DEVINF BOOL WINAPI SetupDiOpenDeviceInterfaceA(HDEVINFO, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); BOOL WINAPI SetupDiOpenDeviceInterfaceW(HDEVINFO, PCWSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); #define SetupDiOpenDeviceInterface WINELIB_NAME_AW(SetupDiOpenDeviceInterface) -BOOL WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, REGSAM); +HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM); HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); -- 2.24.0

1 0

[PATCH resend v3 1/2] ntdll: Try mapping free memory region outside of reserved regions.
by Rémi Bernon Dec. 24, 2019

Dec. 24, 2019

We assumed that all mapped regions are known by Wine view tree, which is obviously not the case with external allocations. This could lead to memory corruption when find_free_area returns an expected free region which is already mapped. Using MAP_FIXED forces mmap to succeed and corrupts the mapping. This patch uses safe mmap calls to check if the expected free memory is actually free, and iterates over the expected free ranges until it succeeds. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/virtual.c | 64 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index cb869feff02..a29517e286d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -496,6 +496,35 @@ static struct file_view *find_view_range( const void *addr, size_t size ) return NULL; } +/*********************************************************************** + * try_map_free_area + * + * Try mmaping some expected free memory region, eventually stepping and + * retrying inside it, and return where it actually succeeded, or NULL. + */ +static void* try_map_free_area( void *base, void *end, ptrdiff_t step, + void *start, size_t size, int unix_prot ) +{ + void *ptr; + + while (start && base <= start && (char*)start + size <= (char*)end) + { + if ((ptr = wine_anon_mmap( start, size, unix_prot, 0 )) == start) + return start; + TRACE( "Found free area is already mapped, start %p.\n", start ); + + if (ptr != (void *)-1) + munmap( ptr, size ); + + if ((step > 0 && (char *)end - (char *)start < step) || + (step < 0 && (char *)start - (char *)base < -step) || + step == 0) + break; + start = (char *)start + step; + } + + return NULL; +} /*********************************************************************** * find_free_area @@ -503,9 +532,11 @@ static struct file_view *find_view_range( const void *addr, size_t size ) * Find a free area between views inside the specified range. * The csVirtual section must be held by caller. */ -static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down ) +static void *find_free_area( void *base, void *end, size_t size, size_t mask, int top_down, + int map_area, int unix_prot ) { struct wine_rb_entry *first = NULL, *ptr = views_tree.root; + ptrdiff_t step = top_down ? -(mask + 1) : (mask + 1); void *start; /* find the first (resp. last) view inside the range */ @@ -538,7 +569,10 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base + view->size <= (char *)start) break; + if (!map_area && (char *)view->base + view->size <= (char *)start) break; + if (map_area && (start = try_map_free_area( (char *)view->base + view->size, + (char *)start + size, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base - size, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || start < base) return NULL; @@ -554,13 +588,17 @@ static void *find_free_area( void *base, void *end, size_t size, size_t mask, in { struct file_view *view = WINE_RB_ENTRY_VALUE( first, struct file_view, entry ); - if ((char *)view->base >= (char *)start + size) break; + if (!map_area && (char *)view->base >= (char *)start + size) break; + if (map_area && (start = try_map_free_area( start, view->base, step, + start, size, unix_prot ))) break; start = ROUND_ADDR( (char *)view->base + view->size + mask, mask ); /* stop if remaining space is not large enough */ if (!start || start >= end || (char *)end - (char *)start < size) return NULL; first = wine_rb_next( first ); } } + + if (!first && map_area) return try_map_free_area( base, end, step, start, size, unix_prot ); return start; } @@ -1054,13 +1092,13 @@ static int alloc_reserved_area_callback( void *start, size_t size, void *arg ) { /* range is split in two by the preloader reservation, try first part */ if ((alloc->result = find_free_area( start, preload_reserve_start, alloc->size, - alloc->mask, alloc->top_down ))) + alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; /* then fall through to try second part */ start = preload_reserve_end; } } - if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down ))) + if ((alloc->result = find_free_area( start, end, alloc->size, alloc->mask, alloc->top_down, FALSE, 0 ))) return 1; return 0; @@ -1148,6 +1186,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { size_t view_size = size + mask + 1; struct alloc_area alloc; + int unix_prot = VIRTUAL_GetUnixProt(vprot); alloc.size = size; alloc.mask = mask; @@ -1158,19 +1197,22 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { ptr = alloc.result; TRACE( "got mem in reserved area %p-%p\n", ptr, (char *)ptr + size ); - if (wine_anon_mmap( ptr, size, VIRTUAL_GetUnixProt(vprot), MAP_FIXED ) != ptr) + if (wine_anon_mmap( ptr, size, unix_prot, MAP_FIXED ) != ptr) return STATUS_INVALID_PARAMETER; goto done; } - for (;;) + if (zero_bits_64) { - if (!zero_bits_64) - ptr = NULL; - else if (!(ptr = find_free_area( (void*)0, alloc.limit, view_size, mask, top_down ))) + if (!(ptr = find_free_area( (void*)0, alloc.limit, size, mask, top_down, TRUE, unix_prot ))) return STATUS_NO_MEMORY; + TRACE( "got mem with find_free_area %p-%p\n", ptr, (char *)ptr + size ); + goto done; + } - if ((ptr = wine_anon_mmap( ptr, view_size, VIRTUAL_GetUnixProt(vprot), ptr ? MAP_FIXED : 0 )) == (void *)-1) + for (;;) + { + if ((ptr = wine_anon_mmap( NULL, view_size, unix_prot, 0 )) == (void *)-1) { if (errno == ENOMEM) return STATUS_NO_MEMORY; return STATUS_INVALID_PARAMETER; -- 2.24.1

3 6

[PATCH] include: Fix SetupDiOpenDeviceInterfaceRegKey() prototype.
by Zhiyi Zhang Dec. 24, 2019

Dec. 24, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/setupapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/setupapi.h b/include/setupapi.h index 818cc12599..fb8f2e4442 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1615,7 +1615,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO, PCWSTR, HWND, DWORD, PSP_DEVINF BOOL WINAPI SetupDiOpenDeviceInterfaceA(HDEVINFO, PCSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); BOOL WINAPI SetupDiOpenDeviceInterfaceW(HDEVINFO, PCWSTR, DWORD, PSP_DEVICE_INTERFACE_DATA); #define SetupDiOpenDeviceInterface WINELIB_NAME_AW(SetupDiOpenDeviceInterface) -BOOL WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, REGSAM); +BOOL WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM); HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PSP_DETSIG_CMPPROC, PVOID, PSP_DEVINFO_DATA); -- 2.24.0

1 0

[PATCH] ntdll: Use default casemap and codepage file names if the value in registry is empty.
by Dmitry Timoshkov Dec. 24, 2019

Dec. 24, 2019

This helps to keep compatibility with old prefixes being reused for wine-5.0. Old prefixes in their registry have [System\\CurrentControlSet\\Control\\Nls\\Codepage] "37"="" [System\\CurrentControlSet\\Control\\Nls\\Language] "0409"="" and this leads to LCMapString(LCMAP_LOWERCASE/LCMAP_UPPERCASE) return garbage. This is a regression caused by 94a3add0ea7889dbd26a4ded60ace1c40b02ed89. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index d9e4e8086e..e3f562808b 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -218,7 +218,7 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) NtClose( handle ); } - if (!name) /* otherwise some hardcoded defaults */ + if (!name || !*name) /* otherwise some hardcoded defaults */ { switch (type) { -- 2.20.1

1 0

[PATCH] winhttp: Initialize a return variable.
by Zhiyi Zhang Dec. 24, 2019

Dec. 24, 2019

When getaddrinfo() failed in detect_autoproxyconfig_url_dns(), an undefined variable is passed to WinHttpDetectAutoProxyConfigUrl(), causing applications to receive a wrong url. This is a regression from 4ad4173e3a715d5bd27bedc164718cef9cafe0a4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48349 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- This fixes Steam not displaying anything. dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 22aa285a44..e647d71faf 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1427,7 +1427,7 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) static WCHAR *detect_autoproxyconfig_url_dns(void) { char *fqdn, *domain, *p; - WCHAR *ret; + WCHAR *ret = NULL; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) -- 2.24.0

2 1

[PATCH] user32/tests: Mark some GetDeviceCaps() tests as todo on Wine.
by Zhiyi Zhang Dec. 24, 2019

Dec. 24, 2019

GetDeviceCaps(hdc, DESKTOPHORZRES/DESKTOPVERTRES) on Windows reports the primary desktop, but on Wine it reports the virtual screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 645c188008..e40d49e8f8 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3267,6 +3267,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu: wrong caps desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu: wrong caps virt desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); DeleteDC( hdc ); @@ -3345,6 +3346,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu/%lu: wrong DC resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu/%lu: wrong desktop resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); ReleaseDC( hwnd, hdc ); -- 2.24.0

2 1

[PATCH] configure: Update Xinerama and XRandR extension help strings.
by Zhiyi Zhang Dec. 24, 2019

Dec. 24, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 88965115d7..5e36331596 100644 --- a/configure.ac +++ b/configure.ac @@ -92,14 +92,14 @@ AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcurso [if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi]) AC_ARG_WITH(xfixes, AS_HELP_STRING([--without-xfixes],[do not use Xfixes for clipboard change notifications]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xfixes_h=no; fi]) -AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]), +AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (legacy multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi]) AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi]) AC_ARG_WITH(xinput2, AS_HELP_STRING([--without-xinput2],[do not use the Xinput 2 extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi]) AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML])) -AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]), +AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi]) AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrender extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi]) -- 2.24.0

1 0

[PATCH] ole32/tests: Avoid testing exact sequences of IUnknown methods.
by Zebediah Figura Dec. 24, 2019

Dec. 24, 2019

Instead, just test that AddRef()/Release() come in balanced pairs by keeping track of the reference count. This fixes test failures with recent Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/ole2.c | 174 ++++++---------------------------------- 1 file changed, 23 insertions(+), 151 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b71a103dbc..6be187497d 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -99,7 +99,6 @@ static const IID IID_WineTest = {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe1} }; -#define TEST_OPTIONAL 0x1 #define TEST_TODO 0x2 struct expected_method @@ -152,16 +151,8 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM { trace("%s\n", method_name); ok(expected_method_list->method != NULL, "Extra method %s called\n", method_name); - if (!strcmp(expected_method_list->method, "WINE_EXTRA")) - { - todo_wine ok(0, "Too many method calls.\n"); - return; - } if (expected_method_list->method) { - while (expected_method_list->flags & TEST_OPTIONAL && - strcmp(expected_method_list->method, method_name) != 0) - expected_method_list++; todo_wine_if (expected_method_list->flags & TEST_TODO) { ok(!strcmp(expected_method_list->method, method_name), @@ -188,8 +179,6 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM #define CHECK_NO_EXTRA_METHODS() \ do { \ - while (expected_method_list->flags & TEST_OPTIONAL) \ - expected_method_list++; \ ok(!expected_method_list->method, "Method sequence starting from %s not called\n", expected_method_list->method); \ } while (0) @@ -266,10 +255,10 @@ static void create_text(STGMEDIUM *med) med->pUnkForRelease = NULL; } +static LONG ole_object_refcount; + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { - CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); - *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleObject)) @@ -294,14 +283,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v static ULONG WINAPI OleObject_AddRef(IOleObject *iface) { - CHECK_EXPECTED_METHOD("OleObject_AddRef"); - return 2; + return InterlockedIncrement(&ole_object_refcount); } static ULONG WINAPI OleObject_Release(IOleObject *iface) { - CHECK_EXPECTED_METHOD("OleObject_Release"); - return 1; + return InterlockedDecrement(&ole_object_refcount); } static HRESULT WINAPI OleObject_SetClientSite @@ -573,20 +560,17 @@ static IOleObject OleObject = { &OleObjectVtbl }; static HRESULT WINAPI OleObjectPersistStg_QueryInterface(IPersistStorage *iface, REFIID riid, void **ppv) { - trace("OleObjectPersistStg_QueryInterface\n"); return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectPersistStg_AddRef(IPersistStorage *iface) { - CHECK_EXPECTED_METHOD("OleObjectPersistStg_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectPersistStg_Release(IPersistStorage *iface) { - CHECK_EXPECTED_METHOD("OleObjectPersistStg_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectPersistStg_GetClassId(IPersistStorage *iface, CLSID *clsid) @@ -677,14 +661,12 @@ static HRESULT WINAPI OleObjectCache_QueryInterface(IOleCache *iface, REFIID rii static ULONG WINAPI OleObjectCache_AddRef(IOleCache *iface) { - CHECK_EXPECTED_METHOD("OleObjectCache_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectCache_Release(IOleCache *iface) { - CHECK_EXPECTED_METHOD("OleObjectCache_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectCache_Cache @@ -824,14 +806,12 @@ static HRESULT WINAPI OleObjectRunnable_QueryInterface(IRunnableObject *iface, R static ULONG WINAPI OleObjectRunnable_AddRef(IRunnableObject *iface) { - CHECK_EXPECTED_METHOD("OleObjectRunnable_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectRunnable_Release(IRunnableObject *iface) { - CHECK_EXPECTED_METHOD("OleObjectRunnable_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectRunnable_GetRunningClass( @@ -974,143 +954,49 @@ static void test_OleCreate(IStorage *pStorage) FORMATETC formatetc; static const struct expected_method methods_olerender_none[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL }, - { "OleObject_Release", TEST_OPTIONAL }, - { "OleObject_QueryInterface", TEST_OPTIONAL }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw_with_site[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_olerender_format[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_olerender_asis[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw_no_runnable[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 }, }; static const struct expected_method methods_olerender_draw_no_cache[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; @@ -1128,6 +1014,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw; trace("OleCreate with OLERENDER_DRAW:\n"); @@ -1135,6 +1022,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw_with_site; trace("OleCreate with OLERENDER_DRAW, with site:\n"); @@ -1142,6 +1030,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); /* GetMiscStatus fails */ g_GetMiscStatusFailsWith = 0x8fafefaf; @@ -1151,6 +1040,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_GetMiscStatusFailsWith = S_OK; formatetc.cfFormat = CF_TEXT; @@ -1169,6 +1059,7 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_asis; trace("OleCreate with OLERENDER_ASIS:\n"); @@ -1176,6 +1067,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); formatetc.cfFormat = 0; formatetc.tymed = TYMED_NULL; @@ -1195,6 +1087,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); trace("end\n"); g_expected_fetc = NULL; } @@ -1207,20 +1100,10 @@ static void test_OleLoad(IStorage *pStorage) static const struct expected_method methods_oleload[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_Load", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; @@ -1242,6 +1125,7 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_GetMiscStatusFailsWith = S_OK; /* Test again, let IOleObject_GetMiscStatus succeed. */ @@ -1261,6 +1145,7 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); for (fmt = CF_TEXT; fmt < CF_MAX; fmt++) { @@ -1447,8 +1332,6 @@ static HRESULT WINAPI DataObject_QueryInterface( REFIID riid, void** ppvObject) { - CHECK_EXPECTED_METHOD("DataObject_QueryInterface"); - if (IsEqualIID(riid, &IID_IDataObject) || IsEqualIID(riid, &IID_IUnknown)) { *ppvObject = iface; @@ -1461,14 +1344,12 @@ static HRESULT WINAPI DataObject_QueryInterface( static ULONG WINAPI DataObject_AddRef( IDataObject* iface) { - CHECK_EXPECTED_METHOD("DataObject_AddRef"); return 2; } static ULONG WINAPI DataObject_Release( IDataObject* iface) { - CHECK_EXPECTED_METHOD("DataObject_Release"); return 1; } @@ -2962,15 +2843,6 @@ static void test_default_handler(void) static const struct expected_method methods_embeddinghelper[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", TEST_TODO }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", TEST_OPTIONAL }, /* Win95/98/NT4 */ - { "OleObject_Release", TEST_TODO }, - { "WINE_EXTRA", TEST_OPTIONAL }, { NULL, 0 } }; @@ -3138,6 +3010,7 @@ static void test_default_handler(void) } CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); hr = CoRevokeClassObject(dwRegister); ok_ole_success(hr, "CoRevokeClassObject"); @@ -3148,16 +3021,12 @@ static void test_runnable(void) { static const struct expected_method methods_query_runnable[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_IsRunning", 0 }, - { "OleObjectRunnable_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_no_runnable[] = { - { "OleObject_QueryInterface", 0 }, { NULL, 0 } }; @@ -3172,18 +3041,21 @@ static void test_runnable(void) ret = OleIsRunning(object); ok(ret == TRUE, "Object should be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_isRunning = FALSE; expected_method_list = methods_query_runnable; ret = OleIsRunning(object); ok(ret == FALSE, "Object should not be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_showRunnable = FALSE; /* QueryInterface(IID_IRunnableObject, ...) will fail */ expected_method_list = methods_no_runnable; ret = OleIsRunning(object); ok(ret == TRUE, "Object without IRunnableObject should be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_isRunning = TRUE; g_showRunnable = TRUE; -- 2.24.1

2 1

[PATCH] include: Update DWRITE_FONT_PROPERTY_ID enum.
by Nikolay Sivov Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index f7cb97dff6..54d204f39f 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -53,9 +53,9 @@ typedef enum DWRITE_RENDERING_MODE1 typedef enum DWRITE_FONT_PROPERTY_ID { DWRITE_FONT_PROPERTY_ID_NONE, - DWRITE_FONT_PROPERTY_ID_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, DWRITE_FONT_PROPERTY_ID_FULL_NAME, DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, @@ -65,7 +65,12 @@ typedef enum DWRITE_FONT_PROPERTY_ID DWRITE_FONT_PROPERTY_ID_WEIGHT, DWRITE_FONT_PROPERTY_ID_STRETCH, DWRITE_FONT_PROPERTY_ID_STYLE, - DWRITE_FONT_PROPERTY_ID_TOTAL + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_TOTAL = DWRITE_FONT_PROPERTY_ID_STYLE + 1, + DWRITE_FONT_PROPERTY_ID_TOTAL_RS3 = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME + 1, + DWRITE_FONT_PROPERTY_ID_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_FACE_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, } DWRITE_FONT_PROPERTY_ID; typedef struct DWRITE_FONT_PROPERTY -- 2.24.0

1 0

[PATCH v2 5/5] msvcrt: Add compatibility _set_invalid_parameter_handler importlib implementation.
by Jacek Caban Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/invalid_parameter.c | 38 +++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 5 files changed, 42 insertions(+) create mode 100644 dlls/msvcrt/invalid_parameter.c

1 0

[PATCH v2 4/5] msvcrt: Add compatibility __p__wcmdln importlib implementation.
by Jacek Caban Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/wcmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/wcmdln.c

1 0

[PATCH v2 3/5] msvcrt: Add compatibility __p__acmdln importlib implementation.
by Jacek Caban Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/acmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/acmdln.c

1 0

[PATCH v2 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.
by Jacek Caban Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/fmode.c

1 0

[PATCH v2] winegstreamer: Recognize the "video/x-cinepak" type.
by Zebediah Figura Dec. 23, 2019

Dec. 23, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: remove an unused variable dlls/winegstreamer/gstdemux.c | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..e67efd58eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -853,12 +888,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); -- 2.24.1

1 0

[PATCH 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.
by Jacek Caban Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/fmode.c

2 2

[PATCH] msvcrt: Fix [str|wcs]tod result being compared against FLT_MAX.
by Erich E. Hoover Dec. 23, 2019

Dec. 23, 2019

Apparently cl.exe treats floats as doubles and compares them against FLT_MAX before converting them (see Bug #48324). It would be really nice if people didn't use constants that are more precise than the number format actually supports... Best, Erich

1 0

[PATCH 1/2] winex11.drv: Don't set the foreground for focus events that are older than the last SetFocus sent without an event.
by Rémi Bernon Dec. 23, 2019

Dec. 23, 2019

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> When creating a visible window, the focus and the respective messages are immediately sent to the created window to match Windows behavior. However, the X11 server also sends either FocusIn events or the WM sends ClientMessages with the WM_TAKE_FOCUS atom (by default) if the windows are managed, since it received focus. If the application didn't have a message loop up to process these events, they will remain in the queue. If only one window is created, this is not a problem because the focus set manually and the focus set when processing the events will be the same and no message is sent. However, if 2 or more windows are created before the message loop, when these events are later processed by the app's message loop, they will change the focus and send the messages again, even though we've already done so earlier, which confuses some apps at this point. One example is Heroes of Might and Magic 5. See comment #11 on https://bugs.winehq.org/show_bug.cgi?id=39742#c11 -- `When "Full screen" active game starts and then shows desktop but it is not exited and after a few times switching game/desktop it shows game screen and it is playable` Related Proton bug: https://github.com/ValveSoftware/Proton/issues/2401 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe this is the correct fix to the failing dinput mouse test. The test fails because the focus is changed back to the second window after it's been created, when the WM_TAKE_FOCUS event actually arrives: as we do not wait for the X11 focus to be set on CreateWindow, it can create an additional and unexpected focus change later on. dlls/winex11.drv/event.c | 48 ++++++++++++++++++++++++++++++++------- dlls/winex11.drv/x11drv.h | 2 ++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..2649d561a6b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -594,14 +594,22 @@ static void set_input_focus( struct x11drv_win_data *data ) /********************************************************************** * set_focus */ -static void set_focus( Display *display, HWND hwnd, Time time ) +static void set_focus( Display *display, HWND hwnd, Time time, unsigned long serial ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); HWND focus; Window win; GUITHREADINFO threadinfo; - TRACE( "setting foreground window to %p\n", hwnd ); - SetForegroundWindow( hwnd ); + if ((long)(thread_data->setfocus_serial - serial) > 0) + { + TRACE( "ignoring old serial %lu/%lu\n", serial, thread_data->setfocus_serial ); + } + else + { + TRACE( "setting foreground window to %p\n", hwnd ); + SetForegroundWindow( hwnd ); + } threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); @@ -709,7 +717,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } } @@ -718,7 +726,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd = GetForegroundWindow(); if (!hwnd) hwnd = last_focus; if (!hwnd) hwnd = GetDesktopWindow(); - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } /* try to find some other window to give the focus to */ @@ -726,7 +734,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time, event->serial ); } else if (protocol == x11drv_atom(_NET_WM_PING)) { @@ -806,9 +814,17 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = x11drv_thread_data()->last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime, event->serial ); + } + else + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if ((long)(thread_data->setfocus_serial - event->serial) > 0) + TRACE("ignoring old serial %lu/%lu\n", event->serial, thread_data->setfocus_serial); + else + SetForegroundWindow( hwnd ); } - else SetForegroundWindow( hwnd ); return TRUE; } @@ -1426,6 +1442,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1441,6 +1458,21 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + hwnd = GetAncestor(hwnd, GA_ROOT); + if (hwnd != thread_data->setfocus_hwnd) + { + thread_data->setfocus_hwnd = hwnd; + + /* If we are not processing an event, store the current serial so that + we ignore all older focus-related events. This prevents the focus + from being reverted later when the app processes its messages. */ + if (!thread_data->current_event) + { + thread_data->setfocus_serial = NextRequest(thread_data->display); + XNoOp(thread_data->display); + } + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..e9b827c7e9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -333,6 +333,8 @@ struct x11drv_thread_data HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + HWND setfocus_hwnd; /* top-level window corresponding to the last SetFocus */ + unsigned long setfocus_serial; /* serial number when last SetFocus without an event happened */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ -- 2.24.1

1 2

[PATCH] winex11.drv: Always set focus to managed window when requested.
by Rémi Bernon Dec. 23, 2019

Dec. 23, 2019

Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented. We used the WM_MOUSEACTIVATE even when changing focus using Alt-Tab for example, and in this case Windows changes focus regardless of the WM_MOUSEACTIVATE reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I expect this is going to break dinput mouse test on testbot again, as 71d35d8940118bc6de6522913fb8c473fa5b2c24 was "fixing" it. The problem came from the "set focus on mouse hover" setting, Windows has no such mechanism I believe, but then we shouldn't try to prevent focus from changing when using this setting. It should either be disabled, or taken into account in the test by not moving the mouse over another window. I can modify the test if that's what we want to do, but I'm assuming the test was moving the cursor over the original window on purpose. dlls/winex11.drv/event.c | 7 ++++++- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..69012e5b8cb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -700,7 +700,12 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); - if (can_activate_window(hwnd)) + if (is_managed(hwnd)) + { + set_focus( event->display, hwnd, event_time ); + return; + } + else if (can_activate_window(hwnd)) { /* simulate a mouse click on the caption to find out * whether the window wants to be activated */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..89ea42b7567 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -169,7 +169,7 @@ struct has_popup_result BOOL found; }; -static BOOL is_managed( HWND hwnd ) +BOOL is_managed( HWND hwnd ) { struct x11drv_win_data *data = get_win_data( hwnd ); BOOL ret = data && data->managed; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..d4f21024634 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -605,6 +605,7 @@ extern void change_systray_owner( Display *display, Window systray_window ) DECL extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL is_managed( HWND hwnd ) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { -- 2.24.1

3 2

[PATCH 1/3] ole32/tests: Use heap-based object for custom moniker.
by Nikolay Sivov Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 138 +++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 73 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 42bc094522..2e1e00adc8 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -34,6 +34,7 @@ #include "initguid.h" #include "wine/test.h" +#include "wine/heap.h" #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) @@ -246,9 +247,30 @@ static const IUnknownVtbl HeapUnknown_Vtbl = HeapUnknown_Release }; +struct test_moniker +{ + IMoniker IMoniker_iface; + IROTData IROTData_iface; + LONG refcount; + + BOOL no_IROTData; +}; + +static struct test_moniker *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IMoniker_iface); +} + +static struct test_moniker *impl_from_IROTData(IROTData *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IROTData_iface); +} + static HRESULT WINAPI -MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { + struct test_moniker *moniker = impl_from_IMoniker(iface); + if (!ppvObject) return E_INVALIDARG; @@ -260,7 +282,11 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IMoniker, riid)) *ppvObject = iface; if (IsEqualIID(&IID_IROTData, riid)) + { CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); + if (!moniker->no_IROTData) + *ppvObject = &moniker->IROTData_iface; + } if ((*ppvObject)==0) return E_NOINTERFACE; @@ -273,13 +299,20 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) static ULONG WINAPI Moniker_AddRef(IMoniker* iface) { - return 2; + struct test_moniker *moniker = impl_from_IMoniker(iface); + return InterlockedIncrement(&moniker->refcount); } static ULONG WINAPI Moniker_Release(IMoniker* iface) { - return 1; + struct test_moniker *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->refcount); + + if (!refcount) + heap_free(moniker); + + return refcount; } static HRESULT WINAPI @@ -457,53 +490,25 @@ Moniker_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) return S_FALSE; } -static const IMonikerVtbl MonikerNoROTDataVtbl = -{ - MonikerNoROTData_QueryInterface, - Moniker_AddRef, - Moniker_Release, - Moniker_GetClassID, - Moniker_IsDirty, - Moniker_Load, - Moniker_Save, - Moniker_GetSizeMax, - Moniker_BindToObject, - Moniker_BindToStorage, - Moniker_Reduce, - Moniker_ComposeWith, - Moniker_Enum, - Moniker_IsEqual, - Moniker_Hash, - Moniker_IsRunning, - Moniker_GetTimeOfLastChange, - Moniker_Inverse, - Moniker_CommonPrefixWith, - Moniker_RelativePathTo, - Moniker_GetDisplayName, - Moniker_ParseDisplayName, - Moniker_IsSystemMoniker -}; - -static IMoniker MonikerNoROTData = { &MonikerNoROTDataVtbl }; - -static IMoniker Moniker; - static HRESULT WINAPI ROTData_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - return IMoniker_QueryInterface(&Moniker, riid, ppvObject); + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppvObject); } static ULONG WINAPI ROTData_AddRef(IROTData *iface) { - return 2; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); } static ULONG WINAPI ROTData_Release(IROTData* iface) { - return 1; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_Release(&moniker->IMoniker_iface); } static HRESULT WINAPI @@ -529,35 +534,6 @@ static IROTDataVtbl ROTDataVtbl = ROTData_GetComparisonData }; -static IROTData ROTData = { &ROTDataVtbl }; - -static HRESULT WINAPI -Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - if (!ppvObject) - return E_INVALIDARG; - - *ppvObject = 0; - - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream,riid) || - IsEqualIID(&IID_IMoniker, riid)) - *ppvObject = iface; - if (IsEqualIID(&IID_IROTData, riid)) - { - CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); - *ppvObject = &ROTData; - } - - if ((*ppvObject)==0) - return E_NOINTERFACE; - - IMoniker_AddRef(iface); - - return S_OK; -} - static const IMonikerVtbl MonikerVtbl = { Moniker_QueryInterface, @@ -585,7 +561,17 @@ static const IMonikerVtbl MonikerVtbl = Moniker_IsSystemMoniker }; -static IMoniker Moniker = { &MonikerVtbl }; +static struct test_moniker *create_test_moniker(void) +{ + struct test_moniker *obj; + + obj = heap_alloc_zero(sizeof(*obj)); + obj->IMoniker_iface.lpVtbl = &MonikerVtbl; + obj->IROTData_iface.lpVtbl = &ROTDataVtbl; + obj->refcount = 1; + + return obj; +} static void test_ROT(void) { @@ -594,6 +580,7 @@ static void test_ROT(void) '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; IMoniker *pMoniker = NULL; + struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; DWORD dwCookie; static const char *methods_register_no_ROTData[] = @@ -634,19 +621,22 @@ static void test_ROT(void) hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); + test_moniker = create_test_moniker(); + test_moniker->no_IROTData = TRUE; + expected_method_list = methods_register_no_ROTData; external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &MonikerNoROTData, &dwCookie); - ok_ole_success(hr, IRunningObjectTable_Register); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + &test_moniker->IMoniker_iface, &dwCookie); + ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok(external_connections == 1, "external_connections = %d\n", external_connections); ok_more_than_one_lock(); expected_method_list = methods_isrunning_no_ROTData; - hr = IRunningObjectTable_IsRunning(pROT, &MonikerNoROTData); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -658,15 +648,16 @@ static void test_ROT(void) expected_method_list = methods_register; /* try with our own moniker */ + test_moniker->no_IROTData = FALSE; hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &Moniker, &dwCookie); + (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok_more_than_one_lock(); expected_method_list = methods_isrunning; - hr = IRunningObjectTable_IsRunning(pROT, &Moniker); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -719,6 +710,7 @@ static void test_ROT(void) ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); + IMoniker_Release(&test_moniker->IMoniker_iface); IRunningObjectTable_Release(pROT); } -- 2.24.0

1 2

[PATCH 1/2] dwrite/tests: Improve coverage of IsMonospacedFont() tests.
by Nikolay Sivov Dec. 23, 2019

Dec. 23, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 130 ++++++++++++++++++++++++++------------- 1 file changed, 87 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index da75a7b70c..68e2c03baf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2018 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2019 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -37,7 +37,7 @@ #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') #define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') -#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') #define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') #define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') @@ -1961,7 +1961,7 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET memset(metrics, 0, sizeof(*metrics)); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2600,7 +2600,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "Failed to create font face, %#x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); @@ -4900,67 +4900,111 @@ static void test_GetDesignGlyphMetrics(void) DELETE_FONTFILE(path); } +static BOOL get_expected_is_monospaced(IDWriteFontFace1 *fontface, const DWRITE_PANOSE *panose) +{ + BOOL exists, is_monospaced = FALSE; + const TT_POST *tt_post; + void *post_context; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace1_TryGetFontTable(fontface, MS_POST_TAG, (const void **)&tt_post, &size, + &post_context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (tt_post) + { + is_monospaced = !!tt_post->fixed_pitch; + IDWriteFontFace1_ReleaseFontTable(fontface, post_context); + } + + if (!is_monospaced) + is_monospaced |= panose->text.proportion == DWRITE_PANOSE_PROPORTION_MONOSPACED; + + return is_monospaced; +} + static void test_IsMonospacedFont(void) { - static const WCHAR courierW[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; IDWriteFontCollection *collection; - IDWriteFactory *factory; - UINT32 index; - BOOL exists; + IDWriteFactory1 *factory; + UINT32 count, i; HRESULT hr; ULONG ref; - factory = create_factory(); + factory = create_factory_iid(&IID_IDWriteFactory1); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (!factory) + { + win_skip("IsMonospacedFont() is not supported.\n"); + return; + } - exists = FALSE; - hr = IDWriteFontCollection_FindFamilyName(collection, courierW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (exists) { + hr = IDWriteFactory1_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Failed to get font collection, hr %#x.\n", hr); + + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; IDWriteFontFamily *family; - IDWriteFont1 *font1; - IDWriteFont *font; + UINT32 font_count, j; + WCHAR nameW[256]; - hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteFontFamily_Release(family); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); - hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); - if (hr == S_OK) { + font_count = IDWriteFontFamily_GetFontCount(family); + + for (j = 0; j < font_count; ++j) + { + BOOL is_monospaced_font, is_monospaced_face, is_monospaced_expected; IDWriteFontFace1 *fontface1; IDWriteFontFace *fontface; - BOOL is_monospaced; + DWRITE_PANOSE panose; + IDWriteFont1 *font1; + IDWriteFont *font; - is_monospaced = IDWriteFont1_IsMonospacedFont(font1); - ok(is_monospaced, "got %d\n", is_monospaced); + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void **)&font1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFont_Release(font); hr = IDWriteFont1_CreateFontFace(font1, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); - ok(hr == S_OK, "got 0x%08x\n", hr); - is_monospaced = IDWriteFontFace1_IsMonospacedFont(fontface1); - ok(is_monospaced, "got %d\n", is_monospaced); - IDWriteFontFace1_Release(fontface1); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IDWriteFontFace_Release(fontface); + + is_monospaced_font = IDWriteFont1_IsMonospacedFont(font1); + is_monospaced_face = IDWriteFontFace1_IsMonospacedFont(fontface1); + ok(is_monospaced_font == is_monospaced_face, "Unexpected monospaced flag.\n"); + + IDWriteFont1_GetPanose(font1, &panose); + + /* FIXME: failures disabled on Wine for now */ + is_monospaced_expected = get_expected_is_monospaced(fontface1, &panose); + todo_wine_if(is_monospaced_expected != is_monospaced_face) + ok(is_monospaced_expected == is_monospaced_face, "Unexpected is_monospaced flag %d for %s, font %d.\n", + is_monospaced_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace1_Release(fontface1); IDWriteFont1_Release(font1); } - else - win_skip("IsMonospacedFont() is not supported.\n"); - IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); } - else - skip("Courier New font not found.\n"); IDWriteFontCollection_Release(collection); - ref = IDWriteFactory_Release(factory); + ref = IDWriteFactory1_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); } @@ -6276,7 +6320,7 @@ static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) hr = IDWriteFont1_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) { @@ -7211,7 +7255,7 @@ static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) UINT32 size; HRESULT hr; - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, hr %#x.\n", hr); if (tt_os2) @@ -7848,7 +7892,7 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) { -- 2.24.0

2 3

[PATCH v2] include: Declare _STGMEDIUM_UNION type except when it violates C spec.
by Jeff Smith Dec. 23, 2019

Dec. 23, 2019

Fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d Based on a patch from Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: Take NONAMELESSUNION definition into consideration in determining what to do with _STGMEDIUM_UNION. include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..a86ceb8b1d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* When NONAMELESSUNION is not defined, the presence of _STGMEDIUM_UNION + * violates the C spec, but is necessary for C++. Avoid C spec violation. */ + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#define _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1440,6 +1446,10 @@ interface IAdviseSink : IUnknown IUnknown *pUnkForRelease; } userSTGMEDIUM; + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.23.0

1 0

Unix FD to Windows File Handles mapping.
by Bruno Albuquerque Dec. 22, 2019

Dec. 22, 2019

Is the way that wine maps file handles from Unix (Linux, more specifically) to Windows predictable? I have this Linux program that forks Wine to run a Windows program. The Windows program can easily access stdin/stdout/stderr the way one would expect in a forked Unix program but I am trying to pass one extra file descriptor to the windows program but I am not sure how to do that. In the Unix program, the FD will be, say, 3. As I am forking then exec'ing Wine, wine itself will have access to this FD and, from Wine's point of view, it should also be 3. The problem is that it seems file handles in Windows are not like in Unix (for example, stdin is not 0, stdout is not 1 and stderr is not 2) so I am assuming that to make this FD available to the WIndows program, it is somehow mapped to a file handle with a different number too. I need to know which one it si to be able to use it. Any pointers on how to do that? If I compile a C program with winegcc/winelib and fork/exec it, it looks like file handles and file descriptors match so one option is to use it. But I prefer to create the program in a different language so winelib is not ideal. Any help would be much appreciated.

5 8

Re: [PATCH] dxgidebug: add missing debug API
by Fabian Maurer Dec. 22, 2019

Dec. 22, 2019

Hi Steve, FYI, wine-patches is deprecated - please send patches and other mail to wine- devel in the future. AFAIK this time it should still be okay though. Are those flags already needed somewhere? Regards, Fabian Maurer

2 1

[PATCH] winegstreamer: Recognize the "video/x-cinepak" type.
by Zebediah Figura Dec. 22, 2019

Dec. 22, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 42 ++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..3641cb5635 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -833,6 +868,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * { static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; const char *typename; + AM_MEDIA_TYPE mt; char *name; GstCaps *caps; GstStructure *arg; @@ -853,12 +889,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); -- 2.24.1

1 0

[PATCH] ntdll: Drop support for floating point numbers in sscanf.
by Erich E. Hoover Dec. 22, 2019

Dec. 22, 2019

Takes care of one more use of "long double". Best, Erich

1 0

Wine staging 5.0 rc2 release
by Alistair Leslie-Hughes Dec. 21, 2019

Dec. 21, 2019

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc2 (835 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [30155] Improve support for SafeDisc v2.05.030. * [47507] Send a WM_ACTIVATE message after restoring a minimized window. * [48289] Grand Theft Auto 5 crashes after loading. Updated: * winebuild-Fake_Dlls * dmime-PChannel-range Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] dmstyle: Avoid cloning the IStream in parse_style_form()
by Michael Stefaniuc Dec. 20, 2019

Dec. 20, 2019

It can be an application provided IStream with unimplemented Clone() method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- That fixes the last crash and the "No One Lives Forever" demo seems playable now. dlls/dmstyle/style.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5ebe6589d4..3e480028b9 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -778,23 +778,21 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK ListCount[0] = 0; switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { - LPSTREAM pClonedStream = NULL; + ULARGE_INTEGER save; struct style_band *pNewBand; TRACE_(dmfile)(": BAND RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - + + /* Can be application provided IStream without Clone method */ liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + IStream_Seek(pStm, liMove, STREAM_SEEK_CUR, &save); - hr = load_band(pClonedStream, &pBand); + hr = load_band(pStm, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; } - IStream_Release (pClonedStream); pNewBand = heap_alloc_zero(sizeof(*pNewBand)); if (NULL == pNewBand) { @@ -808,9 +806,9 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release it as it's inserted */ /** now safely move the cursor */ - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - + liMove.QuadPart = save.QuadPart - liMove.QuadPart + ListSize[0]; + IStream_Seek(pStm, liMove, STREAM_SEEK_SET, NULL); + break; } default: { -- 2.24.1

1 0

[PATCH] msvcrt: Only export __p__* functions on i386
by Martin Storsjo Dec. 20, 2019

Dec. 20, 2019

The previous specification, -arch=win32, is incorrect - these functions aren't available on arm. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b9..4f55bcb45a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -245,35 +245,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc -@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv -@ cdecl -arch=win32 __p___initenv() -@ cdecl -arch=win32 __p___mb_cur_max() -@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv -@ cdecl -arch=win32 __p___winitenv() -@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln -@ cdecl -arch=win32 __p__amblksiz() -@ cdecl -arch=win32 __p__commode() -@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight -@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias -@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ -@ stub -arch=win32 __p__fileinfo() -@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=i386 __p___argc() MSVCRT___p___argc +@ cdecl -arch=i386 __p___argv() MSVCRT___p___argv +@ cdecl -arch=i386 __p___initenv() +@ cdecl -arch=i386 __p___mb_cur_max() +@ cdecl -arch=i386 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=i386 __p___winitenv() +@ cdecl -arch=i386 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=i386 __p__amblksiz() +@ cdecl -arch=i386 __p__commode() +@ cdecl -arch=i386 __p__daylight() MSVCRT___p__daylight +@ cdecl -arch=i386 __p__dstbias() MSVCRT___p__dstbias +@ cdecl -arch=i386 __p__environ() MSVCRT___p__environ +@ stub -arch=i386 __p__fileinfo() +@ cdecl -arch=i386 __p__fmode() MSVCRT___p__fmode @ cdecl -arch=i386 __p__iob() __iob_func -@ stub -arch=win32 __p__mbcasemap() -@ cdecl -arch=win32 __p__mbctype() -@ cdecl -arch=win32 __p__osver() -@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype -@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr -@ stub -arch=win32 __p__pwctype() -@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone -@ cdecl -arch=win32 __p__tzname() -@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron -@ cdecl -arch=win32 __p__winmajor() -@ cdecl -arch=win32 __p__winminor() -@ cdecl -arch=win32 __p__winver() -@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr +@ stub -arch=i386 __p__mbcasemap() +@ cdecl -arch=i386 __p__mbctype() +@ cdecl -arch=i386 __p__osver() +@ cdecl -arch=i386 __p__pctype() MSVCRT___p__pctype +@ cdecl -arch=i386 __p__pgmptr() MSVCRT___p__pgmptr +@ stub -arch=i386 __p__pwctype() +@ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone +@ cdecl -arch=i386 __p__tzname() +@ cdecl -arch=i386 __p__wcmdln() MSVCRT___p__wcmdln +@ cdecl -arch=i386 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=i386 __p__winmajor() +@ cdecl -arch=i386 __p__winminor() +@ cdecl -arch=i386 __p__winver() +@ cdecl -arch=i386 __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() -- 2.17.1

1 0

WineTest regressions
by Francois Gouget Dec. 20, 2019

Dec. 20, 2019

It looks like this patch caused two regressions: commit c8f338369695d360e021f2cbd82a18b2c0eb1514 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 15:54:38 2019 +0100 include: Allow using debug.h in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> * https://test.winehq.org/data/tests/kernel32:codepage.html Something between line 333 and 336 modifies LastError, setting it to ERROR_PROC_NOT_FOUND. Probably the call to wine_dbgstr_wn(). * https://test.winehq.org/data/tests/psapi:psapi_main.html Same thing between line 680 and 684 but this time the suspect is wine_dbgstr_w(). I see two options for fixing: * Modifying wine_dbgstr_*() so they don't modify LastError. If that's possible. * Test LastError before it has been modified (or store it for testing later). That would probably be good policy regardless. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Hell is empty and all the devils are here. -- Wm. Shakespeare, "The Tempest"

2 1

[PATCH 5/5] msvcrt: Add compatibility _set_invalid_parameter_handler importlib implementation.
by Jacek Caban Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/invalid_parameter.c | 38 +++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 5 files changed, 42 insertions(+) create mode 100644 dlls/msvcrt/invalid_parameter.c

1 0

[PATCH 4/5] msvcrt: Add compatibility __p__wcmdln importlib implementation.
by Jacek Caban Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/wcmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/wcmdln.c

1 0

[PATCH 3/5] msvcrt: Add compatibility __p__acmdln importlib implementation.
by Jacek Caban Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/acmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/acmdln.c

1 0

[PATCH 1/5] msvcrt: Introduce IMPORT_SYMBOL helper macro.
by Jacek Caban Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch series fixes builds with mingw configured to default to ucrt. In this case, symbols pulled by startup files were not present in our import lib, so symbols found in default importlib were used. Those four symbols are enough to get current llvm-mingw with default config to work with Wine. Eventually, we will have our own startup files, so we won't need to deal with problems like this. For our own startup code, some of symbols from this series may be useful as well. dlls/msvcrt/iob.c | 8 ++------ dlls/msvcrt/msvcrt.h | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[PATCH] po: Update some Russian strings.
by Nikolay Sivov Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 94 +++++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 69 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3292c450d0..aa5cd6b0c1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-28 11:30+0300\n" +"PO-Revision-Date: 2019-12-20 15:34+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -6829,10 +6829,8 @@ msgid "Begin request has already been made.\n" msgstr "Запрос уже был инициирован.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Объект не инициализирован.\n" +msgstr "Приёмник данных не был завершён.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7055,132 +7053,96 @@ msgid "No events available.\n" msgstr "Нет доступных событий.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition.\n" -msgstr "Данный смена состояний не поддерживается.\n" +msgstr "Некорректная смена состояний источника данных.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Достигнут конец потока данных.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Был вызван метод Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Длительность медиапотока не задана.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" msgstr "" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Набор свойств не найден.\n" +msgstr "Свойство не найдено.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only.\n" -msgstr "Пустое свойство\n" +msgstr "Свойство доступно только для чтения.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Некорректный тип свойства.\n" +msgstr "Недопустимое свойство.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ресурс занят.\n" +msgstr "Источник данных остановлен.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Данный формат не поддерживается.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Ресурс занят.\n" +msgstr "Некорректное состояние источника данных.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Не выбрано ни одного потока.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Характеристики данного источника данных не поддерживаются.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Приёмник данных был удалён.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" msgstr "" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Набор потоков данного приёмника данных фиксирован.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Домен уже существует.\n" +msgstr "Поток приёмника данных уже существует.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Операция была отменена.\n" +msgstr "Создание сэмпла было отменено.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Каталог не пуст.\n" +msgstr "Аллокатор сэмплов пуст.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Состояние часов уже установлено.\n" +msgstr "Приёмник данных уже был остановлен.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" msgstr "" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Потоки приёмника не выбраны.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Слишком длинное имя файла.\n" +msgstr "Превышена длина метаданных.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" @@ -8338,22 +8300,16 @@ msgid "Off" msgstr "Выключено" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "видео" +msgstr "Провайдер" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Выберите формат для экспорта:" +msgstr "Выберите формат для подключения:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Сво&йства" +msgstr "Свойства подключения" #: version.rc:37 msgid "OLE DB Provider(s)" -- 2.24.0

1 0

[PATCH] configure: Allow setting CROSSLDFLAGS by configure.
by Jacek Caban Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This may be used to configure Wine to generate .pdb files with llvm-mingw, but I think this is more generally useful (for .pdb files we should make build system be aware of them, but that's a post-code freeze thing). It's already possible to set it via make argument, but not configure. Makefile.in | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+)

1 0

[v2 PATCH] ole32/tests: Add a trivial test for IMoniker::Enum().
by Nikolay Sivov Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed 2 tests failing on XP. dlls/ole32/tests/moniker.c | 92 +++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e4d693b442..42bc094522 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1532,6 +1532,7 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { IMoniker *moniker, *inverse, *reduced; + IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; DWORD hash; @@ -1609,6 +1610,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); @@ -1617,6 +1633,7 @@ todo_wine static void test_file_moniker(WCHAR* path) { IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; + IEnumMoniker *enummoniker; DWORD moniker_type; IBindCtx *bind_ctx; IStream *stream; @@ -1673,6 +1690,21 @@ todo_wine ok(reduced == moniker1, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker1, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bind_ctx); IStream_Release(stream); @@ -1792,6 +1824,7 @@ static void test_item_moniker(void) static const WCHAR wszDelimiter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; + IEnumMoniker *enummoniker; WCHAR *display_name; LARGE_INTEGER pos; IStream *stream; @@ -1946,6 +1979,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); /* IsEqual */ @@ -1996,6 +2044,7 @@ static void test_anti_moniker(void) FILETIME filetime; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; + IEnumMoniker *enummoniker; IStream *stream; WCHAR *name; @@ -2169,11 +2218,27 @@ todo_wine IStream_Release(stream); + /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); @@ -2181,6 +2246,7 @@ todo_wine static void test_generic_composite_moniker(void) { + IEnumMoniker *enummoniker; HRESULT hr; IMoniker *moniker; IMoniker *moniker1; @@ -2265,18 +2331,31 @@ todo_wine ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } static void test_pointer_moniker(void) { + IMoniker *moniker, *inverse; + IEnumMoniker *enummoniker; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; IStream *stream; IROTData *rotdata; @@ -2383,6 +2462,15 @@ todo_wine IBindCtx_Release(bindctx); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } -- 2.24.0

1 0

[PATCH] dwrite/tests: Improve coverage of IsSymbolFont() tests.
by Nikolay Sivov Dec. 20, 2019

Dec. 20, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 123 +++++++++++++++++++++++++++++++-------- 1 file changed, 99 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3dff4a6191..da75a7b70c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -446,6 +446,7 @@ enum opentype_cmap_table_platform enum opentype_cmap_table_encoding { + OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL = 0, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_BMP = 1, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_FULL = 10, }; @@ -7198,48 +7199,122 @@ static void test_CreateAlphaTexture(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) +{ + BOOL exists, is_symbol = FALSE; + struct dwrite_fonttable cmap; + const TT_OS2_V2 *tt_os2; + const BYTE *tables; + void *os2_context; + WORD num_tables; + unsigned int i; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "Failed to get OS/2 table, hr %#x.\n", hr); + + if (tt_os2) + { + if (tt_os2->version) + is_symbol = !!(GET_BE_DWORD(tt_os2->ulCodePageRange1) & FS_SYMBOL); + if (!is_symbol) + is_symbol = tt_os2->panose.bFamilyType == PAN_FAMILY_PICTORIAL; + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + if (is_symbol) + return is_symbol; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, (const void **)&cmap.data, + &cmap.size, &cmap.context, &exists); + if (FAILED(hr) || !exists) + return is_symbol; + + num_tables = table_read_be_word(&cmap, 0, FIELD_OFFSET(struct cmap_header, numTables)); + tables = cmap.data + FIELD_OFFSET(struct cmap_header, tables); + + for (i = 0; i < num_tables; ++i) + { + struct cmap_encoding_record *record = (struct cmap_encoding_record *)(tables + i * sizeof(*record)); + WORD platform, encoding; + + platform = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, platformID)); + encoding = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, encodingID)); + + if (platform == OPENTYPE_CMAP_TABLE_PLATFORM_WIN && encoding == OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL) + { + is_symbol = TRUE; + break; + } + } + + IDWriteFontFace_ReleaseFontTable(fontface, cmap.context); + + return is_symbol; +} + static void test_IsSymbolFont(void) { - static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; IDWriteFontCollection *collection; IDWriteFontFace *fontface; IDWriteFactory *factory; IDWriteFont *font; + UINT32 count, i; HRESULT hr; ULONG ref; - BOOL ret; factory = create_factory(); - /* Tahoma */ - fontface = create_fontface(factory); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(!ret, "got %d\n", ret); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 font_count, j; + WCHAR nameW[256]; - ret = IDWriteFont_IsSymbolFont(font); - ok(!ret, "got %d\n", ret); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - IDWriteFontCollection_Release(collection); - IDWriteFont_Release(font); - IDWriteFontFace_Release(fontface); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); - /* Symbol */ - font = get_font(factory, symbolW, DWRITE_FONT_STYLE_NORMAL); - ret = IDWriteFont_IsSymbolFont(font); - ok(ret, "got %d\n", ret); + font_count = IDWriteFontFamily_GetFontCount(family); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(ret, "got %d\n", ret); - IDWriteFontFace_Release(fontface); - IDWriteFont_Release(font); + for (j = 0; j < font_count; ++j) + { + BOOL is_symbol_font, is_symbol_face, is_symbol_expected; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + is_symbol_font = IDWriteFont_IsSymbolFont(font); + is_symbol_face = IDWriteFontFace_IsSymbolFont(fontface); + ok(is_symbol_font == is_symbol_face, "Unexpected symbol flag.\n"); + + /* FIXME: failures disabled on Wine for now */ + is_symbol_expected = get_expected_is_symbol(fontface); + todo_wine_if(is_symbol_expected != is_symbol_face) + ok(is_symbol_expected == is_symbol_face, "Unexpected is_symbol flag %d for %s, font %d.\n", + is_symbol_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(collection); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); -- 2.24.0

1 0

[PATCH] wineserver: avoid spurious FD_WRITE on repeated calls to WSAEventSelect()
by Damjan Jovanovic Dec. 20, 2019

Dec. 20, 2019

Repeated calls to WSAEventSelect() with FD_WRITE deliver spurious FD_WRITE events, as the flag isn't held, resulting in us unnecessarily polling the socket for writability, despite the fact FD_WRITE should only be delivered (1) initially on socket creation, and (2) after send[to]() fails with EWOULDBLOCK and buffer space becomes available. This breaks some applications (possibly #10204 and #24946). This patch prevents the spurious FD_WRITE by always holding FD_WRITE in WSAEventSelect()/set_socket_event(). It will be cleared from hmask in enable_socket_event() when a real FD_WRITE needs to be delivered. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++--- server/sock.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)

2 1

[PATCH] msvcrt: Implement wcstod without using 'long double'.
by Erich E. Hoover Dec. 20, 2019

Dec. 20, 2019

Fix for the wide equivalent of strtod (see commit c22af971c287933a137c9fbecc81823812e12b7a). Best, Erich

1 0