June 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : widl: Don' t require inline stubs for functions that are never generated.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 350c93a1643d17671d6aabca96f61562fa66bd93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=350c93a1643d17671d6aabca9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 14:05:53 2011 +0200 widl: Don't require inline stubs for functions that are never generated. --- tools/widl/proxy.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 0a677b7..549bfaa 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -850,6 +850,23 @@ int need_inline_stubs(const type_t *iface) STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) { const var_t *func = stmt->u.var; + if (is_local( func->attrs )) continue; + if (!is_interpreted_func( iface, func )) return 1; + } + return 0; +} + +static int need_proxy_and_inline_stubs(const type_t *iface) +{ + const statement_t *stmt; + + if (!need_proxy( iface )) return 0; + if (get_stub_mode() == MODE_Os) return 1; + + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + { + const var_t *func = stmt->u.var; + if (is_local( func->attrs )) continue; if (!is_interpreted_func( iface, func )) return 1; } return 0; @@ -942,7 +959,7 @@ static void write_proxy_routines(const statement_list_t *stmts) print_proxy( "#include \"%s\"\n", header_name); print_proxy( "\n"); - if (need_inline_stubs_file( stmts )) + if (does_any_iface(stmts, need_proxy_and_inline_stubs)) { write_exceptions( proxy ); print_proxy( "\n");

1 0

Alexandre Julliard : widl: Don' t generate old-style interpreted stubs on 64-bit.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 36ee028f497c82eaab7531258baa4f21bbd5ff43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ee028f497c82eaab7531258… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 12:14:47 2011 +0200 widl: Don't generate old-style interpreted stubs on 64-bit. --- tools/widl/client.c | 9 +++------ tools/widl/proxy.c | 40 +++++++++++++++++++++------------------- tools/widl/server.c | 4 ++-- tools/widl/typegen.c | 10 +++++----- tools/widl/widl.c | 9 ++++++++- tools/widl/widl.h | 2 +- 6 files changed, 40 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36ee028f497c82eaab753…

1 0

Alexandre Julliard : widl: Don' t allow floating point parameters for interpreted functions.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 31475455417c5520955ae4af8ef6ccf4c5f9389c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31475455417c5520955ae4af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 13:57:41 2011 +0200 widl: Don't allow floating point parameters for interpreted functions. --- tools/widl/typegen.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3f5847b..59de872 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1230,14 +1230,26 @@ int is_interpreted_func( const type_t *iface, const var_t *func ) break; } } - /* unions passed by value are not supported in Oi mode */ if (get_stub_mode() != MODE_Oif && args) + { LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) - { - if (type_get_type( var->type ) == TYPE_UNION || - type_get_type( var->type ) == TYPE_ENCAPSULATED_UNION) - return 0; - } + switch (type_get_type( var->type )) + { + case TYPE_BASIC: + switch (type_basic_get_type( var->type )) + { + /* floating point arguments are not supported in Oi mode */ + case TYPE_BASIC_FLOAT: return 0; + case TYPE_BASIC_DOUBLE: return 0; + default: break; + } + break; + /* unions passed by value are not supported in Oi mode */ + case TYPE_UNION: return 0; + case TYPE_ENCAPSULATED_UNION: return 0; + default: break; + } + } if ((str = get_attrp( func->attrs, ATTR_OPTIMIZE ))) return !strcmp( str, "i" ); if ((str = get_attrp( iface->attrs, ATTR_OPTIMIZE ))) return !strcmp( str, "i" );

1 0

Alexandre Julliard : widl: In 64-bit mode, pass all arguments to NdrClientCall instead of a pointer to the first one.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: d9cd0d8cac36c1cc9748a91518185c39af3697c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9cd0d8cac36c1cc9748a9151… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 11:34:46 2011 +0200 widl: In 64-bit mode, pass all arguments to NdrClientCall instead of a pointer to the first one. --- tools/widl/client.c | 20 +++++++++++++++----- tools/widl/proxy.c | 13 +++++++++++-- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ea0c2cc..27093a5 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -107,15 +107,25 @@ static void write_function_stub( const type_t *iface, const var_t *func, fprintf(client, "{\n"); indent++; if (has_ret) print_client( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + print_client( "%s%s( &%s_StubDesc, &__MIDL_ProcFormatString.Format[%u]", has_ret ? "_RetVal = " : "", stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", iface->name, proc_offset ); if (args) - fprintf( client, "(unsigned char *)&%s );\n", - LIST_ENTRY( list_head(args), const var_t, entry )->name ); - else - fprintf( client, "(unsigned char *)0 );\n" ); + { + const var_t *arg; + if (pointer_size == 8) + { + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + fprintf( client, ",\n%*s%s", 4 * indent + 16, "", arg->name ); + } + else + { + arg = LIST_ENTRY( list_head(args), const var_t, entry ); + fprintf( client, ", &%s", arg->name ); + } + } + fprintf( client, " );\n" ); if (has_ret) { print_client( "return (" ); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index e889423..7d4ebe8 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -280,11 +280,20 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( "{\n"); indent++; if (has_ret) print_proxy( "%s", "CLIENT_CALL_RETURN _RetVal;\n\n" ); - print_proxy( "%s%s( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u], ", + print_proxy( "%s%s( &Object_StubDesc, &__MIDL_ProcFormatString.Format[%u],", has_ret ? "_RetVal = " : "", stub_mode == MODE_Oif ? "NdrClientCall2" : "NdrClientCall", proc_offset ); - fprintf( proxy, "(unsigned char *)&This );\n" ); + if (pointer_size == 8) + { + const var_t *arg; + fprintf( proxy, "\n%*sThis", 4 * indent + 16, "" ); + if (args) + LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) + fprintf( proxy, ",\n%*s%s", 4 * indent + 16, "", arg->name ); + } + else fprintf( proxy, " &This" ); + fprintf( proxy, " );\n" ); if (has_ret) { print_proxy( "return (" );

1 0

Henri Verbeet : wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt() to wined3d_check_pixel_format_color().
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: c24c2d1eac46bb4ff181b9a09bc9116134187470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c24c2d1eac46bb4ff181b9a09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:47 2011 +0200 wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt() to wined3d_check_pixel_format_color(). --- dlls/wined3d/directx.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02cb33c..09c4de1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2931,7 +2931,7 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, return WINED3D_OK; } -static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined3d_gl_info *gl_info, +static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BYTE redSize, greenSize, blueSize, alphaSize, colorBits; @@ -3038,13 +3038,11 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, cfg_count = adapter->nCfgs; for (i = 0; i < cfg_count; ++i) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, &cfgs[i], rt_format)) + if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) + && wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) { - if (wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) - { - TRACE_(d3d_caps)("Formats match.\n"); - return WINED3D_OK; - } + TRACE_(d3d_caps)("Formats match.\n"); + return WINED3D_OK; } } } @@ -3185,11 +3183,9 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, for (it = 0; it < adapter->nCfgs; ++it) { const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; - if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, cfg, display_format)) - { - if (wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) - return TRUE; - } + if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) + && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) + return TRUE; } } @@ -3231,8 +3227,8 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ for (it = 0; it < adapter->nCfgs; ++it) { - if (cfgs[it].windowDrawable && IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, - &cfgs[it], check_format)) + if (cfgs[it].windowDrawable + && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[it], check_format)) { TRACE_(d3d_caps)("Pixel format %d is compatible with format %s.\n", cfgs[it].iPixelFormat, debug_d3dformat(check_format->id));

1 0

Henri Verbeet : wined3d: cfg can never be NULL in wined3d_check_pixel_format_color().
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: da125e6bca589f40cf368fddd3e42ebdb2d3f83f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da125e6bca589f40cf368fddd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:48 2011 +0200 wined3d: cfg can never be NULL in wined3d_check_pixel_format_color(). --- dlls/wined3d/directx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 09c4de1..502b5d7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2936,9 +2936,6 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in { BYTE redSize, greenSize, blueSize, alphaSize, colorBits; - if(!cfg) - return FALSE; - /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags & WINED3DFMT_FLAG_FLOAT) return FALSE;

1 0

Henri Verbeet : usp10: Fix a memory leak in GDEF_UpdateGlyphProps().
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 90cf60c796a7102ad0bfcd5479535c6ac3342583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90cf60c796a7102ad0bfcd547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:45 2011 +0200 usp10: Fix a memory leak in GDEF_UpdateGlyphProps(). --- dlls/usp10/shape.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d4f7d17..66904da 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1322,6 +1322,8 @@ static void GDEF_UpdateGlyphProps(HDC hdc, const WORD *pwGlyphs, const WORD cGly pGlyphProp[i].sva.fZeroWidth = 0; } } + + HeapFree(GetProcessHeap(), 0, header); } static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp)

1 0

Henri Verbeet : wined3d: Rename IWineD3DDeviceImpl_LoadLogo() to device_load_logo().
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 5173f9f05f542152a1a9348fd1621188ebee3f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5173f9f05f542152a1a9348fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:49 2011 +0200 wined3d: Rename IWineD3DDeviceImpl_LoadLogo() to device_load_logo(). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c7bade0..632f102 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -910,7 +910,7 @@ HRESULT CDECL wined3d_device_get_swapchain(struct wined3d_device *device, return WINED3D_OK; } -static void IWineD3DDeviceImpl_LoadLogo(struct wined3d_device *device, const char *filename) +static void device_load_logo(struct wined3d_device *device, const char *filename) { HBITMAP hbm; BITMAP bm; @@ -1317,7 +1317,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->d3d_initialized = TRUE; if (wined3d_settings.logo) - IWineD3DDeviceImpl_LoadLogo(device, wined3d_settings.logo); + device_load_logo(device, wined3d_settings.logo); device->highest_dirty_ps_const = 0; device->highest_dirty_vs_const = 0; return WINED3D_OK;

1 0

Jacek Caban : winetest: Added an empty file for tests.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: tools Branch: master Commit: 8526960cf58fafe85cc676333df170cd530f867a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8526960cf58fafe85cc67633… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 8 13:46:00 2011 +0200 winetest: Added an empty file for tests. --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/winetest/tests/empty.js b/winetest/tests/empty.js new file mode 100644 index 0000000..e69de29

1 0

Aric Stewart : usp10: Correct matra type for Oriya 0x0B57.
by Alexandre Julliard June 7, 2011

June 7, 2011

Module: wine Branch: master Commit: 5bf7622fc3ad043cb17accfefcaf5b6371f80a8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf7622fc3ad043cb17accfef… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 7 11:07:38 2011 -0500 usp10: Correct matra type for Oriya 0x0B57. --- dlls/usp10/shape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 36ed75a..d4f7d17 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2335,9 +2335,9 @@ static int oriya_lex(WCHAR c) case 0x0B3F: case 0x0B56: return lex_Matra_above; case 0x0B3E: + case 0x0B57: case 0x0B40: return lex_Matra_post; - case 0x0B47: - case 0x0B57: return lex_Matra_pre; + case 0x0B47: return lex_Matra_pre; case 0x0B4D: return lex_Halant; case 0x200C: return lex_ZWNJ; case 0x200D: return lex_ZWJ;

1 0