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

Alexandre Julliard : ntdll: Copy some missing string functions from msvcrt.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: e3f9f7b38861b9f524bdd5210ffba439f629557b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f9f7b38861b9f524bdd5210… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:53:46 2013 +0100 ntdll: Copy some missing string functions from msvcrt. --- dlls/ntdll/ntdll.spec | 12 +++++----- dlls/ntdll/string.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d144986..83e9260 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1247,10 +1247,10 @@ @ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=x86_64 -norelay __chkstk() -# @ stub __isascii -# @ stub __iscsym -# @ stub __iscsymf -# @ stub __toascii +@ cdecl -private __isascii(long) NTDLL___isascii +@ cdecl -private __iscsym(long) NTDLL___iscsym +@ cdecl -private __iscsymf(long) NTDLL___iscsymf +@ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) # @ stub _alldvrm @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @@ -1284,8 +1284,8 @@ @ cdecl -private _strlwr(str) @ cdecl -private _strnicmp(str str long) @ cdecl -private _strupr(str) -# @ stub -private _tolower -# @ stub -private _toupper +@ cdecl -private _tolower(long) NTDLL__tolower +@ cdecl -private _toupper(long) NTDLL__toupper @ cdecl -private _ui64toa(int64 ptr long) @ cdecl -private _ui64tow(int64 ptr long) @ cdecl -private _ultoa(long ptr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 699adb5..e7a1a61 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -415,6 +415,60 @@ int __cdecl NTDLL_isxdigit( int c ) /********************************************************************* + * __isascii (NTDLL.@) + */ +int CDECL NTDLL___isascii(int c) +{ + return (unsigned)c < 0x80; +} + + +/********************************************************************* + * __toascii (NTDLL.@) + */ +int CDECL NTDLL___toascii(int c) +{ + return (unsigned)c & 0x7f; +} + + +/********************************************************************* + * __iscsym (NTDLL.@) + */ +int CDECL NTDLL___iscsym(int c) +{ + return (c < 127 && (isalnum(c) || c == '_')); +} + + +/********************************************************************* + * __iscsymf (NTDLL.@) + */ +int CDECL NTDLL___iscsymf(int c) +{ + return (c < 127 && (isalpha(c) || c == '_')); +} + + +/********************************************************************* + * _toupper (NTDLL.@) + */ +int CDECL NTDLL__toupper(int c) +{ + return c - 0x20; /* sic */ +} + + +/********************************************************************* + * _tolower (NTDLL.@) + */ +int CDECL NTDLL__tolower(int c) +{ + return c + 0x20; /* sic */ +} + + +/********************************************************************* * strtol (NTDLL.@) */ LONG __cdecl NTDLL_strtol( const char *nptr, char **endptr, int base )

1 0

Alexandre Julliard : msvcrt: Synchronize spec files.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 799731f4b9e9495181e18a68eba16c9219db73fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=799731f4b9e9495181e18a68e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:18:03 2013 +0100 msvcrt: Synchronize spec files. --- dlls/crtdll/crtdll.spec | 6 +- dlls/msvcirt/msvcirt.spec | 12 ++-- dlls/msvcr100/msvcr100.spec | 80 ++++++++++++++++---------------- dlls/msvcr110/msvcr110.spec | 110 +++++++++++++++++++++--------------------- dlls/msvcr70/msvcr70.spec | 68 +++++++++++++------------- dlls/msvcr71/msvcr71.spec | 68 +++++++++++++------------- dlls/msvcr80/msvcr80.spec | 30 ++++++------ dlls/msvcr90/msvcr90.spec | 80 ++++++++++++++++---------------- dlls/msvcrt20/msvcrt20.spec | 14 +++--- dlls/msvcrt40/msvcrt40.spec | 58 +++++++++++----------- dlls/msvcrtd/msvcrtd.spec | 62 ++++++++++++------------ tools/make_specfiles | 1 + 12 files changed, 295 insertions(+), 294 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=799731f4b9e9495181e18…

1 0

Jacek Caban : msctf.idl: Added ITfContextOwnerServices declaration.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 9e5b4eb0565028313bf7355d910f09388668a14b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5b4eb0565028313bf7355d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 13:03:50 2013 +0100 msctf.idl: Added ITfContextOwnerServices declaration. --- include/msctf.idl | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index a1a6f17..a67dbc1 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -106,6 +106,16 @@ cpp_quote("#if 0") typedef [uuid(4f5d560f-5ab5-4dde-8c4d-404592857ab0)] UINT_PTR HKL; cpp_quote("#endif") +typedef [uuid(e26d9e1d-691e-4f29-90d7-338dcf1f8cef)] struct TF_PERSISTENT_PROPERTY_HEADER_ACP +{ + GUID guidType; + LONG ichStart; + LONG cch; + ULONG cb; + DWORD dwPrivate; + CLSID clsidTIP; +} TF_PERSISTENT_PROPERTY_HEADER_ACP; + typedef [uuid(e1b5808d-1e46-4c19-84dc-68c5f5978cc8)] struct TF_LANGUAGEPROFILE { CLSID clsid; @@ -1301,6 +1311,51 @@ interface ITfContextOwnerCompositionServices : ITfContextComposition [ object, + uuid(4ef89150-0807-11d3-8df0-00105a2799b5), + pointer_default(unique) +] +interface ITfPersistentPropertyLoaderACP : IUnknown +{ + HRESULT LoadProperty( + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [out] IStream **ppStream); +} + +[ + object, + uuid(b23eb630-3e1c-11d3-a745-0050040ab407), + pointer_default(unique) +] +interface ITfContextOwnerServices : IUnknown +{ + HRESULT OnLayoutChange(); + + HRESULT OnStatusChange([in] DWORD dwFlags); + + HRESULT OnAttributeChange([in] REFGUID rguidAttribute); + + HRESULT Serialize( + [in] ITfProperty *pProp, + [in] ITfRange *pRange, + [out] TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [in] IStream *pStream); + + HRESULT Unserialize( + [in] ITfProperty *pProp, + [in] const TF_PERSISTENT_PROPERTY_HEADER_ACP *pHdr, + [in] IStream *pStream, + [in] ITfPersistentPropertyLoaderACP *pLoader); + + HRESULT ForceLoadProperty([in] ITfProperty *pProp); + + HRESULT CreateRange( + [in] LONG acpStart, + [in] LONG acpEnd, + [out] ITfRangeACP **ppRange); +} + +[ + object, uuid(17d49a3d-f8b8-4b2f-b254-52319dd64c53), pointer_default(unique) ]

1 0

Huw Davies : usp10: Don't read past the end of the context_type array.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 28adfd4c3ce5be8194c42b67c8a5fbaddb3ab137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28adfd4c3ce5be8194c42b67c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 14 15:48:26 2013 +0000 usp10: Don't read past the end of the context_type array. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d30a615..91637d1 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -931,7 +931,7 @@ static void mark_invalid_combinations(HDC hdc, const WCHAR* pwcChars, INT cChars context_type[i] = lex(pwcChars[i]); GetGlyphIndicesW(hdc, &invalid, 1, &invalid_glyph, 0); - for (i = 1, g=1; i < cChars; i++, g++) + for (i = 1, g=1; i < cChars - 1; i++, g++) { if (context_type[i] != 0 && context_type[i+write_dir]==context_type[i]) {

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 9d8b39cf5ee5af87c3c10f0d3ab671a3ac8ad2a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d8b39cf5ee5af87c3c10f0d3… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Mar 14 15:52:43 2013 +0200 po: Update Finnish translation. --- po/fi.po | 46 ++++++++++++++-------------------------------- 1 files changed, 14 insertions(+), 32 deletions(-) diff --git a/po/fi.po b/po/fi.po index f559383..9eff294 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10406,77 +10406,59 @@ msgstr "Vieraita protokollia" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "TCP-tilastot IPv4:lle" #: netstat.rc:42 -#, fuzzy -#| msgid "Active Connections" msgid "Active Opens" -msgstr "Aktiiviset yhteydet" +msgstr "Aktiivisia avauksia" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Passiivisia avauksia" #: netstat.rc:44 -#, fuzzy -#| msgid "Active Connections" msgid "Failed Connection Attempts" -msgstr "Aktiiviset yhteydet" +msgstr "Epäonnistuneita yhteysyrityksiä" #: netstat.rc:45 -#, fuzzy -#| msgid "Active Connections" msgid "Reset Connections" -msgstr "Aktiiviset yhteydet" +msgstr "Nollattuja yhteyksiä" #: netstat.rc:46 -#, fuzzy -#| msgid "Active Connections" msgid "Current Connections" -msgstr "Aktiiviset yhteydet" +msgstr "Yhteyksiä nyt" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segmentti lukittu.\n" +msgstr "Segmenttejä vastaanotettu" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segmentti lukittu.\n" +msgstr "Segmenttejä lähetetty" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Segmenttejä lähetetty uudelleen" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "UDP-tilastot IPv4:lle" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segmentti lukittu.\n" +msgstr "Datagrammeja vastaanotettu" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Paikallinen portti" +msgstr "Kohdeporttivirheitä" #: netstat.rc:53 -#, fuzzy -#| msgid "Decoding Error" msgid "Receive Errors" -msgstr "Virhe dekoodauksessa" +msgstr "Vastaanottovirheitä" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Datagrammeja lähetetty" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Nikolay Sivov : xmllite: Implement ReadValueChunk().
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: b1d7517ab1cc7dc241d4d6d624b4a67d0d5f7586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d7517ab1cc7dc241d4d6d62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 15:08:29 2013 +0400 xmllite: Implement ReadValueChunk(). --- dlls/xmllite/reader.c | 152 +++++++++++++++++++++++++++---------------- dlls/xmllite/tests/reader.c | 6 +-- 2 files changed, 97 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1d7517ab1cc7dc241d4d…

1 0

Alexandre Julliard : ntoskrnl: Synchronize spec file with ntdll and msvcrt.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 0a3cc8b85d2411c7bb8cd5640f8ccccb8e2be526 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3cc8b85d2411c7bb8cd5640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:57:33 2013 +0100 ntoskrnl: Synchronize spec file with ntdll and msvcrt. --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 82 +++++++++++++++++----------------- tools/make_specfiles | 9 ++++ 2 files changed, 50 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a3cc8b85d2411c7bb8cd…

1 0

Alexandre Julliard : ntdll: Copy some missing math functions from msvcrt.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 17be935568ed630f4a7a53c345dbe533ee61b1ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=17be935568ed630f4a7a53c34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:43:46 2013 +0100 ntdll: Copy some missing math functions from msvcrt. --- dlls/ntdll/misc.c | 129 ++++++++++++++++++++++++------------------------- dlls/ntdll/ntdll.spec | 8 ++-- 2 files changed, 67 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index fecd67e..c115c9c 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -53,72 +53,6 @@ LPCSTR debugstr_us( const UNICODE_STRING *us ) } /********************************************************************* - * _ftol (NTDLL.@) - * - * VERSION - * [GNUC && i386] - */ -#if defined(__GNUC__) && defined(__i386__) -LONGLONG CDECL NTDLL__ftol(void) -{ - /* don't just do DO_FPU("fistp",retval), because the rounding - * mode must also be set to "round towards zero"... */ - double fl; - POP_FPU(fl); - return (LONGLONG)fl; -} -#endif /* defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* - * _ftol (NTDLL.@) - * - * FIXME - * Should be register function - * VERSION - * [!GNUC && i386] - */ -#if !defined(__GNUC__) && defined(__i386__) -LONGLONG CDECL NTDLL__ftol(double fl) -{ - FIXME("should be register function\n"); - return (LONGLONG)fl; -} -#endif /* !defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* - * _CIpow (NTDLL.@) - * VERSION - * [GNUC && i386] - */ -#if defined(__GNUC__) && defined(__i386__) -double CDECL NTDLL__CIpow(void) -{ - double x,y; - POP_FPU(y); - POP_FPU(x); - return pow(x,y); -} -#endif /* defined(__GNUC__) && defined(__i386__) */ - - -/********************************************************************* - * _CIpow (NTDLL.@) - * - * FIXME - * Should be register function - * - * VERSION - * [!GNUC && i386] - */ -#if !defined(__GNUC__) && defined(__i386__) -double CDECL NTDLL__CIpow(double x,double y) -{ - FIXME("should be register function\n"); - return pow(x,y); -} -#endif /* !defined(__GNUC__) && defined(__i386__) */ - -/********************************************************************* * wine_get_version (NTDLL.@) */ const char * CDECL NTDLL_wine_get_version(void) @@ -252,6 +186,69 @@ double CDECL NTDLL_tan( double d ) return tan( d ); } +#if defined(__GNUC__) && defined(__i386__) + +#define FPU_DOUBLE(var) double var; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) +#define FPU_DOUBLES(var1,var2) double var1,var2; \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ + __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) + +/********************************************************************* + * _CIcos (NTDLL.@) + */ +double CDECL NTDLL__CIcos(void) +{ + FPU_DOUBLE(x); + return NTDLL_cos(x); +} + +/********************************************************************* + * _CIlog (NTDLL.@) + */ +double CDECL NTDLL__CIlog(void) +{ + FPU_DOUBLE(x); + return NTDLL_log(x); +} + +/********************************************************************* + * _CIpow (NTDLL.@) + */ +double CDECL NTDLL__CIpow(void) +{ + FPU_DOUBLES(x,y); + return NTDLL_pow(x,y); +} + +/********************************************************************* + * _CIsin (NTDLL.@) + */ +double CDECL NTDLL__CIsin(void) +{ + FPU_DOUBLE(x); + return NTDLL_sin(x); +} + +/********************************************************************* + * _CIsqrt (NTDLL.@) + */ +double CDECL NTDLL__CIsqrt(void) +{ + FPU_DOUBLE(x); + return NTDLL_sqrt(x); +} + +/********************************************************************* + * _ftol (NTDLL.@) + */ +LONGLONG CDECL NTDLL__ftol(void) +{ + FPU_DOUBLE(x); + return (LONGLONG)x; +} + +#endif /* defined(__GNUC__) && defined(__i386__) */ static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *), diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 19ff8e4..d144986 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1240,11 +1240,11 @@ @ stub ZwWriteRequestData @ stdcall ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory @ stdcall ZwYieldExecution() NtYieldExecution -# @ stub _CIcos -# @ stub _CIlog +@ cdecl -private -arch=i386 _CIcos() NTDLL__CIcos +@ cdecl -private -arch=i386 _CIlog() NTDLL__CIlog @ cdecl -private -arch=i386 _CIpow() NTDLL__CIpow -# @ stub _CIsin -# @ stub _CIsqrt +@ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin +@ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -private -arch=x86_64 -norelay __chkstk() # @ stub __isascii

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement stub implementation.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 78b579dff22701febf5dd8948eb3dfc9bcdb810b URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b579dff22701febf5dd8948… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 14 17:52:34 2013 +0100 mshtml: Added IHTMLButtonElement stub implementation. --- dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlinput.c | 229 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 15 +++- 4 files changed, 247 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78b579dff22701febf5dd…

1 0

Nikolay Sivov : msxml3: Use characters callback helper in one more place.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 81ffe0432e474d83a8a4d88421c18e47c09e3708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ffe0432e474d83a8a4d8842… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 08:27:57 2013 +0400 msxml3: Use characters callback helper in one more place. --- dlls/msxml3/saxreader.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5475e1a..5a0b1c2 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -349,6 +349,21 @@ static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandl return (locator->vbInterface && iface->vbhandler) || (!locator->vbInterface && iface->handler); } +static HRESULT saxreader_saxcharacters(saxlocator *locator, BSTR chars) +{ + struct saxcontenthandler_iface *content = saxreader_get_contenthandler(locator->saxreader); + HRESULT hr; + + if (!saxreader_has_handler(locator, SAXContentHandler)) return S_OK; + + if (locator->vbInterface) + hr = IVBSAXContentHandler_characters(content->vbhandler, &chars); + else + hr = ISAXContentHandler_characters(content->handler, chars, SysStringLen(chars)); + + return hr; +} + /* property names */ static const WCHAR PropertyCharsetW[] = { 'c','h','a','r','s','e','t',0 @@ -1565,7 +1580,6 @@ static void libxmlCharacters( int len) { saxlocator *This = ctx; - struct saxcontenthandler_iface *handler = saxreader_get_contenthandler(This->saxreader); BSTR Chars; HRESULT hr; xmlChar *cur, *end; @@ -1624,10 +1638,7 @@ static void libxmlCharacters( } Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur); - if(This->vbInterface) - hr = IVBSAXContentHandler_characters(handler->vbhandler, &Chars); - else - hr = ISAXContentHandler_characters(handler->handler, Chars, SysStringLen(Chars)); + hr = saxreader_saxcharacters(This, Chars); if (sax_callback_failed(This, hr)) { @@ -1799,21 +1810,6 @@ static BSTR saxreader_get_cdata_chunk(const xmlChar *str, int len) return ret; } -static HRESULT saxreader_saxcharacters(saxlocator *locator, BSTR chars) -{ - struct saxcontenthandler_iface *content = saxreader_get_contenthandler(locator->saxreader); - HRESULT hr; - - if (!saxreader_has_handler(locator, SAXContentHandler)) return S_OK; - - if (locator->vbInterface) - hr = IVBSAXContentHandler_characters(content->vbhandler, &chars); - else - hr = ISAXContentHandler_characters(content->handler, chars, SysStringLen(chars)); - - return hr; -} - static void libxml_cdatablock(void *ctx, const xmlChar *value, int len) { const xmlChar *start, *end;

1 0

Ken Thomases : winemac: Extract new function from macdrv_IsClipboardFormatAvailable() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: caf6db7bf981e929851e8807dda4f2fead3bdee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf6db7bf981e929851e8807d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:21 2013 -0500 winemac: Extract new function from macdrv_IsClipboardFormatAvailable() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 79 +++++++++++++++++++++++------------------ 1 files changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4197515..fa4857b 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1324,6 +1324,49 @@ static HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_form /************************************************************************** + * macdrv_pasteboard_has_format + */ +static BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_format) +{ + CFArrayRef types; + int count; + UINT i; + BOOL found = FALSE; + + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return FALSE; + } + + count = CFArrayGetCount(types); + TRACE("got %d types\n", count); + + for (i = 0; !found && i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while (!found && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); + + if (format->format_id == desired_format) + found = TRUE; + } + } + + CFRelease(types); + TRACE(" -> %d\n", found); + return found; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1558,42 +1601,8 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) */ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) { - CFArrayRef types; - int count; - UINT i; - BOOL found = FALSE; - - TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return FALSE; - } - - count = CFArrayGetCount(types); - TRACE("got %d types\n", count); - - for (i = 0; !found && i < count; i++) - { - CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT* format; - - format = NULL; - while (!found && (format = format_for_type(format, type))) - { - TRACE("for type %s got format %s\n", debugstr_cf(type), debugstr_format(format->format_id)); - - if (format->format_id == desired_format) - found = TRUE; - } - } - - CFRelease(types); - TRACE(" -> %d\n", found); - return found; + return macdrv_pasteboard_has_format(NULL, desired_format); }

1 0

Ken Thomases : winemac: Extract new function from macdrv_GetClipboardData() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: c8e6bad15338252b5d93d542feda93b747189871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8e6bad15338252b5d93d542f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:16 2013 -0500 winemac: Extract new function from macdrv_GetClipboardData() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 126 ++++++++++++++++++++++------------------- 1 files changed, 68 insertions(+), 58 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 4a6f859..4197515 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1257,6 +1257,73 @@ static BOOL release_ownership(void) /************************************************************************** + * macdrv_get_pasteboard_data + */ +static HANDLE macdrv_get_pasteboard_data(CFTypeRef pasteboard, UINT desired_format) +{ + CFArrayRef types; + CFIndex count; + CFIndex i; + CFStringRef type, best_type; + WINE_CLIPFORMAT* best_format = NULL; + HANDLE data = NULL; + + TRACE("pasteboard %p, desired_format %s\n", pasteboard, debugstr_format(desired_format)); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) + { + WINE_CLIPFORMAT* format; + + type = CFArrayGetValueAtIndex(types, i); + + format = NULL; + while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); + + if (format->format_id == desired_format) + { + /* The best format is the matching one which is not synthesized. Failing that, + the best format is the first matching synthesized format. */ + if (!format->synthesized || !best_format) + { + best_type = type; + best_format = format; + } + } + } + } + + if (best_format) + { + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(pasteboard, best_type); + + TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); + + if (pasteboard_data) + { + data = best_format->import_func(pasteboard_data); + CFRelease(pasteboard_data); + } + } + + CFRelease(types); + TRACE(" -> %p\n", data); + return data; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1480,66 +1547,9 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) */ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) { - CFArrayRef types; - CFIndex count; - CFIndex i; - CFStringRef type, best_type; - WINE_CLIPFORMAT* best_format = NULL; - HANDLE data = NULL; - - TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return NULL; - } - - count = CFArrayGetCount(types); - TRACE("got %ld types\n", count); - - for (i = 0; (!best_format || best_format->synthesized) && i < count; i++) - { - WINE_CLIPFORMAT* format; - - type = CFArrayGetValueAtIndex(types, i); - - format = NULL; - while ((!best_format || best_format->synthesized) && (format = format_for_type(format, type))) - { - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format ? format->format_id : 0)); - - if (format->format_id == desired_format) - { - /* The best format is the matching one which is not synthesized. Failing that, - the best format is the first matching synthesized format. */ - if (!format->synthesized || !best_format) - { - best_type = type; - best_format = format; - } - } - } - } - - if (best_format) - { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(NULL, best_type); - - TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); - - if (pasteboard_data) - { - data = best_format->import_func(pasteboard_data); - CFRelease(pasteboard_data); - } - } - - CFRelease(types); - TRACE(" -> %p\n", data); - return data; + return macdrv_get_pasteboard_data(NULL, desired_format); }

1 0

Alexandre Julliard : msvcrt: Use -arch=i386 everywhere for consistency.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 866034c1ef16b8b2eb52c2d03d4a088bbc07b93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=866034c1ef16b8b2eb52c2d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:17:52 2013 +0100 msvcrt: Use -arch=i386 everywhere for consistency. --- dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d5cc428..b6ae261 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ # stub _CrtSetReportHook2 # stub _CrtSetReportMode @ stdcall _CxxThrowException(long long) -@ cdecl -i386 -norelay _EH_prolog() +@ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() @@ -181,7 +181,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -@ stdcall -i386 __CxxLongjmpUnwind(ptr) +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() # stub __CxxRegisterExceptionObject # stub __CxxUnregisterExceptionObject @@ -352,7 +352,7 @@ @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign @ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf -@ cdecl -i386 -norelay _chkesp() +@ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize # stub _chsize_s(long int64) @@ -412,9 +412,9 @@ @ extern _environ MSVCRT__environ @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -532,7 +532,7 @@ # stub _getwch() # stub _getwche() @ cdecl _getws(ptr) MSVCRT__getws -@ cdecl -i386 _global_unwind2(ptr) +@ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime32(ptr) MSVCRT__gmtime32 @ cdecl _gmtime32_s(ptr ptr) MSVCRT__gmtime32_s @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 @@ -654,8 +654,8 @@ # stub _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) -@ cdecl -i386 _local_unwind2(ptr long) -@ cdecl -i386 _local_unwind4(ptr ptr long) +@ cdecl -arch=i386 _local_unwind2(ptr long) +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 @ cdecl _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) MSVCRT__localtime64 @@ -665,7 +665,7 @@ @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf -@ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp +@ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) @@ -885,8 +885,8 @@ # stub _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) MSVCRT__searchenv @ cdecl _searchenv_s(str str ptr long) -@ stdcall -i386 _seh_longjmp_unwind4(ptr) -@ stdcall -i386 _seh_longjmp_unwind(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long)

1 0

Dmitry Timoshkov : gdiplus: Add more GdipMeasureString/ GdipMeasureCharacterRanges clipping and alignment tests.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 4b19b618f5e202ed8a0ea121869a3bb3a2d2f20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b19b618f5e202ed8a0ea1218… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 14 16:35:11 2013 +0900 gdiplus: Add more GdipMeasureString/GdipMeasureCharacterRanges clipping and alignment tests. --- dlls/gdiplus/tests/graphics.c | 201 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 193 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e41751a..fe525b6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3909,7 +3909,7 @@ static void test_measure_string(void) static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; - CharacterRange range = { 0, 3 }; + CharacterRange range; GpRegion *region; GpGraphics *graphics; GpFontFamily *family; @@ -3923,8 +3923,7 @@ static void test_measure_string(void) status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); expect(Ok, status); - status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); - expect(Ok, status); + status = GdipCreateRegion(&region); expect(Ok, status); @@ -3964,8 +3963,123 @@ static void test_measure_string(void) todo_wine expectf(height / 2.0, bounds.Height); + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + range.First = 0; + range.Length = 1; + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + set_rect_empty(&rect); + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, 1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(margin_x, bounds.X, 1.0); + expectf(0.0, bounds.Y); + ok(bounds.Width < width_rgn / 2.0, "width of 1 glyph is wrong\n"); + expectf(height_rgn, bounds.Height); + width_1 = bounds.Width; + + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(0.0, bounds.Width); + expectf(0.0, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + 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); + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + 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; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + 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); rect.Height = height / 2.0; set_rect_empty(&bounds); @@ -3975,7 +4089,7 @@ todo_wine expect(1, lines); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); todo_wine expectf(height, bounds.Height); @@ -4042,6 +4156,7 @@ todo_wine expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + /* Default (Near) alignment */ rect.X = 5.0; rect.Y = 5.0; rect.Width = width * 2.0; @@ -4053,7 +4168,7 @@ todo_wine expect(1, lines); expectf(5.0, bounds.X); expectf(5.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4074,6 +4189,7 @@ todo_wine width_rgn = bounds.Width; height_rgn = bounds.Height; + /* Center alignment */ GdipSetStringFormatAlign(format, StringAlignmentCenter); GdipSetStringFormatLineAlign(format, StringAlignmentCenter); @@ -4090,7 +4206,23 @@ todo_wine expectf_(5.0 + width/2.0, bounds.X, 0.01); todo_wine expectf(5.0 + height/2.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 - height/2.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4108,6 +4240,25 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + 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); +todo_wine + expectf_(width_rgn, bounds.Width, 1.0); +todo_wine + expectf_(height_rgn, bounds.Height, 1.0); + + /* Far alignment */ GdipSetStringFormatAlign(format, StringAlignmentFar); GdipSetStringFormatLineAlign(format, StringAlignmentFar); @@ -4121,10 +4272,26 @@ todo_wine expect(3, glyphs); expect(1, lines); todo_wine - expectf(5.0 + width, bounds.X); + expectf_(5.0 + width, bounds.X, 0.01); todo_wine expectf(5.0 + height, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width, bounds.X, 0.01); +todo_wine + expectf(5.0 - height, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4143,6 +4310,24 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +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); expect(Ok, status);

1 0

Ken Thomases : winemac: Implement support for drag-and-drop.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 7993bd3d9010d752704fd25e16ea775852540b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7993bd3d9010d752704fd25e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:32 2013 -0500 winemac: Implement support for drag-and-drop. --- dlls/winemac.drv/Makefile.in | 4 +- dlls/winemac.drv/clipboard.c | 8 +- dlls/winemac.drv/cocoa_event.m | 17 +- dlls/winemac.drv/cocoa_window.m | 74 +++++ dlls/winemac.drv/dragdrop.c | 635 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/event.c | 12 + dlls/winemac.drv/macdrv.h | 8 + dlls/winemac.drv/macdrv_cocoa.h | 29 ++ 8 files changed, 780 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7993bd3d9010d752704fd…

1 0

Ken Thomases : winemac: Extract new function from macdrv_EnumClipboardFormats() parameterized by the target pasteboard.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: fb5794a764b302bce91f938d8fdef396ac8d6922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5794a764b302bce91f938d8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:27 2013 -0500 winemac: Extract new function from macdrv_EnumClipboardFormats() parameterized by the target pasteboard. --- dlls/winemac.drv/clipboard.c | 159 +++++++++++++++++++++++++----------------- 1 files changed, 96 insertions(+), 63 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index fa4857b..40445f6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1367,6 +1367,79 @@ static BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_form /************************************************************************** + * macdrv_copy_pasteboard_formats + */ +static CFArrayRef macdrv_copy_pasteboard_formats(CFTypeRef pasteboard) +{ + CFArrayRef types; + CFIndex count; + CFMutableArrayRef formats; + CFIndex i; + + TRACE("pasteboard %p\n", pasteboard); + + types = macdrv_copy_pasteboard_types(pasteboard); + if (!types) + { + WARN("Failed to copy pasteboard types\n"); + return NULL; + } + + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); + + if (!count) + { + CFRelease(types); + return NULL; + } + + formats = CFArrayCreateMutable(NULL, 0, NULL); + if (!formats) + { + WARN("Failed to allocate formats array\n"); + CFRelease(types); + return NULL; + } + + for (i = 0; i < count; i++) + { + CFStringRef type = CFArrayGetValueAtIndex(types, i); + WINE_CLIPFORMAT* format; + + format = NULL; + while ((format = format_for_type(format, type))) + { + TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + + if (format->synthesized) + { + /* Don't override a real value with a synthesized value. */ + if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) + CFArrayAppendValue(formats, (void*)format->format_id); + } + else + { + /* If the type was already in the array, it must have been synthesized + because this one's real. Remove the synthesized entry in favor of + this one. */ + CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), + (void*)format->format_id); + if (index != kCFNotFound) + CFArrayRemoveValueAtIndex(formats, index); + CFArrayAppendValue(formats, (void*)format->format_id); + } + } + } + + CFRelease(types); + + TRACE(" -> %s\n", debugstr_cf(formats)); + return formats; +} + + +/************************************************************************** * check_clipboard_ownership */ static void check_clipboard_ownership(HWND *owner) @@ -1498,88 +1571,48 @@ void CDECL macdrv_EndClipboardUpdate(void) */ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) { - CFArrayRef types; CFIndex count; CFIndex i; - UINT ret; + UINT ret = 0; TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(NULL); - if (!types) - { - WARN("Failed to copy pasteboard types\n"); - return 0; - } - - count = CFArrayGetCount(types); - TRACE("got %ld types\n", count); - - if (!count) - { - CFRelease(types); - return 0; - } - if (prev_format) { - CFMutableArrayRef formats = CFArrayCreateMutable(NULL, 0, NULL); - if (!formats) + CFArrayRef formats = macdrv_copy_pasteboard_formats(NULL); + if (formats) { - WARN("Failed to allocate array to track formats\n"); - CFRelease(types); - return 0; - } + count = CFArrayGetCount(formats); + i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); + if (i != kCFNotFound && i + 1 < count) + ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); - for (i = 0; i < count; i++) + CFRelease(formats); + } + } + else + { + CFArrayRef types = macdrv_copy_pasteboard_types(NULL); + if (types) { - CFStringRef type = CFArrayGetValueAtIndex(types, i); - WINE_CLIPFORMAT* format; + count = CFArrayGetCount(types); + TRACE("got %ld types\n", count); - format = NULL; - while ((format = format_for_type(format, type))) + if (count) { - TRACE("for type %s got format %p/%s\n", debugstr_cf(type), format, debugstr_format(format->format_id)); + CFStringRef type = CFArrayGetValueAtIndex(types, 0); + WINE_CLIPFORMAT *format = format_for_type(NULL, type); - if (format->synthesized) - { - /* Don't override a real value with a synthesized value. */ - if (!CFArrayContainsValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), (void*)format->format_id)) - CFArrayAppendValue(formats, (void*)format->format_id); - } - else - { - /* If the type was already in the array, it must have been synthesized - because this one's real. Remove the synthesized entry in favor of - this one. */ - CFIndex index = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, CFArrayGetCount(formats)), - (void*)format->format_id); - if (index != kCFNotFound) - CFArrayRemoveValueAtIndex(formats, index); - CFArrayAppendValue(formats, (void*)format->format_id); - } + ret = format ? format->format_id : 0; } - } - count = CFArrayGetCount(formats); - i = CFArrayGetFirstIndexOfValue(formats, CFRangeMake(0, count), (void*)prev_format); - if (i == kCFNotFound || i + 1 >= count) - ret = 0; + CFRelease(types); + } else - ret = (UINT)CFArrayGetValueAtIndex(formats, i + 1); - - CFRelease(formats); + WARN("Failed to copy pasteboard types\n"); } - else - { - CFStringRef type = CFArrayGetValueAtIndex(types, 0); - WINE_CLIPFORMAT *format = format_for_type(NULL, type); - ret = format ? format->format_id : 0; - } - - CFRelease(types); TRACE(" -> %u\n", ret); return ret; }

1 0

Ken Thomases : winemac: Add support for CF_DIB and CF_BITMAP clipboard formats.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 6528619494264d2659039c04ba8a5fa626c99982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6528619494264d2659039c04b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:36 2013 -0500 winemac: Add support for CF_DIB and CF_BITMAP clipboard formats. --- dlls/winemac.drv/clipboard.c | 242 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 242 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6528619494264d2659039…

1 0

Ken Thomases : winemac: Add clipboard formats which can or must be put on Mac pasteboard without transformation .
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: a8d55288de3add7e568d6177bd9dd6ed0c59cef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d55288de3add7e568d6177b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:31 2013 -0500 winemac: Add clipboard formats which can or must be put on Mac pasteboard without transformation. --- dlls/winemac.drv/clipboard.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 3e5e9b3..36e0759 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -141,6 +141,21 @@ static const struct BOOL synthesized; } builtin_format_ids[] = { + { CF_DIBV5, CFSTR("org.winehq.builtin.dibv5"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DIF, CFSTR("org.winehq.builtin.dif"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPBITMAP, CFSTR("org.winehq.builtin.dspbitmap"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPENHMETAFILE, CFSTR("org.winehq.builtin.dspenhmetafile"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPMETAFILEPICT, CFSTR("org.winehq.builtin.dspmetafilepict"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_DSPTEXT, CFSTR("org.winehq.builtin.dsptext"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_LOCALE, CFSTR("org.winehq.builtin.locale"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_OWNERDISPLAY, CFSTR("org.winehq.builtin.ownerdisplay"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_PALETTE, CFSTR("org.winehq.builtin.palette"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_PENDATA, CFSTR("org.winehq.builtin.pendata"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_RIFF, CFSTR("org.winehq.builtin.riff"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_SYLK, CFSTR("org.winehq.builtin.sylk"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_TIFF, CFSTR("public.tiff"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_WAVE, CFSTR("com.microsoft.waveform-audio"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_UNICODETEXT, CFSTR("org.winehq.builtin.unicodetext"), import_clipboard_data, export_clipboard_data, FALSE }, { CF_TEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_text, NULL, TRUE }, { CF_OEMTEXT, CFSTR("org.winehq.builtin.unicodetext"), import_unicodetext_to_oemtext, NULL, TRUE }, @@ -158,6 +173,24 @@ static const struct { CF_OEMTEXT, CFSTR("public.utf8-plain-text"), import_utf8_to_oemtext, export_oemtext_to_utf8, TRUE }, }; +static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; +static const WCHAR wszGIF[] = {'G','I','F',0}; +static const WCHAR wszJFIF[] = {'J','F','I','F',0}; +static const WCHAR wszPNG[] = {'P','N','G',0}; +static const WCHAR wszHTMLFormat[] = {'H','T','M','L',' ','F','o','r','m','a','t',0}; +static const struct +{ + LPCWSTR name; + CFStringRef type; +} builtin_format_names[] = +{ + { wszRichTextFormat, CFSTR("public.rtf") }, + { wszGIF, CFSTR("com.compuserve.gif") }, + { wszJFIF, CFSTR("public.jpeg") }, + { wszPNG, CFSTR("public.png") }, + { wszHTMLFormat, CFSTR("public.html") }, +}; + /* The prefix prepended to an external Mac pasteboard type to make a Win32 clipboard format name. org.winehq.mac-type. */ static const WCHAR mac_type_name_prefix[] = {'o','r','g','.','w','i','n','e','h','q','.','m','a','c','-','t','y','p','e','.',0}; @@ -1224,6 +1257,11 @@ void macdrv_clipboard_process_attach(void) format->synthesized = builtin_format_ids[i].synthesized; list_add_tail(&format_list, &format->entry); } + + /* Register known mappings between Windows formats and Mac types */ + for (i = 0; i < sizeof(builtin_format_names)/sizeof(builtin_format_names[0]); i++) + insert_clipboard_format(RegisterClipboardFormatW(builtin_format_names[i].name), + builtin_format_names[i].type); }

1 0

Jactry Zeng : atl100: Added AtlSetPerUserRegistration stub implementation.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 50e323502eba519c1d1d45bf33857646dee406a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e323502eba519c1d1d45bf3… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Mar 14 00:36:14 2013 +0800 atl100: Added AtlSetPerUserRegistration stub implementation. --- dlls/atl100/atl.c | 9 +++++++++ dlls/atl100/atl100.spec | 2 +- include/atlbase.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index ebb47a1..0e21963 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -743,6 +743,15 @@ HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown *unk, GUID *libid, IID *iid, } /*********************************************************************** + * AtlSetPerUserRegistration [atl100.67] + */ +HRESULT WINAPI AtlSetPerUserRegistration(cpp_bool bEnable) +{ + FIXME("stub: bEnable: %d\n", bEnable); + return E_NOTIMPL; +} + +/*********************************************************************** * AtlGetPerUserRegistration [atl100.68] */ HRESULT WINAPI AtlGetPerUserRegistration(cpp_bool *pbEnabled) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index fa5d251..183ab7b 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -48,5 +48,5 @@ 64 stdcall AtlCallTermFunc(ptr) 65 stdcall AtlWinModuleInit(ptr) 66 stub AtlWinModuleTerm -67 stub AtlSetPerUserRegistration +67 stdcall AtlSetPerUserRegistration(long) 68 stdcall AtlGetPerUserRegistration(ptr) diff --git a/include/atlbase.h b/include/atlbase.h index 1036b10..1f91f55 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -259,6 +259,7 @@ HRESULT WINAPI AtlComModuleRegisterClassObjects(_ATL_COM_MODULE*,DWORD,DWORD); HRESULT WINAPI AtlComModuleUnregisterServer(_ATL_COM_MODULE*,BOOL,const CLSID*); BOOL WINAPI AtlWaitWithMessageLoop(HANDLE); HRESULT WINAPI AtlGetObjectSourceInterface(IUnknown*,GUID*,IID*,unsigned short*,unsigned short*); +HRESULT WINAPI AtlSetPerUserRegistration(unsigned char /*bool*/); HRESULT WINAPI AtlGetPerUserRegistration(unsigned char /*bool*/ *); #endif /* __WINE_ATLBASE_H__ */

1 0

Ken Thomases : winemac: Add support for CF_HDROP clipboard format, mapped to/from Cocoa's NSFilenamesPboardType.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: bff19b173904392e6c64fdfa78df5695e591d41e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff19b173904392e6c64fdfa7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:50 2013 -0500 winemac: Add support for CF_HDROP clipboard format, mapped to/from Cocoa's NSFilenamesPboardType. --- dlls/winemac.drv/clipboard.c | 218 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 5829ca2..2219df6 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -26,6 +26,8 @@ #include "macdrv.h" #include "winuser.h" +#include "shellapi.h" +#include "shlobj.h" #include "wine/list.h" #include "wine/server.h" #include "wine/unicode.h" @@ -70,6 +72,7 @@ typedef struct static HANDLE import_clipboard_data(CFDataRef data); static HANDLE import_bmp_to_bitmap(CFDataRef data); static HANDLE import_bmp_to_dib(CFDataRef data); +static HANDLE import_nsfilenames_to_hdrop(CFDataRef data); static HANDLE import_oemtext_to_text(CFDataRef data); static HANDLE import_oemtext_to_unicodetext(CFDataRef data); static HANDLE import_text_to_oemtext(CFDataRef data); @@ -83,6 +86,7 @@ static HANDLE import_utf8_to_unicodetext(CFDataRef data); static CFDataRef export_clipboard_data(HANDLE data); static CFDataRef export_bitmap_to_bmp(HANDLE data); static CFDataRef export_dib_to_bmp(HANDLE data); +static CFDataRef export_hdrop_to_filenames(HANDLE data); static CFDataRef export_oemtext_to_utf8(HANDLE data); static CFDataRef export_text_to_utf8(HANDLE data); static CFDataRef export_unicodetext_to_utf8(HANDLE data); @@ -181,6 +185,9 @@ static const struct { CF_BITMAP, CFSTR("org.winehq.builtin.bitmap"), import_bmp_to_bitmap, export_bitmap_to_bmp, FALSE }, { CF_BITMAP, CFSTR("com.microsoft.bmp"), import_bmp_to_bitmap, export_bitmap_to_bmp, TRUE }, + + { CF_HDROP, CFSTR("org.winehq.builtin.hdrop"), import_clipboard_data, export_clipboard_data, FALSE }, + { CF_HDROP, CFSTR("NSFilenamesPboardType"), import_nsfilenames_to_hdrop, export_hdrop_to_filenames, TRUE }, }; static const WCHAR wszRichTextFormat[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; @@ -671,6 +678,124 @@ static HANDLE import_bmp_to_dib(CFDataRef data) /************************************************************************** + * import_nsfilenames_to_hdrop + * + * Import NSFilenamesPboardType data, converting the property-list- + * serialized array of path strings to CF_HDROP. + */ +static HANDLE import_nsfilenames_to_hdrop(CFDataRef data) +{ + HDROP hdrop = NULL; + CFArrayRef names; + CFIndex count, i; + size_t len; + char *buffer = NULL; + WCHAR **paths = NULL; + DROPFILES* dropfiles; + UniChar* p; + + TRACE("data %s\n", debugstr_cf(data)); + + names = (CFArrayRef)CFPropertyListCreateWithData(NULL, data, kCFPropertyListImmutable, + NULL, NULL); + if (!names || CFGetTypeID(names) != CFArrayGetTypeID()) + { + WARN("failed to interpret data as a CFArray\n"); + goto done; + } + + count = CFArrayGetCount(names); + + len = 0; + for (i = 0; i < count; i++) + { + CFIndex this_len; + CFStringRef name = (CFStringRef)CFArrayGetValueAtIndex(names, i); + TRACE(" %s\n", debugstr_cf(name)); + if (CFGetTypeID(name) != CFStringGetTypeID()) + { + WARN("non-string in array\n"); + goto done; + } + + this_len = CFStringGetMaximumSizeOfFileSystemRepresentation(name); + if (this_len > len) + len = this_len; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, len); + if (!buffer) + { + WARN("failed to allocate buffer for file-system representations\n"); + goto done; + } + + paths = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * sizeof(paths[0])); + if (!paths) + { + WARN("failed to allocate array of DOS paths\n"); + goto done; + } + + for (i = 0; i < count; i++) + { + CFStringRef name = (CFStringRef)CFArrayGetValueAtIndex(names, i); + if (!CFStringGetFileSystemRepresentation(name, buffer, len)) + { + WARN("failed to get file-system representation for %s\n", debugstr_cf(name)); + goto done; + } + paths[i] = wine_get_dos_file_name(buffer); + if (!paths[i]) + { + WARN("failed to get DOS path for %s\n", debugstr_a(buffer)); + goto done; + } + } + + len = 1; /* for the terminating null */ + for (i = 0; i < count; i++) + len += strlenW(paths[i]) + 1; + + hdrop = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, sizeof(*dropfiles) + len * sizeof(WCHAR)); + if (!hdrop || !(dropfiles = GlobalLock(hdrop))) + { + WARN("failed to allocate HDROP\n"); + GlobalFree(hdrop); + hdrop = NULL; + goto done; + } + + dropfiles->pFiles = sizeof(*dropfiles); + dropfiles->pt.x = 0; + dropfiles->pt.y = 0; + dropfiles->fNC = FALSE; + dropfiles->fWide = TRUE; + + p = (WCHAR*)(dropfiles + 1); + for (i = 0; i < count; i++) + { + strcpyW(p, paths[i]); + p += strlenW(p) + 1; + } + *p = 0; + + GlobalUnlock(hdrop); + +done: + if (paths) + { + for (i = 0; i < count; i++) + HeapFree(GetProcessHeap(), 0, paths[i]); + HeapFree(GetProcessHeap(), 0, paths); + } + HeapFree(GetProcessHeap(), 0, buffer); + if (names) CFRelease(names); + return hdrop; +} + + +/************************************************************************** * import_oemtext_to_text * * Import CF_OEMTEXT data, converting the string to CF_TEXT. @@ -924,6 +1049,99 @@ static CFDataRef export_dib_to_bmp(HANDLE data) /************************************************************************** + * export_hdrop_to_filenames + * + * Export CF_HDROP to NSFilenamesPboardType data, which is a CFArray of + * CFStrings (holding Unix paths) which is serialized as a property list. + */ +static CFDataRef export_hdrop_to_filenames(HANDLE data) +{ + CFDataRef ret = NULL; + DROPFILES *dropfiles; + CFMutableArrayRef filenames = NULL; + void *p; + WCHAR *buffer = NULL; + size_t buffer_len = 0; + + TRACE("data %p\n", data); + + if (!(dropfiles = GlobalLock(data))) + { + WARN("failed to lock data %p\n", data); + goto done; + } + + filenames = CFArrayCreateMutable(NULL, 0, &kCFTypeArrayCallBacks); + if (!filenames) + { + WARN("failed to create filenames array\n"); + goto done; + } + + p = (char*)dropfiles + dropfiles->pFiles; + while (dropfiles->fWide ? *(WCHAR*)p : *(char*)p) + { + char *unixname; + CFStringRef filename; + + TRACE(" %s\n", dropfiles->fWide ? debugstr_w(p) : debugstr_a(p)); + + if (dropfiles->fWide) + unixname = wine_get_unix_file_name(p); + else + { + int len = MultiByteToWideChar(CP_ACP, 0, p, -1, NULL, 0); + if (len) + { + if (len > buffer_len) + { + HeapFree(GetProcessHeap(), 0, buffer); + buffer_len = len * 2; + buffer = HeapAlloc(GetProcessHeap(), 0, buffer_len * sizeof(*buffer)); + } + + MultiByteToWideChar(CP_ACP, 0, p, -1, buffer, buffer_len); + unixname = wine_get_unix_file_name(buffer); + } + else + unixname = NULL; + } + if (!unixname) + { + WARN("failed to convert DOS path to Unix: %s\n", + dropfiles->fWide ? debugstr_w(p) : debugstr_a(p)); + goto done; + } + + if (dropfiles->fWide) + p = (WCHAR*)p + strlenW(p) + 1; + else + p = (char*)p + strlen(p) + 1; + + filename = CFStringCreateWithFileSystemRepresentation(NULL, unixname); + HeapFree(GetProcessHeap(), 0, unixname); + if (!filename) + { + WARN("failed to create CFString from Unix path %s\n", debugstr_a(unixname)); + goto done; + } + + CFArrayAppendValue(filenames, filename); + CFRelease(filename); + } + + ret = CFPropertyListCreateData(NULL, filenames, kCFPropertyListXMLFormat_v1_0, 0, NULL); + +done: + HeapFree(GetProcessHeap(), 0, buffer); + GlobalUnlock(data); + if (filenames) CFRelease(filenames); + TRACE(" -> %s\n", debugstr_cf(ret)); + return ret; +} + + +/************************************************************************** * export_oemtext_to_utf8 * * Export CF_OEMTEXT to UTF-8.

1 0

Ken Thomases : winemac: Allow for processing Cocoa events while waiting for query results.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 761ad810d978168edf3fce62dd8aa12f9e945292 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ad810d978168edf3fce62d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:57 2013 -0500 winemac: Allow for processing Cocoa events while waiting for query results. --- dlls/winemac.drv/cocoa_app.h | 7 ++++++- dlls/winemac.drv/cocoa_app.m | 16 ++++++++++++++-- dlls/winemac.drv/cocoa_event.h | 1 + dlls/winemac.drv/cocoa_event.m | 22 ++++++++++++++++++++-- dlls/winemac.drv/event.c | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 67f75e1..e15d734 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -26,6 +26,11 @@ #define ERR(...) do { if (macdrv_err_on) LogError(__func__, __VA_ARGS__); } while (false) +enum { + WineApplicationEventWakeQuery, +}; + + @class WineEventQueue; @class WineWindow; @@ -87,7 +92,7 @@ - (void) windowGotFocus:(WineWindow*)window; - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout; + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents; - (void) keyboardSelectionDidChange; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 5dc3008..7ee009d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -172,13 +172,25 @@ int macdrv_err_on; } } - - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout + - (BOOL) waitUntilQueryDone:(int*)done timeout:(NSDate*)timeout processEvents:(BOOL)processEvents { PerformRequest(NULL); do { - [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; + if (processEvents) + { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSEvent* event = [NSApp nextEventMatchingMask:NSAnyEventMask + untilDate:timeout + inMode:NSDefaultRunLoopMode + dequeue:YES]; + if (event) + [NSApp sendEvent:event]; + [pool release]; + } + else + [[NSRunLoop currentRunLoop] runMode:WineAppWaitQueryResponseMode beforeDate:timeout]; } while (!*done && [timeout timeIntervalSinceNow] >= 0); return *done; diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 56964da..e74875e 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -36,6 +36,7 @@ - (void) postEvent:(const macdrv_event*)inEvent; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout; @end diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index a5f1c1b..c95fac6 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -252,7 +252,7 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea [eventsLock unlock]; } - - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout processEvents:(BOOL)processEvents { macdrv_event event; NSDate* timeoutDate = [NSDate dateWithTimeIntervalSinceNow:timeout]; @@ -264,10 +264,15 @@ static NSString* const WineEventQueueThreadDictionaryKey = @"WineEventQueueThrea query->done = FALSE; [self postEvent:&event]; - timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate]; + timedout = ![NSApp waitUntilQueryDone:&query->done timeout:timeoutDate processEvents:processEvents]; return !timedout && query->status; } + - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout + { + return [self query:query timeout:timeout processEvents:FALSE]; + } + /*********************************************************************** * OnMainThread @@ -470,8 +475,21 @@ void macdrv_set_query_done(macdrv_query *query) macdrv_retain_query(query); OnMainThreadAsync(^{ + NSEvent* event; + query->done = TRUE; macdrv_release_query(query); + + event = [NSEvent otherEventWithType:NSApplicationDefined + location:NSZeroPoint + modifierFlags:0 + timestamp:[[NSProcessInfo processInfo] systemUptime] + windowNumber:0 + context:nil + subtype:WineApplicationEventWakeQuery + data1:0 + data2:0]; + [NSApp postEvent:event atStart:TRUE]; }); } diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 512d99e..1fba681 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -240,7 +240,8 @@ DWORD CDECL macdrv_MsgWaitForMultipleObjectsEx(DWORD count, const HANDLE *handle timeout, flags & MWMO_ALERTABLE); } - if (data->current_event) event_mask = 0; /* don't process nested events */ + if (data->current_event && data->current_event->type != QUERY_EVENT) + event_mask = 0; /* don't process nested events */ if (process_events(data->queue, event_mask)) ret = count - 1; else if (count || timeout)

1 0

Ken Thomases : winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert .
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 95d5270a0d852b45198a6466aebcca94ee223798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d5270a0d852b45198a6466a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:52:43 2013 -0500 winemac: Synthesize additional bitmap pasteboard types from any that Cocoa can convert. Mac apps generally put TIFF on the pasteboard, but Windows programs are more likely to handle CF_DIB or CF_BITMAP which map to BMP. --- dlls/winemac.drv/cocoa_clipboard.m | 48 ++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 486cbd0..8d29326 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -25,6 +25,10 @@ static int owned_change_count = -1; +static NSArray* BitmapOutputTypes; +static NSDictionary* BitmapOutputTypeMap; +static dispatch_once_t BitmapOutputTypesInitOnce; + /*********************************************************************** * macdrv_is_pasteboard_owner @@ -54,11 +58,43 @@ CFArrayRef macdrv_copy_pasteboard_types(void) __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + dispatch_once(&BitmapOutputTypesInitOnce, ^{ + NSArray* bitmapFileTypes = [NSArray arrayWithObjects: + [NSNumber numberWithUnsignedInteger:NSTIFFFileType], + [NSNumber numberWithUnsignedInteger:NSPNGFileType], + [NSNumber numberWithUnsignedInteger:NSBMPFileType], + [NSNumber numberWithUnsignedInteger:NSGIFFileType], + [NSNumber numberWithUnsignedInteger:NSJPEGFileType], + [NSNumber numberWithUnsignedInteger:NSJPEG2000FileType], + nil]; + + BitmapOutputTypes = [[NSArray alloc] initWithObjects:@"public.tiff", @"public.png", + @"com.microsoft.bmp", @"com.compuserve.gif", @"public.jpeg", + @"public.jpeg-2000", nil]; + + BitmapOutputTypeMap = [[NSDictionary alloc] initWithObjects:bitmapFileTypes + forKeys:BitmapOutputTypes]; + }); + OnMainThread(^{ @try { NSPasteboard* pb = [NSPasteboard generalPasteboard]; NSArray* types = [pb types]; + + // If there are any types understood by NSBitmapImageRep, then we + // can offer all of the types that it can output, too. For example, + // if TIFF is on the pasteboard, we can offer PNG, BMP, etc. to the + // Windows program. We'll convert on demand. + if ([types firstObjectCommonWithArray:[NSBitmapImageRep imageTypes]] || + [types firstObjectCommonWithArray:[NSBitmapImageRep imagePasteboardTypes]]) + { + NSMutableArray* newTypes = [BitmapOutputTypes mutableCopy]; + [newTypes removeObjectsInArray:types]; + types = [types arrayByAddingObjectsFromArray:newTypes]; + [newTypes release]; + } + ret = (CFArrayRef)[types copy]; } @catch (id e) @@ -89,6 +125,18 @@ CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) NSPasteboard* pb = [NSPasteboard generalPasteboard]; if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) ret = [[pb dataForType:(NSString*)type] copy]; + else + { + NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; + if (bitmapType) + { + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + ret = [NSBitmapImageRep representationOfImageRepsInArray:reps + usingType:[bitmapType unsignedIntegerValue] + properties:nil]; + ret = [ret copy]; + } + } } @catch (id e) {

1 0

Alexandre Julliard : msvcrt: Export the float math functions on ARM.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 599d080220bd40a8a076a2a08cb08e64b87f54c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599d080220bd40a8a076a2a08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:06:25 2013 +0100 msvcrt: Export the float math functions on ARM. --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.spec | 54 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4570da0..a55ecb6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -68,7 +68,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef __x86_64__ +#if defined(__x86_64__) || defined(__arm__) /********************************************************************* * _chgsignf (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0bf5ab2..d5cc428 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -351,7 +351,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign -@ cdecl -arch=x86_64 _chgsignf(float) MSVCRT__chgsignf +@ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf @ cdecl -i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -366,7 +366,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign(double double) MSVCRT__copysign -@ cdecl -arch=x86_64 _copysignf(float float) MSVCRT__copysignf +@ cdecl -arch=arm,x86_64 _copysignf(float float) MSVCRT__copysignf @ varargs _cprintf(str) # stub _cprintf_l(str ptr) # stub _cprintf_p(str) @@ -449,7 +449,7 @@ @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite(double) MSVCRT__finite -@ cdecl -arch=x86_64 _finitef(float) MSVCRT__finitef +@ cdecl -arch=arm,x86_64 _finitef(float) MSVCRT__finitef @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @@ -625,7 +625,7 @@ @ cdecl _ismbstrail(ptr ptr) # stub _ismbstrail_l(long ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf +@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @@ -664,7 +664,7 @@ @ cdecl _lock_file(ptr) MSVCRT__lock_file @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb -@ cdecl -arch=x86_64 _logbf(float) MSVCRT__logbf +@ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @@ -834,7 +834,7 @@ # stub -arch=win32 _msize_debug(ptr long) # stub -arch=win64 _msize_dbg(ptr long) @ cdecl _nextafter(double double) MSVCRT__nextafter -@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf +@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf @ cdecl _onexit(ptr) MSVCRT__onexit @ varargs _open(str long) MSVCRT__open @ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle @@ -874,7 +874,7 @@ @ cdecl -arch=i386 _safe_fprem() @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb -@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf +@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf @ varargs _scanf_l(str ptr) MSVCRT__scanf_l @ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l @ varargs _scprintf(str) MSVCRT__scprintf @@ -1238,15 +1238,15 @@ @ cdecl abort() MSVCRT_abort @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos -@ cdecl -arch=x86_64 acosf(float) MSVCRT_acosf +@ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 -@ cdecl -arch=x86_64 asinf(float) MSVCRT_asinf -@ cdecl -arch=x86_64 atanf(float) MSVCRT_atanf -@ cdecl -arch=x86_64 atan2f(float float) MSVCRT_atan2f +@ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf +@ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf +@ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) ntdll.atoi @@ -1256,20 +1256,20 @@ @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil -@ cdecl -arch=x86_64 ceilf(float) MSVCRT_ceilf +@ cdecl -arch=arm,x86_64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr # stub clearerr_s(ptr) @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl cosh(double) MSVCRT_cosh -@ cdecl -arch=x86_64 cosf(float) MSVCRT_cosf -@ cdecl -arch=x86_64 coshf(float) MSVCRT_coshf +@ cdecl -arch=arm,x86_64 cosf(float) MSVCRT_cosf +@ cdecl -arch=arm,x86_64 coshf(float) MSVCRT_coshf @ cdecl ctime(ptr) MSVCRT_ctime @ cdecl difftime(long long) MSVCRT_difftime @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp -@ cdecl -arch=x86_64 expf(float) MSVCRT_expf +@ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf @ cdecl fabs(double) MSVCRT_fabs @ cdecl fclose(ptr) MSVCRT_fclose @ cdecl feof(ptr) MSVCRT_feof @@ -1281,9 +1281,9 @@ @ cdecl fgetwc(ptr) MSVCRT_fgetwc @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor -@ cdecl -arch=x86_64 floorf(float) MSVCRT_floorf +@ cdecl -arch=arm,x86_64 floorf(float) MSVCRT_floorf @ cdecl fmod(double double) MSVCRT_fmod -@ cdecl -arch=x86_64 fmodf(float float) MSVCRT_fmodf +@ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen @ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf @@ -1297,7 +1297,7 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf +@ cdecl -arch=arm,x86_64 frexpf(float ptr) MSVCRT_frexpf @ varargs fscanf(ptr str) MSVCRT_fscanf @ varargs fscanf_s(ptr str) MSVCRT_fscanf_s @ cdecl fseek(ptr long long) MSVCRT_fseek @@ -1349,8 +1349,8 @@ @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 -@ cdecl -arch=x86_64 logf(float) MSVCRT_logf -@ cdecl -arch=x86_64 log10f(float) MSVCRT_log10f +@ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf +@ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen @@ -1371,10 +1371,10 @@ @ cdecl memset(ptr long long) ntdll.memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf -@ cdecl -arch=x86_64 modff(float ptr) MSVCRT_modff +@ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff @ cdecl perror(str) MSVCRT_perror @ cdecl pow(double double) MSVCRT_pow -@ cdecl -arch=x86_64 powf(float float) MSVCRT_powf +@ cdecl -arch=arm,x86_64 powf(float float) MSVCRT_powf @ varargs printf(str) MSVCRT_printf @ varargs printf_s(str) MSVCRT_printf_s @ cdecl putc(long ptr) MSVCRT_putc @@ -1400,12 +1400,12 @@ @ cdecl signal(long long) MSVCRT_signal @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh -@ cdecl -arch=x86_64 sinf(float) MSVCRT_sinf -@ cdecl -arch=x86_64 sinhf(float) MSVCRT_sinhf +@ cdecl -arch=arm,x86_64 sinf(float) MSVCRT_sinf +@ cdecl -arch=arm,x86_64 sinhf(float) MSVCRT_sinhf @ varargs sprintf(ptr str) MSVCRT_sprintf @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s @ cdecl sqrt(double) MSVCRT_sqrt -@ cdecl -arch=x86_64 sqrtf(float) MSVCRT_sqrtf +@ cdecl -arch=arm,x86_64 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s @@ -1444,8 +1444,8 @@ @ cdecl system(str) MSVCRT_system @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh -@ cdecl -arch=x86_64 tanf(float) MSVCRT_tanf -@ cdecl -arch=x86_64 tanhf(float) MSVCRT_tanhf +@ cdecl -arch=arm,x86_64 tanf(float) MSVCRT_tanf +@ cdecl -arch=arm,x86_64 tanhf(float) MSVCRT_tanhf @ cdecl time(ptr) MSVCRT_time @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s

1 0

Alexandre Julliard : msvcrt: Export the ARM version of some mangled names.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 5c4bce668ca0290db6ed89ca8d7eb854f4377214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4bce668ca0290db6ed89ca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 12:41:47 2013 +0100 msvcrt: Export the ARM version of some mangled names. --- dlls/msvcr100/msvcr100.spec | 3 +- dlls/msvcr110/msvcr110.spec | 54 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 78 ++++++++++++++++++++++++++++-------------- 3 files changed, 81 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4bce668ca0290db6ed8…

1 0

André Hentschel : msvcrt: Add setjmp for ARM in spec file.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: b29e56f205727d0f9f79636e1e50efeb47527376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e56f205727d0f9f79636e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 13 20:06:44 2013 +0100 msvcrt: Add setjmp for ARM in spec file. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 019a41a..b558b06 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1769,7 +1769,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 720c056..209cc80 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1422,7 +1422,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2b01fc3..8e5cc9b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1368,7 +1368,7 @@ @ varargs scanf(str) MSVCRT_scanf @ varargs scanf_s(str) MSVCRT_scanf_s @ cdecl setbuf(ptr ptr) MSVCRT_setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @ cdecl signal(long long) MSVCRT_signal

1 0

Ken Thomases : winemac: Enable pasteboard functions to operate on arbitrary pasteboards.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: wine Branch: master Commit: 4ae5b106f80eb29ed0b05b74edf054b622fb7ac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae5b106f80eb29ed0b05b74e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 13 16:53:04 2013 -0500 winemac: Enable pasteboard functions to operate on arbitrary pasteboards. ... not just the general pasteboard (although the general pasteboard is still the default). --- dlls/winemac.drv/clipboard.c | 12 ++++++------ dlls/winemac.drv/cocoa_clipboard.m | 22 ++++++++++++++-------- dlls/winemac.drv/macdrv_cocoa.h | 4 ++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 2219df6..4a6f859 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1326,7 +1326,7 @@ INT CDECL macdrv_CountClipboardFormats(void) return 0; } - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1396,7 +1396,7 @@ UINT CDECL macdrv_EnumClipboardFormats(UINT prev_format) TRACE("prev_format %s\n", debugstr_format(prev_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1490,7 +1490,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1526,7 +1526,7 @@ HANDLE CDECL macdrv_GetClipboardData(UINT desired_format) if (best_format) { - CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(best_type); + CFDataRef pasteboard_data = macdrv_copy_pasteboard_data(NULL, best_type); TRACE("got pasteboard data for type %s: %s\n", debugstr_cf(best_type), debugstr_cf(pasteboard_data)); @@ -1556,7 +1556,7 @@ BOOL CDECL macdrv_IsClipboardFormatAvailable(UINT desired_format) TRACE("desired_format %s\n", debugstr_format(desired_format)); check_clipboard_ownership(NULL); - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); @@ -1758,7 +1758,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) if (!types) { - types = macdrv_copy_pasteboard_types(); + types = macdrv_copy_pasteboard_types(NULL); if (!types) { WARN("Failed to copy pasteboard types\n"); diff --git a/dlls/winemac.drv/cocoa_clipboard.m b/dlls/winemac.drv/cocoa_clipboard.m index 8d29326..b8ca796 100644 --- a/dlls/winemac.drv/cocoa_clipboard.m +++ b/dlls/winemac.drv/cocoa_clipboard.m @@ -53,8 +53,9 @@ int macdrv_is_pasteboard_owner(void) * the pasteboard, or NULL on error. The caller is responsible for * releasing the returned array with CFRelease(). */ -CFArrayRef macdrv_copy_pasteboard_types(void) +CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block CFArrayRef ret = NULL; NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; @@ -79,8 +80,11 @@ CFArrayRef macdrv_copy_pasteboard_types(void) OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - NSArray* types = [pb types]; + NSPasteboard* local_pb = pb; + NSArray* types; + + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + types = [local_pb types]; // If there are any types understood by NSBitmapImageRep, then we // can offer all of the types that it can output, too. For example, @@ -115,22 +119,24 @@ CFArrayRef macdrv_copy_pasteboard_types(void) * if there's no such type on the pasteboard. The caller is responsible * for releasing the returned data object with CFRelease(). */ -CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) +CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) { + NSPasteboard* pb = (NSPasteboard*)pasteboard; __block NSData* ret = nil; OnMainThread(^{ @try { - NSPasteboard* pb = [NSPasteboard generalPasteboard]; - if ([pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) - ret = [[pb dataForType:(NSString*)type] copy]; + NSPasteboard* local_pb = pb; + if (!local_pb) local_pb = [NSPasteboard generalPasteboard]; + if ([local_pb availableTypeFromArray:[NSArray arrayWithObject:(NSString*)type]]) + ret = [[local_pb dataForType:(NSString*)type] copy]; else { NSNumber* bitmapType = [BitmapOutputTypeMap objectForKey:(NSString*)type]; if (bitmapType) { - NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:pb]; + NSArray* reps = [NSBitmapImageRep imageRepsWithPasteboard:local_pb]; ret = [NSBitmapImageRep representationOfImageRepsInArray:reps usingType:[bitmapType unsignedIntegerValue] properties:nil]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index bbd3424..95a3720 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -304,8 +304,8 @@ extern CFDataRef macdrv_copy_keyboard_layout(CGEventSourceKeyboardType* keyboard /* clipboard */ -extern CFArrayRef macdrv_copy_pasteboard_types(void) DECLSPEC_HIDDEN; -extern CFDataRef macdrv_copy_pasteboard_data(CFStringRef type) DECLSPEC_HIDDEN; +extern CFArrayRef macdrv_copy_pasteboard_types(CFTypeRef pasteboard) DECLSPEC_HIDDEN; +extern CFDataRef macdrv_copy_pasteboard_data(CFTypeRef pasteboard, CFStringRef type) DECLSPEC_HIDDEN; extern int macdrv_is_pasteboard_owner(void) DECLSPEC_HIDDEN; extern void macdrv_clear_pasteboard(void) DECLSPEC_HIDDEN; extern int macdrv_set_pasteboard_data(CFStringRef type, CFDataRef data, macdrv_window w) DECLSPEC_HIDDEN;

1 0

Francois Gouget : testbot: Integrate the WineTestBot with the patches website.
by Alexandre Julliard March 14, 2013

March 14, 2013

Module: tools Branch: master Commit: 62142e91529892c3d7a70b842c31158d2ca00203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=62142e91529892c3d7a70b84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:03:36 2013 +0100 testbot: Integrate the WineTestBot with the patches website. This lets the WineTestBot create jobs for each patch sent to wine-patches. However for now the part that sends the results back to the patches website is disabled to preserve compatibility with the old WineTestBot (see WineSendLog.pl). --- testbot/bin/Engine.pl | 65 -------------- testbot/bin/WinePatchesWebGet.pl | 108 ------------------------ testbot/bin/WinePatchesWebNotify.pl | 55 ------------ testbot/bin/WinePatchesWebSubmit.pl | 92 ++++++++++++++++++++ testbot/bin/WineSendLog.pl | 92 ++++++++++---------- testbot/doc/INSTALL.txt | 21 +---- testbot/lib/WineTestBot/Config.pm | 4 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 - testbot/lib/WineTestBot/Engine/Notify.pm | 20 +---- 9 files changed, 146 insertions(+), 315 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=62142e91529892c3d7a7…

1 0

Piotr Caban : wininet: Rename CACHEFILE_ENTRY to entry_header.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9d98ced7eccd200d81d625828c20ae499bca0b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d98ced7eccd200d81d625828… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:23 2013 +0100 wininet: Rename CACHEFILE_ENTRY to entry_header. --- dlls/wininet/urlcache.c | 156 +++++++++++++++++++++++------------------------ 1 files changed, 76 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d98ced7eccd200d81d62…

1 0

Piotr Caban : wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used .
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9d6843a8c1f0eaa041e49126f3318055976f216f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d6843a8c1f0eaa041e49126f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:51 2013 +0100 wininet: Test if cache entry is created when INTERNET_FLAG_NO_CACHE_WRITE flag is used. --- dlls/wininet/tests/http.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c2607dc..eeec7c5 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1072,6 +1072,10 @@ static void InternetOpenUrlA_test(void) DWORD size, readbytes, totalbytes=0; BOOL ret; + ret = DeleteUrlCacheEntry(TEST_URL); + ok(ret || GetLastError() == ERROR_FILE_NOT_FOUND, + "DeleteUrlCacheEntry returned %x, GetLastError() = %d\n", ret, GetLastError()); + myhinternet = InternetOpen("Winetest",0,NULL,NULL,INTERNET_FLAG_NO_CACHE_WRITE); ok((myhinternet != 0), "InternetOpen failed, error %u\n",GetLastError()); size = 0x400; @@ -1093,6 +1097,9 @@ static void InternetOpenUrlA_test(void) InternetCloseHandle(myhttp); InternetCloseHandle(myhinternet); + + ret = DeleteUrlCacheEntry(TEST_URL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "INTERNET_FLAG_NO_CACHE_WRITE flag doesn't work\n"); } static void HttpSendRequestEx_test(void)

1 0

Piotr Caban : wininet: Don't create cache file if it's forbidden.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: bbbc6d119bd353a71dc475d61358372342a388b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbbc6d119bd353a71dc475d61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:05:41 2013 +0100 wininet: Don't create cache file if it's forbidden. --- dlls/wininet/http.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a019095..a3f68ae 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2261,15 +2261,35 @@ static void commit_cache_entry(http_request_t *req) static void create_cache_entry(http_request_t *req) { + static const WCHAR no_cacheW[] = {'n','o','-','c','a','c','h','e',0}; + static const WCHAR no_storeW[] = {'n','o','-','s','t','o','r','e',0}; + WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR file_name[MAX_PATH+1]; - BOOL b; + BOOL b = TRUE; /* FIXME: We should free previous cache file earlier */ heap_free(req->cacheFile); CloseHandle(req->hCacheFile); req->hCacheFile = NULL; + if(req->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) + b = FALSE; + + if(b) { + int header_idx = HTTP_GetCustomHeaderIndex(req, szCache_Control, 0, FALSE); + if(header_idx!=-1 && (!strcmpiW(req->custHeaders[header_idx].lpszValue, no_cacheW) + || !strcmpiW(req->custHeaders[header_idx].lpszValue, no_storeW))) + b = FALSE; + } + + if(!b) { + if(!(req->hdr.dwFlags & INTERNET_FLAG_NEED_FILE)) + return; + + FIXME("INTERNET_FLAG_NEED_FILE is not supported correctly\n"); + } + b = HTTP_GetRequestURL(req, url); if(!b) { WARN("Could not get URL\n");

1 0

Alexandre Julliard : msi: Avoid intermediate variables when calling create_record.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 33aa647e64bc310575443955131bdcae5c32e7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=33aa647e64bc3105754439551… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:47:30 2013 +0100 msi: Avoid intermediate variables when calling create_record. --- dlls/msi/automation.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 0b12e29..228d887 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1203,11 +1203,7 @@ static HRESULT view_invoke( V_VT(pVarResult) = VT_DISPATCH; if ((ret = MsiViewFetch(This->msiHandle, &msiHandle)) == ERROR_SUCCESS) { - IDispatch *dispatch = NULL; - - if (SUCCEEDED(hr = create_record(msiHandle, &dispatch))) - V_DISPATCH(pVarResult) = dispatch; - else + if (FAILED(hr = create_record(msiHandle, &V_DISPATCH(pVarResult)))) ERR("Failed to create Record object, hresult 0x%08x\n", hr); } else if (ret == ERROR_NO_MORE_ITEMS) @@ -1684,7 +1680,6 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, HRESULT hr; VARIANTARG varg0; MSIHANDLE hrec; - IDispatch* dispatch; if (!(wFlags & DISPATCH_METHOD)) return DISP_E_MEMBERNOTFOUND; @@ -1700,11 +1695,7 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, if (!hrec) return DISP_E_EXCEPTION; - hr = create_record(hrec, &dispatch); - if (SUCCEEDED(hr)) - V_DISPATCH(pVarResult) = dispatch; - - return hr; + return create_record(hrec, &V_DISPATCH(pVarResult)); } static HRESULT InstallerImpl_OpenPackage(AutomationObject* This,

1 0

Alexandre Julliard : exception.h: Android doesn't have sigsetjmp.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 34ff565708e6462940019a8d342ac823220f0794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ff565708e6462940019a8d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:04:38 2013 +0100 exception.h: Android doesn't have sigsetjmp. --- include/wine/exception.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 8b807c1..9f9b339 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -88,7 +88,7 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#if defined(__MINGW32__) || defined(__CYGWIN__) +#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(__ANDROID__) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf) #define siglongjmp(buf,val) longjmp(buf,val)

1 0

Jacek Caban : vbscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 9eed654e054520888429fb7ea1c9d8cce1c7c776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eed654e054520888429fb7ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:43:56 2013 +0100 vbscript: Use DEFAULT_UNREACHABLE macro where appropriate. --- dlls/vbscript/compile.c | 7 ++----- dlls/vbscript/global.c | 4 +--- dlls/vbscript/vbdisp.c | 3 +-- dlls/vbscript/vbscript.c | 3 +-- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index fb1974b..c5f3797 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -98,8 +98,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) break; case ARG_NONE: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } } @@ -1398,9 +1397,7 @@ static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_d case FUNC_PROPSET: invoke_type = VBDISP_SET; break; - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } assert(!desc->entries[invoke_type]); diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9c9cd41..4a5a277 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1010,9 +1010,7 @@ static HRESULT Global_InStr(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VA case 4: FIXME("unsupported compare argument %s\n", debugstr_variant(args)); return E_NOTIMPL; - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } if(startv) { diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index f06a5b6..f075163 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -172,8 +172,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f V_BSTR(res) = ret; break; } - default: - assert(0); + DEFAULT_UNREACHABLE; } return S_OK; } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 48dd18c..b594b07 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -216,8 +216,7 @@ static void decrease_state(VBScript *This, SCRIPTSTATE state) break; case SCRIPTSTATE_CLOSED: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } }

1 0

Dmitry Timoshkov : gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region .
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 61dafbb7012061fda7a737daf24340ce927ce2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dafbb7012061fda7a737daf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 13 16:30:45 2013 +0900 gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a450ded..eb3f228 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -349,7 +349,7 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) { - return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); + return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); } /* Draw non-premultiplied ARGB data to the given graphics object */

1 0

Alexandre Julliard : winefile: Pass a value instead of a pointer to avoid type mismatch warnings.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: c0e85b9fe6a1d4a58b621e29e0cd0359c2685d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e85b9fe6a1d4a58b621e29e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 13 12:47:07 2013 +0100 winefile: Pass a value instead of a pointer to avoid type mismatch warnings. --- programs/winefile/winefile.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 23388c1..65f0149 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -465,9 +465,9 @@ static Entry* read_tree_win(Root* root, LPCWSTR path, SORT_ORDER sortOrder, HWND #ifdef __WINE__ -static BOOL time_to_filetime(const time_t* t, FILETIME* ftime) +static BOOL time_to_filetime(time_t t, FILETIME* ftime) { - struct tm* tm = gmtime(t); + struct tm* tm = gmtime(&t); SYSTEMTIME stime; if (!tm) @@ -534,8 +534,8 @@ static void read_directory_unix(Entry* dir, LPCWSTR path) entry->data.nFileSizeHigh = st.st_size >> 32; memset(&entry->data.ftCreationTime, 0, sizeof(FILETIME)); - time_to_filetime(&st.st_atime, &entry->data.ftLastAccessTime); - time_to_filetime(&st.st_mtime, &entry->data.ftLastWriteTime); + time_to_filetime(st.st_atime, &entry->data.ftLastAccessTime); + time_to_filetime(st.st_mtime, &entry->data.ftLastWriteTime); entry->bhfi.nFileIndexLow = ent->d_ino; entry->bhfi.nFileIndexHigh = 0;

1 0

Jacek Caban : jscript: Use DEFAULT_UNREACHABLE macro where appropriate.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 3faeffc5f474db6c835e035734a4dd96999af234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faeffc5f474db6c835e03573… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:44:07 2013 +0100 jscript: Use DEFAULT_UNREACHABLE macro where appropriate. --- dlls/jscript/compile.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 84d3d5f..516de49 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -92,8 +92,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) case ARG_FUNC: case ARG_NONE: break; - default: - assert(0); + DEFAULT_UNREACHABLE; } } @@ -447,8 +446,7 @@ static HRESULT compile_memberid_expression(compiler_ctx_t *ctx, expression_t *ex hres = push_instr_uint(ctx, OP_memberid, flags); break; } - default: - assert(0); + DEFAULT_UNREACHABLE; } return hres; @@ -771,9 +769,7 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) instr_ptr(ctx, instr)->u.arg[1].uint = literal->u.regexp.flags; return S_OK; } - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } } @@ -797,9 +793,7 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st jsstr_release(jsstr); break; } - default: - assert(0); - return E_FAIL; + DEFAULT_UNREACHABLE; } return *str ? S_OK : E_OUTOFMEMORY; @@ -1050,9 +1044,7 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr, BOOL case EXPR_BXOR: hres = compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); break; - default: - assert(0); - hres = E_FAIL; + DEFAULT_UNREACHABLE; } if(FAILED(hres)) @@ -1769,9 +1761,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_WITH: hres = compile_with_statement(ctx, (with_statement_t*)stat); break; - default: - assert(0); - hres = E_FAIL; + DEFAULT_UNREACHABLE; } if(stat_ctx) {

1 0

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

March 13, 2013

Module: wine Branch: master Commit: ae77b3d368519b5518dbe485dfac2e8123b5a477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae77b3d368519b5518dbe485d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 12 22:28:49 2013 +0000 wininet: Avoid signed-unsigned integer comparisons. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 6 +++--- dlls/wininet/netconnection.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 498e848..a019095 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4050,7 +4050,7 @@ static WORD HTTP_ParseWkday(LPCWSTR day) { 't','h','u',0 }, { 'f','r','i',0 }, { 's','a','t',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; @@ -4313,7 +4313,7 @@ static WORD HTTP_ParseWeekday(LPCWSTR day) { 't','h','u','r','s','d','a','y',0 }, { 'f','r','i','d','a','y',0 }, { 's','a','t','u','r','d','a','y',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 384516c..b6e6948 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2836,7 +2836,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_PER_CONNECTION_OPTION: { INTERNET_PER_CONN_OPTION_LISTW *con = lpBuffer; LONG res; - int i; + unsigned int i; proxyinfo_t pi; INTERNET_LoadProxySettings(&pi); @@ -2950,7 +2950,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, wbuffer, wlen ); break; case INTERNET_OPTION_PER_CONNECTION_OPTION: { - int i; + unsigned int i; INTERNET_PER_CONN_OPTION_LISTW *listW; INTERNET_PER_CONN_OPTION_LISTA *listA = lpBuffer; wlen = sizeof(INTERNET_PER_CONN_OPTION_LISTW); @@ -3019,7 +3019,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, if (dwOption == INTERNET_OPTION_PER_CONNECTION_OPTION) { INTERNET_PER_CONN_OPTION_LISTW *list = wbuffer; - int i; + unsigned int i; for (i = 0; i < list->dwOptionCount; ++i) { INTERNET_PER_CONN_OPTIONW *opt = list->pOptions + i; switch (opt->dwOption) { diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3564282..c33f45a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -477,7 +477,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static DWORD init_openssl(void) { #ifdef SONAME_LIBCRYPTO - int i; + unsigned int i; if(OpenSSL_ssl_handle) return ERROR_SUCCESS; @@ -730,7 +730,7 @@ void NETCON_unload(void) } if (ssl_locks) { - int i; + unsigned int i; for (i = 0; i < num_ssl_locks; i++) { ssl_locks[i].DebugInfo->Spare[0] = 0;

1 0

Vincent Povirk : gdiplus: Correct EMF record size calculation.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: a424968482d10356a5987bc08c66061dca5402e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a424968482d10356a5987bc08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:54:41 2013 -0500 gdiplus: Correct EMF record size calculation. --- dlls/gdiplus/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ae905fc..f03557b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -410,7 +410,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (record) { record->iType = recordType; - record->nSize = dataSize; + record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table,

1 0

Piotr Caban : wininet: Rename URL_CACHEFILE_ENTRY to entry_url.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: a448427bf957be91395ed087a3d3d9777ab85a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a448427bf957be91395ed087a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:16:42 2013 +0100 wininet: Rename URL_CACHEFILE_ENTRY to entry_url. --- dlls/wininet/urlcache.c | 382 +++++++++++++++++++++++------------------------ 1 files changed, 190 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a448427bf957be91395ed…

1 0

Piotr Caban : wininet: Added tests for Cache-Control: no-cache and no-store HTTP headers.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 0e0f06412af753cf1925074fd52f859f27a697b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0f06412af753cf1925074fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 13 17:06:01 2013 +0100 wininet: Added tests for Cache-Control: no-cache and no-store HTTP headers. --- dlls/wininet/tests/http.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index eeec7c5..ae7f436 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2015,6 +2015,16 @@ static DWORD CALLBACK server_thread(LPVOID param) WaitForSingleObject(conn_close_event, INFINITE); trace("closing connection\n"); } + if (strstr(buffer, "GET /test_cache_control_no_cache")) + { + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + } + if (strstr(buffer, "GET /test_cache_control_no_store")) + { + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: No-StOrE\r\n\r\nsome content"; + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + } shutdown(c, 2); closesocket(c); @@ -2474,6 +2484,63 @@ static void test_conn_close(int port) CloseHandle(hCompleteEvent); } +static void test_no_cache(int port) +{ + static const char cache_control_no_cache[] = "/test_cache_control_no_cache"; + static const char cache_control_no_store[] = "/test_cache_control_no_store"; + static const char cache_url_fmt[] = "http://localhost:%d%s"; + + char cache_url[256], buf[256]; + HINTERNET ses, con, req; + DWORD read, size; + BOOL ret; + + trace("Testing no-cache header\n"); + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + req = HttpOpenRequest(con, NULL, cache_control_no_cache, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + sprintf(cache_url, cache_url_fmt, port, cache_control_no_cache); + DeleteUrlCacheEntry(cache_url); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 12, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + ret = DeleteUrlCacheEntry(cache_url); + ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + + req = HttpOpenRequest(con, NULL, cache_control_no_store, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + sprintf(cache_url, cache_url_fmt, port, cache_control_no_store); + DeleteUrlCacheEntry(cache_url); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 12, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + ret = DeleteUrlCacheEntry(cache_url); + ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_HttpSendRequestW(int port) { static const WCHAR header[] = {'U','A','-','C','P','U',':',' ','x','8','6',0}; @@ -2951,6 +3018,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_conn_close(si.port); + test_no_cache(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Nikolay Sivov : msxml3: Process CDATA section before reporting it.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 6874bf3c4ed75c0acb2b1f15fb00278656b44200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6874bf3c4ed75c0acb2b1f15f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 13 15:04:59 2013 +0400 msxml3: Process CDATA section before reporting it. --- dlls/msxml3/saxreader.c | 155 +++++++++++++++++++++++-------------- dlls/msxml3/tests/saxreader.c | 175 ++++++++++++++++++++++++++++++----------- 2 files changed, 225 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6874bf3c4ed75c0acb2b1…

1 0

Jacek Caban : winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 15448724be0cd8eec6bb137f85c5f226d915a1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15448724be0cd8eec6bb137f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 13 10:43:46 2013 +0100 winnt.h: Added GCC variant of DEFAULT_UNREACHABLE macro. --- include/winnt.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 0dac8b1..b701de3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -376,8 +376,10 @@ extern "C" { /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200) # define DEFAULT_UNREACHABLE default: __assume(0) +#elif defined(__clang__) || (defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)))) +# define DEFAULT_UNREACHABLE default: __builtin_unreachable() #else -# define DEFAULT_UNREACHABLE +# define DEFAULT_UNREACHABLE default: #endif /* Error Masks */

1 0

Vincent Povirk : gdiplus: Also get a DC for drawing WMF images.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: wine Branch: master Commit: 6214e5b92cf79eade02fc5abaa72b38ef78c2d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6214e5b92cf79eade02fc5aba… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:53:55 2013 -0500 gdiplus: Also get a DC for drawing WMF images. --- dlls/gdiplus/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 4345ece..ae905fc 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -536,7 +536,9 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, memcpy(real_metafile->playback_points, destPoints, sizeof(PointF) * 3); stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, real_metafile->playback_points, 3); - if (stat == Ok && metafile->metafile_type == MetafileTypeEmf) + if (stat == Ok && (metafile->metafile_type == MetafileTypeEmf || + metafile->metafile_type == MetafileTypeWmfPlaceable || + metafile->metafile_type == MetafileTypeWmf)) stat = METAFILE_PlaybackGetDC((GpMetafile*)metafile); if (stat == Ok)

1 0

Francois Gouget : testbot: Tighten handling of the VM status in the task scripts.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: aae43a05737a693f784c8a719b6084b44c5411fc URL: http://source.winehq.org/git/tools.git/?a=commit;h=aae43a05737a693f784c8a71… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:52:30 2013 +0100 testbot: Tighten handling of the VM status in the task scripts. --- testbot/bin/WineRunBuild.pl | 15 +++++++++++++-- testbot/bin/WineRunReconfig.pl | 17 ++++++++++++++--- testbot/bin/WineRunTask.pl | 15 ++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 236d3d0..3f5b592 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -217,6 +220,13 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) @@ -224,6 +234,7 @@ if (defined($ErrMessage)) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $FileName = $Step->FileName; if (!$TA->SendFile("$StepDir/$FileName", "staging/$FileName", 0)) { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 7588045..0333705 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -61,8 +61,11 @@ sub FatalError($$$$) $Job->UpdateStatus(); my $VM = $Task->VM; - $VM->Status('dirty'); - $VM->Save(); + if ($VM->Status eq 'running') + { + $VM->Status('dirty'); + $VM->Save(); + } TaskComplete($JobKey, $StepKey, $TaskKey); exit 1; @@ -190,13 +193,21 @@ my $FullRawlogFileName = "$TaskDir/rawlog"; my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Task; } + my $Script = "#!/bin/sh\n" . "rm -f Reconfig.log\n" . "../bin/build/Reconfig.pl >>Reconfig.log 2>&1\n"; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index ffbb421..abb92e0 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -204,9 +204,16 @@ my $FullLogFileName = "$TaskDir/log"; my $FullErrFileName = "$TaskDir/err"; my $FullScreenshotFileName = "$TaskDir/screenshot.png"; +# Normally the Engine has already set the VM status to 'running'. +# Do it anyway in case we're called manually from the command line. +if ($VM->Status ne "idle" and $VM->Status ne "running") +{ + FatalError "The VM is not ready for use (" . $VM->Status . ")\n", + $FullErrFileName, $Job, $Step, $Task; +} $VM->Status('running'); my ($ErrProperty, $ErrMessage) = $VM->Save(); -if (defined($ErrMessage)) +if (defined $ErrMessage) { FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; @@ -349,10 +356,8 @@ if (!defined $TestFailures) $Task->TestFailures($TestFailures); $Task->Save(); $Job->UpdateStatus(); -if ($Task->VM->Role ne "base") -{ - $Task->VM->PowerOff(); -} + +$VM->PowerOff() if ($VM->Role ne "base"); $VM->Status('dirty'); $VM->Save();

1 0

Francois Gouget : testbot/build: Staging is handled before starting the build task.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 90a5a8d483a7132871465580f8f841e9fa97eb21 URL: http://source.winehq.org/git/tools.git/?a=commit;h=90a5a8d483a7132871465580… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:08 2013 +0100 testbot/build: Staging is handled before starting the build task. --- testbot/bin/WineRunBuild.pl | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 7fd87b2..236d3d0 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -217,15 +217,8 @@ if (! defined($BaseName)) FatalError "Can't determine base name\n", $FullErrFileName, $Job, $Task; } -my $ErrMessage = $Step->HandleStaging($JobId); -if (defined($ErrMessage)) -{ - FatalError "$ErrMessage\n", $FullErrFileName, $Job, $Task; -} - $VM->Status('running'); -my $ErrProperty; -($ErrProperty, $ErrMessage) = $VM->Save(); +my ($ErrProperty, $ErrMessage) = $VM->Save(); if (defined($ErrMessage)) { FatalError "Can't set VM status to running: $ErrMessage\n",

1 0

Francois Gouget : testbot/build: Remove an unused variable in WineRunBuild. pl.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: d26f41afd04edda9c8a23a56217ab6922deadbb2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d26f41afd04edda9c8a23a56… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:49:58 2013 +0100 testbot/build: Remove an unused variable in WineRunBuild.pl. --- testbot/bin/WineRunBuild.pl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 20a43da..728777a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -186,7 +186,6 @@ my $TA = $VM->GetAgent(); LogMsg "Task $JobId/$StepNo/$TaskNo started\n"; -my $RptFileName = $VM->Name . ".rpt"; my $StepDir = "$DataDir/jobs/$JobId/$StepNo"; my $TaskDir = "$StepDir/$TaskNo"; my $FullRawlogFileName = "$TaskDir/rawlog";

1 0

Francois Gouget : testbot/TestAgent: Enable libssh2 compression.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: b64151902405857b6a193e60782872470c482e96 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b64151902405857b6a193e60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:51 2013 +0100 testbot/TestAgent: Enable libssh2 compression. --- testbot/lib/WineTestBot/TestAgent.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f3d5f0a..2b834f7 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -858,6 +858,11 @@ sub _Connect($) require Net::SSH2; $self->{ssh} = Net::SSH2->new(); $self->{ssh}->debug(1) if ($Debug > 1); + + # Set up compression + $self->{ssh}->method('COMP_CS', 'zlib', 'none'); + $self->{ssh}->method('COMP_SC', 'zlib', 'none'); + if (!$self->{ssh}->connect($self->{sshfd})) { $self->_SetError($FATAL, "Unable to connect to the SSH server: " . $self->_ssherror());

1 0

Francois Gouget : testbot/build: Clean up FatalError() and stop abusing it.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 4c9e159874c219053ce5e9ba1d3964912f8d0987 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4c9e159874c219053ce5e9ba… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:51:01 2013 +0100 testbot/build: Clean up FatalError() and stop abusing it. If not given an error file and a task it's equivalent to a simple LogMsg() + exit(). --- testbot/bin/WineRunBuild.pl | 91 +++++++++++++++++++--------------------- testbot/bin/WineRunReconfig.pl | 85 ++++++++++++++++++------------------- testbot/bin/WineRunTask.pl | 90 ++++++++++++++++++--------------------- 3 files changed, 125 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=4c9e159874c219053ce5…

1 0

Francois Gouget : testbot: Document the user account management procedures.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: eb909209aa2686f6fd5ba093e39fbb11b9ce35d6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=eb909209aa2686f6fd5ba093… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:37:38 2013 +0100 testbot: Document the user account management procedures. --- testbot/README | 25 +++++++++++++++++++++++++ testbot/doc/INSTALL.txt | 3 +++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/testbot/README b/testbot/README index 4f4cbc9..f15f82a 100644 --- a/testbot/README +++ b/testbot/README @@ -68,3 +68,28 @@ WineTestBot: --------------- See the doc/INSTALL.txt file. + + +5. USER ACCOUNT MANAGEMENT +-------------------------- + +When a user asks for an account, a provisional account is created immediately +but has to be 'activated' before it can be used. Also an email is sent to the +WineTestBot administrators. + +If the request is considered to be illegitimate / spam, the administrator +should directly delete the provisional account. Otherwise the account should +be approved. + +Approving the account will generate a 'password reset code' and send an email +to the user with a URL to visit to set the account password. That will activate +the account and make it usable. + + +Notes: +* Existing accounts can be suspended by unchecking the 'active' field. This + prevents the user from logging in and changing the password. +* Only accounts that have the 'wine-devel' role can submit jobs. So + administrators who also want to submit jobs should add it to their account + (see the doc/INSTALL.txt file). +* FIXME: Document how the LDAP integration works. diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 4c14668..a5655ec 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -58,6 +58,9 @@ General setup for the web site: the resetcode you just updated and a new password. - Make yourself admin by adding a row to UserRoles: mysql> insert into UserRoles values('<username>', 'admin'); +- If you want to be able to submit jobs from the same account you will likely + need to also give it the 'wine-devel' role: + mysql> insert into UserRoles values('<username>', wine-devel); - When you refresh the home page, you should now have an "Admin" menu in the sidebar.

1 0

Francois Gouget : testbot/TestAgent: Time the file transfers to provide speed statistics.
by Alexandre Julliard March 13, 2013

March 13, 2013

Module: tools Branch: master Commit: 0dede3eb003bb3682ec3ce22ba10fb8daa2880a2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0dede3eb003bb3682ec3ce22… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 15:33:45 2013 +0100 testbot/TestAgent: Time the file transfers to provide speed statistics. --- testbot/lib/WineTestBot/TestAgent.pm | 37 ++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 074e4f0..f3d5f0a 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -53,6 +53,36 @@ sub debug(@) print STDERR @_ if ($Debug); } +my $time_hires; +sub now() +{ + local $@; + $time_hires=eval { require Time::HiRes } if (!defined $time_hires); + return eval { Time::HiRes::time() } if ($time_hires); + return time(); +} + +sub trace_speed($$) +{ + if ($Debug) + { + my ($Bytes, $Elapsed) = @_; + my $Speed = ""; + if ($Elapsed) + { + $Speed = $Bytes * 8 / $Elapsed / 1000; + $Speed = $Speed < 1000 ? sprintf(" (%.1fKb/s)", $Speed) : + sprintf(" (%.1fMb/s)", $Speed / 1000); + } + $Bytes = $Bytes < 8 * 1024 ? "$Bytes bytes" : + $Bytes < 8 * 1024 * 1024 ? sprintf("%.1fKiB", $Bytes / 1024) : + sprintf("%.1fMiB", $Bytes / 1024 / 1024); + $Elapsed = $Elapsed < 1 ? sprintf("%.1fms", $Elapsed * 1000) : + sprintf("%.1fs", $Elapsed); + debug("Transferred $Bytes in $Elapsed$Speed\n"); + } +} + sub new($$$;$) { my ($class, $Hostname, $Port, $Tunnel) = @_; @@ -396,6 +426,7 @@ sub _RecvFile($$$) my $Size = $self->_ExpectEntryHeader('d'); return undef if (!defined $Size); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -421,6 +452,7 @@ sub _RecvFile($$$) } $Size -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); + $Bytes += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); @@ -437,6 +469,8 @@ sub _RecvFile($$$) $@ = "timed out while receiving '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; } @@ -701,6 +735,7 @@ sub _SendFile($$$) return undef if (!defined $self->{fd}); debug(" SendFile($Filename)\n"); + my ($Bytes, $Start) = (0, now()); my $Success; eval { @@ -743,6 +778,8 @@ sub _SendFile($$$) $@ = "timed out while sending '$Filename'" if ($@ =~ /^timeout /); $self->_SetError($FATAL, $@); } + + trace_speed($Bytes, now() - $Start); return $Success; }

1 0