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

Ken Thomases : winemac: Rename create_cgimage_from_icon() to create_cgimage_from_icon_bitmaps().
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 322ce433d5fbb3d1354c6e2ac7fa8943f21923c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=322ce433d5fbb3d1354c6e2ac… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:38 2013 -0500 winemac: Rename create_cgimage_from_icon() to create_cgimage_from_icon_bitmaps(). --- dlls/winemac.drv/mouse.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 66214fe..d8c97b6 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -467,12 +467,12 @@ CFArrayRef create_monochrome_cursor(HDC hdc, const ICONINFOEXW *icon, int width, /*********************************************************************** - * create_cgimage_from_icon + * create_cgimage_from_icon_bitmaps */ -static CGImageRef create_cgimage_from_icon(HDC hdc, HANDLE icon, HBITMAP hbmColor, - unsigned char *color_bits, int color_size, HBITMAP hbmMask, - unsigned char *mask_bits, int mask_size, int width, - int height, int istep) +static CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmColor, + unsigned char *color_bits, int color_size, HBITMAP hbmMask, + unsigned char *mask_bits, int mask_size, int width, + int height, int istep) { int i, has_alpha = FALSE; DWORD *ptr; @@ -655,8 +655,8 @@ static CFDictionaryRef create_cursor_frame(HDC hdc, const ICONINFOEXW *iinfo, HA CFDictionarySetValue(frame, CFSTR("duration"), duration_number); CFRelease(duration_number); - cgimage = create_cgimage_from_icon(hdc, icon, hbmColor, color_bits, color_size, - hbmMask, mask_bits, mask_size, width, height, istep); + cgimage = create_cgimage_from_icon_bitmaps(hdc, icon, hbmColor, color_bits, color_size, + hbmMask, mask_bits, mask_size, width, height, istep); if (!cgimage) { CFRelease(frame);

1 0

Daniel Jelinski : comctl32/listview: Fix overwriting of item values.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 27fb2fb076878a6efa9bdafe96f26fb6fb54ab5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=27fb2fb076878a6efa9bdafe9… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun Mar 17 16:18:15 2013 +0100 comctl32/listview: Fix overwriting of item values. --- dlls/comctl32/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 52717e9..42e389f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6265,6 +6265,7 @@ again: { lvItem.iItem = nItem; lvItem.iSubItem = 0; + lvItem.pszText = szDispText; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) continue; if (lvItem.mask & LVIF_PARAM)

1 0

Piotr Caban : msvcp90: Added time_put facet to locale object.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 5401437739f28169f548aa2b53ff57f2918149b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5401437739f28169f548aa2b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:38:14 2013 +0100 msvcp90: Added time_put facet to locale object. --- dlls/msvcp90/locale.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 135 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 253edb6..5e11ece 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7982,6 +7982,34 @@ MSVCP_size_t __cdecl time_put_char__Getcat(const locale_facet **facet, const loc return LC_TIME; } +static time_put* time_put_char_use_facet(const locale *loc) +{ + static time_put *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&time_put_char_id)); + if(fac) { + _Lockit_dtor(&lock); + return (time_put*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + time_put_char__Getcat(&fac, loc); + obj = (time_put*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AAVios_base(a)2@DPBUtm@@DD(a)Z */ /* ?do_put@?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@2(a)V32@AEAVios_base(a)2@DPEBUtm@@DD(a)Z */ DEFINE_THISCALL_WRAPPER(time_put_char_do_put, 36) @@ -8217,6 +8245,34 @@ MSVCP_size_t __cdecl time_put_wchar__Getcat(const locale_facet **facet, const lo return LC_TIME; } +static time_put* time_put_wchar_use_facet(const locale *loc) +{ + static time_put *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&time_put_wchar_id)); + if(fac) { + _Lockit_dtor(&lock); + return (time_put*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + time_put_wchar__Getcat(&fac, loc); + obj = (time_put*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl time_put_short__Getcat(const locale_facet **facet, const locale *loc) @@ -8237,6 +8293,34 @@ MSVCP_size_t __cdecl time_put_short__Getcat(const locale_facet **facet, const lo return LC_TIME; } +static time_put* time_put_short_use_facet(const locale *loc) +{ + static time_put *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&time_put_short_id)); + if(fac) { + _Lockit_dtor(&lock); + return (time_put*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + time_put_short__Getcat(&fac, loc); + obj = (time_put*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBUtm@@DD(a)Z */ /* ?do_put@?$time_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@MEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEBUtm@@DD(a)Z */ /* ?do_put@?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@MBE?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AAVios_base(a)2@_WPBUtm@@DD(a)Z */ @@ -8491,7 +8575,7 @@ locale__Locimp** __cdecl locale__Locimp__Clocptr_func(void) /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get */ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8577,6 +8661,22 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_short_id)); } + if(cat & (1<<(time_put_short__Getcat(NULL, NULL)-1))) { + time_put *t; + + if(loc) { + t = time_put_short_use_facet(loc); + }else { + t = MSVCRT_operator_new(sizeof(time_put)); + if(!t) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + time_put_short_ctor_locinfo(t, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_short_id)); + } + if(cat & (1<<(codecvt_short__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8597,7 +8697,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get */ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8683,6 +8783,22 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_wchar_id)); } + if(cat & (1<<(time_put_wchar__Getcat(NULL, NULL)-1))) { + time_put *t; + + if(loc) { + t = time_put_wchar_use_facet(loc); + }else { + t = MSVCRT_operator_new(sizeof(time_put)); + if(!t) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + time_put_wchar_ctor_locinfo(t, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_wchar_id)); + } + if(cat & (1<<(codecvt_wchar__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8703,7 +8819,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get */ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8789,6 +8905,22 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_char_id)); } + if(cat & (1<<(time_put_char__Getcat(NULL, NULL)-1))) { + time_put *t; + + if(loc) { + t = time_put_char_use_facet(loc); + }else { + t = MSVCRT_operator_new(sizeof(time_put)); + if(!t) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + time_put_char_ctor_locinfo(t, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &t->facet, locale_id_operator_size_t(&time_put_char_id)); + } + if(cat & (1<<(codecvt_char__Getcat(NULL, NULL)-1))) { codecvt_char *codecvt;

1 0

Piotr Caban : msvcp90: Added collate facet to locale object.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 1c688130c4cd638bf4f36eff60f820f1df0ce0f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c688130c4cd638bf4f36eff6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:37:59 2013 +0100 msvcp90: Added collate facet to locale object. --- dlls/msvcp90/locale.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 138 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 77b140c..253edb6 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -768,7 +768,7 @@ collate* __thiscall collate_char_ctor_name(collate *this, const char *name, MSVC /* ??0?$collate(a)D@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$collate(a)D@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(collate_char_ctor_locinfo, 12) -collate* __thiscall collate_char_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) +collate* __thiscall collate_char_ctor_locinfo(collate *this, const _Locinfo *locinfo, MSVCP_size_t refs) { TRACE("(%p %p %lu)\n", this, locinfo, refs); @@ -842,6 +842,34 @@ MSVCP_size_t __cdecl collate_char__Getcat(const locale_facet **facet, const loca return LC_COLLATE; } +static collate* collate_char_use_facet(const locale *loc) +{ + static collate *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&collate_char_id)); + if(fac) { + _Lockit_dtor(&lock); + return (collate*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + collate_char__Getcat(&fac, loc); + obj = (collate*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* _Strcoll */ int __cdecl _Strcoll(const char *first1, const char *last1, const char *first2, const char *last2, const _Collvec *coll) @@ -979,7 +1007,7 @@ collate* __thiscall collate_short_ctor_name(collate *this, const char *name, MSV /* ??0?$collate(a)_W@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$collate(a)_W@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_locinfo, 12) -collate* __thiscall collate_wchar_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) +collate* __thiscall collate_wchar_ctor_locinfo(collate *this, const _Locinfo *locinfo, MSVCP_size_t refs) { TRACE("(%p %p %lu)\n", this, locinfo, refs); @@ -992,7 +1020,7 @@ collate* __thiscall collate_wchar_ctor_locinfo(collate *this, _Locinfo *locinfo, /* ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ /* ??0?$collate(a)G@std@@QEAA(a)AEBV_Locinfo@1(a)_K@Z */ DEFINE_THISCALL_WRAPPER(collate_short_ctor_locinfo, 12) -collate* __thiscall collate_short_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) +collate* __thiscall collate_short_ctor_locinfo(collate *this, const _Locinfo *locinfo, MSVCP_size_t refs) { collate *ret = collate_wchar_ctor_locinfo(this, locinfo, refs); ret->facet.vtable = &MSVCP_collate_short_vtable; @@ -1085,6 +1113,34 @@ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const loc return LC_COLLATE; } +static collate* collate_wchar_use_facet(const locale *loc) +{ + static collate *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&collate_wchar_id)); + if(fac) { + _Lockit_dtor(&lock); + return (collate*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + collate_wchar__Getcat(&fac, loc); + obj = (collate*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z */ /* ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl collate_short__Getcat(const locale_facet **facet, const locale *loc) @@ -1097,6 +1153,34 @@ MSVCP_size_t __cdecl collate_short__Getcat(const locale_facet **facet, const loc return LC_COLLATE; } +static collate* collate_short_use_facet(const locale *loc) +{ + static collate *obj = NULL; + + _Lockit lock; + const locale_facet *fac; + + _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); + fac = locale__Getfacet(loc, locale_id_operator_size_t(&collate_short_id)); + if(fac) { + _Lockit_dtor(&lock); + return (collate*)fac; + } + + if(obj) { + _Lockit_dtor(&lock); + return obj; + } + + collate_short__Getcat(&fac, loc); + obj = (collate*)fac; + locale_facet__Incref(&obj->facet); + locale_facet_register(&obj->facet); + _Lockit_dtor(&lock); + + return obj; +} + /* _Wcscoll */ int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2, const _Collvec *coll) @@ -8407,7 +8491,7 @@ locale__Locimp** __cdecl locale__Locimp__Clocptr_func(void) /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makeushloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * num_put, collate, messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put */ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8477,6 +8561,22 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_short_id)); } + if(cat & (1<<(collate_short__Getcat(NULL, NULL)-1))) { + collate *c; + + if(loc) { + c = collate_short_use_facet(loc); + }else { + c = MSVCRT_operator_new(sizeof(collate)); + if(!c) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + collate_short_ctor_locinfo(c, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_short_id)); + } + if(cat & (1<<(codecvt_short__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8497,7 +8597,7 @@ void __cdecl locale__Locimp__Makeushloc(const _Locinfo *locinfo, category cat, l /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makewloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * collate, messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put */ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8567,6 +8667,22 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_wchar_id)); } + if(cat & (1<<(collate_wchar__Getcat(NULL, NULL)-1))) { + collate *c; + + if(loc) { + c = collate_wchar_use_facet(loc); + }else { + c = MSVCRT_operator_new(sizeof(collate)); + if(!c) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + collate_wchar_ctor_locinfo(c, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_wchar_id)); + } + if(cat & (1<<(codecvt_wchar__Getcat(NULL, NULL)-1))) { codecvt_wchar *codecvt; @@ -8587,7 +8703,7 @@ void __cdecl locale__Locimp__Makewloc(const _Locinfo *locinfo, category cat, loc /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXABV_Locinfo(a)3@HPAV123(a)PBV23@@Z */ /* ?_Makexloc(a)_Locimp@locale(a)std@@CAXAEBV_Locinfo(a)3@HPEAV123(a)PEBV23@@Z */ /* List of missing facets: - * collate, messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put + * messages, money_get, money_put, moneypunct, moneypunct, time_get, time_put */ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, locale__Locimp *locimp, const locale *loc) { @@ -8657,6 +8773,22 @@ void __cdecl locale__Locimp__Makexloc(const _Locinfo *locinfo, category cat, loc locale__Locimp__Addfac(locimp, &numpunct->facet, locale_id_operator_size_t(&numpunct_char_id)); } + if(cat & (1<<(collate_char__Getcat(NULL, NULL)-1))) { + collate *c; + + if(loc) { + c = collate_char_use_facet(loc); + }else { + c = MSVCRT_operator_new(sizeof(collate)); + if(!c) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + collate_char_ctor_locinfo(c, locinfo, 0); + } + locale__Locimp__Addfac(locimp, &c->facet, locale_id_operator_size_t(&collate_char_id)); + } + if(cat & (1<<(codecvt_char__Getcat(NULL, NULL)-1))) { codecvt_char *codecvt;

1 0

Piotr Caban : msvcp90: Added time_put class implementation.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 889786edd19a2d13125e53b568bfcf58e3e8e6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=889786edd19a2d13125e53b56… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:37:48 2013 +0100 msvcp90: Added time_put class implementation. --- dlls/msvcp90/locale.c | 254 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 205 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=889786edd19a2d13125e5…

1 0

Piotr Caban : msvcp90: Added time_put class stub.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 38302c20f040589ff83cd10618c4448d0524b766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38302c20f040589ff83cd1061… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 19 15:37:36 2013 +0100 msvcp90: Added time_put class stub. --- dlls/msvcp90/locale.c | 315 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 128 +++++++++--------- 2 files changed, 379 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38302c20f040589ff83cd…

1 0

Ken Thomases : winemac: Move create_cgimage_from_icon_bitmaps() into new module, image.c.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 462721a11562732de00702cb3e7711552d1783ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=462721a11562732de00702cb3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Mar 17 22:40:44 2013 -0500 winemac: Move create_cgimage_from_icon_bitmaps() into new module, image.c. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/image.c | 152 ++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 5 ++ dlls/winemac.drv/mouse.c | 126 ---------------------------------- 4 files changed, 158 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=462721a11562732de0070…

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::name implementation.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 724b248f988b9a507c17b35ef80a6199960dcf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724b248f988b9a507c17b35ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 18 14:06:10 2013 +0100 mshtml: Added IHTMLButtonElement::name implementation. --- dlls/mshtml/htmlinput.c | 38 ++++++++++++++++++++++++++++++++------ dlls/mshtml/nsiface.idl | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 0ca0e76..d6bd394 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1417,6 +1417,8 @@ typedef struct { HTMLElement element; IHTMLButtonElement IHTMLButtonElement_iface; + + nsIDOMHTMLButtonElement *nsbutton; } HTMLButtonElement; static inline HTMLButtonElement *impl_from_IHTMLButtonElement(IHTMLButtonElement *iface) @@ -1504,15 +1506,33 @@ static HRESULT WINAPI HTMLButtonElement_get_value(IHTMLButtonElement *iface, BST static HRESULT WINAPI HTMLButtonElement_put_name(IHTMLButtonElement *iface, BSTR v) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&name_str, v); + nsres = nsIDOMHTMLButtonElement_SetName(This->nsbutton, &name_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLButtonElement_get_name(IHTMLButtonElement *iface, BSTR *p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&name_str, NULL); + nsres = nsIDOMHTMLButtonElement_GetName(This->nsbutton, &name_str); + return return_nsstr(nsres, &name_str, p); } static HRESULT WINAPI HTMLButtonElement_put_status(IHTMLButtonElement *iface, VARIANT v) @@ -1628,8 +1648,7 @@ static dispex_static_data_t HTMLButtonElement_dispex = { HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLButtonElement *ret; - - ERR("!!!\n"); + nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); if(!ret) @@ -1639,6 +1658,13 @@ HRESULT HTMLButtonElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele ret->element.node.vtbl = &HTMLButtonElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLButtonElement_dispex); + + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLButtonElement, (void**)&ret->nsbutton); + + /* Share nsbutton reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsbutton == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; } diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 647566f..76f8ed0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1690,6 +1690,41 @@ interface nsIDOMHTMLOptionElement : nsIDOMHTMLElement [ object, + uuid(8e40d4d7-c204-4192-802a-0b5602e9c669), + local +] +interface nsIDOMHTMLButtonElement : nsIDOMHTMLElement +{ + nsresult GetAutofocus(bool *aAutofocus); + nsresult SetAutofocus(bool aAutofocus); + nsresult GetDisabled(bool *aDisabled); + nsresult SetDisabled(bool aDisabled); + nsresult GetForm(nsIDOMHTMLFormElement **aForm); + nsresult GetFormAction(nsAString *aFormAction); + nsresult SetFormAction(const nsAString *aFormAction); + nsresult GetFormEnctype(nsAString *aFormEnctype); + nsresult SetFormEnctype(const nsAString *aFormEnctype); + nsresult GetFormMethod(nsAString *aFormMethod); + nsresult SetFormMethod(const nsAString *aFormMethod); + nsresult GetFormNoValidate(bool *aFormNoValidate); + nsresult SetFormNoValidate(bool aFormNoValidate); + nsresult GetFormTarget(nsAString *aFormTarget); + nsresult SetFormTarget(const nsAString *aFormTarget); + nsresult GetName(nsAString *aName); + nsresult SetName(const nsAString *aName); + nsresult GetType(nsAString *aType); + nsresult SetType(const nsAString *aType); + nsresult GetValue(nsAString *aValue); + nsresult SetValue(const nsAString *aValue); + nsresult GetWillValidate(bool *aWillValidate); + nsresult GetValidity(nsIDOMValidityState **aValidity); + nsresult GetValidationMessage(nsAString *aValidationMessage); + nsresult CheckValidity(bool *_retval); + nsresult SetCustomValidity(const nsAString *error); +} + +[ + object, uuid(429b041b-06df-486c-9a3a-a1d901cc76a2), local ]

1 0

Dmitry Timoshkov : windowscodecs: Make JPEG decoder fallback to 96 dpi resolution for density_unit == 0 case .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: fb87ee2464ea9904b8aa3f1bbdb52a94f610e492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb87ee2464ea9904b8aa3f1bb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Mar 18 14:22:13 2013 +0900 windowscodecs: Make JPEG decoder fallback to 96 dpi resolution for density_unit == 0 case. --- dlls/windowscodecs/jpegformat.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 6f2653d..c742f78 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -548,16 +548,23 @@ static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifa EnterCriticalSection(&This->lock); - if (This->cinfo.density_unit == 2) /* pixels per centimeter */ + switch (This->cinfo.density_unit) { + case 2: /* pixels per centimeter */ *pDpiX = This->cinfo.X_density * 2.54; *pDpiY = This->cinfo.Y_density * 2.54; - } - else - { - /* 1 = pixels per inch, 0 = unknown */ + break; + + case 1: /* pixels per inch */ *pDpiX = This->cinfo.X_density; *pDpiY = This->cinfo.Y_density; + break; + + case 0: /* unknown */ + default: + *pDpiX = 96.0; + *pDpiY = 96.0; + break; } LeaveCriticalSection(&This->lock);

1 0

Marcus Meissner : jscript: Fix warning with older compilers.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 874c66e0864be117a733671bf73211501217315f URL: http://source.winehq.org/git/wine.git/?a=commit;h=874c66e0864be117a733671bf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Mar 16 07:53:06 2013 +0100 jscript: Fix warning with older compilers. --- dlls/jscript/compile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 516de49..d332087 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -771,6 +771,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) } DEFAULT_UNREACHABLE; } + return E_FAIL; } static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *str)

1 0

Dmitry Timoshkov : gdi32: Add support for disk-based metafiles to GetMetaFileBitsEx.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 8744c10a389d2d8171c38ffed9828bec10200cea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8744c10a389d2d8171c38ffed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sat Mar 16 12:20:24 2013 +0900 gdi32: Add support for disk-based metafiles to GetMetaFileBitsEx. --- dlls/gdi32/metafile.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index dbbffee..406728e 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -1088,17 +1088,27 @@ UINT WINAPI GetMetaFileBitsEx( HMETAFILE hmf, UINT nSize, LPVOID buf ) { METAHEADER *mh = GDI_GetObjPtr( hmf, OBJ_METAFILE ); UINT mfSize; + BOOL mf_copy = FALSE; TRACE("(%p,%d,%p)\n", hmf, nSize, buf); if (!mh) return 0; /* FIXME: error code */ if(mh->mtType == METAFILE_DISK) - FIXME("Disk-based metafile?\n"); + { + mh = MF_LoadDiskBasedMetaFile( mh ); + if (!mh) + { + GDI_ReleaseObj( hmf ); + return 0; + } + mf_copy = TRUE; + } mfSize = mh->mtSize * 2; if (buf) { if(mfSize > nSize) mfSize = nSize; memmove(buf, mh, mfSize); } + if (mf_copy) HeapFree( GetProcessHeap(), 0, mh ); GDI_ReleaseObj( hmf ); TRACE("returning size %d\n", mfSize); return mfSize;

1 0

Marcus Meissner : windowscodecs: Do not leak profile on errors (Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 4641ed5c9552adf665c733633a1928a487acf407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4641ed5c9552adf665c733633… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 15 20:09:14 2013 +0100 windowscodecs: Do not leak profile on errors (Coverity). --- dlls/windowscodecs/colorcontext.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index ca40184..268b6ef 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -126,8 +126,16 @@ static HRESULT load_profile(const WCHAR *filename, BYTE **profile, UINT *len) } ret = ReadFile(handle, *profile, size.u.LowPart, &count, NULL); CloseHandle(handle); - if (!ret) return HRESULT_FROM_WIN32(GetLastError()); - if (count != size.u.LowPart) return E_FAIL; + if (!ret) { + HeapFree (GetProcessHeap(),0,*profile); + *profile = NULL; + return HRESULT_FROM_WIN32(GetLastError()); + } + if (count != size.u.LowPart) { + HeapFree (GetProcessHeap(),0,*profile); + *profile = NULL; + return E_FAIL; + } *len = count; return S_OK; }

1 0

Marcus Meissner : jscript: Check the correct heap return condition ( Coverity).
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: wine Branch: master Commit: 339ec9c4ed7386c220b222354a0d2c82f89a6088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=339ec9c4ed7386c220b222354… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Mar 15 19:42:12 2013 +0100 jscript: Check the correct heap return condition (Coverity). --- dlls/jscript/jsregexp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 61e9a95..3863142 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -609,7 +609,7 @@ HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **r regexp->jsregexp = regexp_new(ctx, &ctx->tmp_heap, regexp->str->str, jsstr_length(regexp->str), flags, FALSE); - if(FAILED(hres)) { + if(!regexp->jsregexp) { WARN("regexp_new failed\n"); jsdisp_release(&regexp->dispex); return E_FAIL;

1 0

Francois Gouget : testbot: A few spelling fixes and small wording tweaks.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 05e70279bbf0a872bf3e7d5d8136869380e4e00f URL: http://source.winehq.org/git/tools.git/?a=commit;h=05e70279bbf0a872bf3e7d5d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:41:35 2013 +0100 testbot: A few spelling fixes and small wording tweaks. --- testbot/bin/Engine.pl | 2 +- testbot/lib/ObjectModel/Item.pm | 2 +- testbot/lib/WineTestBot/Jobs.pm | 2 +- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 2 +- testbot/lib/WineTestBot/VMs.pm | 6 +++--- testbot/web/ForgotPassword.pl | 2 +- testbot/web/JobDetails.pl | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 489c686..da3e54c 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -415,7 +415,7 @@ sub InitVMs() =item C<SafetyNet()> -This is called on startup and regularly after that to catch thing that fall +This is called on startup and regularly after that to catch things that fall through the cracks, possibly because of an Engine restart. Specifically it updates the status of all the current Jobs, Steps and Tasks, then schedules Tasks to be run, checks the staging directory for diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index 94ad8e6..48864f4 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -184,7 +184,7 @@ sub AUTOLOAD my $self = shift; my $PropertyName = $ObjectModel::Item::AUTOLOAD; - # strip fully-qualfied portion + # strip fully-qualified portion $PropertyName =~ s/.*://; if ($PropertyName eq "DESTROY") { diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 4c20948..cd6c427 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -155,7 +155,7 @@ sub UpdateStatus($) # Inherit the steps most significant status with some caveats: # - if one of the steps is still queued then this job is still running # - if a step is skipped it's either because a previous step failed or because - # the user cancelled the job. In both cases mark the job as failed + # the user canceled the job. In both cases mark the job as failed # - if all the steps are still queued, then this job's original status, # 'queued', is still valid foreach my $StepStatus ("running", "failed", "skipped", "completed") diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index c2262c7..22e00e1 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -386,7 +386,7 @@ sub IsTestPatch =item C<NewPatch()> -Creates a WineTestBot::Patch object for the given message. If that the message +Creates a WineTestBot::Patch object for the given message. If the message does impact Wine's tests then the Patch object disposition is set and no further action is performed. Otherwise if the patch is part of a series then it gets tied to a WineTestBot::PendingPatchSet object by diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 810d5c4..f49fa68 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -108,7 +108,7 @@ BEGIN CreateBasicPropertyDescriptor("FileName", "File name", !1, 1, "A", 64), CreateBasicPropertyDescriptor("FileType", "File Type", !1, 1, "A", 64), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("ChildPid", "Process id of child process", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 5), diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index fa53b07..56028d8 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -206,7 +206,7 @@ BEGIN CreateItemrefPropertyDescriptor("VM", "VM", !1, 1, \&CreateVMs, ["VMName"]), CreateBasicPropertyDescriptor("Timeout", "Timeout", !1, 1, "N", 4), CreateBasicPropertyDescriptor("CmdLineArg", "Command line args", !1, !1, "A", 256), - CreateBasicPropertyDescriptor("ChildPid", "Process id of child process", !1, !1, "N", 5), + CreateBasicPropertyDescriptor("ChildPid", "Child process id", !1, !1, "N", 5), CreateBasicPropertyDescriptor("Started", "Execution started", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Execution ended", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("TestFailures", "Number of test failures", !1, !1, "N", 6), diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index ed3282c..fd064a1 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -586,7 +586,7 @@ sub CountPoweredOnNonBaseVMs { my $self = shift; - my $PowerdOnVMs = 0; + my $PoweredOnVMs = 0; foreach my $VM (@{$self->GetItems()}) { my $VMStatus = $VM->Status; @@ -596,11 +596,11 @@ sub CountPoweredOnNonBaseVMs $VMStatus eq "idle" || $VMStatus eq "running")) { - $PowerdOnVMs++; + $PoweredOnVMs++; } } - return $PowerdOnVMs; + return $PoweredOnVMs; } sub SortKeysBySortOrder diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 5a9d71f..a22d441 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -44,7 +44,7 @@ sub _initialize sub GetTitle { - return "Reset passwor"; + return "Reset password"; } sub GetHeaderText diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b191327..11bb122 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -245,7 +245,7 @@ sub GenerateBody my $Action = $self->GetParam("Action"); if ($Action eq "Cancel job") { - print "Job will be cancelled.\n"; + print "Job will be canceled.\n"; } elsif ($Action eq "Restart job") {

1 0

Francois Gouget : testbot/WineRunTask: Make it possible to use the standard 'Name <address>' syntax for the administrator.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 63f2ce8b8154a41ddad5bafa61829e5854345ab5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=63f2ce8b8154a41ddad5bafa… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:39:29 2013 +0100 testbot/WineRunTask: Make it possible to use the standard 'Name <address>' syntax for the administrator. --- testbot/bin/WineRunTask.pl | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 57a4537..bcfda06 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -278,11 +278,15 @@ elsif ($Step->Type eq "suite") $Info .= ": " if ($Info ne ""); $Info .= $VM->Details; } - # Escape the info argument for cmd's command interpreter - $Info =~ s/\\/\\\\/g; + # Escape the arguments for cmd's command interpreter + my $EMail = $AdminEMail; + $EMail =~ s/"/\\"/g; + $EMail =~ s/%/%%/g; + $EMail =~ s/%/%%/g; $Info =~ s/"/\\"/g; $Info =~ s/%/%%/g; - $Script .= "-q -o $RptFileName -t $Tag -m $AdminEMail -i \"$Info\"\r\n" . + $Info =~ s/%/%%/g; + $Script .= "-q -o $RptFileName -t $Tag -m \"$EMail\" -i \"$Info\"\r\n" . "$FileName -q -s $RptFileName\r\n"; } if (!$TA->SendFileFromString($Script, "script.bat", $TestAgent::SENDFILE_EXE))

1 0

Francois Gouget : testbot/WineSendLog: Jobs are canceled at the initiative of the user and thus are not testbot errors .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 5f7b8d1b8469ae097656fdb082b21042f1af142a URL: http://source.winehq.org/git/tools.git/?a=commit;h=5f7b8d1b8469ae097656fdb0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:39:54 2013 +0100 testbot/WineSendLog: Jobs are canceled at the initiative of the user and thus are not testbot errors. Furthermore, when killed WineRunTask.pl, no longer prints the canceled message in the error log so that check was moot. --- testbot/bin/WineSendLog.pl | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index ac522c1..4e678bd 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -57,8 +57,7 @@ sub IsBotFailure { my $ErrLine = $_[0]; - return ($ErrLine =~ m/Cancelled/ || - $ErrLine =~ m/Can't set VM status to running/ || + return ($ErrLine =~ m/Can't set VM status to running/ || $ErrLine =~ m/Can't copy exe to VM/ || $ErrLine =~ m/Can't copy log from VM/ || $ErrLine =~ m/Can't copy generated executable from VM/);

1 0

Francois Gouget : testbot/WineRunTask: GenFixEnv. exe is not needed anymore so remove it.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: fb04605452507ee3790e4702509a5d09da3be9dc URL: http://source.winehq.org/git/tools.git/?a=commit;h=fb04605452507ee3790e4702… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:38:42 2013 +0100 testbot/WineRunTask: GenFixEnv.exe is not needed anymore so remove it. TestAgentd runs in a normal user account so the environment is already set up. --- testbot/bin/WineRunTask.pl | 7 -- testbot/bin/windows/GenFixEnv.exe | Bin 7680 -> 0 bytes testbot/src/GenFixEnv/GenFixEnv.c | 164 ------------------------------------- testbot/src/GenFixEnv/Makefile | 10 -- 4 files changed, 0 insertions(+), 181 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index abb92e0..57a4537 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -241,19 +241,12 @@ if (!$TA->SendFile("$BinDir/windows/$TestLauncher", $TestLauncher, 0)) FatalError "Can't copy TestLauncher to VM: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } -if (!$TA->SendFile("$BinDir/windows/GenFixEnv.exe", "GenFixEnv.exe", 0)) -{ - $ErrMessage = $TA->GetLastError(); - FatalError "Can't copy GenFixEnv to VM: $ErrMessage\n", - $FullErrFileName, $Job, $Step, $Task; -} my $Script = "\@echo off\r\nset WINETEST_DEBUG=" . $Step->DebugLevel . "\r\n"; if ($Step->ReportSuccessfulTests) { $Script .= "set WINETEST_REPORT_SUCCESS=1\r\n"; } -$Script .= "GenFixEnv FixEnv.bat\r\ncall FixEnv.bat\r\ndel FixEnv.bat\r\n"; if ($Step->Type eq "single") { $Script .= "$TestLauncher -t " . $Task->Timeout . " $FileName "; diff --git a/testbot/bin/windows/GenFixEnv.exe b/testbot/bin/windows/GenFixEnv.exe deleted file mode 100755 index b2e7d3c..0000000 Binary files a/testbot/bin/windows/GenFixEnv.exe and /dev/null differ diff --git a/testbot/src/GenFixEnv/GenFixEnv.c b/testbot/src/GenFixEnv/GenFixEnv.c deleted file mode 100644 index 8272eb6..0000000 --- a/testbot/src/GenFixEnv/GenFixEnv.c +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Generates a batch file that sets up the environment. - * This can be used in case the mechanism for running a process in the VM - * does not properly set up the environment for the currently logged in user. - * - * Copyright 2009 Ge van Geldorp - * - * 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 - */ - -#include <stdio.h> -#include <windows.h> -#include <shlobj.h> - -static void GenerateFromReg(FILE *BatchFile) -{ - LONG Err; - HKEY UserEnvironment; - DWORD Index; - char ValueName[256]; - DWORD ValueNameSize; - DWORD Type; - char Data[1024]; - DWORD DataSize; - - Err = RegOpenKeyExA(HKEY_CURRENT_USER, "Environment", 0, KEY_QUERY_VALUE, - &UserEnvironment); - if (Err != ERROR_SUCCESS) - return; - - Index = 0; - do - { - ValueNameSize = sizeof(ValueName); - DataSize = sizeof(Data); - Err = RegEnumValueA(UserEnvironment, Index, ValueName, &ValueNameSize, - NULL, &Type, (LPBYTE) Data, &DataSize); - if (Err == ERROR_SUCCESS) - { - if (Type == REG_EXPAND_SZ) - { - char Expanded[sizeof(Data)]; - DWORD ExpandedSize; - ExpandedSize = ExpandEnvironmentStringsA(Data, Expanded, - sizeof(Expanded)); - memcpy(Data, Expanded, ExpandedSize); - Type = REG_SZ; - } - if (Type == REG_SZ) - { - if (strcmp(ValueName, "TEMP") != 0 && strcmp(ValueName, "TMP") != 0) - fprintf(BatchFile, "SET \"%s=%s\"\n", ValueName, Data); - else - { - char Short[sizeof(Data)]; - GetShortPathNameA(Data, Short, sizeof(Short)); - fprintf(BatchFile, "SET \"%s=%s\"\n", ValueName, Short); - } - } - } - Index++; - } - while (Err == ERROR_SUCCESS); - - RegCloseKey(UserEnvironment); -} - -static void GenerateUserProfile(FILE *BatchFile) -{ - BOOL (WINAPI *pOpenProcessToken)(HANDLE,DWORD,PHANDLE); - BOOL (WINAPI *pGetUserProfileDirectoryA)(HANDLE,LPSTR,LPDWORD); - HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); - HMODULE huserenv = LoadLibraryA("userenv.dll"); - HANDLE Token; - char Data[1024]; - DWORD DataSize; - - pOpenProcessToken = (void *)GetProcAddress(hadvapi32, "OpenProcessToken"); - pGetUserProfileDirectoryA = (void *)GetProcAddress(huserenv, - "GetUserProfileDirectoryA"); - if (pOpenProcessToken == NULL || pGetUserProfileDirectoryA == NULL) - return; - - if (! pOpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token)) - return; - DataSize = sizeof(Data); - if (! pGetUserProfileDirectoryA(Token, Data, &DataSize)) - return; - fprintf(BatchFile, "SET \"USERPROFILE=%s\"\n", Data); - CloseHandle(Token); -} - -static void GenerateCSIDL(FILE *BatchFile) -{ - char Path[_MAX_PATH]; - HMODULE Mod; - HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); - HRESULT Res; - - Mod = LoadLibraryA("shell32.dll"); - pSHGetFolderPathA = (void *) GetProcAddress(Mod, "SHGetFolderPathA"); - if (pSHGetFolderPathA == NULL) - { - FreeLibrary(Mod); - Mod = LoadLibraryA("shfolder.dll"); - pSHGetFolderPathA = (void *) GetProcAddress(Mod, "SHGetFolderPathA"); - } - if (pSHGetFolderPathA != NULL) - { - if (GetEnvironmentVariable("APPDATA", Path, sizeof(Path)) == 0) - { - Res = pSHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, - SHGFP_TYPE_CURRENT, Path); - if (SUCCEEDED(Res)) - fprintf(BatchFile, "SET \"APPDATA=%s\"\n", Path); - } - if (GetEnvironmentVariable("LOCALAPPDATA", Path, sizeof(Path)) == 0) - { - Res = pSHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA, NULL, - SHGFP_TYPE_CURRENT, Path); - if (SUCCEEDED(Res)) - fprintf(BatchFile, "SET \"LOCALAPPDATA=%s\"\n", Path); - } - } - FreeLibrary(Mod); -} - -int main(int argc, char *argv[]) -{ - FILE *BatchFile; - if (argc != 2) - { - fprintf(stderr, "Usage: GenFixEnv <BatchFile>\n"); - exit(1); - } - - BatchFile = fopen(argv[1], "w"); - if (BatchFile == NULL) - { - perror("Unable to open output file"); - exit(1); - } - - fprintf(BatchFile, "@echo off\n"); - GenerateFromReg(BatchFile); - GenerateUserProfile(BatchFile); - GenerateCSIDL(BatchFile); - - fclose(BatchFile); - - return 0; -} diff --git a/testbot/src/GenFixEnv/Makefile b/testbot/src/GenFixEnv/Makefile deleted file mode 100644 index a485094..0000000 --- a/testbot/src/GenFixEnv/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -bindir = ../../bin/windows - -CROSSCC32 = i686-w64-mingw32-gcc -CROSSSTRIP32 = i686-w64-mingw32-strip - -all: $(bindir)/GenFixEnv.exe - -$(bindir)/GenFixEnv.exe: GenFixEnv.c - $(CROSSCC32) -Wall -o $@ $< - $(CROSSSTRIP32) $@

1 0

Francois Gouget : testbot/Engine: The ExpectWinetestUpdate notification is unused. Remove it.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 55cd61671e43197cd026a62f77ed06095baa278e URL: http://source.winehq.org/git/tools.git/?a=commit;h=55cd61671e43197cd026a62f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:41:00 2013 +0100 testbot/Engine: The ExpectWinetestUpdate notification is unused. Remove it. --- testbot/bin/Engine.pl | 66 +----------------------------- testbot/lib/WineTestBot/Engine/Notify.pm | 18 +-------- 2 files changed, 2 insertions(+), 82 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 3f9c9b4..489c686 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -236,79 +236,16 @@ sub HandleVMStatusChange return "1OK"; } -sub CheckForWinetestUpdate -{ - my $Bits = $_[0]; - - $ActiveBackEnds{'WineTestBot'}->PrepareForFork(); - my $Pid = fork; - if (!defined $Pid) - { - LogMsg "Unable to fork for CheckForWinetestUpdate.pl: $!\n"; - } - elsif (!$Pid) - { - WineTestBot::Log::SetupRedirects(); - exec("$BinDir/CheckForWinetestUpdate.pl $Bits") or - LogMsg "Unable to exec CheckForWinetestUpdate.pl: $!\n"; - exit(1); - } -} - -sub CheckForWinetestUpdate32 -{ - CheckForWinetestUpdate(32); -} - -sub CheckForWinetestUpdate64 -{ - CheckForWinetestUpdate(64); -} - -sub GiveUpOnWinetestUpdate -{ - DeleteEvent("CheckForWinetestUpdate32"); - DeleteEvent("CheckForWinetestUpdate64"); - LogMsg "Giving up on winetest.exe update\n"; -} - -sub HandleExpectWinetestUpdate -{ - if (EventScheduled("GiveUpOnWinetestUpdate")) - { - DeleteEvent("GiveUpOnWinetestUpdate"); - } - else - { - AddEvent("CheckForWinetestUpdate32", 300, 1, \&CheckForWinetestUpdate32); - AddEvent("CheckForWinetestUpdate64", 300, 1, \&CheckForWinetestUpdate64); - } - AddEvent("GiveUpOnWinetestUpdate", 3660, 0, \&GiveUpOnWinetestUpdate); - - return "1OK"; -} - sub HandleFoundWinetestUpdate { my $Bits = $_[0]; - if ($Bits =~ m/^(32|64)$/) - { - $Bits = $1; - } - else + if ($Bits !~ /^(?:32|64)$/) { LogMsg "Invalid number of bits in foundwinetestupdate message\n"; return "0Invalid number of bits"; } - DeleteEvent("CheckForWinetestUpdate${Bits}"); - if (! EventScheduled("CheckForWinetestUpdate32") && - ! EventScheduled("CheckForWinetestUpdate64")) - { - DeleteEvent("GiveUpOnWinetestUpdate"); - } - my $ErrMessage = ScheduleJobs(); if (defined($ErrMessage)) { @@ -418,7 +355,6 @@ sub HandleGetScreenshot } my %Handlers=( - "expectwinetestupdate" => \&HandleExpectWinetestUpdate, "foundwinetestupdate" => \&HandleFoundWinetestUpdate, "getscreenshot" => \&HandleGetScreenshot, "jobcancel" => \&HandleJobCancel, diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index c0793d5..8452615 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -34,8 +34,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $RunningInEngine); require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&PingEngine &JobSubmit &JobStatusChange &JobCancel &JobRestart - &TaskComplete &VMStatusChange - &ExpectWinetestUpdate &FoundWinetestUpdate + &TaskComplete &VMStatusChange &FoundWinetestUpdate &WinePatchMLSubmission &WinePatchWebSubmission &GetScreenshot); @EXPORT_OK = qw($RunningInEngine); @@ -183,21 +182,6 @@ sub VMStatusChange return substr($Reply, 1); } -sub ExpectWinetestUpdate -{ - my $Reply = SendCmdReceiveReply("expectwinetestupdate\n"); - if (length($Reply) < 1) - { - return "Unrecognized reply received from engine"; - } - if (substr($Reply, 0, 1) eq "1") - { - return undef; - } - - return substr($Reply, 1); -} - sub FoundWinetestUpdate { my $Bits = $_[0];

1 0

Francois Gouget : testbot: Give a '.diff' extension to the mailed-in patches.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: f113f4164551c0bab165a7b0f3b62baf447fe534 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f113f4164551c0bab165a7b0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:38:24 2013 +0100 testbot: Give a '.diff' extension to the mailed-in patches. This way the web server knows what MIME type to give them and they get opened in an editor on download. --- testbot/lib/WineTestBot/Patches.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 11c355f..c2262c7 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -207,12 +207,12 @@ sub Submit my $NewStep = $Steps->Add(); # Create a link to the patch file in the staging dir my $FileNameRandomPart = GenerateRandomString(32); - while (-e ("$DataDir/staging/${FileNameRandomPart}_patch")) + while (-e ("$DataDir/staging/${FileNameRandomPart}_patch.diff")) { $FileNameRandomPart = GenerateRandomString(32); } - link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch"; - $NewStep->FileName($FileNameRandomPart . " patch"); + link $PatchFileName, "$DataDir/staging/${FileNameRandomPart}_patch.diff"; + $NewStep->FileName($FileNameRandomPart . " patch.diff"); my @Keys = keys %{$Targets{$BaseName}}; $NewStep->FileType($Targets{$BaseName}{$Keys[0]}); $NewStep->InStaging(1);

1 0

Francois Gouget : testbot/lib: Fix an error message by adding a space between the property name and its value .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: f024ea3c27009f87f8038b17eba822cbe5c6112a URL: http://source.winehq.org/git/tools.git/?a=commit;h=f024ea3c27009f87f8038b17… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:37:05 2013 +0100 testbot/lib: Fix an error message by adding a space between the property name and its value. --- testbot/lib/ObjectModel/Collection.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 3d7f78c..a81a5d9 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -289,7 +289,7 @@ sub Validate my $ExistingItem = $self->GetBackEnd()->LoadItem($self, $Item->GetKey()); if (defined($ExistingItem)) { - $ErrMessage = $self->GetItemName() . $ErrMessage . + $ErrMessage = $self->GetItemName() . " " . $ErrMessage . " already exists"; return ($Item->GetKey(), undef, $ErrMessage); }

1 0

Francois Gouget : testbot/doc: The Sessions. Permanent field is in fact a boolean.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: a1901b6f3aaf1431752bd857deb0def2ea6fc0e0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a1901b6f3aaf1431752bd857… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:33:54 2013 +0100 testbot/doc: The Sessions.Permanent field is in fact a boolean. --- testbot/doc/winetestbot-schema.dia | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index 0e18787..5f906f2 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -366,7 +366,7 @@ <dia:string>#Permanent#</dia:string> </dia:attribute> <dia:attribute name="type"> - <dia:string>#ENUM#</dia:string> + <dia:string>#BOOL#</dia:string> </dia:attribute> <dia:attribute name="comment"> <dia:string>##</dia:string>

1 0

Francois Gouget : testbot/lib: Remove an unused WineTestBot::Log import.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 7f2f519c4d8ec7721eb5b19e0b28aa068f120fbc URL: http://source.winehq.org/git/tools.git/?a=commit;h=7f2f519c4d8ec7721eb5b19e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:37:46 2013 +0100 testbot/lib: Remove an unused WineTestBot::Log import. --- testbot/lib/WineTestBot/Jobs.pm | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 66f87ba..4c20948 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -294,7 +294,6 @@ use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; -use WineTestBot::Log; use WineTestBot::Patches; use WineTestBot::Steps; use WineTestBot::Users;

1 0

Francois Gouget : testbot/web: Simplify the jobs/steps/ tasks iteration code of the index page.
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: a9936a0ad7970adc0cad00f3c4e0ccbe82c41790 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a9936a0ad7970adc0cad00f3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:37:22 2013 +0100 testbot/web: Simplify the jobs/steps/tasks iteration code of the index page. --- testbot/web/index.pl | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 6d88106..59bf16a 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -100,13 +100,11 @@ sub GenerateDataCell { my $Failures = 0; my $HasTestResult; - my $Steps = $Item->Steps; - foreach my $StepKey (@{$Steps->GetKeys()}) + foreach my $Step (@{$Item->Steps->GetItems()}) { - my $Tasks = $Steps->GetItem($StepKey)->Tasks; - foreach my $TaskKey (@{$Tasks->GetKeys()}) + foreach my $Task (@{$Step->Tasks->GetItems()}) { - my $TaskFailures = $Tasks->GetItem($TaskKey)->TestFailures; + my $TaskFailures = $Task->TestFailures; if ($TaskFailures ne "") { $HasTestResult = 1;

1 0

Francois Gouget : testbot/TestAgentd: Make the socket blocking again even when timing out waiting for the child process .
by Alexandre Julliard March 25, 2013

March 25, 2013

Module: tools Branch: master Commit: 9f3eec5df2bdc45ef686e41a4ea691a51756c1de URL: http://source.winehq.org/git/tools.git/?a=commit;h=9f3eec5df2bdc45ef686e41a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 24 23:35:43 2013 +0100 testbot/TestAgentd: Make the socket blocking again even when timing out waiting for the child process. --- testbot/src/testagentd/platform_windows.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 10ea55a..92fc9aa 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -198,7 +198,8 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child break; case WAIT_TIMEOUT: set_status(ST_ERROR, "timed out waiting for the child process"); - return 0; + success = 0; + goto cleanup; default: debug("WaitForMultipleObjects() returned %lu (le=%lu). Giving up!\n", r, GetLastError()); break; @@ -207,6 +208,7 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child list_remove(&child->entry); free(child); + cleanup: /* We must reset WSAEventSelect before we can make * the socket blocking again. */

1 0

Austin English : bugzilla: update task list to wine 1.6 (website)
by Jeremy Newman March 22, 2013

March 22, 2013

Module: bugzilla Branch: master Commit: 2d2e32ed3a8ac45d509506837e382063425eb01f URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=2d2e32ed3a8ac45d50950… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 21 18:07:01 2013 -0700 bugzilla: update task list to wine 1.6 (website) -- -Austin --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 941c0db..f55a6f0 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -23,7 +23,7 @@ [% INCLUDE global/menu_start.html.tmpl bt = 'Task Lists' %] - <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.4.0&order=bugs.bug_severity">Wine 1.4</a></li> + <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.6.0&order=bugs.bug_severity">Wine 1.6</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&columnlist=bug_severity,priority,bug_status,cf_regression_sha1sum,short_desc&keywords_type=anywords">Regressions</a></li> <li><a href="buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=download&keywords_type=anywords">With download</a></li> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 2384c8e..88b535e 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -186,8 +186,8 @@ YAHOO.util.Event.onDOMReady(onLoadActions); The bugs we are currently working on are organized into Task lists. <ol class="wine_index_list"> - <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">Wine 1.4</a> - These bugs are scheduled to be fixed before Wine 1.4 is released. + <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">Wine 1.6</a> + These bugs are scheduled to be fixed before Wine 1.6 is released. </li> <li><a href="http://bugs.winehq.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NE…">Regressions</a>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.25 ( resend with small correction)
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: 93a47eeefe71235942074de740c6c209f558ea6c URL: http://source.winehq.org/git/website.git/?a=commit;h=93a47eeefe71235942074d… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Mar 18 13:42:26 2013 -0300 Portuguese translation for release 1.5.25 (resend with small correction) --- news/pt/2013030101.xml | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/news/pt/2013030101.xml b/news/pt/2013030101.xml new file mode 100644 index 0000000..9fd4a6d --- /dev/null +++ b/news/pt/2013030101.xml @@ -0,0 +1,14 @@ +<news> +<date>1 de Março de 2013</date> +<title>Wine 1.5.25 lançado</title> +<body> + A versão de desenvolvimento 1.5.25 já está disponível agora. + <a href="{$root}/announce/1.5.25">Novidades</a> desta versão: +<ul> + <li>Suporte adequado ao cursor no driver de Mac.</li> + <li>Correções no suporte a escrita direita-para-esquerda no RichEdit.</li> + <li>Versão inicial de uma fonte Wingdings.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.25.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

Lucas Zawacki : Portuguese translation for release 1.5.26
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: 82991652b5c02862c526df19e90d3bb2a5788f7a URL: http://source.winehq.org/git/website.git/?a=commit;h=82991652b5c02862c526df… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Mar 18 13:28:17 2013 -0300 Portuguese translation for release 1.5.26 --- news/pt/2013031501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/pt/2013031501.xml b/news/pt/2013031501.xml new file mode 100644 index 0000000..fc9db96 --- /dev/null +++ b/news/pt/2013031501.xml @@ -0,0 +1,16 @@ +<news> +<date>15 de Março de 2013</date> +<title>Wine 1.5.26 lançado</title> +<body> + A versão de desenvolvimento 1.5.26 já está disponível agora. + <a href="{$root}/announce/1.5.26">Novidades</a> desta versão: +<ul> + <li>Suporte a OpenGL no driver para Mac.</li> + <li>Suporte a área de transferência e drag&drop no driver para Mac.</li> + <li>Melhorias na cache de URLs.</li> + <li>Algumas correções em binários ARM.</li> + <li>Fim do suporte à plataforma SPARC.</li> + <li>Várias correções de bugs.</li> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e irão aparecer em breve em suas respectivas <a href="{$root}/download">sessões da área de downloads</a>. +</body></news>

1 0

André Hentschel : Wine 1.5.26 freigegeben
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: 7c8cf53b5f15fdd95c4dfa38fbae802f3fff8f8c URL: http://source.winehq.org/git/website.git/?a=commit;h=7c8cf53b5f15fdd95c4dfa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Mar 16 15:31:51 2013 +0100 Wine 1.5.26 freigegeben --- news/de/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2013031501.xml b/news/de/2013031501.xml new file mode 100644 index 0000000..9891453 --- /dev/null +++ b/news/de/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>15. März 2013</date> +<title>Wine 1.5.26 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.26 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.26">Neuerungen (en)</a> in dieser Version: +<ul> + <li>OpenGL Unterstützung im Mac Treiber.</li> + <li>Zwischenablage und Drag&Drop Unterstützung im Mac Treiber.</li> + <li>Verbesserungen am URL Cache.</li> + <li>Einige Fehlerbehebungen für ARM Binaries.</li> + <li>SPARC Plattform wird nicht länger Unterstützt.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.5.26
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: e81f79a5f651540a4cbc090a1c0a6e4acd54239a URL: http://source.winehq.org/git/website.git/?a=commit;h=e81f79a5f651540a4cbc09… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 15 23:55:39 2013 +0100 French translation for release 1.5.26 --- news/fr/2013031501.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/fr/2013031501.xml b/news/fr/2013031501.xml new file mode 100644 index 0000000..a42046a --- /dev/null +++ b/news/fr/2013031501.xml @@ -0,0 +1,16 @@ +<news> +<date>15 mars 2013</date> +<title>Sortie de Wine 1.5.26</title> +<body> + La version de développement 1.5.26 de Wine est disponible. + <a href="{$root}/announce/1.5.26">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge d'OpenGL dans le pilote Mac.</li> + <li>Prise en charge du presse-papiers et du glisser-déposer dans le pilote Mac.</li> + <li>Améliorations au cache d'URL.</li> + <li>Plusieurs correctifs pour les binaires ARM.</li> + <li>Suppression de la prise en charge de la plate-forme SPARC.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.5.26
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: 8a1e8e555bd13aa47ff5c2398e857ab42e9e02c3 URL: http://source.winehq.org/git/website.git/?a=commit;h=8a1e8e555bd13aa47ff5c2… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Mar 17 06:52:34 2013 +0100 Polish translation for release 1.5.26 --- news/pl/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2013031501.xml b/news/pl/2013031501.xml new file mode 100644 index 0000000..6dc9824 --- /dev/null +++ b/news/pl/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>Marzec 15, 2013</date> +<title>Wydano Wine 1.5.26</title> +<body> + Wydanie rozwojowe Wine 1.5.26 jest już dostępne. + <a href="{$root}/announce/1.5.26">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla OpenGL w sterowniku Mac.</li> + <li>Wsparcie dla schowka oraz przeciągania i upuszczania w sterowniku Mac.</li> + <li>Ulepszenia w pamięci podręcznej adresów URL.</li> + <li>Kilka poprawek w plikach binarnych ARM.</li> + <li>Zaprzestanie wsparcia dla platformy SPARC.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Jactry Zeng : Simplified Chinese translation for release 1.5.26
by Jeremy Newman March 18, 2013

March 18, 2013

Module: website Branch: master Commit: ddb8a0f8cc3c9ddee5323b59c4dc0f67c38b9b47 URL: http://source.winehq.org/git/website.git/?a=commit;h=ddb8a0f8cc3c9ddee5323b… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Sat Mar 16 23:36:20 2013 +0800 Simplified Chinese translation for release 1.5.26 --- news/zh-cn/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013031501.xml b/news/zh-cn/2013031501.xml new file mode 100644 index 0000000..88490f2 --- /dev/null +++ b/news/zh-cn/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>三月 15, 2013</date> +<title>Wine 1.5.26 发布</title> +<body> + Wine 开发版 1.5.26 现在可以使用了。 + 本次<a href="{$root}/announce/1.5.26">更新</a>： +<ul> + <li>Mac 后端驱动对 OpenGL 的支持。</li> + <li>Mac 后端驱动对剪贴板和拖放的支持。</li> + <li>对 URL cache 的改进。</li> + <li>针对 ARM 二进制的一些修复。</li> + <li>不再支持 SPARC 平台。</li> + <li>各种 bug 修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.5.26.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.26
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: website Branch: master Commit: e340c245acc0761b6c4dbd01be73c98a51fdba11 URL: http://source.winehq.org/git/website.git/?a=commit;h=e340c245acc0761b6c4dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:42:24 2013 +0100 Wine release 1.5.26 --- news/en/2013031501.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2013031501.xml b/news/en/2013031501.xml new file mode 100644 index 0000000..fce9941 --- /dev/null +++ b/news/en/2013031501.xml @@ -0,0 +1,17 @@ +<news> +<date>March 15, 2013</date> +<title>Wine 1.5.26 Released</title> +<body> + The Wine development release 1.5.26 is now available. + <a href="{$root}/announce/1.5.26">What's new</a> in this release: +<ul> + <li>OpenGL support in the Mac driver.</li> + <li>Clipboard and drag&drop support in the Mac driver.</li> + <li>Improvements to the URL cache.</li> + <li>Some fixes for ARM binaries.</li> + <li>SPARC platform no longer supported.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.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

Tag wine-1.5.26 : Alexandre Julliard : Release 1.5.26
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: refs/tags/wine-1.5.26 Tag: b4c349e950e458863c62112cbcf32735b29333ff URL: http://source.winehq.org/git/wine.git/?a=tag;h=b4c349e950e458863c62112cbcf3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:31:14 2013 +0100 Release 1.5.26

1 0

Alexandre Julliard : Release 1.5.26.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 99982f886f039241425623c0076dc9ae70b9ef6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=99982f886f039241425623c00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 20:31:14 2013 +0100 Release 1.5.26. --- ANNOUNCE | 703 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 382 insertions(+), 341 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=99982f886f03924142562…

1 0

Jacek Caban : mshtml: Added HTMLElementEvents2 support.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: d3e8d44e9c0535b8ff520917163cec9b5eae823f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e8d44e9c0535b8ff5209171… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:02:15 2013 +0100 mshtml: Added HTMLElementEvents2 support. --- dlls/mshtml/htmlelem.c | 2 ++ dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/mshtml_private.h | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 02c1538..db4b8e7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1679,6 +1679,8 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve return S_OK; } +cp_static_data_t HTMLElementEvents2_data = { HTMLElementEvents2_tid, NULL /* FIXME */, TRUE }; + const cpc_entry_t HTMLElement_cpc[] = { HTMLELEMENT_CPC, {NULL} diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 19446ad..9ea1708 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -883,12 +883,20 @@ static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) return hres; } -static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, VARIANT *retv) +static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, HTMLEventObj *event_obj, VARIANT *retv) { DISPPARAMS dp = {NULL,NULL,0,0}; + VARIANT event_arg; ULONG argerr; EXCEPINFO ei; + if(event_obj) { + V_VT(&event_arg) = VT_DISPATCH; + V_DISPATCH(&event_arg) = (IDispatch*)&event_obj->IHTMLEventObj_iface; + dp.rgvarg = &event_arg; + dp.cArgs = 1; + } + memset(&ei, 0, sizeof(ei)); return IDispatch_Invoke(disp, dispid, &IID_NULL, 0, DISPATCH_METHOD, &dp, retv, &ei, &argerr); } @@ -1019,7 +1027,8 @@ static void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, V_VT(&v) = VT_EMPTY; TRACE("cp %s [%u] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, &v); + hres = call_cp_func(cp->sinks[i].disp, event_info[eid].dispid, + cp->data->pass_event_arg ? event_obj : NULL, &v); if(hres == S_OK) { TRACE("cp %s [%u] <<<\n", debugstr_w(event_info[eid].name), i); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a2a9436..d0bb68e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -114,6 +114,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLUnknownElement) \ XDIID(DispHTMLWindow2) \ XDIID(HTMLDocumentEvents) \ + XDIID(HTMLElementEvents2) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAttributeCollection) \ XIID(IHTMLAttributeCollection2) \ @@ -430,6 +431,7 @@ typedef enum { typedef struct _cp_static_data_t { tid_t tid; void (*on_advise)(IUnknown*,struct _cp_static_data_t*); + BOOL pass_event_arg; DWORD id_cnt; DISPID *ids; } cp_static_data_t; @@ -666,7 +668,8 @@ typedef struct { IHTMLElement3_tid, \ IHTMLElement4_tid -#define HTMLELEMENT_CPC {NULL} +extern cp_static_data_t HTMLElementEvents2_data; +#define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data} extern const cpc_entry_t HTMLElement_cpc[]; typedef struct {

1 0

Jacek Caban : mshtml: Use lazy allocation for connection points.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: af6c518e7d25f33aa80a5c4d8ac6add2fb0a8040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6c518e7d25f33aa80a5c4d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:01:53 2013 +0100 mshtml: Use lazy allocation for connection points. --- dlls/mshtml/conpoint.c | 100 +++++++++++++++++++++++++++-------------- dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlbody.c | 12 +++-- dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmldoc.c | 16 +++++-- dlls/mshtml/htmlelem.c | 11 ++++- dlls/mshtml/htmlembed.c | 1 + dlls/mshtml/htmlevent.c | 56 ++++++++++++------------ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 2 + dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 3 + dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmlmeta.c | 1 + dlls/mshtml/htmlnode.c | 3 + dlls/mshtml/htmlobject.c | 1 + dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmltable.c | 10 +++- dlls/mshtml/htmltablecell.c | 1 + dlls/mshtml/htmltablerow.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextcont.c | 2 - dlls/mshtml/htmltextnode.c | 3 + dlls/mshtml/mshtml_private.h | 28 ++++++------ dlls/mshtml/mutation.c | 2 +- dlls/mshtml/persist.c | 2 +- 32 files changed, 174 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af6c518e7d25f33aa80a5…

1 0

Alistair Leslie-Hughes : msxml3: Implment IXMLParser SetInput.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 6f2f577fa5c77ddd8f1790ee142c92ec1c460967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2f577fa5c77ddd8f1790ee1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 15 16:16:02 2013 +1100 msxml3: Implment IXMLParser SetInput. --- dlls/msxml3/tests/xmlparser.c | 3 +++ dlls/msxml3/xmlparser.c | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmlparser.c b/dlls/msxml3/tests/xmlparser.c index 46812c8..51f2a27 100644 --- a/dlls/msxml3/tests/xmlparser.c +++ b/dlls/msxml3/tests/xmlparser.c @@ -135,6 +135,9 @@ static void create_test(void) ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); ok(nodefactory == &thenodefactory, "expected NULL\n"); + hr = IXMLParser_SetInput(parser, NULL); + ok(hr == E_INVALIDARG, "Expected S_OK got 0x%08x\n", hr); + hr = IXMLParser_SetFactory(parser, NULL); ok(hr == S_OK, "Expected S_OK got 0x%08x\n", hr); diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c index 154e439..4c91a1e 100644 --- a/dlls/msxml3/xmlparser.c +++ b/dlls/msxml3/xmlparser.c @@ -47,6 +47,7 @@ typedef struct _xmlparser { IXMLParser IXMLParser_iface; IXMLNodeFactory *nodefactory; + IUnknown *input; LONG ref; int flags; @@ -96,6 +97,9 @@ static ULONG WINAPI xmlparser_Release(IXMLParser* iface) TRACE("(%p)->(%d)\n", This, ref); if ( ref == 0 ) { + if(This->input) + IUnknown_Release(This->input); + if(This->nodefactory) IXMLNodeFactory_Release(This->nodefactory); @@ -246,9 +250,18 @@ static HRESULT WINAPI xmlparser_SetInput(IXMLParser *iface, IUnknown *pStm) { xmlparser *This = impl_from_IXMLParser( iface ); - FIXME("(%p %p)\n", This, pStm); + TRACE("(%p %p)\n", This, pStm); - return E_NOTIMPL; + if(!pStm) + return E_INVALIDARG; + + if(This->input) + IUnknown_Release(This->input); + + This->input = pStm; + IUnknown_AddRef(This->input); + + return S_OK; } static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData, @@ -435,6 +448,7 @@ HRESULT XMLParser_create(IUnknown* pUnkOuter, void**ppObj) This->IXMLParser_iface.lpVtbl = &xmlparser_vtbl; This->nodefactory = NULL; + This->input = NULL; This->flags = 0; This->ref = 1;

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges shouldn' t add margins to string bounds.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: db746fe8970058b369c23ddbc62a147b9abfba6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db746fe8970058b369c23ddbc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 15 13:37:53 2013 +0900 gdiplus: GdipMeasureCharacterRanges shouldn't add margins to string bounds. --- dlls/gdiplus/graphics.c | 5 ----- dlls/gdiplus/tests/graphics.c | 8 +------- 2 files changed, 1 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index eb3f228..93f85b1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4684,11 +4684,6 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Y = layoutRect->Y * args.rel_height; scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; - if (scaled_rect.Width >= 0.5) - { - scaled_rect.Width -= margin_x * 2.0 * args.rel_width; - if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ - } get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fe525b6..4df2119 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4033,11 +4033,8 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf_(width_1, bounds.Width, 1.0); todo_wine expectf_(height - margin_y, bounds.Height, 1.0); @@ -4071,13 +4068,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf_(width_1, bounds.Width, 1.0); -todo_wine expectf(height_rgn, bounds.Height); set_rect_empty(&rect); @@ -4234,6 +4227,7 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); +todo_wine expectf_(5.0 + width_rgn/2.0, bounds.X, 1.0); todo_wine expectf_(5.0 + height_rgn/2.0, bounds.Y, 1.0);

1 0

Francois Gouget : msvcr110: Remove an unused debug channel.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 534410b8320b8c8ffff9226df3263fc57eb75d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=534410b8320b8c8ffff9226df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 15 02:50:09 2013 +0100 msvcr110: Remove an unused debug channel. --- dlls/msvcr110/msvcr110.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 70c03d2..ba943b0 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -23,9 +23,6 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(msvcr110); /********************************************************************* * DllMain (MSVCR110.@)

1 0

Jacek Caban : mshtml: Don't use getElementsByTagNameNS in IHTMLDocument3:: getElementsByTagName implementation.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 1d05cd515c168e45d38f344952b27b406ad07bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d05cd515c168e45d38f34495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:01:23 2013 +0100 mshtml: Don't use getElementsByTagNameNS in IHTMLDocument3::getElementsByTagName implementation. --- dlls/mshtml/htmldoc3.c | 7 ++----- dlls/mshtml/tests/dom.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4b9b12e..de5cdab 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -566,9 +566,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, { HTMLDocument *This = impl_from_IHTMLDocument3(iface); nsIDOMNodeList *nslist; - nsAString id_str, ns_str; + nsAString id_str; nsresult nsres; - static const WCHAR str[] = {'*',0}; TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pelColl); @@ -578,10 +577,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, } nsAString_InitDepend(&id_str, v); - nsAString_InitDepend(&ns_str, str); - nsres = nsIDOMHTMLDocument_GetElementsByTagNameNS(This->doc_node->nsdoc, &ns_str, &id_str, &nslist); + nsres = nsIDOMHTMLDocument_GetElementsByTagName(This->doc_node->nsdoc, &id_str, &nslist); nsAString_Finish(&id_str); - nsAString_Finish(&ns_str); if(FAILED(nsres)) { ERR("GetElementByName failed: %08x\n", nsres); return E_FAIL; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d2be89f..2e4e3d8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6281,7 +6281,7 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - str = a2bstr("img"); + str = a2bstr("Img"); hres = IHTMLDocument3_getElementsByTagName(doc3, str, &col); ok(hres == S_OK, "getElementsByTagName(%s) failed: %08x\n", wine_dbgstr_w(str), hres); SysFreeString(str);

1 0

Jacek Caban : wininet: Use parsed status_code to test for CONTINUE HTTP response.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: c6005aabcdb76afb8b0bc5592171d84b0c9fd0f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6005aabcdb76afb8b0bc5592… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 11:46:22 2013 +0100 wininet: Use parsed status_code to test for CONTINUE HTTP response. --- dlls/wininet/http.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a3f68ae..d0ed459 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5680,7 +5680,6 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) NETCON_set_timeout( request->netconn, FALSE, request->receive_timeout ); do { - static const WCHAR szHundred[] = {'1','0','0',0}; /* * We should first receive 'HTTP/1.x nnn OK' where nnn is the status code. */ @@ -5716,7 +5715,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) TRACE("version [%s] status code [%s] status text [%s]\n", debugstr_w(buffer), debugstr_w(status_code), debugstr_w(status_text) ); - codeHundred = (!strcmpW(status_code, szHundred)); + codeHundred = request->status_code == HTTP_STATUS_CONTINUE; } else if (!codeHundred) {

1 0

Marcus Meissner : quartz: Free wszPatternString (Coverity).
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 2d05c24a1e7a9ea2f9d82c7e8fba46151bf93efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d05c24a1e7a9ea2f9d82c7e8… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Mar 14 22:11:47 2013 +0100 quartz: Free wszPatternString (Coverity). --- dlls/quartz/filesource.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 95e146d..aee6d97 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -335,12 +335,15 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * break; } - if (strcmpW(wszValueName, source_filter_name)==0) + if (strcmpW(wszValueName, source_filter_name)==0) { + HeapFree(GetProcessHeap(), 0, wszPatternString); continue; + } /* if it is not the source filter value */ if (process_pattern_string(wszPatternString, pReader) == S_OK) { + HeapFree(GetProcessHeap(), 0, wszPatternString); if (majorType && FAILED(CLSIDFromString(wszMajorKeyName, majorType))) break; if (minorType && FAILED(CLSIDFromString(wszMinorKeyName, minorType))) @@ -354,8 +357,8 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * break; } bFound = TRUE; - } - HeapFree(GetProcessHeap(), 0, wszPatternString); + } else + HeapFree(GetProcessHeap(), 0, wszPatternString); } CloseHandle(hkeyMinor); }

1 0

Jacek Caban : mshtml: Added HTMLElementEvents2 tests.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 3c4e4ee3c0d04d2bf53cc4e50e635c40b1d25a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4e4ee3c0d04d2bf53cc4e50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 15 15:02:31 2013 +0100 mshtml: Added HTMLElementEvents2 tests. --- dlls/mshtml/tests/events.c | 74 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 6d74f40..8e9d88c9 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -82,6 +82,7 @@ DEFINE_EXPECT(submit_onclick_cancel); DEFINE_EXPECT(submit_onclick_attached); DEFINE_EXPECT(submit_onclick_attached_check_cancel); DEFINE_EXPECT(submit_onclick_setret); +DEFINE_EXPECT(elem2_cp_onclick); static HWND container_hwnd = NULL; static IHTMLWindow2 *window; @@ -1239,6 +1240,31 @@ static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp ok_(__FILE__,line)(argerr != NULL, "argerr == NULL\n"); } +#define test_cp_eventarg(a,b,c,d,e,f) _test_cp_eventarg(__LINE__,a,b,c,d,e,f) +static void _test_cp_eventarg(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr) +{ + IHTMLEventObj *event; + + ok_(__FILE__,line)(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", debugstr_guid(riid)); + ok_(__FILE__,line)(flags == DISPATCH_METHOD, "flags = %x\n", flags); + ok_(__FILE__,line)(dp != NULL, "dp == NULL\n"); + ok_(__FILE__,line)(dp->cArgs == 1, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(dp->rgvarg != NULL, "dp->rgvarg = %p\n", dp->rgvarg); + ok_(__FILE__,line)(!dp->cNamedArgs, "dp->cNamedArgs = %d\n", dp->cNamedArgs); + ok_(__FILE__,line)(!dp->rgdispidNamedArgs, "dp->rgdispidNamedArgs = %p\n", dp->rgdispidNamedArgs); + ok_(__FILE__,line)(vres != NULL, "vres == NULL\n"); + ok_(__FILE__,line)(V_VT(vres) == VT_EMPTY, "V_VT(vres) = %d\n", V_VT(vres)); + ok_(__FILE__,line)(ei != NULL, "ei == NULL\n"); + ok_(__FILE__,line)(argerr != NULL, "argerr == NULL\n"); + + ok(V_VT(dp->rgvarg) == VT_DISPATCH, "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg)); + ok(V_DISPATCH(dp->rgvarg) != NULL, "V_DISPATCH(dp->rgvarg) = %p\n", V_DISPATCH(dp->rgvarg)); + + event = _get_event_obj(line); + ok(iface_cmp((IUnknown*)event, (IUnknown*)V_DISPATCH(dp->rgvarg)), "event != arg0\n"); + IHTMLEventObj_Release(event); +} + static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) @@ -1278,6 +1304,24 @@ static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMemb CONNECTION_POINT_OBJ(doccp_onclick_cancel, DIID_HTMLDocumentEvents); +static HRESULT WINAPI elem2_cp(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(elem2_cp_onclick); + test_cp_eventarg(riid, wFlags, pdp, pVarResult, pei, puArgErr); + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(elem2_cp, DIID_HTMLElementEvents2); + static HRESULT WINAPI timeoutFunc_Invoke(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) @@ -1492,8 +1536,8 @@ static IDispatch EventDispatch = { &EventDispatchVtbl }; static void test_onclick(IHTMLDocument2 *doc) { + DWORD cp_cookie, elem2_cp_cookie; IHTMLElement *div, *body; - DWORD cp_cookie; VARIANT v; HRESULT hres; @@ -1638,6 +1682,34 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(doccp_onclick); CHECK_CALLED(invoke_onclick); + elem2_cp_cookie = register_cp((IUnknown*)div, &DIID_HTMLElementEvents2, (IUnknown*)&elem2_cp_obj); + + SET_EXPECT(div_onclick); + SET_EXPECT(div_onclick_disp); + SET_EXPECT(div_onclick_attached); + SET_EXPECT(elem2_cp_onclick); + SET_EXPECT(body_onclick); + SET_EXPECT(document_onclick); + SET_EXPECT(doc_onclick_attached); + SET_EXPECT(doccp_onclick); + SET_EXPECT(invoke_onclick); + + trace("click >>>\n"); + hres = IHTMLElement_click(div); + ok(hres == S_OK, "click failed: %08x\n", hres); + trace("click <<<\n"); + + CHECK_CALLED(div_onclick); + CHECK_CALLED(div_onclick_disp); + CHECK_CALLED(div_onclick_attached); + CHECK_CALLED(elem2_cp_onclick); + CHECK_CALLED(body_onclick); + CHECK_CALLED(document_onclick); + CHECK_CALLED(doc_onclick_attached); + CHECK_CALLED(doccp_onclick); + CHECK_CALLED(invoke_onclick); + + unregister_cp((IUnknown*)div, &DIID_HTMLElementEvents2, elem2_cp_cookie); unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); V_VT(&v) = VT_NULL;

1 0

Hans Leidekker : winhttp: Implement WINHTTP_OPTION_CONNECTION_INFO.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 02f2ab943777840176bc7ee552826e7933be7aa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f2ab943777840176bc7ee55… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 15 10:39:00 2013 +0100 winhttp: Implement WINHTTP_OPTION_CONNECTION_INFO. --- dlls/winhttp/session.c | 94 ++++++++++++++++++++++++++++++++++++++++++ dlls/winhttp/tests/winhttp.c | 62 +++++++++++++++++++++++++++ include/winhttp.h | 16 +++++++ 3 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index d43b225..394fddd 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -25,6 +25,11 @@ #include "windef.h" #include "winbase.h" +#ifndef __MINGW32__ +#define USE_WS_PREFIX +#endif +#include "winsock2.h" +#include "ws2ipdef.h" #include "winhttp.h" #include "wincrypt.h" #include "winreg.h" @@ -587,6 +592,71 @@ static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) return ret; } +static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) +{ +#ifndef __MINGW32__ + switch (addr->sa_family) + { + case AF_INET: + { + const struct sockaddr_in *addr_unix = (const struct sockaddr_in *)addr; + struct WS_sockaddr_in *addr_win = (struct WS_sockaddr_in *)addr_storage; + char *p; + + addr_win->sin_family = WS_AF_INET; + addr_win->sin_port = addr_unix->sin_port; + memcpy( &addr_win->sin_addr, &addr_unix->sin_addr, 4 ); + p = (char *)&addr_win->sin_addr + 4; + memset( p, 0, sizeof(*addr_storage) - (p - (char *)addr_win) ); + return TRUE; + } + case AF_INET6: + { + const struct sockaddr_in6 *addr_unix = (const struct sockaddr_in6 *)addr; + struct WS_sockaddr_in6 *addr_win = (struct WS_sockaddr_in6 *)addr_storage; + + addr_win->sin6_family = WS_AF_INET6; + addr_win->sin6_port = addr_unix->sin6_port; + addr_win->sin6_flowinfo = addr_unix->sin6_flowinfo; + memcpy( &addr_win->sin6_addr, &addr_unix->sin6_addr, 16 ); +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + addr_win->sin6_scope_id = addr_unix->sin6_scope_id; +#else + addr_win->sin6_scope_id = 0; +#endif + memset( addr_win + 1, 0, sizeof(*addr_storage) - sizeof(*addr_win) ); + return TRUE; + } + default: + ERR("unhandled family %u\n", addr->sa_family); + return FALSE; + } +#else + switch (addr->sa_family) + { + case AF_INET: + { + struct sockaddr_in *addr_in = (struct sockaddr_in *)addr_storage; + + memcpy( addr_in, addr, sizeof(*addr_in) ); + memset( addr_in + 1, 0, sizeof(*addr_storage) - sizeof(*addr_in) ); + return TRUE; + } + case AF_INET6: + { + struct sockaddr_in6 *addr_in6 = (struct sockaddr_in6 *)addr_storage; + + memcpy( addr_in6, addr, sizeof(*addr_in6) ); + memset( addr_in6 + 1, 0, sizeof(*addr_storage) - sizeof(*addr_in6) ); + return TRUE; + } + default: + ERR("unhandled family %u\n", addr->sa_family); + return FALSE; + } +#endif +} + static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) { request_t *request = (request_t *)hdr; @@ -683,6 +753,30 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf *buflen = sizeof(DWORD); return TRUE; } + case WINHTTP_OPTION_CONNECTION_INFO: + { + WINHTTP_CONNECTION_INFO *info = buffer; + struct sockaddr local; + socklen_t len = sizeof(local); + const struct sockaddr *remote = (const struct sockaddr *)&request->connect->sockaddr; + + if (!buffer || *buflen < sizeof(*info)) + { + *buflen = sizeof(*info); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + if (!netconn_connected( &request->netconn )) + { + set_last_error( ERROR_WINHTTP_INCORRECT_HANDLE_STATE ); + return FALSE; + } + if (getsockname( request->netconn.socket, &local, &len )) return FALSE; + if (!convert_sockaddr( &local, &info->LocalAddress )) return FALSE; + if (!convert_sockaddr( remote, &info->RemoteAddress )) return FALSE; + info->cbSize = sizeof(*info); + return TRUE; + } case WINHTTP_OPTION_RESOLVE_TIMEOUT: *(DWORD *)buffer = request->resolve_timeout; *buflen = sizeof(DWORD); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index fd0db18..b03e108 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -23,6 +23,8 @@ #include <stdlib.h> #include <windef.h> #include <winbase.h> +#include <winsock2.h> +#include <ws2tcpip.h> #include <winhttp.h> #include <wincrypt.h> #include <winreg.h> @@ -2019,6 +2021,65 @@ static void test_bad_header( int port ) WinHttpCloseHandle( ses ); } +static void test_connection_info( int port ) +{ + static const WCHAR basicW[] = {'/','b','a','s','i','c',0}; + HINTERNET ses, con, req; + WINHTTP_CONNECTION_INFO info; + DWORD size, error; + BOOL ret; + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "failed to open session %u\n", GetLastError() ); + + con = WinHttpConnect( ses, localhostW, port, 0 ); + ok( con != NULL, "failed to open a connection %u\n", GetLastError() ); + + req = WinHttpOpenRequest( con, NULL, basicW, NULL, NULL, NULL, 0 ); + ok( req != NULL, "failed to open a request %u\n", GetLastError() ); + + size = sizeof(info); + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + error = GetLastError(); + if (!ret && error == ERROR_INVALID_PARAMETER) + { + win_skip( "WINHTTP_OPTION_CONNECTION_INFO not supported\n" ); + return; + } + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, "got %u\n", error ); + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "failed to send request %u\n", GetLastError() ); + + size = 0; + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INSUFFICIENT_BUFFER, "got %u\n", error ); + + size = sizeof(info); + memset( &info, 0, sizeof(info) ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); + ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "failed to receive response %u\n", GetLastError() ); + + size = sizeof(info); + memset( &info, 0, sizeof(info) ); + ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size ); + ok( ret, "failed to retrieve connection info %u\n", GetLastError() ); + ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize ); + + WinHttpCloseHandle( req ); + WinHttpCloseHandle( con ); + WinHttpCloseHandle( ses ); +} + static void test_credentials(void) { static WCHAR userW[] = {'u','s','e','r',0}; @@ -2768,6 +2829,7 @@ START_TEST (winhttp) if (ret != WAIT_OBJECT_0) return; + test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); test_basic_authentication(si.port); diff --git a/include/winhttp.h b/include/winhttp.h index cf0da83..9247abf 100644 --- a/include/winhttp.h +++ b/include/winhttp.h @@ -19,6 +19,12 @@ #ifndef __WINE_WINHTTP_H #define __WINE_WINHTTP_H +#ifdef _WIN64 +#include <pshpack8.h> +#else +#include <pshpack4.h> +#endif + #define WINHTTPAPI #define BOOLAPI WINHTTPAPI BOOL WINAPI @@ -527,6 +533,14 @@ typedef struct DWORD dwMinorVersion; } HTTP_VERSION_INFO, *LPHTTP_VERSION_INFO; +#ifdef _WS2DEF_ +typedef struct +{ + DWORD cbSize; + SOCKADDR_STORAGE LocalAddress; + SOCKADDR_STORAGE RemoteAddress; +} WINHTTP_CONNECTION_INFO; +#endif #ifdef __cplusplus extern "C" { @@ -565,4 +579,6 @@ BOOL WINAPI WinHttpWriteData(HINTERNET,LPCVOID,DWORD,LPDWORD); } #endif +#include <poppack.h> + #endif /* __WINE_WINHTTP_H */

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges should treat empty layout extents as infinite when StringFormatFlagsNoClip is specified .
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 6ab04040e52465e77558a067309e8a54bdc0f32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab04040e52465e77558a0673… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 15 13:38:21 2013 +0900 gdiplus: GdipMeasureCharacterRanges should treat empty layout extents as infinite when StringFormatFlagsNoClip is specified. Unlike GdipMeasureString which always treats empty layout extents as infinite. --- dlls/gdiplus/gdiplus_private.h | 2 +- dlls/gdiplus/graphics.c | 21 +++++++++++++-------- dlls/gdiplus/graphicspath.c | 3 ++- dlls/gdiplus/tests/graphics.c | 8 -------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 87f3b8b..f2214b5 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -442,7 +442,7 @@ typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) DECLSPEC_HIDDEN; void get_log_fontW(const GpFont *, GpGraphics *, LOGFONTW *) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 93f85b1..10a6402 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4418,7 +4418,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics *graphics, INT x, INT y, INT w GpStatus gdip_format_string(HDC hdc, GDIPCONST WCHAR *string, INT length, GDIPCONST GpFont *font, - GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, + GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, int ignore_empty_clip, gdip_format_string_callback callback, void *user_data) { WCHAR* stringdup; @@ -4441,6 +4441,11 @@ GpStatus gdip_format_string(HDC hdc, nwidth = rect->Width; nheight = rect->Height; + if (ignore_empty_clip) + { + if (!nwidth) nwidth = INT_MAX; + if (!nheight) nheight = INT_MAX; + } if (format) hkprefix = format->hkprefix; @@ -4698,7 +4703,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, - measure_ranges_callback, &args); + (stringFormat->attr & StringFormatFlagsNoClip) != 0, measure_ranges_callback, &args); SelectObject(hdc, oldfont); DeleteObject(gdifont); @@ -4806,8 +4811,8 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; get_font_hfont(graphics, font, format, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont); @@ -4822,7 +4827,7 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, args.linesfilled = &lines; lines = glyphs = 0; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, measure_string_callback, &args); if (linesfilled) *linesfilled = lines; @@ -4979,8 +4984,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string if (scaled_rect.Width < 0.5) return Ok; /* doesn't fit */ } - if (scaled_rect.Width >= 1 << 23 || scaled_rect.Width < 0.5) scaled_rect.Width = 1 << 23; - if (scaled_rect.Height >= 1 << 23 || scaled_rect.Height < 0.5) scaled_rect.Height = 1 << 23; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; if (!(format_flags & StringFormatFlagsNoClip) && scaled_rect.Width != 1 << 23 && scaled_rect.Height != 1 << 23) @@ -5005,7 +5010,7 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string GetTextMetricsW(hdc, &textmetric); args.ascent = textmetric.tmAscent / rel_height; - gdip_format_string(hdc, string, length, font, &scaled_rect, format, + gdip_format_string(hdc, string, length, font, &scaled_rect, format, TRUE, draw_string_callback, &args); DeleteObject(rgn); diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index f4d1a4b..62f8490 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1009,7 +1009,8 @@ GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT args.maxY = 0; args.scale = emSize / native_height; args.ascent = textmetric.tmAscent * args.scale; - status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, format, format_string_callback, &args); + status = gdip_format_string(dc, string, length, NULL, &scaled_layout_rect, + format, TRUE, format_string_callback, &args); DeleteDC(dc); DeleteObject(hfont); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 4df2119..cbe0b9d 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4050,13 +4050,9 @@ todo_wine set_rect_empty(&bounds); status = GdipGetRegionBounds(region, graphics, &bounds); expect(Ok, status); -todo_wine expectf_(5.0 + margin_x, bounds.X, 1.0); -todo_wine expectf(5.0, bounds.Y); -todo_wine expectf(width_rgn, bounds.Width); -todo_wine expectf(height_rgn, bounds.Height); rect.X = 5.0; @@ -4247,9 +4243,7 @@ todo_wine expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); todo_wine expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); -todo_wine expectf_(width_rgn, bounds.Width, 1.0); -todo_wine expectf_(height_rgn, bounds.Height, 1.0); /* Far alignment */ @@ -4317,9 +4311,7 @@ todo_wine expectf_(5.0 - width_rgn, bounds.X, 2.0); todo_wine expectf_(5.0 - height_rgn, bounds.Y, 1.0); -todo_wine expectf_(width_rgn, bounds.Width, 1.0); -todo_wine expectf_(height_rgn, bounds.Height, 1.0); status = GdipDeleteFont(font);

1 0

Marcus Meissner : msxml3: Initialize hr (Coverity).
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: 5d0ae3d112c9e109e14870795389497fba92966c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d0ae3d112c9e109e14870795… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Mar 14 22:11:45 2013 +0100 msxml3: Initialize hr (Coverity). --- dlls/msxml3/element.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 70360e5..20cd9b7 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1243,7 +1243,7 @@ static HRESULT WINAPI domelem_setAttribute( domelem *This = impl_from_IXMLDOMElement( iface ); xmlChar *xml_name, *xml_value, *local, *prefix; xmlNodePtr element; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_variant(&value));

1 0

Andrew Talbot : user32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 15, 2013

March 15, 2013

Module: wine Branch: master Commit: f3790542d502f8e79d677fbe3e1afbd7980229e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3790542d502f8e79d677fbe3… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 14 21:04:24 2013 +0000 user32: Avoid signed-unsigned integer comparisons. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b587e63..0a38440 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4701,7 +4701,7 @@ static inline void set_menu_item_text( MENUITEM *menu, LPCWSTR text, BOOL unicod */ static int MENU_depth( POPUPMENU *pmenu, int depth) { - int i; + UINT i; MENUITEM *item; int subdepth;

1 0

Francois Gouget : testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: tools Branch: master Commit: ce43ff14cd99a98408a17b35eda843372b6789bb URL: http://source.winehq.org/git/tools.git/?a=commit;h=ce43ff14cd99a98408a17b35… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 14 21:57:36 2013 +0100 testbot: The calls to CreateJobs() and ScheduleJobs() need to be fully qualified. --- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 232e767..11c355f 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -187,7 +187,7 @@ sub Submit my $First = 1; foreach my $BaseName (keys %Targets) { - my $Jobs = CreateJobs(); + my $Jobs = WineTestBot::Jobs::CreateJobs(); # Create a new job for this patch my $NewJob = $Jobs->Add(); @@ -283,7 +283,7 @@ sub Submit } $self->Disposition($Disposition); - ScheduleJobs(); + WineTestBot::Jobs::ScheduleJobs(); return undef; }

1 0

Jacek Caban : mshtml.idl: Added IHTMLButtonElement and DispHTMLButtonElement declarations.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 532de89170c697c77765ef1c345596d4b1488950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532de89170c697c77765ef1c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 17:52:00 2013 +0100 mshtml.idl: Added IHTMLButtonElement and DispHTMLButtonElement declarations. --- include/mshtmdid.h | 9 +++++ include/mshtml.idl | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 0 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 08dd25d..e57a3f8 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2432,6 +2432,15 @@ #define DISPID_IHTMLTEXTAREAELEMENT_WRAP DISPID_RICHTEXT+3 #define DISPID_IHTMLTEXTAREAELEMENT_CREATETEXTRANGE DISPID_RICHTEXT+6 +/* IHTMLButtonElement */ +#define DISPID_IHTMLBUTTONELEMENT_TYPE DISPID_INPUT +#define DISPID_IHTMLBUTTONELEMENT_VALUE DISPID_A_VALUE +#define DISPID_IHTMLBUTTONELEMENT_NAME STDPROPID_XOBJ_NAME +#define DISPID_IHTMLBUTTONELEMENT_STATUS DISPID_BUTTON+1 +#define DISPID_IHTMLBUTTONELEMENT_DISABLED STDPROPID_XOBJ_DISABLED +#define DISPID_IHTMLBUTTONELEMENT_FORM DISPID_SITE+4 +#define DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE DISPID_BUTTON+2 + /* IHTMLInputElement */ #define DISPID_IHTMLINPUTELEMENT_TYPE DISPID_INPUT #define DISPID_IHTMLINPUTELEMENT_VALUE DISPID_A_VALUE diff --git a/include/mshtml.idl b/include/mshtml.idl index e1caea4..f64eb98 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10139,6 +10139,95 @@ methods: } /***************************************************************************** + * IHTMLButtonElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f2bb-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLButtonElement : IDispatch +{ + [propget, id(DISPID_IHTMLBUTTONELEMENT_TYPE)] + HRESULT type([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + HRESULT value([in] BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + HRESULT value([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + HRESULT name([in] BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + HRESULT name([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + HRESULT status([in] VARIANT v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + HRESULT status([out, retval] VARIANT *p); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_DISABLED), displaybind, bindable] + HRESULT disabled([out, retval] VARIANT_BOOL *p); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_FORM)] + HRESULT form([out, retval] IHTMLFormElement **p); + + [id(DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE)] + HRESULT createTextRange([out, retval] IHTMLTxtRange **range); +} + +/***************************************************************************** + * DispHTMLButtonElement dispinterface + */ +[ + hidden, + uuid(3050f51f-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLButtonElement +{ +properties: +methods: + WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_TYPE)] + BSTR type(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + void value(BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_VALUE), displaybind, bindable] + BSTR value(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + void name(BSTR v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_NAME), displaybind, bindable] + BSTR name(); + + [propput, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + void status(VARIANT v); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_STATUS)] + VARIANT status(); + + [propget, id(DISPID_IHTMLBUTTONELEMENT_FORM)] + IHTMLFormElement *form(); + + [id(DISPID_IHTMLBUTTONELEMENT_CREATETEXTRANGE)] + IHTMLTxtRange *createTextRange(); +} + +/***************************************************************************** * IHTMLHeadElement interface */ [

1 0

Piotr Caban : msvcrt: Limit access to out buffer in fread function.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 027d9852105d515196f7c6271d76b8c5316e47cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=027d9852105d515196f7c6271… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 14 13:13:44 2013 +0100 msvcrt: Limit access to out buffer in fread function. DVDFab HD Decrypter expects that unused part of output buffer is not modified. --- dlls/msvcrt/file.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4561711..28aefc1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -35,6 +35,7 @@ # include <unistd.h> #endif #include <sys/types.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -3652,10 +3653,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm while(rcnt>0) { int i; - /* Fill the buffer on small reads. - * TODO: Use a better buffering strategy. - */ - if (!file->_cnt && size*nmemb <= MSVCRT_BUFSIZ/2 && !(file->_flag & MSVCRT__IONBF) + if (!file->_cnt && rcnt<MSVCRT_BUFSIZ && !(file->_flag & MSVCRT__IONBF) && (file->_bufsiz != 0 || msvcrt_alloc_buffer(file))) { file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz); file->_ptr = file->_base; @@ -3670,8 +3668,12 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm file->_cnt -= i; file->_ptr += i; } + } else if (rcnt > UINT_MAX) { + i = MSVCRT__read(file->_file, ptr, UINT_MAX); + } else if (rcnt < MSVCRT_BUFSIZ) { + i = MSVCRT__read(file->_file, ptr, rcnt); } else { - i = MSVCRT__read(file->_file,ptr, rcnt); + i = MSVCRT__read(file->_file, ptr, rcnt - MSVCRT_BUFSIZ/2); } pread += i; rcnt -= i;

1 0