January 2019 - Wine-devel - list.winehq.org

[PATCH vkd3d 1/3] vkd3d: Handle NULL pointers in vkd3d_private_store_set_private_data().
by Józef Kucia 09 Jan '19

09 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 6841bfb180d2..ed4d77fea8cd 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -527,6 +527,17 @@ static HRESULT vkd3d_private_store_set_private_data(struct vkd3d_private_store * struct vkd3d_private_data *d, *old_data; const void *ptr = data; + if (!data) + { + if ((d = vkd3d_private_store_get_private_data(store, tag))) + { + vkd3d_private_data_destroy(d); + return S_OK; + } + + return S_FALSE; + } + if (is_object) { if (data_size != sizeof(IUnknown *)) @@ -584,25 +595,12 @@ HRESULT vkd3d_get_private_data(struct vkd3d_private_store *store, HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store, const GUID *tag, unsigned int data_size, const void *data) { - struct vkd3d_private_data *d; - - if (!data) - { - if (!(d = vkd3d_private_store_get_private_data(store, tag))) - return S_FALSE; - - vkd3d_private_data_destroy(d); - return S_OK; - } - return vkd3d_private_store_set_private_data(store, tag, data, data_size, false); } HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store, const GUID *tag, const IUnknown *object) { - if (!object) - return vkd3d_set_private_data(store, tag, sizeof(object), &object); - - return vkd3d_private_store_set_private_data(store, tag, object, sizeof(object), true); + const void *data = object ? object : (void *)&object; + return vkd3d_private_store_set_private_data(store, tag, data, sizeof(object), !!object); } -- 2.19.2

2 1

[PATCH] d3dx9: Return correct comment length from get_instr_length().
by Matteo Bruni 09 Jan '19

09 Jan '19

From: Paul Gofman <gofmanp(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46435. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index acbbf0718ad..e8ce3dd796c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2415,18 +2415,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 74251d079da..a1a47ec357b 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6463,6 +6463,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ -- 2.19.2

1 0

[PATCH] d3dcompiler_43: Define D3D_COMPILER_VERSION.
by Matteo Bruni 09 Jan '19

09 Jan '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Supersedes patch 156439. It turns out I tested the previous patch with d3dcompiler_43, which was the only one missing the define in the makefile... dlls/d3dcompiler_43/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index c31aa6c2a62..40f80150105 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3dcompiler_43.dll IMPORTS = dxguid uuid EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asmparser.c \ -- 2.19.2

1 0

[PATCH] d3dx9: Return correct comment length from get_instr_length().
by Paul Gofman 09 Jan '19

09 Jan '19

For bug https://bugs.winehq.org/show_bug.cgi?id=46435. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- It is not a regression as this code did not change since December 2017. Still suggesting it now as the bug involves potential out of bounds (read) access and the fix looks pretty obvious. dlls/d3dx9_36/shader.c | 8 +++++--- dlls/d3dx9_36/tests/shader.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index acbbf0718a..e8ce3dd796 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2415,18 +2415,20 @@ HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader static unsigned int get_instr_length(const DWORD *byte_code, unsigned int major, unsigned int minor) { + DWORD opcode = *byte_code & 0xffff; unsigned int len = 0; + if (opcode == D3DSIO_COMMENT) + return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; + if (major > 1) return (*byte_code & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT; - switch (*byte_code & 0xffff) + switch (opcode) { case D3DSIO_END: ERR("Unexpected END token.\n"); return 0; - case D3DSIO_COMMENT: - return (*byte_code & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT; case D3DSIO_DEF: case D3DSIO_DEFI: return 5; diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 1086e5e9d6..b67ffb209c 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -6457,6 +6457,7 @@ static void test_shader_semantics(void) vs_3_0[] = { 0xfffe0300, /* vs_3_0 */ + 0x0002fffe, 0x0200000f, 0x00000000, /* comment */ 0x0200001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ 0x0200001f, 0x80000003, 0x900f0001, /* dcl_normal v1 */ 0x0200001f, 0x8001000a, 0x900f0002, /* dcl_color1 v2 */ -- 2.20.1

1 0

[PATCH 1/3] shell32/tests: Test that ShellView picks up external file changes
by Nigel Baillie 09 Jan '19

09 Jan '19

Signed-off-by: Nigel Baillie <metreckk(a)gmail.com> --- dlls/shell32/tests/shlview.c | 89 ++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5d96c8d44..4d0cf641a7 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1502,6 +1502,94 @@ todo_wine IUnknown_Release(unk); } +static void do_events(void) +{ + MSG msg; + while(PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)){ + TranslateMessage(&msg); + DispatchMessageA(&msg); + } +} + +static void test_external_change(void) +{ + IShellFolder *desktop, *folder; + FOLDERSETTINGS settings; + IShellView *view; + IShellBrowser *browser; + IFolderView *fv; + HWND hwnd_view; + LPITEMIDLIST pidl; + HRESULT hr; + HANDLE file; + INT count; + RECT r; + BOOLEAN b; + static const WCHAR test_folder_path[] = + {'C',':','\\','s','h','l','v','i','e','w','_','t','e','s','t',0}; + static const WCHAR test_file_path[] = + {'C',':','\\','s','h','l','v','i','e','w','_','t','e','s','t','\\','f','.','t','x','t',0}; + + /* create test folder, get a PIDL to it */ + b = CreateDirectoryW(test_folder_path, NULL); + ok(b, "failed to create test directory\n"); + + pidl = ILCreateFromPathW(test_folder_path); + ok(pidl != NULL, "couldn't get a PIDL to the test directory\n"); + + /* Get an IFolderView for the test folder */ + hr = SHGetDesktopFolder(&desktop); + ok(hr == S_OK, "got (0x%08x) when trying to grab desktop folder\n", hr); + + hr = IShellFolder_BindToObject(desktop, pidl, NULL, &IID_IShellFolder, (void**)&folder); + ok(hr == S_OK, "got (0x%08x) from BindToObject\n", hr); + + hr = IShellFolder_CreateViewObject(folder, NULL, &IID_IShellView, (void**)&view); + ok(hr == S_OK, "got (0x%08x) from CreateViewObject\n", hr); + + hr = IShellView_QueryInterface(view, &IID_IFolderView, (void**)&fv); + ok(hr == S_OK, "got (0x%08x) when trying to get an IFolderView interface\n", hr); + + /* create window */ + browser = IShellBrowserImpl_Construct(); + settings.ViewMode = FVM_ICON; + settings.fFlags = 0; + hwnd_view = (HWND)0xdeadbeef; + SetRect(&r, 0, 0, 100, 100); + hr = IShellView_CreateViewWindow(view, NULL, &settings, browser, &r, &hwnd_view); + ok(hr == S_OK, "got (0x%08x) when trying to create view window\n", hr); + ok(IsWindow(hwnd_view), "got %p instead of a valid HWND\n", hwnd_view); + + /* item count should be zero */ + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(count == 0, "count should've been 0, but was %i\n", count); + + /* create test file */ + file = CreateFileW(test_file_path, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to create test file\n"); + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); /* we don't actually need the file open */ + + /* let the shlview figure out that it was created */ + Sleep(1000); + do_events(); + + /* it should now show the new file! */ + IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(count == 1, "count should've been 1, but was %i\n", count); + + /* cleanup */ + hr = IShellView_DestroyViewWindow(view); + DeleteFileW(test_file_path); + RemoveDirectoryW(test_folder_path); + IShellBrowser_Release(browser); + IFolderView_Release(fv); + IShellView_Release(view); + IShellFolder_Release(desktop); +} + START_TEST(shlview) { OleInitialize(NULL); @@ -1518,6 +1606,7 @@ START_TEST(shlview) test_SHCreateShellFolderView(); test_SHCreateShellFolderViewEx(); test_newmenu(); + test_external_change(); OleUninitialize(); } -- 2.19.1

4 11

[PATCH 3/5] wined3d: Simplify wined3d_cs_emit_clear() slightly.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 5ea25e992aa5..aa8eef7a2e01 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -600,22 +600,20 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; struct wined3d_cs_clear *op; + unsigned int rt_count, i; RECT view_rect; - unsigned int i; + + rt_count = flags & WINED3DCLEAR_TARGET ? cs->device->adapter->d3d_info.limits.max_rt_count : 0; op = wined3d_cs_require_space(cs, FIELD_OFFSET(struct wined3d_cs_clear, rects[rect_count]), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_CLEAR; op->flags = flags; - if (flags & WINED3DCLEAR_TARGET) - op->rt_count = rt_count; - else - op->rt_count = 0; + op->rt_count = rt_count; op->fb = &cs->fb; SetRect(&op->draw_rect, vp->x, vp->y, vp->x + vp->width, vp->y + vp->height); if (state->render_states[WINED3D_RS_SCISSORTESTENABLE]) @@ -626,16 +624,13 @@ void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT * op->rect_count = rect_count; memcpy(op->rects, rects, sizeof(*rects) * rect_count); - if (flags & WINED3DCLEAR_TARGET) + for (i = 0; i < rt_count; ++i) { - for (i = 0; i < rt_count; ++i) + if ((view = state->fb->render_targets[i])) { - if ((view = state->fb->render_targets[i])) - { - SetRect(&view_rect, 0, 0, view->width, view->height); - IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); - wined3d_resource_acquire(view->resource); - } + SetRect(&view_rect, 0, 0, view->width, view->height); + IntersectRect(&op->draw_rect, &op->draw_rect, &view_rect); + wined3d_resource_acquire(view->resource); } } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) -- 2.19.2

2 1

[PATCH 2/5] ddraw/tests: Fix compilation on systems that don't support nameless unions.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++-------- dlls/ddraw/tests/ddraw2.c | 22 ++++++++++---------- dlls/ddraw/tests/ddraw4.c | 44 +++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 44 +++++++++++++++++++-------------------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 9e562de5c44d..d36120426f92 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4368,7 +4368,7 @@ static void fill_surface(IDirectDrawSurface *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -9114,11 +9114,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -9184,7 +9184,7 @@ static void test_cross_device_blt(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_VIDEOMEMORY; - U5(surface_desc).dwBackBufferCount = 2; + surface_desc.dwBackBufferCount = 2; hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -10610,7 +10610,7 @@ static void test_ck_operation(void) surface_desc.dwWidth = 4; surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; @@ -11266,10 +11266,10 @@ static void test_clear(void) /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; viewport_set_background(device, viewport, green); hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index e4a866e23619..7cbfce056fdd 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4977,7 +4977,7 @@ static void fill_surface(IDirectDrawSurface *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -10246,11 +10246,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -10316,7 +10316,7 @@ static void test_cross_device_blt(void) surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_VIDEOMEMORY; - U5(surface_desc).dwBackBufferCount = 2; + surface_desc.dwBackBufferCount = 2; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -11965,7 +11965,7 @@ static void test_ck_operation(void) surface_desc.dwWidth = 4; surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; @@ -12688,10 +12688,10 @@ static void test_clear(void) /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; viewport_set_background(device, viewport, green); hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); @@ -12993,7 +12993,7 @@ static void test_viewport(void) memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(ds, &surface_desc); - z_fmt = U4(surface_desc).ddpfPixelFormat; + z_fmt = surface_desc.ddpfPixelFormat; for (i = 0; i < ARRAY_SIZE(rt_sizes); ++i) { @@ -13010,7 +13010,7 @@ static void test_viewport(void) surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - U4(surface_desc).ddpfPixelFormat = z_fmt; + surface_desc.ddpfPixelFormat = z_fmt; hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &ds, NULL); ok(SUCCEEDED(hr), "Failed to create depth buffer, hr %#x (i %u).\n", hr, i); hr = IDirectDrawSurface_AddAttachedSurface(rt, ds); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 92ca9f6eb4b1..9b47c2bd3ca9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6295,7 +6295,7 @@ static void fill_surface(IDirectDrawSurface4 *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -11714,11 +11714,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface4_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface4_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -11802,12 +11802,12 @@ static void test_cross_device_blt(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; hr = IDirectDraw4_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13695,10 +13695,10 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13834,11 +13834,11 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; - U5(U4(surface_desc.ddpfPixelFormat)).dwRGBAlphaBitMask = 0xff000000; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + U5(U4(surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &src, NULL); @@ -14807,10 +14807,10 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index ccb22d538823..fbc27376a530 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6093,7 +6093,7 @@ static void fill_surface(IDirectDrawSurface7 *surface, D3DCOLOR color) for (y = 0; y < surface_desc.dwHeight; ++y) { - ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * surface_desc.lPitch); + ptr = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); for (x = 0; x < surface_desc.dwWidth; ++x) { ptr[x] = color; @@ -11624,11 +11624,11 @@ static void test_blt_z_alpha(void) for (i = 0; i < ARRAY_SIZE(blt_flags); ++i) { - fx.dwFillColor = 0x3300ff00; + U5(fx).dwFillColor = 0x3300ff00; hr = IDirectDrawSurface7_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); - fx.dwFillColor = 0xccff0000; + U5(fx).dwFillColor = 0xccff0000; hr = IDirectDrawSurface7_Blt(dst_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); ok(SUCCEEDED(hr), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -11712,12 +11712,12 @@ static void test_cross_device_blt(void) surface_desc.dwWidth = 640; surface_desc.dwHeight = 480; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; - surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); - surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; - U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; - U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; - U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 16; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x0000001f; hr = IDirectDraw7_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -12952,10 +12952,10 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); @@ -13091,11 +13091,11 @@ static void test_ck_operation(void) surface_desc.dwHeight = 1; surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; - U1(U4(surface_desc.ddpfPixelFormat)).dwRGBBitCount = 32; - U2(U4(surface_desc.ddpfPixelFormat)).dwRBitMask = 0x00ff0000; - U3(U4(surface_desc.ddpfPixelFormat)).dwGBitMask = 0x0000ff00; - U4(U4(surface_desc.ddpfPixelFormat)).dwBBitMask = 0x000000ff; - U5(U4(surface_desc.ddpfPixelFormat)).dwRGBAlphaBitMask = 0xff000000; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + U5(U4(surface_desc).ddpfPixelFormat).dwRGBAlphaBitMask = 0xff000000; hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src, NULL); @@ -14152,10 +14152,10 @@ static void test_clear(void) ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); /* negative x, negative y. * Also ignored, except on WARP, which clears the entire screen. */ - rect_negneg.x1 = 640; - rect_negneg.y1 = 240; - rect_negneg.x2 = 320; - rect_negneg.y2 = 0; + U1(rect_negneg).x1 = 640; + U2(rect_negneg).y1 = 240; + U3(rect_negneg).x2 = 320; + U4(rect_negneg).y2 = 0; hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); -- 2.19.2

3 2

[PATCH 1/5] ddraw/tests: Add tests for attaching depth buffers of different sizes.
by Józef Kucia 09 Jan '19

09 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 47 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 59d07b7d76fc..9e562de5c44d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4991,6 +4991,53 @@ static void test_surface_attachment(void) IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(surface4); + IDirectDrawSurface_Release(surface3); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 8b9b249a3a4e..e4a866e23619 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -6015,6 +6015,53 @@ static void test_surface_attachment(void) IDirectDrawSurface_Release(surface2); IDirectDrawSurface_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(surface_desc.ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(surface_desc.ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface2_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface2_Release(surface4); + IDirectDrawSurface2_Release(surface3); + IDirectDrawSurface2_Release(surface2); + IDirectDrawSurface2_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1c4841891e40..92ca9f6eb4b1 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -7327,6 +7327,53 @@ static void test_surface_attachment(void) IDirectDrawSurface4_Release(surface2); IDirectDrawSurface4_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface4_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(surface4); + IDirectDrawSurface4_Release(surface3); + IDirectDrawSurface4_Release(surface2); + IDirectDrawSurface4_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 9ab8644191f5..ccb22d538823 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -7157,6 +7157,53 @@ static void test_surface_attachment(void) IDirectDrawSurface7_Release(surface2); IDirectDrawSurface7_Release(surface1); + /* Test depth surfaces of different sizes. */ + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_3DDEVICE; + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface1, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER; + U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 16; + U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0x0000ffff; + surface_desc.dwWidth = 32; + surface_desc.dwHeight = 32; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface2, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 64; + surface_desc.dwHeight = 64; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface3, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface4, NULL); + ok(hr == D3D_OK, "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface2); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface3); + ok(hr == D3D_OK, "Failed to attach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface3); + ok(hr == D3D_OK, "Failed to detach depth buffer, hr %#x.\n", hr); + hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); + todo_wine ok(hr == DDERR_CANNOTATTACHSURFACE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(surface4); + IDirectDrawSurface7_Release(surface3); + IDirectDrawSurface7_Release(surface2); + IDirectDrawSurface7_Release(surface1); + /* Test DeleteAttachedSurface() and automatic detachment of attached surfaces on release. */ memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); -- 2.19.2

3 2

[PATCH 2/3] windowscodecs: Remove redundant checks from the TIFF decoder's CopyPixels implementation.
by Dmitry Timoshkov 09 Jan '19

09 Jan '19

Common copy_pixels() helper already performs theses checks, and the buffer size check is wrong. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/windowscodecs/tests/tiffformat.c | 2 -- dlls/windowscodecs/tiffformat.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 8da843bdcc..ff9c4b9a74 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -598,11 +598,9 @@ static void test_tiff_24bpp(void) ok(hr == E_INVALIDARG, "CopyPixels(%u) should fail: %#x\n", stride, hr); else { -todo_wine_if(stride > 3) ok(hr == S_OK, "CopyPixels(%u) error %#x\n", stride, hr); for (i = 0; i < sizeof(data); i++) -todo_wine_if(stride > 3) ok(data[i] == expected_data[i], "%u: expected %02x, got %02x\n", i, expected_data[i], data[i]); } } diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 93af5594a7..2d265e8694 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1080,7 +1080,6 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, WICRect rc; HRESULT hr=S_OK; BYTE *dst_tilepos; - UINT bytesperrow; WICRect rect; TRACE("(%p,%s,%u,%u,%p)\n", iface, debug_wic_rect(prc), cbStride, cbBufferSize, pbBuffer); @@ -1100,14 +1099,6 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, return E_INVALIDARG; } - bytesperrow = ((This->decode_info.bpp * prc->Width)+7)/8; - - if (cbStride < bytesperrow) - return E_INVALIDARG; - - if ((cbStride * prc->Height) > cbBufferSize) - return E_INVALIDARG; - min_tile_x = prc->X / This->decode_info.tile_width; min_tile_y = prc->Y / This->decode_info.tile_height; max_tile_x = (prc->X+prc->Width-1) / This->decode_info.tile_width; -- 2.20.1

2 2

[PATCH] d3dcompiler.h: Define D3DCOMPILER_DLL to d3dcompiler_47.dll.
by Jacek Caban 09 Jan '19

09 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This is consistent with importlib. include/d3dcompiler.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

3 3