June 2017 - Wine-Commits - list.winehq.org

Paul Gofman : d3dx9/tests: Extend test for boolean matrix constant setting.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 7178c167423241e7ccbaf3b3f1c0d41aae2b5861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7178c167423241e7ccbaf3b3f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Jun 2 12:58:07 2017 +0300 d3dx9/tests: Extend test for boolean matrix constant setting. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 1010 ++++++++++++++++++++++-------------------- 1 file changed, 520 insertions(+), 490 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7178c167423241e7ccbaf…

1 0

Nikolay Sivov : d3drm: Fix IDirect3DRMMesh:: QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: c75c8e7f537af8fe1711d9c4594d6794d2d3a8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c75c8e7f537af8fe1711d9c45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:31 2017 +0300 d3drm: Fix IDirect3DRMMesh::QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/meshbuilder.c | 2 ++ dlls/d3drm/tests/d3drm.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 4d5a2a7..82f809e 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2322,6 +2322,8 @@ static HRESULT WINAPI d3drm_mesh_QueryInterface(IDirect3DRMMesh *iface, REFIID r TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDirect3DRMMesh) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) || IsEqualGUID(riid, &IID_IUnknown)) { IDirect3DRMMesh_AddRef(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 411cd83..9985d03 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -615,6 +615,7 @@ static void test_Mesh(void) IDirect3DRMMesh *mesh; DWORD size; CHAR cname[64] = {0}; + IUnknown *unk; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); @@ -635,6 +636,14 @@ static void test_Mesh(void) ok(size == sizeof("Mesh"), "wrong size: %u\n", size); ok(!strcmp(cname, "Mesh"), "Expected cname to be \"Mesh\", but got \"%s\"\n", cname); + hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr); + IUnknown_Release(unk); + + hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr); + IUnknown_Release(unk); + IDirect3DRMMesh_Release(mesh); IDirect3DRM_Release(d3drm);

1 0

Nikolay Sivov : d3drm/tests: Some tests for creating texture from ddraw surface.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 824c46207dd538cd81e905072e8094cd5e1ede4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=824c46207dd538cd81e905072… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:07:29 2017 +0300 d3drm/tests: Some tests for creating texture from ddraw surface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 85af6d2..90820a2 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2192,6 +2192,7 @@ static void test_Texture(void) IDirect3DRMTexture *texture1; IDirect3DRMTexture2 *texture2; IDirect3DRMTexture3 *texture3; + IDirectDrawSurface *surface; D3DRMIMAGE initimg = { @@ -2340,6 +2341,11 @@ static void test_Texture(void) ref4 = get_refcount((IUnknown *)d3drm3); ok(ref4 == ref1, "expected ref4 == ref1, got ref1 = %u , ref4 = %u.\n", ref1, ref4); + /* Created from image, GetSurface() does not work. */ + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &surface); +todo_wine + ok(hr == D3DRMERR_NOTCREATEDFROMDDS, "GetSurface() expected to fail, %#x\n", hr); + /* Test all failures together */ hr = IDirect3DRMTexture_GetClassName(texture1, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); @@ -6535,6 +6541,187 @@ cleanup: DestroyWindow(window); } +static void test_create_texture_from_surface(void) +{ + D3DRMIMAGE testimg = + { + 0, 0, 0, 0, 0, + TRUE, 0, (void *)0xcafebabe, NULL, + 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL + }; + IDirectDrawSurface *surface = NULL, *surface2 = NULL, *ds = NULL; + IDirect3DRMTexture *texture1; + IDirect3DRMTexture2 *texture2; + IDirect3DRMTexture3 *texture3; + IDirectDraw *ddraw = NULL; + IDirect3DRM *d3drm1 = NULL; + IDirect3DRM2 *d3drm2 = NULL; + IDirect3DRM3 *d3drm3 = NULL; + ULONG ref1, ref2, ref3; + D3DRMIMAGE *image; + DDSURFACEDESC desc; + HWND window; + HRESULT hr; + RECT rc; + + hr = DirectDrawCreate(NULL, &ddraw, NULL); + ok(hr == DD_OK, "Cannot get IDirectDraw interface (hr = %x).\n", hr); + + window = CreateWindowA("static", "d3drm_test", WS_OVERLAPPEDWINDOW, 0, 0, 300, 200, 0, 0, 0, 0); + GetClientRect(window, &rc); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + hr = Direct3DRMCreate(&d3drm1); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM2, (void **)&d3drm2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM2 interface (hr = %x).\n", hr); + + hr = IDirect3DRM_QueryInterface(d3drm1, &IID_IDirect3DRM3, (void **)&d3drm3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRM3 interface (hr = %x).\n", hr); + + /* Create a surface and use it to create a texture. */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; + desc.dwWidth = rc.right; + desc.dwHeight = rc.bottom; + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + /* Test NULL params */ + texture1 = (IDirect3DRMTexture *)0xdeadbeef; + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, &texture1); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture1, "Expected texture returned == NULL, got %p.\n", texture1); +} + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture2 = (IDirect3DRMTexture2 *)0xdeadbeef; + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, &texture2); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture2, "Expected texture returned == NULL, got %p.\n", texture2); +} + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + texture3 = (IDirect3DRMTexture3 *)0xdeadbeef; + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, &texture3); +todo_wine { + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + ok(!texture3, "Expected texture returned == NULL, got %p.\n", texture3); +} + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, NULL, NULL); +todo_wine + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM_CreateTextureFromSurface(d3drm1, surface, &texture1); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture_GetImage(texture1); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture_InitFromSurface(texture1, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + IDirect3DRMTexture_Release(texture1); +} + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM2_CreateTextureFromSurface(d3drm2, surface, &texture2); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture2_GetImage(texture2); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture2_InitFromSurface(texture2, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + IDirect3DRMTexture_Release(texture2); +} + ok(get_refcount((IUnknown *)surface) == 1, "Unexpected surface refcount.\n"); + hr = IDirect3DRM3_CreateTextureFromSurface(d3drm3, surface, &texture3); +todo_wine + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + ok(get_refcount((IUnknown *)surface) == 2, "Unexpected surface refcount.\n"); + image = IDirect3DRMTexture3_GetImage(texture3); + ok(image == NULL, "Unexpected image, %p.\n", image); + hr = IDirect3DRMTexture3_InitFromSurface(texture3, NULL); + ok(hr == D3DRMERR_BADOBJECT, "Expected hr == D3DRMERR_BADOBJECT, got %#x.\n", hr); + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %#x.\n", hr); + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + ok(ds == surface, "Expected same surface back.\n"); + IDirectDrawSurface_Release(ds); + + /* Init already initialized texture with same surface. */ + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + + /* Init already initialized texture with different surface. */ + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface2); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + + hr = IDirect3DRMTexture3_GetSurface(texture3, 0, &ds); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + ok(ds == surface, "Expected same surface back.\n"); + IDirectDrawSurface_Release(ds); + + ref1 = get_refcount((IUnknown *)d3drm1); + ref2 = get_refcount((IUnknown *)d3drm2); + ref3 = get_refcount((IUnknown *)d3drm3); + hr = IDirect3DRMTexture3_InitFromImage(texture3, &testimg); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n"); + ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n"); + ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n"); + /* Release leaked reference to d3drm1 */ + IDirect3DRM_Release(d3drm1); + + IDirect3DRMTexture_Release(texture3); + + /* Create from image, initialize from surface. */ + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface (hr = %#x)\n", hr); + + ref1 = get_refcount((IUnknown *)d3drm1); + ref2 = get_refcount((IUnknown *)d3drm2); + ref3 = get_refcount((IUnknown *)d3drm3); + hr = IDirect3DRMTexture3_InitFromSurface(texture3, surface); + ok(hr == D3DRMERR_BADOBJECT, "Expected a failure, hr %#x.\n", hr); + ok(ref1 < get_refcount((IUnknown *)d3drm1), "Expected d3drm1 reference taken.\n"); + ok(ref2 == get_refcount((IUnknown *)d3drm2), "Expected d3drm2 reference unchanged.\n"); + ok(ref3 == get_refcount((IUnknown *)d3drm3), "Expected d3drm3 reference unchanged.\n"); + /* Release leaked reference to d3drm1 */ + IDirect3DRM_Release(d3drm1); + + IDirect3DRMTexture3_Release(texture3); +} + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(surface); + IDirect3DRM3_Release(d3drm3); + IDirect3DRM2_Release(d3drm2); + IDirect3DRM_Release(d3drm1); + IDirectDraw_Release(ddraw); +} + START_TEST(d3drm) { test_MeshBuilder(); @@ -6568,4 +6755,5 @@ START_TEST(d3drm) test_viewport_qi(); test_viewport_clear1(); test_viewport_clear2(); + test_create_texture_from_surface(); }

1 0

Michael Müller : d3d11/tests: Add basic test for D3D11_QUERY_PIPELINE_STATISTICS.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 7208e5deabcb90cbd93ab8542a3062a4b15ee1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7208e5deabcb90cbd93ab8542… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jun 5 00:47:35 2017 +0200 d3d11/tests: Add basic test for D3D11_QUERY_PIPELINE_STATISTICS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index addc3ee..d3f12e2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4902,6 +4902,81 @@ if (0) release_test_context(&test_context); } +static void test_pipeline_statistics_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + D3D11_QUERY_DATA_PIPELINE_STATISTICS data; + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + ID3D11Asynchronous *query; + unsigned int data_size, i; + ID3D11Device *device; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D11_QUERY_PIPELINE_STATISTICS; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Begin(context, query); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.IAVertices == ~(UINT64)0, "Data was modified.\n"); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + ok(data.PSInvocations >= 640 * 480, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); + ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); + ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + + ID3D11Asynchronous_Release(query); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -20332,6 +20407,7 @@ START_TEST(d3d11) test_create_rasterizer_state(); test_create_query(); test_occlusion_query(); + test_pipeline_statistics_query(); test_timestamp_query(); test_device_removed_reason(); test_private_data();

1 0

Sebastian Lackner : d3d11: Remove duplicate const in d3d11_device_CheckFormatSupport.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 1b4e62738dc39fef29922684ab2483cd0aab4a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4e62738dc39fef29922684a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 5 14:46:20 2017 +0200 d3d11: Remove duplicate const in d3d11_device_CheckFormatSupport. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fcf5d10..e84c365 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3324,7 +3324,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device *i struct wined3d *wined3d; unsigned int i; - static const const struct + static const struct { enum wined3d_resource_type rtype; unsigned int usage;

1 0

Alexandre Julliard : wineandroid: Forward native window perform() calls to the desktop process.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 4c1f541c13b38d9523753afb9e2ddb2f5431f7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1f541c13b38d9523753afb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:40 2017 +0200 wineandroid: Forward native window perform() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 182 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 48b595f..7b4e348 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -57,6 +57,7 @@ enum android_ioctl IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, IOCTL_QUERY, + IOCTL_PERFORM, NB_IOCTLS }; @@ -65,6 +66,8 @@ struct native_win_data { struct ANativeWindow *parent; HWND hwnd; + int api; + int buffer_format; }; /* wrapper for a native window in the context of the client (non-Java) process */ @@ -110,6 +113,13 @@ struct ioctl_android_query int value; }; +struct ioctl_android_perform +{ + struct ioctl_header hdr; + int operation; + int args[4]; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -171,6 +181,8 @@ static struct native_win_data *create_native_win_data( HWND hwnd ) } if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return NULL; data->hwnd = hwnd; + data->api = NATIVE_WINDOW_API_CPU; + data->buffer_format = PF_BGRA_8888; data_map[idx] = data; return data; } @@ -193,7 +205,8 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (win) { wrap_java_call(); - win->perform( win, NATIVE_WINDOW_API_CONNECT, NATIVE_WINDOW_API_CPU ); + if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); + win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); unwrap_java_call(); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); @@ -374,6 +387,93 @@ static NTSTATUS query_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PT return android_error_to_status( ret ); } +static NTSTATUS perform_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_perform *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret = -ENOENT; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + + switch (res->operation) + { + case NATIVE_WINDOW_SET_BUFFERS_FORMAT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->buffer_format = res->args[0]; + break; + case NATIVE_WINDOW_API_CONNECT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->api = res->args[0]; + break; + case NATIVE_WINDOW_API_DISCONNECT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->api = 0; + break; + case NATIVE_WINDOW_SET_USAGE: + case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM: + case NATIVE_WINDOW_SET_SCALING_MODE: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFER_COUNT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, (size_t)res->args[0] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS: + case NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0], res->args[1] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0], res->args[1], res->args[2] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] | ((int64_t)res->args[1] << 32) ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_CONNECT: + case NATIVE_WINDOW_DISCONNECT: + case NATIVE_WINDOW_UNLOCK_AND_POST: + wrap_java_call(); + ret = parent->perform( parent, res->operation ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_CROP: + { + android_native_rect_t rect; + rect.left = res->args[0]; + rect.top = res->args[1]; + rect.right = res->args[2]; + rect.bottom = res->args[3]; + wrap_java_call(); + ret = parent->perform( parent, res->operation, &rect ); + unwrap_java_call(); + break; + } + case NATIVE_WINDOW_LOCK: + default: + FIXME( "unsupported perform op %d\n", res->operation ); + break; + } + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -381,6 +481,7 @@ static const ioctl_func ioctl_funcs[] = destroyWindow_ioctl, /* IOCTL_DESTROY_WINDOW */ windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ query_ioctl, /* IOCTL_QUERY */ + perform_ioctl, /* IOCTL_PERFORM */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -581,7 +682,84 @@ static int query( const ANativeWindow *window, int what, int *value ) static int perform( ANativeWindow *window, int operation, ... ) { - return 0; + static const char * const names[] = + { + "SET_USAGE", "CONNECT", "DISCONNECT", "SET_CROP", "SET_BUFFER_COUNT", "SET_BUFFERS_GEOMETRY", + "SET_BUFFERS_TRANSFORM", "SET_BUFFERS_TIMESTAMP", "SET_BUFFERS_DIMENSIONS", "SET_BUFFERS_FORMAT", + "SET_SCALING_MODE", "LOCK", "UNLOCK_AND_POST", "API_CONNECT", "API_DISCONNECT", + "SET_BUFFERS_USER_DIMENSIONS", "SET_POST_TRANSFORM_CROP" + }; + + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_perform perf; + va_list args; + + perf.hdr.hwnd = HandleToLong( win->hwnd ); + perf.operation = operation; + memset( perf.args, 0, sizeof(perf.args) ); + + va_start( args, operation ); + switch (operation) + { + case NATIVE_WINDOW_SET_USAGE: + case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM: + case NATIVE_WINDOW_SET_BUFFERS_FORMAT: + case NATIVE_WINDOW_SET_SCALING_MODE: + case NATIVE_WINDOW_API_CONNECT: + case NATIVE_WINDOW_API_DISCONNECT: + perf.args[0] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %d\n", win->hwnd, names[operation], perf.args[0] ); + break; + case NATIVE_WINDOW_SET_BUFFER_COUNT: + perf.args[0] = va_arg( args, size_t ); + TRACE( "hwnd %p %s count %d\n", win->hwnd, names[operation], perf.args[0] ); + break; + case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS: + case NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS: + perf.args[0] = va_arg( args, int ); + perf.args[1] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %dx%d\n", win->hwnd, names[operation], perf.args[0], perf.args[1] ); + break; + case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY: + perf.args[0] = va_arg( args, int ); + perf.args[1] = va_arg( args, int ); + perf.args[2] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %dx%d %d\n", win->hwnd, names[operation], + perf.args[0], perf.args[1], perf.args[2] ); + break; + case NATIVE_WINDOW_SET_CROP: + { + android_native_rect_t *rect = va_arg( args, android_native_rect_t * ); + perf.args[0] = rect->left; + perf.args[1] = rect->top; + perf.args[2] = rect->right; + perf.args[3] = rect->bottom; + TRACE( "hwnd %p %s rect %d,%d-%d,%d\n", win->hwnd, names[operation], + perf.args[0], perf.args[1], perf.args[2], perf.args[3] ); + break; + } + case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP: + { + int64_t timestamp = va_arg( args, int64_t ); + perf.args[0] = timestamp; + perf.args[1] = timestamp >> 32; + TRACE( "hwnd %p %s arg %08x%08x\n", win->hwnd, names[operation], perf.args[1], perf.args[0] ); + break; + } + case NATIVE_WINDOW_LOCK: + case NATIVE_WINDOW_UNLOCK_AND_POST: + case NATIVE_WINDOW_CONNECT: + case NATIVE_WINDOW_DISCONNECT: + TRACE( "hwnd %p %s\n", win->hwnd, names[operation] ); + break; + case NATIVE_WINDOW_SET_POST_TRANSFORM_CROP: + default: + FIXME( "unsupported perform hwnd %p op %d %s\n", win->hwnd, operation, + operation < sizeof(names)/sizeof(names[0]) ? names[operation] : "???" ); + break; + } + va_end( args ); + return android_ioctl( IOCTL_PERFORM, &perf, sizeof(perf), NULL, NULL ); } struct ANativeWindow *create_ioctl_window( HWND hwnd )

1 0

Francois Gouget : wmvcore/tests: Make test_profile_manager_interfaces() static.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: bc54489ba6d41b993bee6857deead74dd766f34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc54489ba6d41b993bee6857d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:38:44 2017 +0200 wmvcore/tests: Make test_profile_manager_interfaces() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 51ff9dc..a190013 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -183,7 +183,7 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } -void test_profile_manager_interfaces(void) +static void test_profile_manager_interfaces(void) { HRESULT hr; IWMProfileManager *profile;

1 0

Józef Kucia : wined3d: Introduce get_query_result64() helper function.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: 54a0ce36855f946914af7b8f76e95ed44d676e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a0ce36855f946914af7b8f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:37 2017 +0200 wined3d: Introduce get_query_result64() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 118 +++++++++++++++------------------------------------ 1 file changed, 34 insertions(+), 84 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index cf12c74..2af2048 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,6 +25,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static UINT64 get_query_result64(GLuint id, const struct wined3d_gl_info *gl_info) +{ + if (gl_info->supported[ARB_TIMER_QUERY]) + { + GLuint64 result; + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, &result)); + return result; + } + else + { + GLuint result; + GL_EXTCALL(glGetQueryObjectuiv(id, GL_QUERY_RESULT, &result)); + return result; + } +} + static void wined3d_query_init(struct wined3d_query *query, struct wined3d_device *device, enum wined3d_query_type type, const void *data, DWORD data_size, const struct wined3d_query_ops *query_ops, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -374,28 +390,15 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD gl_info = context->gl_info; GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT_AVAILABLE, &available)); - checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT_AVAILABLE)"); - TRACE("available %#x.\n", available); + TRACE("Available %#x.\n", available); if (available) { - if (gl_info->supported[ARB_TIMER_QUERY]) - { - GLuint64 result; - GL_EXTCALL(glGetQueryObjectui64v(oq->id, GL_QUERY_RESULT, &result)); - checkGLcall("glGetQueryObjectui64v(GL_QUERY_RESULT)"); - oq->samples = result; - } - else - { - GLuint result; - GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &result)); - checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)"); - oq->samples = result; - } + oq->samples = get_query_result64(oq->id, gl_info); TRACE("Returning 0x%s samples.\n", wine_dbgstr_longlong(oq->samples)); } + checkGLcall("poll occlusion query"); context_release(context); return available; @@ -640,22 +643,8 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW if (written_available && generated_available) { - if (gl_info->supported[ARB_TIMER_QUERY]) - { - GLuint64 result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.written, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_written = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.generated, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_generated = result; - } - else - { - GLuint result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.written, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_written = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.generated, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_generated = result; - } + pq->statistics.primitives_written = get_query_result64(pq->u.query.written, gl_info); + pq->statistics.primitives_generated = get_query_result64(pq->u.query.generated, gl_info); TRACE("Returning %s, %s primitives.\n", wine_dbgstr_longlong(pq->statistics.primitives_written), wine_dbgstr_longlong(pq->statistics.primitives_generated)); @@ -758,63 +747,24 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f { GL_EXTCALL(glGetQueryObjectuiv(pq->u.id[i], GL_QUERY_RESULT_AVAILABLE, &available)); if (!available) - goto done; + break; } - if (gl_info->supported[ARB_TIMER_QUERY]) - { - GLuint64 result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.vertices, GL_QUERY_RESULT, &result)); - pq->statistics.vertices_submitted = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.primitives, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_submitted = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.vertex_shader, GL_QUERY_RESULT, &result)); - pq->statistics.vs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.tess_control_shader, GL_QUERY_RESULT, &result)); - pq->statistics.hs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.tess_eval_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ds_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.geometry_shader, GL_QUERY_RESULT, &result)); - pq->statistics.gs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.geometry_primitives, GL_QUERY_RESULT, &result)); - pq->statistics.gs_primitives = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.fragment_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ps_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.compute_shader, GL_QUERY_RESULT, &result)); - pq->statistics.cs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.clipping_input, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_input_primitives = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.clipping_output, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_output_primitives = result; - } - else + if (available) { - GLuint result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.vertices, GL_QUERY_RESULT, &result)); - pq->statistics.vertices_submitted = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.primitives, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_submitted = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.vertex_shader, GL_QUERY_RESULT, &result)); - pq->statistics.vs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.tess_control_shader, GL_QUERY_RESULT, &result)); - pq->statistics.hs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.tess_eval_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ds_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.geometry_shader, GL_QUERY_RESULT, &result)); - pq->statistics.gs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.geometry_primitives, GL_QUERY_RESULT, &result)); - pq->statistics.gs_primitives = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.fragment_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ps_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.compute_shader, GL_QUERY_RESULT, &result)); - pq->statistics.cs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.clipping_input, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_input_primitives = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.clipping_output, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_output_primitives = result; + pq->statistics.vertices_submitted = get_query_result64(pq->u.query.vertices, gl_info); + pq->statistics.primitives_submitted = get_query_result64(pq->u.query.primitives, gl_info); + pq->statistics.vs_invocations = get_query_result64(pq->u.query.vertex_shader, gl_info); + pq->statistics.hs_invocations = get_query_result64(pq->u.query.tess_control_shader, gl_info); + pq->statistics.ds_invocations = get_query_result64(pq->u.query.tess_eval_shader, gl_info); + pq->statistics.gs_invocations = get_query_result64(pq->u.query.geometry_shader, gl_info); + pq->statistics.gs_primitives = get_query_result64(pq->u.query.geometry_primitives, gl_info); + pq->statistics.ps_invocations = get_query_result64(pq->u.query.fragment_shader, gl_info); + pq->statistics.cs_invocations = get_query_result64(pq->u.query.compute_shader, gl_info); + pq->statistics.clipping_input_primitives = get_query_result64(pq->u.query.clipping_input, gl_info); + pq->statistics.clipping_output_primitives = get_query_result64(pq->u.query.clipping_output, gl_info); } -done: checkGLcall("poll pipeline statistics query"); context_release(context); return available;

1 0

Józef Kucia : d3d11/tests: Introduce get_query_data() helper function.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: eb329e9019c50fc476abb440fdb2941e9233772a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb329e9019c50fc476abb440f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:36 2017 +0200 d3d11/tests: Introduce get_query_data() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 152 ++++++++++++----------------------------------- 1 file changed, 37 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb329e9019c50fc476abb…

1 0

Alexandre Julliard : wineandroid: Forward native window setSwapInterval() calls to the desktop process.
by Alexandre Julliard June 5, 2017

June 5, 2017

Module: wine Branch: master Commit: e441e85db94b2380e2e652c1c8332f64152b1b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e441e85db94b2380e2e652c1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:59 2017 +0200 wineandroid: Forward native window setSwapInterval() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 7b4e348..344e0c3 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -58,6 +58,7 @@ enum android_ioctl IOCTL_WINDOW_POS_CHANGED, IOCTL_QUERY, IOCTL_PERFORM, + IOCTL_SET_SWAP_INT, NB_IOCTLS }; @@ -68,6 +69,7 @@ struct native_win_data HWND hwnd; int api; int buffer_format; + int swap_interval; }; /* wrapper for a native window in the context of the client (non-Java) process */ @@ -120,6 +122,12 @@ struct ioctl_android_perform int args[4]; }; +struct ioctl_android_set_swap_interval +{ + struct ioctl_header hdr; + int interval; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -207,6 +215,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR wrap_java_call(); if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); + win->setSwapInterval( win, data->swap_interval ); unwrap_java_call(); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); @@ -474,6 +483,25 @@ static NTSTATUS perform_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_ return android_error_to_status( ret ); } +static NTSTATUS setSwapInterval_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_set_swap_interval *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + win_data->swap_interval = res->interval; + + if (!(parent = win_data->parent)) return STATUS_SUCCESS; + wrap_java_call(); + ret = parent->setSwapInterval( parent, res->interval ); + unwrap_java_call(); + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -482,6 +510,7 @@ static const ioctl_func ioctl_funcs[] = windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ query_ioctl, /* IOCTL_QUERY */ perform_ioctl, /* IOCTL_PERFORM */ + setSwapInterval_ioctl, /* IOCTL_SET_SWAP_INT */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -662,7 +691,13 @@ static int queueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeW static int setSwapInterval( struct ANativeWindow *window, int interval ) { - return 0; + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_set_swap_interval swap; + + TRACE( "hwnd %p interval %d\n", win->hwnd, interval ); + swap.hdr.hwnd = HandleToLong( win->hwnd ); + swap.interval = interval; + return android_ioctl( IOCTL_SET_SWAP_INT, &swap, sizeof(swap), NULL, NULL ); } static int query( const ANativeWindow *window, int what, int *value )

1 0