April 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_load_renderbuffer().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: c4f7bdcfdd8fff986baa45d04646c2ce321764a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f7bdcfdd8fff986baa45d04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 18:34:39 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index aab5d73..af7bf68 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3193,7 +3193,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wined3d_context *context, DWORD dst_location) { - const RECT rect = {0, 0, surface->resource.width, surface->resource.height}; + struct wined3d_texture *texture = surface->container; + const RECT rect = {0, 0, + wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level)}; DWORD locations = surface_get_sub_resource(surface)->locations; DWORD src_location; @@ -3206,7 +3209,7 @@ static void surface_load_renderbuffer(struct wined3d_surface *surface, struct wi else /* surface_blt_fbo will load the source location if necessary. */ src_location = WINED3D_LOCATION_TEXTURE_RGB; - surface_blt_fbo(surface->container->resource.device, context, WINED3D_TEXF_POINT, + surface_blt_fbo(texture->resource.device, context, WINED3D_TEXF_POINT, surface, src_location, &rect, surface, dst_location, &rect); }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_load_location().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 8c30612d9984aed0c883aba3df38502d683468a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c30612d9984aed0c883aba3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 18:34:40 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index af7bf68..b8cb777 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3219,14 +3219,17 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); struct wined3d_texture *texture = surface->container; struct wined3d_texture_sub_resource *sub_resource; + unsigned int surface_w, surface_h; HRESULT hr; TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); + surface_w = wined3d_texture_get_level_width(texture, surface->texture_level); + surface_h = wined3d_texture_get_level_height(texture, surface->texture_level); + sub_resource = &texture->sub_resources[sub_resource_idx]; if (sub_resource->locations & location && (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) - || (surface->ds_current_size.cx == surface->resource.width - && surface->ds_current_size.cy == surface->resource.height))) + || (surface->ds_current_size.cx == surface_w && surface->ds_current_size.cy == surface_h))) { TRACE("Location (%#x) is already up to date.\n", location); return WINED3D_OK; @@ -3306,8 +3309,8 @@ done: if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - surface->ds_current_size.cx = surface->resource.width; - surface->ds_current_size.cy = surface->resource.height; + surface->ds_current_size.cx = surface_w; + surface->ds_current_size.cy = surface_h; } if (location != WINED3D_LOCATION_SYSMEM && (sub_resource->locations & WINED3D_LOCATION_SYSMEM))

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_surface_blt().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 3a06ade1c4ea7e1ad45f3d20a4ae97a36ce4f41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a06ade1c4ea7e1ad45f3d20a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 18:34:41 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_surface_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b8cb777..b2e5081 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4168,6 +4168,7 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst struct wined3d_device *device = dst_texture->resource.device; struct wined3d_swapchain *src_swapchain, *dst_swapchain; struct wined3d_texture *src_texture = NULL; + unsigned int dst_w, dst_h, src_w, src_h; unsigned int src_sub_resource_idx = 0; DWORD src_ds_flags, dst_ds_flags; BOOL scale, convert; @@ -4211,11 +4212,13 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst return WINEDDERR_SURFACEBUSY; } + dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level); + dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level); if (dst_rect->left >= dst_rect->right || dst_rect->top >= dst_rect->bottom - || dst_rect->left > dst_surface->resource.width || dst_rect->left < 0 - || dst_rect->top > dst_surface->resource.height || dst_rect->top < 0 - || dst_rect->right > dst_surface->resource.width || dst_rect->right < 0 - || dst_rect->bottom > dst_surface->resource.height || dst_rect->bottom < 0) + || dst_rect->left > dst_w || dst_rect->left < 0 + || dst_rect->top > dst_h || dst_rect->top < 0 + || dst_rect->right > dst_w || dst_rect->right < 0 + || dst_rect->bottom > dst_h || dst_rect->bottom < 0) { WARN("The application gave us a bad destination rectangle.\n"); return WINEDDERR_INVALIDRECT; @@ -4223,11 +4226,13 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst if (src_texture) { + src_w = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); + src_h = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); if (src_rect->left >= src_rect->right || src_rect->top >= src_rect->bottom - || src_rect->left > src_surface->resource.width || src_rect->left < 0 - || src_rect->top > src_surface->resource.height || src_rect->top < 0 - || src_rect->right > src_surface->resource.width || src_rect->right < 0 - || src_rect->bottom > src_surface->resource.height || src_rect->bottom < 0) + || src_rect->left > src_w || src_rect->left < 0 + || src_rect->top > src_h || src_rect->top < 0 + || src_rect->right > src_w || src_rect->right < 0 + || src_rect->bottom > src_h || src_rect->bottom < 0) { WARN("The application gave us a bad source rectangle.\n"); return WINEDDERR_INVALIDRECT;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in texture3d_prepare_texture().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 044b330ae1b7899d112d2cb9976fae1f63dec2d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=044b330ae1b7899d112d2cb99… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 18:34:42 2016 +0200 wined3d: Use the texture dimension helpers in texture3d_prepare_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index de3ed07..889d239 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1729,7 +1729,9 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal, - volume->resource.width, volume->resource.height, volume->resource.depth, + wined3d_texture_get_level_width(texture, volume->texture_level), + wined3d_texture_get_level_height(texture, volume->texture_level), + wined3d_texture_get_level_depth(texture, volume->texture_level), 0, format->glFormat, format->glType, NULL)); checkGLcall("glTexImage3D"); }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_texture_update_overlay().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 0be7f5deb16495556c7b40f10b13848af70d8f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be7f5deb16495556c7b40f10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 11 18:34:43 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_texture_update_overlay(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 889d239..c475970 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2038,13 +2038,17 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un if (src_rect) surface->overlay_srcrect = *src_rect; else - SetRect(&surface->overlay_srcrect, 0, 0, surface->resource.width, surface->resource.height); + SetRect(&surface->overlay_srcrect, 0, 0, + wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level)); dst_surface = dst_sub_resource->u.surface; if (dst_rect) surface->overlay_destrect = *dst_rect; else - SetRect(&surface->overlay_destrect, 0, 0, dst_surface->resource.width, dst_surface->resource.height); + SetRect(&surface->overlay_destrect, 0, 0, + wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level), + wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level)); if (surface->overlay_dest && (surface->overlay_dest != dst_surface || flags & WINEDDOVER_HIDE)) {

1 0

Stefan Dösinger : d3d9/tests: Add a system memory miptree layout test.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 301c9a4d5ce2124fe8e4bf4d6878f2958cfcfba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=301c9a4d5ce2124fe8e4bf4d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 11 18:34:44 2016 +0200 d3d9/tests: Add a system memory miptree layout test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9df199b..e6edb00 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -10904,6 +10904,151 @@ static void test_check_device_format(void) IDirect3D9_Release(d3d); } +static void test_miptree_layout(void) +{ + unsigned int pool_idx, format_idx, base_dimension, level_count, offset, i, j; + IDirect3DCubeTexture9 *texture_cube; + IDirect3DTexture9 *texture_2d; + IDirect3DDevice9 *device; + D3DLOCKED_RECT map_desc; + BYTE *base = NULL; + IDirect3D9 *d3d; + D3DCAPS9 caps; + UINT refcount; + HWND window; + HRESULT hr; + + static const struct + { + D3DFORMAT format; + const char *name; + } + formats[] = + { + {D3DFMT_A8R8G8B8, "D3DFMT_A8R8G8B8"}, + {D3DFMT_A8, "D3DFMT_A8"}, + {D3DFMT_L8, "D3DFMT_L8"}, + }; + static const struct + { + D3DPOOL pool; + const char *name; + } + pools[] = + { + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED"}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM"}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH"}, + }; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + + base_dimension = 257; + if (caps.TextureCaps & (D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_CUBEMAP_POW2)) + { + skip("Using power of two base dimension.\n"); + base_dimension = 256; + } + + for (format_idx = 0; format_idx < sizeof(formats) / sizeof(*formats); ++format_idx) + { + if (FAILED(hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, formats[format_idx].format))) + { + skip("%s textures not supported, skipping tests.\n", formats[format_idx].name); + continue; + } + + for (pool_idx = 0; pool_idx < sizeof(pools) / sizeof(*pools); ++pool_idx) + { + hr = IDirect3DDevice9_CreateTexture(device, base_dimension, base_dimension, 0, 0, + formats[format_idx].format, pools[pool_idx].pool, &texture_2d, NULL); + ok(SUCCEEDED(hr), "Failed to create a %s %s texture, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, hr); + + level_count = IDirect3DTexture9_GetLevelCount(texture_2d); + for (i = 0, offset = 0; i < level_count; ++i) + { + hr = IDirect3DTexture9_LockRect(texture_2d, i, &map_desc, NULL, 0); + ok(SUCCEEDED(hr), "%s, %s: Failed to lock level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, hr); + + if (!i) + base = map_desc.pBits; + else + todo_wine ok(map_desc.pBits == base + offset, + "%s, %s, level %u: Got unexpected pBits %p, expected %p.\n", + pools[pool_idx].name, formats[format_idx].name, i, map_desc.pBits, base + offset); + offset += (base_dimension >> i) * map_desc.Pitch; + + hr = IDirect3DTexture9_UnlockRect(texture_2d, i); + ok(SUCCEEDED(hr), "%s, %s Failed to unlock level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, hr); + } + + IDirect3DTexture9_Release(texture_2d); + } + + if (FAILED(hr = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, formats[format_idx].format))) + { + skip("%s cube textures not supported, skipping tests.\n", formats[format_idx].name); + continue; + } + + for (pool_idx = 0; pool_idx < sizeof(pools) / sizeof(*pools); ++pool_idx) + { + hr = IDirect3DDevice9_CreateCubeTexture(device, base_dimension, 0, 0, + formats[format_idx].format, pools[pool_idx].pool, &texture_cube, NULL); + ok(SUCCEEDED(hr), "Failed to create a %s %s cube texture, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, hr); + + level_count = IDirect3DCubeTexture9_GetLevelCount(texture_cube); + for (i = 0, offset = 0; i < 6; ++i) + { + for (j = 0; j < level_count; ++j) + { + hr = IDirect3DCubeTexture9_LockRect(texture_cube, i, j, &map_desc, NULL, 0); + ok(SUCCEEDED(hr), "%s, %s: Failed to lock face %u, level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, j, hr); + + if (!i && !j) + base = map_desc.pBits; + else + todo_wine ok(map_desc.pBits == base + offset, + "%s, %s, face %u, level %u: Got unexpected pBits %p, expected %p.\n", + pools[pool_idx].name, formats[format_idx].name, i, j, map_desc.pBits, base + offset); + offset += (base_dimension >> j) * map_desc.Pitch; + + hr = IDirect3DCubeTexture9_UnlockRect(texture_cube, i, j); + ok(SUCCEEDED(hr), "%s, %s: Failed to unlock face %u, level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, j, hr); + } + offset = (offset + 15) & ~15; + } + + IDirect3DCubeTexture9_Release(texture_cube); + } + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11018,6 +11163,7 @@ START_TEST(device) test_resource_priority(); test_swapchain_parameters(); test_check_device_format(); + test_miptree_layout(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d8/tests: Add a system memory miptree layout test.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 794ad86fec0fd8cbae3a08c589ba6f98683fc10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=794ad86fec0fd8cbae3a08c58… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 11 18:34:45 2016 +0200 d3d8/tests: Add a system memory miptree layout test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 32e2f09..13fe51a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7846,6 +7846,151 @@ static void test_swapchain_parameters(void) DestroyWindow(window); } +static void test_miptree_layout(void) +{ + unsigned int pool_idx, format_idx, base_dimension, level_count, offset, i, j; + IDirect3DCubeTexture8 *texture_cube; + IDirect3DTexture8 *texture_2d; + IDirect3DDevice8 *device; + D3DLOCKED_RECT map_desc; + BYTE *base = NULL; + IDirect3D8 *d3d; + D3DCAPS8 caps; + UINT refcount; + HWND window; + HRESULT hr; + + static const struct + { + D3DFORMAT format; + const char *name; + } + formats[] = + { + {D3DFMT_A8R8G8B8, "D3DFMT_A8R8G8B8"}, + {D3DFMT_A8, "D3DFMT_A8"}, + {D3DFMT_L8, "D3DFMT_L8"}, + }; + static const struct + { + D3DPOOL pool; + const char *name; + } + pools[] = + { + {D3DPOOL_MANAGED, "D3DPOOL_MANAGED"}, + {D3DPOOL_SYSTEMMEM, "D3DPOOL_SYSTEMMEM"}, + {D3DPOOL_SCRATCH, "D3DPOOL_SCRATCH"}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 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, NULL))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + + base_dimension = 257; + if (caps.TextureCaps & (D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_CUBEMAP_POW2)) + { + skip("Using power of two base dimension.\n"); + base_dimension = 256; + } + + for (format_idx = 0; format_idx < sizeof(formats) / sizeof(*formats); ++format_idx) + { + if (FAILED(hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_TEXTURE, formats[format_idx].format))) + { + skip("%s textures not supported, skipping tests.\n", formats[format_idx].name); + continue; + } + + for (pool_idx = 0; pool_idx < sizeof(pools) / sizeof(*pools); ++pool_idx) + { + hr = IDirect3DDevice8_CreateTexture(device, base_dimension, base_dimension, 0, 0, + formats[format_idx].format, pools[pool_idx].pool, &texture_2d); + ok(SUCCEEDED(hr), "Failed to create a %s %s texture, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, hr); + + level_count = IDirect3DTexture8_GetLevelCount(texture_2d); + for (i = 0, offset = 0; i < level_count; ++i) + { + hr = IDirect3DTexture8_LockRect(texture_2d, i, &map_desc, NULL, 0); + ok(SUCCEEDED(hr), "%s, %s: Failed to lock level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, hr); + + if (!i) + base = map_desc.pBits; + else + todo_wine ok(map_desc.pBits == base + offset, + "%s, %s, level %u: Got unexpected pBits %p, expected %p.\n", + pools[pool_idx].name, formats[format_idx].name, i, map_desc.pBits, base + offset); + offset += (base_dimension >> i) * map_desc.Pitch; + + hr = IDirect3DTexture8_UnlockRect(texture_2d, i); + ok(SUCCEEDED(hr), "%s, %s Failed to unlock level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, hr); + } + + IDirect3DTexture8_Release(texture_2d); + } + + if (FAILED(hr = IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_CUBETEXTURE, formats[format_idx].format))) + { + skip("%s cube textures not supported, skipping tests.\n", formats[format_idx].name); + continue; + } + + for (pool_idx = 0; pool_idx < sizeof(pools) / sizeof(*pools); ++pool_idx) + { + hr = IDirect3DDevice8_CreateCubeTexture(device, base_dimension, 0, 0, + formats[format_idx].format, pools[pool_idx].pool, &texture_cube); + ok(SUCCEEDED(hr), "Failed to create a %s %s cube texture, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, hr); + + level_count = IDirect3DCubeTexture8_GetLevelCount(texture_cube); + for (i = 0, offset = 0; i < 6; ++i) + { + for (j = 0; j < level_count; ++j) + { + hr = IDirect3DCubeTexture8_LockRect(texture_cube, i, j, &map_desc, NULL, 0); + ok(SUCCEEDED(hr), "%s, %s: Failed to lock face %u, level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, j, hr); + + if (!i && !j) + base = map_desc.pBits; + else + todo_wine ok(map_desc.pBits == base + offset, + "%s, %s, face %u, level %u: Got unexpected pBits %p, expected %p.\n", + pools[pool_idx].name, formats[format_idx].name, i, j, map_desc.pBits, base + offset); + offset += (base_dimension >> j) * map_desc.Pitch; + + hr = IDirect3DCubeTexture8_UnlockRect(texture_cube, i, j); + ok(SUCCEEDED(hr), "%s, %s: Failed to unlock face %u, level %u, hr %#x.\n", + pools[pool_idx].name, formats[format_idx].name, i, j, hr); + } + offset = (offset + 15) & ~15; + } + + IDirect3DCubeTexture8_Release(texture_cube); + } + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -7948,6 +8093,7 @@ START_TEST(device) test_lost_device(); test_resource_priority(); test_swapchain_parameters(); + test_miptree_layout(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Francois Gouget : shell32/tests: Fix a race condition in the DDE ShellExecute() tests on Windows 10.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 15d9a4a7113ed8249cb365a36d1e97d22e35fa88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d9a4a7113ed8249cb365a36… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 11 18:43:55 2016 +0200 shell32/tests: Fix a race condition in the DDE ShellExecute() tests on Windows 10. Even if we have a results file after a failed ShellExecuteEx() call, it may not correspond to the last call and should thus be ignored. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ebf9d80..9db12ce 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -650,7 +650,7 @@ static INT_PTR shell_execute_ex_(const char* file, int line, * functions know about it */ WritePrivateProfileStringA(NULL, NULL, NULL, child_file); - if (GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) + if (rc > 32 && GetFileAttributesA(child_file) != INVALID_FILE_ATTRIBUTES) { int c; dump_child_(file, line);

1 0

Julian Rüger : German translation for release 1.9.5
by Jeremy Newman 12 Apr '16

12 Apr '16

Module: website Branch: master Commit: 308ee63f832f980e6c853b96786454bb28d7e579 URL: http://source.winehq.org/git/website.git/?a=commit;h=308ee63f832f980e6c853b… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 9 12:34:02 2016 +0200 German translation for release 1.9.5 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016030501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/de/2016030501.xml b/news/de/2016030501.xml new file mode 100644 index 0000000..88a885d --- /dev/null +++ b/news/de/2016030501.xml @@ -0,0 +1,16 @@ +<news> +<date>5. März 2016</date> +<title>Wine 1.9.5 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.5 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.5">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Neue Version der Mono-Engine, mit 64-Bit-Unterstützung.</li> + <li>Anfänge des WineD3D Command-Stream.</li> + <li>Unterstützung von Effect-States in Direct3DX.</li> + <li>Drag&Drop-Verbesserungen.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.5.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Julian Rüger : German translation for release 1.9.6
by Jeremy Newman 12 Apr '16

12 Apr '16

Module: website Branch: master Commit: 0bf35d662714779b81c9b592d11ebe8f7b2647cb URL: http://source.winehq.org/git/website.git/?a=commit;h=0bf35d662714779b81c9b5… Author: Julian Rüger <jr98(a)gmx.net> Date: Sat Apr 9 12:37:22 2016 +0200 German translation for release 1.9.6 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016031801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2016031801.xml b/news/de/2016031801.xml new file mode 100644 index 0000000..504e4a2 --- /dev/null +++ b/news/de/2016031801.xml @@ -0,0 +1,15 @@ +<news> +<date>18. März 2016</date> +<title>Wine 1.9.6 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.6 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.6">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Bessere Erkennung von Grafikkarten bei Benutzung von Mesa.</li> + <li>Unterstützung von Shader-Model-5-Shadern.</li> + <li>Verbesserungen an der C++-Ausnahmebehandlung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.6.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0