January 2016 - Wine-Commits

Józef Kucia : wined3d: Implement SM4 ineg instruction.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 6004c261d8ebe1fa65b625cd476f915612629bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6004c261d8ebe1fa65b625cd4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 17:49:13 2016 +0100 wined3d: Implement SM4 ineg instruction. 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/glsl_shader.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7c3041c..c8ba074 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3015,6 +3015,16 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_ineg(const struct wined3d_shader_instruction *ins) +{ + struct glsl_src_param src_param; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + shader_addline(ins->ctx->buffer, "-%s);\n", src_param.param_str); +} + static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) { struct wined3d_string_buffer *buffer = ins->ctx->buffer; @@ -8015,7 +8025,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ NULL, - /* WINED3DSIH_INEG */ NULL, + /* WINED3DSIH_INEG */ shader_glsl_ineg, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label,

1 0

Józef Kucia : wined3d: Implement SM4 ilt instruction.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 73432b289649381ab79928269d734666fb8ad7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=73432b289649381ab79928269… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 17:49:12 2016 +0100 wined3d: Implement SM4 ilt instruction. 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/glsl_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a0c218f..7c3041c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2981,6 +2981,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = "greaterThanEqual"; break; case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; + case WINED3DSIH_ILT: op = "lessThan"; break; case WINED3DSIH_NE: op = "notEqual"; break; default: op = "<unhandled operator>"; @@ -3001,6 +3002,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IGE: op = ">="; break; case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; + case WINED3DSIH_ILT: op = "<"; break; case WINED3DSIH_NE: op = "!="; break; default: op = "<unhandled operator>"; @@ -8007,7 +8009,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, - /* WINED3DSIH_ILT */ NULL, + /* WINED3DSIH_ILT */ shader_glsl_relop, /* WINED3DSIH_IMAD */ shader_glsl_mad, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl,

1 0

Józef Kucia : wined3d: Implement SM4 ieq instruction.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 3f21a0394be4eb31fd49ed81971b85d6acddd943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f21a0394be4eb31fd49ed819… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 17:49:11 2016 +0100 wined3d: Implement SM4 ieq instruction. 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/glsl_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6234699..a0c218f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2976,6 +2976,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_EQ: op = "equal"; break; + case WINED3DSIH_IEQ: op = "equal"; break; case WINED3DSIH_GE: op = "greaterThanEqual"; break; case WINED3DSIH_IGE: op = "greaterThanEqual"; break; case WINED3DSIH_UGE: op = "greaterThanEqual"; break; @@ -2995,6 +2996,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_EQ: op = "=="; break; + case WINED3DSIH_IEQ: op = "=="; break; case WINED3DSIH_GE: op = ">="; break; case WINED3DSIH_IGE: op = ">="; break; case WINED3DSIH_UGE: op = ">="; break; @@ -8001,7 +8003,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_IADD */ shader_glsl_binop, - /* WINED3DSIH_IEQ */ NULL, + /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop,

1 0

Henri Verbeet : wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in wined3d_device_copy_resource().
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: d178301b723b0a05d8dc0c04b185e39f3ac8ba14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d178301b723b0a05d8dc0c04b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:27 2016 +0100 wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in wined3d_device_copy_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 05daafe..97586f4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3868,6 +3868,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, { struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; + RECT dst_rect, src_rect; unsigned int i, count; HRESULT hr; @@ -3929,8 +3930,11 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, dst_surface = surface_from_resource(wined3d_texture_get_sub_resource(dst_texture, i)); src_surface = surface_from_resource(wined3d_texture_get_sub_resource(src_texture, i)); - if (FAILED(hr = wined3d_surface_blt(dst_surface, NULL, src_surface, NULL, 0, NULL, WINED3D_TEXF_POINT))) - ERR("Failed to blit, subresource %u, hr %#x.\n", i, hr); + SetRect(&dst_rect, 0, 0, dst_surface->resource.width, dst_surface->resource.height); + SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, + src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + ERR("Failed to blit, sub-resource %u, hr %#x.\n", i, hr); } }

1 0

Henri Verbeet : wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in resolve_depth_buffer().
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 756b5e777a9ae5618dbf713b1c36ee39d85cdcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=756b5e777a9ae5618dbf713b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:26 2016 +0100 wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in resolve_depth_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 581d119..05daafe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2015,6 +2015,7 @@ static void resolve_depth_buffer(struct wined3d_state *state) { struct wined3d_texture *texture = state->textures[0]; struct wined3d_surface *depth_stencil, *surface; + RECT src_rect, dst_rect; if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE_2D || !(texture->resource.format_flags & WINED3DFMT_FLAG_DEPTH)) @@ -2023,7 +2024,9 @@ static void resolve_depth_buffer(struct wined3d_state *state) if (!(depth_stencil = wined3d_rendertarget_view_get_surface(state->fb->depth_stencil))) return; - wined3d_surface_blt(surface, NULL, depth_stencil, NULL, 0, NULL, WINED3D_TEXF_POINT); + SetRect(&dst_rect, 0, 0, surface->resource.width, surface->resource.height); + SetRect(&src_rect, 0, 0, depth_stencil->resource.width, depth_stencil->resource.height); + wined3d_surface_blt(surface, &dst_rect, depth_stencil, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } void CDECL wined3d_device_set_render_state(struct wined3d_device *device,

1 0

Józef Kucia : wined3d: Implement SM4 not instruction.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: dba682c6f118dbb6315da3b887b643981c572855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba682c6f118dbb6315da3b88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 17:49:15 2016 +0100 wined3d: Implement SM4 not instruction. 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/glsl_shader.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4be81a5..ec3c2cb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3015,14 +3015,26 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) } } -static void shader_glsl_ineg(const struct wined3d_shader_instruction *ins) +static void shader_glsl_unary_op(const struct wined3d_shader_instruction *ins) { struct glsl_src_param src_param; DWORD write_mask; + const char *op; + + switch (ins->handler_idx) + { + case WINED3DSIH_INEG: op = "-"; break; + case WINED3DSIH_NOT: op = "~"; break; + default: + op = "<unhandled operator>"; + ERR("Unhandled opcode %s.\n", + debug_d3dshaderinstructionhandler(ins->handler_idx)); + break; + } write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(ins->ctx->buffer, "-%s);\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "%s%s);\n", op, src_param.param_str); } static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) @@ -8025,7 +8037,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ NULL, - /* WINED3DSIH_INEG */ shader_glsl_ineg, + /* WINED3DSIH_INEG */ shader_glsl_unary_op, /* WINED3DSIH_ISHL */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, @@ -8050,7 +8062,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NOP */ shader_glsl_nop, - /* WINED3DSIH_NOT */ NULL, + /* WINED3DSIH_NOT */ shader_glsl_unary_op, /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_OR */ shader_glsl_binop, /* WINED3DSIH_PHASE */ shader_glsl_nop,

1 0

Nikolay Sivov : d2d1: Use drawing effect at DrawGlyphRun().
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 90155cb1e16a6956f12c200c54869657df792f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90155cb1e16a6956f12c200c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 26 15:36:18 2016 +0300 d2d1: Use drawing effect at DrawGlyphRun(). 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/render_target.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 7c8a43f..7cfbdfa 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -32,6 +32,17 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; +static ID2D1Brush *d2d_draw_get_text_brush(struct d2d_draw_text_layout_ctx *context, IUnknown *effect) +{ + ID2D1Brush *brush = NULL; + + if (effect && SUCCEEDED(IUnknown_QueryInterface(effect, &IID_ID2D1Brush, (void**)&brush))) + return brush; + + ID2D1Brush_AddRef(context->brush); + return context->brush; +} + static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) { dst->x = x; @@ -1638,6 +1649,7 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); D2D1_POINT_2F baseline_origin = {baseline_origin_x, baseline_origin_y}; struct d2d_draw_text_layout_ctx *context = ctx; + ID2D1Brush *brush; TRACE("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " "measuring_mode %#x, glyph_run %p, desc %p, effect %p.\n", @@ -1646,14 +1658,16 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRende if (desc) WARN("Ignoring glyph run description %p.\n", desc); - if (effect) - FIXME("Ignoring effect %p.\n", effect); if (context->options & ~D2D1_DRAW_TEXT_OPTIONS_NO_SNAP) FIXME("Ignoring options %#x.\n", context->options); + brush = d2d_draw_get_text_brush(context, effect); + TRACE("%s\n", debugstr_wn(desc->string, desc->stringLength)); ID2D1RenderTarget_DrawGlyphRun(&render_target->ID2D1RenderTarget_iface, - baseline_origin, glyph_run, context->brush, measuring_mode); + baseline_origin, glyph_run, brush, measuring_mode); + + ID2D1Brush_Release(brush); return S_OK; }

1 0

André Hentschel : include: Add more OID defines.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: ff1ecab238320705c0f7ded6e93443aeaf7165be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff1ecab238320705c0f7ded6e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 26 20:51:02 2016 +0100 include: Add more OID defines. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ntddndis.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/include/ntddndis.h b/include/ntddndis.h index 3ea18ce..e820a81 100644 --- a/include/ntddndis.h +++ b/include/ntddndis.h @@ -57,6 +57,62 @@ extern "C" { #define IOCTL_NDIS_RESERVED12 _NDIS_CONTROL_CODE(0x14, METHOD_BUFFERED) #define IOCTL_NDIS_RESERVED13 _NDIS_CONTROL_CODE(0x15, METHOD_BUFFERED) +#define OID_GEN_SUPPORTED_LIST 0x00010101 +#define OID_GEN_HARDWARE_STATUS 0x00010102 +#define OID_GEN_MEDIA_SUPPORTED 0x00010103 +#define OID_GEN_MEDIA_IN_USE 0x00010104 +#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 +#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 +#define OID_GEN_LINK_SPEED 0x00010107 +#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 +#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 +#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010a +#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010b +#define OID_GEN_VENDOR_ID 0x0001010c +#define OID_GEN_VENDOR_DESCRIPTION 0x0001010d +#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010e +#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010f +#define OID_GEN_DRIVER_VERSION 0x00010110 +#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 +#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 +#define OID_GEN_MAC_OPTIONS 0x00010113 +#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 +#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 + +#define OID_802_3_PERMANENT_ADDRESS 0x01010101 +#define OID_802_3_CURRENT_ADDRESS 0x01010102 +#define OID_802_3_MULTICAST_LIST 0x01010103 +#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 +#define OID_802_3_MAC_OPTIONS 0x01010105 +#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 +#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 +#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 +#define OID_802_3_XMIT_DEFERRED 0x01020201 +#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 +#define OID_802_3_RCV_OVERRUN 0x01020203 +#define OID_802_3_XMIT_UNDERRUN 0x01020204 +#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 +#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 +#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 +#define OID_802_3_ADD_MULTICAST_ADDRESS 0x01010208 +#define OID_802_3_DELETE_MULTICAST_ADDRESS 0x01010209 + +#define OID_802_5_PERMANENT_ADDRESS 0x02010101 +#define OID_802_5_CURRENT_ADDRESS 0x02010102 +#define OID_802_5_CURRENT_FUNCTIONAL 0x02010103 +#define OID_802_5_CURRENT_GROUP 0x02010104 +#define OID_802_5_LAST_OPEN_STATUS 0x02010105 +#define OID_802_5_CURRENT_RING_STATUS 0x02010106 +#define OID_802_5_CURRENT_RING_STATE 0x02010107 +#define OID_802_5_LINE_ERRORS 0x02020101 +#define OID_802_5_LOST_FRAMES 0x02020102 +#define OID_802_5_BURST_ERRORS 0x02020201 +#define OID_802_5_AC_ERRORS 0x02020202 +#define OID_802_5_ABORT_DELIMETERS 0x02020203 +#define OID_802_5_FRAME_COPIED_ERRORS 0x02020204 +#define OID_802_5_FREQUENCY_ERRORS 0x02020205 +#define OID_802_5_TOKEN_ERRORS 0x02020206 +#define OID_802_5_INTERNAL_ERRORS 0x02020207 #define OID_802_11_BSSID 0x0d010101 #define OID_802_11_SSID 0x0d010102

1 0

Henri Verbeet : wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: dafaae77308be415e024739f227fea64ae85d6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dafaae77308be415e024739f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:23 2016 +0100 wined3d: Unify WINED3D_RTYPE_TEXTURE and WINED3D_RTYPE_CUBE_TEXTURE. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 2 +- dlls/d3d8/device.c | 4 +- dlls/d3d8/directx.c | 26 +++++++- dlls/d3d8/texture.c | 6 +- dlls/d3d9/device.c | 4 +- dlls/d3d9/directx.c | 26 +++++++- dlls/d3d9/texture.c | 6 +- dlls/ddraw/device.c | 6 +- dlls/ddraw/surface.c | 18 ++--- dlls/wined3d/device.c | 60 +++++++---------- dlls/wined3d/directx.c | 38 ++++------- dlls/wined3d/resource.c | 148 ++++++++++++++++++++++------------------- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 11 ++- dlls/wined3d/utils.c | 15 ++--- dlls/wined3d/wined3d_private.h | 5 +- include/wine/wined3d.h | 9 +-- 18 files changed, 207 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dafaae77308be415e0247…

1 0

Nikolay Sivov : oleaut32/tests: Fix some test failures.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 12ce3c58ede8e0a2e849c5b39be963dd718201e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12ce3c58ede8e0a2e849c5b39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 26 19:31:14 2016 +0300 oleaut32/tests: Fix some test failures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 71764c3..ee8568c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1656,7 +1656,6 @@ static void test_CreateTypeLib(SYSKIND sys) { static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; - static const WCHAR defaultQW[] = {'d','e','f','a','u','l','t','?',0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; static OLECHAR func2W[] = {'f','u','n','c','2',0}; static OLECHAR prop1W[] = {'P','r','o','p','1',0}; @@ -1701,6 +1700,8 @@ static void test_CreateTypeLib(SYSKIND sys) { TYPEKIND kind; DESCKIND desckind; BINDPTR bindptr; + char nameA[16]; + WCHAR nameW[16]; switch(sys){ case SYS_WIN32: @@ -2197,6 +2198,9 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(hres == S_OK, "got %08x\n", hres); SysFreeString(V_BSTR(&paramdescex.varDefaultValue)); + WideCharToMultiByte(CP_ACP, 0, defaultW, -1, nameA, sizeof(nameA), NULL, NULL); + MultiByteToWideChar(CP_ACP, 0, nameA, -1, nameW, sizeof(nameW)/sizeof(nameW[0])); + hres = ITypeInfo2_GetFuncDesc(ti2, 3, &pfuncdesc); ok(hres == S_OK, "got %08x\n", hres); @@ -2222,7 +2226,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -2234,7 +2238,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3020,7 +3024,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue))); @@ -3032,7 +3036,7 @@ static void test_CreateTypeLib(SYSKIND sys) { U(*edesc).paramdesc.pparamdescex->cBytes); ok(V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue) == VT_BSTR, "got: %d\n", V_VT(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)); - ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), defaultQW), + ok(!lstrcmpW(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue), nameW), "got: %s\n", wine_dbgstr_w(V_BSTR(&U(*edesc).paramdesc.pparamdescex->varDefaultValue)));

1 0