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

Rodrigo Rivas Costa : user32: Make DeferWindowPos() fail on invalid window handles.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 5e65b65219bd56a5991c2c54df99b524e379846a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e65b65219bd56a5991c2c54d… Author: Rodrigo Rivas Costa <rodrigorivascosta(a)gmail.com> Date: Sat Apr 9 09:09:20 2016 +0300 user32: Make DeferWindowPos() fail on invalid window handles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 35 +++++++++++++++++++++++++++++++++++ dlls/user32/winpos.c | 6 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 957e8a1d..918e1ef 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8821,6 +8821,40 @@ static void test_winproc_limit(void) ok(i == 1, "winproc should be called once (%d)\n", i); } +static void test_deferwindowpos(void) +{ + HDWP hdwp, hdwp2; + BOOL ret; + + hdwp = BeginDeferWindowPos(0); + ok(hdwp != NULL, "got %p\n", hdwp); + + ret = EndDeferWindowPos(NULL); + ok(!ret, "got %d\n", ret); + + hdwp2 = DeferWindowPos(NULL, NULL, NULL, 0, 0, 10, 10, 0); +todo_wine + ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) || + broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos((HDWP)0xdead, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0); +todo_wine + ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) || + broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, NULL, NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + hdwp2 = DeferWindowPos(hdwp, (HWND)0xdead, NULL, 0, 0, 10, 10, 0); + ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError()); + + ret = EndDeferWindowPos(hdwp); + ok(ret, "got %d\n", ret); +} + START_TEST(win) { char **argv; @@ -8963,6 +8997,7 @@ START_TEST(win) test_GetMessagePos(); test_activateapp(hwndMain); test_winproc_handles(argv[0]); + test_deferwindowpos(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index f92a3dc..4915aad 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2348,7 +2348,11 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, hdwp, hwnd, hwndAfter, x, y, cx, cy, flags); hwnd = WIN_GetFullHandle( hwnd ); - if (is_desktop_window( hwnd )) return 0; + if (is_desktop_window( hwnd ) || !IsWindow( hwnd )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0; if (pDWP == OBJ_OTHER_PROCESS)

1 0

Jacek Caban : user32: Use top level window as dialog parent for modal dialogs.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 9da0c00a68c43348c2c00878f9a874dbb260147f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da0c00a68c43348c2c00878f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 6 14:40:54 2016 +0200 user32: Use top level window as dialog parent for modal dialogs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 3ea426d..2bacf4d 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -587,24 +587,24 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate, if (modal && owner) { HWND parent; - disabled_owner = owner; /* * Owner needs to be top level window. We need to duplicate the logic from server, - * because we need to disable it before creating dialog window. + * because we need to disable it before creating dialog window. Note that we do that + * even if dialog has WS_CHILD, but only for modal dialogs, which matched what + * Windows does. */ - while ((GetWindowLongW( disabled_owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + while ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) { - parent = GetParent( disabled_owner ); + parent = GetParent( owner ); if (!parent || parent == GetDesktopWindow()) break; - disabled_owner = parent; + owner = parent; } - if (IsWindowEnabled( disabled_owner )) + if (IsWindowEnabled( owner )) { flags |= DF_OWNERENABLED; + disabled_owner = owner; EnableWindow( disabled_owner, FALSE ); } - else - disabled_owner = NULL; } if (unicode)

1 0

Henri Verbeet : ddraw/tests: Add some more surface GetDC() tests to test_getdc().
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 31999bafda5672c788d8e66af957d156ff6a156a URL: http://source.winehq.org/git/wine.git/?a=commit;h=31999bafda5672c788d8e66af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:29 2016 +0200 ddraw/tests: Add some more surface GetDC() tests to test_getdc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 158 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 159 ++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 161 +++++++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/dsurface.c | 51 -------------- 5 files changed, 624 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31999bafda5672c788d8e…

1 0

Józef Kucia : d3d11: Partially implement OMSetRenderTargetsAndUnorderedAccessViews().
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 6d05587bafe0dce338ec5811ff5b910abebb50cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d05587bafe0dce338ec5811f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:35 2016 +0200 d3d11: Partially implement OMSetRenderTargetsAndUnorderedAccessViews(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f0bb52e..569d397 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -602,10 +602,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord { FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " "unordered_access_view_start_slot %u, unordered_access_view_count %u, unordered_access_views %p, " - "initial_counts %p stub!\n", + "initial_counts %p partial-stub!\n", iface, render_target_view_count, render_target_views, depth_stencil_view, unordered_access_view_start_slot, unordered_access_view_count, unordered_access_views, initial_counts); + + if (render_target_view_count != D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) + { + d3d11_immediate_context_OMSetRenderTargets(iface, render_target_view_count, render_target_views, + depth_stencil_view); + } } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface,

1 0

Józef Kucia : include: Add D3D11_KEEP_* constants.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: d8ebf2efed676be6bbe196b662ea3777e03e730b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ebf2efed676be6bbe196b66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:34 2016 +0200 include: Add D3D11_KEEP_* constants. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 805a557..b49d6f4 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -103,6 +103,9 @@ const INT D3D11_VIEWPORT_BOUNDS_MIN = -32768; const UINT D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX = 15; const UINT D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +const UINT D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL = 0xffffffff; +const UINT D3D11_KEEP_UNORDERED_ACCESS_VIEWS = 0xffffffff; + const UINT D3D11_SHADER_MAJOR_VERSION = 5; const UINT D3D11_SHADER_MAX_INSTANCES = 65535; const UINT D3D11_SHADER_MAX_INTERFACES = 253;

1 0

Nikolay Sivov : gdi32: Increase first gdi handle value.
by Alexandre Julliard April 8, 2016

April 8, 2016

Module: wine Branch: master Commit: 4161f5120b59d916e1818748f0d0ced7c7a76303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4161f5120b59d916e1818748f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 23:36:03 2016 +0300 gdi32: Increase first gdi handle value. Due to 32->16bit handle truncation low enough handle values could be misinterpreted as stock brushes indices in FillRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index e861f24..237544d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); -#define FIRST_GDI_HANDLE 16 +#define FIRST_GDI_HANDLE 32 #define MAX_GDI_HANDLES 16384 struct hdc_list

1 0

Stefan Dösinger : wined3d: Pass a texture and sub-resource index to wined3d_texture_ops.texture_sub_resource_upload_data ().
by Alexandre Julliard April 8, 2016

April 8, 2016

Module: wine Branch: master Commit: b284f1383690ab28f46b0273f371215e78647587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b284f1383690ab28f46b0273f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Apr 7 19:38:02 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_texture_ops.texture_sub_resource_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 27 +++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b31b0e1..0a89665 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1077,9 +1077,7 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { - struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; - - texture->texture_ops->texture_sub_resource_upload_data(sub_resource, context, &data[i]); + texture->texture_ops->texture_upload_data(texture, i, context, &data[i]); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); } @@ -1089,21 +1087,23 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, return WINED3D_OK; } -static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource, +static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { - struct wined3d_surface *surface = surface_from_resource(sub_resource); static const POINT dst_point = {0, 0}; struct wined3d_const_bo_address addr; + unsigned int texture_level; RECT src_rect; - SetRect(&src_rect, 0, 0, surface->resource.width, surface->resource.height); + texture_level = sub_resource_idx % texture->level_count; + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(texture, texture_level), + wined3d_texture_get_level_height(texture, texture_level)); addr.buffer_object = 0; addr.addr = data->data; - wined3d_surface_upload_data(surface, context->gl_info, surface->container->resource.format, - &src_rect, data->row_pitch, &dst_point, FALSE, &addr); + wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, + texture->resource.format, &src_rect, data->row_pitch, &dst_point, FALSE, &addr); } static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -1199,7 +1199,7 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture2d_ops = { - texture2d_sub_resource_upload_data, + texture2d_upload_data, texture2d_load_location, texture2d_prepare_location, texture2d_prepare_texture, @@ -1684,21 +1684,20 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_resource, +static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { - struct wined3d_volume *volume = volume_from_resource(sub_resource); struct wined3d_const_bo_address addr; unsigned int row_pitch, slice_pitch; - wined3d_texture_get_pitch(volume->container, volume->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch); addr.buffer_object = 0; addr.addr = data->data; - wined3d_volume_upload_data(volume, context, &addr); + wined3d_volume_upload_data(texture->sub_resources[sub_resource_idx].u.volume, context, &addr); } static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -1755,7 +1754,7 @@ static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture3d_ops = { - texture3d_sub_resource_upload_data, + texture3d_upload_data, texture3d_load_location, texture3d_prepare_location, texture3d_prepare_texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb6d967..e6cd1ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2416,7 +2416,7 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_sub_resource_upload_data)(struct wined3d_resource *sub_resource, + void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch().
by Alexandre Julliard April 8, 2016

April 8, 2016

Module: wine Branch: master Commit: 81dae1c6362bcd0d0b2571e535f3a3ed4f9ff616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81dae1c6362bcd0d0b2571e53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:37:57 2016 +0200 wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c015cc..301aa16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2172,9 +2172,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st struct wined3d_device *device = dst_texture->resource.device; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ - UINT fbwidth = src_surface->resource.width; - UINT fbheight = src_surface->resource.height; const struct wined3d_gl_info *gl_info; + unsigned int src_width, src_height; struct wined3d_context *context; GLenum drawBuffer = GL_BACK; GLenum offscreen_buffer; @@ -2192,6 +2191,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_texture_load(dst_texture, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); + src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); + src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; @@ -2258,7 +2259,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } /* TODO: Only back up the part that will be overwritten */ - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, 0, 0, 0, 0, fbwidth, fbheight); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, 0, 0, 0, 0, src_width, src_height); checkGLcall("glCopyTexSubImage2D"); @@ -2288,7 +2289,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, src_surface->pow2Width, src_surface->pow2Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); checkGLcall("glTexImage2D"); - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, fbwidth, fbheight); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, src_width, src_height); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); checkGLcall("glTexParameteri"); @@ -2312,13 +2313,13 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st if (!upsidedown) { - top = src_surface->resource.height - src_rect->top; - bottom = src_surface->resource.height - src_rect->bottom; + top = src_height - src_rect->top; + bottom = src_height - src_rect->bottom; } else { - top = src_surface->resource.height - src_rect->bottom; - bottom = src_surface->resource.height - src_rect->top; + top = src_height - src_rect->bottom; + bottom = src_height - src_rect->top; } if (src_texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) @@ -2398,20 +2399,20 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glBegin(GL_QUADS); /* top left */ gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, 0.0f); - gl_info->gl_ops.gl.p_glVertex2i(0, fbheight); + gl_info->gl_ops.gl.p_glVertex2i(0, src_height); /* bottom left */ - gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)fbheight / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)src_height / (float)src_surface->pow2Height); gl_info->gl_ops.gl.p_glVertex2i(0, 0); /* bottom right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, - (float)fbheight / (float)src_surface->pow2Height); - gl_info->gl_ops.gl.p_glVertex2i(fbwidth, 0); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, + (float)src_height / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glVertex2i(src_width, 0); /* top right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, 0.0f); - gl_info->gl_ops.gl.p_glVertex2i(fbwidth, fbheight); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, 0.0f); + gl_info->gl_ops.gl.p_glVertex2i(src_width, src_height); gl_info->gl_ops.gl.p_glEnd(); } gl_info->gl_ops.gl.p_glDisable(texture_target);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_load_texture().
by Alexandre Julliard April 8, 2016

April 8, 2016

Module: wine Branch: master Commit: 11db4d4a1d1b9a63962f3ef1f5dac616dd7d4fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=11db4d4a1d1b9a63962f3ef1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:38:01 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8ac3b2f..5427ee9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3044,8 +3044,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - unsigned int width, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; - const RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; + unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = surface->container; @@ -3056,6 +3055,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_format format; POINT dst_point = {0, 0}; BYTE *mem = NULL; + RECT src_rect; sub_resource = surface_get_sub_resource(surface); if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -3067,6 +3067,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return WINED3D_OK; } + width = wined3d_texture_get_level_width(texture, surface->texture_level); + height = wined3d_texture_get_level_height(texture, surface->texture_level); + SetRect(&src_rect, 0, 0, width, height); + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, @@ -3092,10 +3096,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; 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, context, WINED3D_TEXF_POINT, surface, src_location, - &rect, surface, dst_location, &rect); + &src_rect, surface, dst_location, &src_rect); return WINED3D_OK; } @@ -3134,8 +3137,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, wined3d_texture_bind_and_dirtify(texture, context, srgb); wined3d_texture_get_pitch(texture, surface->texture_level, &src_row_pitch, &src_slice_pitch); - width = surface->resource.width; - format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) format = *wined3d_get_format(gl_info, conversion->dst_format); @@ -3160,8 +3161,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (format.convert) { /* This code is entered for texture formats which need a fixup. */ - UINT height = surface->resource.height; - format.byte_count = format.conv_byte_count; wined3d_format_calculate_pitch(&format, 1, width, height, &dst_row_pitch, &dst_slice_pitch); @@ -3180,7 +3179,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* This code is only entered for color keying fixups */ struct wined3d_palette *palette = NULL; - UINT height = surface->resource.height; wined3d_format_calculate_pitch(&format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch);

1 0

Nikolay Sivov : user32: Limit broadcast messages to system and registered ones.
by Alexandre Julliard April 8, 2016

April 8, 2016

Module: wine Branch: master Commit: ad7cb436571ec66ae7a5687568fca2f5318c7e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7cb436571ec66ae7a568756… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 17:46:18 2016 +0300 user32: Limit broadcast messages to system and registered ones. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 10 ++++++++-- dlls/user32/tests/msg.c | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9e0ce05..94d7a84 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3232,6 +3232,10 @@ static LRESULT send_inter_thread_callback( HWND hwnd, UINT msg, WPARAM wp, LPARA return send_inter_thread_message( info, result ); } +static BOOL is_message_broadcastable(UINT msg) +{ + return msg < WM_USER || msg >= 0xc000; +} /*********************************************************************** * send_message @@ -3246,7 +3250,8 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO if (is_broadcast(info->hwnd)) { - EnumWindows( broadcast_message_callback, (LPARAM)info ); + if (is_message_broadcastable( info->msg )) + EnumWindows( broadcast_message_callback, (LPARAM)info ); if (res_ptr) *res_ptr = 1; return TRUE; } @@ -3659,7 +3664,8 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) if (is_broadcast(hwnd)) { - EnumWindows( broadcast_message_callback, (LPARAM)&info ); + if (is_message_broadcastable( info.msg )) + EnumWindows( broadcast_message_callback, (LPARAM)&info ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3c5914e..d2059a8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14047,7 +14047,6 @@ static void test_broadcast(void) } else { - todo_wine ok(!ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); } @@ -14064,7 +14063,6 @@ static void test_broadcast(void) } else { - todo_wine ok(!ret, "%d: got %d, error %d\n", i, ret, GetLastError()); } @@ -14082,7 +14080,6 @@ static void test_broadcast(void) } else { - todo_wine ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_lparam, GetLastError()); } @@ -14102,7 +14099,6 @@ static void test_broadcast(void) } else { - todo_wine ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_lparam, GetLastError()); }

1 0