wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Akihiro Sagawa : d3d8/tests: Add out-of-bounds region tests.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 3499694f1350a0f8058bf1928ace9c697d505b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3499694f1350a0f8058bf192… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 2 17:57:34 2019 +0330 d3d8/tests: Add out-of-bounds region tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 310ffc59e4..96ab4596a7 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5441,6 +5441,15 @@ static void add_dirty_rect_test(void) HRESULT hr; static const RECT part_rect = {96, 96, 160, 160}; + static const RECT oob_rect[] = + { + { 0, 0, 200, 300}, + { 0, 0, 300, 200}, + {100, 100, 10, 10}, + {200, 300, 10, 10}, + {300, 200, 310, 210}, + { 0, 0, 0, 0}, + }; window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); @@ -5784,6 +5793,17 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture8_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); + /* Test out-of-bounds regions. */ + for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) + { + hr = IDirect3DTexture8_AddDirtyRect(tex_src_red, &oob_rect[i]); + todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture8_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture8_UnlockRect(tex_src_red, 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + } + IDirect3DSurface8_Release(surface_dst2); IDirect3DSurface8_Release(surface_managed1); IDirect3DSurface8_Release(surface_managed0);

1 0

Akihiro Sagawa : d3d9/tests: Add out-of-bounds region tests.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 3329f50612848e611c4ecd8f524f42f7537ea22b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3329f50612848e611c4ecd8f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 2 17:57:33 2019 +0330 d3d9/tests: Add out-of-bounds region tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cbfb98bec6..f19bd11607 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19249,6 +19249,15 @@ static void add_dirty_rect_test(void) HWND window; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; + static const RECT oob_rect[] = + { + { 0, 0, 200, 300}, + { 0, 0, 300, 200}, + {100, 100, 10, 10}, + {200, 300, 10, 10}, + {300, 200, 310, 210}, + { 0, 0, 0, 0}, + }; DWORD color; window = create_window(); @@ -19595,6 +19604,17 @@ static void add_dirty_rect_test(void) hr = IDirect3DTexture9_AddDirtyRect(tex_managed, NULL); ok(SUCCEEDED(hr), "Failed to add dirty rect, hr %#x.\n", hr); + /* Test out-of-bounds regions. */ + for (i = 0; i < ARRAY_SIZE(oob_rect); ++i) + { + hr = IDirect3DTexture9_AddDirtyRect(tex_src_red, &oob_rect[i]); + todo_wine ok(hr == D3DERR_INVALIDCALL, "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture9_LockRect(tex_src_red, 0, &locked_rect, &oob_rect[i], 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + hr = IDirect3DTexture9_UnlockRect(tex_src_red, 0); + ok(SUCCEEDED(hr), "[%u] Got unexpected hr %#x.\n", i, hr); + } + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); hr = IDirect3DDevice9_SetTexture(device, 0, NULL);

1 0

Andrey Gusev : kernelbase/tests: Fix a typo in ok() message.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 2a64dd44bc87f8a1c9d93b633270623e290e3a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64dd44bc87f8a1c9d93b63… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:11:07 2019 +0200 kernelbase/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index abe586b0a2..93303bafc3 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -797,7 +797,7 @@ static void test_PathCchAddBackslashEx(void) } else { - ok(ptrW == NULL, "%u: unexpecred end pointer.\n", i); + ok(ptrW == NULL, "%u: unexpected end pointer.\n", i); ok(remaining == 0, "%u: unexpected remaining buffer length.\n", i); } }

1 0

Andrey Gusev : ieframe/tests: Fix a typo in ok() message.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 33396865177906a8d38f832392ffe76683773a2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=33396865177906a8d38f8323… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:05:27 2019 +0200 ieframe/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index db47fdf616..a99c68ac5e 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -283,7 +283,7 @@ static void _test_ready_state(unsigned line, READYSTATE exstate, VARIANT_BOOL ex hres = IWebBrowser2_get_Busy(wb, &busy); if(expect_busy != BUSY_FAIL) { ok_(__FILE__,line)(hres == S_OK, "get_ReadyState failed: %08x\n", hres); - ok_(__FILE__,line)(busy == expect_busy, "Busy = %x, exoected %x for ready state %d\n", + ok_(__FILE__,line)(busy == expect_busy, "Busy = %x, expected %x for ready state %d\n", busy, expect_busy, state); }else { todo_wine

1 0

Andrey Gusev : sapiaut.idl: Fix a typo.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: acd0eb3672b02668d6cc14f6256da80aacae21a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acd0eb3672b02668d6cc14f6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 14:59:44 2019 +0200 sapiaut.idl: Fix a typo. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index ecd6908163..94ac72a209 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -1784,7 +1784,7 @@ interface ISpeechRecoGrammar : IDispatch HRESULT CmdLoadFromObject([in]const BSTR classid, [in] const BSTR grammarname, [in, defaultvalue(SLOStatic)] SpeechLoadOption option); [id(DISPID_SRGCmdLoadFromResource)] - HRESULT CmdLoadFromResource([in]long mod, [in] VARIANT name, [in] VARIANT yype, [in] SpeechLanguageId language, + HRESULT CmdLoadFromResource([in]long mod, [in] VARIANT name, [in] VARIANT type, [in] SpeechLanguageId language, [in, defaultvalue(SLOStatic)] SpeechLoadOption option); [id(DISPID_SRGCmdLoadFromMemory)]

1 0

Andrey Gusev : kernel32/tests: Reorder the WINAPI with the void.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: a9bf1ad81e7706a7e2e216665b398e4c85568e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9bf1ad81e7706a7e2e21666… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:53:59 2019 +0200 kernel32/tests: Reorder the WINAPI with the void. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/dummy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c index 14d0d90dea..b8eab8c219 100644 --- a/dlls/kernel32/tests/dummy.c +++ b/dlls/kernel32/tests/dummy.c @@ -14,7 +14,7 @@ BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) return TRUE; } -WINAPI void get_path(char *buffer, int buffer_size) +void WINAPI get_path(char *buffer, int buffer_size) { GetModuleFileNameA(instance, buffer, buffer_size); }

1 0

Andrey Gusev : mapi32: Reorder the WINAPI with the HRESULT.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 6c89fb106a38af3ca8a5966aa0d227948dcacb78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c89fb106a38af3ca8a5966a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:45:59 2019 +0200 mapi32: Reorder the WINAPI with the HRESULT. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 55baf9129a..b217035e2c 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1497,7 +1497,7 @@ static inline void IMAPIPROP_Unlock(IPropDataImpl *This) * Inherited method from the IUnknown Interface. * See IUnknown_QueryInterface. */ -static WINAPI HRESULT IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) +static HRESULT WINAPI IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) { IPropDataImpl *This = impl_from_IPropData(iface);

1 0

Andrey Gusev : uianimation: Remove duplicate WINAPI.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 22c925b8ab8771fdab96e0f1d5f1b3a64fe6cb45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22c925b8ab8771fdab96e0f1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Dec 2 15:38:01 2019 +0200 uianimation: Remove duplicate WINAPI. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 492c1b757a..c0c7367e09 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -132,7 +132,7 @@ struct animation_storyboard *impl_from_IUIAnimationStoryboard( IUIAnimationStory return CONTAINING_RECORD( iface, struct animation_storyboard, IUIAnimationStoryboard_iface ); } -static HRESULT WINAPI WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface, +static HRESULT WINAPI animation_storyboard_QueryInterface( IUIAnimationStoryboard *iface, REFIID iid, void **obj ) { struct animation_storyboard *This = impl_from_IUIAnimationStoryboard( iface ); @@ -352,7 +352,7 @@ struct animation_var *impl_from_IUIAnimationVariable( IUIAnimationVariable *ifac return CONTAINING_RECORD( iface, struct animation_var, IUIAnimationVariable_iface ); } -static HRESULT WINAPI WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface, +static HRESULT WINAPI animation_var_QueryInterface( IUIAnimationVariable *iface, REFIID iid, void **obj ) { struct animation_var *This = impl_from_IUIAnimationVariable( iface ); @@ -998,7 +998,7 @@ struct tr_library *impl_from_IUIAnimationTransitionLibrary( IUIAnimationTransiti return CONTAINING_RECORD( iface, struct tr_library, IUIAnimationTransitionLibrary_iface ); } -static HRESULT WINAPI WINAPI tr_library_QueryInterface( IUIAnimationTransitionLibrary *iface, +static HRESULT WINAPI tr_library_QueryInterface( IUIAnimationTransitionLibrary *iface, REFIID iid, void **obj ) { struct tr_library *This = impl_from_IUIAnimationTransitionLibrary( iface );

1 0

Paul Gofman : ddraw/tests: Add test for stretching compressed format surfaces.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 050e6f934bedc80b0380c6d2af4de878c6c4f2cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=050e6f934bedc80b0380c6d2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Dec 2 16:27:11 2019 +0300 ddraw/tests: Add test for stretching compressed format surfaces. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 536a626eda..f4a709711b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16902,6 +16902,225 @@ static void test_surface_format_conversion_alpha(void) DestroyWindow(window); } +static void test_compressed_surface_stretch(void) +{ + static const struct + { + unsigned int src_width, src_height; + unsigned int dst_width, dst_height; + unsigned int src_x, src_y; + unsigned int dst_x, dst_y; + BOOL todo_src, todo_dst; + } + test_sizes[] = + { + {4, 4, 8, 8}, + {8, 8, 4, 4}, + {4, 4, 2, 2, 0, 0, 0, 0, FALSE, TRUE}, + {4, 4, 6, 6, 0, 0, 0, 0, FALSE, TRUE}, + {4, 4, 8, 8, 2, 2, 2, 2, TRUE, TRUE}, + }; + + static const struct + { + DWORD src_caps, dst_caps; + } + test_caps[] = + { +#if 0 + /* Broken on Windows. */ + {DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY}, +#endif + {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY}, + {DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY, DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY}, + {DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY, DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY}, + }; + + static struct + { + DDPIXELFORMAT fmt; + const char *name; + DWORD support_flag; + } + test_formats[] = + { + { + { + sizeof(DDPIXELFORMAT), DDPF_RGB | DDPF_ALPHAPIXELS, 0, + {16}, {0x00007c00}, {0x000003e0}, {0x0000001f}, {0x00008000} + }, + "R5G5B5A1", + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '1'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT1", SUPPORT_DXT1, + }, + { + { + sizeof(DDPIXELFORMAT), DDPF_FOURCC, MAKEFOURCC('D', 'X', 'T', '3'), + {0}, {0}, {0}, {0}, {0} + }, + "DXT3", SUPPORT_DXT3, + }, + }; + + unsigned int i, j, k, l, x, y, pitch; + DDSURFACEDESC2 rb_surface_desc, src_surface_desc, dst_surface_desc, lock; + IDirectDrawSurface7 *src_surf, *dst_surf, *rb_surf; + IDirect3DDevice7 *device; + RECT src_rect, dst_rect; + DWORD supported_fmts; + unsigned short *data; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + BOOL passed; + DDBLTFX fx; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_EnumTextureFormats(device, test_block_formats_creation_cb, + &supported_fmts); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&src_surface_desc, 0, sizeof(src_surface_desc)); + src_surface_desc.dwSize = sizeof(src_surface_desc); + src_surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + dst_surface_desc = src_surface_desc; + + memset(&rb_surface_desc, 0, sizeof(rb_surface_desc)); + rb_surface_desc.dwSize = sizeof(rb_surface_desc); + rb_surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + U4(rb_surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(rb_surface_desc).ddpfPixelFormat); + U4(rb_surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; + U1(U4(rb_surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(rb_surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(rb_surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(rb_surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; + U5(U4(rb_surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0x00008000; + rb_surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + + for (i = 0; i < ARRAY_SIZE(test_caps); ++i) + { + src_surface_desc.ddsCaps.dwCaps = test_caps[i].src_caps; + dst_surface_desc.ddsCaps.dwCaps = test_caps[i].dst_caps; + + for (j = 0; j < ARRAY_SIZE(test_sizes); ++j) + { + SetRect(&src_rect, test_sizes[j].src_x, test_sizes[j].src_y, + test_sizes[j].src_width, test_sizes[j].src_height); + SetRect(&dst_rect, test_sizes[j].dst_x, test_sizes[j].dst_y, + test_sizes[j].dst_width, test_sizes[j].dst_height); + + src_surface_desc.dwWidth = test_sizes[j].src_width; + src_surface_desc.dwHeight = test_sizes[j].src_height; + + dst_surface_desc.dwWidth = (test_sizes[j].dst_width + 3) & ~3; + dst_surface_desc.dwHeight = (test_sizes[j].dst_height + 3) & ~3; + + rb_surface_desc.dwWidth = max(src_surface_desc.dwWidth, dst_surface_desc.dwWidth); + rb_surface_desc.dwHeight = max(src_surface_desc.dwHeight, dst_surface_desc.dwHeight); + + hr = IDirectDraw7_CreateSurface(ddraw, &rb_surface_desc, &rb_surf, NULL); + ok(hr == DD_OK, "Test (%u, %u), got unexpected hr %#x.\n", i, j, hr); + + for (k = 0; k < ARRAY_SIZE(test_formats); ++k) + { + U4(src_surface_desc).ddpfPixelFormat = test_formats[k].fmt; + hr = IDirectDraw7_CreateSurface(ddraw, &src_surface_desc, &src_surf, NULL); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + U5(fx).dwFillColor = 0x801f; + hr = IDirectDrawSurface7_Blt(rb_surf, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + hr = IDirectDrawSurface7_Blt(src_surf, &src_rect, rb_surf, &src_rect, DDBLT_WAIT, NULL); + + todo_wine_if(test_formats[k].fmt.dwFlags == DDPF_FOURCC && test_sizes[j].todo_src) + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + if (FAILED(hr)) + { + IDirectDrawSurface7_Release(src_surf); + continue; + } + + for (l = 0; l < ARRAY_SIZE(test_formats); ++l) + { + if (~supported_fmts & test_formats[l].support_flag) + { + skip("%s format is not supported, skipping test %u.\n", test_formats[l].name, i); + continue; + } + + U4(dst_surface_desc).ddpfPixelFormat = test_formats[l].fmt; + + hr = IDirectDraw7_CreateSurface(ddraw, &dst_surface_desc, &dst_surf, NULL); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + hr = IDirectDrawSurface7_Blt(dst_surf, &dst_rect, src_surf, &src_rect, DDBLT_WAIT, NULL); + todo_wine_if(test_formats[l].fmt.dwFlags == DDPF_FOURCC && test_sizes[j].todo_dst) + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + if (FAILED(hr)) + { + IDirectDrawSurface7_Release(dst_surf); + continue; + } + + U5(fx).dwFillColor = 0xffffffff; + hr = IDirectDrawSurface7_Blt(rb_surf, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + + hr = IDirectDrawSurface7_Blt(rb_surf, &dst_rect, dst_surf, &dst_rect, DDBLT_WAIT, NULL); + ok(hr == DD_OK, "Test (%u, %u, %u, %u), got unexpected hr %#x.\n", i, j, k, l, hr); + hr = IDirectDrawSurface7_Lock(rb_surf, NULL, &lock, 0, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + pitch = U1(lock).lPitch; + + passed = TRUE; + for (y = dst_rect.top; y < dst_rect.bottom && passed; ++y) + { + data = (unsigned short *)((BYTE *)lock.lpSurface + y * pitch); + + for (x = dst_rect.left; x < dst_rect.right && passed; ++x) + { + passed = data[x] == 0x801f; + ok(passed, "Test (%u, %u, %u, %u), x %u, y %u, " + "got unexpected colour 0x%04x.\n", i, j, k, l, x, y, data[x]); + } + } + hr = IDirectDrawSurface7_Unlock(rb_surf, NULL); + IDirectDrawSurface7_Release(dst_surf); + } + IDirectDrawSurface7_Release(src_surf); + } + IDirectDrawSurface7_Release(rb_surf); + } + } + + IDirect3DDevice7_Release(device); + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -17051,4 +17270,5 @@ START_TEST(ddraw7) test_caps(); test_d32_support(); test_surface_format_conversion_alpha(); + test_compressed_surface_stretch(); }

1 0

Paul Gofman : wined3d: Support stretching compressed format surfaces in surface_cpu_blt().
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: cf2bd824e27caea4aebd9b060e3cd383e17eaa87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf2bd824e27caea4aebd9b06… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Dec 2 16:27:10 2019 +0300 wined3d: Support stretching compressed format surfaces in surface_cpu_blt(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 82 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 47f2e5e5f0..5ccdb506e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1643,6 +1643,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int unsigned int texture_level; HRESULT hr = WINED3D_OK; BOOL same_sub_resource; + BOOL upload = FALSE; DWORD map_binding; const BYTE *sbase; const BYTE *sbuf; @@ -1663,6 +1664,11 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int if (wined3d_format_is_typeless(dst_format) && dst_format->id == src_format->typeless_id) dst_format = src_format; + src_height = src_box->bottom - src_box->top; + src_width = src_box->right - src_box->left; + dst_height = dst_box->bottom - dst_box->top; + dst_width = dst_box->right - dst_box->left; + dst_range.offset = 0; dst_range.size = dst_texture->sub_resources[dst_sub_resource_idx].size; if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) @@ -1684,6 +1690,15 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int else { same_sub_resource = FALSE; + upload = dst_format->flags[dst_texture->resource.gl_type] & WINED3DFMT_FLAG_BLOCKS + && (dst_width != src_width || dst_height != src_height); + + if (upload) + { + dst_format = src_format->flags[dst_texture->resource.gl_type] & WINED3DFMT_FLAG_BLOCKS + ? wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, 0) : src_format; + } + if (!(flags & WINED3D_BLT_RAW) && dst_format->id != src_format->id) { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) @@ -1707,25 +1722,31 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int src_map.data = wined3d_context_map_bo_address(context, &src_data, src_texture->sub_resources[src_sub_resource_idx].size, 0, WINED3D_MAP_READ); - map_binding = dst_texture->resource.map_binding; - texture_level = dst_sub_resource_idx % dst_texture->level_count; - if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) - ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); - wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); - wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); - dst_map.data = wined3d_context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); + if (upload) + { + wined3d_format_calculate_pitch(dst_format, 1, dst_box->right, dst_box->bottom, + &dst_map.row_pitch, &dst_map.slice_pitch); + dst_map.data = heap_alloc(dst_map.slice_pitch); + } + else + { + map_binding = dst_texture->resource.map_binding; + texture_level = dst_sub_resource_idx % dst_texture->level_count; + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); + + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); + wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); + dst_map.data = wined3d_context_map_bo_address(context, &dst_data, + dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); + } } src_fmt_flags = src_format->flags[src_texture->resource.gl_type]; dst_fmt_flags = dst_format->flags[dst_texture->resource.gl_type]; flags &= ~WINED3D_BLT_RAW; bpp = dst_format->byte_count; - src_height = src_box->bottom - src_box->top; - src_width = src_box->right - src_box->left; - dst_height = dst_box->bottom - dst_box->top; - dst_width = dst_box->right - dst_box->left; row_byte_count = dst_width * bpp; sbase = (BYTE *)src_map.data @@ -1746,13 +1767,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } - if (src_height != dst_height || src_width != dst_width) - { - WARN("Stretching not supported on compressed surfaces.\n"); - hr = WINED3DERR_INVALIDCALL; - goto release; - } - hr = surface_cpu_blt_compressed(sbase, dbuf, src_map.row_pitch, dst_map.row_pitch, dst_width, dst_height, src_format, flags, fx); @@ -2093,7 +2107,33 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); + if (upload && hr == WINED3D_OK) + { + struct wined3d_bo_address data; + + data.buffer_object = 0; + data.addr = dst_map.data; + + texture_level = dst_sub_resource_idx % dst_texture->level_count; + + wined3d_texture_prepare_location(dst_texture, texture_level, context, WINED3D_LOCATION_TEXTURE_RGB); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), dst_format, + dst_box, dst_map.row_pitch, dst_map.slice_pitch, dst_texture, texture_level, + WINED3D_LOCATION_TEXTURE_RGB, dst_box->left, dst_box->top, 0); + + wined3d_texture_validate_location(dst_texture, texture_level, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, texture_level, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + if (upload) + { + heap_free(dst_map.data); + } + else + { + wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); + } + if (!same_sub_resource) wined3d_context_unmap_bo_address(context, &src_data, 0, 0, NULL); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)

1 0

← Newer
1
...
57
58
59
60
61
62
63
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019