- Wine-Devel - list.winehq.org

[PATCH] mlang: Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo().
by Serge Gautherie July 10, 2020

July 10, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- MSVC: '...\mlang.c(3568): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)' --- dlls/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 1b1aed3..a209cc4 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = 1LL << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1, -- 2.10.0.windows.1

1 0

[PATCH v3 1/2] d3dx10/tests: Add more test images.
by Ziqing Hui July 10, 2020

July 10, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 155 ++++++++++++++++++++++++++++++- 2 files changed, 153 insertions(+), 4 deletions(-)

4 5

[PATCH 1/3] windowscodecs/tests: In the tests of DdsDecoder_Initialize(), use broken() for cube map and uncompressed DDS image.
by Ziqing Hui July 10, 2020

July 10, 2020

Loading cube map or uncompressed DDS image will fail on navtive WIC. But we would like to support them in our builtin implementation. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)

2 3

[PATCH] amstream: Add AMMediaStream::JoinFilterGraph() tests.
by Gijs Vermeulen July 9, 2020

July 9, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 84 ++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2d9f3e35f2..64edca0742 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4328,6 +4328,89 @@ static void test_ammediastream_join_filter(void) check_ammediastream_join_filter(&CLSID_AMDirectDrawStream); } +static void check_ammediastream_join_filter_graph(const CLSID *clsid, const MSPID *id) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IGraphBuilder *builder, *builder2; + IMediaStreamFilter *filter; + IAMMediaStream *stream; + IFilterGraph *graph; + FILTER_INFO info; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, (IMediaStream **)&stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!builder, "Expected non-null graph.\n"); + EXPECT_REF(builder, 4); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + /* Crashes on native. */ + if (0) + { + hr = IAMMediaStream_JoinFilterGraph(stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMMediaStream_JoinFilterGraph(stream, graph); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(builder2 == builder, "Expected graph %p, got %p.\n", builder, builder2); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IGraphBuilder_Release(builder2); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + ref = IFilterGraph_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(builder); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_join_filter_graph(void) +{ + check_ammediastream_join_filter_graph(&CLSID_AMAudioStream, &MSPID_PrimaryAudio); + check_ammediastream_join_filter_graph(&CLSID_AMDirectDrawStream, &MSPID_PrimaryVideo); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5023,6 +5106,7 @@ START_TEST(amstream) test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); + test_ammediastream_join_filter_graph(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run(); -- 2.27.0

2 2

[PATCH v4 1/2] d3dx9: Ignore filter in D3DXLoadSurfaceFromSurface() when rects match.
by Matteo Bruni July 9, 2020

July 9, 2020

From: Robin Kertels <robin.kertels(a)gmail.com> This allows us to use IDirect3DDevice9_StretchRect and avoid GPU synchronization. It massively improves performance in Dead Space 1 which calls LoadSurfaceFromSurface every frame before presenting. Signed-off-by: Robin Kertels <robin.kertels(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v4: Improve style a tiny bit. dlls/d3dx9_36/surface.c | 105 +++++++++++++++++++++++++++++++--------- 1 file changed, 82 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a5143cbee4a8..045d7267c96e 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -2142,11 +2142,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { + const struct pixel_format_desc *src_format_desc, *dst_format_desc; + D3DSURFACE_DESC src_desc, dst_desc; + struct volume src_size, dst_size; IDirect3DSurface9 *temp_surface; D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; - D3DSURFACE_DESC src_desc; D3DLOCKED_RECT lock; + RECT dst_rect_temp; HRESULT hr; RECT s; @@ -2158,28 +2161,92 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, if (!dst_surface || !src_surface) return D3DERR_INVALIDCALL; + IDirect3DSurface9_GetDesc(src_surface, &src_desc); + src_format_desc = get_format_info(src_desc.Format); + if (!src_rect) + { + SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); + src_rect = &s; + } + else if (src_rect->left == src_rect->right || src_rect->top == src_rect->bottom) + { + WARN("Empty src_rect specified.\n"); + return filter == D3DX_FILTER_NONE ? D3D_OK : E_FAIL; + } + else if (src_rect->left > src_rect->right || src_rect->right > src_desc.Width + || src_rect->left < 0 || src_rect->left > src_desc.Width + || src_rect->top > src_rect->bottom || src_rect->bottom > src_desc.Height + || src_rect->top < 0 || src_rect->top > src_desc.Height) + { + WARN("Invalid src_rect specified.\n"); + return D3DERR_INVALIDCALL; + } + + src_size.width = src_rect->right - src_rect->left; + src_size.height = src_rect->bottom - src_rect->top; + src_size.depth = 1; + + IDirect3DSurface9_GetDesc(dst_surface, &dst_desc); + dst_format_desc = get_format_info(dst_desc.Format); + if (!dst_rect) + { + SetRect(&dst_rect_temp, 0, 0, dst_desc.Width, dst_desc.Height); + dst_rect = &dst_rect_temp; + } + else if (dst_rect->left == dst_rect->right || dst_rect->top == dst_rect->bottom) + { + WARN("Empty dst_rect specified.\n"); + return filter == D3DX_FILTER_NONE ? D3D_OK : E_FAIL; + } + else if (dst_rect->left > dst_rect->right || dst_rect->right > dst_desc.Width + || dst_rect->left < 0 || dst_rect->left > dst_desc.Width + || dst_rect->top > dst_rect->bottom || dst_rect->bottom > dst_desc.Height + || dst_rect->top < 0 || dst_rect->top > dst_desc.Height) + { + WARN("Invalid dst_rect specified.\n"); + return D3DERR_INVALIDCALL; + } + + dst_size.width = dst_rect->right - dst_rect->left; + dst_size.height = dst_rect->bottom - dst_rect->top; + dst_size.depth = 1; + if (!dst_palette && !src_palette && !color_key) { - switch (filter) + if (src_desc.Format == dst_desc.Format + && dst_size.width == src_size.width + && dst_size.height == src_size.height + && color_key == 0 + && !(src_rect->left & (src_format_desc->block_width - 1)) + && !(src_rect->top & (src_format_desc->block_height - 1)) + && !(dst_rect->left & (dst_format_desc->block_width - 1)) + && !(dst_rect->top & (dst_format_desc->block_height - 1))) { - case D3DX_FILTER_NONE: - d3d_filter = D3DTEXF_NONE; - break; + d3d_filter = D3DTEXF_NONE; + } + else + { + switch (filter) + { + case D3DX_FILTER_NONE: + d3d_filter = D3DTEXF_NONE; + break; - case D3DX_FILTER_POINT: - d3d_filter = D3DTEXF_POINT; - break; + case D3DX_FILTER_POINT: + d3d_filter = D3DTEXF_POINT; + break; - case D3DX_FILTER_LINEAR: - d3d_filter = D3DTEXF_LINEAR; - break; + case D3DX_FILTER_LINEAR: + d3d_filter = D3DTEXF_LINEAR; + break; - default: - d3d_filter = ~0u; - break; + default: + d3d_filter = D3DTEXF_FORCE_DWORD; + break; + } } - if (d3d_filter != ~0u) + if (d3d_filter != D3DTEXF_FORCE_DWORD) { IDirect3DSurface9_GetDevice(src_surface, &device); hr = IDirect3DDevice9_StretchRect(device, src_surface, src_rect, dst_surface, dst_rect, d3d_filter); @@ -2189,14 +2256,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, } } - IDirect3DSurface9_GetDesc(src_surface, &src_desc); - - if (!src_rect) - { - SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); - src_rect = &s; - } - if (FAILED(lock_surface(src_surface, NULL, &lock, &temp_surface, FALSE))) return D3DXERR_INVALIDDATA; -- 2.26.2

1 1

[PATCH v2 11/11] server: Remove no longer needed get_console_output_info request.
by Jacek Caban July 9, 2020

July 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 43 ------------------------------------------- server/protocol.def | 27 --------------------------- 2 files changed, 70 deletions(-)

2 1

[PATCH v2 10/11] wineconsole: Use IOCTL_CONDRV_GET_OUTPUT_INFO in WINECON_GetServerConfig.
by Jacek Caban July 9, 2020

July 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)

2 1

[PATCH v2 09/11] kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfoEx.
by Jacek Caban July 9, 2020

July 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 43 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 22 deletions(-)

2 1

[PATCH v2 08/11] kernelbase: Use IOCTL_CONDRV_GET_OUTPUT_INFO in GetConsoleScreenBufferInfo.
by Jacek Caban July 9, 2020

July 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-)

2 1

[PATCH v2 01/11] kernel32/tests: Add more invalid handle tests.
by Jacek Caban July 9, 2020

July 9, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Don't depend on ioctl to set proper last error, it should fix failures on TestBot. The first patch demonstrates the problem without depending on the way tests are launched. dlls/kernel32/tests/console.c | 63 +++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)

2 2