wine-commits April 2014

wine-commits@winehq.org

2 participants
500 discussions

Henri Verbeet : d3d8/tests: Use a separate device for p8_texture_test().
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: wine Branch: master Commit: 9166b74039bd735c7ad67bc9a985213f430c38ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9166b74039bd735c7ad67bc9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 18 08:15:55 2014 +0200 d3d8/tests: Use a separate device for p8_texture_test(). --- dlls/d3d8/tests/visual.c | 99 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a731fa0..4801bae 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2075,75 +2075,79 @@ static void alpha_test(IDirect3DDevice8 *device) } } -static void p8_texture_test(IDirect3DDevice8 *device) +static void p8_texture_test(void) { - IDirect3D8 *d3d = NULL; - HRESULT hr; - IDirect3DTexture8 *texture = NULL, *texture2 = NULL; - D3DLOCKED_RECT lr; - unsigned char *data; + IDirect3DTexture8 *texture, *texture2; + IDirect3DDevice8 *device; PALETTEENTRY table[256]; + unsigned char *data; + D3DLOCKED_RECT lr; + IDirect3D8 *d3d; D3DCOLOR color; + ULONG refcount; D3DCAPS8 caps; + HWND window; + HRESULT hr; UINT i; - float quad[] = { - -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, - -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, - 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, - 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, + + static const float quad[] = + { + -1.0f, 0.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 1.0f, 0.1f, 0.0f, 1.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, }; - float quad2[] = { - -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, - -1.0f, 0.0f, 0.1f, 0.0f, 1.0f, - 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, - 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, + static const float quad2[] = + { + -1.0f, -1.0f, 0.1f, 0.0f, 0.0f, + -1.0f, 0.0f, 0.1f, 0.0f, 1.0f, + 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, + 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, }; - IDirect3DDevice8_GetDirect3D(device, &d3d); - - if(IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, 0, - D3DRTYPE_TEXTURE, D3DFMT_P8) != D3D_OK) { - skip("D3DFMT_P8 textures not supported\n"); - goto out; + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; } - hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, - D3DPOOL_MANAGED, &texture2); - ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed, hr = %08x\n", hr); - if(!texture2) { - skip("Failed to create D3DFMT_P8 texture\n"); - goto out; + if (IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, D3DFMT_P8) != D3D_OK) + { + skip("D3DFMT_P8 textures not supported.\n"); + IDirect3DDevice8_Release(device); + goto done; } + hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, D3DPOOL_MANAGED, &texture2); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture8_LockRect(texture2, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture8_LockRect failed, hr = %08x\n", hr); data = lr.pBits; *data = 1; - hr = IDirect3DTexture8_UnlockRect(texture2, 0); ok(hr == D3D_OK, "IDirect3DTexture8_UnlockRect failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, - D3DPOOL_MANAGED, &texture); - ok(hr == D3D_OK, "IDirect3DDevice8_CreateTexture failed, hr = %08x\n", hr); - if(!texture) { - skip("Failed to create D3DFMT_P8 texture\n"); - goto out; - } - + hr = IDirect3DDevice8_CreateTexture(device, 1, 1, 1, 0, D3DFMT_P8, D3DPOOL_MANAGED, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); memset(&lr, 0, sizeof(lr)); hr = IDirect3DTexture8_LockRect(texture, 0, &lr, NULL, 0); ok(hr == D3D_OK, "IDirect3DTexture8_LockRect failed, hr = %08x\n", hr); data = lr.pBits; *data = 1; - hr = IDirect3DTexture8_UnlockRect(texture, 0); ok(hr == D3D_OK, "IDirect3DTexture8_UnlockRect failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice8_Clear failed, hr = %08x\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, TRUE); ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); @@ -2276,15 +2280,13 @@ static void p8_texture_test(IDirect3DDevice8 *device) ok(hr == D3D_OK, "IDirect3DDevice8_Present failed, hr = %08x\n", hr); } - hr = IDirect3DDevice8_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice8_SetTexture failed, hr = %08x\n", hr); - hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); - ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState failed, hr = %08x\n", hr); - -out: - if(texture) IDirect3DTexture8_Release(texture); - if(texture2) IDirect3DTexture8_Release(texture2); + IDirect3DTexture8_Release(texture); + IDirect3DTexture8_Release(texture2); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: IDirect3D8_Release(d3d); + DestroyWindow(window); } static void texop_test(void) @@ -4875,14 +4877,13 @@ START_TEST(visual) skip("No vs.1.1 support\n"); } - p8_texture_test(device_ptr); - refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left.\n", refcount); cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); + p8_texture_test(); texop_test(); depth_buffer_test(); depth_buffer2_test();

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.3.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: bugzilla Branch: upstream Commit: 748d99a5e9fd30f8651dd3aad3a47699c3bf0541 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=748d99a5e9fd30f8651dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 09:58:47 2014 +0200 Import of upstream bugzilla release 4.4.3. --- .gitignore | 32 +++++ Bugzilla/Auth.pm | 19 ++- Bugzilla/Auth/Login/CGI.pm | 41 +++++- Bugzilla/Auth/Login/Cookie.pm | 71 +++++++-- Bugzilla/Auth/Persist/Cookie.pm | 38 +++-- Bugzilla/Bug.pm | 59 ++++---- Bugzilla/CGI.pm | 13 ++ Bugzilla/Constants.pm | 2 +- Bugzilla/Template.pm | 16 +++ Bugzilla/Util.pm | 20 ++- Bugzilla/WebService.pm | 26 ++-- Bugzilla/WebService/Server/JSONRPC.pm | 6 +- Bugzilla/WebService/Server/XMLRPC.pm | 6 + Bugzilla/WebService/User.pm | 92 +++++++----- Bugzilla/WebService/Util.pm | 23 +++ contrib/jb2bz.py | 152 ++++++++++++-------- docs/bugzilla.ent | 12 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +- lib/CGI.pm | 2 +- relogin.cgi | 26 +++- showdependencytree.cgi | 10 +- t/004template.t | 16 ++- .../en/default/account/auth/login-small.html.tmpl | 4 +- template/en/default/account/auth/login.html.tmpl | 4 +- template/en/default/account/cancel-token.txt.tmpl | 2 +- template/en/default/admin/groups/delete.html.tmpl | 3 +- .../en/default/admin/params/attachment.html.tmpl | 4 +- template/en/default/admin/params/auth.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 5 +- template/en/default/bug/create/create.html.tmpl | 3 + template/en/default/bug/edit.html.tmpl | 5 + template/en/default/email/bugmail.txt.tmpl | 2 +- template/en/default/email/flagmail.txt.tmpl | 2 +- .../en/default/extensions/name-readme.txt.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 8 +- template/en/default/global/user-error.html.tmpl | 17 ++- template/en/default/list/edit-multiple.html.tmpl | 7 +- template/en/default/list/list.html.tmpl | 12 +- template/en/default/pages/release-notes.html.tmpl | 27 ++++ 40 files changed, 587 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=748d99a5e9fd30f86…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: bugzilla Branch: master Commit: 8e5ec148130c27d3636f3acb9647186eef593788 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=8e5ec148130c27d3636f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 09:59:37 2014 +0200 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.3.
by Alexandre Julliard 18 Apr '14

18 Apr '14

Module: bugzilla Branch: master Commit: 748d99a5e9fd30f8651dd3aad3a47699c3bf0541 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=748d99a5e9fd30f8651dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 18 09:58:47 2014 +0200 Import of upstream bugzilla release 4.4.3. --- .gitignore | 32 +++++ Bugzilla/Auth.pm | 19 ++- Bugzilla/Auth/Login/CGI.pm | 41 +++++- Bugzilla/Auth/Login/Cookie.pm | 71 +++++++-- Bugzilla/Auth/Persist/Cookie.pm | 38 +++-- Bugzilla/Bug.pm | 59 ++++---- Bugzilla/CGI.pm | 13 ++ Bugzilla/Constants.pm | 2 +- Bugzilla/Template.pm | 16 +++ Bugzilla/Util.pm | 20 ++- Bugzilla/WebService.pm | 26 ++-- Bugzilla/WebService/Server/JSONRPC.pm | 6 +- Bugzilla/WebService/Server/XMLRPC.pm | 6 + Bugzilla/WebService/User.pm | 92 +++++++----- Bugzilla/WebService/Util.pm | 23 +++ contrib/jb2bz.py | 152 ++++++++++++-------- docs/bugzilla.ent | 12 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +- lib/CGI.pm | 2 +- relogin.cgi | 26 +++- showdependencytree.cgi | 10 +- t/004template.t | 16 ++- .../en/default/account/auth/login-small.html.tmpl | 4 +- template/en/default/account/auth/login.html.tmpl | 4 +- template/en/default/account/cancel-token.txt.tmpl | 2 +- template/en/default/admin/groups/delete.html.tmpl | 3 +- .../en/default/admin/params/attachment.html.tmpl | 4 +- template/en/default/admin/params/auth.html.tmpl | 2 +- template/en/default/admin/sudo.html.tmpl | 5 +- template/en/default/bug/create/create.html.tmpl | 3 + template/en/default/bug/edit.html.tmpl | 5 + template/en/default/email/bugmail.txt.tmpl | 2 +- template/en/default/email/flagmail.txt.tmpl | 2 +- .../en/default/extensions/name-readme.txt.tmpl | 2 +- template/en/default/global/messages.html.tmpl | 8 +- template/en/default/global/user-error.html.tmpl | 17 ++- template/en/default/list/edit-multiple.html.tmpl | 7 +- template/en/default/list/list.html.tmpl | 12 +- template/en/default/pages/release-notes.html.tmpl | 27 ++++ 40 files changed, 587 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=748d99a5e9fd30f86…

1 0

Matteo Bruni : d3dx9: Skip the AddRef/ Release calls if the new texture is the same as the old one.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: b3c5d2ccda28b3163cd04baf36e285ff2b1b0057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3c5d2ccda28b3163cd04baf3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:50 2014 +0200 d3dx9: Skip the AddRef/Release calls if the new texture is the same as the old one. --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a2a8e9f..8e2f850 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2409,6 +2409,9 @@ static HRESULT d3dx9_base_effect_set_texture(struct d3dx9_base_effect *base, { struct IDirect3DBaseTexture9 *oltexture = *(struct IDirect3DBaseTexture9 **)param->data; + if (texture == oltexture) + return D3D_OK; + if (texture) IDirect3DBaseTexture9_AddRef(texture); if (oltexture) IDirect3DBaseTexture9_Release(oltexture);

1 0

Matteo Bruni : d3dx9: Copy the entire vector at once if there is no need of type conversions.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 96b0b917524ff90c21669be498f3abd0a61f87a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b0b917524ff90c21669be49… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:49 2014 +0200 d3dx9: Copy the entire vector at once if there is no need of type conversions. --- dlls/d3dx9_36/effect.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f136fb7..a2a8e9f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1792,6 +1792,12 @@ static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base, *(INT *)param->data = tmp; return D3D_OK; } + if (param->type == D3DXPT_FLOAT) + { + memcpy(param->data, vector, param->columns * sizeof(float)); + return D3D_OK; + } + set_vector(param, vector); return D3D_OK; @@ -1866,6 +1872,17 @@ static HRESULT d3dx9_base_effect_set_vector_array(struct d3dx9_base_effect *base switch (param->class) { case D3DXPC_VECTOR: + if (param->type == D3DXPT_FLOAT) + { + if (param->columns == 4) + memcpy(param->data, vector, count * 4 * sizeof(float)); + else + for (i = 0; i < count; ++i) + memcpy((float *)param->data + param->columns * i, vector + i, + param->columns * sizeof(float)); + return D3D_OK; + } + for (i = 0; i < count; ++i) { set_vector(&param->members[i], &vector[i]);

1 0

Matteo Bruni : wined3d: Add support for timestamp queries.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: a1784d9ed939ea2fdc350489fdbe94502912a276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1784d9ed939ea2fdc350489f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:48 2014 +0200 wined3d: Add support for timestamp queries. --- dlls/d3d9/query.c | 21 ++++- dlls/wined3d/context.c | 67 ++++++++++++++ dlls/wined3d/query.c | 197 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 +++ include/wine/wined3d.h | 6 ++ 5 files changed, 301 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1784d9ed939ea2fdc350…

1 0

Matteo Bruni : wined3d: Add support for GL_ARB_timer_query extension.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: 4811a839cf4f21a17323a0f0b1f148d0fc9840fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4811a839cf4f21a17323a0f0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:47 2014 +0200 wined3d: Add support for GL_ARB_timer_query extension. --- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d_gl.h | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f3331bf..94a002e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -139,6 +139,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, + {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, {"GL_ARB_vertex_blend", ARB_VERTEX_BLEND }, {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, @@ -2968,6 +2969,15 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (gl_info->supported[ARB_TIMER_QUERY]) + { + GLint counter_bits; + + GL_EXTCALL(glGetQueryivARB(GL_TIMESTAMP, GL_QUERY_COUNTER_BITS_ARB, &counter_bits)); + TRACE("Timestamp query counter has %d bits.\n", counter_bits); + if (!counter_bits) + gl_info->supported[ARB_TIMER_QUERY] = FALSE; + } if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) { TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 7331592..acfbe3c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -89,6 +89,7 @@ enum wined3d_gl_extension ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, + ARB_TIMER_QUERY, ARB_VERTEX_ARRAY_BGRA, ARB_VERTEX_BLEND, ARB_VERTEX_BUFFER_OBJECT, @@ -321,6 +322,9 @@ enum wined3d_gl_extension USE_GL_FUNC(glCompressedTexSubImage2DARB) \ USE_GL_FUNC(glCompressedTexSubImage3DARB) \ USE_GL_FUNC(glGetCompressedTexImageARB) \ + /* GL_ARB_timer_query */ \ + USE_GL_FUNC(glQueryCounter) \ + USE_GL_FUNC(glGetQueryObjectui64v) \ /* GL_ARB_vertex_blend */ \ USE_GL_FUNC(glVertexBlendARB) \ USE_GL_FUNC(glWeightPointerARB) \

1 0

Matteo Bruni : d3d9/tests: Add a test for timestamp queries.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: cdedb06af77a83b7839c3a434cfdba8020b35300 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdedb06af77a83b7839c3a434… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 16 18:14:46 2014 +0200 d3d9/tests: Add a test for timestamp queries. --- dlls/d3d9/tests/device.c | 149 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 09b0905..4dd7a6a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3869,6 +3869,154 @@ static void test_occlusion_query_states(void) DestroyWindow(window); } +static void test_timestamp_query(void) +{ + static const float point[3] = {0.0, 0.0, 0.0}; + IDirect3DQuery9 *query, *disjoint_query, *freq_query; + unsigned int data_size, i; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + HWND window; + HRESULT hr; + UINT64 timestamp, freq; + BOOL disjoint; + + window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPFREQ, &freq_query); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Timestamp queries are not supported, skipping tests.\n"); + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + data_size = IDirect3DQuery9_GetDataSize(freq_query); + ok(data_size == sizeof(UINT64), "Query data size is %u, 8 expected.\n", data_size); + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMPDISJOINT, &disjoint_query); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + data_size = IDirect3DQuery9_GetDataSize(disjoint_query); + ok(data_size == sizeof(BOOL), "Query data size is %u, 4 expected.\n", data_size); + + hr = IDirect3DDevice9_CreateQuery(device, D3DQUERYTYPE_TIMESTAMP, &query); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + data_size = IDirect3DQuery9_GetDataSize(query); + ok(data_size == sizeof(UINT64), "Query data size is %u, 8 expected.\n", data_size); + + hr = IDirect3DQuery9_Issue(freq_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(freq_query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(freq_query, &freq, sizeof(freq), D3DGETDATA_FLUSH); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_FALSE || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_BEGIN); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(disjoint_query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(disjoint_query, &disjoint, sizeof(disjoint), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* It's not strictly necessary for the TIMESTAMP query to be inside + * a TIMESTAMP_DISJOINT query. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DQuery9_GetData(query, &timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DQuery9_Release(query); + IDirect3DQuery9_Release(disjoint_query); + IDirect3DQuery9_Release(freq_query); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + static void test_get_set_vertex_shader(void) { IDirect3DVertexShader9 *current_shader = NULL; @@ -7903,6 +8051,7 @@ START_TEST(device) test_vertex_buffer_alignment(); test_query_support(); test_occlusion_query_states(); + test_timestamp_query(); test_get_set_vertex_shader(); test_vertex_shader_constant(); test_get_set_pixel_shader();

1 0

Piotr Caban : msvcr110: Share the source code with msvcrt.
by Alexandre Julliard 17 Apr '14

17 Apr '14

Module: wine Branch: master Commit: b7c5e341ae8e50316fbe4fe011d409b852e9d074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c5e341ae8e50316fbe4fe01… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 17 13:07:21 2014 +0200 msvcr110: Share the source code with msvcrt. --- dlls/msvcr110/Makefile.in | 32 +- dlls/msvcr110/msvcr110.c | 72 -- dlls/msvcr110/msvcr110.spec | 2436 +++++++++++++++++++++---------------------- dlls/msvcrt/except.c | 8 + dlls/msvcrt/misc.c | 12 + dlls/msvcrt/process.c | 8 + tools/make_specfiles | 1 - 7 files changed, 1276 insertions(+), 1293 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c5e341ae8e50316fbe4…

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2014