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

Józef Kucia : wined3d: Recognize SM5 dcl_output_control_point_count opcode.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 5367c0d2b4276471323d04e27e4d4ecc924ae0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5367c0d2b4276471323d04e27… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:58 2016 +0200 wined3d: Recognize SM5 dcl_output_control_point_count opcode. 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/wined3d/arb_program_shader.c | 309 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 309 ++++++++++++++++++------------------- dlls/wined3d/shader.c | 312 +++++++++++++++++++------------------- dlls/wined3d/shader_sm4.c | 197 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 568 insertions(+), 560 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5367c0d2b4276471323d0…

1 0

Nikolay Sivov : d2d1/tests: Basic test for ID2D1DCRenderTarget creation.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: ea7df313190eb4aa3ebf46f134e72dd8ed253129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7df313190eb4aa3ebf46f13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 29 14:12:31 2016 +0300 d2d1/tests: Basic test for ID2D1DCRenderTarget creation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 2a78d2c..7f9632f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2626,6 +2626,71 @@ todo_wine DestroyWindow(window); } +static void test_dc_target(void) +{ + static const D2D1_PIXEL_FORMAT invalid_formats[] = + { + { DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_PREMULTIPLIED }, + { DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_UNKNOWN }, + { DXGI_FORMAT_R8G8B8A8_UNORM, D2D1_ALPHA_MODE_PREMULTIPLIED }, + }; + D2D1_RENDER_TARGET_PROPERTIES desc; + ID2D1SolidColorBrush *brush; + ID2D1DCRenderTarget *rt; + ID2D1Factory *factory; + D2D1_COLOR_F color; + D2D1_SIZE_F size; + unsigned int i; + HRESULT hr; + + hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); + + for (i = 0; i < sizeof(invalid_formats) / sizeof(*invalid_formats); ++i) + { + desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + desc.pixelFormat = invalid_formats[i]; + desc.dpiX = 96.0f; + desc.dpiY = 96.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); + todo_wine + ok(hr == D2DERR_UNSUPPORTED_PIXEL_FORMAT, "Got unexpected hr %#x.\n", hr); + } + + desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; + desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; + desc.dpiX = 96.0f; + desc.dpiY = 96.0f; + desc.usage = D2D1_RENDER_TARGET_USAGE_NONE; + desc.minLevel = D2D1_FEATURE_LEVEL_DEFAULT; + hr = ID2D1Factory_CreateDCRenderTarget(factory, &desc, &rt); +todo_wine + ok(SUCCEEDED(hr), "Failed to create target, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ + size = ID2D1DCRenderTarget_GetSize(rt); + ok(size.width == 0.0f, "got width %.08e.\n", size.width); + ok(size.height == 0.0f, "got height %.08e.\n", size.height); + + /* object creation methods work without BindDC() */ + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1DCRenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + ID2D1SolidColorBrush_Release(brush); + + ID2D1DCRenderTarget_BeginDraw(rt); + hr = ID2D1DCRenderTarget_EndDraw(rt, NULL, NULL); + ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#x.\n", hr); + + ID2D1DCRenderTarget_Release(rt); +} + ID2D1Factory_Release(factory); +} + START_TEST(d2d1) { test_clip(); @@ -2640,4 +2705,5 @@ START_TEST(d2d1) test_opacity_brush(); test_create_target(); test_draw_text_layout(); + test_dc_target(); }

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in swapchain_gl_present ().
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 5f05acfcff7259ed6e5b15e2a28eac2eafdb3400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f05acfcff7259ed6e5b15e2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:31 2016 +0200 wined3d: Use wined3d_texture_blt() in swapchain_gl_present(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 09cc45a..3c282ce 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -480,6 +480,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, wined3d_texture_get_sub_resource(swapchain->back_buffers[0], 0)); const struct wined3d_fb_state *fb = &swapchain->device->fb; const struct wined3d_gl_info *gl_info; + struct wined3d_texture *logo_texture; struct wined3d_context *context; struct wined3d_surface *front; BOOL render_to_fbo; @@ -494,23 +495,19 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, gl_info = context->gl_info; - if (swapchain->device->logo_texture) + if ((logo_texture = swapchain->device->logo_texture)) { - struct wined3d_surface *src_surface = surface_from_resource( - wined3d_texture_get_sub_resource(swapchain->device->logo_texture, 0)); - RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; + RECT rect = {0, 0, logo_texture->resource.width, logo_texture->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, + wined3d_texture_blt(swapchain->back_buffers[0], 0, &rect, logo_texture, 0, &rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); } if (swapchain->device->bCursorVisible && swapchain->device->cursor_texture && !swapchain->device->hardwareCursor) { - struct wined3d_surface *cursor = surface_from_resource( - wined3d_texture_get_sub_resource(swapchain->device->cursor_texture, 0)); - RECT destRect = + RECT dst_rect = { swapchain->device->xScreenSpace - swapchain->device->xHotSpot, swapchain->device->yScreenSpace - swapchain->device->yHotSpot, @@ -523,14 +520,17 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, swapchain->device->cursor_texture->resource.width, swapchain->device->cursor_texture->resource.height }; - const RECT clip_rect = {0, 0, back_buffer->resource.width, back_buffer->resource.height}; + const RECT clip_rect = {0, 0, + swapchain->back_buffers[0]->resource.width, + swapchain->back_buffers[0]->resource.height}; TRACE("Rendering the software cursor.\n"); if (swapchain->desc.windowed) - MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - if (wined3d_clip_blit(&clip_rect, &destRect, &src_rect)) - wined3d_surface_blt(back_buffer, &destRect, cursor, &src_rect, + MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&dst_rect, 2); + if (wined3d_clip_blit(&clip_rect, &dst_rect, &src_rect)) + wined3d_texture_blt(swapchain->back_buffers[0], 0, &dst_rect, + swapchain->device->cursor_texture, 0, &src_rect, WINED3D_BLT_ALPHA_TEST, NULL, WINED3D_TEXF_POINT); }

1 0

Henri Verbeet : wined3d: Store the context' s current rendertarget as a texture and sub-resource index.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: d6e2f650d5d141cea1982269b3367d6b45cf8694 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e2f650d5d141cea1982269b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:32 2016 +0200 wined3d: Store the context's current rendertarget as a texture and sub-resource index. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 119 ++++++++++++++++++++++++++--------------- dlls/wined3d/query.c | 14 ++--- dlls/wined3d/surface.c | 44 +++++++-------- dlls/wined3d/wined3d_private.h | 15 +++++- 4 files changed, 119 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d6e2f650d5d141cea1982…

1 0

Henri Verbeet : wined3d: Simplify checking if the released resource is in use as a rendertarget in device_resource_released ().
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 4a9304305ae2940288e9382926a6931dd46982d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9304305ae2940288e938292… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:33 2016 +0200 wined3d: Simplify checking if the released resource is in use as a rendertarget in device_resource_released(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cd392b3..8fe1da3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4970,37 +4970,24 @@ static void device_resource_remove(struct wined3d_device *device, struct wined3d void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) { enum wined3d_resource_type type = resource->type; + struct wined3d_rendertarget_view *rtv; unsigned int i; TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); context_resource_released(device, resource, type); - switch (type) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - case WINED3D_RTYPE_SURFACE: - { - struct wined3d_surface *surface = surface_from_resource(resource); - - if (!device->d3d_initialized) break; - - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) - { - if (wined3d_rendertarget_view_get_surface(device->fb.render_targets[i]) == surface) - { - ERR("Surface %p is still in use as render target %u.\n", surface, i); - device->fb.render_targets[i] = NULL; - } - } + if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) + ERR("Resource %p is still in use as render target %u.\n", resource, i); + } - if (wined3d_rendertarget_view_get_surface(device->fb.depth_stencil) == surface) - { - ERR("Surface %p is still in use as depth/stencil buffer.\n", surface); - device->fb.depth_stencil = NULL; - } - } - break; + if ((rtv = device->fb.depth_stencil) && rtv->resource == resource) + ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + switch (type) + { case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i)

1 0

Henri Verbeet : wined3d: Validate the sub-resource index in wined3d_rendertarget_view_init().
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 33d49ecd76e36053138552008f2389575698c5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d49ecd76e36053138552008… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:34 2016 +0200 wined3d: Validate the sub-resource index in wined3d_rendertarget_view_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 36 +++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 5 +---- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 8d4f7fd..29b370f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -60,18 +60,16 @@ void * CDECL wined3d_rendertarget_view_get_parent(const struct wined3d_rendertar void * CDECL wined3d_rendertarget_view_get_sub_resource_parent(const struct wined3d_rendertarget_view *view) { - struct wined3d_resource *sub_resource; + struct wined3d_texture *texture; TRACE("view %p.\n", view); if (view->resource->type == WINED3D_RTYPE_BUFFER) return wined3d_buffer_get_parent(buffer_from_resource(view->resource)); - if (!(sub_resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(view->resource), - view->sub_resource_idx))) - return NULL; + texture = wined3d_texture_from_resource(view->resource); - return wined3d_resource_get_parent(sub_resource); + return wined3d_resource_get_parent(texture->sub_resources[view->sub_resource_idx].resource); } void CDECL wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent) @@ -88,15 +86,13 @@ struct wined3d_resource * CDECL wined3d_rendertarget_view_get_resource(const str return view->resource; } -static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, +static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, const struct wined3d_rendertarget_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; view->refcount = 1; - view->resource = resource; - wined3d_resource_incref(resource); view->parent = parent; view->parent_ops = parent_ops; @@ -113,16 +109,20 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie else { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); - struct wined3d_resource *sub_resource; + if (desc->u.texture.level_idx >= texture->level_count + || desc->u.texture.layer_idx >= texture->layer_count + || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) + return WINED3DERR_INVALIDCALL; view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - sub_resource = wined3d_texture_get_sub_resource(texture, view->sub_resource_idx); - view->buffer_offset = 0; - view->width = sub_resource->width; - view->height = sub_resource->height; + view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); + view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx); view->depth = desc->u.texture.layer_count; } + wined3d_resource_incref(view->resource = resource); + + return WINED3D_OK; } HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, @@ -130,6 +130,7 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget struct wined3d_rendertarget_view **view) { struct wined3d_rendertarget_view *object; + HRESULT hr; TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", desc, resource, parent, parent_ops, view); @@ -137,12 +138,17 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_rendertarget_view_init(object, desc, resource, parent, parent_ops); + if (FAILED(hr = wined3d_rendertarget_view_init(object, desc, resource, parent, parent_ops))) + { + HeapFree(GetProcessHeap(), 0, object); + WARN("Failed to initialise view, hr %#x.\n", hr); + return hr; + } TRACE("Created render target view %p.\n", object); *view = object; - return WINED3D_OK; + return hr; } HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5beea4a..a9ad85c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2958,17 +2958,14 @@ struct wined3d_rendertarget_view static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( const struct wined3d_rendertarget_view *view) { - struct wined3d_resource *resource; struct wined3d_texture *texture; if (!view || view->resource->type != WINED3D_RTYPE_TEXTURE_2D) return NULL; texture = wined3d_texture_from_resource(view->resource); - if (!(resource = wined3d_texture_get_sub_resource(texture, view->sub_resource_idx))) - return NULL; - return surface_from_resource(resource); + return texture->sub_resources[view->sub_resource_idx].u.surface; } struct wined3d_shader_resource_view

1 0

Henri Verbeet : wined3d: Get rid of the d3d_surface and d3d_texture debug channels.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 97f4034e58e0bd12f1da6e1d9f840bd0e18ed7c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f4034e58e0bd12f1da6e1d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:35 2016 +0200 wined3d: Get rid of the d3d_surface and d3d_texture debug channels. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 13 +++++-------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/volume.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cd8c863..4a59c5a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -30,9 +30,8 @@ #include "wine/port.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -WINE_DECLARE_DEBUG_CHANNEL(d3d); #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ @@ -3262,7 +3261,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co return WINED3D_OK; } - if (WARN_ON(d3d_surface)) + if (WARN_ON(d3d)) { DWORD required_access = resource_access_from_location(location); if ((texture->resource.access_flags & required_access) != required_access) @@ -3400,7 +3399,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: - if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) + if (TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n"); dump_color_fixup_desc(src_format->color_fixup); @@ -4128,10 +4127,8 @@ do { \ } error: - if (flags && FIXME_ON(d3d_surface)) - { - FIXME("\tUnsupported flags: %#x.\n", flags); - } + if (flags) + FIXME(" Unsupported flags %#x.\n", flags); release: wined3d_resource_unmap(&dst_texture->resource, dst_sub_resource_idx); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4cf445a..ce6162f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -24,7 +24,7 @@ #include "wine/port.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(winediag); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index fe1b6ee..bfc0d0b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -24,7 +24,7 @@ #include "wine/port.h" #include "wined3d_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static BOOL volume_prepare_system_memory(struct wined3d_volume *volume)

1 0

Francois Gouget : testbot/TestAgent: Unify support for the old and new Wait RPCs.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: tools Branch: master Commit: 9166e2c95096d81c14e25c4ceaeadd5c8f6e4baf URL: http://source.winehq.org/git/tools.git/?a=commit;h=9166e2c95096d81c14e25c4c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 04:00:22 2016 +0200 testbot/TestAgent: Unify support for the old and new Wait RPCs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 76 ++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f255e0f..43481a9 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1184,46 +1184,38 @@ sub Wait($$$;$) debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", ", ", defined $Keepalive ? $Keepalive : "<undef>", "\n"); - # Make sure we have the server version - return undef if (!$self->{agentversion} and !$self->_Connect()); + my $Result; + $Keepalive ||= 0xffffffff; + my $OldTimeout = $self->{timeout}; - my ($OldTimeout, $Result); - if ($self->{agentversion} =~ / 1\.0$/) + my $Deadline = $Timeout ? time() + $Timeout : undef; + while (1) { - # Add a 5 second leeway to take into account network transmission delays - $OldTimeout = $self->SetTimeout($Timeout + 5) if ($Timeout); - - # Send the command - if (!$self->_StartRPC($RPC_WAIT) or - !$self->_SendListSize('ArgC', 1) or - !$self->_SendUInt64('Pid', $Pid)) + my $Remaining = $Keepalive; + if ($Deadline) { - last; + $Remaining = $Deadline - time(); + last if ($Remaining < 0); + $Remaining = $Keepalive if ($Keepalive < $Remaining); } + # Add a 5 second leeway to take into account network transmission delays + $self->SetTimeout($Remaining + 5); - # Get the reply - $Result = $self->_RecvList('I'); - } - else - { - $Keepalive ||= 0xffffffff; - $OldTimeout = $self->{timeout}; + # Make sure we have the server version + last if (!$self->{agentversion} and !$self->_Connect()); - my $Deadline; - $Deadline = time() + $Timeout if ($Timeout); - while (1) + # Send the command + if ($self->{agentversion} =~ / 1\.0$/) { - my $Remaining = $Keepalive; - if ($Deadline) + if (!$self->_StartRPC($RPC_WAIT) or + !$self->_SendListSize('ArgC', 1) or + !$self->_SendUInt64('Pid', $Pid)) { - $Remaining = $Deadline - time(); - last if ($Remaining < 0); - $Remaining = $Keepalive if ($Keepalive < $Remaining); + last; } - # Add a 5 second leeway to take into account network transmission delays - $self->SetTimeout($Remaining + 5); - - # Send the command + } + else + { if (!$self->_StartRPC($RPC_WAIT2) or !$self->_SendListSize('ArgC', 2) or !$self->_SendUInt64('Pid', $Pid) or @@ -1231,20 +1223,20 @@ sub Wait($$$;$) { last; } + } - # Get the reply - $Result = $self->_RecvList('I'); + # Get the reply + $Result = $self->_RecvList('I'); - # The process has quit - last if (defined $Result); + # The process has quit + last if (defined $Result); - # The only 'error' we should be getting here is the TestAgent server - # telling us it timed out waiting for the process. However flaky network - # connections like to break while we're waiting for the reply. So retry - # if that happens and let the automatic reconnection detect real network - # issues. - last if ($self->{err} !~ /(?:timed out waiting|network read timed out)/); - } + # The only 'error' we should be getting here is the TestAgent server + # telling us it timed out waiting for the process. However flaky network + # connections like to break while we're waiting for the reply. So retry + # if that happens and let the automatic reconnection detect real network + # issues. + last if ($self->{err} !~ /(?:timed out waiting|network read timed out)/); } $self->SetTimeout($OldTimeout); return $Result;

1 0

Iván Matellanes : msvcirt: Avoid superfluous comparison in some compilers.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 885273414601caf68bea4415604f02d1f7aca0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=885273414601caf68bea44156… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Mar 28 11:19:08 2016 +0100 msvcirt: Avoid superfluous comparison in some compilers. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 09f488a..19c26fd 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1383,7 +1383,7 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset, TRACE("(%p %d %d %d)\n", this, offset, dir, mode); - if (dir < SEEKDIR_beg || dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) + if ((unsigned int)dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) return EOF; /* read buffer */ if (mode & OPENMODE_in) {

1 0

Alexandre Julliard : user32: Use kernel32 functions for character types and case conversions.
by Alexandre Julliard 29 Mar '16

29 Mar '16

Module: wine Branch: master Commit: 11fcc61b6df0f3b33e85e56910a171c114ed5e50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11fcc61b6df0f3b33e85e5691… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 29 20:40:57 2016 +0900 user32: Use kernel32 functions for character types and case conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/lstr.c | 62 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index a7e885a..a56e21c 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -31,11 +31,11 @@ #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winuser.h" #include "winerror.h" #include "wine/exception.h" -#include "wine/unicode.h" /*********************************************************************** @@ -175,7 +175,7 @@ BOOL WINAPI CharToOemBuffW( LPCWSTR s, LPSTR d, DWORD len ) */ BOOL WINAPI CharToOemW( LPCWSTR s, LPSTR d ) { - return CharToOemBuffW( s, d, strlenW( s ) + 1 ); + return CharToOemBuffW( s, d, lstrlenW( s ) + 1 ); } @@ -280,20 +280,38 @@ LPSTR WINAPI CharUpperA(LPSTR str) /*********************************************************************** * CharLowerW (USER32.@) */ -LPWSTR WINAPI CharLowerW(LPWSTR x) +LPWSTR WINAPI CharLowerW( LPWSTR str ) { - if (!IS_INTRESOURCE(x)) return strlwrW(x); - else return (LPWSTR)((UINT_PTR)tolowerW(LOWORD(x))); + if (!IS_INTRESOURCE( str )) + { + CharLowerBuffW( str, lstrlenW( str )); + return str; + } + else + { + WCHAR ch = LOWORD( str ); + CharLowerBuffW( &ch, 1 ); + return (LPWSTR)(UINT_PTR)ch; + } } /*********************************************************************** * CharUpperW (USER32.@) */ -LPWSTR WINAPI CharUpperW(LPWSTR x) +LPWSTR WINAPI CharUpperW( LPWSTR str ) { - if (!IS_INTRESOURCE(x)) return struprW(x); - else return (LPWSTR)((UINT_PTR)toupperW(LOWORD(x))); + if (!IS_INTRESOURCE( str )) + { + CharUpperBuffW( str, lstrlenW( str )); + return str; + } + else + { + WCHAR ch = LOWORD( str ); + CharUpperBuffW( &ch, 1 ); + return (LPWSTR)(UINT_PTR)ch; + } } @@ -327,10 +345,8 @@ DWORD WINAPI CharLowerBuffA( LPSTR str, DWORD len ) */ DWORD WINAPI CharLowerBuffW( LPWSTR str, DWORD len ) { - DWORD ret = len; if (!str) return 0; /* YES */ - for (; len; len--, str++) *str = tolowerW(*str); - return ret; + return LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_LOWERCASE, str, len, str, len ); } @@ -364,10 +380,8 @@ DWORD WINAPI CharUpperBuffA( LPSTR str, DWORD len ) */ DWORD WINAPI CharUpperBuffW( LPWSTR str, DWORD len ) { - DWORD ret = len; if (!str) return 0; /* YES */ - for (; len; len--, str++) *str = toupperW(*str); - return ret; + return LCMapStringW( LOCALE_USER_DEFAULT, LCMAP_UPPERCASE, str, len, str, len ); } @@ -386,9 +400,10 @@ BOOL WINAPI IsCharLowerA(CHAR x) /*********************************************************************** * IsCharLowerW (USER32.@) */ -BOOL WINAPI IsCharLowerW(WCHAR x) +BOOL WINAPI IsCharLowerW( WCHAR ch ) { - return (get_char_typeW(x) & C1_LOWER) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_LOWER); } @@ -407,9 +422,10 @@ BOOL WINAPI IsCharUpperA(CHAR x) /*********************************************************************** * IsCharUpperW (USER32.@) */ -BOOL WINAPI IsCharUpperW(WCHAR x) +BOOL WINAPI IsCharUpperW( WCHAR ch ) { - return (get_char_typeW(x) & C1_UPPER) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_UPPER); } @@ -428,9 +444,10 @@ BOOL WINAPI IsCharAlphaNumericA(CHAR x) /*********************************************************************** * IsCharAlphaNumericW (USER32.@) */ -BOOL WINAPI IsCharAlphaNumericW(WCHAR x) +BOOL WINAPI IsCharAlphaNumericW( WCHAR ch ) { - return (get_char_typeW(x) & (C1_ALPHA|C1_DIGIT)) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & (C1_ALPHA|C1_DIGIT)); } @@ -449,7 +466,8 @@ BOOL WINAPI IsCharAlphaA(CHAR x) /*********************************************************************** * IsCharAlphaW (USER32.@) */ -BOOL WINAPI IsCharAlphaW(WCHAR x) +BOOL WINAPI IsCharAlphaW( WCHAR ch ) { - return (get_char_typeW(x) & C1_ALPHA) != 0; + WORD type; + return GetStringTypeW( CT_CTYPE1, &ch, 1, &type ) && (type & C1_ALPHA); }

1 0