January 2012 - Wine-commits

Stefan Dösinger : ddraw: Properly set the color key in texture::load.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 551c732d744d3f5991af114b3157b641ccdcbac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551c732d744d3f5991af114b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:16 2012 +0100 ddraw: Properly set the color key in texture::load. --- dlls/ddraw/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ced64a9..2e97510 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4967,12 +4967,12 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu { struct wined3d_mapped_rect src_rect, dst_rect; - /* Copy also the ColorKeying stuff */ + /* Copy the src blit color key if the source has one, don't erase + * the destination's ckey if the source has none */ if (src_desc->dwFlags & DDSD_CKSRCBLT) { - dst_desc->dwFlags |= DDSD_CKSRCBLT; - dst_desc->ddckCKSrcBlt.dwColorSpaceLowValue = src_desc->ddckCKSrcBlt.dwColorSpaceLowValue; - dst_desc->ddckCKSrcBlt.dwColorSpaceHighValue = src_desc->ddckCKSrcBlt.dwColorSpaceHighValue; + IDirectDrawSurface7_SetColorKey(&dst_surface->IDirectDrawSurface7_iface, + DDCKEY_SRCBLT, &src_desc->ddckCKSrcBlt); } /* Copy the main memory texture into the surface that corresponds

1 0

Stefan Dösinger : ddraw/tests: Add an IDirect3DTexture ::Load color key test.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 2bd56ac5530e8200082c6898d63da507192bd779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd56ac5530e8200082c6898d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:17 2012 +0100 ddraw/tests: Add an IDirect3DTexture::Load color key test. --- dlls/ddraw/tests/ddraw2.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3a62f57..c84e5e9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1078,6 +1078,106 @@ static void test_depth_blit(void) DestroyWindow(window); } +static void test_texture_load_ckey(void) +{ + IDirectDraw2 *ddraw = NULL; + IDirectDrawSurface *src = NULL; + IDirectDrawSurface *dst = NULL; + IDirect3DTexture *src_tex = NULL; + IDirect3DTexture *dst_tex = NULL; + DDSURFACEDESC ddsd; + HRESULT hr; + DDCOLORKEY ckey; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create ddraw object, skipping test.\n"); + return; + } + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface_QueryInterface(src, &IID_IDirect3DTexture, (void **)&src_tex); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#x.\n", hr); + if (FAILED(hr)) + { + /* 64 bit ddraw does not support d3d */ + skip("Could not get Direct3DTexture interface, skipping texture::Load color keying tests.\n"); + goto done; + } + hr = IDirectDrawSurface_QueryInterface(dst, &IID_IDirect3DTexture, (void **)&dst_tex); + ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr); + + /* No surface has a color key */ + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDCAPS), "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + /* Testbot Windows NT VMs */ + skip("IDirect3DTexture::Load does not work, skipping color keying tests.\n"); + goto done; + } + + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0xdeadbeef; + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0xdeadbeef, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0xdeadbeef, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Source surface has a color key */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface_SetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Both surfaces have a color key: Dest ckey is overwritten */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Only the destination has a color key: It is not deleted */ + hr = IDirectDrawSurface_SetColorKey(src, DDCKEY_SRCBLT, NULL); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + +done: + if (dst_tex) IDirect3DTexture_Release(dst_tex); + if (src_tex) IDirect3DTexture_Release(src_tex); + if (dst) IDirectDrawSurface_Release(dst); + if (src) IDirectDrawSurface_Release(src); + if (ddraw) IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -1086,4 +1186,5 @@ START_TEST(ddraw2) test_surface_interface_mismatch(); test_coop_level_threaded(); test_depth_blit(); + test_texture_load_ckey(); }

1 0

Stefan Dösinger : ddraw/tests: Add an IDirect3DTexture2::Load color key test.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: cfc9e120ae46163f754983c72b65cdd73870bac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc9e120ae46163f754983c72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:18 2012 +0100 ddraw/tests: Add an IDirect3DTexture2::Load color key test. --- dlls/ddraw/tests/ddraw4.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b242f86..6e7490b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1214,6 +1214,101 @@ static void test_depth_blit(void) DestroyWindow(window); } +static void test_texture_load_ckey(void) +{ + IDirectDraw4 *ddraw; + IDirectDrawSurface4 *src; + IDirectDrawSurface4 *dst; + IDirect3DTexture2 *src_tex; + IDirect3DTexture2 *dst_tex; + DDSURFACEDESC2 ddsd; + HRESULT hr; + DDCOLORKEY ckey; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create ddraw object, skipping test.\n"); + return; + } + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_QueryInterface(src, &IID_IDirect3DTexture2, (void **)&src_tex); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture2 interface, hr %#x.\n", hr); + if (FAILED(hr)) + { + /* 64 bit ddraw does not support d3d */ + skip("Could not get Direct3DTexture2 interface, skipping texture::Load color keying tests.\n"); + IDirectDrawSurface4_Release(dst); + IDirectDrawSurface4_Release(src); + IDirectDraw4_Release(ddraw); + return; + } + hr = IDirectDrawSurface4_QueryInterface(dst, &IID_IDirect3DTexture2, (void **)&dst_tex); + ok(SUCCEEDED(hr), "Failed to get Direct3DTexture2 interface, hr %#x.\n", hr); + + /* No surface has a color key */ + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0xdeadbeef; + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0xdeadbeef, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0xdeadbeef, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Source surface has a color key */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface4_SetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Both surfaces have a color key: Dest ckey is overwritten */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface4_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Only the destination has a color key: It is not deleted */ + hr = IDirectDrawSurface4_SetColorKey(src, DDCKEY_SRCBLT, NULL); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + IDirect3DTexture2_Release(dst_tex); + IDirect3DTexture2_Release(src_tex); + IDirectDrawSurface4_Release(dst); + IDirectDrawSurface4_Release(src); + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -1223,4 +1318,5 @@ START_TEST(ddraw4) test_surface_interface_mismatch(); test_coop_level_threaded(); test_depth_blit(); + test_texture_load_ckey(); }

1 0

Stefan Dösinger : ddraw/tests: Port the depth blit test to ddraw4.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: b16248898b5299a09c17d057a8ae8c698d810308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16248898b5299a09c17d057a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 30 08:41:58 2012 +0100 ddraw/tests: Port the depth blit test to ddraw4. --- dlls/ddraw/tests/ddraw4.c | 209 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 209 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3471779..34cab7f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1004,6 +1004,214 @@ static void test_coop_level_threaded(void) destroy_window_thread(&p); } +static IDirectDrawSurface4 *get_depth_stencil(IDirect3DDevice3 *device) +{ + IDirectDrawSurface4 *rt, *ret; + DDSCAPS2 caps = {DDSCAPS_ZBUFFER, 0, 0, 0}; + HRESULT hr; + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get the render target, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(rt, &caps, &ret); + ok(SUCCEEDED(hr) || hr == DDERR_NOTFOUND, "Failed to get the z buffer, hr %#x.\n", hr); + IDirectDrawSurface4_Release(rt); + return ret; +} + +static void test_depth_blit(void) +{ + static struct + { + float x, y, z; + DWORD color; + } + quad1[] = + { + { -1.0, 1.0, 0.50f, 0xff00ff00}, + { 1.0, 1.0, 0.50f, 0xff00ff00}, + { -1.0, -1.0, 0.50f, 0xff00ff00}, + { 1.0, -1.0, 0.50f, 0xff00ff00}, + }; + static const D3DCOLOR expected_colors[4][4] = + { + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x00ff0000, 0x00ff0000, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + }; + DDSURFACEDESC2 ddsd_new, ddsd_existing; + + IDirect3DDevice3 *device; + IDirectDrawSurface4 *ds1, *ds2, *ds3, *rt; + IDirect3DViewport3 *viewport; + D3DVIEWPORT2 vp_data; + RECT src_rect, dst_rect; + unsigned int i, j; + D3DCOLOR color; + HRESULT hr; + IDirect3D3 *d3d; + IDirectDraw4 *ddraw; + DDBLTFX fx; + HWND window; + D3DRECT d3drect; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); + hr = IDirect3D3_CreateViewport(d3d, &viewport, NULL); + ok(SUCCEEDED(hr), "Failed to create a viewport, hr %#x.\n", hr); + IDirect3D3_Release(d3d); + + ds1 = get_depth_stencil(device); + + memset(&ddsd_new, 0, sizeof(ddsd_new)); + ddsd_new.dwSize = sizeof(ddsd_new); + memset(&ddsd_existing, 0, sizeof(ddsd_existing)); + ddsd_existing.dwSize = sizeof(ddsd_existing); + hr = IDirectDrawSurface4_GetSurfaceDesc(ds1, &ddsd_existing); + ddsd_new.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + ddsd_new.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; + ddsd_new.dwWidth = ddsd_existing.dwWidth; + ddsd_new.dwHeight = ddsd_existing.dwHeight; + U4(ddsd_new).ddpfPixelFormat = U4(ddsd_existing).ddpfPixelFormat; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd_new, &ds2, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd_new, &ds3, NULL); + ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + IDirectDraw4_Release(ddraw); + + hr = IDirect3DDevice3_AddViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to add viewport to device, hr %#x.\n", hr); + memset(&vp_data, 0, sizeof(vp_data)); + vp_data.dwSize = sizeof(vp_data); + vp_data.dwWidth = ddsd_existing.dwWidth; + vp_data.dwHeight = ddsd_existing.dwHeight; + vp_data.dvMaxZ = 1.0; + vp_data.dvClipX = -1.0f; + vp_data.dvClipWidth = 2.0f; + vp_data.dvClipY = 1.0f; + vp_data.dvClipHeight = 2.0f; + hr = IDirect3DViewport3_SetViewport2(viewport, &vp_data); + ok(SUCCEEDED(hr), "Failed to set viewport data, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetCurrentViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to activate the viewport, hr %#x.\n", hr); + + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "Failed to enable z testing, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "Failed to set the z function, hr %#x.\n", hr); + hr = IDirect3DDevice3_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + U1(d3drect).x1 = U2(d3drect).y1 = 0; + U3(d3drect).x2 = vp_data.dwWidth; U4(d3drect).y2 = vp_data.dwHeight; + hr = IDirect3DViewport3_Clear2(viewport, 1, &d3drect, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the z buffer, hr %#x.\n", hr); + + /* Partial blit. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Different locations. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 320, 240, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Streched. */ + SetRect(&src_rect, 0, 0, 320, 240); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Flipped. */ + SetRect(&src_rect, 0, 480, 640, 0); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 480, 640, 0); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(hr == DDERR_INVALIDRECT, "Got unexpected hr %#x.\n", hr); + /* Full, explicit. */ + SetRect(&src_rect, 0, 0, 640, 480); + SetRect(&dst_rect, 0, 0, 640, 480); + hr = IDirectDrawSurface4_Blt(ds2, &dst_rect, ds1, &src_rect, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Depth -> color blit: Succeeds on Win7 + Radeon HD 5700, fails on WinXP + Radeon X1600 */ + + /* Depth blit inside a BeginScene / EndScene pair */ + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start a scene, hr %#x.\n", hr); + /* From the current depth stencil */ + hr = IDirectDrawSurface4_Blt(ds2, NULL, ds1, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* To the current depth stencil */ + hr = IDirectDrawSurface4_Blt(ds1, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + /* Between unbound surfaces */ + hr = IDirectDrawSurface4_Blt(ds3, NULL, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end a scene, hr %#x.\n", hr); + + /* Avoid changing the depth stencil, it doesn't work properly on Windows. + * Instead use DDBLT_DEPTHFILL to clear the depth stencil. Unfortunately + * drivers disagree on the meaning of dwFillDepth. Only 0 seems to produce + * a reliable result(z = 0.0) */ + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + hr = IDirectDrawSurface4_Blt(ds2, NULL, NULL, NULL, DDBLT_DEPTHFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to clear the source z buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport3_Clear2(viewport, 1, &d3drect, D3DCLEAR_ZBUFFER | D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear the color and z buffers, hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 320, 240); + hr = IDirectDrawSurface4_Blt(ds1, &dst_rect, ds2, NULL, DDBLT_WAIT, NULL); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface4_Release(ds3); + IDirectDrawSurface4_Release(ds2); + IDirectDrawSurface4_Release(ds1); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to start a scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, + quad1, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end a scene, hr %#x.\n", hr); + + hr = IDirect3DDevice3_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = get_surface_color(rt, x, y); + ok(compare_color(color, expected_colors[i][j], 1), + "Expected color 0x%08x at %u,%u, got 0x%08x.\n", expected_colors[i][j], x, y, color); + } + } + IDirectDrawSurface4_Release(rt); + + hr = IDirect3DDevice3_DeleteViewport(device, viewport); + ok(SUCCEEDED(hr), "Failed to delete viewport from device, hr %#x.\n", hr); + IDirect3DViewport3_Release(viewport); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -1012,4 +1220,5 @@ START_TEST(ddraw4) test_coop_level_d3d_state(); test_surface_interface_mismatch(); test_coop_level_threaded(); + test_depth_blit(); }

1 0

Stefan Dösinger : ddraw/tests: Port the depth blit test to ddraw2.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 60ef7e0bd4d3f0c1f17364edfbe7d5f3d29243ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=60ef7e0bd4d3f0c1f17364edf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 30 08:41:59 2012 +0100 ddraw/tests: Port the depth blit test to ddraw2. --- dlls/ddraw/tests/ddraw2.c | 239 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 239 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=60ef7e0bd4d3f0c1f1736…

1 0

Nikolay Sivov : msxml3: Trace VARIANT parameters.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: d56070a233b091dd40fec8375ede7527bde670cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56070a233b091dd40fec8375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 12:40:22 2012 +0300 msxml3: Trace VARIANT parameters. --- dlls/msxml3/domdoc.c | 48 ++++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1ae0d56..64122ce 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1000,7 +1000,7 @@ static HRESULT WINAPI domdoc_put_nodeValue( VARIANT value) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(v%d)\n", This, V_VT(&value)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); return E_FAIL; } @@ -1110,7 +1110,7 @@ static HRESULT WINAPI domdoc_insertBefore( { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(%p x%d %p)\n", This, newChild, V_VT(&refChild), outNewChild); + TRACE("(%p)->(%p %s %p)\n", This, newChild, debugstr_variant(&refChild), outNewChild); return node_insert_before(&This->node, newChild, &refChild, outNewChild); } @@ -1868,7 +1868,7 @@ static HRESULT WINAPI domdoc_createNode( xmlChar *xml_name, *href; HRESULT hr; - TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(name), debugstr_w(namespaceURI), node); + TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_variant(&Type), debugstr_w(name), debugstr_w(namespaceURI), node); if(!node) return E_INVALIDARG; @@ -2503,21 +2503,17 @@ static HRESULT WINAPI domdoc_put_onreadystatechange( } -static HRESULT WINAPI domdoc_put_onDataAvailable( - IXMLDOMDocument3 *iface, - VARIANT onDataAvailableSink ) +static HRESULT WINAPI domdoc_put_onDataAvailable(IXMLDOMDocument3 *iface, VARIANT sink) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("%p\n", This); + FIXME("(%p)->(%s): stub\n", This, debugstr_variant(&sink)); return E_NOTIMPL; } -static HRESULT WINAPI domdoc_put_onTransformNode( - IXMLDOMDocument3 *iface, - VARIANT onTransformNodeSink ) +static HRESULT WINAPI domdoc_put_onTransformNode(IXMLDOMDocument3 *iface, VARIANT sink ) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - FIXME("%p\n", This); + FIXME("(%p)->(%s): stub\n", This, debugstr_variant(&sink)); return E_NOTIMPL; } @@ -2573,21 +2569,21 @@ static HRESULT WINAPI domdoc_get_schemas( static HRESULT WINAPI domdoc_putref_schemas( IXMLDOMDocument3* iface, - VARIANT var1) + VARIANT schema) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); HRESULT hr = E_FAIL; IXMLDOMSchemaCollection2* new_schema = NULL; - FIXME("(%p): semi-stub\n", This); - switch(V_VT(&var1)) + FIXME("(%p)->(%s): semi-stub\n", This, debugstr_variant(&schema)); + switch(V_VT(&schema)) { case VT_UNKNOWN: - hr = IUnknown_QueryInterface(V_UNKNOWN(&var1), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + hr = IUnknown_QueryInterface(V_UNKNOWN(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); break; case VT_DISPATCH: - hr = IDispatch_QueryInterface(V_DISPATCH(&var1), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); + hr = IDispatch_QueryInterface(V_DISPATCH(&schema), &IID_IXMLDOMSchemaCollection, (void**)&new_schema); break; case VT_NULL: @@ -2596,7 +2592,7 @@ static HRESULT WINAPI domdoc_putref_schemas( break; default: - WARN("Can't get schema from vt %x\n", V_VT(&var1)); + WARN("Can't get schema from vt %x\n", V_VT(&schema)); } if(SUCCEEDED(hr)) @@ -2766,11 +2762,11 @@ static HRESULT WINAPI domdoc_validate( static HRESULT WINAPI domdoc_setProperty( IXMLDOMDocument3* iface, BSTR p, - VARIANT var) + VARIANT value) { domdoc *This = impl_from_IXMLDOMDocument3( iface ); - TRACE("(%p)->(%s)\n", This, debugstr_w(p)); + TRACE("(%p)->(%s %s)\n", This, debugstr_w(p), debugstr_variant(&value)); if (lstrcmpiW(p, PropertySelectionLanguageW) == 0) { @@ -2779,14 +2775,14 @@ static HRESULT WINAPI domdoc_setProperty( BSTR bstr; V_VT(&varStr) = VT_EMPTY; - if (V_VT(&var) != VT_BSTR) + if (V_VT(&value) != VT_BSTR) { - if (FAILED(hr = VariantChangeType(&varStr, &var, 0, VT_BSTR))) + if (FAILED(hr = VariantChangeType(&varStr, &value, 0, VT_BSTR))) return hr; bstr = V_BSTR(&varStr); } else - bstr = V_BSTR(&var); + bstr = V_BSTR(&value); hr = S_OK; if (lstrcmpiW(bstr, PropValueXPathW) == 0) @@ -2808,14 +2804,14 @@ static HRESULT WINAPI domdoc_setProperty( BSTR bstr; V_VT(&varStr) = VT_EMPTY; - if (V_VT(&var) != VT_BSTR) + if (V_VT(&value) != VT_BSTR) { - if (FAILED(hr = VariantChangeType(&varStr, &var, 0, VT_BSTR))) + if (FAILED(hr = VariantChangeType(&varStr, &value, 0, VT_BSTR))) return hr; bstr = V_BSTR(&varStr); } else - bstr = V_BSTR(&var); + bstr = V_BSTR(&value); hr = S_OK; @@ -2933,7 +2929,7 @@ static HRESULT WINAPI domdoc_setProperty( lstrcmpiW(p, PropertyResolveExternalsW) == 0) { /* Ignore */ - FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&var)); + FIXME("Ignoring property %s, value %d\n", debugstr_w(p), V_BOOL(&value)); return S_OK; }

1 0

Erich Hoover : crypt32: Fix domain component length check.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: bfa2c5ea98b007e0081b025902165a0eeb9aca0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa2c5ea98b007e0081b02590… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Jan 29 12:25:59 2012 -0700 crypt32: Fix domain component length check. --- dlls/crypt32/chain.c | 5 + dlls/crypt32/tests/chain.c | 237 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 242 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bfa2c5ea98b007e0081b0…

1 0

Alexandre Julliard : dinput: Catch unsuccessful clipping attempts and fall back to warping.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: b0657c8623e7ed8745ffb87b3ed47afb55589bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0657c8623e7ed8745ffb87b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 17:46:23 2012 +0100 dinput: Catch unsuccessful clipping attempts and fall back to warping. --- dlls/dinput/mouse.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 20de328..ead6c25 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -421,7 +421,7 @@ static void warp_check( SysMouseImpl* This, BOOL force ) if (force || (This->need_warp && (now - This->last_warped > interval))) { - RECT rect; + RECT rect, new_rect; POINT mapped_center; This->last_warped = now; @@ -442,7 +442,8 @@ static void warp_check( SysMouseImpl* This, BOOL force ) rect.right = min( rect.right, rect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ) - 2 ); rect.bottom = min( rect.bottom, rect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ) - 2 ); TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect )); - This->clipped = ClipCursor( &rect ); + ClipCursor( &rect ); + This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); } } }

1 0

Alexandre Julliard : winex11: Disallow clipping to fullscreen rectangle if XInput2 is not available.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 1592b9c9de2338a70835ecbdd5a48318162b123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1592b9c9de2338a70835ecbdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 17:46:32 2012 +0100 winex11: Disallow clipping to fullscreen rectangle if XInput2 is not available. --- dlls/winex11.drv/mouse.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 07a420e..85df63b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -388,6 +388,11 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) /* don't clip to 1x1 rectangle if we don't have XInput */ if (clip->right - clip->left == 1 && clip->bottom - clip->top == 1) only_with_xinput = TRUE; + /* don't clip to fullscreen rectangle either (with 1-pixel offset to catch the dinput case) */ + if (clip->left <= virtual_screen_rect.left + 1 || clip->right >= virtual_screen_rect.right - 1 || + clip->top <= virtual_screen_rect.top + 1 || clip->bottom >= virtual_screen_rect.bottom - 1) + only_with_xinput = TRUE; + if (only_with_xinput && data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) );

1 0

Stefan Leichter : msi: Update version resource.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: f3caa7684695edb2aab932bd2987ff8f55af5932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3caa7684695edb2aab932bd2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jan 30 14:27:39 2012 +0100 msi: Update version resource. --- dlls/msi/msi.rc | 8 ++++---- programs/msiexec/rsrc.rc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index f58de7e..fd67807 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -77,9 +77,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine MSI dll" #define WINE_FILENAME_STR "msi.dll" -#define WINE_FILEVERSION 4,5,6001,22159 -#define WINE_FILEVERSION_STR "4.5.6001.22159" -#define WINE_PRODUCTVERSION 4,5,6001,22159 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22159" +#define WINE_FILEVERSION 4,5,6001,22299 +#define WINE_FILEVERSION_STR "4.5.6001.22299" +#define WINE_PRODUCTVERSION 4,5,6001,22299 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" #include "wine/wine_common_ver.rc" diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index 2594c51..b9994ef 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -21,10 +21,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 3,1,4000,1823 -#define WINE_FILEVERSION_STR "3.1.4000.1823" -#define WINE_PRODUCTVERSION 3,1,4000,1823 -#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" +#define WINE_FILEVERSION 4,5,6001,22299 +#define WINE_FILEVERSION_STR "4.5.6001.22299" +#define WINE_PRODUCTVERSION 4,5,6001,22299 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc"

1 0