November 2021 - Wine-Commits

Alistair Leslie-Hughes : msdasql: Implement IDBProperties GetProperties.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 6e94e879947d9328aa3fbe8a7861bc2d5a464948 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e94e879947d9328aa3fbe8a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 5 16:29:59 2021 +1100 msdasql: Implement IDBProperties GetProperties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 76 +++++++++++++++++++++++++++++++++++++++++-- dlls/msdasql/tests/provider.c | 57 ++++++++++++++++++++++++++++++-- dlls/oledb32/tests/database.c | 4 +-- 3 files changed, 130 insertions(+), 7 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index b8d68287e6a..d14f7957978 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -193,6 +193,12 @@ static const struct dbproperty dbproperties[] = { L"General Timeout", DBPROP_INIT_GENERALTIMEOUT, DBPROPOPTIONS_OPTIONAL, VT_I4 }, }; +struct msdasql_prop +{ + VARTYPE id; + VARIANT value; +}; + struct msdasql { IUnknown MSDASQL_iface; @@ -202,6 +208,7 @@ struct msdasql IPersist IPersist_iface; LONG ref; + struct msdasql_prop properties[14]; }; static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) @@ -324,10 +331,49 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; + DBPROPSET *propset; - FIXME("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + TRACE("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); - return E_NOTIMPL; + *pcPropertySets = 1; + + if (cPropertyIDSets != 1) + { + FIXME("Currently only 1 property set supported.\n"); + cPropertyIDSets = 1; + } + + propset = CoTaskMemAlloc(cPropertyIDSets * sizeof(DBPROPSET)); + propset->guidPropertySet = DBPROPSET_DBINIT; + + for (i=0; i < cPropertyIDSets; i++) + { + TRACE("Property id %d (count %d, set %s)\n", i, rgPropertyIDSets[i].cPropertyIDs, + debugstr_guid(&rgPropertyIDSets[i].guidPropertySet)); + + propset->cProperties = rgPropertyIDSets[i].cPropertyIDs; + propset->rgProperties = CoTaskMemAlloc(propset->cProperties * sizeof(DBPROP)); + + for (j=0; j < propset->cProperties; j++) + { + propset->rgProperties[j].dwPropertyID = rgPropertyIDSets[i].rgPropertyIDs[j]; + + for(k = 0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertyIDSets[i].rgPropertyIDs[j]) + { + V_VT(&propset->rgProperties[j].vValue) = VT_EMPTY; + VariantCopy(&propset->rgProperties[j].vValue, &provider->properties[k].value); + break; + } + } + } + } + + *prgPropertySets = propset; + + return S_OK; } static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, @@ -531,6 +577,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; HRESULT hr; + int i; provider = malloc(sizeof(struct msdasql)); if (!provider) @@ -543,6 +590,31 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->IPersist_iface.lpVtbl = &persistVtbl; provider->ref = 1; + for(i=0; i < ARRAY_SIZE(dbproperties); i++) + { + provider->properties[i].id = dbproperties[i].id; + VariantInit(&provider->properties[i].value); + + /* Only the follow are initialized to a value */ + switch(dbproperties[i].id) + { + case DBPROP_INIT_PROMPT: + V_VT(&provider->properties[i].value) = dbproperties[i].type; + V_I2(&provider->properties[i].value) = 4; + break; + case DBPROP_INIT_LCID: + V_VT(&provider->properties[i].value) = dbproperties[i].type; + V_I4(&provider->properties[i].value) = GetUserDefaultLCID(); + break; + case DBPROP_INIT_OLEDBSERVICES: + V_VT(&provider->properties[i].value) = dbproperties[i].type; + V_I4(&provider->properties[i].value) = -1; + break; + default: + V_VT(&provider->properties[i].value) = VT_EMPTY; + } + } + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); IUnknown_Release(&provider->MSDASQL_iface); return hr; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 6cf95e02a80..6ffe17e7028 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -75,6 +75,14 @@ static void test_Properties(void) ULONG infocount; DBPROPINFOSET *propinfoset; WCHAR *desc; + DBPROPID properties[14] = + { + DBPROP_AUTH_PASSWORD, DBPROP_AUTH_PERSIST_SENSITIVE_AUTHINFO, DBPROP_AUTH_USERID, + DBPROP_INIT_DATASOURCE, DBPROP_INIT_HWND, DBPROP_INIT_LOCATION, + DBPROP_INIT_MODE, DBPROP_INIT_PROMPT, DBPROP_INIT_TIMEOUT, + DBPROP_INIT_PROVIDERSTRING, DBPROP_INIT_LCID, DBPROP_INIT_CATALOG, + DBPROP_INIT_OLEDBSERVICES, DBPROP_INIT_GENERALTIMEOUT + }; hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); @@ -88,18 +96,30 @@ static void test_Properties(void) ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { - ULONG i; VARTYPE types[14] = { VT_BSTR, VT_BOOL, VT_BSTR, VT_BSTR, intptr_vartype, VT_BSTR, VT_I4, VT_I2 , VT_I4, VT_BSTR, VT_I4, VT_BSTR, VT_I4, VT_I4 }; + ULONG i; + DBPROPIDSET propidlist; + ULONG propcnt; + DBPROPSET *propset; ok(IsEqualGUID(&propinfoset->guidPropertySet, &DBPROPSET_DBINIT), "got %s\n", debugstr_guid(&propinfoset->guidPropertySet)); ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + propidlist.guidPropertySet = DBPROPSET_DBINIT; + propidlist.cPropertyIDs = propinfoset->cPropertyInfos; + propidlist.rgPropertyIDs = CoTaskMemAlloc(propinfoset->cPropertyInfos * sizeof(DBPROP)); + for (i = 0; i < propinfoset->cPropertyInfos; i++) { - trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); ok(propinfoset->rgPropertyInfos[i].vtType == types[i], "got %d\n", propinfoset->rgPropertyInfos[i].vtType); ok(propinfoset->rgPropertyInfos[i].dwFlags == (DBPROPFLAGS_DBINIT | DBPROPFLAGS_READ | DBPROPFLAGS_WRITE), "got %d\n", propinfoset->rgPropertyInfos[i].dwFlags); + ok(properties[i] == propinfoset->rgPropertyInfos[i].dwPropertyID, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].dwPropertyID); + ok(propinfoset->rgPropertyInfos[i].vtType != VT_EMPTY, "%d, got %d\n", i, + propinfoset->rgPropertyInfos[i].vtType); + + propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } for (i = 0; i < propinfoset->cPropertyInfos; i++) @@ -107,6 +127,39 @@ static void test_Properties(void) CoTaskMemFree(propinfoset->rgPropertyInfos); CoTaskMemFree(propinfoset); + + hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); + ok(propset->cProperties == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propidlist.cPropertyIDs; i++) + { + VARTYPE vartype = VT_EMPTY; + + ok(properties[i] == propidlist.rgPropertyIDs[i], "%d, got %d\n", i, propidlist.rgPropertyIDs[i]); + + if(properties[i] == DBPROP_INIT_PROMPT) + { + ok(V_I2(&propset->rgProperties[i].vValue) == 4, "wrong value %s\n", debugstr_variant(&propset->rgProperties[i].vValue)); + vartype = VT_I2; + } + else if(properties[i] == DBPROP_INIT_LCID) + { + ok(V_I4(&propset->rgProperties[i].vValue) == GetUserDefaultLCID(), "wrong value %s\n", debugstr_variant(&propset->rgProperties[i].vValue)); + vartype = VT_I4; + } + else if(properties[i] == DBPROP_INIT_OLEDBSERVICES) + { + ok(V_I4(&propset->rgProperties[i].vValue) == -1, "wrong value %s\n", debugstr_variant(&propset->rgProperties[i].vValue)); + vartype = VT_I4; + } + + ok(V_VT(&propset->rgProperties[i].vValue) == vartype, "%d wrong type %d\n", i, V_VT(&propset->rgProperties[i].vValue)); + } + + CoTaskMemFree(propidlist.rgPropertyIDs); + CoTaskMemFree(propset); } IDBProperties_Release(props); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 421f4258afd..8bdb1f948f4 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -1039,8 +1039,7 @@ static void test_odbc_provider(void) CoTaskMemFree(propinfoset); hr = IDBProperties_GetProperties(props, 1, &propidlist, &propcnt, &propset); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) { /* Remove if, once _GetProperties is implemented */ + ok(hr == S_OK, "got 0x%08x\n", hr); ok(propidlist.cPropertyIDs == 14, "got %d\n", propinfoset->cPropertyInfos); for (i = 0; i < propidlist.cPropertyIDs; i++) @@ -1050,7 +1049,6 @@ static void test_odbc_provider(void) propidlist.rgPropertyIDs[i] = propinfoset->rgPropertyInfos[i].dwPropertyID; } - } CoTaskMemFree(propidlist.rgPropertyIDs); CoTaskMemFree(propset);

1 0

Zebediah Figura : winegstreamer: Implement IWMReader::GetOutputFormat().
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 00bc5eb73b95cbfe404fe18e1d0aadacc8ab4662 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00bc5eb73b95cbfe404fe18e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 4 15:46:24 2021 -0500 winegstreamer: Implement IWMReader::GetOutputFormat(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 11 +++++++---- dlls/wmvcore/tests/wmvcore.c | 23 ++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 6771b590a71..dd5b01b3e5c 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -137,11 +137,14 @@ static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD outp return E_NOTIMPL; } -static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output_num, DWORD format_num, IWMOutputMediaProps **props) +static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, + DWORD index, IWMOutputMediaProps **props) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %u %p)\n", This, output_num, format_num, props); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReader(iface); + + TRACE("reader %p, output %u, index %u, props %p.\n", reader, output, index, props); + + return wm_reader_get_output_format(&reader->reader, output, index, props); } static HRESULT WINAPI WMReader_Start(IWMReader *iface, QWORD start, QWORD duration, float rate, void *context) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 148b4f5f373..6fbc2ed6a3e 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1419,21 +1419,18 @@ static void test_async_reader_types(void) * with. In particular it has to be PCM. */ hr = IWMReader_GetOutputFormat(reader, output_number, 0, &output_props); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ret_size = sizeof(mt2_buffer); - hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ret_size = sizeof(mt2_buffer); + hr = IWMOutputMediaProps_GetMediaType(output_props, mt2, &ret_size); + ok(hr == S_OK, "Got hr %#x.\n", hr); - ref = IWMOutputMediaProps_Release(output_props); - ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IWMOutputMediaProps_Release(output_props); + ok(!ref, "Got outstanding refcount %d.\n", ref); - /* The sample size might differ. */ - mt2->lSampleSize = mt->lSampleSize; - ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); - } + /* The sample size might differ. */ + mt2->lSampleSize = mt->lSampleSize; + ok(compare_media_types(mt, mt2), "Media types didn't match.\n"); } else { @@ -1553,7 +1550,7 @@ static void test_async_reader_types(void) output_props = (void *)0xdeadbeef; hr = IWMReader_GetOutputFormat(reader, 2, 0, &output_props); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(output_props == (void *)0xdeadbeef, "Got output props %p.\n", output_props); IWMReaderAdvanced2_Release(advanced);

1 0

Michael Stefaniuc : dmime: Fixup the Wave track parser.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 48f19c76cfd684b1fb3832c44d8cb7553cd62fe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48f19c76cfd684b1fb3832c4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Nov 4 23:44:01 2021 +0100 dmime: Fixup the Wave track parser. An incomplete patch was prematurely added with 854895f70afeeb3c098ff32318353ec4fe7b9bc1 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 6 -- dlls/dmime/wavetrack.c | 254 +++++++++++++++++++++++++-------------------- 2 files changed, 142 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48f19c76cfd684b1fb38…

1 0

Zhiyi Zhang : comctl32/button: Correctly place parts for themed check boxes.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 4f912012a97c3e7e5ba47f3f123c1a79be2fb82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f912012a97c3e7e5ba47f3f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 5 14:34:46 2021 +0800 comctl32/button: Correctly place parts for themed check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 76 ++++++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 80635feaafc..515dff03921 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2748,18 +2748,20 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - SIZE sz; - RECT bgRect, textRect; + RECT client_rect, content_rect, old_label_rect, label_rect, box_rect, image_rect, text_rect; HFONT font, hPrevFont = NULL; DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + LONG ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; NMCUSTOMDRAW nmcd; LRESULT cdrf; LOGFONTW lf; HWND parent; - WCHAR *text; BOOL created_font = FALSE; + int text_offset; + SIZE box_size; + HRGN region; HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); if (SUCCEEDED(hr)) { @@ -2775,20 +2777,31 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (infoPtr->font) SelectObject(hDC, infoPtr->font); } - if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) - sz.cx = sz.cy = 13; + GetClientRect(infoPtr->hwnd, &client_rect); + GetThemeBackgroundContentRect(theme, hDC, part, state, &client_rect, &content_rect); + region = set_control_clipping(hDC, &client_rect); - GetClientRect(infoPtr->hwnd, &bgRect); - GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); - init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); + if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &box_size))) + { + box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + box_size.cy = box_size.cx; + } - if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ - bgRect.top = bgRect.top + (textRect.bottom - textRect.top - sz.cy) / 2; + GetCharWidthW(hDC, '0', '0', &text_offset); + text_offset /= 2; + + label_rect = content_rect; + if (dwStyle & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) + label_rect.right -= box_size.cx + text_offset; + else + label_rect.left += box_size.cx + text_offset; + + old_label_rect = label_rect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &label_rect, &image_rect, &text_rect); + box_rect = get_box_rect(dwStyle, ex_style, &content_rect, &label_rect, dtFlags != (UINT)-1L, + box_size); - /* adjust for the check/radio marker */ - bgRect.bottom = bgRect.top + sz.cy; - bgRect.right = bgRect.left + sz.cx; - textRect.left = bgRect.right + 6; + init_custom_draw(&nmcd, infoPtr, hDC, &client_rect); parent = GetParent(infoPtr->hwnd); if (!parent) parent = infoPtr->hwnd; @@ -2798,7 +2811,6 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); - DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) { @@ -2811,36 +2823,32 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; - text = get_button_text(infoPtr); - if (!(cdrf & CDRF_DOERASE) && text) - DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + /* Draw label */ + if (!(cdrf & CDRF_DOERASE)) + { + DrawThemeBackground(theme, hDC, part, state, &box_rect, NULL); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &image_rect, &text_rect, theme, part, state); + } if (cdrf & CDRF_NOTIFYPOSTPAINT) { nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } + if ((cdrf & CDRF_SKIPPOSTPAINT) || dtFlags == (UINT)-1L) goto cleanup; - if (text) + if (focused) { - if (!(cdrf & CDRF_SKIPPOSTPAINT) && focused) - { - RECT focusRect; - - focusRect = textRect; - - DrawTextW(hDC, text, lstrlenW(text), &focusRect, dtFlags | DT_CALCRECT); - - if (focusRect.right < textRect.right) focusRect.right++; - focusRect.bottom = textRect.bottom; - - DrawFocusRect( hDC, &focusRect ); - } - - heap_free(text); + label_rect.left--; + label_rect.right++; + IntersectRect(&label_rect, &label_rect, &old_label_rect); + DrawFocusRect(hDC, &label_rect); } cleanup: + SelectClipRgn(hDC, region); + if (region) DeleteObject(region); if (created_font) DeleteObject(font); if (hPrevFont) SelectObject(hDC, hPrevFont); }

1 0

Zhiyi Zhang : comctl32/button: Correctly place parts for themed split buttons.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 595f5c59ec6f72c935eddf6ae5dc3b3b2314edf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595f5c59ec6f72c935eddf6a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 5 14:35:05 2021 +0800 comctl32/button: Correctly place parts for themed split buttons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 7b617a199b0..19febd8b6ac 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2917,7 +2917,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT rc, content_rect, push_rect, dropdown_rect, focus_rect; + RECT rc, content_rect, push_rect, dropdown_rect, focus_rect, label_rect, image_rect, text_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2984,13 +2984,12 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in { COLORREF old_color, color; INT old_bk_mode; - WCHAR *text; - if ((text = get_button_text(infoPtr))) - { - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &content_rect); - heap_free(text); - } + label_rect = content_rect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &label_rect, &image_rect, &text_rect); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &image_rect, &text_rect, theme, + BP_PUSHBUTTON, state); GetThemeColor(theme, BP_PUSHBUTTON, state, TMT_TEXTCOLOR, &color); old_bk_mode = SetBkMode(hDC, TRANSPARENT);

1 0

Zhiyi Zhang : comctl32/button: Correctly place parts for buttons with WS_EX_RIGHT.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 2f2cfaf076968ed7a6250b8a61c433e5722e0b55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f2cfaf076968ed7a6250b8a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 5 14:34:30 2021 +0800 comctl32/button: Correctly place parts for buttons with WS_EX_RIGHT. WS_EX_RIGHT has the same effect as BS_RIGHT. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 6a463cb3460..70ac6b1c2da 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1547,17 +1547,15 @@ static BOOL CL_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) */ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *labelRc, RECT *imageRc, RECT *textRc) { - LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); - LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); - LONG split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; WCHAR *text = get_button_text(infoPtr); SIZE imageSize = BUTTON_GetImageSize(infoPtr); - UINT dtStyle = BUTTON_BStoDT(style, ex_style); RECT labelRect, imageRect, imageRectWithMargin, textRect; LONG imageMarginWidth, imageMarginHeight; const RECT *textMargin = BUTTON_GetTextMargin(infoPtr); + LONG style, ex_style, split_style; RECT emptyMargin = {0}; LONG maxTextWidth; + UINT dtStyle; /* Calculate label rectangle according to label type */ if ((imageSize.cx == 0 && imageSize.cy == 0) && (text == NULL || text[0] == '\0')) @@ -1569,6 +1567,14 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la return (UINT)-1; } + style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + /* Add BS_RIGHT directly. When both WS_EX_RIGHT and BS_LEFT are present, it becomes BS_CENTER */ + if (ex_style & WS_EX_RIGHT) + style |= BS_RIGHT; + split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; + dtStyle = BUTTON_BStoDT(style, ex_style); + SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); imageRectWithMargin = imageRect; if (infoPtr->imagelist.himl)

1 0

Zebediah Figura : winegstreamer: Implement IWMReader::GetOutputFormatCount().
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 5306d0ff3c95e7b9b1c77fa2bb30b420d07879f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5306d0ff3c95e7b9b1c77fa2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 4 15:46:25 2021 -0500 winegstreamer: Implement IWMReader::GetOutputFormatCount(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_asyncreader.c | 10 ++++++---- dlls/wmvcore/tests/wmvcore.c | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index dd5b01b3e5c..e7bf667bf90 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -130,11 +130,13 @@ static HRESULT WINAPI WMReader_SetOutputProps(IWMReader *iface, DWORD output_num return E_NOTIMPL; } -static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output_num, DWORD *formats) +static HRESULT WINAPI WMReader_GetOutputFormatCount(IWMReader *iface, DWORD output, DWORD *count) { - struct async_reader *This = impl_from_IWMReader(iface); - FIXME("(%p)->(%u %p)\n", This, output_num, formats); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReader(iface); + + TRACE("reader %p, output %u, count %p.\n", reader, output, count); + + return wm_reader_get_output_format_count(&reader->reader, output, count); } static HRESULT WINAPI WMReader_GetOutputFormat(IWMReader *iface, DWORD output, diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 6fbc2ed6a3e..666cf65a462 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1441,8 +1441,8 @@ static void test_async_reader_types(void) count = 0; hr = IWMReader_GetOutputFormatCount(reader, output_number, &count); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(count > 0, "Got count %u.\n", count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count > 0, "Got count %u.\n", count); for (j = 0; j < count; ++j) { @@ -1518,7 +1518,7 @@ static void test_async_reader_types(void) } hr = IWMReader_GetOutputFormat(reader, output_number, count, &output_props); - todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); + ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#x.\n", hr); hr = IWMReader_GetOutputProps(reader, output_number, &output_props); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1540,7 +1540,7 @@ static void test_async_reader_types(void) count = 0xdeadbeef; hr = IWMReader_GetOutputFormatCount(reader, 2, &count); - todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); ok(count == 0xdeadbeef, "Got count %#x.\n", count); output_props = (void *)0xdeadbeef;

1 0

Zhiyi Zhang : comctl32/button: Correctly place parts for themed push buttons.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: e1fb7f8b86af799c6074f880ddcf68cb5f2ca778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1fb7f8b86af799c6074f880… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 5 14:34:37 2021 +0800 comctl32/button: Correctly place parts for themed push buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51916 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 70ac6b1c2da..80635feaafc 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1761,6 +1761,38 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, heap_free(text); } +static void BUTTON_DrawThemedLabel(const BUTTON_INFO *info, HDC hdc, UINT text_flags, + const RECT *image_rect, const RECT *text_rect, HTHEME theme, + int part, int state) +{ + HBRUSH brush = NULL; + UINT image_flags; + WCHAR *text; + + if (show_image(info)) + { + image_flags = IsWindowEnabled(info->hwnd) ? DSS_NORMAL : DSS_DISABLED; + + if ((GetWindowLongW(info->hwnd, GWL_STYLE) & BS_PUSHLIKE) + && (info->state & BST_INDETERMINATE)) + { + brush = GetSysColorBrush(COLOR_GRAYTEXT); + image_flags |= DSS_MONO; + } + + BUTTON_DrawImage(info, hdc, brush, image_flags, image_rect); + } + + if (show_image_only(info)) + return; + + if (!(text = get_button_text(info))) + return; + + DrawThemeText(theme, hdc, part, state, text, lstrlenW(text), text_flags, 0, text_rect); + heap_free(text); +} + /********************************************************************** * Push Button Functions */ @@ -2661,17 +2693,16 @@ cleanup: */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect, focusRect; + RECT bgRect, labelRect, imageRect, textRect, focusRect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; - WCHAR *text; if (infoPtr->font) SelectObject(hDC, infoPtr->font); GetClientRect(infoPtr->hwnd, &bgRect); - GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); - focusRect = textRect; + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &labelRect); + focusRect = labelRect; init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); @@ -2697,10 +2728,12 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) return; - if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) + if (!(cdrf & CDRF_DOERASE)) { - DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); - heap_free(text); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + if (dtFlags != (UINT)-1L) + BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect, theme, + BP_PUSHBUTTON, state); } if (cdrf & CDRF_NOTIFYPOSTPAINT)

1 0

Hans Leidekker : mshtml: Implement HTMLAnchorElement_get_pathname().
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 3a196ef61354a3654bdc70fac3f4090d1a28d7cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a196ef61354a3654bdc70fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 4 13:08:59 2021 +0100 mshtml: Implement HTMLAnchorElement_get_pathname(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 11 +++++++++-- dlls/mshtml/tests/dom.js | 37 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..b11d39ae07f 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,15 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString pathname_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + /* FIXME: IE prepends a slash for some protocols */ + nsAString_Init(&pathname_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetPathname(This->nsanchor, &pathname_str); + return return_nsstr(nsres, &pathname_str, p); } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 3a2b96a7958..e2be69782fc 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -137,24 +137,39 @@ async_test("iframe_location", function() { }); sync_test("anchor", function() { - var iframe = document.body.firstChild; - var anchor = document.createElement("a"); - var anchor_tests = [ - { href: "http://www.winehq.org:123/about", protocol: "http:", host: "www.winehq.org:123" }, - { href: "https://www.winehq.org:123/about", protocol: "https:", host: "www.winehq.org:123" }, - { href: "about:blank", protocol: "about:", host: "" }, - { href: "file:///c:/dir/file.html", protocol: "file:", host: "" }, - { href: "http://www.winehq.org/about", protocol: "http:", host: "www.winehq.org:80", todo_host: true }, - { href: "https://www.winehq.org/about", protocol: "https:", host: "www.winehq.org:443", todo_host: true }, + { href: "http://www.winehq.org:123/about", + protocol: "http:", host: "www.winehq.org:123", path: "/about" }, + { href: "https://www.winehq.org:123/about", + protocol: "https:", host: "www.winehq.org:123", path: "/about" }, + { href: "about:blank", + protocol: "about:", host: "", path: "/blank", todo_pathname: 1 }, + { href: "unknown:path", + protocol: "unknown:", host: "", path: "path" }, + { href: "ftp:path", + protocol: "ftp:", host: "", path: "path" }, + { href: "mailto:path", + protocol: "mailto:", host: "", path: "path" }, + { href: "ws:path", + protocol: "ws:", host: "", path: "path" }, + { href: "file:path", + protocol: "file:", host: "", path: "/path", todo_pathname: 1 }, + { href: "file:///c:/dir/file.html", + protocol: "file:", host: "", path: "/c:/dir/file.html" }, + { href: "http://www.winehq.org/about", + protocol: "http:", host: "www.winehq.org", path: "/about" }, + { href: "https://www.winehq.org/about", + protocol: "https:", host: "www.winehq.org", path: "/about" }, ]; for(var i in anchor_tests) { var t = anchor_tests[i]; - anchor.href = t.href; + document.body.innerHTML = '<a href="' + t.href + '">'; + var anchor = document.body.firstChild; ok(anchor.protocol === t.protocol, "anchor(" + t.href + ").protocol = " + anchor.protocol); - todo_wine_if("todo_host" in t). ok(anchor.host === t.host, "anchor(" + t.href + ").host = " + anchor.host); + todo_wine_if("todo_pathname" in t). + ok(anchor.pathname === t.path, "anchor(" + t.href + ").pathname = " + anchor.pathname); } });

1 0

Martin Storsjö : winebuild: Fix relay entry points in Thumb mode with binutils/ELF and LLVM/PE.
by Alexandre Julliard Nov. 5, 2021

Nov. 5, 2021

Module: wine Branch: master Commit: 9e9509f3074b9170f5acd432067f8a9b1b599eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e9509f3074b9170f5acd432… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Nov 3 14:41:36 2021 +0200 winebuild: Fix relay entry points in Thumb mode with binutils/ELF and LLVM/PE. b1fe783adee51b5c3d3c0dc58e5dc1e81fd46299 fixed relay entry points in Thumb mode when assembled with Clang/LLVM in ELF mode, but broke them when assembled with binutils as (and PE mode with LLVM didn't work either before or after). When/where the thumb bit is applied on symbols varies a lot between assemblers; this is a notoriously vague and undocumented area. After a .thumb_func directive, binutils as considers the next non-local symbol as a thumb symbol, to have the thumb bit set. LLVM's built-in assembler considers the next symbol, local or not, to be a thumb symbol. (Just noting for reference for possible solutions, this particular difference didn't play a role so far.) Secondly, in a symbol difference expression like this: .long symbol1 - symbol2 Binutils as ignores the potential thumb state for both symbols and just calculates the raw distance. LLVM does include the thumb bit in symbol1 but ignores it in symbol2. Finally, for PE targets, the linker sets the thumb bit on all absolute addresses pointing to the text section, regardless of any .thumb_func directives at assembly time. (I.e., the __wine_spec_relay_entry_points entry in .L__wine_spec_relay_descr gets the bit set even if it wasn't marked as .thumb_func.) Therefore, mark __wine_spec_relay_entry_points as .thumb_func, as the absolute address to it will end up with the thumb bit set in PE builds in any case. Don't mark the individual relay entry pointers as thumb functions (the code still is generated as thumb as there hasn't been any mode switch back to arm mode); this makes the differences calculated correctly (both LLVM and binutils ignore the thumb state of the subtracted label). If desired, one could change __wine_spec_relay_entry_point_%d into local labels with a .L prefix, just as before b1fe783adee51b5c3d3c0dc58e5dc1e81fd46299 again, it doesn't make any difference in this form. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 513778ad10c..36df296b9c1 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -248,6 +248,7 @@ static void output_relay_debug( DLLSPEC *spec ) /* then the relay thunks */ output( "\t.text\n" ); + if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_points:\n" ); output( "\tnop\n" ); /* to avoid 0 offset */ @@ -303,7 +304,6 @@ static void output_relay_debug( DLLSPEC *spec ) has_float = is_float_arg( odp, j ); output( "\t.align %d\n", get_alignment(4) ); - if (thumb_mode) output( "\t.thumb_func\n" ); output( "__wine_spec_relay_entry_point_%d:\n", i ); output_cfi( ".cfi_startproc" ); output( "\tpush {r0-r3}\n" );

1 0