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