September 2013 - Wine-commits

Henri Verbeet : ddraw/tests: Add a test for render target surface capabilities.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 31de4f1670536df30ba0c518c4de1cfa97f72c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31de4f1670536df30ba0c518c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:43 2013 +0200 ddraw/tests: Add a test for render target surface capabilities. --- dlls/ddraw/tests/ddraw1.c | 242 ++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 318 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 302 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 308 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1170 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31de4f1670536df30ba0c…

1 0

Henri Verbeet : wined3d: Only print a warning about render target usage in wined3d_device_set_render_target ().
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 49c6b87a324f91afef9fef1a9a767bab59fc3bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c6b87a324f91afef9fef1a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:44 2013 +0200 wined3d: Only print a warning about render target usage in wined3d_device_set_render_target(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30dcc06..58c3db1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3997,7 +3997,7 @@ HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, if (render_target && !(render_target->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - FIXME("Surface %p doesn't have render target usage.\n", render_target); + WARN("Surface %p doesn't have render target usage.\n", render_target); return WINED3DERR_INVALIDCALL; }

1 0

Henri Verbeet : wined3d: Set the default scissor rect from the swapchain desc in state_init_default ().
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 0eae0858ae19e4ad14951252c833d8e9e8e9ca46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eae0858ae19e4ad14951252c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:45 2013 +0200 wined3d: Set the default scissor rect from the swapchain desc in state_init_default(). We always have a swapchain here, even if there are no back buffers. --- dlls/wined3d/stateblock.c | 40 ++++++++++++++-------------------------- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 00ab69a..c2a5208 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1181,8 +1181,7 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi DWORD d; } tmpfloat; unsigned int i; - struct wined3d_swapchain *swapchain; - struct wined3d_surface *backbuffer; + struct wined3d_swapchain_desc *swapchain_desc; static const struct wined3d_matrix identity = {{{ 1.0f, 0.0f, 0.0f, 0.0f, @@ -1386,32 +1385,21 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi state->textures[i] = NULL; } - /* check the return values, because the GetBackBuffer call isn't valid for ddraw */ - if ((swapchain = wined3d_device_get_swapchain(device, 0))) - { - if ((backbuffer = wined3d_swapchain_get_back_buffer(swapchain, 0, WINED3D_BACKBUFFER_TYPE_MONO))) - { - struct wined3d_resource_desc desc; - - wined3d_resource_get_desc(&backbuffer->resource, &desc); + swapchain_desc = &device->swapchains[0]->desc; - /* Set the default scissor rect values */ - state->scissor_rect.left = 0; - state->scissor_rect.right = desc.width; - state->scissor_rect.top = 0; - state->scissor_rect.bottom = desc.height; - } - - /* Set the default viewport */ - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = swapchain->desc.backbuffer_width; - state->viewport.height = swapchain->desc.backbuffer_height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; - } + /* Set the default scissor rect values */ + state->scissor_rect.left = 0; + state->scissor_rect.right = swapchain_desc->backbuffer_width; + state->scissor_rect.top = 0; + state->scissor_rect.bottom = swapchain_desc->backbuffer_height; - TRACE("Done.\n"); + /* Set the default viewport */ + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = swapchain_desc->backbuffer_width; + state->viewport.height = swapchain_desc->backbuffer_height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

1 0

Henri Verbeet : d3dx9: Avoid CONST.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 49a3dbc453783b0c7c118726eaa331f5e918653e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a3dbc453783b0c7c118726e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:46 2013 +0200 d3dx9: Avoid CONST. --- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/line.c | 17 +++++------ dlls/d3dx9_36/mesh.c | 66 ++++++++++++++++++++--------------------------- dlls/d3dx9_36/skin.c | 15 ++++++---- dlls/d3dx9_36/sprite.c | 20 +++++++------- dlls/d3dx9_36/surface.c | 6 ++-- 6 files changed, 59 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49a3dbc453783b0c7c118…

1 0

Henri Verbeet : d3d9: Avoid CONST.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 11ced88a37ac5bfa33a5d7578205a04ee27b4b85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ced88a37ac5bfa33a5d7578… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:47 2013 +0200 d3d9: Avoid CONST. --- dlls/d3d9/tests/vertexdeclaration.c | 103 ++++++++++---------- include/d3d9.h | 175 +++++++++++++++++++---------------- 2 files changed, 149 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11ced88a37ac5bfa33a5d…

1 0

Alexandre Julliard : include: Remove CONST from non-pointer parameters.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: bf611955748f3670d187d98fef30d08f81cb7e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf611955748f3670d187d98fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 20 12:14:47 2013 +0200 include: Remove CONST from non-pointer parameters. --- include/dpaddr.h | 20 +++--- include/dplay8.h | 194 ++++++++++++++++++++++++++-------------------------- include/dplobby8.h | 36 +++++----- include/dpnathlp.h | 58 ++++++++-------- 4 files changed, 154 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf611955748f3670d187d…

1 0

Ken Thomases : winex11: Don' t trace a garbage value or read past end of caller' s array in X11DRV_wglChoosePixelFormatARB().
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: cf973bd28dfc3bb2b274ce2de72ec6848767b29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf973bd28dfc3bb2b274ce2de… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 19 20:37:16 2013 -0500 winex11: Don't trace a garbage value or read past end of caller's array in X11DRV_wglChoosePixelFormatARB(). --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e28302e..3e8480b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2520,7 +2520,7 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c { piFormats[pfmt_it++] = i + 1; TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", - it + 1, nCfgs, fmt_id, piFormats[pfmt_it]); + it + 1, nCfgs, fmt_id, i + 1); break; } }

1 0

Michael Müller : d3d9: Partial implementation of IDirect3DSwapChain9Ex.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: edad7dea7e09cb48daf0e36044ffb99a0588f4fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=edad7dea7e09cb48daf0e3604… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Sep 9 15:43:00 2013 +0200 d3d9: Partial implementation of IDirect3DSwapChain9Ex. --- dlls/d3d9/d3d9_private.h | 7 ++- dlls/d3d9/device.c | 13 ++--- dlls/d3d9/swapchain.c | 123 +++++++++++++++++++++++++++++++++++++--------- 3 files changed, 109 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edad7dea7e09cb48daf0e…

1 0

Michael Müller : d3d9/tests: Test if IDirect3DSwapChain9Ex is available with IDirect3D9(Ex).
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: cf01bb3d2ab711c9a0504350097383372b8f6818 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf01bb3d2ab711c9a05043500… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Sep 9 16:16:32 2013 +0200 d3d9/tests: Test if IDirect3DSwapChain9Ex is available with IDirect3D9(Ex). --- dlls/d3d9/tests/d3d9ex.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index f4f3327..d175d4e 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -122,6 +122,8 @@ static void test_qi_base_to_ex(void) IDirect3D9Ex *d3d9ex = (void *) 0xdeadbeef; IDirect3DDevice9 *device; IDirect3DDevice9Ex *deviceEx = (void *) 0xdeadbeef; + IDirect3DSwapChain9 *swapchain = NULL; + IDirect3DSwapChain9Ex *swapchainEx = (void *)0xdeadbeef; HRESULT hr; HWND window = create_window(); D3DPRESENT_PARAMETERS present_parameters; @@ -160,6 +162,22 @@ static void test_qi_base_to_ex(void) ok(deviceEx == NULL, "QueryInterface returned interface %p, expected NULL\n", deviceEx); if(deviceEx) IDirect3DDevice9Ex_Release(deviceEx); + /* Get the implicit swapchain */ + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x).\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSwapChain9_QueryInterface(swapchain, &IID_IDirect3DSwapChain9Ex, (void **)&swapchainEx); + ok(hr == E_NOINTERFACE, + "IDirect3DSwapChain9::QueryInterface for IID_IDirect3DSwapChain9Ex returned %08x, expected E_NOINTERFACE.\n", + hr); + ok(swapchainEx == NULL, "QueryInterface returned interface %p, expected NULL.\n", swapchainEx); + if (swapchainEx) + IDirect3DSwapChain9Ex_Release(swapchainEx); + } + if (swapchain) + IDirect3DSwapChain9_Release(swapchain); + IDirect3DDevice9_Release(device); out: @@ -173,6 +191,8 @@ static void test_qi_ex_to_base(void) IDirect3D9Ex *d3d9ex; IDirect3DDevice9 *device; IDirect3DDevice9Ex *deviceEx = (void *) 0xdeadbeef; + IDirect3DSwapChain9 *swapchain = NULL; + IDirect3DSwapChain9Ex *swapchainEx = (void *)0xdeadbeef; HRESULT hr; HWND window = create_window(); D3DPRESENT_PARAMETERS present_parameters; @@ -242,6 +262,24 @@ static void test_qi_ex_to_base(void) ok(ref == 2, "IDirect3DDevice9 refcount is %d, expected 2\n", ref); ref = getref((IUnknown *) deviceEx); ok(ref == 2, "IDirect3DDevice9Ex refcount is %d, expected 2\n", ref); + + /* Get the implicit swapchain */ + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(SUCCEEDED(hr), "Failed to get the implicit swapchain (%08x).\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DSwapChain9_QueryInterface(swapchain, &IID_IDirect3DSwapChain9Ex, (void **)&swapchainEx); + ok(hr == D3D_OK, + "IDirect3DSwapChain9::QueryInterface for IID_IDirect3DSwapChain9Ex returned %08x, expected D3D_OK.\n", + hr); + ok(swapchainEx != NULL && swapchainEx != (void *)0xdeadbeef, + "QueryInterface returned interface %p, expected != NULL && != 0xdeadbeef.\n", swapchainEx); + if (swapchainEx) + IDirect3DSwapChain9Ex_Release(swapchainEx); + } + if (swapchain) + IDirect3DSwapChain9_Release(swapchain); + if(deviceEx) IDirect3DDevice9Ex_Release(deviceEx); IDirect3DDevice9_Release(device);

1 0

Sebastian Lackner : d3d9/tests: Implemented tests for IDirect3DSwapChain9Ex_GetDisplayModeEx.
by Alexandre Julliard 20 Sep '13

20 Sep '13

Module: wine Branch: master Commit: 0fb3aaac1044ee0020ddf7654f838ed008dd0bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb3aaac1044ee0020ddf7654… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 19 20:14:28 2013 +0200 d3d9/tests: Implemented tests for IDirect3DSwapChain9Ex_GetDisplayModeEx. --- dlls/d3d9/tests/d3d9ex.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d175d4e..bf331a5 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -322,6 +322,96 @@ static void test_get_adapter_luid(void) IDirect3D9Ex_Release(d3d9ex); } +static void test_swapchain_get_displaymode_ex(void) +{ + IDirect3DSwapChain9 *swapchain = NULL; + IDirect3DSwapChain9Ex *swapchainEx = NULL; + IDirect3DDevice9Ex *device; + D3DDISPLAYMODE mode; + D3DDISPLAYMODEEX mode_ex; + D3DDISPLAYROTATION rotation; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping swapchain GetDisplayModeEx tests.\n"); + goto out; + } + + /* Get the implicit swapchain */ + hr = IDirect3DDevice9Ex_GetSwapChain(device, 0, &swapchain); + if (FAILED(hr)) + { + skip("Failed to get the implicit swapchain, skipping swapchain GetDisplayModeEx tests.\n"); + goto out; + } + + hr = IDirect3DSwapChain9_QueryInterface(swapchain, &IID_IDirect3DSwapChain9Ex, (void **)&swapchainEx); + IDirect3DSwapChain9_Release(swapchain); + if (FAILED(hr)) + { + skip("Failed to QI for IID_IDirect3DSwapChain9Ex, skipping swapchain GetDisplayModeEx tests.\n"); + goto out; + } + + /* invalid size */ + memset(&mode_ex, 0, sizeof(mode_ex)); + hr = IDirect3DSwapChain9Ex_GetDisplayModeEx(swapchainEx, &mode_ex, &rotation); + ok(hr == D3DERR_INVALIDCALL, "GetDisplayModeEx returned %#x instead of D3DERR_INVALIDCALL.\n", hr); + + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + rotation = (D3DDISPLAYROTATION)0xdeadbeef; + /* valid count and valid size */ + hr = IDirect3DSwapChain9Ex_GetDisplayModeEx(swapchainEx, &mode_ex, &rotation); + ok(SUCCEEDED(hr), "GetDisplayModeEx failed, hr %#x.\n", hr); + + /* compare what GetDisplayMode returns with what GetDisplayModeEx returns */ + hr = IDirect3DSwapChain9Ex_GetDisplayMode(swapchainEx, &mode); + ok(SUCCEEDED(hr), "GetDisplayMode failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "Size is %d.\n", mode_ex.Size); + ok(mode_ex.Width == mode.Width, "Width is %d instead of %d.\n", mode_ex.Width, mode.Width); + ok(mode_ex.Height == mode.Height, "Height is %d instead of %d.\n", mode_ex.Height, mode.Height); + ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d.\n", + mode_ex.RefreshRate, mode.RefreshRate); + ok(mode_ex.Format == mode.Format, "Format is %x instead of %x.\n", mode_ex.Format, mode.Format); + /* Don't know yet how to test for ScanLineOrdering, just testing that it + * is set to a value by GetDisplayModeEx(). */ + ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0.\n"); + /* Don't know how to compare the rotation in this case, test that it is set */ + ok(rotation != (D3DDISPLAYROTATION)0xdeadbeef, "rotation is %d, expected != 0xdeadbeef.\n", rotation); + + trace("GetDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d.\n", + mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); + + /* test GetDisplayModeEx with null pointer for D3DDISPLAYROTATION */ + memset(&mode_ex, 0, sizeof(mode_ex)); + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + + hr = IDirect3DSwapChain9Ex_GetDisplayModeEx(swapchainEx, &mode_ex, NULL); + ok(SUCCEEDED(hr), "GetDisplayModeEx failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "Size is %d.\n", mode_ex.Size); + ok(mode_ex.Width == mode.Width, "Width is %d instead of %d.\n", mode_ex.Width, mode.Width); + ok(mode_ex.Height == mode.Height, "Height is %d instead of %d.\n", mode_ex.Height, mode.Height); + ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d.\n", + mode_ex.RefreshRate, mode.RefreshRate); + ok(mode_ex.Format == mode.Format, "Format is %x instead of %x.\n", mode_ex.Format, mode.Format); + /* Don't know yet how to test for ScanLineOrdering, just testing that it + * is set to a value by GetDisplayModeEx(). */ + ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0.\n"); + + IDirect3DSwapChain9Ex_Release(swapchainEx); + +out: + if (device) + IDirect3DDevice9Ex_Release(device); + DestroyWindow(window); +} + static void test_get_adapter_displaymode_ex(void) { HWND window = create_window(); @@ -1015,6 +1105,7 @@ START_TEST(d3d9ex) test_qi_base_to_ex(); test_qi_ex_to_base(); + test_swapchain_get_displaymode_ex(); test_get_adapter_luid(); test_get_adapter_displaymode_ex(); test_texture_sysmem_create();

1 0