wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : wined3d: Require a valid destination point in surface_upload_from_surface().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: f243302ed527cb892645ceb225b347768d08e529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f243302ed527cb892645ceb22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:34 2017 +0200 wined3d: Require a valid destination point in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c0f9491..dfb083d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -878,25 +878,12 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_context *context; struct wined3d_bo_address data; UINT update_w, update_h; - RECT r, dst_rect; - POINT p; + RECT r; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - if (!dst_point) - { - p.x = 0; - p.y = 0; - dst_point = &p; - } - else if (dst_point->x < 0 || dst_point->y < 0) - { - WARN("Invalid destination point.\n"); - return WINED3DERR_INVALIDCALL; - } - if (!src_rect) { SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), @@ -910,21 +897,14 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, return WINED3DERR_INVALIDCALL; } - update_w = src_rect->right - src_rect->left; - update_h = src_rect->bottom - src_rect->top; - SetRect(&dst_rect, dst_point->x, dst_point->y, dst_point->x + update_w, dst_point->y + update_h); - if (!wined3d_surface_check_rect_dimensions(dst_surface, &dst_rect)) - { - WARN("Destination rectangle not block-aligned.\n"); - return WINED3DERR_INVALIDCALL; - } - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info; /* Only load the surface for partial updates. For newly allocated texture * the texture wouldn't be the current location, and we'd upload zeroes * just to overwrite them again. */ + update_w = src_rect->right - src_rect->left; + update_h = src_rect->bottom - src_rect->top; if (update_w == wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level) && update_h == wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level)) wined3d_texture_prepare_texture(dst_texture, context, FALSE);

1 0

Henri Verbeet : wined3d: Implement wined3d_device_update_texture() on top of wined3d_cs_emit_blt_sub_resource().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 4c8b3e0d19a9c10400311419b605bf016e65bd05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8b3e0d19a9c10400311419b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:33 2017 +0200 wined3d: Implement wined3d_device_update_texture() on top of wined3d_cs_emit_blt_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 61 ++++++++++----------------------------------------- 1 file changed, 11 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2b30eb..a43e080 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3544,12 +3544,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; - unsigned int row_pitch, slice_pitch; + unsigned int width, height, depth; enum wined3d_resource_type type; - struct wined3d_context *context; - struct wined3d_bo_address data; - HRESULT hr; - RECT r; + struct wined3d_box box; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -3617,59 +3614,23 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - context = context_acquire(device, NULL, 0); - - /* Make sure that the destination texture is loaded. */ - wined3d_texture_load(dst_texture, context, FALSE); - - /* Only a prepare, since we're uploading entire sub-resources. */ - wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - /* Update every surface level of the texture. */ for (i = 0; i < level_count; ++i) { + width = wined3d_texture_get_level_width(dst_texture, i); + height = wined3d_texture_get_level_height(dst_texture, i); + depth = wined3d_texture_get_level_depth(dst_texture, i); + wined3d_box_set(&box, 0, 0, width, height, 0, depth); + for (j = 0; j < layer_count; ++j) { - unsigned int src_sub_resource_idx = j * src_level_count + i + src_skip_levels; - unsigned int dst_sub_resource_idx = j * dst_level_count + i; - - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, i), - wined3d_texture_get_level_height(dst_texture, i)); - if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, - src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - context_release(context); - return hr; - } - continue; - } - - if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, - context, src_texture->resource.map_binding)) - { - WARN("Failed to load source sub-resource %u into %s.\n", src_sub_resource_idx, - wined3d_debug_location(src_texture->resource.map_binding)); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - - wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->resource.map_binding); - wined3d_texture_get_pitch(src_texture, src_skip_levels + i, &row_pitch, &slice_pitch); - - wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, NULL, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + wined3d_cs_emit_blt_sub_resource(device->cs, + &dst_texture->resource, j * dst_level_count + i, &box, + &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, + 0, NULL, WINED3D_TEXF_POINT); } } - context_release(context); - return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Unify the 2D and 3D paths in wined3d_device_update_texture().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: c1ebab1a4b19f71e1f421f74efc674ff2d936a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ebab1a4b19f71e1f421f74e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:32 2017 +0200 wined3d: Unify the 2D and 3D paths in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 108 ++++++++++++++++------------------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 42 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9bf3600..d2b30eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3542,6 +3542,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture) { unsigned int src_size, dst_size, src_skip_levels = 0; + unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; unsigned int row_pitch, slice_pitch; enum wined3d_resource_type type; @@ -3591,8 +3592,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - level_count = min(wined3d_texture_get_level_count(src_texture), - wined3d_texture_get_level_count(dst_texture)); + src_level_count = src_texture->level_count; + dst_level_count = dst_texture->level_count; + level_count = min(src_level_count, dst_level_count); src_size = max(src_texture->resource.width, src_texture->resource.height); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); @@ -3615,88 +3617,60 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* Make sure that the destination texture is loaded. */ context = context_acquire(device, NULL, 0); + + /* Make sure that the destination texture is loaded. */ wined3d_texture_load(dst_texture, context, FALSE); - context_release(context); + + /* Only a prepare, since we're uploading entire sub-resources. */ + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); /* Update every surface level of the texture. */ - switch (type) + for (i = 0; i < level_count; ++i) { - case WINED3D_RTYPE_TEXTURE_2D: + for (j = 0; j < layer_count; ++j) { - unsigned int src_levels = src_texture->level_count; - unsigned int dst_levels = dst_texture->level_count; - struct wined3d_surface *src_surface; - struct wined3d_surface *dst_surface; + unsigned int src_sub_resource_idx = j * src_level_count + i + src_skip_levels; + unsigned int dst_sub_resource_idx = j * dst_level_count + i; - for (i = 0; i < layer_count; ++i) + /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ + if (dst_texture->resource.format->convert + || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) { - for (j = 0; j < level_count; ++j) + SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, i), + wined3d_texture_get_level_height(dst_texture, i)); + if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, + src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) { - unsigned int src_sub_resource_idx = i * src_levels + j + src_skip_levels; - unsigned int dst_sub_resource_idx = i * dst_levels + j; - - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, j), - wined3d_texture_get_level_height(dst_texture, j)); - if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, - src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; - } - continue; - } - - src_surface = src_texture->sub_resources[src_sub_resource_idx].u.surface; - dst_surface = dst_texture->sub_resources[dst_sub_resource_idx].u.surface; - if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) - { - WARN("Failed to update surface, hr %#x.\n", hr); - return hr; - } + WARN("Failed to update surface, hr %#x.\n", hr); + context_release(context); + return hr; } + continue; } - return WINED3D_OK; - } - case WINED3D_RTYPE_TEXTURE_3D: - context = context_acquire(device, NULL, 0); - - /* Only a prepare, since we're uploading entire volumes. */ - wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); - - for (j = 0; j < level_count; ++j) + if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, + context, src_texture->resource.map_binding)) { - if (!wined3d_texture_load_location(src_texture, src_skip_levels + j, - context, src_texture->resource.map_binding)) - { - WARN("Failed to load source sub-resource %u into %s.\n", src_skip_levels + j, - wined3d_debug_location(src_texture->resource.map_binding)); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - - wined3d_texture_get_memory(src_texture, src_skip_levels + j, &data, src_texture->resource.map_binding); - wined3d_texture_get_pitch(src_texture, src_skip_levels + j, &row_pitch, &slice_pitch); - - wined3d_texture_upload_data(dst_texture, j, context, NULL, - wined3d_const_bo_address(&data), row_pitch, slice_pitch); - wined3d_texture_invalidate_location(dst_texture, j, ~WINED3D_LOCATION_TEXTURE_RGB); + WARN("Failed to load source sub-resource %u into %s.\n", src_sub_resource_idx, + wined3d_debug_location(src_texture->resource.map_binding)); + context_release(context); + return WINED3DERR_INVALIDCALL; } - context_release(context); - return WINED3D_OK; + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, src_skip_levels + i, &row_pitch, &slice_pitch); - default: - FIXME("Unsupported texture type %#x.\n", type); - return WINED3DERR_INVALIDCALL; + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, NULL, + wined3d_const_bo_address(&data), row_pitch, slice_pitch); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + } } + + context_release(context); + + return WINED3D_OK; } HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c9d9c10..c0f9491 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -866,7 +866,7 @@ static BOOL wined3d_surface_check_rect_dimensions(struct wined3d_surface *surfac return SUCCEEDED(wined3d_texture_check_box_dimensions(surface->container, surface->texture_level, &box)); } -HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, +static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b40e132..9f98136 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3085,8 +3085,6 @@ BOOL surface_load_location(struct wined3d_surface *surface, void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; -HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, - struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : odbccp32: Look in LOCAL_MACHINE for the driver.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 3b5a8707e6c1c8ea94df59372aac7bc34c47925d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5a8707e6c1c8ea94df59372… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 10 04:30:36 2017 +0000 odbccp32: Look in LOCAL_MACHINE for the driver. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 666d8c0..f28d464 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -260,7 +260,7 @@ static HMODULE load_config_driver(const WCHAR *driver) DWORD size = 0, type; HKEY hkey; - if ((ret = RegOpenKeyW(HKEY_CURRENT_USER, odbcini, &hkey)) == ERROR_SUCCESS) + if ((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) { HKEY hkeydriver;

1 0

Stefan Dösinger : comctl32: Don' t touch the new child twice in PGM_SETCHILD.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 692656467729c5548c45244aa05ca946620afa72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=692656467729c5548c45244aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:02:04 2017 +0200 comctl32: Don't touch the new child twice in PGM_SETCHILD. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 15 ++++----------- dlls/comctl32/tests/pager.c | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index a10d3bb..ae759fb 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -248,10 +248,9 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr) TRACE("[%p] SWP %dx%d at (%d,%d)\n", infoPtr->hwndSelf, infoPtr->nWidth, infoPtr->nHeight, -nPos, 0); - SetWindowPos(infoPtr->hwndChild, 0, + SetWindowPos(infoPtr->hwndChild, HWND_TOP, -nPos, 0, - infoPtr->nWidth, infoPtr->nHeight, - SWP_NOZORDER); + infoPtr->nWidth, infoPtr->nHeight, 0); } else { @@ -262,10 +261,9 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr) TRACE("[%p] SWP %dx%d at (%d,%d)\n", infoPtr->hwndSelf, infoPtr->nWidth, infoPtr->nHeight, 0, -nPos); - SetWindowPos(infoPtr->hwndChild, 0, + SetWindowPos(infoPtr->hwndChild, HWND_TOP, 0, -nPos, - infoPtr->nWidth, infoPtr->nHeight, - SWP_NOZORDER); + infoPtr->nWidth, infoPtr->nHeight, 0); } InvalidateRect(infoPtr->hwndChild, NULL, TRUE); @@ -481,11 +479,6 @@ PAGER_SetChild (PAGER_INFO* infoPtr, HWND hwndChild) SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); - /* position child within the page scroller */ - SetWindowPos(infoPtr->hwndChild, HWND_TOP, - 0,0,0,0, - SWP_SHOWWINDOW | SWP_NOSIZE); /* native is 0 */ - infoPtr->nPos = -1; PAGER_SetPos(infoPtr, 0, FALSE); } diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index e7ce748..7a9cdbb 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -283,7 +283,7 @@ static void test_pager(void) GetWindowRect(pager, &rect); ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); - todo_wine ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n"); + ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd);

1 0

Stefan Dösinger : comctl32/tests: Extend PGM_SETCHILD tests.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 310eb883b7d4f8629b99f1414141777399abd087 URL: http://source.winehq.org/git/wine.git/?a=commit;h=310eb883b7d4f8629b99f1414… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:02:03 2017 +0200 comctl32/tests: Extend PGM_SETCHILD tests. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 9a0bb08..e7ce748 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -27,9 +27,10 @@ #define NUM_MSG_SEQUENCES 1 #define PAGER_SEQ_INDEX 0 -static HWND parent_wnd, child1_wnd; +static HWND parent_wnd, child1_wnd, child2_wnd; #define CHILD1_ID 1 +#define CHILD2_ID 2 static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -42,10 +43,28 @@ static const struct message set_child_seq[] = { { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, { WM_WINDOWPOSCHANGED, sent }, { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD1_ID }, - { WM_NCCALCSIZE, sent|wparam|id, TRUE, 0, CHILD1_ID }, + { WM_NCCALCSIZE, sent|wparam|id|optional, TRUE, 0, CHILD1_ID }, { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD1_ID }, { WM_WINDOWPOSCHANGED, sent|id, 0, 0, CHILD1_ID }, - { WM_SIZE, sent|id|defwinproc, 0, 0, CHILD1_ID }, + { WM_SIZE, sent|id|defwinproc|optional, 0, 0, CHILD1_ID }, + { 0 } +}; + +/* This differs from the above message list only in the child window that is + * expected to receive the child messages. No message is sent to the old child. + * Also child 2 is hidden while child 1 is visible. The pager does not make the + * hidden child visible. */ +static const struct message switch_child_seq[] = { + { PGM_SETCHILD, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_NCCALCSIZE, sent|wparam, TRUE }, + { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, + { WM_WINDOWPOSCHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD2_ID }, + { WM_NCCALCSIZE, sent|wparam|id, TRUE, 0, CHILD2_ID }, + { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD2_ID }, + { WM_WINDOWPOSCHANGED, sent|id, 0, 0, CHILD2_ID }, + { WM_SIZE, sent|id|defwinproc, 0, 0, CHILD2_ID }, { 0 } }; @@ -201,6 +220,8 @@ static LRESULT WINAPI child_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM if (hwnd == child1_wnd) msg.id = CHILD1_ID; + else if (hwnd == child2_wnd) + msg.id = CHILD2_ID; else msg.id = 0; @@ -246,6 +267,8 @@ static void test_pager(void) child1_wnd = CreateWindowA( "Pager test child class", "button", WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 300, 300, pager, 0, GetModuleHandleA(0), 0 ); + child2_wnd = CreateWindowA("Pager test child class", "button", WS_CHILD | WS_BORDER, 0, 0, 300, 300, + pager, 0, GetModuleHandleA(0), 0); flush_sequences( sequences, NUM_MSG_SEQUENCES ); SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd ); @@ -254,6 +277,21 @@ static void test_pager(void) ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top ); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child2_wnd); + ok_sequence(sequences, PAGER_SEQ_INDEX, switch_child_seq, "switch to invisible child", TRUE); + GetWindowRect(pager, &rect); + ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, + "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); + todo_wine ok(!IsWindowVisible(child2_wnd), "Child window 2 is visible\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "switch to visible child", TRUE); + GetWindowRect(pager, &rect); + ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, + "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); + flush_sequences( sequences, NUM_MSG_SEQUENCES ); SendMessageA( pager, PGM_SETPOS, 0, 10 ); ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_seq, "set pos", TRUE);

1 0

Stefan Dösinger : comctl32/tests: Test messages sent to the pager child.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: b73bf3bac393a63141abd5026243c277e7c682db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73bf3bac393a63141abd5026… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 7 16:02:02 2017 +0200 comctl32/tests: Test messages sent to the pager child. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 75 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 372b227..9a0bb08 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -27,7 +27,9 @@ #define NUM_MSG_SEQUENCES 1 #define PAGER_SEQ_INDEX 0 -static HWND parent_wnd; +static HWND parent_wnd, child1_wnd; + +#define CHILD1_ID 1 static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -39,6 +41,11 @@ static const struct message set_child_seq[] = { { WM_NCCALCSIZE, sent|wparam, TRUE }, { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, { WM_WINDOWPOSCHANGED, sent }, + { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD1_ID }, + { WM_NCCALCSIZE, sent|wparam|id, TRUE, 0, CHILD1_ID }, + { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD1_ID }, + { WM_WINDOWPOSCHANGED, sent|id, 0, 0, CHILD1_ID }, + { WM_SIZE, sent|id|defwinproc, 0, 0, CHILD1_ID }, { 0 } }; @@ -49,7 +56,20 @@ static const struct message set_pos_seq[] = { { WM_NOTIFY, sent|id|parent, 0, 0, PGN_CALCSIZE }, { WM_WINDOWPOSCHANGED, sent }, { WM_MOVE, sent|optional }, + /* The WM_SIZE handler sends WM_WINDOWPOSCHANGING, WM_CHILDACTIVATE + * and WM_WINDOWPOSCHANGED (which sends WM_MOVE) to the child. + * Another WM_WINDOWPOSCHANGING is sent afterwards. + * + * The 2nd WM_WINDOWPOSCHANGING is unconditional, but the comparison + * function is too simple to roll back an accepted message, so we have + * to mark the 2nd message optional. */ { WM_SIZE, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|id, 0, 0, CHILD1_ID }, /* Actually optional. */ + { WM_CHILDACTIVATE, sent|id, 0, 0, CHILD1_ID }, /* Actually optional. */ + { WM_WINDOWPOSCHANGED, sent|id|optional, TRUE, 0, CHILD1_ID}, + { WM_MOVE, sent|id|optional|defwinproc, 0, 0, CHILD1_ID }, + { WM_WINDOWPOSCHANGING, sent|id|optional, 0, 0, CHILD1_ID }, /* Actually not optional. */ + { WM_CHILDACTIVATE, sent|id|optional, 0, 0, CHILD1_ID }, /* Actually not optional. */ { 0 } }; @@ -166,9 +186,53 @@ static HWND create_pager_control( DWORD style ) return hwnd; } +static LRESULT WINAPI child_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + struct message msg; + static LONG defwndproc_counter; + LRESULT ret; + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + + if (hwnd == child1_wnd) + msg.id = CHILD1_ID; + else + msg.id = 0; + + add_message(sequences, PAGER_SEQ_INDEX, &msg); + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + return ret; +} + +static BOOL register_child_wnd_class(void) +{ + WNDCLASSA cls; + + cls.style = 0; + cls.lpfnWndProc = child_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "Pager test child class"; + return RegisterClassA(&cls); +} + static void test_pager(void) { - HWND pager, child; + HWND pager; RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); @@ -177,11 +241,14 @@ static void test_pager(void) win_skip( "Pager control not supported\n" ); return; } - child = CreateWindowA( "BUTTON", "button", WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 300, 300, + + register_child_wnd_class(); + + child1_wnd = CreateWindowA( "Pager test child class", "button", WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, 300, 300, pager, 0, GetModuleHandleA(0), 0 ); flush_sequences( sequences, NUM_MSG_SEQUENCES ); - SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child ); + SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd ); ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "set child", TRUE); GetWindowRect( pager, &rect ); ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100,

1 0

Paul Gofman : d3dx9: Preserve states regardless of state manager presence.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 2b18cd43215144e3c81e10fb05b792b47c5f9467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b18cd43215144e3c81e10fb0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 10 20:45:44 2017 +0200 d3dx9: Preserve states regardless of state manager presence. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++++-- dlls/d3dx9_36/tests/effect.c | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 49409ae..813b57e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3788,7 +3788,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW if (flags & ~(D3DXFX_DONOTSAVESTATE | D3DXFX_DONOTSAVESAMPLERSTATE | D3DXFX_DONOTSAVESHADERSTATE)) WARN("Invalid flags (%#x) specified.\n", flags); - if (effect->manager || flags & D3DXFX_DONOTSAVESTATE) + if (flags & D3DXFX_DONOTSAVESTATE) { TRACE("State capturing disabled.\n"); } @@ -3799,12 +3799,17 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW if (!technique->saved_state) { + ID3DXEffectStateManager *manager; + + manager = effect->manager; + effect->manager = NULL; if (FAILED(hr = IDirect3DDevice9_BeginStateBlock(effect->device))) ERR("BeginStateBlock failed, hr %#x.\n", hr); for (i = 0; i < technique->pass_count; i++) d3dx9_apply_pass_states(effect, &technique->passes[i], TRUE); if (FAILED(hr = IDirect3DDevice9_EndStateBlock(effect->device, &technique->saved_state))) ERR("EndStateBlock failed, hr %#x.\n", hr); + effect->manager = manager; } if (FAILED(hr = IDirect3DStateBlock9_Capture(technique->saved_state))) ERR("StateBlock Capture failed, hr %#x.\n", hr); @@ -3883,7 +3888,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) if (!effect->started) return D3D_OK; - if (effect->manager || effect->flags & D3DXFX_DONOTSAVESTATE) + if (effect->flags & D3DXFX_DONOTSAVESTATE) { TRACE("State restoring disabled.\n"); } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fd41156..de5ae69 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5673,7 +5673,6 @@ static void test_effect_state_manager(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetLight(device, i, &light); ok(hr == D3D_OK, "Got result %#x.\n", hr); - todo_wine ok(!memcmp(&light, &light_filler, sizeof(light)), "Light %u mismatch.\n", i); }

1 0

Paul Gofman : d3dx9: Support effect state manager.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: d6ab655a0936509628f5c8d5ef5e49653ad8fe03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ab655a0936509628f5c8d5e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 10 20:45:43 2017 +0200 d3dx9: Support effect state manager. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 6 +++- dlls/d3dx9_36/effect.c | 75 +++++++++++++++++++++++++++---------------- dlls/d3dx9_36/preshader.c | 22 ++++++------- dlls/d3dx9_36/tests/effect.c | 2 -- 4 files changed, 64 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6ab655a0936509628f5c…

1 0

Paul Gofman : d3dx9/tests: Add tests for effect state manager.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: de8e03c48613d85856bf323e0f55fed370092cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e03c48613d85856bf323e0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 10 20:45:42 2017 +0200 d3dx9/tests: Add tests for effect state manager. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 376 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 376 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de8e03c48613d85856bf3…

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017