September 2014 - Wine-commits

Henri Verbeet : widl: Handle aggregate returns in a MSVC compatible way.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: fabfa59aea5c5b3201142382038beb3e76cb7567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fabfa59aea5c5b32011423820… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 5 17:33:03 2014 +0200 widl: Handle aggregate returns in a MSVC compatible way. Aggregates are returned through an implicit parameter after the this/interface pointer. Note that this follows the C++ convention, affected methods are not callable from C with the Microsoft headers. --- dlls/d2d1/brush.c | 25 ++++++++++++++----------- dlls/d2d1/render_target.c | 25 ++++++++++++++----------- tools/widl/header.c | 43 +++++++++++++++++++++++++++++++++++++++---- 3 files changed, 67 insertions(+), 26 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index d8b769b..ed92d60 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -227,13 +227,14 @@ static void STDMETHODCALLTYPE d2d_solid_color_brush_SetColor(ID2D1SolidColorBrus FIXME("iface %p, color %p stub!\n", iface, color); } -static D2D1_COLOR_F STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface) +static D2D1_COLOR_F * STDMETHODCALLTYPE d2d_solid_color_brush_GetColor(ID2D1SolidColorBrush *iface, D2D1_COLOR_F *color) { static const D2D1_COLOR_F black = {0.0f, 0.0f, 0.0f, 1.0f}; - FIXME("iface %p stub!\n", iface); + FIXME("iface %p, color %p stub!\n", iface, color); - return black; + *color = black; + return color; } static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = @@ -360,21 +361,23 @@ static void STDMETHODCALLTYPE d2d_linear_gradient_brush_SetEndPoint(ID2D1LinearG FIXME("iface %p, end_point {%.8e, %.8e} stub!\n", iface, end_point.x, end_point.y); } -static D2D1_POINT_2F STDMETHODCALLTYPE d2d_linear_gradient_brush_GetStartPoint(ID2D1LinearGradientBrush *iface) +static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_linear_gradient_brush_GetStartPoint(ID2D1LinearGradientBrush *iface, + D2D1_POINT_2F *point) { - static const D2D1_POINT_2F point = {0.0f, 0.0f}; - - FIXME("iface %p stub!\n", iface); + FIXME("iface %p, point %p stub!\n", iface, point); + point->x = 0.0f; + point->y = 0.0f; return point; } -static D2D1_POINT_2F STDMETHODCALLTYPE d2d_linear_gradient_brush_GetEndPoint(ID2D1LinearGradientBrush *iface) +static D2D1_POINT_2F * STDMETHODCALLTYPE d2d_linear_gradient_brush_GetEndPoint(ID2D1LinearGradientBrush *iface, + D2D1_POINT_2F *point) { - static const D2D1_POINT_2F point = {0.0f, 0.0f}; - - FIXME("iface %p stub!\n", iface); + FIXME("iface %p, point %p stub!\n", iface, point); + point->x = 0.0f; + point->y = 0.0f; return point; } diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 864cd31..9664fde 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -450,12 +450,13 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget return S_OK; } -static D2D1_PIXEL_FORMAT STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface) +static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface, + D2D1_PIXEL_FORMAT *format) { - static const D2D1_PIXEL_FORMAT format = {DXGI_FORMAT_UNKNOWN, D2D1_ALPHA_MODE_UNKNOWN}; - - FIXME("iface %p stub!\n", iface); + FIXME("iface %p, format %p stub!\n", iface, format); + format->format = DXGI_FORMAT_UNKNOWN; + format->alphaMode = D2D1_ALPHA_MODE_UNKNOWN; return format; } @@ -485,22 +486,24 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *if *dpi_y = render_target->dpi_y; } -static D2D1_SIZE_F STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTarget *iface) +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTarget *iface, D2D1_SIZE_F *size) { - static const D2D1_SIZE_F size = {0.0f, 0.0f}; - - FIXME("iface %p stub!\n", iface); + FIXME("iface %p, size %p stub!\n", iface, size); + size->width = 0.0f; + size->height = 0.0f; return size; } -static D2D1_SIZE_U STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1RenderTarget *iface) +static D2D1_SIZE_U * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelSize(ID2D1RenderTarget *iface, + D2D1_SIZE_U *pixel_size) { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); - TRACE("iface %p.\n", iface); + TRACE("iface %p, pixel_size %p.\n", iface, pixel_size); - return render_target->pixel_size; + *pixel_size = render_target->pixel_size; + return pixel_size; } static UINT32 STDMETHODCALLTYPE d2d_d3d_render_target_GetMaximumBitmapSize(ID2D1RenderTarget *iface) diff --git a/tools/widl/header.c b/tools/widl/header.c index 4f2222a..f0f0156 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -828,6 +828,13 @@ static int is_inherited_method(const type_t *iface, const var_t *func) return 0; } +static int is_aggregate_return(const var_t *func) +{ + enum type_type type = type_get_type(type_function_get_rettype(func->type)); + return type == TYPE_STRUCT || type == TYPE_UNION || + type == TYPE_COCLASS || type == TYPE_INTERFACE; +} + static void write_method_macro(FILE *header, const type_t *iface, const char *name) { const statement_t *stmt; @@ -846,7 +853,8 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na first_iface = 0; } - if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { + if (!is_callas(func->attrs) && !is_inherited_method(iface, func) && + !is_aggregate_return(func)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -947,12 +955,24 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char fprintf(header, " %s_%s(", name, get_name(func)); write_args(header, type_get_function_args(func->type), name, 1, FALSE); fprintf(header, ") {\n"); - fprintf(header, " %s", is_void(type_function_get_rettype(func->type)) ? "" : "return "); - fprintf(header, "This->lpVtbl->%s(This", get_name(func)); + ++indentation; + if (!is_aggregate_return(func)) { + indent(header, 0); + fprintf(header, "%sThis->lpVtbl->%s(This", + is_void(type_function_get_rettype(func->type)) ? "" : "return ", + get_name(func)); + } else { + indent(header, 0); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, " __ret;\n"); + indent(header, 0); + fprintf(header, "return *This->lpVtbl->%s(This,&__ret", get_name(func)); + } if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) fprintf(header, ",%s", arg->name); fprintf(header, ");\n"); + --indentation; fprintf(header, "}\n"); } } @@ -979,11 +999,26 @@ static void do_write_c_method_def(FILE *header, const type_t *iface, const char if (!callconv) callconv = "STDMETHODCALLTYPE"; indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); + if (is_aggregate_return(func)) + fprintf(header, " *"); if (is_inherited_method(iface, func)) fprintf(header, " (%s *%s_%s)(\n", callconv, iface->name, func->name); else fprintf(header, " (%s *%s)(\n", callconv, get_name(func)); - write_args(header, type_get_function_args(func->type), name, 1, TRUE); + ++indentation; + indent(header, 0); + fprintf(header, "%s *This", name); + if (is_aggregate_return(func)) { + fprintf(header, ",\n"); + indent(header, 0); + write_type_decl_left(header, type_function_get_rettype(func->type)); + fprintf(header, " *__ret"); + } + --indentation; + if (type_get_function_args(func->type)) { + fprintf(header, ",\n"); + write_args(header, type_get_function_args(func->type), name, 0, TRUE); + } fprintf(header, ");\n"); fprintf(header, "\n"); }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetSize().
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: 92a1ede37fa196345d11fe99ea23e82b911b9aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a1ede37fa196345d11fe99e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 5 17:33:04 2014 +0200 d2d1: Implement d2d_d3d_render_target_GetSize(). --- dlls/d2d1/render_target.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 9664fde..6a1b963 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -488,10 +488,12 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_GetDpi(ID2D1RenderTarget *if static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_d3d_render_target_GetSize(ID2D1RenderTarget *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0.0f; - size->height = 0.0f; + size->width = render_target->pixel_size.width / (render_target->dpi_x / 96.0f); + size->height = render_target->pixel_size.height / (render_target->dpi_y / 96.0f); return size; }

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_Clear().
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: e2c7b442a1f28d05d9c59d32a6d8ba96692422c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c7b442a1f28d05d9c59d32a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 5 15:50:58 2014 +0200 d2d1: Implement d2d_d3d_render_target_Clear(). This is of course a fairly naive initial implementation. We'd probably want to batch up drawing operations, and only execute them on EndDraw() or Flush() to reduce state setup overhead. --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 10 ++ dlls/d2d1/render_target.c | 227 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 236 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2c7b442a1f28d05d9c59…

1 0

Henri Verbeet : d2d1: Implement initial clipping support.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: a49fbeb84173b1cc58919456cef04a0022115843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49fbeb84173b1cc58919456c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 5 15:50:59 2014 +0200 d2d1: Implement initial clipping support. --- dlls/d2d1/d2d1_private.h | 11 +++ dlls/d2d1/render_target.c | 171 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 180 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a49fbeb84173b1cc58919…

1 0

Henri Verbeet : d2d1/tests: Add a basic clipping test.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: e90b49e2bc8245ddc77456cb952a6e48b9fe4aa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e90b49e2bc8245ddc77456cb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 5 15:51:00 2014 +0200 d2d1/tests: Add a basic clipping test. --- configure | 1 + configure.ac | 1 + dlls/d2d1/tests/Makefile.in | 5 + dlls/d2d1/tests/d2d1.c | 337 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 344 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e90b49e2bc8245ddc7745…

1 0

YongHao Hu : msvcp90: Improve complex_float_pow.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: 16816672936f3ecbb44d7932f260e27b664b26ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=16816672936f3ecbb44d7932f… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Fri Sep 5 18:00:43 2014 +0800 msvcp90: Improve complex_float_pow. --- dlls/msvcp90/math.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index ec0b4f8..7ea6b69 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1468,19 +1468,19 @@ complex_float* __cdecl complex_float_pow_cf(complex_float *ret, const complex_fl complex_float* __cdecl complex_float_pow_ci(complex_float *ret, const complex_float *l, int r) { complex_float c = *l; - complex_float temp = { 1.0, 0 }; - complex_float_assign(ret, &temp); + complex_float unit_value = { 1.0, 0 }; + complex_float_assign(ret, &unit_value); if(r < 0) { r = -r; - complex_float_div(&c, &temp, l); + complex_float_div(&c, &unit_value, l); } for(; r>0; r>>=1) { if(r & 1) complex_float_mult_assign(ret, &c); - complex_float_assign(&temp, &c); - complex_float_mult_assign(&c, &temp); + if(r != 1) + complex_float_mult_assign(&c, &c); } return ret; @@ -2190,19 +2190,19 @@ complex_double* __cdecl complex_double_pow_cd(complex_double *ret, const complex complex_double* __cdecl complex_double_pow_ci(complex_double *ret, const complex_double *l, int r) { complex_double c = *l; - complex_double temp = { 1.0, 0 }; - complex_double_assign(ret, &temp); + complex_double unit_value = { 1.0, 0 }; + complex_double_assign(ret, &unit_value); if(r < 0) { r = -r; - complex_double_div(&c, &temp, l); + complex_double_div(&c, &unit_value, l); } for(; r>0; r>>=1) { if(r & 1) complex_double_mult_assign(ret, &c); - complex_double_assign(&temp, &c); - complex_double_mult_assign(&c, &temp); + if(r != 1) + complex_double_mult_assign(&c, &c); } return ret;

1 0

Marcus Meissner : ntoskrnl.exe: Emulate some more mov eax -> drX.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: bd6e1976b379527f3327fafe5e18805b180eb742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6e1976b379527f3327fafe5… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Sep 7 20:22:33 2014 +0200 ntoskrnl.exe: Emulate some more mov eax -> drX. --- dlls/ntoskrnl.exe/instr.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index dd33085..85ab9eb 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -366,18 +366,34 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) context->Eip += prefixlen+3; return ExceptionContinueExecution; } - ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); + ERR("Unsupported DR register -> EAX, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; case 0x23: /* mov eax drX */ switch (instr[2]) { + case 0xc0: /* mov eax, dr0 */ + context->Dr0 = context->Eax; + context->Eip += prefixlen+3; + return ExceptionContinueExecution; case 0xc8: /* mov eax, dr1 */ context->Dr1 = context->Eax; context->Eip += prefixlen+3; return ExceptionContinueExecution; + case 0xd0: /* mov eax, dr2 */ + context->Dr2 = context->Eax; + context->Eip += prefixlen+3; + return ExceptionContinueExecution; + case 0xd8: /* mov eax, dr3 */ + context->Dr3 = context->Eax; + context->Eip += prefixlen+3; + return ExceptionContinueExecution; + case 0xf8: /* mov eax, dr7 */ + context->Dr7 = context->Eax; + context->Eip += prefixlen+3; + return ExceptionContinueExecution; } - ERR("Unsupported DR register, eip+2 is %02x\n", instr[2]); + ERR("Unsupported EAX -> DR register, eip+2 is %02x\n", instr[2]); /* fallthrough to illegal instruction */ break; }

1 0

Sebastian Lackner : ntdll: Save more registers in call_dll_entry_point on i386.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: b7f77bb1fd75fd065cf0a34abae6a5e92573c724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f77bb1fd75fd065cf0a34ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 7 01:46:26 2014 +0200 ntdll: Save more registers in call_dll_entry_point on i386. --- dlls/ntdll/loader.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 79aa341..dfe7516 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -142,7 +142,9 @@ static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len ) * call_dll_entry_point * * Some brain-damaged dlls (ir32_32.dll for instance) modify ebx in - * their entry point, so we need a small asm wrapper. + * their entry point, so we need a small asm wrapper. Testing indicates + * that only modifying esi leads to a crash, so use this one to backup + * ebp while running the dll entry proc. */ #ifdef __i386__ extern BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module, UINT reason, void *reserved ); @@ -154,13 +156,24 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point, __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") "pushl %ebx\n\t" __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") - "subl $8,%esp\n\t" + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-8\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-12\n\t") + "movl %ebp,%esi\n\t" + __ASM_CFI(".cfi_def_cfa_register %esi\n\t") "pushl 20(%ebp)\n\t" "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "movl 8(%ebp),%eax\n\t" "call *%eax\n\t" - "leal -4(%ebp),%esp\n\t" + "movl %esi,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "leal -12(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") "popl %ebx\n\t" __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %ebp\n\t"

1 0

Sebastian Lackner : ntdll: Use call_dll_entry_point to execute TLS callbacks.
by Alexandre Julliard 08 Sep '14

08 Sep '14

Module: wine Branch: master Commit: 636dc013cd45993c35ba00c7ec45c087aa183b0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=636dc013cd45993c35ba00c7e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Sep 7 01:46:52 2014 +0200 ntdll: Use call_dll_entry_point to execute TLS callbacks. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index dfe7516..18ae29c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1030,7 +1030,7 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) GetCurrentThreadId(), *callback, module, reason_names[reason] ); __TRY { - (*callback)( module, reason, NULL ); + call_dll_entry_point( (DLLENTRYPROC)*callback, module, reason, NULL ); } __EXCEPT_ALL {

1 0

Alexandre Julliard : Wine release 1.7.26
by Alexandre Julliard 05 Sep '14

05 Sep '14

Module: website Branch: master Commit: 2a0a2ac9c70e0fea122a543572fdf0ef694a55f7 URL: http://source.winehq.org/git/website.git/?a=commit;h=2a0a2ac9c70e0fea122a54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 20:18:38 2014 +0200 Wine release 1.7.26 --- news/en/2014090501.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014090501.xml b/news/en/2014090501.xml new file mode 100644 index 0000000..760bdda --- /dev/null +++ b/news/en/2014090501.xml @@ -0,0 +1,15 @@ +<news> +<date>September 5, 2014</date> +<title>Wine 1.7.26 Released</title> +<body> + The Wine development release 1.7.26 is now available. + <a href="{$root}/announce/1.7.26">What's new</a> in this release: +<ul> + <li>Still more DirectWrite functions.</li> + <li>Improvements to the common File Dialog.</li> + <li>A number of C runtime improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.26.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0