March 2012 - Wine-Commits - list.winehq.org

Piotr Caban : urlmon/tests: Mark results returned by older urlmon broken in FindMimeFromData tests.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 04847ada41982d6434be65ae6a6b5e5c4e9810a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04847ada41982d6434be65ae6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 9 12:38:51 2012 +0100 urlmon/tests: Mark results returned by older urlmon broken in FindMimeFromData tests. --- dlls/urlmon/tests/misc.c | 205 ++++++++++++++++++++++----------------------- 1 files changed, 100 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04847ada41982d6434be6…

1 0

Nikolay Sivov : msxml3: Add stub ISAXAttributes for MXAttributes implementation.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: c2d792475b448b5cd51c1f806dddd4b297a28e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d792475b448b5cd51c1f806… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 9 11:55:03 2012 +0300 msxml3: Add stub ISAXAttributes for MXAttributes implementation. --- dlls/msxml3/mxwriter.c | 154 +++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/saxreader.c | 37 ++++++---- 2 files changed, 175 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2d792475b448b5cd51c1…

1 0

Jacek Caban : msident: Added stub DLL.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: aadc5cb6de4c13bed8d40cc16bc94fb8a8719cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=aadc5cb6de4c13bed8d40cc16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 9 11:12:25 2012 +0100 msident: Added stub DLL. --- configure | 1 + configure.ac | 1 + dlls/msident/Makefile.in | 6 ++++ dlls/msident/msident.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msident/msident.spec | 2 + 5 files changed, 71 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 55464c7..e7d691d 100755 --- a/configure +++ b/configure @@ -15150,6 +15150,7 @@ wine_fn_config_dll mshtml enable_mshtml implib,po wine_fn_config_test dlls/mshtml/tests mshtml_test wine_fn_config_dll msi enable_msi implib,po wine_fn_config_test dlls/msi/tests msi_test +wine_fn_config_dll msident enable_msident wine_fn_config_dll msimg32 enable_msimg32 implib wine_fn_config_dll msimsg enable_msimsg wine_fn_config_dll msimtf enable_msimtf diff --git a/configure.ac b/configure.ac index 357c829..3fd320e 100644 --- a/configure.ac +++ b/configure.ac @@ -2659,6 +2659,7 @@ WINE_CONFIG_DLL(mshtml,,[implib,po]) WINE_CONFIG_TEST(dlls/mshtml/tests) WINE_CONFIG_DLL(msi,,[implib,po]) WINE_CONFIG_TEST(dlls/msi/tests) +WINE_CONFIG_DLL(msident) WINE_CONFIG_DLL(msimg32,,[implib]) WINE_CONFIG_DLL(msimsg) WINE_CONFIG_DLL(msimtf) diff --git a/dlls/msident/Makefile.in b/dlls/msident/Makefile.in new file mode 100644 index 0000000..e52a4c8 --- /dev/null +++ b/dlls/msident/Makefile.in @@ -0,0 +1,6 @@ +MODULE = msident.dll + +C_SRCS = \ + msident.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/msident/msident.c b/dlls/msident/msident.c new file mode 100644 index 0000000..d6c9935 --- /dev/null +++ b/dlls/msident/msident.c @@ -0,0 +1,61 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "windows.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msident); + +/****************************************************************** + * DllMain (msident.@) + */ +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (msident.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (msident.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} diff --git a/dlls/msident/msident.spec b/dlls/msident/msident.spec new file mode 100644 index 0000000..079117d --- /dev/null +++ b/dlls/msident/msident.spec @@ -0,0 +1,2 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

Alexandre Julliard : winex11: Ignore FocusOut event on destroyed windows.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 29c1b8fa0842fdcaff6a7bdb73693be7445f602c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c1b8fa0842fdcaff6a7bdb7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 11:37:15 2012 +0100 winex11: Ignore FocusOut event on destroyed windows. --- dlls/winex11.drv/event.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 99c47c8..7f9f0bf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -759,6 +759,7 @@ static void X11DRV_FocusOut( HWND hwnd, XEvent *xev ) if (!hwnd && event->window == x11drv_thread_data()->clip_window) reset_clipping_window(); return; } + if (!hwnd) return; if (ximInComposeMode) return; x11drv_thread_data()->last_focus = hwnd;

1 0

Alexandre Julliard : gdi32: Fix rounding error for odd ellipse sizes in CreateRoundRectRgn.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 53c53126d53e58ea02bb956d8db56af3f0fe6761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53c53126d53e58ea02bb956d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 9 11:38:12 2012 +0100 gdi32: Fix rounding error for odd ellipse sizes in CreateRoundRectRgn. --- dlls/gdi32/region.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 231a7cf..dd2827d 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -824,12 +824,12 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, rects[i].top = top + i; rects[i].bottom = rects[i].top + 1; } - rects[i - 1].bottom = bottom - ellipse_height + i; /* extend to bottom of rectangle */ for (; i < ellipse_height; i++) { rects[i].top = bottom - ellipse_height + i; rects[i].bottom = rects[i].top + 1; } + rects[ellipse_height / 2].top = top + ellipse_height / 2; /* extend to top of rectangle */ hrgn = alloc_gdi_handle( &obj->header, OBJ_REGION, &region_funcs );

1 0

André Hentschel : winemaker: Abort on unhandled file formats.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: fc9670306069afea5856726f7102f1c5c9c59218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc9670306069afea5856726f7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:29:29 2012 +0100 winemaker: Abort on unhandled file formats. --- tools/winemaker | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index b6e5e7c..80305d1 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -977,6 +977,9 @@ sub source_scan_project_file($$$) push @{@$project_settings[$T_CEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_CXXEXTRA]},$prj_target_cflags; push @{@$project_settings[$T_DEFINES]},$prj_target_defines; + } else { + print STDERR "File format not supported for file: $filename\n"; + return; } # Add this project to the project list, except for

1 0

André Hentschel : winedbg: Use copy of be_i386_fetch_float for be_arm_fetch_float ( except of long double).
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: a948c20151197996b3668c49df123b40d743b3bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a948c20151197996b3668c49d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Mar 8 22:28:26 2012 +0100 winedbg: Use copy of be_i386_fetch_float for be_arm_fetch_float (except of long double). --- programs/winedbg/be_arm.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 0bd5601..c39043c 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -237,8 +237,20 @@ static int be_arm_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, static int be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, long double* ret) { - dbg_printf("be_arm_fetch_float: not done\n"); - return FALSE; + char tmp[sizeof(long double)]; + + /* FIXME: this assumes that debuggee and debugger use the same + * representation for reals + */ + if (!memory_read_value(lvalue, size, tmp)) return FALSE; + + switch (size) + { + case sizeof(float): *ret = *(float*)tmp; break; + case sizeof(double): *ret = *(double*)tmp; break; + default: return FALSE; + } + return TRUE; } struct backend_cpu be_arm =

1 0

Henri Verbeet : wined3d: Use ARB_texture_rg for WINED3DFMT_R16G16_UNORM textures when available.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 6eb5c891ac367588f3060edf5a22f7c33549cf91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eb5c891ac367588f3060edf5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 20:27:14 2012 +0100 wined3d: Use ARB_texture_rg for WINED3DFMT_R16G16_UNORM textures when available. --- dlls/wined3d/utils.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 847366e..66c8444 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -729,6 +729,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RGB, GL_UNSIGNED_SHORT, 6, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, WINED3D_GL_EXT_NONE, convert_r16g16}, + {WINED3DFMT_R16G16_UNORM, GL_RG16, GL_RG16, 0, + GL_RG, GL_UNSIGNED_SHORT, 0, + WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, + ARB_TEXTURE_RG, NULL}, {WINED3DFMT_B10G10R10A2_UNORM, GL_RGB10_A2, GL_RGB10_A2, 0, GL_BGRA, GL_UNSIGNED_INT_2_10_10_10_REV, 0, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET,

1 0

Henri Verbeet : d3dx9: Implement loading luminance/ alpha data in D3DXLoadSurfaceFromMemory().
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: 5380572057b0247b906c5a9f266aef0910a6a78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5380572057b0247b906c5a9f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 20:27:12 2012 +0100 d3dx9: Implement loading luminance/alpha data in D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/d3dx9_36_private.h | 7 ++ dlls/d3dx9_36/surface.c | 167 ++++++++++++++++++++++++++++++------- dlls/d3dx9_36/util.c | 53 ++++++++----- 3 files changed, 176 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5380572057b0247b906c5…

1 0

Jacek Caban : jscript: Removed no longer needed disp_propput caller argument.
by Alexandre Julliard March 9, 2012

March 9, 2012

Module: wine Branch: master Commit: fb799158031fb9950fbbe032e730230d947c1bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb799158031fb9950fbbe032e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 8 14:29:01 2012 +0100 jscript: Removed no longer needed disp_propput caller argument. --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/engine.c | 8 ++++---- dlls/jscript/jscript.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e8cc6e9..5ce98e7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1095,7 +1095,7 @@ HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, VARIANT *val, jsexcept_t *e return jsdisp_propput_name(obj, buf, val, ei, caller); } -HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei) { jsdisp_t *jsdisp; HRESULT hres; @@ -1106,7 +1106,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val prop = get_prop(jsdisp, id); if(prop) - hres = prop_put(jsdisp, prop, val, ei, caller); + hres = prop_put(jsdisp, prop, val, ei, NULL); else hres = DISP_E_MEMBERNOTFOUND; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 95b2348..fdea876 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -617,7 +617,7 @@ static HRESULT interp_forin(exec_ctx_t *ctx) V_VT(&v) = VT_BSTR; V_BSTR(&v) = name; - hres = disp_propput(ctx->parser->script, var_obj, var_id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propput(ctx->parser->script, var_obj, var_id, &v, ctx->ei); SysFreeString(name); if(FAILED(hres)) return hres; @@ -1903,7 +1903,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) hres = to_number(ctx->parser->script, &v, ctx->ei, &n); if(SUCCEEDED(hres)) { num_set_val(&inc, num_val(&n)+(double)arg); - hres = disp_propput(ctx->parser->script, obj, id, &inc, ctx->ei, NULL/*FIXME*/); + hres = disp_propput(ctx->parser->script, obj, id, &inc, ctx->ei); } if(FAILED(hres)) VariantClear(&v); @@ -1938,7 +1938,7 @@ static HRESULT interp_preinc(exec_ctx_t *ctx) VariantClear(&v); if(SUCCEEDED(hres)) { num_set_val(&v, num_val(&n)+(double)arg); - hres = disp_propput(ctx->parser->script, obj, id, &v, ctx->ei, NULL/*FIXME*/); + hres = disp_propput(ctx->parser->script, obj, id, &v, ctx->ei); } } IDispatch_Release(obj); @@ -2364,7 +2364,7 @@ static HRESULT interp_assign(exec_ctx_t *ctx) if(!disp) return throw_reference_error(ctx->parser->script, ctx->ei, JS_E_ILLEGAL_ASSIGN, NULL); - hres = disp_propput(ctx->parser->script, disp, id, v, ctx->ei, NULL/*FIXME*/); + hres = disp_propput(ctx->parser->script, disp, id, v, ctx->ei); IDispatch_Release(disp); if(FAILED(hres)) { VariantClear(v); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 42537cc..2e2d57b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -211,7 +211,7 @@ HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServi HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; +HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN;

1 0