wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Henri Verbeet : wined3d: Get rid of the WINED3DPOOL typedef.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: e53a277305a0e9337a22144743c026b34501b512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53a277305a0e9337a2214474… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:37 2012 +0100 wined3d: Get rid of the WINED3DPOOL typedef. --- dlls/d3d10core/device.c | 4 +- dlls/d3d10core/texture.c | 4 +- dlls/d3d8/buffer.c | 4 +- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 13 +++++---- dlls/d3d8/surface.c | 2 +- dlls/d3d8/volume.c | 2 +- dlls/d3d9/buffer.c | 4 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/d3d9/device.c | 10 +++--- dlls/d3d9/surface.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/ddraw/ddraw.c | 6 ++-- dlls/ddraw/device.c | 4 +- dlls/ddraw/surface.c | 14 +++++----- dlls/ddraw/vertexbuffer.c | 2 +- dlls/dxgi/device.c | 2 +- dlls/wined3d/arb_program_shader.c | 6 ++-- dlls/wined3d/buffer.c | 14 +++++----- dlls/wined3d/device.c | 13 ++++----- dlls/wined3d/directx.c | 4 +- dlls/wined3d/resource.c | 16 ++++++------ dlls/wined3d/surface.c | 50 ++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 20 +++++++------- dlls/wined3d/utils.c | 16 ++++++------ dlls/wined3d/volume.c | 4 +- dlls/wined3d/wined3d_private.h | 14 +++++----- include/wine/wined3d.h | 39 ++++++++++++++-------------- 29 files changed, 139 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e53a277305a0e9337a221…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DRESOURCETYPE typedef.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 6a5a098b2307efe804a15f2f79bdc9765082c6a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a5a098b2307efe804a15f2f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:36 2012 +0100 wined3d: Get rid of the WINED3DRESOURCETYPE typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 8 ++++---- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 8 ++++---- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 30 +++++++++++++++--------------- dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/palette.c | 2 +- dlls/wined3d/resource.c | 8 ++++---- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/utils.c | 18 +++++++++--------- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 10 +++++----- include/wine/wined3d.h | 24 +++++++++++------------- 19 files changed, 80 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a5a098b2307efe804a15…

1 0

Henri Verbeet : ddraw: Maintain D3D state across cooperative level changes.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 992dbc10786b79959d8b0a790974f6630aa81e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=992dbc10786b79959d8b0a790… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:35 2012 +0100 ddraw: Maintain D3D state across cooperative level changes. --- dlls/ddraw/ddraw.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 6 ++-- dlls/ddraw/tests/ddraw4.c | 6 ++-- dlls/ddraw/tests/ddraw7.c | 6 ++-- 5 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e413ae6..c3f5387 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -759,6 +759,9 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, HWND window, BOOL static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, DWORD cooplevel) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + struct wined3d_stateblock *stateblock; + struct wined3d_surface *rt, *ds; + BOOL restore_state = FALSE; HWND window; HRESULT hr; @@ -914,10 +917,66 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, wined3d_device_set_multithreaded(This->wined3d_device); if (This->wined3d_swapchain) + { + if (DefaultSurfaceType != SURFACE_GDI) + { + restore_state = TRUE; + + if (FAILED(hr = wined3d_stateblock_create(This->wined3d_device, WINED3DSBT_ALL, &stateblock))) + { + ERR("Failed to create stateblock, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + + if (FAILED(hr = wined3d_stateblock_capture(stateblock))) + { + ERR("Failed to capture stateblock, hr %#x.\n", hr); + wined3d_stateblock_decref(stateblock); + wined3d_mutex_unlock(); + return hr; + } + + wined3d_device_get_render_target(This->wined3d_device, 0, &rt); + if (rt == This->wined3d_frontbuffer) + { + wined3d_surface_decref(rt); + rt = NULL; + } + + wined3d_device_get_depth_stencil(This->wined3d_device, &ds); + } + ddraw_destroy_swapchain(This); + } + if (FAILED(hr = ddraw_create_swapchain(This, This->dest_window, !(cooplevel & DDSCL_FULLSCREEN)))) ERR("Failed to create swapchain, hr %#x.\n", hr); + if (restore_state) + { + if (ds) + { + wined3d_device_set_depth_stencil(This->wined3d_device, ds); + wined3d_surface_decref(ds); + } + + if (rt) + { + wined3d_device_set_render_target(This->wined3d_device, 0, rt, FALSE); + wined3d_surface_decref(rt); + } + + hr = wined3d_stateblock_apply(stateblock); + wined3d_stateblock_decref(stateblock); + if (FAILED(hr)) + { + ERR("Failed to apply stateblock, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } + } + /* Unhandled flags */ if(cooplevel & DDSCL_ALLOWREBOOT) WARN("(%p) Unhandled flag DDSCL_ALLOWREBOOT, harmless\n", This); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d9620d2..7981c84 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -575,7 +575,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice_DeleteViewport(device, viewport); ok(SUCCEEDED(hr), "Failed to delete viewport, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f6b5538..824ddb1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -593,14 +593,14 @@ static void test_coop_level_d3d_state(void) ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); - todo_wine ok(!!value, "Got unexpected z-enable state %#x.\n", value); + ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice2_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); - todo_wine ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); + ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice2_DeleteViewport(device, viewport); ok(SUCCEEDED(hr), "Failed to delete viewport, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9e263fe..68a478f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -784,14 +784,14 @@ static void test_coop_level_d3d_state(void) ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); - todo_wine ok(!!value, "Got unexpected z-enable state %#x.\n", value); + ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); - todo_wine ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); + ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DViewport3_Clear2(viewport, 1, &clear_rect, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice3_DeleteViewport(device, viewport); ok(SUCCEEDED(hr), "Failed to delete viewport, hr %#x.\n", hr); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 51fd618..d5477f0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -754,14 +754,14 @@ static void test_coop_level_d3d_state(void) ok(surface == rt, "Got unexpected surface %p.\n", surface); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); - todo_wine ok(!!value, "Got unexpected z-enable state %#x.\n", value); + ok(!!value, "Got unexpected z-enable state %#x.\n", value); hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, &value); ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); - todo_wine ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); + ok(!!value, "Got unexpected alpha blend enable state %#x.\n", value); hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - todo_wine ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); IDirectDrawSurface7_Release(surface); IDirectDrawSurface7_Release(rt);

1 0

Henri Verbeet : ddraw/tests: Add some tests to show that we should maintain D3D state across cooperative level chnages .
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: dfa7e9b56337a5e919e8dabb369e9e64d7c946fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa7e9b56337a5e919e8dabb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:34 2012 +0100 ddraw/tests: Add some tests to show that we should maintain D3D state across cooperative level chnages. --- dlls/ddraw/tests/ddraw1.c | 229 +++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 247 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 143 ++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 117 +++++++++++++++++++++- 4 files changed, 734 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfa7e9b56337a5e919e8d…

1 0

Henri Verbeet : ddraw/tests: Add a border around the blitted source data in test_clipper_blt().
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 1acd8278c860f19b59c741536b9ab9f02d29780f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1acd8278c860f19b59c741536… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:33 2012 +0100 ddraw/tests: Add a border around the blitted source data in test_clipper_blt(). Some drivers use the neighbouring pixels in the interpolation. You can probably argue about whether that's right or wrong, but it's really not what we're trying to test in either case. --- dlls/ddraw/tests/ddraw1.c | 18 +++++++++++++----- dlls/ddraw/tests/ddraw2.c | 18 +++++++++++++----- dlls/ddraw/tests/ddraw4.c | 18 +++++++++++++----- dlls/ddraw/tests/ddraw7.c | 18 +++++++++++++----- 4 files changed, 52 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 846ca19..7ba5de1 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -173,8 +173,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret; + static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -285,17 +292,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr); hr = IDirectDrawSurface_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr); - SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d94af1a..a0a26ee 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -180,8 +180,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret; + static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -292,17 +299,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr); hr = IDirectDrawSurface_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr); - SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 144f372..bf81412 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -476,8 +476,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret; + static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -587,17 +594,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface4_Lock(src_surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface4_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr); - SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface4_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index f130c01..84bae12 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -469,8 +469,15 @@ static void test_clipper_blt(void) HWND window; DDBLTFX fx; HRESULT hr; + DWORD *ptr; DWORD ret; + static const DWORD src_data[] = + { + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xffff0000, 0xffffffff, 0xffffffff, + }; static const D3DCOLOR expected1[] = { 0x000000ff, 0x0000ff00, 0x00000000, 0x00000000, @@ -580,17 +587,18 @@ static void test_clipper_blt(void) hr = IDirectDrawSurface7_Lock(src_surface, NULL, &surface_desc, 0, NULL); ok(SUCCEEDED(hr), "Failed to lock source surface, hr %#x.\n", hr); - ((DWORD *)surface_desc.lpSurface)[0] = 0xff0000ff; - ((DWORD *)surface_desc.lpSurface)[1] = 0xff00ff00; - ((DWORD *)surface_desc.lpSurface)[2] = 0xffff0000; - ((DWORD *)surface_desc.lpSurface)[3] = 0xffffffff; + ok(surface_desc.lPitch == 2560, "Got unexpected surface pitch %u.\n", surface_desc.lPitch); + ptr = surface_desc.lpSurface; + memcpy(&ptr[ 0], &src_data[ 0], 6 * sizeof(DWORD)); + memcpy(&ptr[ 640], &src_data[ 6], 6 * sizeof(DWORD)); + memcpy(&ptr[1280], &src_data[12], 6 * sizeof(DWORD)); hr = IDirectDrawSurface7_Unlock(src_surface, NULL); ok(SUCCEEDED(hr), "Failed to unlock source surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_SetClipper(dst_surface, clipper); ok(SUCCEEDED(hr), "Failed to set clipper, hr %#x.\n", hr); - SetRect(&src_rect, 0, 0, 4, 1); + SetRect(&src_rect, 1, 1, 5, 2); hr = IDirectDrawSurface7_Blt(dst_surface, NULL, src_surface, &src_rect, DDBLT_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to blit, hr %#x.\n", hr); for (i = 0; i < 4; ++i)

1 0

Henri Verbeet : ddraw: Allow querying the surface interface if a device was created from a surface .
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: cf636cc3b3b1de0d966d43e04314a0454fc055a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf636cc3b3b1de0d966d43e04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:32 2012 +0100 ddraw: Allow querying the surface interface if a device was created from a surface. --- dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/surface.c | 1 + 3 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index c23007e..2e5b65b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -299,6 +299,8 @@ struct IDirect3DDeviceImpl /* Required to keep track which of two available texture blending modes in d3ddevice3 is used */ BOOL legacyTextureBlending; + BOOL from_surface; + D3DMATRIX legacy_projection; D3DMATRIX legacy_clipspace; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7e935e5..a056d9d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -179,6 +179,13 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, TRACE("(%p) Returning IDirect3DDevice7 interface at %p\n", This, *obj); } + /* DirectDrawSurface */ + else if (IsEqualGUID(&IID_IDirectDrawSurface, refiid) && This->from_surface) + { + *obj = &This->target->IDirectDrawSurface_iface; + TRACE("Returning IDirectDrawSurface interface %p.\n", *obj); + } + /* Unknown interface */ else { diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f1477f4..e57762c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -199,6 +199,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, if (d3d) { device_impl = impl_from_IDirect3DDevice7(d3d); + device_impl->from_surface = TRUE; *obj = &device_impl->IDirect3DDevice_iface; TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); return S_OK;

1 0

Henri Verbeet : wined3d: Reset the changed float shader constants in stateblock_init_default_state( ).
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: c70e17e8060c4537523d767b0fffa4ec707487b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70e17e8060c4537523d767b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:31 2012 +0100 wined3d: Reset the changed float shader constants in stateblock_init_default_state(). The GLSL constant tracking needs these to be correct. --- dlls/wined3d/stateblock.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9a109ed..59bb841 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1107,6 +1107,9 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) stateblock->blockType = WINED3DSBT_INIT; + memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL)); + memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); + /* Set some of the defaults for lights, transforms etc */ memcpy(&state->transforms[WINED3D_TS_PROJECTION], identity, sizeof(identity)); memcpy(&state->transforms[WINED3D_TS_VIEW], identity, sizeof(identity));

1 0

Henri Verbeet : wined3d: Don't print an ERR if the depth/ stencil surface still has references in wined3d_device_uninit_3d().
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 59df293640fbb9e89ff0a5674bceb5fd8a131bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=59df293640fbb9e89ff0a5674… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 17 21:13:30 2012 +0100 wined3d: Don't print an ERR if the depth/stencil surface still has references in wined3d_device_uninit_3d(). This is completely legitimate in ddraw. --- dlls/wined3d/device.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a68fb6d..84e0db0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1493,9 +1493,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) TRACE("Releasing depth/stencil buffer %p.\n", surface); device->fb.depth_stencil = NULL; - if (wined3d_surface_decref(surface) - && surface != device->auto_depth_stencil) - ERR("Something is still holding a reference to depth/stencil buffer %p.\n", surface); + wined3d_surface_decref(surface); } if (device->auto_depth_stencil)

1 0

Nikolay Sivov : msi: Support test for aplicable patch of MSIPATCH_DATATYPE_XMLPATH type.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 3b60c2c0d1eaa2634cbf32a49df2f32f8e36eb9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b60c2c0d1eaa2634cbf32a49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 17 23:46:16 2012 +0300 msi: Support test for aplicable patch of MSIPATCH_DATATYPE_XMLPATH type. --- dlls/msi/msi.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 941a547..cc83e39 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -651,6 +651,7 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH } break; } + case MSIPATCH_DATATYPE_XMLPATH: case MSIPATCH_DATATYPE_XMLBLOB: { VARIANT_BOOL b; @@ -669,7 +670,16 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH } s = SysAllocString( info[i].szPatchData ); - hr = IXMLDOMDocument_loadXML( desc, s, &b ); + if (info[i].ePatchDataType == MSIPATCH_DATATYPE_XMLPATH) + { + VARIANT src; + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = s; + hr = IXMLDOMDocument_load( desc, src, &b ); + } + else + hr = IXMLDOMDocument_loadXML( desc, s, &b ); SysFreeString( s ); if ( hr != S_OK ) { @@ -692,7 +702,7 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH } default: { - FIXME("patch data type %u not supported\n", info[i].ePatchDataType); + FIXME("unknown patch data type %u\n", info[i].ePatchDataType); info[i].dwOrder = i; info[i].uStatus = ERROR_SUCCESS; break;

1 0

Nikolay Sivov : msi: Support MSIPATCH_DATATYPE_XMLBLOB when testing for applicable patch.
by Alexandre Julliard 18 Jan '12

18 Jan '12

Module: wine Branch: master Commit: 123eba280124f4f3a520a333fed8119bd560c09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=123eba280124f4f3a520a333f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 17 22:07:11 2012 +0300 msi: Support MSIPATCH_DATATYPE_XMLBLOB when testing for applicable patch. --- dlls/msi/msi.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index fd2315f..941a547 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -42,6 +42,9 @@ #include "wintrust.h" #include "softpub.h" +#include "initguid.h" +#include "msxml2.h" + #include "wine/debug.h" #include "wine/unicode.h" @@ -304,7 +307,6 @@ done: return r; } - static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_codes ) { MSIHANDLE patch, info = 0; @@ -580,17 +582,63 @@ static UINT MSI_ApplicablePatchW( MSIPACKAGE *package, LPCWSTR patch ) return r; } +/* IXMLDOMDocument should be set to XPath mode already */ +static UINT MSI_ApplicablePatchXML( MSIPACKAGE *package, IXMLDOMDocument *desc ) +{ + static const WCHAR queryW[] = {'M','s','i','P','a','t','c','h','/', + 'T','a','r','g','e','t','P','r','o','d','u','c','t','/', + 'T','a','r','g','e','t','P','r','o','d','u','c','t','C','o','d','e',0}; + UINT r = ERROR_FUNCTION_FAILED; + IXMLDOMNodeList *list; + LPWSTR product_code; + IXMLDOMNode *node; + HRESULT hr; + BSTR s; + + product_code = msi_dup_property( package->db, szProductCode ); + if (!product_code) + { + /* FIXME: the property ProductCode should be written into the DB somewhere */ + ERR("no product code to check\n"); + return ERROR_SUCCESS; + } + + s = SysAllocString(queryW); + hr = IXMLDOMDocument_selectNodes( desc, s, &list ); + SysFreeString(s); + if (hr != S_OK) + return ERROR_INVALID_PATCH_XML; + + while (IXMLDOMNodeList_nextNode( list, &node ) == S_OK && r != ERROR_SUCCESS) + { + hr = IXMLDOMNode_get_text( node, &s ); + IXMLDOMNode_Release( node ); + if (!strcmpW( s, product_code )) r = ERROR_SUCCESS; + SysFreeString(s); + } + IXMLDOMNodeList_Release( list ); + + if (r != ERROR_SUCCESS) + TRACE("patch not applicable\n"); + + msi_free( product_code ); + return r; +} + static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCHSEQUENCEINFOW *info ) { + IXMLDOMDocument *desc = NULL; DWORD i; + if (count > 1) + FIXME("patch ordering not supported\n"); + for (i = 0; i < count; i++) { switch (info[i].ePatchDataType) { case MSIPATCH_DATATYPE_PATCHFILE: { - FIXME("patch ordering not supported\n"); if (MSI_ApplicablePatchW( package, info[i].szPatchData ) != ERROR_SUCCESS) { info[i].dwOrder = ~0u; @@ -603,6 +651,45 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH } break; } + case MSIPATCH_DATATYPE_XMLBLOB: + { + VARIANT_BOOL b; + HRESULT hr; + BSTR s; + + if (!desc) + { + hr = CoCreateInstance( &CLSID_DOMDocument30, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument, (void**)&desc ); + if (hr != S_OK) + { + ERR("failed to create DOMDocument30 instance, 0x%08x\n", hr); + return ERROR_FUNCTION_FAILED; + } + } + + s = SysAllocString( info[i].szPatchData ); + hr = IXMLDOMDocument_loadXML( desc, s, &b ); + SysFreeString( s ); + if ( hr != S_OK ) + { + ERR("failed to parse patch description\n"); + IXMLDOMDocument_Release( desc ); + break; + } + + if (MSI_ApplicablePatchXML( package, desc ) != ERROR_SUCCESS) + { + info[i].dwOrder = ~0u; + info[i].uStatus = ERROR_PATCH_TARGET_NOT_FOUND; + } + else + { + info[i].dwOrder = i; + info[i].uStatus = ERROR_SUCCESS; + } + break; + } default: { FIXME("patch data type %u not supported\n", info[i].ePatchDataType); @@ -611,11 +698,15 @@ static UINT determine_patch_sequence( MSIPACKAGE *package, DWORD count, MSIPATCH break; } } + TRACE("szPatchData: %s\n", debugstr_w(info[i].szPatchData)); TRACE("ePatchDataType: %u\n", info[i].ePatchDataType); TRACE("dwOrder: %u\n", info[i].dwOrder); TRACE("uStatus: %u\n", info[i].uStatus); } + + if (desc) IXMLDOMDocument_Release( desc ); + return ERROR_SUCCESS; }

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
98
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 January 2012