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

Re: [PATCH 2/2] comctl32: Paint 32-bpp bitmaps with an alpha channel using GdiAlphaBlend.

by Alexandre Julliard

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > +static HBITMAP create_alpha_bitmap( HBITMAP hbitmap ) > +{ > + HBITMAP alpha = 0; > + BITMAPINFO *info = NULL; > + BITMAP bm; > + HDC src, dst; > + void *bits; > + DWORD i; > + const unsigned char *ptr; > + BOOL has_alpha = FALSE; > + > + if (!GetObjectW( hbitmap, sizeof(bm), &bm )) return 0; > + if (bm.bmBitsPixel != 32) return 0; > + > + if (!(src = CreateCompatibleDC( 0 ))) return 0; > + if (!(dst = CreateCompatibleDC( src ))) goto done; > + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) goto done; > + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); > + info->bmiHeader.biWidth = bm.bmWidth; > + info->bmiHeader.biHeight = -bm.bmHeight; > + info->bmiHeader.biPlanes = 1; > + info->bmiHeader.biBitCount = 32; > + info->bmiHeader.biCompression = BI_RGB; > + info->bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; > + info->bmiHeader.biXPelsPerMeter = 0; > + info->bmiHeader.biYPelsPerMeter = 0; > + info->bmiHeader.biClrUsed = 0; > + info->bmiHeader.biClrImportant = 0; > + if (!(alpha = CreateDIBSection( dst, info, DIB_RGB_COLORS, &bits, NULL, 0 ))) goto done; > + > + SelectObject( src, hbitmap ); > + SelectObject( dst, alpha ); > + BitBlt(dst, 0, 0, bm.bmWidth, bm.bmHeight, src, 0, 0, SRCCOPY); BitBlt() is not guaranteed to preserve alpha, it's not the right function to use here. > @@ -184,7 +235,15 @@ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) > if (!extra) return 0; > > hOldBitmap = extra->image.hbitmap; > - extra->image.hbitmap = hBitmap; > + alpha = create_alpha_bitmap( hBitmap ); > + if (alpha) > + { > + extra->image.hbitmap = alpha; > + extra->image_has_alpha = TRUE; > + } > + else > + extra->image.hbitmap = hBitmap; You'd need to free the old bitmap and reset the flag, though I'm not sure it makes sense to store the flag in the first place, you could handle this at paint time. You probably also need to return the original bitmap, this would need tests. -- Alexandre Julliard julliard(a)winehq.org

May 31, 2019

Re: [PATCH v6 1/7] ntdll/tests: Move NtAllocateVirtualMemory tests that were in kernel32

by Huw Davies

On Fri, May 31, 2019 at 10:31:10AM +0200, Rémi Bernon wrote: > Is there a particular reason the tested functions are dynamically > loaded in some test executables? The typical reason would be that the functions are not available on all of the Windows versions that we test. As we retire testing on older Windows versions this can leave us dynamically loading functions that we need not any more. Huw.

May 31, 2019

Re: [PATCH v6 1/7] ntdll/tests: Move NtAllocateVirtualMemory tests that were in kernel32

by Rémi Bernon

On Thu, 2019-05-30 at 13:19 +0100, Huw Davies wrote: > On Wed, May 29, 2019 at 03:13:07PM +0200, Rémi Bernon wrote: > > diff --git a/dlls/ntdll/tests/virtual.c > > b/dlls/ntdll/tests/virtual.c > > new file mode 100644 > > index 00000000000..63300ac9460 > > --- /dev/null > > +++ b/dlls/ntdll/tests/virtual.c > > @@ -0,0 +1,88 @@ > > +#include <stdio.h> > > + > > +#include "ntstatus.h" > > +#define WIN32_NO_STATUS > > +#include "windef.h" > > +#include "winbase.h" > > +#include "winnt.h" > > +#include "winternl.h" > > +#include "winerror.h" > > +#include "winuser.h" > > +#include "excpt.h" > > +#include "wine/test.h" > > + > > +static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID > > *, ULONG, SIZE_T *, ULONG, ULONG); > > +static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, > > SIZE_T *, ULONG); > > I don't see any reason to dynamically load these fn ptrs, you can > just > call the functions directly. Is there a particular reason the tested functions are dynamically loaded in some test executables? Rémi.

May 31, 2019

Re: [PATCH 1/2] kernel32: Add sxs tests

by Alexandre Julliard

Fabian Maurer <dark.shadow4(a)web.de> writes: > + if (!write_resource_file(info->path_tmp, path_dll, "sxs_dll.dll", info->path_dll)) > + { > + skip("Failed to create file for testing\n"); > + return 1; > + } > + > + if (!write_resource_file(info->path_tmp, exe_manifest, exe_manifest, info->path_manifest_exe)) > + { > + skip("Failed to create file for testing\n"); > + return 1; > + } > + > + if (!write_resource_file(info->path_tmp, dll_manifest, "sxs_dll.manifest", info->path_manifest_dll)) > + { > + skip("Failed to create file for testing\n"); > + return 1; > + } These should be reported as errors, not just skipped. > + info->handle_context = CreateActCtxA(&info->context); > + ok((info->handle_context != NULL && info->handle_context != INVALID_HANDLE_VALUE )|| broken(GetLastError() == 14001), > + "CreateActCtxA failed: %d\n", GetLastError()); > + if (GetLastError() == 14001) > + { > + skip("Failed to create activation context.\n"); > + return 1; > + } Please use the appropriate constant instead of 14001. Also, why does it fail? > + FreeLibrary(info->module); > + FreeLibrary(info->module); /* Make sure it's freed in any case */ Why do you need this? -- Alexandre Julliard julliard(a)winehq.org

May 31, 2019

Re: [PATCH] kernel32: Move the implementation of GetTickCount() to kernel32.

by Huw Davies

On Thu, May 30, 2019 at 11:12:47AM -0500, Andrew Wesie wrote: > If we are going to duplicate the functionality of monotonic_counter, > can we add a test to ensure that it stays in sync with the ntdll > functions? I've attached a test that should work. Right, thanks for pointing that out. I did something similar with the real time clock. I'll send in a patch. Huw.

May 31, 2019

Re: [PATCH 2/2] ddraw: Allow writing to vtable for surface and palette

by Marvin

Hi, While running your changed tests, 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=53117 Your paranoid android. === debian9 (32 bit report) === ddraw: ddraw2.c:3030: Test failed: Expected message 0x7e, but didn't receive it. === debian9 (32 bit WoW report) === ddraw: ddraw2.c:2792: Test failed: Expected message 0x46, but didn't receive it. ddraw2.c:2794: Test failed: Expected screen size 1920x1200, got 0x0. ddraw2.c:2799: Test failed: Expected (0,0)-(1920,1200), got (0,0)-(1920,1080).

May 31, 2019

[PATCH 2/2] ddraw: Allow writing to vtable for surface and palette

by Alistair Leslie-Hughes

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=46949 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/palette.c | 2 +- dlls/ddraw/surface.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/palette.c b/dlls/ddraw/palette.c index 87aec96443..7cfd662f2e 100644 --- a/dlls/ddraw/palette.c +++ b/dlls/ddraw/palette.c @@ -218,7 +218,7 @@ static HRESULT WINAPI ddraw_palette_GetEntries(IDirectDrawPalette *iface, return hr; } -static const struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = +static struct IDirectDrawPaletteVtbl ddraw_palette_vtbl = { /*** IUnknown ***/ ddraw_palette_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 63f276a2a9..275c6a17f5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5390,7 +5390,7 @@ static HRESULT WINAPI d3d_texture1_Load(IDirect3DTexture *iface, IDirect3DTextur * The VTable *****************************************************************************/ -static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = +static struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = { /* IUnknown */ ddraw_surface7_QueryInterface, @@ -5449,7 +5449,7 @@ static const struct IDirectDrawSurface7Vtbl ddraw_surface7_vtbl = ddraw_surface7_GetLOD, }; -static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = +static struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = { /* IUnknown */ ddraw_surface4_QueryInterface, @@ -5503,7 +5503,7 @@ static const struct IDirectDrawSurface4Vtbl ddraw_surface4_vtbl = ddraw_surface4_ChangeUniquenessValue, }; -static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = +static struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = { /* IUnknown */ ddraw_surface3_QueryInterface, @@ -5551,7 +5551,7 @@ static const struct IDirectDrawSurface3Vtbl ddraw_surface3_vtbl = ddraw_surface3_SetSurfaceDesc, }; -static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = +static struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = { /* IUnknown */ ddraw_surface2_QueryInterface, -- 2.17.1

May 31, 2019

[PATCH 1/2] ddraw: Remove const from ddraw1_vtbl and ddraw_surface1_vtbl.

by Alistair Leslie-Hughes

From: Michael Müller <michael(a)fds-team.de> Bad Mojo Redux tries to hook ddraw1 and expects both interfaces to be writable. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=39534 Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 04a94b6978..a26c380839 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4655,7 +4655,7 @@ static const struct IDirectDraw2Vtbl ddraw2_vtbl = ddraw2_GetAvailableVidMem, }; -static const struct IDirectDrawVtbl ddraw1_vtbl = +static struct IDirectDrawVtbl ddraw1_vtbl = { /* IUnknown */ ddraw1_QueryInterface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4e2faef867..63f276a2a9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5597,7 +5597,7 @@ static const struct IDirectDrawSurface2Vtbl ddraw_surface2_vtbl = ddraw_surface2_PageUnlock, }; -static const struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = +static struct IDirectDrawSurfaceVtbl ddraw_surface1_vtbl = { /* IUnknown */ ddraw_surface1_QueryInterface, -- 2.17.1

May 31, 2019

[v2 PATCH] mshtml: Implement IHTMLDocument2 put/get_bgColor

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mshtml/htmldoc.c | 42 +++++++++++++++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 30 +++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 5b14678a6f..160834cd5b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -680,15 +680,49 @@ static HRESULT WINAPI HTMLDocument_get_alinkColor(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_bgColor(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + nsresult nsres; + nsAString nsstr; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + if(V_VT(&v) != VT_BSTR) + { + FIXME("Unsupported type (%d)\n", V_VT(&v)); + return E_INVALIDARG; + } + + nsAString_InitDepend(&nsstr, V_BSTR(&v)); + nsres = nsIDOMHTMLDocument_SetBgColor(This->doc_node->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetBgColor failed: %08x\n", nsres); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_bgColor(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLDocument_GetBgColor(This->doc_node->nsdoc, &nsstr); + if(NS_FAILED(nsres)) + return E_FAIL; + + hres = return_nsstr_variant(nsres, &nsstr, p); + if(hres == S_OK) + { + static const WCHAR defaultcolor[] = {'#','f','f','f','f','f','f',0}; + if(!V_BSTR(p)) + V_BSTR(p) = SysAllocString(defaultcolor); + } + return hres; } static HRESULT WINAPI HTMLDocument_put_fgColor(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d46c232f9b..d5aecfc57d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -9868,6 +9868,35 @@ static void test_doctype(IHTMLDocument2 *doc) IHTMLDOMNode_Release(doctype); } +static void test_background_color(IHTMLDocument2 *doc) +{ + static WCHAR newcolor[] = {'#','f','f','0','0','0','0',0}; + HRESULT hres; + IHTMLDocument2 *doc_node; + VARIANT color; + + doc_node = get_doc_node(doc); + hres = IHTMLDocument2_get_bgColor(doc_node, &color); + ok(hres == S_OK, "failed: %08x\n", hres); + ok(V_VT(&color) == VT_BSTR, "type failed: %d\n", V_VT(&color)); + ok(!strcmp_wa(V_BSTR(&color), "#ffffff"), "str=%s\n", wine_dbgstr_w(V_BSTR(&color))); + VariantClear(&color); + + V_VT(&color) = VT_BSTR; + V_BSTR(&color) = SysAllocString(newcolor); + hres = IHTMLDocument2_put_bgColor(doc_node, color); + ok(hres == S_OK, "failed: %08x\n", hres); + VariantClear(&color); + + hres = IHTMLDocument2_get_bgColor(doc_node, &color); + ok(hres == S_OK, "failed: %08x\n", hres); + ok(V_VT(&color) == VT_BSTR, "type failed: %d\n", V_VT(&color)); + ok(!strcmp_wa(V_BSTR(&color), "#ff0000"), "str=%s\n", wine_dbgstr_w(V_BSTR(&color))); + VariantClear(&color); + + IHTMLDocument2_Release(doc_node); +} + static void test_null_write(IHTMLDocument2 *doc) { HRESULT hres; @@ -11032,6 +11061,7 @@ START_TEST(dom) run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); run_domtest(doctype_str, test_doctype); + run_domtest(doctype_str, test_background_color); test_quirks_mode(); -- 2.17.1

May 31, 2019

Re: [PATCH 5/5] quartz/dsoundrender: Use BaseFilterImpl_QueryInterface().

by Marvin

Hi, While running your changed tests, 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=53110 Your paranoid android. === debian9 (build log) === ../../../wine/dlls/strmbase/renderer.c:228:5: error: unknown field ‘filter_query_interface’ specified in initializer Makefile:580: recipe for target 'renderer.o' failed Makefile:8688: recipe for target 'dlls/strmbase' failed Task: The win32 build failed === debian9 (build log) === ../../../wine/dlls/strmbase/renderer.c:228:5: error: unknown field ‘filter_query_interface’ specified in initializer Makefile:571: recipe for target 'renderer.o' failed Makefile:8431: recipe for target 'dlls/strmbase' failed Task: The wow64 build failed

May 31, 2019