wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Hugh McMaster : regedit: Free the value name buffer from the default value name parser state if necessary (Valgrind).
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: b501b2388da00c7a446e0c587061bc463f96ef29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b501b2388da00c7a446e0c587… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 24 12:47:48 2017 +0000 regedit: Free the value name buffer from the default value name parser state if necessary (Valgrind). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 394023b..7be4605 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -699,6 +699,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) /* handler for parser DEFAULT_VALUE_NAME state */ static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) { + HeapFree(GetProcessHeap(), 0, parser->value_name); parser->value_name = NULL; set_state(parser, DATA_START);

1 0

Hugh McMaster : po: Fix a typo in the Norwegian translation.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: 75e9f670fa3e989a90e9125ecfe3464ca05b1d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e9f670fa3e989a90e9125ec… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jul 24 12:47:39 2017 +0000 po: Fix a typo in the Norwegian translation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2fa8d89..0ad494b 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -12512,7 +12512,7 @@ msgstr "regedit: Registerverdien \"%1\" vil bli eksportert som binære data.\n" #: regedit.rc:427 msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Ugyldig systemnøkkel [%1]\n" +msgstr "regedit: Ugyldig systemnøkkel [%1]\n" #: regedit.rc:428 msgid ""

1 0

Alex Henrie : msvcr120: Declare ret as a float in functions that return a float.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: eca2999113c3224d54f80644becde09d33dcba0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eca2999113c3224d54f80644b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 24 00:40:33 2017 -0600 msvcr120: Declare ret as a float in functions that return a float. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index b030a63..0249493 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2431,11 +2431,11 @@ double CDECL MSVCR120_expm1(double x) float CDECL MSVCR120_expm1f(float x) { #ifdef HAVE_EXPM1F - double ret = expm1f(x); + float ret = expm1f(x); #else - double ret = exp(x) - 1; + float ret = exp(x) - 1; #endif - if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + if (!finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; return ret; } @@ -3087,7 +3087,7 @@ double CDECL MSVCR120_atanh(double x) float CDECL MSVCR120_atanhf(float x) { #ifdef HAVE_ATANHF - double ret; + float ret; if (x > 1 || x < -1) { MSVCRT_fenv_t env; @@ -3102,7 +3102,7 @@ float CDECL MSVCR120_atanhf(float x) ret = atanhf(x); - if (!isfinite(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; + if (!finitef(ret)) *MSVCRT__errno() = MSVCRT_ERANGE; return ret; #else return MSVCR120_atanh(x);

1 0

Józef Kucia : d3d11/tests: Add test for forced early depth stencil.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: 48d5ace68832725af97a1ecf3fd657036d01bc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d5ace68832725af97a1ecf3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 24 00:15:56 2017 +0200 d3d11/tests: Add test for forced early depth stencil. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5f87281..9af9f87 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20666,6 +20666,127 @@ static void test_fractional_viewports(void) release_test_context(&test_context); } +static void test_early_depth_stencil(void) +{ + ID3D11DepthStencilState *depth_stencil_state; + D3D11_DEPTH_STENCIL_DESC depth_stencil_desc; + ID3D11Texture2D *texture, *depth_texture; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11UnorderedAccessView *uav; + ID3D11DeviceContext *context; + ID3D11DepthStencilView *dsv; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + RWTexture2D<int> u; + + [earlydepthstencil] + float4 main() : SV_Target + { + InterlockedAdd(u[uint2(0, 0)], 1); + return float4(1.0f, 1.0f, 1.0f, 1.0f); + } +#endif + 0x43425844, 0xda4325ad, 0xc01d3815, 0xfd610cc9, 0x8ed1e351, 0x00000001, 0x000000ec, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d, + 0x0100286a, 0x0400189c, 0x0011e000, 0x00000001, 0x00003333, 0x03000065, 0x001020f2, 0x00000000, + 0x0a0000ad, 0x0011e000, 0x00000001, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004001, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, + 0x3f800000, 0x3f800000, 0x0100003e, + }; + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const UINT values[4] = {0}; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + depth_stencil_desc.DepthEnable = TRUE; + depth_stencil_desc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ZERO; + depth_stencil_desc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL; + depth_stencil_desc.StencilEnable = FALSE; + hr = ID3D11Device_CreateDepthStencilState(device, &depth_stencil_desc, &depth_stencil_state); + ok(SUCCEEDED(hr), "Failed to create depth stencil state, hr %#x.\n", hr); + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_SINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_D32_FLOAT; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &depth_texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)depth_texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create depth stencil view, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + memset(&vp, 0, sizeof(vp)); + vp.Width = 1.0f; + vp.Height = 100.0f; + vp.MinDepth = 0.5f; + vp.MaxDepth = 0.5f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext_OMSetDepthStencilState(context, depth_stencil_state, 0); + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, + 1, &test_context.backbuffer_rtv, dsv, 1, 1, &uav, NULL); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, values); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.6f, 0); + draw_quad(&test_context); + check_texture_color(texture, 100, 1); + draw_quad(&test_context); + check_texture_color(texture, 200, 1); + check_texture_float(depth_texture, 0.6f, 1); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.3f, 0); + draw_quad(&test_context); + draw_quad(&test_context); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.55f, 0); + draw_quad(&test_context); + check_texture_color(texture, 300, 1); + + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.5f, 0); + draw_quad(&test_context); + check_texture_color(texture, 400, 1); + check_texture_float(depth_texture, 0.5f, 1); + + ID3D11Texture2D_Release(depth_texture); + ID3D11DepthStencilView_Release(dsv); + ID3D11DepthStencilState_Release(depth_stencil_state); + ID3D11PixelShader_Release(ps); + ID3D11Texture2D_Release(texture); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -20763,4 +20884,5 @@ START_TEST(d3d11) test_gather(); test_gather_c(); test_fractional_viewports(); + test_early_depth_stencil(); }

1 0

Józef Kucia : wined3d: Implement forceEarlyDepthStencil shader global flag.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: a6d26527c61178a4408ce37833ab281f05248fa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6d26527c61178a4408ce3783… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 24 00:15:55 2017 +0200 wined3d: Implement forceEarlyDepthStencil shader global flag. 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 | 3 +++ dlls/wined3d/shader.c | 23 +++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 29 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f96f48d..7290fc7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7393,6 +7393,9 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants) FIXME("Insufficient uniforms to run this shader.\n"); + if (shader->u.ps.force_early_depth_stencil) + shader_addline(buffer, "layout(early_fragment_tests) in;\n"); + shader_addline(buffer, "void main()\n{\n"); /* Direct3D applications expect integer vPos values, while OpenGL drivers diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8827641..d9504ef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1085,6 +1085,21 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st else reg_maps->cb_sizes[reg->idx[0].offset] = reg->idx[1].offset; } + else if (ins.handler_idx == WINED3DSIH_DCL_GLOBAL_FLAGS) + { + if (ins.flags & WINED3DSGF_FORCE_EARLY_DEPTH_STENCIL) + { + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + shader->u.ps.force_early_depth_stencil = TRUE; + else + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + else + { + WARN("Ignoring global flags %#x.\n", ins.flags); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_GS_INSTANCES) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) @@ -1760,6 +1775,14 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD shader_addline(buffer, " | "); } + if (global_flags & WINED3DSGF_FORCE_EARLY_DEPTH_STENCIL) + { + shader_addline(buffer, "forceEarlyDepthStencil"); + global_flags &= ~WINED3DSGF_FORCE_EARLY_DEPTH_STENCIL; + if (global_flags) + shader_addline(buffer, " | "); + } + if (global_flags & WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS) { shader_addline(buffer, "enableRawAndStructuredBuffers"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ccf0563..eae451b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -559,6 +559,7 @@ enum wined3d_shader_interpolation_mode enum wined3d_shader_global_flags { WINED3DSGF_REFACTORING_ALLOWED = 0x1, + WINED3DSGF_FORCE_EARLY_DEPTH_STENCIL = 0x4, WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, }; @@ -3866,6 +3867,8 @@ struct wined3d_pixel_shader /* Some information about the shader behavior */ BOOL color0_mov; DWORD color0_reg; + + BOOL force_early_depth_stencil; }; struct wined3d_compute_shader

1 0

Alexandre Julliard : user32: Always update the visible region for cross-process DCEs.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: e7f30014c307cf69f9c4e7c472ee38338e0b2638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f30014c307cf69f9c4e7c47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 17:04:35 2017 +0200 user32: Always update the visible region for cross-process DCEs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 2130473..6cc9a7e 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -1111,6 +1111,9 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) dce->hwnd = hwnd; dce->flags = (dce->flags & ~user_flags) | (flags & user_flags); + /* cross-process invalidation is not supported yet, so always update the vis rgn */ + if (!WIN_IsCurrentProcess( hwnd )) bUpdateVisRgn = TRUE; + if (SetHookFlags( dce->hdc, DCHF_VALIDATEVISRGN )) bUpdateVisRgn = TRUE; /* DC was dirty */ if (bUpdateVisRgn) update_visible_region( dce );

1 0

Alexandre Julliard : user32: Reduce the cursor height if it also includes the mask.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: d0e8170c90ef63363f8389be2619c9332ae2c371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0e8170c90ef63363f8389be2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 13:12:50 2017 +0200 user32: Reduce the cursor height if it also includes the mask. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index f408c22..1fbec2a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -633,6 +633,7 @@ static BOOL CURSORICON_GetResCursorEntry( LPCVOID dir, DWORD size, int n, *width = cursor->wWidth; *height = cursor->wHeight; *bits = resdir->idEntries[n].wBitCount; + if (*height == *width * 2) *height /= 2; return TRUE; }

1 0

Huw Davies : gdi32: Respect the rop mode in SetPixel.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: 8e9af9e01635733376962bea58b04f001a90ac66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9af9e01635733376962bea5… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 10:47:04 2017 +0100 gdi32: Respect the rop mode in SetPixel. Based on a patch by Tim Worthington. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/tests/dib.c | 70 ++++++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e9af9e01635733376962…

1 0

Huw Davies : gdi32: Add a helper to fill rectangles with a given pixel.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: 46e6ee48f3cd5a6eeec50db2a8c7db17025c606f URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e6ee48f3cd5a6eeec50db2a… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 24 10:47:03 2017 +0100 gdi32: Add a helper to fill rectangles with a given pixel. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 19 +++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 770e89e..adf16c4 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -257,6 +257,7 @@ extern void add_clipped_bounds( dibdrv_physdev *dev, const RECT *rect, HRGN clip extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; extern void release_cached_font( struct cached_font *font ) DECLSPEC_HIDDEN; +extern BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) DECLSPEC_HIDDEN; static inline void init_clipped_rects( struct clipped_rects *clip_rects ) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index cde20e3..8e55d1a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1754,6 +1754,20 @@ COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) } /********************************************************************** + * fill_with_pixel + * + * Fill a number of rectangles with a given pixel color and rop mode + */ +BOOL fill_with_pixel( DC *dc, dib_info *dib, DWORD pixel, int num, const RECT *rects, INT rop ) +{ + rop_mask mask; + + calc_rop_masks( rop, pixel, &mask ); + dib->funcs->solid_rects( dib, num, rects, mask.and, mask.xor ); + return TRUE; +} + +/********************************************************************** * solid_brush * * Fill a number of rectangles with the solid brush @@ -1762,12 +1776,9 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop) { DC *dc = get_physdev_dc( &pdev->dev ); - rop_mask brush_color; DWORD color = get_pixel_color( dc, &pdev->dib, brush->colorref, TRUE ); - calc_rop_masks( rop, color, &brush_color ); - dib->funcs->solid_rects( dib, num, rects, brush_color.and, brush_color.xor ); - return TRUE; + return fill_with_pixel( dc, dib, color, num, rects, rop ); } static BOOL alloc_brush_mask_bits( dib_brush *brush )

1 0

Henri Verbeet : widl: Handle C++ aggregate returns in a MSVC compatible way.
by Alexandre Julliard 24 Jul '17

24 Jul '17

Module: wine Branch: master Commit: b42a15513eaa973b40ab967014b311af64acbb98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b42a15513eaa973b40ab96701… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 21 13:03:41 2017 +0200 widl: Handle C++ aggregate returns in a MSVC compatible way. This mainly affects 64-bit winelib applications, and potentially mingw-w64 usage of the Wine headers. As explained in commit fabfa59aea5c5b3201142382038beb3e76cb7567, MSVC returns aggregates through an implicit parameter immediately after the this/interface pointer. GCC's "ms_abi" attribute is supposed to match this, but unfortunately current versions of g++ (confirmed up to at least g++ 6.3) place the implicit return pointer before the this/interface pointer. See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52792. This commit takes an approach similar to the earlier commit fabfa59aea5c5b3201142382038beb3e76cb7567: For ABI compatibility the return pointer is listed as an explicit parameter in the vtbl entry, while an inline helper is provided for source code compatibility. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index e48b488..b5fe232 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1043,13 +1043,62 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); + const var_list_t *args = type_get_function_args(func->type); + const var_t *arg; + if (!callconv) callconv = "STDMETHODCALLTYPE"; + + if (is_aggregate_return(func)) { + fprintf(header, "#ifdef WIDL_EXPLICIT_AGGREGATE_RETURNS\n"); + + indent(header, 0); + fprintf(header, "virtual "); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, "* %s %s(\n", callconv, get_name(func)); + ++indentation; + indent(header, 0); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, " *__ret"); + --indentation; + if (args) { + fprintf(header, ",\n"); + write_args(header, args, iface->name, 2, TRUE); + } + fprintf(header, ") = 0;\n"); + + indent(header, 0); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, " %s %s(\n", callconv, get_name(func)); + write_args(header, args, iface->name, 2, TRUE); + fprintf(header, ")\n"); + indent(header, 0); + fprintf(header, "{\n"); + ++indentation; + indent(header, 0); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, " __ret;\n"); + indent(header, 0); + fprintf(header, "return *%s(&__ret", get_name(func)); + if (args) + LIST_FOR_EACH_ENTRY(arg, args, const var_t, entry) + fprintf(header, ", %s", arg->name); + fprintf(header, ");\n"); + --indentation; + indent(header, 0); + fprintf(header, "}\n"); + + fprintf(header, "#else\n"); + } + indent(header, 0); fprintf(header, "virtual "); write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " %s %s(\n", callconv, get_name(func)); - write_args(header, type_get_function_args(func->type), iface->name, 2, TRUE); + write_args(header, args, iface->name, 2, TRUE); fprintf(header, ") = 0;\n"); + + if (is_aggregate_return(func)) + fprintf(header, "#endif\n"); fprintf(header, "\n"); } }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
64
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 July 2017