October 2015 - Wine-commits

Henri Verbeet : d3d9: Simplify d3d9_device_CheckDeviceState().
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 51b9aba9ccd476fbab2837243f314bab41186aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b9aba9ccd476fbab2837243… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:35:08 2015 +0200 d3d9: Simplify d3d9_device_CheckDeviceState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9c09f65..9ff32a7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3287,13 +3287,11 @@ static HRESULT WINAPI d3d9_device_CheckDeviceState(IDirect3DDevice9Ex *iface, HW { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_swapchain_desc swapchain_desc; - struct wined3d_swapchain *swapchain; TRACE("iface %p, dst_window %p.\n", iface, dst_window); wined3d_mutex_lock(); - swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); - wined3d_swapchain_get_desc(swapchain, &swapchain_desc); + wined3d_swapchain_get_desc(device->implicit_swapchains[0]->wined3d_swapchain, &swapchain_desc); wined3d_mutex_unlock(); if (swapchain_desc.windowed)

1 0

Henri Verbeet : wined3d: The cursor image surface is not allowed to be NULL in wined3d_device_set_cursor_properties ().
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 8b9e56cc9e3d526e64e6fe7de664ed487875a0a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b9e56cc9e3d526e64e6fe7de… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 16 10:35:09 2015 +0200 wined3d: The cursor image surface is not allowed to be NULL in wined3d_device_set_cursor_properties(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 138 +++++++++++++++++++++++++------------------------- 1 file changed, 70 insertions(+), 68 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4d1030d..0d607ee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4205,6 +4205,10 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_surface *cursor_image) { + struct wined3d_display_mode mode; + struct wined3d_map_desc map_desc; + HRESULT hr; + TRACE("device %p, x_hotspot %u, y_hotspot %u, cursor_image %p.\n", device, x_hotspot, y_hotspot, cursor_image); @@ -4214,86 +4218,84 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device device->cursor_texture = NULL; } - if (cursor_image) + if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) { - struct wined3d_display_mode mode; - struct wined3d_map_desc map_desc; - HRESULT hr; + WARN("Surface %p has an invalid format %s.\n", + cursor_image, debug_d3dformat(cursor_image->resource.format->id)); + return WINED3DERR_INVALIDCALL; + } - /* MSDN: Cursor must be A8R8G8B8 */ - if (cursor_image->resource.format->id != WINED3DFMT_B8G8R8A8_UNORM) - { - WARN("surface %p has an invalid format.\n", cursor_image); - return WINED3DERR_INVALIDCALL; - } + if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode, NULL))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + return WINED3DERR_INVALIDCALL; + } - if (FAILED(hr = wined3d_get_adapter_display_mode(device->wined3d, device->adapter->ordinal, &mode, NULL))) - { - ERR("Failed to get display mode, hr %#x.\n", hr); - return WINED3DERR_INVALIDCALL; - } + if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) + { + WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", + cursor_image, cursor_image->resource.width, cursor_image->resource.height, + mode.width, mode.height); + return WINED3DERR_INVALIDCALL; + } - /* MSDN: Cursor must be smaller than the display mode */ - if (cursor_image->resource.width > mode.width || cursor_image->resource.height > mode.height) - { - WARN("Surface %p dimensions are %ux%u, but screen dimensions are %ux%u.\n", - cursor_image, cursor_image->resource.width, cursor_image->resource.height, - mode.width, mode.height); - return WINED3DERR_INVALIDCALL; - } + /* TODO: MSDN: Cursor sizes must be a power of 2 */ - /* TODO: MSDN: Cursor sizes must be a power of 2 */ + /* Do not store the surface's pointer because the application may + * release it after setting the cursor image. Windows doesn't + * addref the set surface, so we can't do this either without + * creating circular refcount dependencies. */ + if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, cursor_image))) + { + ERR("Failed to create cursor texture.\n"); + return WINED3DERR_INVALIDCALL; + } - /* Do not store the surface's pointer because the application may - * release it after setting the cursor image. Windows doesn't - * addref the set surface, so we can't do this either without - * creating circular refcount dependencies. */ - if (!(device->cursor_texture = wined3d_device_create_cursor_texture(device, cursor_image))) - { - ERR("Failed to create cursor texture.\n"); - return WINED3DERR_INVALIDCALL; - } + if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) + { + UINT mask_size = cursor_image->resource.width * cursor_image->resource.height / 8; + ICONINFO cursor_info; + DWORD *mask_bits; + HCURSOR cursor; - device->cursorWidth = cursor_image->resource.width; - device->cursorHeight = cursor_image->resource.height; + /* 32-bit user32 cursors ignore the alpha channel if it's all + * zeroes, and use the mask instead. Fill the mask with all ones + * to ensure we still get a fully transparent cursor. */ + if (!(mask_bits = HeapAlloc(GetProcessHeap(), 0, mask_size))) + return E_OUTOFMEMORY; + memset(mask_bits, 0xff, mask_size); + + wined3d_surface_map(cursor_image, &map_desc, NULL, WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); + cursor_info.fIcon = FALSE; + cursor_info.xHotspot = x_hotspot; + cursor_info.yHotspot = y_hotspot; + cursor_info.hbmMask = CreateBitmap(cursor_image->resource.width, + cursor_image->resource.height, 1, 1, mask_bits); + cursor_info.hbmColor = CreateBitmap(cursor_image->resource.width, + cursor_image->resource.height, 1, 32, map_desc.data); + wined3d_surface_unmap(cursor_image); + + /* Create our cursor and clean up. */ + cursor = CreateIconIndirect(&cursor_info); + if (cursor_info.hbmMask) + DeleteObject(cursor_info.hbmMask); + if (cursor_info.hbmColor) + DeleteObject(cursor_info.hbmColor); + if (device->hardwareCursor) + DestroyCursor(device->hardwareCursor); + device->hardwareCursor = cursor; + if (device->bCursorVisible) + SetCursor(cursor); - if (cursor_image->resource.width == 32 && cursor_image->resource.height == 32) - { - UINT mask_size = cursor_image->resource.width * cursor_image->resource.height / 8; - ICONINFO cursorInfo; - DWORD *maskBits; - HCURSOR cursor; - - /* 32-bit user32 cursors ignore the alpha channel if it's all - * zeroes, and use the mask instead. Fill the mask with all ones - * to ensure we still get a fully transparent cursor. */ - maskBits = HeapAlloc(GetProcessHeap(), 0, mask_size); - memset(maskBits, 0xff, mask_size); - wined3d_surface_map(cursor_image, &map_desc, NULL, - WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY); - TRACE("width: %u height: %u.\n", cursor_image->resource.width, cursor_image->resource.height); - - cursorInfo.fIcon = FALSE; - cursorInfo.xHotspot = x_hotspot; - cursorInfo.yHotspot = y_hotspot; - cursorInfo.hbmMask = CreateBitmap(cursor_image->resource.width, cursor_image->resource.height, - 1, 1, maskBits); - cursorInfo.hbmColor = CreateBitmap(cursor_image->resource.width, cursor_image->resource.height, - 1, 32, map_desc.data); - wined3d_surface_unmap(cursor_image); - /* Create our cursor and clean up. */ - cursor = CreateIconIndirect(&cursorInfo); - if (cursorInfo.hbmMask) DeleteObject(cursorInfo.hbmMask); - if (cursorInfo.hbmColor) DeleteObject(cursorInfo.hbmColor); - if (device->hardwareCursor) DestroyCursor(device->hardwareCursor); - device->hardwareCursor = cursor; - if (device->bCursorVisible) SetCursor( cursor ); - HeapFree(GetProcessHeap(), 0, maskBits); - } + HeapFree(GetProcessHeap(), 0, mask_bits); } + TRACE("New cursor dimensions are %ux%u.\n", cursor_image->resource.width, cursor_image->resource.height); + device->cursorWidth = cursor_image->resource.width; + device->cursorHeight = cursor_image->resource.height; device->xHotSpot = x_hotspot; device->yHotSpot = y_hotspot; + return WINED3D_OK; }

1 0

Jacek Caban : jscript: Added a test of DeleteMembedByDispID returning an error.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 79361d3bc056ed7659fb63880ed91019837a4906 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79361d3bc056ed7659fb63880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 15 12:58:38 2015 +0200 jscript: Added a test of DeleteMembedByDispID returning an error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/run.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 6259071..85f7e1c 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -84,6 +84,7 @@ DEFINE_EXPECT(global_propputref_d); DEFINE_EXPECT(global_propputref_i); DEFINE_EXPECT(global_propdelete_d); DEFINE_EXPECT(global_nopropdelete_d); +DEFINE_EXPECT(global_propdeleteerror_d); DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); DEFINE_EXPECT(global_notexists_d); @@ -110,6 +111,7 @@ DEFINE_EXPECT(ActiveScriptSite_OnScriptError); DEFINE_EXPECT(invoke_func); DEFINE_EXPECT(DeleteMemberByDispID); DEFINE_EXPECT(DeleteMemberByDispID_false); +DEFINE_EXPECT(DeleteMemberByDispID_error); DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_TESTPROPGET 0x1000 @@ -143,8 +145,9 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_GETSCRIPTSTATE 0x101c #define DISPID_GLOBAL_BINDEVENTHANDLER 0x101d -#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 -#define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 +#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 +#define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 +#define DISPID_GLOBAL_TESTPROPDELETEERROR 0x2002 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -709,6 +712,12 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_TESTNOPROPDELETE; return S_OK; } + if(!strcmp_wa(bstrName, "testPropDeleteError")) { + CHECK_EXPECT(global_propdeleteerror_d); + test_grfdex(grfdex, fdexNameCaseSensitive); + *pid = DISPID_GLOBAL_TESTPROPDELETEERROR; + return S_OK; + } if(!strcmp_wa(bstrName, "getVT")) { test_grfdex(grfdex, fdexNameCaseSensitive); *pid = DISPID_GLOBAL_GETVT; @@ -1361,6 +1370,9 @@ static HRESULT WINAPI Global_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) case DISPID_GLOBAL_TESTNOPROPDELETE: CHECK_EXPECT(DeleteMemberByDispID_false); return S_FALSE; + case DISPID_GLOBAL_TESTPROPDELETEERROR: + CHECK_EXPECT(DeleteMemberByDispID_error); + return E_FAIL; default: ok(0, "id = %d\n", id); } @@ -1848,6 +1860,17 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +static void parse_script_ae(const char *src, HRESULT exhres) +{ + BSTR tmp; + HRESULT hres; + + tmp = a2bstr(src); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, tmp); + SysFreeString(tmp); + ok(hres == exhres, "parse_script failed: %08x, expected %08x\n", hres, exhres); +} + static void parse_script_with_error_a(const char *src, SCODE errorcode, ULONG line, LONG pos, LPCSTR source, LPCSTR desc, LPCSTR linetext) { BSTR tmp, script_source, description, line_text; @@ -2448,6 +2471,12 @@ static BOOL run_tests(void) CHECK_CALLED(global_nopropdelete_d); CHECK_CALLED(DeleteMemberByDispID_false); + SET_EXPECT(global_propdeleteerror_d); + SET_EXPECT(DeleteMemberByDispID_error); + parse_script_ae("delete testPropDeleteError;", E_FAIL); + CHECK_CALLED(global_propdeleteerror_d); + CHECK_CALLED(DeleteMemberByDispID_error); + SET_EXPECT(puredisp_prop_d); parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');"); CHECK_CALLED(puredisp_prop_d);

1 0

Stefan Dösinger : wined3d: Pass a context to read_from_framebuffer.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: b28511f73b04d54dfdc4f31e31e4606e7e0e5b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28511f73b04d54dfdc4f31e3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 12 22:34:39 2015 +0200 wined3d: Pass a context to read_from_framebuffer. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 14 ++++++++++++++ dlls/wined3d/surface.c | 18 +++++++++++++----- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 3e2a804..dc4199a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1194,6 +1194,20 @@ void context_release(struct wined3d_context *context) } } +/* This is used when a context for render target A is active, but a separate context is + * needed to access the WGL framebuffer for render target B. Re-acquire a context for rt + * A to avoid breaking caller code. */ +void context_restore(struct wined3d_context *context, struct wined3d_surface *restore) +{ + if (context->current_rt != restore) + { + context_release(context); + context = context_acquire(restore->resource.device, restore); + } + + context_release(context); +} + static void context_enter(struct wined3d_context *context) { TRACE("Entering context %p, level %u.\n", context, context->level + 1); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c911d35..7101bc4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2681,11 +2681,13 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINED3D_OK; } -static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_location) +static void read_from_framebuffer(struct wined3d_surface *surface, + struct wined3d_context *old_ctx, DWORD dst_location) { struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context *context = old_ctx; + struct wined3d_surface *restore_rt = NULL; BYTE *mem; BYTE *row, *top, *bottom; int i; @@ -2694,7 +2696,12 @@ static void read_from_framebuffer(struct wined3d_surface *surface, DWORD dst_loc surface_get_memory(surface, &data, dst_location); - context = context_acquire(device, surface); + if (surface != old_ctx->current_rt) + { + restore_rt = old_ctx->current_rt; + context = context_acquire(device, surface); + } + context_apply_blit_state(context, device); gl_info = context->gl_info; @@ -2781,7 +2788,8 @@ error: checkGLcall("glBindBuffer"); } - context_release(context); + if (restore_rt) + context_restore(context, restore_rt); } /* Read the framebuffer contents into a texture. Note that this function @@ -3824,7 +3832,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface, if (surface->locations & WINED3D_LOCATION_DRAWABLE) { - read_from_framebuffer(surface, dst_location); + read_from_framebuffer(surface, context, dst_location); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 70a8db8..75c16ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1423,6 +1423,7 @@ void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; void context_resource_unloaded(const struct wined3d_device *device, struct wined3d_resource *resource, enum wined3d_resource_type type) DECLSPEC_HIDDEN; +void context_restore(struct wined3d_context *context, struct wined3d_surface *restore) DECLSPEC_HIDDEN; BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Pass a context to surface_blt_to_drawable.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 7af0ede8fe72d7a01ec3dbfd2b6f5fd288fb69e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af0ede8fe72d7a01ec3dbfd2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 12 22:34:40 2015 +0200 wined3d: Pass a context to surface_blt_to_drawable. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7101bc4..f5ee7e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3275,19 +3275,28 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW rect->bottom = drawable_height - rect->bottom; } +/* Context activation is done by the caller. */ static void surface_blt_to_drawable(const struct wined3d_device *device, + struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, BOOL alpha_test, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context *context = old_ctx; + struct wined3d_surface *restore_rt = NULL; RECT src_rect, dst_rect; src_rect = *src_rect_in; dst_rect = *dst_rect_in; - context = context_acquire(device, dst_surface); + + if (old_ctx->current_rt != dst_surface) + { + restore_rt = old_ctx->current_rt; + context = context_acquire(device, dst_surface); + } + gl_info = context->gl_info; /* Make sure the surface is up-to-date. This should probably use @@ -3340,7 +3349,8 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, && dst_surface->container->swapchain->front_buffer == dst_surface->container)) gl_info->gl_ops.gl.p_glFlush(); /* Flush to ensure ordering across contexts. */ - context_release(context); + if (restore_rt) + context_restore(context, restore_rt); } HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) @@ -3844,6 +3854,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { RECT r; + struct wined3d_context *context; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && wined3d_resource_is_offscreen(&surface->container->resource)) @@ -3852,10 +3863,12 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, return WINED3DERR_INVALIDCALL; } + context = context_acquire(surface->resource.device, surface); surface_get_rect(surface, NULL, &r); surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB); - surface_blt_to_drawable(surface->resource.device, + surface_blt_to_drawable(surface->resource.device, context, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); + context_release(context); return WINED3D_OK; } @@ -4286,6 +4299,8 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, struct wined3d_surface *dst_surface, const RECT *dst_rect, const struct wined3d_color_key *color_key) { + struct wined3d_context *context; + /* Blit from offscreen surface to render target */ struct wined3d_color_key old_blt_key = src_surface->container->async.src_blt_color_key; DWORD old_color_key_flags = src_surface->container->async.color_key_flags; @@ -4294,8 +4309,10 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, DWORD filter, wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT, color_key); - surface_blt_to_drawable(device, filter, + context = context_acquire(device, dst_surface); + surface_blt_to_drawable(device, context, filter, !!color_key, src_surface, src_rect, dst_surface, dst_rect); + context_release(context); /* Restore the color key parameters */ wined3d_texture_set_color_key(src_surface->container, WINED3D_CKEY_SRC_BLT,

1 0

Stefan Dösinger : wined3d: Pass a context to surface_load_drawable.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 84933d60a31835315eea238a4eb1b086b8f3bd46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84933d60a31835315eea238a4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 12 22:34:41 2015 +0200 wined3d: Pass a context to surface_load_drawable. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> 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, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f5ee7e1..c70b709 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3850,11 +3850,11 @@ static void surface_load_sysmem(struct wined3d_surface *surface, surface, wined3d_debug_location(surface->locations)); } +/* Context activation is done by the caller. */ static HRESULT surface_load_drawable(struct wined3d_surface *surface, - const struct wined3d_gl_info *gl_info) + struct wined3d_context *context) { RECT r; - struct wined3d_context *context; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && wined3d_resource_is_offscreen(&surface->container->resource)) @@ -3863,12 +3863,10 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, return WINED3DERR_INVALIDCALL; } - context = context_acquire(surface->resource.device, surface); surface_get_rect(surface, NULL, &r); surface_load_location(surface, WINED3D_LOCATION_TEXTURE_RGB); surface_blt_to_drawable(surface->resource.device, context, WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r); - context_release(context); return WINED3D_OK; } @@ -4125,7 +4123,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) break; case WINED3D_LOCATION_DRAWABLE: - if (FAILED(hr = surface_load_drawable(surface, gl_info))) + context = context_acquire(device, NULL); + hr = surface_load_drawable(surface, context); + context_release(context); + if (FAILED(hr)) return hr; break;

1 0

Stefan Dösinger : wined3d: Pass a context to surface_blt_fbo.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 8b149890acc9457122b5339a3970466a028159a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b149890acc9457122b5339a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 12 22:34:42 2015 +0200 wined3d: Pass a context to surface_blt_fbo. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c70b709..994e161 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -858,13 +858,15 @@ static void surface_depth_blt_fbo(const struct wined3d_device *device, } /* Blit between surface locations. Onscreen on different swapchains is not supported. - * Depth / stencil is not supported. */ -static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_texture_filter_type filter, + * Depth / stencil is not supported. Context activation is done by the caller. */ +static void surface_blt_fbo(const struct wined3d_device *device, + struct wined3d_context *old_ctx, enum wined3d_texture_filter_type filter, struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect_in, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect_in) { const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; + struct wined3d_context *context = old_ctx; + struct wined3d_surface *required_rt, *restore_rt = NULL; RECT src_rect, dst_rect; GLenum gl_filter; GLenum buffer; @@ -907,9 +909,15 @@ static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_te if (!surface_is_full_rect(dst_surface, &dst_rect)) surface_load_location(dst_surface, dst_location); - if (src_location == WINED3D_LOCATION_DRAWABLE) context = context_acquire(device, src_surface); - else if (dst_location == WINED3D_LOCATION_DRAWABLE) context = context_acquire(device, dst_surface); - else context = context_acquire(device, NULL); + if (src_location == WINED3D_LOCATION_DRAWABLE) required_rt = src_surface; + else if (dst_location == WINED3D_LOCATION_DRAWABLE) required_rt = dst_surface; + else required_rt = NULL; + + if (required_rt && required_rt != old_ctx->current_rt) + { + restore_rt = old_ctx->current_rt; + context = context_acquire(device, required_rt); + } if (!context->valid) { @@ -972,7 +980,8 @@ static void surface_blt_fbo(const struct wined3d_device *device, enum wined3d_te && dst_surface->container->swapchain->front_buffer == dst_surface->container)) gl_info->gl_ops.gl.p_glFlush(); - context_release(context); + if (restore_rt) + context_restore(context, restore_rt); } static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, @@ -3900,13 +3909,17 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) { + context = context_acquire(device, NULL); + if (srgb) - surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, + surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect, surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect); else - surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_SRGB, + surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_SRGB, &src_rect, surface, WINED3D_LOCATION_TEXTURE_RGB, &src_rect); + context_release(context); + return WINED3D_OK; } @@ -3921,8 +3934,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; RECT rect = {0, 0, surface->resource.width, surface->resource.height}; - surface_blt_fbo(device, WINED3D_TEXF_POINT, surface, src_location, + context = context_acquire(device, NULL); + surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &rect, surface, dst_location, &rect); + context_release(context); return WINED3D_OK; } @@ -4045,14 +4060,17 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, static void surface_multisample_resolve(struct wined3d_surface *surface) { + struct wined3d_context *context; RECT rect = {0, 0, surface->resource.width, surface->resource.height}; if (!(surface->locations & WINED3D_LOCATION_RB_MULTISAMPLE)) ERR("Trying to resolve multisampled surface %p, but location WINED3D_LOCATION_RB_MULTISAMPLE not current.\n", surface); - surface_blt_fbo(surface->resource.device, WINED3D_TEXF_POINT, + context = context_acquire(surface->resource.device, NULL); + surface_blt_fbo(surface->resource.device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_RB_MULTISAMPLE, &rect, surface, WINED3D_LOCATION_RB_RESOLVED, &rect); + context_release(context); } HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) @@ -5287,11 +5305,15 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) { + struct wined3d_context *context; TRACE("Using FBO blit.\n"); - surface_blt_fbo(device, filter, + context = context_acquire(device, NULL); + surface_blt_fbo(device, context, filter, src_surface, src_surface->container->resource.draw_binding, &src_rect, dst_surface, dst_surface->container->resource.draw_binding, &dst_rect); + context_release(context); + surface_validate_location(dst_surface, dst_surface->container->resource.draw_binding); surface_invalidate_location(dst_surface, ~dst_surface->container->resource.draw_binding);

1 0

Martin Storsjo : msvcrt: Remove a stray semicolon.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: bf4493404cee43a345fe853b5c11b053cdd22322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4493404cee43a345fe853b5… Author: Martin Storsjo <martin(a)martin.st> Date: Thu Oct 15 16:08:19 2015 +0300 msvcrt: Remove a stray semicolon. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 7f734ea..2de515d 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -787,7 +787,7 @@ static void test_snprintf (void) fmt, expect, n); ok (!memcmp (fmt, buffer, valid), "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); - }; + } } static void test_fprintf(void)

1 0

Bernhard Übelacker : taskmgr: Fix changing of debug channels.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: 74c2989db36246fd8940a38253e8004d7455736e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c2989db36246fd8940a3825… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Oct 14 19:27:10 2015 +0200 taskmgr: Fix changing of debug channels. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/dbgchnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index 1049a16..6e2dea0 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -280,7 +280,8 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam) HANDLE hProcess; NMITEMACTIVATE* nmia = (NMITEMACTIVATE*)lParam; - hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE, FALSE, get_selected_pid()); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE, + FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME message box */ lhti.pt = nmia->ptAction; hChannelLV = GetDlgItem(hDlg, IDC_DEBUG_CHANNELS_LIST);

1 0

Thomas Faller : ntdll/tests: Fix use of uninitialized value.
by Alexandre Julliard 15 Oct '15

15 Oct '15

Module: wine Branch: master Commit: c96684c3b275ad579a296d46ac76ced64654430d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96684c3b275ad579a296d46a… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Wed Oct 14 18:13:33 2015 +0200 ntdll/tests: Fix use of uninitialized value. Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 6bd1530..8989760 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -111,7 +111,7 @@ static void testQuery(void) pRtlMultiByteToUnicodeN( bn, sizeof(bn), NULL, test->val, strlen(test->val)+1 ); ok( value.Length == strlen(test->val) * sizeof(WCHAR), "Wrong length %d for %s\n", value.Length, test->var ); - ok((value.Length == strlen(test->val) * sizeof(WCHAR) && memcmp(bv, bn, test->len*sizeof(WCHAR)) == 0) || + ok((value.Length == strlen(test->val) * sizeof(WCHAR) && memcmp(bv, bn, value.Length) == 0) || lstrcmpW(bv, bn) == 0, "Wrong result for %s/%d\n", test->var, test->len); ok(bv[test->len] == '@', "Writing too far away in the buffer for %s/%d\n", test->var, test->len);

1 0