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

Henri Verbeet : wined3d: Merge wined3d_volume_load_location() into texture3d_load_location().
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 2337c50ed769f2078257283f82aa7e696b452324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2337c50ed769f2078257283f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 13:29:40 2016 +0200 wined3d: Merge wined3d_volume_load_location() into texture3d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 199 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/volume.c | 206 ----------------------------------------- dlls/wined3d/wined3d_private.h | 2 - 3 files changed, 198 insertions(+), 209 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2337c50ed769f20782572…

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_volume_srgb_transfer().
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: d262a183116dedfbeedc2d1ec2ea597673bfcd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d262a183116dedfbeedc2d1ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 13:29:39 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_volume_srgb_transfer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 72ebd19..2e38aa7 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -141,12 +141,12 @@ static DWORD volume_access_from_location(DWORD location) } /* Context activation is done by the caller. */ -static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, +static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, BOOL dest_is_srgb) { - unsigned int sub_resource_idx = volume->texture_level; - struct wined3d_texture *texture = volume->container; + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; struct wined3d_bo_address data; + /* Optimizations are possible, but the effort should be put into either * implementing EXT_SRGB_DECODE in the driver or finding out why we * picked the wrong copy for the original upload and fixing that. @@ -156,7 +156,7 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); data.buffer_object = 0; - if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, texture->sub_resources[sub_resource_idx].size))) + if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, sub_resource->size))) return; wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); @@ -225,11 +225,11 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) { - wined3d_volume_srgb_transfer(volume, context, TRUE); + texture3d_srgb_transfer(texture, sub_resource_idx, context, TRUE); } else if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_SRGB) { - wined3d_volume_srgb_transfer(volume, context, FALSE); + texture3d_srgb_transfer(texture, sub_resource_idx, context, FALSE); } else {

1 0

Józef Kucia : wined3d: Introduce rasterizer state object.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 3861b4bb3771cf5fa4116bb50883fb13718b1c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3861b4bb3771cf5fa4116bb50… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:41 2016 +0200 wined3d: Introduce rasterizer state object. 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/cs.c | 28 +++++++++++++++++++ dlls/wined3d/device.c | 26 ++++++++++++++++++ dlls/wined3d/state.c | 62 ++++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d.spec | 6 ++++ dlls/wined3d/wined3d_private.h | 11 ++++++++ include/wine/wined3d.h | 14 ++++++++++ 6 files changed, 138 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3861b4bb3771cf5fa4116…

1 0

Huw Davies : gdi32: Access a few more properties directly from the DC in the dib driver.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 5118d1312cd890dc944f3115ebcc26c3470b9168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5118d1312cd890dc944f3115e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 10:49:48 2016 +0100 gdi32: Access a few more properties directly from the DC in the dib driver. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 3 ++- dlls/gdi32/dibdrv/objects.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f93bda7..08e777d 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -68,12 +68,13 @@ static CRITICAL_SECTION font_cache_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static BOOL brush_rect( dibdrv_physdev *pdev, dib_brush *brush, const RECT *rect, HRGN clip ) { + DC *dc = get_physdev_dc( &pdev->dev ); struct clipped_rects clipped_rects; BOOL ret; if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = brush->rects( pdev, brush, &pdev->dib, clipped_rects.count, clipped_rects.rects, - GetROP2( pdev->dev.hdc )); + dc->ROPmode ); free_clipped_rects( &clipped_rects ); return ret; } diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e3e853f..cde20e3 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1291,10 +1291,10 @@ static void add_cap( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const PO static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, const struct face *face_1, const struct face *face_2 ) { + DC *dc = get_physdev_dc( &pdev->dev ); int det = face_1->dx * face_2->dy - face_1->dy * face_2->dx; POINT pt_1, pt_2, pts[5]; double a, b, x, y; - FLOAT limit; if (det == 0) return 0; @@ -1315,9 +1315,8 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, x = a * face_1->dx - b * face_2->dx; y = a * face_1->dy - b * face_2->dy; - GetMiterLimit( pdev->dev.hdc, &limit ); - - if (((x - pt->x) * (x - pt->x) + (y - pt->y) * (y - pt->y)) * 4 > limit * limit * pdev->pen_width * pdev->pen_width) + if (((x - pt->x) * (x - pt->x) + (y - pt->y) * (y - pt->y)) * 4 > + dc->miterLimit * dc->miterLimit * pdev->pen_width * pdev->pen_width) return 0; pts[0] = face_2->start; @@ -1746,8 +1745,9 @@ static inline int get_pen_device_width( DC *dc, int width ) COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); - if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) + if (dc->hPen == GetStockObject( DC_PEN )) pdev->pen_brush.colorref = color; return color; @@ -1996,7 +1996,7 @@ static BOOL select_pattern_brush( dibdrv_physdev *pdev, dib_brush *brush, BOOL * static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { - POINT origin; + DC *dc = get_physdev_dc( &pdev->dev ); BOOL needs_reselect = FALSE; if (rop != brush->rop) @@ -2032,9 +2032,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, } } - GetBrushOrgEx(pdev->dev.hdc, &origin); - - dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, &brush->masks ); + dib->funcs->pattern_rects( dib, num, rects, &dc->brush_org, &brush->dib, &brush->masks ); if (needs_reselect) free_pattern_brush( brush ); return TRUE; @@ -2098,6 +2096,7 @@ static void select_brush( dibdrv_physdev *pdev, dib_brush *brush, HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_pattern *pattern ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); LOGBRUSH logbrush; TRACE("(%p, %p)\n", dev, hbrush); @@ -2105,7 +2104,7 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush, const struct brush_patter GetObjectW( hbrush, sizeof(logbrush), &logbrush ); if (hbrush == GetStockObject( DC_BRUSH )) - logbrush.lbColor = GetDCBrushColor( dev->hdc ); + logbrush.lbColor = dc->dcBrushColor; select_brush( pdev, &pdev->brush, &logbrush, pattern ); return hbrush; @@ -2155,7 +2154,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte pdev->pen_width = get_pen_device_width( dc, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) - logbrush.lbColor = GetDCPenColor( dev->hdc ); + logbrush.lbColor = dc->dcPenColor; set_dash_pattern( &pdev->pen_pattern, 0, NULL ); select_brush( pdev, &pdev->pen_brush, &logbrush, pattern ); @@ -2220,8 +2219,9 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + DC *dc = get_physdev_dc( dev ); - if (GetCurrentObject(dev->hdc, OBJ_BRUSH) == GetStockObject( DC_BRUSH )) + if (dc->hBrush == GetStockObject( DC_BRUSH )) { LOGBRUSH logbrush = { BS_SOLID, color, 0 }; select_brush( pdev, &pdev->brush, &logbrush, NULL );

1 0

Józef Kucia : wined3d: Get rid of separate function for SM5 derivative instructions.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 4b815d525aee79239d2fa195d892f0bf7a812434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b815d525aee79239d2fa195d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:48 2016 +0200 wined3d: Get rid of separate function for SM5 derivative instructions. 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 | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ece9b72..b0de8c6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3528,7 +3528,11 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_ABS: instruction = "abs"; break; case WINED3DSIH_DSX: instruction = "dFdx"; break; + case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; + case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; + case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; + case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; case WINED3DSIH_FRC: instruction = "fract"; break; case WINED3DSIH_IMAX: instruction = "max"; break; case WINED3DSIH_IMIN: instruction = "min"; break; @@ -3542,7 +3546,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_UMAX: instruction = "max"; break; case WINED3DSIH_UMIN: instruction = "min"; break; default: instruction = ""; - FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); + ERR("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); break; } @@ -3564,27 +3568,6 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } -static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_string_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - const char *instruction; - DWORD write_mask; - - switch (ins->handler_idx) - { - case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; - case WINED3DSIH_DSX_FINE: instruction = "dFdxFine"; break; - case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; - case WINED3DSIH_DSY_FINE: instruction = "ycorrection.y * dFdyFine"; break; - default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; - } - - write_mask = shader_glsl_append_dst(buffer, ins); - shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "%s(%s));\n", instruction, src_param.param_str); -} - static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) @@ -8721,11 +8704,11 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DP4 */ shader_glsl_dot, /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, - /* WINED3DSIH_DSX_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSX_FINE */ shader_glsl_derivative, + /* WINED3DSIH_DSX_COARSE */ shader_glsl_map2gl, + /* WINED3DSIH_DSX_FINE */ shader_glsl_map2gl, /* WINED3DSIH_DSY */ shader_glsl_map2gl, - /* WINED3DSIH_DSY_COARSE */ shader_glsl_derivative, - /* WINED3DSIH_DSY_FINE */ shader_glsl_derivative, + /* WINED3DSIH_DSY_COARSE */ shader_glsl_map2gl, + /* WINED3DSIH_DSY_FINE */ shader_glsl_map2gl, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, /* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit,

1 0

Józef Kucia : wined3d: Handle SM5 derivative instructions in shader_get_registers_used().
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: d95c91caa8e59b17fa7adb803afa76f17998de5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95c91caa8e59b17fa7adb803… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:40 2016 +0200 wined3d: Handle SM5 derivative instructions in shader_get_registers_used(). 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/shader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5192b18..f1940c6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1217,8 +1217,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } if (ins.handler_idx == WINED3DSIH_NRM) reg_maps->usesnrm = 1; - else if (ins.handler_idx == WINED3DSIH_DSY) reg_maps->usesdsy = 1; - else if (ins.handler_idx == WINED3DSIH_DSX) reg_maps->usesdsx = 1; + else if (ins.handler_idx == WINED3DSIH_DSY + || ins.handler_idx == WINED3DSIH_DSY_COARSE + || ins.handler_idx == WINED3DSIH_DSY_FINE) + { + reg_maps->usesdsy = 1; + } + else if (ins.handler_idx == WINED3DSIH_DSX + || ins.handler_idx == WINED3DSIH_DSX_COARSE + || ins.handler_idx == WINED3DSIH_DSX_FINE) + { + reg_maps->usesdsx = 1; + } else if (ins.handler_idx == WINED3DSIH_TEXLDD) reg_maps->usestexldd = 1; else if (ins.handler_idx == WINED3DSIH_TEXLDL) reg_maps->usestexldl = 1; else if (ins.handler_idx == WINED3DSIH_MOVA) reg_maps->usesmova = 1;

1 0

Józef Kucia : d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: bdae44fb51bda6845f02543dd320ff245a186085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdae44fb51bda6845f02543dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:39 2016 +0200 d3d10core/tests: Add test for DXGI_FORMAT_R10G10B10A2_UINT vertex format. 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/d3d10core/tests/device.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index c6fc480..3d7ef0c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8257,6 +8257,7 @@ static void test_input_assembler(void) LAYOUT_UNORM8, LAYOUT_SNORM8, LAYOUT_UNORM10_2, + LAYOUT_UINT10_2, LAYOUT_COUNT, }; @@ -8290,6 +8291,7 @@ static void test_input_assembler(void) DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R10G10B10A2_UNORM, + DXGI_FORMAT_R10G10B10A2_UINT, }; static const struct { @@ -8464,6 +8466,16 @@ static void test_input_assembler(void) {0.0f, 0.0f, 0.0f, 1.0f}}, {LAYOUT_UNORM10_2, sizeof(unorm10_2_data), &unorm10_2_data, {1.0f, 0.0f, 512.0f / 1023.0f, 2.0f / 3.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_zero), &uint32_zero, + {0.0f, 0.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(uint32_max), &uint32_max, + {1023.0f, 1023.0f, 1023.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(g10_data), &g10_data, + {0.0f, 1023.0f, 0.0f, 0.0f}}, + {LAYOUT_UINT10_2, sizeof(a2_data), &a2_data, + {0.0f, 0.0f, 0.0f, 3.0f}}, + {LAYOUT_UINT10_2, sizeof(unorm10_2_data), &unorm10_2_data, + {1023.0f, 0.0f, 512.0f, 2.0f}}, }; if (!init_test_context(&test_context)) @@ -8484,9 +8496,11 @@ static void test_input_assembler(void) for (i = 0; i < LAYOUT_COUNT; ++i) { input_layout_desc[1].Format = layout_formats[i]; + input_layout[i] = NULL; hr = ID3D10Device_CreateInputLayout(device, input_layout_desc, sizeof(input_layout_desc) / sizeof(*input_layout_desc), vs_float_code, sizeof(vs_float_code), &input_layout[i]); + todo_wine_if(input_layout_desc[1].Format == DXGI_FORMAT_R10G10B10A2_UINT) ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", layout_formats[i], hr); } @@ -8522,6 +8536,9 @@ static void test_input_assembler(void) { D3D10_BOX box = {0, 0, 0, 1, 1, 1}; + if (tests[i].layout_id == LAYOUT_UINT10_2) + continue; + assert(tests[i].layout_id < LAYOUT_COUNT); ID3D10Device_IASetInputLayout(device, input_layout[tests[i].layout_id]); @@ -8541,6 +8558,7 @@ static void test_input_assembler(void) switch (layout_formats[tests[i].layout_id]) { case DXGI_FORMAT_R16G16B16A16_UINT: + case DXGI_FORMAT_R10G10B10A2_UINT: case DXGI_FORMAT_R8G8B8A8_UINT: ID3D10Device_VSSetShader(device, vs_uint); break; @@ -8571,7 +8589,10 @@ static void test_input_assembler(void) ID3D10Buffer_Release(vb_attribute); ID3D10Buffer_Release(vb_position); for (i = 0; i < LAYOUT_COUNT; ++i) - ID3D10InputLayout_Release(input_layout[i]); + { + if (input_layout[i]) + ID3D10InputLayout_Release(input_layout[i]); + } ID3D10PixelShader_Release(ps); ID3D10VertexShader_Release(vs_float); ID3D10VertexShader_Release(vs_uint);

1 0

Michael Stefaniuc : ddraw: Don't memset memory before overwritting it.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 63fcf7faee88aea9425f57de8516dea262f54531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fcf7faee88aea9425f57de8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 27 16:10:39 2016 +0200 ddraw: Don't memset memory before overwritting it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/viewport.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 5ebc41e..154f9aa 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -272,7 +272,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport(IDirect3DViewport3 *iface, D3DVIE wined3d_mutex_lock(); dwSize = lpData->dwSize; - memset(lpData, 0, dwSize); if (!This->use_vp2) memcpy(lpData, &(This->viewports.vp1), dwSize); else { @@ -895,7 +894,6 @@ static HRESULT WINAPI d3d_viewport_GetViewport2(IDirect3DViewport3 *iface, D3DVI wined3d_mutex_lock(); dwSize = lpData->dwSize; - memset(lpData, 0, dwSize); if (This->use_vp2) memcpy(lpData, &(This->viewports.vp2), dwSize); else {

1 0

Alexandre Julliard : kernel32/tests: Fix a few more loader test failures.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 1110eccafba7f1a5671c80b2788dc78ac710285a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1110eccafba7f1a5671c80b27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 13:45:15 2016 +0900 kernel32/tests: Fix a few more loader test failures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4efe2f7..0b38445 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -340,17 +340,18 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header ) LARGE_INTEGER size; HANDLE file, map; NTSTATUS status; + ULONG file_size; GetTempPathA(MAX_PATH, temp_path); GetTempFileNameA(temp_path, "ldr", 0, dll_name); - size.u.LowPart = create_test_dll( &dos_header, sizeof(dos_header), nt_header, dll_name ); - ok( size.u.LowPart, "could not create %s\n", dll_name); - size.u.HighPart = 0; + file_size = create_test_dll( &dos_header, sizeof(dos_header), nt_header, dll_name ); + ok( file_size, "could not create %s\n", dll_name); file = CreateFileA(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); if (!status) @@ -362,8 +363,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header ) ok( info_size == sizeof(info), "NtQuerySection wrong size %u\n", info_size ); ok( info.Attributes == (SEC_IMAGE | SEC_FILE), "NtQuerySection wrong attr %x\n", info.Attributes ); ok( info.BaseAddress == NULL, "NtQuerySection wrong base %p\n", info.BaseAddress ); - ok( info.Size.QuadPart == size.QuadPart, "NtQuerySection wrong size %x%08x / %x%08x\n", - info.Size.u.HighPart, info.Size.u.LowPart, size.u.HighPart, size.u.LowPart ); + ok( info.Size.QuadPart == file_size, "NtQuerySection wrong size %x%08x / %08x\n", + info.Size.u.HighPart, info.Size.u.LowPart, file_size ); query_image_section( 1000, dll_name, nt_header ); } if (map) CloseHandle( map ); @@ -1944,7 +1945,8 @@ static void child_process(const char *dll_name, DWORD target_offset) memset(&pbi, 0, sizeof(pbi)); ret = pNtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#x\n", ret); - ok(pbi.ExitStatus == STILL_ACTIVE, "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); + ok(pbi.ExitStatus == STILL_ACTIVE || pbi.ExitStatus == 195, + "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(process, ProcessAffinityMask, &affinity, sizeof(affinity)); ok(!ret, "NtSetInformationProcess error %#x\n", ret); @@ -1979,7 +1981,8 @@ static void child_process(const char *dll_name, DWORD target_offset) memset(&pbi, 0, sizeof(pbi)); ret = pNtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#x\n", ret); - ok(pbi.ExitStatus == STILL_ACTIVE, "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); + ok(pbi.ExitStatus == STILL_ACTIVE || pbi.ExitStatus == 195, + "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(process, ProcessAffinityMask, &affinity, sizeof(affinity)); ok(!ret, "NtSetInformationProcess error %#x\n", ret);

1 0

Ken Thomases : ntdll: For Mac 64-bit, poke the TEB address to %gs: 0x30 and re-enable the inlining of NtCurrentTeb().
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 7501942008f91a9a137fe598ce5ce7cb47de5522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7501942008f91a9a137fe598c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jul 27 10:42:29 2016 -0500 ntdll: For Mac 64-bit, poke the TEB address to %gs:0x30 and re-enable the inlining of NtCurrentTeb(). 64-bit Windows apps have hard-coded accesses to %gs:0x30 baked into them. They need to find the TEB self pointer there. Technically, the gsbase register and the memory it points to belong to the pthread implementation on macOS. It's used for the pthread TLS implementation. However, study of the sources and experimentation reveal that TLS slot 6 (offset 0x30) is not currently used. Furthermore, Apple has promised to not use that slot in the future. So, we hijack it for our purposes. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_x86_64.c | 34 +++------------------------------- include/winnt.h | 2 +- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index f6e7edf..e0c0746 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -149,7 +149,7 @@ @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort -@ stdcall NtCurrentTeb() +@ stdcall -arch=win32,arm64 NtCurrentTeb() # @ stub NtDebugActiveProcess # @ stub NtDebugContinue @ stdcall NtDelayExecution(long ptr) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1db3a23..10faaea 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -241,8 +241,6 @@ static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_ #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) #elif defined (__APPLE__) -static pthread_key_t teb_key; - #define RAX_sig(context) ((context)->uc_mcontext->__ss.__rax) #define RBX_sig(context) ((context)->uc_mcontext->__ss.__rbx) #define RCX_sig(context) ((context)->uc_mcontext->__ss.__rcx) @@ -2834,13 +2832,6 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } -#ifdef __APPLE__ -static void init_teb_key(void) -{ - pthread_key_create( &teb_key, NULL ); -} -#endif - /********************************************************************** * signal_init_thread */ @@ -2849,10 +2840,6 @@ void signal_init_thread( TEB *teb ) const WORD fpu_cw = 0x27f; stack_t ss; -#ifdef __APPLE__ - static pthread_once_t init_once = PTHREAD_ONCE_INIT; -#endif - #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) @@ -2860,9 +2847,9 @@ void signal_init_thread( TEB *teb ) #elif defined(__NetBSD__) sysarch( X86_64_SET_GSBASE, &teb ); #elif defined (__APPLE__) - /* FIXME: Actually setting %gs needs support from the OS */ - pthread_once( &init_once, init_teb_key ); - pthread_setspecific( teb_key, teb ); + __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" + : + : "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); #else # error Please define setting %gs for your architecture #endif @@ -3847,19 +3834,4 @@ __ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") */ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") -/********************************************************************** - * NtCurrentTeb (NTDLL.@) - * - * FIXME: This isn't exported from NTDLL on real NT. This should be - * removed if and when we can set the GSBASE MSR on Mac OS X. - */ -#ifdef __APPLE__ -TEB * WINAPI NtCurrentTeb(void) -{ - return pthread_getspecific( teb_key ); -} -#else -__ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tret" ) -#endif - #endif /* __x86_64__ */ diff --git a/include/winnt.h b/include/winnt.h index 2705373..96722a4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2331,7 +2331,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm mov teb, eax; return teb; } -#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__APPLE__) +#elif defined(__x86_64__) && defined(__GNUC__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb;

1 0