September 2019 - Wine-Devel

[PATCH 1/4] comctl32/combo: Add test for WM_CTLCOLORSTATIC
by Fabian Maurer Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 74 +++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 923d826b30..b4130139dd 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -46,6 +46,8 @@ static HWND hComboExParentWnd, hMainWnd; static HINSTANCE hMainHinst; static const char ComboExTestClass[] = "ComboExTestClass"; +static HBRUSH brush_red; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); #define MAX_CHARS 100 @@ -507,6 +509,8 @@ static BOOL init(void) wc.lpfnWndProc = ComboExTestWndProc; RegisterClassA(&wc); + brush_red = CreateSolidBrush(RGB(255, 0, 0)); + hMainWnd = CreateWindowA(WC_STATICA, "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); ShowWindow(hMainWnd, SW_SHOW); @@ -533,6 +537,7 @@ static void cleanup(void) UnregisterClassA(ComboExTestClass, GetModuleHandleA(NULL)); DestroyWindow(hMainWnd); + DeleteObject(brush_red); } static void test_comboex_subclass(void) @@ -717,6 +722,7 @@ static LRESULT (CALLBACK *old_parent_proc)(HWND hwnd, UINT msg, WPARAM wparam, L static LPCSTR expected_edit_text; static LPCSTR expected_list_text; static BOOL selchange_fired; +static HWND lparam_for_WM_CTLCOLOR = 0; static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -748,6 +754,19 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPAR break; } break; + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: + if (lparam_for_WM_CTLCOLOR) + { + ok(lparam_for_WM_CTLCOLOR == (HWND)lparam, "Expected %p, got %p\n", lparam_for_WM_CTLCOLOR, (HWND)lparam); + } + return (LRESULT) brush_red; } return CallWindowProcA(old_parent_proc, hwnd, msg, wparam, lparam); @@ -1254,6 +1273,60 @@ static void test_combo_dropdown_size(DWORD style) } } +static void test_color_messages(void) +{ + HBRUSH brush; + int result; + COMBOBOXINFO info; + HWND handle_combo = create_combobox(CBS_DROPDOWN); + + old_parent_proc = (void *)SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)parent_wnd_proc); + + info.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + result = GetComboBoxInfo(handle_combo, &info); + ok(result, "Failed to get combobox info structure.\n"); + + lparam_for_WM_CTLCOLOR = info.hwndItem; + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLOR, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORMSGBOX, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLOREDIT, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORLISTBOX, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORBTN, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORDLG, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORSCROLLBAR, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + brush = (HBRUSH)SendMessageA(handle_combo, WM_CTLCOLORSTATIC, 0, (LPARAM)info.hwndItem); + todo_wine + ok(brush == brush_red, "Expected %p, got %p\n", brush_red, brush); + + lparam_for_WM_CTLCOLOR = 0; + + DestroyWindow(handle_combo); + SetWindowLongPtrA(hMainWnd, GWLP_WNDPROC, (ULONG_PTR)old_parent_proc); +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1281,6 +1354,7 @@ START_TEST(combo) } /* ComboBox control tests. */ + test_color_messages(); test_combo_WS_VSCROLL(); test_combo_setfont(CBS_DROPDOWN); test_combo_setfont(CBS_DROPDOWNLIST); -- 2.23.0

2 10

[PATCH 1/3] testbot/Engine: Kill the child before forking a new one for sacrifices.
by Francois Gouget Sept. 23, 2019

Sept. 23, 2019

VM::Run() now checks that no process is actively using the VM before starting the new one. Killing the current process makes more sense anyway and could help ensure it won't interfere with the new one by sending TestAgent commands. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Same as before but integrated into the patch series and fixed the commit message. Now that I have been able to reproduce the issue I have been able to confirm that this patch avoids the occurence of the circumstance that caused the Engine to crash last week-end. testbot/lib/WineTestBot/Engine/Scheduler.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Engine/Scheduler.pm b/testbot/lib/WineTestBot/Engine/Scheduler.pm index e9a3ff9fe..737533785 100644 --- a/testbot/lib/WineTestBot/Engine/Scheduler.pm +++ b/testbot/lib/WineTestBot/Engine/Scheduler.pm @@ -765,6 +765,7 @@ sub _SacrificeVM($$$) $Host->{$Victim->Status}--; $Host->{dirty}++; $Victim->RecordStatus($Sched->{records}, $Victim->Status eq "dirty" ? "dirty poweroff" : "dirty sacrifice"); + $Victim->KillChild(); $Victim->RunPowerOff(); return 1; } -- 2.20.1

1 2

[PATCH 5/5] scrobj: Run scripts when creating a scriptlet instance.
by Jacek Caban Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 8 ++++++++ dlls/scrobj/tests/scrobj.c | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-)

1 0

[PATCH 4/5] scrobj: Implement GetItemInfo.
by Jacek Caban Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 228 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 221 insertions(+), 7 deletions(-)

1 0

[PATCH 3/5] scrobj: Create script hosts for scriptlet instance.
by Jacek Caban Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 20 -------------------- 2 files changed, 34 insertions(+), 22 deletions(-)

1 0

[PATCH 2/5] scrobj: Parse scripts in DllInstall.
by Jacek Caban Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 54 ++++++++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.c | 2 -- 2 files changed, 54 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5] scrobj: Add scriptlet instance stub implementation.
by Jacek Caban Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/scrobj/scrobj.c | 213 ++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 53 ++++++++- 2 files changed, 259 insertions(+), 7 deletions(-)

1 0

[PATCH] d2d1: Make ShaderResourceView optional when creating bitmap.
by Brendan Shanks Sept. 23, 2019

Sept. 23, 2019

Fixes Rockstar Games Launcher when using DXVK. Original patch by Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 67 +++++++++++++----------------------- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 5 +-- 3 files changed, 26 insertions(+), 47 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 39e81192f7..b24e9e4cc7 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -66,11 +66,13 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap1 *iface) if (!refcount) { - ID3D10ShaderResourceView_Release(bitmap->view); if (bitmap->rtv) ID3D10RenderTargetView_Release(bitmap->rtv); if (bitmap->surface) IDXGISurface_Release(bitmap->surface); + if (bitmap->view) + ID3D10ShaderResourceView_Release(bitmap->view); + ID3D10Resource_Release(bitmap->texture); ID2D1Factory_Release(bitmap->factory); heap_free(bitmap); } @@ -149,7 +151,6 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, { struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); ID3D10Device *device; - ID3D10Resource *dst; D3D10_BOX box; TRACE("iface %p, dst_rect %p, src_data %p, pitch %u.\n", iface, dst_rect, src_data, pitch); @@ -164,11 +165,9 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromMemory(ID2D1Bitmap1 *iface, box.back = 1; } - ID3D10ShaderResourceView_GetResource(bitmap->view, &dst); - ID3D10ShaderResourceView_GetDevice(bitmap->view, &device); - ID3D10Device_UpdateSubresource(device, dst, 0, dst_rect ? &box : NULL, src_data, pitch, 0); + ID3D10Resource_GetDevice(bitmap->texture, &device); + ID3D10Device_UpdateSubresource(device, bitmap->texture, 0, dst_rect ? &box : NULL, src_data, pitch, 0); ID3D10Device_Release(device); - ID3D10Resource_Release(dst); return S_OK; } @@ -271,36 +270,37 @@ static BOOL format_supported(const D2D1_PIXEL_FORMAT *format) } static void d2d_bitmap_init(struct d2d_bitmap *bitmap, struct d2d_device_context *context, - ID3D10ShaderResourceView *view, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) + ID3D10Resource *texture, D2D1_SIZE_U size, const D2D1_BITMAP_PROPERTIES1 *desc) { - ID3D10Resource *resource; ID3D10Device *d3d_device; HRESULT hr; bitmap->ID2D1Bitmap1_iface.lpVtbl = &d2d_bitmap_vtbl; bitmap->refcount = 1; ID2D1Factory_AddRef(bitmap->factory = context->factory); - ID3D10ShaderResourceView_AddRef(bitmap->view = view); + ID3D10Resource_AddRef(bitmap->texture = texture); bitmap->pixel_size = size; bitmap->format = desc->pixelFormat; bitmap->dpi_x = desc->dpiX; bitmap->dpi_y = desc->dpiY; bitmap->options = desc->bitmapOptions; - ID3D10ShaderResourceView_GetResource(bitmap->view, &resource); - if (d2d_device_context_is_dxgi_target(context)) - ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface, (void **)&bitmap->surface); + ID3D10Resource_QueryInterface(texture, &IID_IDXGISurface, (void **)&bitmap->surface); + ID3D10Resource_GetDevice(texture, &d3d_device); if (bitmap->options & D2D1_BITMAP_OPTIONS_TARGET) { - ID3D10Resource_GetDevice(resource, &d3d_device); - if (FAILED(hr = ID3D10Device_CreateRenderTargetView(d3d_device, resource, NULL, &bitmap->rtv))) + if (FAILED(hr = ID3D10Device_CreateRenderTargetView(d3d_device, texture, NULL, &bitmap->rtv))) WARN("Failed to create rtv, hr %#x.\n", hr); - ID3D10Device_Release(d3d_device); } - ID3D10Resource_Release(resource); + if (!(bitmap->options & D2D1_BITMAP_OPTIONS_CANNOT_DRAW)) + { + if (FAILED(hr = ID3D10Device_CreateShaderResourceView(d3d_device, texture, NULL, &bitmap->view))) + WARN("Failed to create view, hr %#x.\n", hr); + } + ID3D10Device_Release(d3d_device); if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f) { @@ -314,7 +314,6 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, { D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; - ID3D10ShaderResourceView *view; ID3D10Texture2D *texture; HRESULT hr; @@ -355,21 +354,12 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return hr; } - hr = ID3D10Device_CreateShaderResourceView(context->d3d_device, (ID3D10Resource *)texture, NULL, &view); - ID3D10Texture2D_Release(texture); - if (FAILED(hr)) - { - ERR("Failed to create view, hr %#x.\n", hr); - return hr; - } - if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - d2d_bitmap_init(*bitmap, context, view, size, desc); + d2d_bitmap_init(*bitmap, context, (ID3D10Resource *)texture, size, desc); TRACE("Created bitmap %p.\n", *bitmap); } - - ID3D10ShaderResourceView_Release(view); + ID3D10Texture2D_Release(texture); return *bitmap ? S_OK : E_OUTOFMEMORY; } @@ -391,7 +381,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - ID3D10ShaderResourceView_GetDevice(src_impl->view, &device); + ID3D10Resource_GetDevice(src_impl->texture, &device); ID3D10Device_Release(device); if (device != context->d3d_device) { @@ -423,7 +413,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, goto failed; } - d2d_bitmap_init(*bitmap, context, src_impl->view, src_impl->pixel_size, desc); + d2d_bitmap_init(*bitmap, context, src_impl->texture, src_impl->pixel_size, desc); TRACE("Created bitmap %p.\n", *bitmap); failed: @@ -432,7 +422,6 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (IsEqualGUID(iid, &IID_IDXGISurface) || IsEqualGUID(iid, &IID_IDXGISurface1)) { - ID3D10ShaderResourceView *view; DXGI_SURFACE_DESC surface_desc; IDXGISurface *surface = data; ID3D10Resource *resource; @@ -454,17 +443,9 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, return D2DERR_UNSUPPORTED_OPERATION; } - hr = ID3D10Device_CreateShaderResourceView(context->d3d_device, resource, NULL, &view); - ID3D10Resource_Release(resource); - if (FAILED(hr)) - { - WARN("Failed to create shader resource view, hr %#x.\n", hr); - return hr; - } - if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { - ID3D10ShaderResourceView_Release(view); + ID3D10Resource_Release(resource); return E_OUTOFMEMORY; } @@ -472,7 +453,7 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, if (FAILED(hr = IDXGISurface_GetDesc(surface, &surface_desc))) { WARN("Failed to get surface desc, hr %#x.\n", hr); - ID3D10ShaderResourceView_Release(view); + ID3D10Resource_Release(resource); return hr; } @@ -499,8 +480,8 @@ HRESULT d2d_bitmap_create_shared(struct d2d_device_context *context, REFIID iid, pixel_size.width = surface_desc.Width; pixel_size.height = surface_desc.Height; - d2d_bitmap_init(*bitmap, context, view, pixel_size, &d); - ID3D10ShaderResourceView_Release(view); + d2d_bitmap_init(*bitmap, context, resource, pixel_size, &d); + ID3D10Resource_Release(resource); TRACE("Created bitmap %p.\n", *bitmap); return S_OK; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index b07893ae18..e377a731f8 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -349,6 +349,7 @@ struct d2d_bitmap ID3D10ShaderResourceView *view; ID3D10RenderTargetView *rtv; IDXGISurface *surface; + ID3D10Resource *texture; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index 310c541296..eb76bd1ac9 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -687,7 +687,6 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget struct d2d_bitmap *bitmap_impl; IDXGISurface1 *dxgi_surface; ID2D1DeviceContext *context; - ID3D10Resource *resource; D2D1_SIZE_U bitmap_size; ID2D1Bitmap *bitmap; HRESULT hr; @@ -716,9 +715,7 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget } bitmap_impl = unsafe_impl_from_ID2D1Bitmap(bitmap); - ID3D10ShaderResourceView_GetResource(bitmap_impl->view, &resource); - ID3D10Resource_QueryInterface(resource, &IID_IDXGISurface1, (void **)&dxgi_surface); - ID3D10Resource_Release(resource); + ID3D10Resource_QueryInterface(bitmap_impl->texture, &IID_IDXGISurface1, (void **)&dxgi_surface); ID2D1DeviceContext_SetTarget(context, (ID2D1Image *)bitmap); ID2D1Bitmap_Release(bitmap); -- 2.17.1

1 0

[PATCH] testbot: Fix the VM::RecordResult() documentation.
by Francois Gouget Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d85df1d08..ccb07335c 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -655,7 +655,7 @@ sub RecordStatus($$;$) =pod =over 12 -=item C<RecordStatus()> +=item C<RecordResult()> Adds a Record of the specified VM process result. -- 2.20.1

1 0

[PATCH 1/2] testbot/LibvirtTool: Remove _GetStateName(), it is not used anymore.
by Francois Gouget Sept. 23, 2019

Sept. 23, 2019

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 7cbca4c35..f3ac3f310 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -394,23 +394,6 @@ sub IsReady($) ); } -sub _GetStateName($) -{ - my ($State) = @_; - - my %StateNames = ( - Sys::Virt::Domain::STATE_NOSTATE => "no state", - Sys::Virt::Domain::STATE_RUNNING => "running", - Sys::Virt::Domain::STATE_BLOCKED => "blocked", - Sys::Virt::Domain::STATE_PAUSED => "paused", - Sys::Virt::Domain::STATE_SHUTDOWN => "shutdown", - Sys::Virt::Domain::STATE_SHUTOFF => "shutoff", - Sys::Virt::Domain::STATE_CRASHED => "crashed", - Sys::Virt::Domain::STATE_PMSUSPENDED => "pmsuspended", - ); - return $StateNames{$State} || "unknown"; -} - sub PowerOff($) { my ($self) = @_; -- 2.20.1

1 1