March 2017 - Wine-Devel - list.winehq.org

Re: [PATCH 2/2 resend] devenum: Return S_OK in IMoniker::IsEqual() stub.
by Andrew Eikum March 10, 2017

March 10, 2017

I'm not sure how application use these monikers, but lying about moniker equality makes me a little nervous. This doesn't look that hard to implement correctly. Andrew On Fri, Mar 10, 2017 at 06:26:55PM +0800, Jactry Zeng wrote: > Superseded patch 131295. > > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/devenum/mediacatenum.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > > diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c > index 66343342c9..3543182cf4 100644 > --- a/dlls/devenum/mediacatenum.c > +++ b/dlls/devenum/mediacatenum.c > @@ -530,7 +530,10 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsEqual(IMoniker *iface, IMoniker > { > FIXME("(%p)->(%p): stub\n", iface, pmkOtherMoniker); > > - return E_NOTIMPL; > + if (!pmkOtherMoniker) > + return E_INVALIDARG; > + > + return S_OK; > } > > static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Hash(IMoniker *iface, DWORD *pdwHash) > >

1 0

Re: [1/2] services/tests: Add test for database locking.
by Marvin March 10, 2017

March 10, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29411 Your paranoid android. === w7u (32 bit service) === service.c:407: Test failed: LockServiceDatabase failed: 1055 service.c:413: Test failed: UnlockServiceDatabase failed: 1071

2 1

Re: [PATCH 1/2] devenum: Implement IMoniker::GetClassID().
by Nikolay Sivov March 10, 2017

March 10, 2017

On 10.03.2017 12:32, Jactry Zeng wrote: > Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> > --- > dlls/devenum/mediacatenum.c | 8 +++++--- > dlls/devenum/tests/devenum.c | 9 +++++++++ > 2 files changed, 14 insertions(+), 3 deletions(-) > > - FIXME("(%p)->(%p): stub\n", This, pClassID); > + TRACE("(%p)->(%p): stub\n", This, pClassID); You can remove 'stub' now.

2 1

Re: [PATCH] oledb32: Downgrade IDataSourceLocator_QueryInterface FIXME to WARN
by Huw Davies March 10, 2017

March 10, 2017

On Fri, Mar 10, 2017 at 04:31:02AM +0000, Alistair Leslie-Hughes wrote: > Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> > --- > dlls/oledb32/dslocator.c | 2 +- > dlls/oledb32/tests/database.c | 4 ++++ > 2 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c > index 11ed3e9..055357e 100644 > --- a/dlls/oledb32/dslocator.c > +++ b/dlls/oledb32/dslocator.c > @@ -80,7 +80,7 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID > return S_OK; > } > > - FIXME("interface %s not implemented\n", debugstr_guid(riid)); > + WARN("interface %s not implemented\n", debugstr_guid(riid)); > return E_NOINTERFACE; > } I think leaving the FIXME, but skipping it if the iid is IID_IRunnableObject would be better. Huw.

1 0

Re: [PATCH 1/2] comctl32/propsheet: Diverse UI fixes
by Nikolay Sivov March 10, 2017

March 10, 2017

On 09.03.2017 23:19, Hermès BÉLUSCA-MAÏTO wrote: > [PATCH 1/2] comctl32/propsheet: Diverse UI fixes: > > - Draw static text elements with a transparent background, so that they > acquire the correct background color of the wizard window. > > - Modify the check for the header bitmap, as the header's hbmHeader is > initialized also if the flag PSH_HEADER but not PSH_USEHBMHEADER is set > (see function PROPSHEET_LoadWizardBitmaps). > > - Add a check for header's hbmWatermark so that the watermark is drawn > only when a valid bitmap handle is present. - Fix a copy-pasta error > when drawing the header's subtitle. > > > > Hi, Hermès. Thanks for the patches, some comments follow. > case WM_CTLCOLORSTATIC: > - SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); > - return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); > + SetBkMode((HDC)wParam, TRANSPARENT); > + return (INT_PTR)GetStockObject(HOLLOW_BRUSH); > } Do you have a simple test program to confirm this? This should be a separate patch. > @@ -3373,7 +3373,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) > if (ppshpage->dwFlags & PSP_USEHEADERSUBTITLE) { > SelectObject(hdc, psInfo->hFont); > SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); > - if (!IS_INTRESOURCE(ppshpage->pszHeaderTitle)) > + if (!IS_INTRESOURCE(ppshpage->pszHeaderSubTitle)) > DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); > else > { Looks good, please make it a separate patch too. > @@ -3298,7 +3298,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) > > hOldFont = SelectObject(hdc, psInfo->hFontBold); > > - if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) > + if (psInfo->ppshheader.u5.hbmHeader) > { > hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); > I'll need a visual test to confirm this, looks a bit strange that flags are ignored. > @@ -3395,7 +3395,8 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) > > if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && > (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && > - (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) > + (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && > + (psInfo->ppshheader.u4.hbmWatermark) ) > { > HWND hwndLine = GetDlgItem(hwnd, IDC_SUNKEN_LINE); This looks reasonable, also deserved a separate patch.

1 1

Re: [PATCH 5/7] xmllite/reader: Fix position methods return values in closed reader state
by Marvin March 10, 2017

March 10, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29381 Your paranoid android. === wxppro (32 bit reader) === reader.c:2536: Test failed: Expected (XmlReadState_Initial), got (XmlReadState_Closed) === w2003std (32 bit reader) === reader.c:2536: Test failed: Expected (XmlReadState_Initial), got (XmlReadState_Closed)

1 0

Wine Mono vagrant build environment
by Vincent Povirk March 10, 2017

March 10, 2017

I'm not sure if anyone will care about this, but I figured I should mention it somewhere. With the release of Wine Mono 4.7.0 today, the source tree now ships with a Vagrantfile, which can be used with Vagrant to create a virtual machine that can build the project. This was the environment used to create the msi package, and I plan to continue using it this way for future releases. Previously, the official build environment was my work PC, which means there was always the possibility that upgrading or changing it would have some effect on the official packages. I don't know if this is useful for anyone else, but I figure that an easy way to create a build environment, along with the complete documentation of that environment which we get as a side-effect, can only be a good thing. This is not a replacement for building on real hardware. I only plan to use it to make official builds, not for development, and I still want to hear about any issues people encounter while trying to do the build on their own systems.

2 1

Re: [PATCH 4/5] d3d9/tests: Skip UpdateTexture tests if texture filtering isn't supported.
by Marvin March 10, 2017

March 10, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29375 Your paranoid android. === w1064 (32 bit visual) === visual.c:7947: Test failed: Input test: Quad 3(2crd-wrongidx) returned color 0x00ff00ff, expected 0x00ff0080 visual.c:7995: Test failed: Got unexpected color 0x00007580 for quad 2 (different colors). visual.c:8099: Test failed: Got unexpected color 0x00ff0000 for no color attribute test.

1 0

Re: [PATCH v2 2/5] ddraw/tests: Add a ddraw7 vertex buffer refcount test.
by Marvin March 10, 2017

March 10, 2017

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=29374 Your paranoid android. === w8 (32 bit ddraw7) === ddraw7.c:3763: Test failed: Lit quad with light has color 0x00000000. ddraw7.c:3763: Test failed: Lit quad with singular world matrix has color 0x00000000. ddraw7.c:3763: Test failed: Lit quad with transformation matrix has color 0x00000000.

1 0

RE: ***SPAM*** Re: [PATCH 1/2] comctl32/propsheet: Diverse UI fixes
by Hermès BÉLUSCA-MAÏTO March 9, 2017

March 9, 2017

Hello Nikolay, I'll resend tomorrow the fixes in separate patches, and add a simple test app (with source) for you to have a look. Thank you for your reviewing, Hermès -----Message d'origine----- De : wine-patches [mailto:wine-patches-bounces(a)winehq.org] De la part de Nikolay Sivov Envoyé : jeudi 9 mars 2017 23:17 À : wine-patches(a)winehq.org Objet : ***SPAM*** Re: [PATCH 1/2] comctl32/propsheet: Diverse UI fixes On 09.03.2017 23:19, Hermès BÉLUSCA-MAÏTO wrote: > [PATCH 1/2] comctl32/propsheet: Diverse UI fixes: > > - Draw static text elements with a transparent background, so that > they acquire the correct background color of the wizard window. > > - Modify the check for the header bitmap, as the header's hbmHeader is > initialized also if the flag PSH_HEADER but not PSH_USEHBMHEADER is > set (see function PROPSHEET_LoadWizardBitmaps). > > - Add a check for header's hbmWatermark so that the watermark is drawn > only when a valid bitmap handle is present. - Fix a copy-pasta error > when drawing the header's subtitle. > > > > Hi, Hermès. Thanks for the patches, some comments follow. > case WM_CTLCOLORSTATIC: > - SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); > - return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); > + SetBkMode((HDC)wParam, TRANSPARENT); > + return (INT_PTR)GetStockObject(HOLLOW_BRUSH); > } Do you have a simple test program to confirm this? This should be a separate patch. > @@ -3373,7 +3373,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC hdcParam) > if (ppshpage->dwFlags & PSP_USEHEADERSUBTITLE) { > SelectObject(hdc, psInfo->hFont); > SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); > - if (!IS_INTRESOURCE(ppshpage->pszHeaderTitle)) > + if (!IS_INTRESOURCE(ppshpage->pszHeaderSubTitle)) > DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); > else > { Looks good, please make it a separate patch too. > @@ -3298,7 +3298,7 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC > hdcParam) > > hOldFont = SelectObject(hdc, psInfo->hFontBold); > > - if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) > + if (psInfo->ppshheader.u5.hbmHeader) > { > hbmp = SelectObject(hdcSrc, > psInfo->ppshheader.u5.hbmHeader); > I'll need a visual test to confirm this, looks a bit strange that flags are ignored. > @@ -3395,7 +3395,8 @@ static LRESULT PROPSHEET_Paint(HWND hwnd, HDC > hdcParam) > > if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && > (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && > - (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) > + (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && > + (psInfo->ppshheader.u4.hbmWatermark) ) > { > HWND hwndLine = GetDlgItem(hwnd, IDC_SUNKEN_LINE); This looks reasonable, also deserved a separate patch.

1 0