March 2020 - Wine-devel - list.winehq.org

[PATCH v2 resend] comctl32: Correctly draw disabled toolbar button which contains 32 bpp bitmap with alpha channel.
by Ziqing Hui 17 Mar '20

17 Mar '20

It has been a week since I send this patch and got no reply... so I resend it now. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24784 Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/comctl32/imagelist.c | 5 +++++ dlls/comctl32/toolbar.c | 12 ++++++++++++ include/commctrl.h | 2 ++ 3 files changed, 19 insertions(+)

3 3

[PATCH 6/6] d3d9/tests: Fix a test failure on Win10 1809 TestBots.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5adeb51854..603239f922 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -9780,7 +9780,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || broken(hr == E_FAIL && (i == 6 || i == 7)), /* Win10 1809 TestBots */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); IDirect3DVolumeTexture9_Release(dst); -- 2.20.1

2 1

[PATCH 4/6] d3d9/tests: Test device caps on multiple adapters.
by Zhiyi Zhang 17 Mar '20

17 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 310 ++++++++++++++++++++++++--------------- 1 file changed, 189 insertions(+), 121 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 49280ef869..5adeb51854 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12576,8 +12576,44 @@ static void test_stretch_rect(void) DestroyWindow(window); } +#define test_device_caps_adapter_group(a, b, c) _test_device_caps_adapter_group(a, b, c, __LINE__) +static void _test_device_caps_adapter_group(const D3DCAPS9 *caps, unsigned int adapter_idx, + unsigned int adapter_count, int line) +{ + ok_(__FILE__, line)(caps->AdapterOrdinal == adapter_idx, + "Adapter %u: Got unexpected AdapterOrdinal %u.\n", adapter_idx, caps->AdapterOrdinal); + /* Single GPU */ + if (caps->NumberOfAdaptersInGroup == adapter_count) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == 0, + "Adapter %u: Expect MasterAdapterOrdinal %u, got %u.\n", adapter_idx, 0, + caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == caps->AdapterOrdinal, + "Adapter %u: Expect AdapterOrdinalInGroup %u, got %u.\n", adapter_idx, + caps->AdapterOrdinal, caps->AdapterOrdinalInGroup); + ok_(__FILE__, line)(caps->NumberOfAdaptersInGroup == + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + "Adapter %u: Expect NumberOfAdaptersInGroup %u, got %u.\n", adapter_idx, + (caps->AdapterOrdinalInGroup ? 0 : adapter_count), + caps->NumberOfAdaptersInGroup); + } + /* Multiple GPUs and each GPU has only one output */ + else if (caps->NumberOfAdaptersInGroup == 1) + { + ok_(__FILE__, line)(caps->MasterAdapterOrdinal == caps->AdapterOrdinal, + "Adapter %u: Expect MasterAdapterOrdinal %u, got %u.\n", adapter_idx, + caps->AdapterOrdinal, caps->MasterAdapterOrdinal); + ok_(__FILE__, line)(caps->AdapterOrdinalInGroup == 0, + "Adapter %u: Expect AdapterOrdinalInGroup %u, got %u.\n", adapter_idx, 0, + caps->AdapterOrdinalInGroup); + } + /* TODO: Test other multi-GPU setup */ +} + static void test_device_caps(void) { + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; @@ -12589,129 +12625,161 @@ static void test_device_caps(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d, window, NULL))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) { - skip("Failed to create a D3D device.\n"); - IDirect3D9_Release(d3d); - DestroyWindow(window); - return; + /* Test IDirect3D9_GetDeviceCaps */ + hr = IDirect3D9_GetDeviceCaps(d3d, adapter_idx, D3DDEVTYPE_HAL, &caps); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Adapter %u: GetDeviceCaps failed, hr %#x.\n", + adapter_idx, hr); + if (hr == D3DERR_NOTAVAILABLE) + { + skip("Adapter %u: No Direct3D support, skipping test.\n", adapter_idx); + break; + } + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + + /* Test IDirect3DDevice9_GetDeviceCaps */ + device_desc.adapter_ordinal = adapter_idx; + device = create_device(d3d, window, &device_desc); + ok(!!device, "Adapter %u: Failed to create a D3D device.\n", adapter_idx); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Adapter %u: Failed to get caps, hr %#x.\n", adapter_idx, hr); + + test_device_caps_adapter_group(&caps, adapter_idx, adapter_count); + ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), + "Adapter %u: Caps field has unexpected flags %#x.\n", adapter_idx, caps.Caps); + ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA + | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED + | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP + | D3DCAPS2_CANSHARERESOURCE)), + "Adapter %u: Caps2 field has unexpected flags %#x.\n", adapter_idx, caps.Caps2); + /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior + * broken. */ + ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD + | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM + | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED + | D3DCAPS3_RESERVED)), + "Adapter %u: Caps3 field has unexpected flags %#x.\n", adapter_idx, caps.Caps3); + ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP + | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW + | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS + | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP + | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS + | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA + | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS + | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED + | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), + "Adapter %u: PrimitiveMiscCaps field has unexpected flags %#x.\n", adapter_idx, + caps.PrimitiveMiscCaps); + ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST + | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE + | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR + | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER + | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE + | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS + | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) + || broken(!(caps.RasterCaps & ~0x0f736191)), + "Adapter %u: RasterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.RasterCaps); + /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only + * advertised on the reference rasterizer and WARP. */ + ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "Adapter %u: SrcBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.SrcBlendCaps); + ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) + || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR + | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA + | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR + | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA + | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR + | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), + "Adapter %u: DestBlendCaps field has unexpected flags %#x.\n", adapter_idx, + caps.DestBlendCaps); + ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 + | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY + | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE + | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED + | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP + | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP + | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 + | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), + "Adapter %u: TextureCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureCaps); + ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO + | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: TextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.TextureFilterCaps); + ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: CubeTextureFilterCaps field has unexpected flags %#x.\n", adapter_idx, + caps.CubeTextureFilterCaps); + ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR + | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT + | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR + | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD + | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), + "Adapter %u: VolumeTextureFilterCaps field has unexpected flags %#x.\n", + adapter_idx, caps.VolumeTextureFilterCaps); + ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND + | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), + "Adapter %u: LineCaps field has unexpected flags %#x.\n", adapter_idx, + caps.LineCaps); + ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE + | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT + | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), + "Adapter %u: StencilCaps field has unexpected flags %#x.\n", adapter_idx, + caps.StencilCaps); + ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 + | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER + | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP + | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), + "Adapter %u: VertexProcessingCaps field has unexpected flags %#x.\n", adapter_idx, + caps.VertexProcessingCaps); + /* Both Nvidia and AMD give 10 here. */ + ok(caps.MaxActiveLights <= 10, + "Adapter %u: MaxActiveLights field has unexpected value %u.\n", adapter_idx, + caps.MaxActiveLights); + /* AMD gives 6, Nvidia returns 8. */ + ok(caps.MaxUserClipPlanes <= 8, + "Adapter %u: MaxUserClipPlanes field has unexpected value %u.\n", adapter_idx, + caps.MaxUserClipPlanes); + ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, + "Adapter %u: MaxVertexW field has unexpected value %.8e.\n", adapter_idx, + caps.MaxVertexW); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); } - - hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - - ok(!(caps.Caps & ~D3DCAPS_READ_SCANLINE), "Caps field has unexpected flags %#x.\n", caps.Caps); - ok(!(caps.Caps2 & ~(D3DCAPS2_NO2DDURING3DSCENE | D3DCAPS2_FULLSCREENGAMMA - | D3DCAPS2_CANRENDERWINDOWED | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED - | D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP - | D3DCAPS2_CANSHARERESOURCE)), - "Caps2 field has unexpected flags %#x.\n", caps.Caps2); - /* AMD doesn't filter all the ddraw / d3d9 caps. Consider that behavior - * broken. */ - ok(!(caps.Caps3 & ~(D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD - | D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION | D3DCAPS3_COPY_TO_VIDMEM - | D3DCAPS3_COPY_TO_SYSTEMMEM | D3DCAPS3_DXVAHD | D3DCAPS3_DXVAHD_LIMITED - | D3DCAPS3_RESERVED)), - "Caps3 field has unexpected flags %#x.\n", caps.Caps3); - ok(!(caps.PrimitiveMiscCaps & ~(D3DPMISCCAPS_MASKZ | D3DPMISCCAPS_LINEPATTERNREP - | D3DPMISCCAPS_CULLNONE | D3DPMISCCAPS_CULLCW | D3DPMISCCAPS_CULLCCW - | D3DPMISCCAPS_COLORWRITEENABLE | D3DPMISCCAPS_CLIPPLANESCALEDPOINTS - | D3DPMISCCAPS_CLIPTLVERTS | D3DPMISCCAPS_TSSARGTEMP | D3DPMISCCAPS_BLENDOP - | D3DPMISCCAPS_NULLREFERENCE | D3DPMISCCAPS_INDEPENDENTWRITEMASKS - | D3DPMISCCAPS_PERSTAGECONSTANT | D3DPMISCCAPS_FOGANDSPECULARALPHA - | D3DPMISCCAPS_SEPARATEALPHABLEND | D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS - | D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING | D3DPMISCCAPS_FOGVERTEXCLAMPED - | D3DPMISCCAPS_POSTBLENDSRGBCONVERT)), - "PrimitiveMiscCaps field has unexpected flags %#x.\n", caps.PrimitiveMiscCaps); - ok(!(caps.RasterCaps & ~(D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST - | D3DPRASTERCAPS_FOGVERTEX | D3DPRASTERCAPS_FOGTABLE - | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR - | D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER - | D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE - | D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS - | D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE)) - || broken(!(caps.RasterCaps & ~0x0f736191)), - "RasterCaps field has unexpected flags %#x.\n", caps.RasterCaps); - /* D3DPBLENDCAPS_SRCCOLOR2 and D3DPBLENDCAPS_INVSRCCOLOR2 are only - * advertised on the reference rasterizer and WARP. */ - ok(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "SrcBlendCaps field has unexpected flags %#x.\n", caps.SrcBlendCaps); - ok(!(caps.DestBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR)) - || broken(!(caps.SrcBlendCaps & ~(D3DPBLENDCAPS_ZERO | D3DPBLENDCAPS_ONE | D3DPBLENDCAPS_SRCCOLOR - | D3DPBLENDCAPS_INVSRCCOLOR | D3DPBLENDCAPS_SRCALPHA | D3DPBLENDCAPS_INVSRCALPHA - | D3DPBLENDCAPS_DESTALPHA | D3DPBLENDCAPS_INVDESTALPHA | D3DPBLENDCAPS_DESTCOLOR - | D3DPBLENDCAPS_INVDESTCOLOR | D3DPBLENDCAPS_SRCALPHASAT | D3DPBLENDCAPS_BOTHSRCALPHA - | D3DPBLENDCAPS_BOTHINVSRCALPHA | D3DPBLENDCAPS_BLENDFACTOR - | D3DPBLENDCAPS_SRCCOLOR2 | D3DPBLENDCAPS_INVSRCCOLOR2))), - "DestBlendCaps field has unexpected flags %#x.\n", caps.DestBlendCaps); - ok(!(caps.TextureCaps & ~(D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 - | D3DPTEXTURECAPS_ALPHA | D3DPTEXTURECAPS_SQUAREONLY - | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE | D3DPTEXTURECAPS_ALPHAPALETTE - | D3DPTEXTURECAPS_NONPOW2CONDITIONAL | D3DPTEXTURECAPS_PROJECTED - | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP | D3DPTEXTURECAPS_MIPMAP - | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP - | D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2 - | D3DPTEXTURECAPS_NOPROJECTEDBUMPENV)), - "TextureCaps field has unexpected flags %#x.\n", caps.TextureCaps); - ok(!(caps.TextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_CONVOLUTIONMONO - | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "TextureFilterCaps field has unexpected flags %#x.\n", caps.TextureFilterCaps); - ok(!(caps.CubeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "CubeTextureFilterCaps field has unexpected flags %#x.\n", caps.CubeTextureFilterCaps); - ok(!(caps.VolumeTextureFilterCaps & ~(D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR - | D3DPTFILTERCAPS_MINFANISOTROPIC | D3DPTFILTERCAPS_MINFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MINFGAUSSIANQUAD | D3DPTFILTERCAPS_MIPFPOINT - | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR - | D3DPTFILTERCAPS_MAGFANISOTROPIC | D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD - | D3DPTFILTERCAPS_MAGFGAUSSIANQUAD)), - "VolumeTextureFilterCaps field has unexpected flags %#x.\n", caps.VolumeTextureFilterCaps); - ok(!(caps.LineCaps & ~(D3DLINECAPS_TEXTURE | D3DLINECAPS_ZTEST | D3DLINECAPS_BLEND - | D3DLINECAPS_ALPHACMP | D3DLINECAPS_FOG | D3DLINECAPS_ANTIALIAS)), - "LineCaps field has unexpected flags %#x.\n", caps.LineCaps); - ok(!(caps.StencilCaps & ~(D3DSTENCILCAPS_KEEP | D3DSTENCILCAPS_ZERO | D3DSTENCILCAPS_REPLACE - | D3DSTENCILCAPS_INCRSAT | D3DSTENCILCAPS_DECRSAT | D3DSTENCILCAPS_INVERT - | D3DSTENCILCAPS_INCR | D3DSTENCILCAPS_DECR | D3DSTENCILCAPS_TWOSIDED)), - "StencilCaps field has unexpected flags %#x.\n", caps.StencilCaps); - ok(!(caps.VertexProcessingCaps & ~(D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 - | D3DVTXPCAPS_DIRECTIONALLIGHTS | D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER - | D3DVTXPCAPS_TWEENING | D3DVTXPCAPS_TEXGEN_SPHEREMAP - | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER)), - "VertexProcessingCaps field has unexpected flags %#x.\n", caps.VertexProcessingCaps); - /* Both Nvidia and AMD give 10 here. */ - ok(caps.MaxActiveLights <= 10, - "MaxActiveLights field has unexpected value %u.\n", caps.MaxActiveLights); - /* AMD gives 6, Nvidia returns 8. */ - ok(caps.MaxUserClipPlanes <= 8, - "MaxUserClipPlanes field has unexpected value %u.\n", caps.MaxUserClipPlanes); - ok(caps.MaxVertexW == 0.0f || caps.MaxVertexW >= 1e10f, - "MaxVertexW field has unexpected value %.8e.\n", caps.MaxVertexW); - - refcount = IDirect3DDevice9_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); DestroyWindow(window); } -- 2.20.1

1 0

[PATCH resend 1/2] winegstreamer: Also use GST_QOS_TYPE_OVERFLOW for samples that arrive on time.
by Zebediah Figura 17 Mar '20

17 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9d7f85b82d9..2e3fbd29253 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1964,6 +1964,7 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { struct gstdemux_source *pin = impl_from_IQualityControl(iface); + GstQOSType type = GST_QOS_TYPE_OVERFLOW; GstEvent *evt; TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, @@ -1976,8 +1977,13 @@ static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFil if (qm.Type == Flood) qm.Late = 0; - evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, - qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + /* GSTQOS_TYPE_OVERFLOW is also used for buffers that arrive on time, but + * DirectShow filters might use Famine, so check that there actually is an + * underrun. */ + if (qm.Type == Famine && qm.Proportion > 1000) + type = GST_QOS_TYPE_UNDERFLOW; + + evt = gst_event_new_qos(type, qm.Proportion / 1000.0, qm.Late * 100, qm.TimeStamp * 100); if (!evt) { WARN("Failed to create QOS event\n"); -- 2.25.1

1 1

[PATCH] winebus.sys: Use public HID_USAGE_* constants.
by Zebediah Figura 17 Mar '20

17 Mar '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Fix a typo in the process (HID_USAGE_DIGITIZER_Y_TILT is 0x3E, not 0x3F). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 18 +++++++++--------- include/hidusage.h | 33 ++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 24d7961b06..51940ba088 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -139,8 +139,8 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_THROTTLE}, /*ABS_THROTTLE*/ {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_RUDDER}, /*ABS_RUDDER*/ {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_WHEEL}, /*ABS_WHEEL*/ - {HID_USAGE_PAGE_SIMULATION, 0xC4}, /*ABS_GAS*/ - {HID_USAGE_PAGE_SIMULATION, 0xC5}, /*ABS_BRAKE*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_ACCELLERATOR}, /*ABS_GAS*/ + {HID_USAGE_PAGE_SIMULATION, HID_USAGE_SIMULATION_BRAKE}, /*ABS_BRAKE*/ {0,0}, /*ABS_HAT0X*/ {0,0}, /*ABS_HAT0Y*/ {0,0}, /*ABS_HAT1X*/ @@ -149,15 +149,15 @@ static const BYTE ABS_TO_HID_MAP[][2] = { {0,0}, /*ABS_HAT2Y*/ {0,0}, /*ABS_HAT3X*/ {0,0}, /*ABS_HAT3Y*/ - {HID_USAGE_PAGE_DIGITIZER, 0x30}, /*ABS_PRESSURE*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TIP_PRESSURE}, /*ABS_PRESSURE*/ {0, 0}, /*ABS_DISTANCE*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3D}, /*ABS_TILT_X*/ - {HID_USAGE_PAGE_DIGITIZER, 0x3F}, /*ABS_TILT_Y*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_X_TILT}, /*ABS_TILT_X*/ + {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_Y_TILT}, /*ABS_TILT_Y*/ {0, 0}, /*ABS_TOOL_WIDTH*/ {0, 0}, {0, 0}, {0, 0}, - {HID_USAGE_PAGE_CONSUMER, 0xE0} /*ABS_VOLUME*/ + {HID_USAGE_PAGE_CONSUMER, HID_USAGE_CONSUMER_VOLUME} /*ABS_VOLUME*/ }; #define HID_ABS_MAX (ABS_VOLUME+1) #define TOP_ABS_PAGE (HID_USAGE_PAGE_DIGITIZER+1) @@ -245,9 +245,9 @@ static const BYTE* what_am_I(struct udev_device *dev) static const BYTE Keyboard[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD}; static const BYTE Gamepad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_GAMEPAD}; static const BYTE Keypad[2] = {HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYPAD}; - static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, 0x2}; - static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, 0x4}; - static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, 0x5}; + static const BYTE Tablet[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_PEN}; + static const BYTE Touchscreen[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_SCREEN}; + static const BYTE Touchpad[2] = {HID_USAGE_PAGE_DIGITIZER, HID_USAGE_DIGITIZER_TOUCH_PAD}; struct udev_device *parent = dev; diff --git a/include/hidusage.h b/include/hidusage.h index 67d698ed34..c45e2712fc 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -24,6 +24,21 @@ extern "C" { typedef USHORT USAGE, *PUSAGE; +#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) + +#define HID_USAGE_CONSUMER_VOLUME ((USAGE) 0xE0) + +#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) +#define HID_USAGE_DIGITIZER_TOUCH_SCREEN ((USAGE) 0x04) +#define HID_USAGE_DIGITIZER_TOUCH_PAD ((USAGE) 0x05) +#define HID_USAGE_DIGITIZER_TIP_PRESSURE ((USAGE) 0x30) +#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) +#define HID_USAGE_DIGITIZER_X_TILT ((USAGE) 0x3D) +#define HID_USAGE_DIGITIZER_Y_TILT ((USAGE) 0x3E) +#define HID_USAGE_DIGITIZER_AZIMUTH ((USAGE) 0x3F) +#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) +#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) + #define HID_USAGE_GENERIC_POINTER ((USAGE) 0x01) #define HID_USAGE_GENERIC_MOUSE ((USAGE) 0x02) #define HID_USAGE_GENERIC_JOYSTICK ((USAGE) 0x04) @@ -183,16 +198,11 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) -#define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) -#define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) -#define HID_USAGE_TELEPHONY_MESSAGE_CONTROLS ((USAGE) 0x03) -#define HID_USAGE_TELEPHONY_HANDSET ((USAGE) 0x04) -#define HID_USAGE_TELEPHONY_HEADSET ((USAGE) 0x05) -#define HID_USAGE_TELEPHONY_KEYPAD ((USAGE) 0x06) -#define HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON ((USAGE) 0x07) - #define HID_USAGE_SIMULATION_RUDDER ((USAGE) 0xBA) #define HID_USAGE_SIMULATION_THROTTLE ((USAGE) 0xBB) +#define HID_USAGE_SIMULATION_ACCELLERATOR ((USAGE) 0xC4) +#define HID_USAGE_SIMULATION_BRAKE ((USAGE) 0xC5) +#define HID_USAGE_SIMULATION_STEERING ((USAGE) 0xC8) #define HID_USAGE_TELEPHONY_PHONE ((USAGE) 0x01) #define HID_USAGE_TELEPHONY_ANSWERING_MACHINE ((USAGE) 0x02) @@ -214,13 +224,6 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22) -#define HID_USAGE_CONSUMERCTRL ((USAGE) 0x01) - -#define HID_USAGE_DIGITIZER_PEN ((USAGE) 0x02) -#define HID_USAGE_DIGITIZER_IN_RANGE ((USAGE) 0x32) -#define HID_USAGE_DIGITIZER_TIP_SWITCH ((USAGE) 0x42) -#define HID_USAGE_DIGITIZER_BARREL_SWITCH ((USAGE) 0x44) - #ifdef __cplusplus } #endif -- 2.25.1

1 0

[PATCH] hidclass.sys: Don't reset the report count when recording a main item.
by Zebediah Figura 17 Mar '20

17 Mar '20

From: Zebediah Figura <zfigura(a)codeweavers.com> The report count is global and should be preserved. This fixes the Logitech Extreme 3D Pro controller when used with hidraw. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 876369ad70..56e4da4ad1 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -505,7 +505,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l case TAG_MAIN_INPUT: case TAG_MAIN_OUTPUT: case TAG_MAIN_FEATURE: - for (j = 0; caps->ReportCount; j++) + for (j = 0; j < caps->ReportCount; j++) { feature = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*feature)); list_add_tail(&collection->features, &feature->entry); @@ -520,13 +520,13 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->u.NotRange.Usage = usages[j]; feature->caps = *caps; feature->caps.ReportCount = 1; - caps->ReportCount--; feature->collection = collection; if (j+1 >= usages_top) + { + feature->caps.ReportCount += caps->ReportCount - (j + 1); break; + } } - if (caps->ReportCount) - feature->caps.ReportCount += caps->ReportCount; usages_top = 0; new_caps(caps); break; -- 2.25.1

1 0

[PATCH] dmime: Free more interfaces in IDirectMusicPerformance FreePMsg
by Alistair Leslie-Hughes 16 Mar '20

16 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/performance.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b71637a1..f535fe888f 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -535,6 +535,12 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma DMUS_ItemRemoveFromQueue( This, pItem ); LeaveCriticalSection(&This->safe); + if (pPMSG->pTool) + IDirectMusicTool_Release(pPMSG->pTool); + + if (pPMSG->pGraph) + IDirectMusicGraph_Release(pPMSG->pGraph); + if (pPMSG->punkUser) IUnknown_Release(pPMSG->punkUser); -- 2.25.1

2 1

[PATCH] dmime: IDirectMusicGraph GetTool isn't a stub.
by Alistair Leslie-Hughes 16 Mar '20

16 Mar '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index eebebef4d1..85eef9c091 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -149,8 +149,8 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; - - FIXME("(%p, %d, %p): stub\n", This, dwIndex, ppTool); + + TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); LIST_FOR_EACH (pEntry, &This->Tools) { -- 2.25.1

2 1

[tools] testbot/web: Remove the old job submit page.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The new interface seems to be working well so there is no need for the old one anymore. testbot/lib/WineTestBot/CGI/PageBase.pm | 3 +- testbot/web/OldSubmit.pl | 1043 ----------------------- 2 files changed, 1 insertion(+), 1045 deletions(-) delete mode 100644 testbot/web/OldSubmit.pl diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 25a2fdfb45..613bddde5e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -259,8 +259,7 @@ EOF { print " <li class='divider'> </li>\n"; print " <li><p><a href='", MakeSecureURL("/Submit.pl"), - "'>Submit job</a> (<a href='", MakeSecureURL("/OldSubmit.pl"), - "'>Old UI</a>)</p></li>\n"; + "'>Submit job</a></p></li>\n"; print " <li><p><a href='/Activity.pl'>Activity</a></p></li>\n"; print " <li><p><a href='/Stats.pl'>Statistics</a></p></li>\n"; print " <li class='divider'> </li>\n"; diff --git a/testbot/web/OldSubmit.pl b/testbot/web/OldSubmit.pl deleted file mode 100644 index 06ce27565b..0000000000 --- a/testbot/web/OldSubmit.pl +++ /dev/null @@ -1,1043 +0,0 @@ -# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# WineTestBot job submit page -# -# Copyright 2009 Ge van Geldorp -# Copyright 2012-2014, 2017-2018 Francois Gouget -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - -use strict; - -package SubmitPage; - -use ObjectModel::CGI::FreeFormPage; -our @ISA = qw(ObjectModel::CGI::FreeFormPage); - -use CGI qw(:standard); -use Fcntl; # For O_XXX -use IO::Handle; -use POSIX qw(:fcntl_h); # For SEEK_XXX -use File::Basename; - -use ObjectModel::BasicPropertyDescriptor; -use WineTestBot::Branches; -use WineTestBot::Config; -use WineTestBot::Engine::Notify; -use WineTestBot::Jobs; -use WineTestBot::Missions; -use WineTestBot::PatchUtils; -use WineTestBot::Steps; -use WineTestBot::Utils; -use WineTestBot::VMs; - - -sub _initialize($$$) -{ - my ($self, $Request, $RequiredRole) = @_; - - $self->{Page} = $self->GetParam("Page") || 1; - # Page is a hidden parameter so fix it instead of issuing an error - $self->{Page} = 1 if ($self->{Page} !~ /^[1-4]$/); - $self->{LastPage} = $self->{Page}; - - my @PropertyDescriptors1 = ( - CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), - ); - $self->{PropertyDescriptors1} = \@PropertyDescriptors1; - - my @PropertyDescriptors3 = ( - CreateBasicPropertyDescriptor("TestExecutable", "Test executable", !1, 1, "A", 50), - CreateBasicPropertyDescriptor("CmdLineArg", "Command line arguments", !1, !1, "A", 50), - CreateBasicPropertyDescriptor("Run64", "Run 64-bit tests in addition to 32-bit tests", !1, 1, "B", 1), - CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), - CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), - ); - $self->{PropertyDescriptors3} = \@PropertyDescriptors3; - - if ($self->{Page} == 2) - { - $self->{ShowAll} = defined($self->GetParam("ShowAll")); - } - - $self->SUPER::_initialize($Request, $RequiredRole, undef); -} - -sub GetTitle($) -{ - #my ($self) = @_; - return "Submit a job"; -} - -sub GetHeaderText($) -{ - my ($self) = @_; - - if ($self->{Page} == 1) - { - return "Specify the patch file that you want to upload and submit " . - "for testing.<br>\n" . - "You can also specify a Windows .exe file, this would normally be " . - "a Wine test executable that you cross-compiled." - } - elsif ($self->{Page} == 2) - { - my $HeaderText = "Select the VMs on which you want to run your test."; - my $VMs = CreateVMs(); - $VMs->AddFilter("Status", ["offline", "maintenance"]); - if (!$VMs->IsEmpty()) - { - $HeaderText .= "<br>NOTE: Offline VMs and those undergoing maintenance will not be able to run your tests right away."; - } - return $HeaderText; - } - elsif ($self->{Page} == 4) - { - return "Your job was successfully queued, but the job engine that takes " . - "care of actually running it seems to be unavailable (perhaps it " . - "crashed). Your job will remain queued until the engine is " . - "restarted."; - } - - return ""; -} - -sub GetPropertyDescriptors($) -{ - my ($self) = @_; - - if ($self->{Page} == 1) - { - return $self->{PropertyDescriptors1}; - } - elsif ($self->{Page} == 3) - { - my $IsPatch = ($self->GetParam("FileType") eq "patch"); - $self->{PropertyDescriptors3}[0]->{IsRequired} = $IsPatch; - return $self->{PropertyDescriptors3}; - } - - return $self->SUPER::GetPropertyDescriptors(); -} - -sub GenerateFields($) -{ - my ($self) = @_; - - print "<div><input type='hidden' name='Page' value='$self->{Page}'></div>\n"; - if ($self->{Page} == 1) - { - print "<div class='ItemProperty'><label>File</label>", - "<div class='ItemValue'>", - "<input type='file' name='File' size='64' maxlength='64' />", - " <span class='Required'>*</span></div></div>\n"; - my $Branches = CreateBranches(); - my $SelectedBranchKey = $self->GetParam("Branch"); - if (! defined($SelectedBranchKey)) - { - $SelectedBranchKey = $Branches->GetDefaultBranch()->GetKey(); - } - if (! $Branches->MultipleBranchesPresent()) - { - print "<div><input type='hidden' name='Branch' value='", - $self->CGI->escapeHTML($SelectedBranchKey), - "'></div>\n"; - } - else - { - print "<div class='ItemProperty'><label>Branch</label>", - "<div class='ItemValue'>", - "<select name='Branch' size='1'>"; - my @SortedKeys = sort { $a cmp $b } @{$Branches->GetKeys()}; - foreach my $Key (@SortedKeys) - { - my $Branch = $Branches->GetItem($Key); - print "<option value='", $self->CGI->escapeHTML($Key), "'"; - if ($Key eq $SelectedBranchKey) - { - print " selected"; - } - print ">", $self->CGI->escapeHTML($Branch->Name), "</option>"; - } - print "</select>", - " <span class='Required'>*</span></div></div>\n"; - } - - $self->{HasRequired} = 1; - } - else - { - if (! defined($self->{FileName})) - { - $self->{FileName} = $self->GetParam("FileName"); - } - if (! defined($self->{FileType})) - { - $self->{FileType} = $self->GetParam("FileType"); - } - if (! defined($self->{TestExecutable})) - { - $self->{TestExecutable} = $self->GetParam("TestExecutable"); - } - if (! defined($self->{CmdLineArg})) - { - $self->{CmdLineArg} = $self->GetParam("CmdLineArg"); - } - print "<div><input type='hidden' name='Remarks' value='", - $self->CGI->escapeHTML($self->GetParam("Remarks")), "'></div>\n"; - print "<div><input type='hidden' name='FileName' value='", - $self->CGI->escapeHTML($self->{FileName}), "'></div>\n"; - print "<div><input type='hidden' name='FileType' value='", - $self->CGI->escapeHTML($self->{FileType}), "'></div>\n"; - print "<div><input type='hidden' name='Branch' value='", - $self->CGI->escapeHTML($self->GetParam("Branch")), "'></div>\n"; - if ($self->{Page} != 3) - { - if (defined($self->{TestExecutable})) - { - print "<div><input type='hidden' name='TestExecutable' value='", - $self->CGI->escapeHTML($self->{TestExecutable}), "'></div>\n"; - } - if (defined($self->{CmdLineArg})) - { - print "<div><input type='hidden' name='CmdLineArg' value='", - $self->CGI->escapeHTML($self->{CmdLineArg}), "'></div>\n"; - } - } - if ($self->{Page} == 2) - { - if ($self->{LastPage} == 3) - { - my $VMs = CreateVMs(); - # VMs that are only visible with ShowAll - $VMs->AddFilter("Role", ["winetest", "extra"]); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if (defined $self->GetParam($FieldName)) - { - $self->{ShowAll} = 1; - last; - } - } - } - if ($self->{ShowAll}) - { - print "<div><input type='hidden' name='ShowAll' value='1'></div>\n"; - } - print "<div class='CollectionBlock'><table>\n"; - print "<thead><tr><th class='Record'></th>\n"; - print "<th class='Record'>VM Name</th>\n"; - print "<th class='Record'>Description</th>\n"; - print "</thead><tbody>\n"; - - my $VMs = CreateVMs(); - if ($self->{FileType} eq "exe64") - { - $VMs->AddFilter("Type", ["win64", "wine"]); - } - else - { - $VMs->AddFilter("Type", ["win32", "win64", "wine"]); - } - if ($self->{ShowAll}) - { - # All but the retired and deleted ones - $VMs->AddFilter("Role", ["base", "winetest", "extra"]); - } - else - { - $VMs->AddFilter("Role", ["base"]); - } - my $Even = 1; - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - print "<tr class='", ($Even ? "even" : "odd"), - "'><td><input name='$FieldName' type='checkbox'"; - $Even = !$Even; - my ($Checked, $Status) = (1, ""); - if ($VM->Status =~ /^(offline|maintenance)$/) - { - $Status = " [". $VM->Status ."]"; - $Checked = undef; - } - if ($Checked and - ($self->{LastPage} == 1 || $self->GetParam($FieldName))) - { - print " checked='checked'"; - } - print "/></td>\n"; - - print "<td>", $self->CGI->escapeHTML($VM->Name), "</td>\n"; - print "<td><details><summary>", - $self->CGI->escapeHTML($VM->Description || $VM->Name), - "$Status</summary>", - $self->CGI->escapeHTML($VM->Details || "No details!"), - "</details></td>"; - print "</tr>\n"; - } - print "</tbody></table>\n"; - print "</div>\n"; - } - else - { - if (defined($self->{NoCmdLineArgWarn})) - { - print "<div><input type='hidden' name='NoCmdLineArgWarn' value='on'>", - "</div>\n"; - } - my $VMs = CreateVMs(); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if ($self->GetParam($FieldName)) - { - print "<div><input type='hidden' name='$FieldName' value='on'>", - "</div>\n"; - } - } - } - } - if ($self->{Page} == 4) - { - if ($self->GetParam("JobKey")) - { - $self->{JobKey} = $self->GetParam("JobKey"); - } - print "<div><input type='hidden' name='JobKey' value='", $self->{JobKey}, - "'></div>\n"; - } - - $self->SUPER::GenerateFields(); -} - -sub GenerateActions($) -{ - my ($self) = @_; - - if ($self->{Page} == 2) - { - print <<EOF; -<script type='text/javascript'> - -</script> -EOF - - print "<div class='ItemActions'>\n"; - print "<input type='submit' name='Action' value='", - $self->{ShowAll} ? "Show base VMs" : "Show all VMs", "'/>\n"; - print "</div>\n"; - } - - $self->SUPER::GenerateActions(); -} - -sub GetActions($) -{ - my ($self) = @_; - - my $Actions = $self->SUPER::GetActions(); - if ($self->{Page} == 1) - { - push @$Actions, "Next >"; - } - elsif ($self->{Page} == 2) - { - push @$Actions, "< Prev", "Next >"; - } - elsif ($self->{Page} == 3) - { - push @$Actions, "< Prev", "Submit"; - } - elsif ($self->{Page} == 4) - { - push @$Actions, "OK"; - } - - return $Actions; -} - -sub DisplayProperty($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if ($self->{Page} == 3) - { - my $PropertyName = $PropertyDescriptor->GetName(); - if ($self->GetParam("FileType") eq "patch") - { - if ($PropertyName eq "Run64") - { - my $Show64 = !1; - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["win64"]); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if ($self->GetParam($FieldName)) - { - $Show64 = 1; - last; - } - } - if (! $Show64) - { - return ""; - } - } - } - else - { - if ($PropertyName eq "TestExecutable" || $PropertyName eq "Run64") - { - return ""; - } - } - } - - return $self->SUPER::DisplayProperty($PropertyDescriptor); -} - -sub GetPropertyValue($$) -{ - my ($self, $PropertyDescriptor) = @_; - - if ($self->{Page} == 3) - { - my $PropertyName = $PropertyDescriptor->GetName(); - if ($PropertyName eq "DebugLevel") - { - return 1; - } - if ($PropertyName eq "Run64") - { - return 1; - } - } - - return $self->SUPER::GetPropertyValue($PropertyDescriptor); -} - -sub GetTmpStagingFullPath($$) -{ - my ($self, $FileName) = @_; - - return undef if (!$FileName); - return "$DataDir/staging/" . $self->GetCurrentSession()->Id . "-websubmit_$FileName"; -} - -sub Validate($) -{ - my ($self) = @_; - - if ($self->{Page} == 2) - { - my $VMSelected = !1; - my $VMs = CreateVMs(); - foreach my $VMKey (@{$VMs->GetKeys()}) - { - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - if ($self->GetParam($FieldName)) - { - $VMSelected = 1; - last; - } - } - - if (! $VMSelected) - { - $self->{ErrMessage} = "Select at least one VM"; - return !1; - } - } - elsif ($self->{Page} == 3) - { - if (($self->GetParam("FileType") eq "patch" && - $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || - !IsValidFileName($self->GetParam("TestExecutable"))) - { - $self->{ErrField} = "TestExecutable"; - $self->{ErrMessage} = "Invalid test executable filename"; - return !1; - } - - if ($self->GetParam("NoCmdLineArgWarn")) - { - $self->{NoCmdLineArgWarn} = 1; - } - elsif (! $self->GetParam("CmdLineArg")) - { - $self->{ErrMessage} = "You didn't specify a command line argument. " . - "This is most likely not correct, so please " . - "fix this. If you're sure that you really don't " . - 'want a command line argument, press "Submit" ' . - "again."; - $self->{ErrField} = "CmdLineArg"; - $self->{NoCmdLineArgWarn} = 1; - return !1; - } - } - - return $self->SUPER::Validate(); -} - -sub ValidateAndGetFileName($$) -{ - my ($self, $FieldName) = @_; - - my $FileName = $self->GetParam($FieldName); - if (!$FileName) - { - $self->{ErrField} = $FieldName; - $self->{ErrMessage} = "You must provide a file to test"; - return undef; - } - if (!IsValidFileName($FileName)) - { - $self->{ErrField} = $FieldName; - $self->{ErrMessage} = "The filename contains invalid characters"; - return undef; - } - my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); - if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) - { - $self->{ErrField} = $FieldName; - $self->{ErrMessage} = "The filename is too long"; - return undef; - } - return $FileName; -} - -sub DetermineFileType($$) -{ - my ($self, $FileName) = @_; - - if (! sysopen(FH, $FileName, O_RDONLY)) - { - return ("Unable to open $FileName", "unknown", undef, undef); - } - - my $FileType = "unknown"; - my $Buffer; - if (sysread(FH, $Buffer, 0x40)) - { - # Unpack IMAGE_DOS_HEADER - my @Fields = unpack "S30I", $Buffer; - if ($Fields[0] == 0x5a4d) - { - seek FH, $Fields[30], SEEK_SET; - if (sysread(FH, $Buffer, 0x18)) - { - @Fields = unpack "IS2I3S2", $Buffer; - if ($Fields[0] == 0x00004550) - { - if (($Fields[7] & 0x2000) == 0) - { - $FileType = "exe"; - } - else - { - $FileType = "dll"; - } - if ($Fields[1] == 0x014c) - { - $FileType .= "32"; - } - elsif ($Fields[1] == 0x8664) - { - $FileType .= "64"; - } - else - { - $FileType = "unknown"; - } - } - } - } - # zip files start with PK, 0x03, 0x04 - elsif ($Fields[0] == 0x4b50 && $Fields[1] == 0x0403) - { - $FileType = "zip"; - } - } - - close FH; - - my ($ErrMessage, $ExeBase, $TestUnit); - if ($FileType eq "unknown") - { - my $Impacts = GetPatchImpacts($FileName); - if ($Impacts->{TestUnitCount} == 0) - { - $ErrMessage = "Patch doesn't affect tests"; - } - elsif ($Impacts->{TestUnitCount} > 1) - { - $ErrMessage = "Patch contains changes to multiple tests"; - } - else - { - foreach my $TestInfo (values %{$Impacts->{Tests}}) - { - if ($TestInfo->{UnitCount}) - { - $FileType = "patch"; - $ExeBase = $TestInfo->{ExeBase}; - $TestUnit = (keys %{$TestInfo->{PatchedUnits}})[0]; - last; - } - } - } - } - elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip") - { - # We know what these are but not what to do with them. So reject them early. - $FileType = "unknown"; - } - - return ($ErrMessage, $FileType, $ExeBase, $TestUnit); -} - -sub OnPage1Next($) -{ - my ($self) = @_; - - my $BaseName = $self->ValidateAndGetFileName("File"); - return !1 if (!$BaseName); - - my $Fh = $self->CGI->upload("File"); - if (defined($Fh)) - { - my $StagingFile = $self->GetTmpStagingFullPath($BaseName); - my $OldUMask = umask(002); - if (! open (OUTFILE,">", $StagingFile)) - { - umask($OldUMask); - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unable to process uploaded file"; - return !1; - } - umask($OldUMask); - my $Buffer; - while (sysread($Fh, $Buffer, 4096)) - { - print OUTFILE $Buffer; - } - close OUTFILE; - - my ($ErrMessage, $FileType, $ExeBase, $TestUnit) = $self->DetermineFileType($StagingFile); - if (defined($ErrMessage)) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = $ErrMessage; - return !1; - } - if ($FileType !~ /^(?:exe32|exe64|patch)$/) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "Unrecognized file type"; - return !1; - } - - $self->{FileName} = $BaseName; - $self->{FileType} = $FileType; - if (defined $ExeBase) - { - $self->{TestExecutable} = "$ExeBase.exe"; - } - if (defined($TestUnit)) - { - $self->{CmdLineArg} = $TestUnit; - } - } - else - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "File upload failed"; - return !1; - } - - if (! $self->Validate) - { - return !1; - } - - $self->{Page} = 2; - - return 1; -} - -sub OnPage2Next($) -{ - my ($self) = @_; - - if (! $self->Validate) - { - return !1; - } - - $self->{Page} = 3; - - return 1; -} - -sub OnPage2Prev($) -{ - my ($self) = @_; - - my $FileName = $self->GetParam("FileName"); - if ($FileName) - { - my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); - unlink($StagingFileName) if ($StagingFileName); - } - - $self->{Page} = 1; - - return 1; -} - -sub OnPage3Prev($) -{ - my ($self) = @_; - - $self->{Page} = 2; - - return 1; -} - - -sub SubmitJob($$$) -{ - my ($self, $BaseName, $Staging) = @_; - - # See also Patches::Submit() in lib/WineTestBot/Patches.pm - - # First create a new job - my $Jobs = CreateJobs(); - my $NewJob = $Jobs->Add(); - $NewJob->User($self->GetCurrentSession()->User); - $NewJob->Priority(5); - if ($self->GetParam("Remarks")) - { - $NewJob->Remarks($self->GetParam("Remarks")); - } - else - { - $NewJob->Remarks($self->GetParam("CmdLineArg")); - } - my $Branch = CreateBranches()->GetItem($self->GetParam("Branch")); - if (defined($Branch)) - { - $NewJob->Branch($Branch); - } - my $Steps = $NewJob->Steps; - - # Add steps and tasks for the 32 and 64-bit tests - my $FileType = $self->GetParam("FileType"); - my $Impacts; - $Impacts = GetPatchImpacts($Staging) if ($FileType eq "patch"); - - my $BuildStep; - foreach my $Bits ("32", "64") - { - next if ($Bits eq "32" && $FileType eq "exe64"); - next if ($Bits eq "64" && $FileType eq "exe32"); - next if ($Bits eq "64" && $FileType eq "patch" && !defined($self->GetParam("Run64"))); - - my $Tasks; - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", $Bits eq "32" ? ["win32", "win64"] : ["win64"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs - - if (!$Tasks) - { - if (!$BuildStep and $FileType eq "patch") - { - # This is a patch so add a build step... - $BuildStep = $Steps->Add(); - $BuildStep->FileName($BaseName); - $BuildStep->FileType($FileType); - $BuildStep->Type("build"); - $BuildStep->DebugLevel(0); - - # ...with a build task - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["build"]); - $VMs->AddFilter("Role", ["base"]); - my $BuildVM = ${$VMs->GetItems()}[0]; - my $Task = $BuildStep->Tasks->Add(); - $Task->VM($BuildVM); - - my $MissionStatement = "exe32"; - $MissionStatement .= ":exe64" if (defined $self->GetParam("Run64")); - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (!defined $ErrMessage) - { - $Task->Timeout(GetBuildTimeout($Impacts, $Missions->[0])); - $Task->Missions($MissionStatement); - - # Save the build step so the others can reference it - (my $ErrKey, my $ErrProperty, $ErrMessage) = $Jobs->Save(); - } - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - } - - # Then create the test step - my $TestStep = $Steps->Add(); - if ($FileType eq "patch") - { - $TestStep->PreviousNo($BuildStep->No); - my $TestExe = basename($self->GetParam("TestExecutable")); - $TestExe =~ s/_test\.exe$/_test64.exe/ if ($Bits eq "64"); - $TestStep->FileName($TestExe); - } - else - { - $TestStep->FileName($BaseName); - } - $TestStep->FileType("exe$Bits"); - $TestStep->Type("single"); - $TestStep->DebugLevel($self->GetParam("DebugLevel")); - $TestStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $TestStep->Tasks; - } - - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($SingleTimeout); - $Task->Missions("exe$Bits"); - $Task->CmdLineArg($self->GetParam("CmdLineArg")); - } - } - - my ($Tasks, $MissionStatement, $Timeout); - my $VMs = CreateVMs(); - $VMs->AddFilter("Type", ["wine"]); - my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); - foreach my $VMKey (@$SortedKeys) - { - my $VM = $VMs->GetItem($VMKey); - my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); - next if (!$self->GetParam($FieldName)); # skip unselected VMs - - if (!$Tasks) - { - # First create the Wine test step - my $WineStep = $Steps->Add(); - $WineStep->FileName($BaseName); - $WineStep->FileType($FileType); - $WineStep->Type("single"); - $WineStep->DebugLevel($self->GetParam("DebugLevel")); - $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); - $Tasks = $WineStep->Tasks; - - $MissionStatement = ($FileType =~ /^(?:exe32|patch)$/) ? "win32" : ""; - if ($FileType eq "exe64" or - ($FileType eq "patch" and defined $self->GetParam("Run64"))) - { - $MissionStatement .= ":wow64"; - } - $MissionStatement =~ s/^://; - - my ($ErrMessage, $Missions) = ParseMissionStatement($MissionStatement); - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - $Missions = $Missions->[0]; - $Timeout = $FileType ne "patch" ? - $SingleTimeout : - GetBuildTimeout($Impacts, $Missions) + - GetTestTimeout($Impacts, $Missions); - } - - # Then add a task for this VM - my $Task = $Tasks->Add(); - $Task->VM($VM); - $Task->Timeout($Timeout); - $Task->Missions($MissionStatement); - $Task->CmdLineArg($self->GetParam("CmdLineArg")) if ($FileType ne "patch"); - } - - # Now save it all (or whatever's left to save) - my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - - # Stage the test patch/executable so the job can pick it up - if (!rename($Staging, "$DataDir/staging/job". $NewJob->Id ."_$BaseName")) - { - $self->{ErrMessage} = "Could not stage '$BaseName': $!\n"; - return !1; - } - - # Switch Status to staging to indicate we are done setting up the job - $NewJob->Status("staging"); - ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); - if (defined($ErrMessage)) - { - $self->{ErrMessage} = $ErrMessage; - return !1; - } - - # Notify engine - my $ErrMessage = RescheduleJobs(); - if (defined $ErrMessage) - { - $self->{ErrMessage} = $ErrMessage; - $self->{Page} = 4; - $self->{JobKey} = $NewJob->GetKey(); - return !1; - } - - $self->Redirect("/JobDetails.pl?Key=". $NewJob->GetKey()); # does not return - exit; -} - -sub OnSubmit($) -{ - my ($self) = @_; - - return !1 if (!$self->Validate()); - my $BaseName = $self->ValidateAndGetFileName("FileName"); - return !1 if (!$BaseName); - - # Rename the staging file to avoid race conditions if the user clicks on - # Submit multiple times - my $OldStaging = $self->GetTmpStagingFullPath($BaseName); - my $Staging = CreateNewLink($OldStaging, "$DataDir/staging", $BaseName); - if (!defined $Staging) - { - $self->{ErrMessage} = "Could not rename '$BaseName': $!"; - return !1; - } - if (!unlink $OldStaging) - { - unlink $Staging; - $self->{ErrMessage} = $!{ENOENT} ? - "$BaseName has already been submitted or has expired" : - "Could not remove the staging '$BaseName' file: $!"; - return !1; - } - - if (!$self->SubmitJob($BaseName, $Staging)) - { - # Restore the file for the next attempt - rename($Staging, $OldStaging); - return !1; - } - return 1; -} - -sub OnShowAllVMs($) -{ - my ($self) = @_; - - $self->{ShowAll} = 1; - - return !1; -} - -sub OnShowBaseVMs($) -{ - my ($self) = @_; - - $self->{ShowAll} = !1; - - return !1; -} - -sub OnOK($) -{ - my ($self) = @_; - - if (defined($self->GetParam("JobKey"))) - { - $self->Redirect("/JobDetails.pl?Key=" . $self->GetParam("JobKey")); # does not return - } - else - { - $self->Redirect("/index.pl"); # does not return - } -} - -sub OnAction($$) -{ - my ($self, $Action) = @_; - - if ($Action eq "Next >") - { - return $self->{Page} == 2 ? $self->OnPage2Next() : $self->OnPage1Next(); - } - elsif ($Action eq "< Prev") - { - return $self->{Page} == 3 ? $self->OnPage3Prev() : $self->OnPage2Prev(); - } - elsif ($Action eq "Submit") - { - return $self->OnSubmit(); - } - elsif ($Action eq "Show base VMs") - { - return $self->OnShowBaseVMs(); - } - elsif ($Action eq "Show all VMs") - { - return $self->OnShowAllVMs(); - } - elsif ($Action eq "OK") - { - return $self->OnOK(); - } - - return $self->SUPER::OnAction($Action); -} - - -package main; - -my $Request = shift; - -my $SubmitPage = SubmitPage->new($Request, "wine-devel"); -$SubmitPage->GeneratePage(); -- 2.20.1

1 0

[tools] testbot/PatchUtils: Detect when make_fir needs to be run.
by Francois Gouget 16 Mar '20

16 Mar '20

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 85df90099b..8a6982c5de 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -148,6 +148,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeFir}) + { + InfoMsg "\nRunning make_fir\n"; + system("cd '$DataDir/$Dir/dlls/dsound/' && set -x && ./make_fir"); + if ($? != 0) + { + LogMsg "make_fir failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index eaa9868942..44b3f97cca 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/dlls/dsound/make_fir$=) + { + $Impacts->{MakeFir} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) { $Impacts->{MakeErrors} = 1; -- 2.20.1

1 0