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