June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v2 0/3] MR288: comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/288

June 21, 2022

[PATCH v2 1/3] comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND.

by Zhiyi Zhang

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Tested manually on XP, Win 7 and Win 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/toolbar.c | 31 +++++++++++++++++-------------- include/commctrl.h | 2 +- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9b059996b65..bea294958c5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1062,20 +1062,23 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, if (theme) { - int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; - int stateId = TS_NORMAL; - - if (tbcd.nmcd.uItemState & CDIS_DISABLED) - stateId = TS_DISABLED; - else if (tbcd.nmcd.uItemState & CDIS_SELECTED) - stateId = TS_PRESSED; - else if (tbcd.nmcd.uItemState & CDIS_CHECKED) - stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; - else if ((tbcd.nmcd.uItemState & CDIS_HOT) - || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) - stateId = TS_HOT; - - DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); + if (!(dwItemCDFlag & TBCDRF_NOBACKGROUND)) + { + int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; + int stateId = TS_NORMAL; + + if (tbcd.nmcd.uItemState & CDIS_DISABLED) + stateId = TS_DISABLED; + else if (tbcd.nmcd.uItemState & CDIS_SELECTED) + stateId = TS_PRESSED; + else if (tbcd.nmcd.uItemState & CDIS_CHECKED) + stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; + else if ((tbcd.nmcd.uItemState & CDIS_HOT) + || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) + stateId = TS_HOT; + + DrawThemeBackground(theme, hdc, partId, stateId, &rc, NULL); + } } else TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); diff --git a/include/commctrl.h b/include/commctrl.h index b829e4498ea..725ef64764f 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1380,7 +1380,7 @@ typedef struct _NMTBCUSTOMDRAW #define TBCDRF_NOETCHEDEFFECT 0x00100000 /* No etched effect for */ /* disabled items */ #define TBCDRF_BLENDICON 0x00200000 /* ILD_BLEND50 on the icon image */ -#define TBCDRF_NOBACKGROUND 0x00400000 /* ILD_BLEND50 on the icon image */ +#define TBCDRF_NOBACKGROUND 0x00400000 /* Don't draw button background */ #define TBCDRF_USECDCOLORS 0x00800000 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/288

June 21, 2022

[PATCH v2 0/3] MR288: comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND.

by Zhiyi Zhang (＠zhiyi)

Tested manually on XP, Win 7 and Win 10. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> -- v2: comctl32/toolbar: Don't use pattern brushes to draw checked background. comctl32/tests: Test that themed toolbar buttons don't use pattern brushes to draw checked background. comctl32/toolbar: Add support for TBCDRF_NOBACKGROUND. https://gitlab.winehq.org/wine/wine/-/merge_requests/288

June 21, 2022

Re: [PATCH v2 0/5] MR287: uxtheme: Support parsing more button parts and states. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/287

June 21, 2022

Re: [PATCH v3 0/1] MR273: ntdll/tests: Add more tests for \Device\NamedPipe\ root directory. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/273

June 21, 2022

Re: [PATCH v2 1/1] d3drm: Implement IDirect3DRMFrame{1/2/3}::SetSceneBackgroundImage

by Zebediah Figura

On 6/21/22 06:53, Alistair Leslie-Hughes wrote: > From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/d3drm/d3drm_private.h | 1 + > dlls/d3drm/frame.c | 38 +++++++++++++++++++++++++++++++------- > 2 files changed, 32 insertions(+), 7 deletions(-) > In general I'm concerned about these commits adding state tracking code that's never actually used. Most notably, it means we can't test anything but the state tracking, and while there's not *likely* to be anything wrong with the state tracking as it is, it's not impossible either. It's also going to make it harder to implement the real workhorse methods. Once you finally get to the point where you need to implement IDirect3DRMViewport::Render() [and, although it hasn't been stated, I'm guessing you're dealing with a d3drm application that is eventually going to call it], you'll have a whole lot of state that you'll suddenly need to implement, or else basically have methods that silently return success without doing anything useful, which is not good for debugging. In this case it's even worse because "backgroundimage" is never read, so it's completely dead code.

June 21, 2022

Re: [PATCH v3 3/9] d3dx10: Add ID3DX10ThreadPump:AddWorkItem implementation.

by Zebediah Figura

On 6/18/22 14:21, Piotr Caban wrote: > +static DWORD WINAPI io_thread(void *arg) > +{ > + struct thread_pump *thread_pump = arg; > + struct work_item *work_item; > + UINT zero = 0; > + HRESULT hr; > + > + TRACE("%p thread started.\n", thread_pump); > + > + while (1) > + { > + RtlWaitOnAddress((void *)&thread_pump->io_count, &zero, sizeof(zero), NULL); > + AcquireSRWLockExclusive(&thread_pump->io_lock); > + if (!thread_pump->io_count) > + { > + ReleaseSRWLockExclusive(&thread_pump->io_lock); > + continue; > + } This works, but it strikes me as simpler (and more idiomatic) just to use a condition variable. Any reason not to do that? Note also that "zero" can be static const.

June 21, 2022

Re: HLSL compiler change log

by Zebediah Figura

On 6/21/22 03:49, Giovanni Mascellani wrote: > Hi, > > I tried to put together a quick change log for the HLSL compiler since > vkd3d 1.3. I concentrated on user-visible changes (so mostly ignoring > tests and internal refactoring), a possible side effect of which is that > my contributions are somehow more evident. I don't mean to belittle the > work of who did more plumbing job. > > --- > * Support integer arithmetic, bitwise and shift operations. > > * Fold constant operations for a number of operators. > > * Support matrix and vector subscripting. > > * Support matrix copying, casting, entry-wise operations and > row-by-column multiplication. By the last I assume mul() is meant; it may be best to spell that out explicitly. > > * Support complex initializers. > > * Support the "nointerpolation" modifier, and assume it for integer > variables. > > * Perform copy propagation even when the code has branches and/or loops. Which, on a more user-facing level, allows object-typed variables to be used from within loops, and produces more optimized code for variables accessed within loops in general. > --- > > Francisco, are there relevant cases of complex initializers that are > still unsupported in master? Anything else I skipped? A couple smaller things I noticed that I think are worth mentioning as well: * The SV_VertexID semantic is supported. * Matrix-typed varyings are supported.

June 21, 2022

[PATCH 1/1] uiautomationcore: Initialize VARIANT in test_uia_prov_from_acc_properties() (Coverity).

by Connor McAdams

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 298a3942cbb..710991d5a3d 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -2078,6 +2078,7 @@ static void test_uia_prov_from_acc_properties(void) int i, x; /* MSAA role to UIA control type test. */ + VariantInit(&v); for (i = 0; i < ARRAY_SIZE(msaa_role_uia_types); i++) { const struct msaa_role_uia_type *role = &msaa_role_uia_types[i]; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/295

June 21, 2022

[PATCH 0/1] MR295: uiautomationcore: Initialize VARIANT in UIAutomation test.

by Connor McAdams (＠cmcadams)

Initialize VARIANT before calling VariantClear in UIAutomation. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/295

June 21, 2022