April 2021 - Wine-devel - list.winehq.org

[PATCH] mfplat/tests: Fix an event queue refcounting test on Vista.
by Francois Gouget 23 Apr '21

23 Apr '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- > That means Vista leaks it, not something we want to do. I'd rather > skip all tests on Vista. That seems a bit radical. As far as this failure is concerned, this patch should be sufficient. dlls/mfplat/tests/mfplat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index caf6f78d9e9..fbac078bed3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3129,7 +3129,9 @@ static void test_event_queue(void) EXPECT_REF(&callback.IMFAsyncCallback_iface, 2); IMFMediaEventQueue_Release(queue); - EXPECT_REF(&callback.IMFAsyncCallback_iface, 1); + ret = get_refcount(&callback.IMFAsyncCallback_iface); + ok(ret == 1 || broken(ret == 2) /* Vista */, + "Unexpected refcount %d, expected 1.\n", ret); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); -- 2.20.1

2 1

[PATCH] comctl32: send DTN_DATETIMECHANGE when the checkbox changes too
by Damjan Jovanovic 23 Apr '21

23 Apr '21

Currently the date time picker only sends DTN_DATETIMECHANGE when a date is selected by the user, but it should be sent when the checkbox is changed too. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=19756 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/comctl32/datetime.c | 1 + 1 file changed, 1 insertion(+)

2 1

[PATCH] dwrite: Fix misplaced parentheses.
by Andrey Gusev 23 Apr '21

23 Apr '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dwrite/opentype.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 717550acf38..9830937231d 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2101,7 +2101,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->lf.lfWeight = props->weight; /* FONT_IS_SYMBOL */ - if (!(is_symbol = props->panose.familyKind == DWRITE_PANOSE_FAMILY_SYMBOL)) + if (!(is_symbol = props->panose.familyKind) == DWRITE_PANOSE_FAMILY_SYMBOL) { struct dwrite_fonttable cmap; int i, offset, num_tables; @@ -2133,7 +2133,7 @@ void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct d props->flags |= FONT_IS_SYMBOL; /* FONT_IS_MONOSPACED */ - if (!(is_monospaced = props->panose.text.proportion == DWRITE_PANOSE_PROPORTION_MONOSPACED)) + if (!(is_monospaced = props->panose.text.proportion) == DWRITE_PANOSE_PROPORTION_MONOSPACED) { struct dwrite_fonttable post; @@ -4634,7 +4634,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex feature_index = GET_BE_WORD(langsys->feature_index[j]); if (feature_index >= total_feature_count) continue; - if ((found = feature_list->features[feature_index].tag == feature->tag)) + if ((found = feature_list->features[feature_index].tag) == feature->tag) { feature->index = feature_index; break; -- 2.30.2

4 7

[PATCH 1/6] user32: Add nulldrv dummy english keyboard layout.
by Rémi Bernon 23 Apr '21

23 Apr '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This supersedes 203899-203901 in a sense that they will conflict with the patches. The previous series was anyway not doing much and I intend to resend the surface patches later, making all user32 tests pass with null driver progressively. As a starting point, this series makes all the user32 input tests pass with null graphics driver. dlls/user32/driver.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 7ac77141696..8060baa5df1 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user); WINE_DECLARE_DEBUG_CHANNEL(winediag); +WINE_DECLARE_DEBUG_CHANNEL(keyboard); static USER_DRIVER null_driver, lazy_load_driver; @@ -187,9 +188,12 @@ void USER_unload_driver(void) * These are fallbacks for entry points that are not implemented in the real driver. */ +static HKL nulldrv_keyboard_layout = (HKL)MAKELONG(MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT), MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT)); + static HKL CDECL nulldrv_ActivateKeyboardLayout( HKL layout, UINT flags ) { - return 0; + TRACE_(keyboard)( "layout %p, flags %x.\n", layout, flags ); + return nulldrv_keyboard_layout; } static void CDECL nulldrv_Beep(void) @@ -260,17 +264,24 @@ static INT CDECL nulldrv_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) static HKL CDECL nulldrv_GetKeyboardLayout( DWORD thread_id ) { - return 0; + TRACE_(keyboard)( "thread_id %u.\n", thread_id ); + return nulldrv_keyboard_layout; } static BOOL CDECL nulldrv_GetKeyboardLayoutName( LPWSTR name ) { - return FALSE; + DWORD layout; + TRACE_(keyboard)( "name %p.\n", name ); + layout = HandleToUlong( nulldrv_keyboard_layout ); + if (HIWORD(layout) == LOWORD(layout)) layout = LOWORD(layout); + swprintf( name, KL_NAMELENGTH, L"%08x", layout ); + return TRUE; } static HKL CDECL nulldrv_LoadKeyboardLayout( LPCWSTR name, UINT flags ) { - return 0; + TRACE_(keyboard)( "name %s, flags %x.\n", debugstr_w(name), flags ); + return nulldrv_keyboard_layout; } static UINT CDECL nulldrv_MapVirtualKeyEx( UINT code, UINT type, HKL layout ) -- 2.31.0

3 12

[PATCH] iphlpapi: Fix misplaced parentheses.
by Andrey Gusev 23 Apr '21

23 Apr '21

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/iphlpapi/ipstats.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a15a0abad22..3cf0e811437 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2620,10 +2620,10 @@ static int compare_tcp6_basic_rows(const void *a, const void *b) const MIB_TCP6ROW *rowB = b; int ret; - if ((ret = memcmp(&rowA->LocalAddr, &rowB->LocalAddr, sizeof(rowA->LocalAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->LocalAddr, &rowB->LocalAddr, sizeof(rowA->LocalAddr))) != 0) return ret; if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; if ((ret = rowA->dwLocalPort - rowB->dwLocalPort) != 0) return ret; - if ((ret = memcmp(&rowA->RemoteAddr, &rowB->RemoteAddr, sizeof(rowA->RemoteAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->RemoteAddr, &rowB->RemoteAddr, sizeof(rowA->RemoteAddr))) != 0) return ret; if ((ret = rowA->dwRemoteScopeId - rowB->dwRemoteScopeId) != 0) return ret; return rowA->dwRemotePort - rowB->dwRemotePort; } @@ -2634,10 +2634,10 @@ static int compare_tcp6_owner_rows(const void *a, const void *b) const MIB_TCP6ROW_OWNER_PID *rowB = b; int ret; - if ((ret = memcmp(&rowA->ucLocalAddr, &rowB->ucLocalAddr, sizeof(rowA->ucLocalAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->ucLocalAddr, &rowB->ucLocalAddr, sizeof(rowA->ucLocalAddr))) != 0) return ret; if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; if ((ret = rowA->dwLocalPort - rowB->dwLocalPort) != 0) return ret; - if ((ret = memcmp(&rowA->ucRemoteAddr, &rowB->ucRemoteAddr, sizeof(rowA->ucRemoteAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->ucRemoteAddr, &rowB->ucRemoteAddr, sizeof(rowA->ucRemoteAddr))) != 0) return ret; if ((ret = rowA->dwRemoteScopeId - rowB->dwRemoteScopeId) != 0) return ret; return rowA->dwRemotePort - rowB->dwRemotePort; } @@ -2679,7 +2679,7 @@ static int compare_udp6_rows(const void *a, const void *b) const MIB_UDP6ROW *rowB = b; int ret; - if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr)) != 0)) return ret; + if ((ret = memcmp(&rowA->dwLocalAddr, &rowB->dwLocalAddr, sizeof(rowA->dwLocalAddr))) != 0) return ret; if ((ret = rowA->dwLocalScopeId - rowB->dwLocalScopeId) != 0) return ret; return rowA->dwLocalPort - rowB->dwLocalPort; } -- 2.30.2

1 0

[PATCH v2] gdi32: fix PatBlt() drawing with negative width/height
by Damjan Jovanovic 23 Apr '21

23 Apr '21

In a (x, y, w, h) rectangle passed to PatBlt(), a negative w results in the rectangle drawn being (x+w, y, -w, h), and negative h results in (x, y+h, w, -h). Wine instead does (x+w+1, y, -w, h) and (x, y+h+1, w, -h), so the rectangle drawn is misplaced: Windows (0,0) +------+ |+-----++ || || ++-----+| +------+ Wine This patch recalculates the rectangle dimensions correctly. Try 2 tests brush patterns and multiple DIB/DDB formats. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27584 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdi32/bitblt.c | 11 ++++++ dlls/gdi32/tests/dib.c | 86 ++++++++++++++++++++++++------------------ 2 files changed, 61 insertions(+), 36 deletions(-)

1 0

[tools] winetest/gather: Show skipped dlls on the index pages.
by Francois Gouget 23 Apr '21

23 Apr '21

Sucessful tests are omitted from the index pages except if they skipped some checks. So it makes sense to also show test units that were skipped entirely. Note also that their label (skipped instead of 0) makes it possible to distinguish the two cases. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/gather | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 2a23f0a59..fa5525b88 100755 --- a/winetest/gather +++ b/winetest/gather @@ -505,7 +505,7 @@ foreach my $group (@groups) { merge_status( $test_results{$testname}->{$group->{name}}, $report->{$testname} ); } $group->{$testname} = $group_result; - if ($group_result->{status} =~ /^(?:missing(?:dll|sxs)|skipped|stub)$/ or + if ($group_result->{status} =~ /^(?:missing(?:dll|sxs)|stub)$/ or ($group_result->{status} eq "run" and $group_result->{errors}->[1] == 0 and $group_result->{todos}->[1] == 0 and -- 2.20.1

1 0

[PATCH] po: Update German translation.
by Julian Rüger 23 Apr '21

23 Apr '21

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH v4] msxml3: Don't unlink the XML declaration when saving document.
by Dmitry Timoshkov 23 Apr '21

23 Apr '21

v3: Treat standalone == -1 and standalone == -2 same way when saving XML. v4: XML loading code always creates its own XML declaration, so always specify XML_SAVE_NO_DECL when asking libxml2 to generate XML. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/domdoc.c | 11 ++------ dlls/msxml3/tests/domdoc.c | 53 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 80c32e9ba99..cf4f0433218 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2534,7 +2534,6 @@ static HRESULT WINAPI domdoc_save( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); xmlSaveCtxtPtr ctx = NULL; - xmlNodePtr xmldecl; HRESULT ret = S_OK; TRACE("(%p)->(%s)\n", This, debugstr_variant(&destination)); @@ -2567,9 +2566,8 @@ static HRESULT WINAPI domdoc_save( ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); if(ret == S_OK) { - int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; ctx = xmlSaveToIO(domdoc_stream_save_writecallback, - domdoc_stream_save_closecallback, stream, NULL, options); + domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); if(!ctx) { @@ -2583,8 +2581,6 @@ static HRESULT WINAPI domdoc_save( case VT_BSTR: case VT_BSTR | VT_BYREF: { - int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; - /* save with file path */ HANDLE handle = CreateFileW( (V_VT(&destination) & VT_BYREF)? *V_BSTRREF(&destination) : V_BSTR(&destination), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -2594,9 +2590,8 @@ static HRESULT WINAPI domdoc_save( return E_FAIL; } - /* disable top XML declaration */ ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, options); + handle, NULL, XML_SAVE_NO_DECL); if (!ctx) { CloseHandle(handle); @@ -2610,9 +2605,7 @@ static HRESULT WINAPI domdoc_save( return S_FALSE; } - xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); if (xmlSaveDoc(ctx, get_doc(This)) == -1) ret = S_FALSE; - xmldoc_link_xmldecl(get_doc(This), xmldecl); /* will release resources through close callback */ xmlSaveClose(ctx); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 5bc2fe1d5c3..6f8e2b44ed3 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8524,6 +8524,9 @@ static void test_createProcessingInstruction(void) { static const WCHAR xml1[] = L"<?xml version=\"1.0\"?>\r\n<test/>\r\n"; static const char xml2[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\r\n<test/>\r\n"; + static const char xml2_wine[] = "<?xml version=\"1.0\" encoding=\"windows-1252\"?>\n<test/>\n"; + static const char xml3[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\r\n<test/>\r\n"; + static const char xml3_wine[] = "<?xml version=\"1.0\" standalone=\"yes\"?>\n<test/>\n"; IXMLDOMProcessingInstruction *pi; IXMLDOMDocument *doc; IXMLDOMNode *node; @@ -8533,6 +8536,8 @@ static void test_createProcessingInstruction(void) VARIANT var; HRESULT hr; IStream *stream; + LARGE_INTEGER off; + VARIANT_BOOL b; HGLOBAL global; char *p; @@ -8582,11 +8587,55 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); p = GlobalLock(global); p[GlobalSize(global)] = 0; -todo_wine - ok(!strcmp(p, xml2), "got %s\n", wine_dbgstr_a(p)); + ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + + /* Verify the result after load+save */ + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_load(doc, var, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + off.QuadPart = 0; + hr = IStream_Seek(stream, off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + p = GlobalLock(global); + p[GlobalSize(global)] = 0; + ok(!strcmp(p, xml2) || !strcmp(p, xml2_wine), "got %s\n", wine_dbgstr_a(p)); GlobalUnlock(global); + IStream_Release(stream); + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\" standalone=\"yes\"?>\r\n<test/>\r\n"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&var) = VT_UNKNOWN; + V_UNKNOWN(&var) = (IUnknown*)stream; + hr = IXMLDOMDocument_save(doc, var); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = GetHGlobalFromStream(stream, &global); + ok(hr == S_OK, "got 0x%08x\n", hr); + + p = GlobalLock(global); + p[GlobalSize(global)] = 0; + ok(!strcmp(p, xml3) || !strcmp(p, xml3_wine), "got %s\n", wine_dbgstr_a(p)); + GlobalUnlock(global); + + IStream_Release(stream); IXMLDOMDocument_Release(doc); } -- 2.31.1

2 2

[PATCH v3 2/2] winex11.drv: Correct a full screen condition.
by Ziqing Hui 22 Apr '21

22 Apr '21

The if condition here came from 47c54c4ae7f235780a55ddf670503db4afc11055, which is to detect full screen window. However, according to tests in previous commit, there is possibility that a window without setting WS_CAPTION is not full screen, for example, main window of Tencent WeChat. And windows like this can also be maximized or restored. So that we can not treat WS_CAPTION as our full screen condition. This fixes maximizing Tencent WeChat by dragging it to screen edge. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Change commit message. v3: Fix a typo in title (conditon -> condition). dlls/winex11.drv/event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0