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

Henri Verbeet : ddraw: Allow DDSCAPS_FLIP without DDSCAPS_PRIMARYSURFACE.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 1736431c683ade50a8e539331158dc5570cd300c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1736431c683ade50a8e539331… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:08 2016 +0200 ddraw: Allow DDSCAPS_FLIP without DDSCAPS_PRIMARYSURFACE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 70 ++++++---- dlls/ddraw/tests/ddraw1.c | 348 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw2.c | 348 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw4.c | 348 +++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 350 ++++++++++++++++++++++++++-------------------- 5 files changed, 840 insertions(+), 624 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1736431c683ade50a8e53…

1 0

Henri Verbeet : ddraw: Fix the parameter names for the various Flip() functions.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 4e02cc3a8663e3493e50ed8f0ef92887842ac40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e02cc3a8663e3493e50ed8f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:07 2016 +0200 ddraw: Fix the parameter names for the various Flip() functions. The "dst" surface is the source, not the destination. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d914b2f..796e387 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1345,51 +1345,51 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface4_Flip(IDirectDrawSurface4 *iface, - IDirectDrawSurface4 *dst, DWORD flags) + IDirectDrawSurface4 *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface4(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface4(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface3_Flip(IDirectDrawSurface3 *iface, - IDirectDrawSurface3 *dst, DWORD flags) + IDirectDrawSurface3 *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface3(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface3(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface3(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface2_Flip(IDirectDrawSurface2 *iface, - IDirectDrawSurface2 *dst, DWORD flags) + IDirectDrawSurface2 *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface2(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface2(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface2(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface1_Flip(IDirectDrawSurface *iface, - IDirectDrawSurface *dst, DWORD flags) + IDirectDrawSurface *src, DWORD flags) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface(iface); - struct ddraw_surface *dst_impl = unsafe_impl_from_IDirectDrawSurface(dst); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface(src); - TRACE("iface %p, dst %p, flags %#x.\n", iface, dst, flags); + TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); return ddraw_surface7_Flip(&surface->IDirectDrawSurface7_iface, - dst_impl ? &dst_impl->IDirectDrawSurface7_iface : NULL, flags); + src_impl ? &src_impl->IDirectDrawSurface7_iface : NULL, flags); } static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, const RECT *dst_rect_in,

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_volume_upload_data().
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: aaca15f17278d94287ef5c0af9c7e9e25e5f05f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaca15f17278d94287ef5c0af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:05 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 34 ++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 121a8ee..fd7f818 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3601,7 +3601,7 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, data.buffer_object = 0; data.addr = src.data; - wined3d_volume_upload_data(dst_texture->sub_resources[i].u.volume, context, &data); + wined3d_volume_upload_data(dst_texture, i, context, &data); wined3d_texture_invalidate_location(dst_texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); if (FAILED(hr = wined3d_resource_unmap(&src_texture->resource, src_level + i))) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f1896fd..eb0ad2f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1992,7 +1992,7 @@ static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int addr.buffer_object = 0; addr.addr = data->data; - wined3d_volume_upload_data(texture->sub_resources[sub_resource_idx].u.volume, context, &addr); + wined3d_volume_upload_data(texture, sub_resource_idx, context, &addr); } static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 3106ac7..f59f963 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -30,23 +30,22 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); /* This call just uploads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, - const struct wined3d_const_bo_address *data) +void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data) { - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *texture = volume->container; const struct wined3d_format *format = texture->resource.format; + unsigned int level = sub_resource_idx % texture->level_count; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int width, height, depth; const void *mem = data->addr; void *converted_mem = NULL; - TRACE("volume %p, context %p, level %u, format %s (%#x).\n", - volume, context, volume->texture_level, debug_d3dformat(format->id), - format->id); + TRACE("texture %p, sub_resource_idx %u, context %p, format %s (%#x).\n", + texture, level, context, debug_d3dformat(format->id), format->id); - width = wined3d_texture_get_level_width(texture, volume->texture_level); - height = wined3d_texture_get_level_height(texture, volume->texture_level); - depth = wined3d_texture_get_level_depth(texture, volume->texture_level); + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); + depth = wined3d_texture_get_level_depth(texture, level); if (format->convert) { @@ -54,14 +53,14 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine UINT src_row_pitch, src_slice_pitch; if (data->buffer_object) - ERR("Loading a converted volume from a PBO.\n"); + ERR("Loading a converted texture from a PBO.\n"); if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) ERR("Converting a block-based format.\n"); dst_row_pitch = width * format->conv_byte_count; dst_slice_pitch = dst_row_pitch * height; - wined3d_texture_get_pitch(texture, volume->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); converted_mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); format->convert(data->addr, converted_mem, src_row_pitch, src_slice_pitch, @@ -75,9 +74,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine checkGLcall("glBindBuffer"); } - GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, - width, height, depth, - format->glFormat, format->glType, mem)); + GL_EXTCALL(glTexSubImage3D(GL_TEXTURE_3D, level, 0, 0, 0, + width, height, depth, format->glFormat, format->glType, mem)); checkGLcall("glTexSubImage3D"); if (data->buffer_object) @@ -163,7 +161,7 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); wined3d_volume_download_data(volume, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - wined3d_volume_upload_data(volume, context, wined3d_const_bo_address(&data)); + wined3d_volume_upload_data(texture, volume->texture_level, context, wined3d_const_bo_address(&data)); HeapFree(GetProcessHeap(), 0, data.addr); } @@ -215,14 +213,14 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, data.addr += sub_resource->offset; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_volume_upload_data(volume, context, &data); + wined3d_volume_upload_data(texture, sub_resource_idx, context, &data); } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); - wined3d_volume_upload_data(volume, context, &data); + wined3d_volume_upload_data(texture, sub_resource_idx, context, &data); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c19e7e..099d1ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2611,8 +2611,8 @@ struct wined3d_volume BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wined3d_context *context, - const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; +void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_context *context, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN; struct wined3d_renderbuffer_entry {

1 0

Henri Verbeet : ddraw: Require exclusive mode only for primary surface flips.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 7cabef1457fe0aae4319339fdc46b059b41fc3bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cabef1457fe0aae4319339fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:09 2016 +0200 ddraw: Require exclusive mode only for primary surface flips. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 3 ++- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 18 ++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 18 ++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 18 ++++++++++++++++-- 5 files changed, 66 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a1bbced..c7e7256 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1235,7 +1235,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_mutex_lock(); - if (!(dst_impl->ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if ((dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + && !(dst_impl->ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { WARN("Not in exclusive mode.\n"); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a9ba1b1..88d4f0c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -4197,8 +4197,6 @@ static void test_flip(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = set_display_mode(ddraw, 640, 480); - ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); @@ -4233,6 +4231,22 @@ static void test_flip(void) if (FAILED(hr)) continue; + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface_IsLost(frontbuffer); + ok(hr == DD_OK, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface_Flip(frontbuffer, NULL, DDFLIP_WAIT); + if (test_data[i].caps & DDSCAPS_PRIMARYSURFACE) + ok(hr == DDERR_NOEXCLUSIVEMODE, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + else + ok(SUCCEEDED(hr), "%s: Failed to flip, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface_IsLost(frontbuffer); + todo_wine ok(hr == DDERR_SURFACELOST, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = restore_surfaces(ddraw); + ok(SUCCEEDED(hr), "%s: Failed to restore surfaces, hr %#x.\n", test_data[i].name, hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(frontbuffer, &surface_desc); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index a56df21..4ee81b8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -4830,8 +4830,6 @@ static void test_flip(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = set_display_mode(ddraw, 640, 480); - ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); @@ -4866,6 +4864,22 @@ static void test_flip(void) if (FAILED(hr)) continue; + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface_IsLost(frontbuffer); + ok(hr == DD_OK, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface_Flip(frontbuffer, NULL, DDFLIP_WAIT); + if (test_data[i].caps & DDSCAPS_PRIMARYSURFACE) + ok(hr == DDERR_NOEXCLUSIVEMODE, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + else + ok(SUCCEEDED(hr), "%s: Failed to flip, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface_IsLost(frontbuffer); + todo_wine ok(hr == DDERR_SURFACELOST, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = restore_surfaces(ddraw); + ok(SUCCEEDED(hr), "%s: Failed to restore surfaces, hr %#x.\n", test_data[i].name, hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDrawSurface_GetSurfaceDesc(frontbuffer, &surface_desc); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8615e1c..271ae00 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6150,8 +6150,6 @@ static void test_flip(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = set_display_mode(ddraw, 640, 480); - ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); @@ -6239,6 +6237,22 @@ static void test_flip(void) test_data[i].name, surface, frontbuffer); IDirectDrawSurface4_Release(surface); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface4_IsLost(frontbuffer); + ok(hr == DD_OK, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface4_Flip(frontbuffer, NULL, DDFLIP_WAIT); + if (test_data[i].caps & DDSCAPS_PRIMARYSURFACE) + ok(hr == DDERR_NOEXCLUSIVEMODE, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + else + ok(SUCCEEDED(hr), "%s: Failed to flip, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface4_IsLost(frontbuffer); + todo_wine ok(hr == DDERR_SURFACELOST, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = IDirectDraw4_RestoreAllSurfaces(ddraw); + ok(SUCCEEDED(hr), "%s: Failed to restore surfaces, hr %#x.\n", test_data[i].name, hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1444800..7ea1d6e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -6018,8 +6018,6 @@ static void test_flip(void) ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); - hr = set_display_mode(ddraw, 640, 480); - ok(SUCCEEDED(hr), "Failed to set display mode, hr %#x.\n", hr); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); @@ -6109,6 +6107,22 @@ static void test_flip(void) test_data[i].name, surface, frontbuffer); IDirectDrawSurface7_Release(surface); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface7_IsLost(frontbuffer); + ok(hr == DD_OK, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface7_Flip(frontbuffer, NULL, DDFLIP_WAIT); + if (test_data[i].caps & DDSCAPS_PRIMARYSURFACE) + ok(hr == DDERR_NOEXCLUSIVEMODE, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + else + ok(SUCCEEDED(hr), "%s: Failed to flip, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "%s: Failed to set cooperative level, hr %#x.\n", test_data[i].name, hr); + hr = IDirectDrawSurface7_IsLost(frontbuffer); + todo_wine ok(hr == DDERR_SURFACELOST, "%s: Got unexpected hr %#x.\n", test_data[i].name, hr); + hr = IDirectDraw7_RestoreAllSurfaces(ddraw); + ok(SUCCEEDED(hr), "%s: Failed to restore surfaces, hr %#x.\n", test_data[i].name, hr); + memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;

1 0

Francois Gouget : urlmon/tests: Fix a spelling error in a uri comment.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 9cd57841049f06a43a68ed4fbef8055894bf29ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cd57841049f06a43a68ed4fb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:37:41 2016 +0200 urlmon/tests: Fix a spelling error in a uri comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 464fb07..5f98d4e 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5768,7 +5768,7 @@ static const uri_builder_test uri_builder_tests[] = { 0,INET_E_INVALID_URL,FALSE, 0,0,0,INET_E_INVALID_URL,FALSE }, - /* UserName can't contain any character that is a delimeter for another + /* UserName can't contain any character that is a delimiter for another * component that appears after it in a normal URI. */ { "http://google.com/",0,S_OK,FALSE,

1 0

Francois Gouget : jsproxy/tests: A spelling fix for a jsproxy ok() message.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 712944943f9fc341727e4eb1863a1a34627c20f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=712944943f9fc341727e4eb18… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:36:11 2016 +0200 jsproxy/tests: A spelling fix for a jsproxy ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/tests/jsproxy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index d23867b..67a2988 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -92,7 +92,7 @@ static void test_InternetGetProxyInfo(void) SetLastError( 0xdeadbeef ); ret = pInternetGetProxyInfo( url, strlen(url), host, strlen(host), &proxy, &len ); err = GetLastError(); - ok( !ret, "unexpected succes\n" ); + ok( !ret, "unexpected success\n" ); ok( err == ERROR_CAN_NOT_COMPLETE, "got %u\n", err ); buf.dwStructSize = sizeof(buf);

1 0

Francois Gouget : msctf/tests: Spelling fixes for inputprocessor ok() messages.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 958d1435269f0ddf726ae87728a01d1859309e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=958d1435269f0ddf726ae8772… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 00:35:50 2016 +0200 msctf/tests: Spelling fixes for inputprocessor ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/tests/inputprocessor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 8c9c884..d78509d 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1206,13 +1206,13 @@ static void test_KeystrokeMgr(void) ok(hr == E_INVALIDARG,"Wrong return, expected E_INVALIDARG\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, 0, &CLSID_PreservedKey, &tfpk, NULL, 0); - ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + ok(hr==E_INVALIDARG,"ITfKeystrokeMgr_PreserveKey improperly succeeded\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); ok(SUCCEEDED(hr),"ITfKeystrokeMgr_PreserveKey failed\n"); hr =ITfKeystrokeMgr_PreserveKey(keymgr, tid, &CLSID_PreservedKey, &tfpk, NULL, 0); - ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey inproperly succeeded\n"); + ok(hr == TF_E_ALREADY_EXISTS,"ITfKeystrokeMgr_PreserveKey improperly succeeded\n"); preserved = FALSE; hr = ITfKeystrokeMgr_IsPreservedKey(keymgr, &CLSID_PreservedKey, &tfpk, &preserved); @@ -1227,7 +1227,7 @@ static void test_KeystrokeMgr(void) if (hr == S_FALSE) ok(preserved == FALSE,"misreporting preserved key\n"); hr = ITfKeystrokeMgr_UnpreserveKey(keymgr, &CLSID_PreservedKey,&tfpk); - ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey inproperly succeeded\n"); + ok(hr==CONNECT_E_NOCONNECTION,"ITfKeystrokeMgr_UnpreserveKey improperly succeeded\n"); hr = ITfKeystrokeMgr_UnadviseKeyEventSink(keymgr,tid); ok(SUCCEEDED(hr),"ITfKeystrokeMgr_UnadviseKeyEventSink failed\n");

1 0

Nikolay Sivov : shell32/tests: Fix some test failures running with limited user.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: e89a7735c3a9fce670648fbf0bdfb221171172d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89a7735c3a9fce670648fbf0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 21 21:17:37 2016 +0300 shell32/tests: Fix some test failures running with limited user. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index 0077f1e..aebf6b5 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -150,6 +150,12 @@ static void test_IQueryAssociations_GetString(void) int i = 0; r = RegCreateKeyExW(HKEY_CLASSES_ROOT, test_extensionW, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &test_extension_key, NULL); + if (r == ERROR_ACCESS_DENIED) + { + win_skip("Not enough permissions to create a test key.\n"); + return; + } + ok(r == ERROR_SUCCESS, "RegCreateKeyExW(HKCR, \".test\") failed: 0x%lx\n", r); r = RegSetValueExW(test_extension_key, NULL, 0, REG_SZ, (PBYTE)test_progidW, sizeof(test_progidW)); ok(r == ERROR_SUCCESS, "RegSetValueExW(HKCR\\.test, NULL, \"testfile\") failed: 0x%lx\n", r);

1 0

Nikolay Sivov : shell32/tests: Use ok() functionality to print line numbers.
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 87f081974f22e9e9f5b4c53754e7315c2f23489e URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f081974f22e9e9f5b4c5375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 21 21:17:38 2016 +0300 shell32/tests: Use ok() functionality to print line numbers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/assoc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/assoc.c b/dlls/shell32/tests/assoc.c index aebf6b5..9cd6aeb 100644 --- a/dlls/shell32/tests/assoc.c +++ b/dlls/shell32/tests/assoc.c @@ -100,7 +100,7 @@ static struct assoc_getstring_test getstring_tests[] = { NULL } }; -static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCWSTR expected_string, int line_num) +static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCWSTR expected_string, int line) { IQueryAssociations *assoc; HRESULT hr; @@ -108,25 +108,25 @@ static void getstring_test(LPCWSTR assocName, HKEY progIdKey, ASSOCSTR str, LPCW DWORD len; hr = CoCreateInstance(&CLSID_QueryAssociations, NULL, CLSCTX_INPROC_SERVER, &IID_IQueryAssociations, (void*)&assoc); - ok(hr == S_OK, "line %d: failed to create IQueryAssociations, 0x%x\n", line_num, hr); + ok_(__FILE__, line)(hr == S_OK, "failed to create IQueryAssociations, 0x%x\n", hr); hr = IQueryAssociations_Init(assoc, 0, assocName, progIdKey, NULL); - ok(hr == S_OK, "line %d: IQueryAssociations::Init failed, 0x%x\n", line_num, hr); + ok_(__FILE__, line)(hr == S_OK, "IQueryAssociations::Init failed, 0x%x\n", hr); hr = IQueryAssociations_GetString(assoc, 0, str, NULL, NULL, &len); if (hr != S_FALSE) { if (expected_string) { - ok(SUCCEEDED(hr), "line %d: GetString returned 0x%x, expected success\n", line_num, hr); + ok_(__FILE__, line)(SUCCEEDED(hr), "GetString returned 0x%x, expected success\n", hr); } else { - ok(FAILED(hr), "line %d: GetString returned 0x%x, expected failure\n", line_num, hr); + ok_(__FILE__, line)(FAILED(hr), "GetString returned 0x%x, expected failure\n", hr); } } buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - ok(buffer != NULL, "line %d: out of memory\n", line_num); + ok_(__FILE__, line)(buffer != NULL, "out of memory\n"); hr = IQueryAssociations_GetString(assoc, 0, str, NULL, buffer, &len); if (expected_string) { - ok(lstrcmpW(buffer, expected_string) == 0, "line %d: GetString returned %s, expected %s\n", line_num, + ok_(__FILE__, line)(lstrcmpW(buffer, expected_string) == 0, "GetString returned %s, expected %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(expected_string)); } }

1 0

Henri Verbeet : wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt ().
by Alexandre Julliard April 22, 2016

April 22, 2016

Module: wine Branch: master Commit: 82044bc9192c26aba8399785be0da38e2ebf7cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82044bc9192c26aba8399785b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 17:05:06 2016 +0200 wined3d: Return a failure code if creating the staging texture failed in surface_cpu_blt(). Note that we return immediately. The textures aren't mapped yet here, so we shouldn't try to unmap them. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8463666..367bd95 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3408,9 +3408,9 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) { - /* The conv function writes a FIXME */ - WARN("Cannot convert source surface format to dest format.\n"); - goto release; + FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_texture->resource.format->id)); + return WINED3DERR_NOTAVAILABLE; } src_texture = converted_texture; src_sub_resource_idx = 0;

1 0