December 2011 - Wine-Commits

Francois Gouget : include: Don't import servprov.idl from urlhist.idl.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: d8c7c8017785739284410f8efc4c8fa8df4ca7f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c7c8017785739284410f8ef… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 21 14:23:50 2011 +0100 include: Don't import servprov.idl from urlhist.idl. --- include/urlhist.idl | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/urlhist.idl b/include/urlhist.idl index 0dde482..7d05901 100644 --- a/include/urlhist.idl +++ b/include/urlhist.idl @@ -20,7 +20,6 @@ import "objidl.idl"; import "oleidl.idl"; import "oaidl.idl"; import "docobj.idl"; -import "servprov.idl"; typedef enum _ADDURL_FLAG {

1 0

Detlef Riekenberg : ieframe: Improve status updates in BindStatusCallback_OnProgress.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 52b03c90e7d0afb6a4821284460cbb20e8734f62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b03c90e7d0afb6a48212844… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Dec 21 13:51:24 2011 +0100 ieframe: Improve status updates in BindStatusCallback_OnProgress. --- dlls/ieframe/ieframe.rc | 9 +++++++++ dlls/ieframe/navigate.c | 36 +++++++++++++++++++++++++++++------- dlls/ieframe/resource.h | 8 ++++++++ po/ar.po | 28 +++++++++++++++++++++++----- po/bg.po | 29 ++++++++++++++++++++++++----- po/ca.po | 30 +++++++++++++++++++++++++----- po/cs.po | 28 +++++++++++++++++++++++----- po/da.po | 29 ++++++++++++++++++++++++----- po/de.po | 30 +++++++++++++++++++++++++----- po/el.po | 28 +++++++++++++++++++++++----- po/en.po | 26 +++++++++++++++++++++----- po/en_US.po | 26 +++++++++++++++++++++----- po/eo.po | 28 +++++++++++++++++++++++----- po/es.po | 30 +++++++++++++++++++++++++----- po/fa.po | 28 +++++++++++++++++++++++----- po/fi.po | 29 ++++++++++++++++++++++++----- po/fr.po | 30 +++++++++++++++++++++++++----- po/he.po | 30 +++++++++++++++++++++++++----- po/hi.po | 28 +++++++++++++++++++++++----- po/hu.po | 29 ++++++++++++++++++++++++----- po/it.po | 30 +++++++++++++++++++++++++----- po/ja.po | 30 +++++++++++++++++++++++++----- po/ko.po | 30 +++++++++++++++++++++++++----- po/lt.po | 30 +++++++++++++++++++++++++----- po/ml.po | 28 +++++++++++++++++++++++----- po/nb_NO.po | 29 ++++++++++++++++++++++++----- po/nl.po | 30 +++++++++++++++++++++++++----- po/or.po | 28 +++++++++++++++++++++++----- po/pa.po | 28 +++++++++++++++++++++++----- po/pl.po | 30 +++++++++++++++++++++++++----- po/pt_BR.po | 30 +++++++++++++++++++++++++----- po/pt_PT.po | 30 +++++++++++++++++++++++++----- po/rm.po | 26 +++++++++++++++++++++----- po/ro.po | 29 ++++++++++++++++++++++++----- po/ru.po | 30 +++++++++++++++++++++++++----- po/sk.po | 36 +++++++++++++++++++++++++++++++----- po/sl.po | 30 +++++++++++++++++++++++++----- po/sr_RS(a)cyrillic.po | 30 +++++++++++++++++++++++++----- po/sr_RS(a)latin.po | 30 +++++++++++++++++++++++++----- po/sv.po | 30 +++++++++++++++++++++++++----- po/te.po | 28 +++++++++++++++++++++++----- po/th.po | 28 +++++++++++++++++++++++----- po/tr.po | 29 ++++++++++++++++++++++++----- po/uk.po | 30 +++++++++++++++++++++++++----- po/wa.po | 28 +++++++++++++++++++++++----- po/wine.pot | 26 +++++++++++++++++++++----- po/zh_CN.po | 29 ++++++++++++++++++++++++----- po/zh_TW.po | 29 ++++++++++++++++++++++++----- 48 files changed, 1128 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52b03c90e7d0afb6a4821…

1 0

Piotr Caban : msvcp90: Added partial collate<wchar_t> implementation.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: bb002e27b35bb4d7f5620f97bcebd0745a1b7efe URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb002e27b35bb4d7f5620f97b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:57:46 2011 +0100 msvcp90: Added partial collate<wchar_t> implementation. --- dlls/msvcp90/locale.c | 97 ++++++++++++++++++++++++++++++++------------- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 70 insertions(+), 29 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7b0fa5f..b8c4b11 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -833,14 +833,36 @@ extern const vtable_ptr MSVCP_collate_wchar_vtable; /* ??_7?$collate(a)G@std@@6B@ */ extern const vtable_ptr MSVCP_collate_short_vtable; +/* ?_Init@?$collate(a)_W@std@@IAEXABV_Locinfo(a)2@@Z */ +/* ?_Init@?$collate(a)_W@std@@IEAAXAEBV_Locinfo(a)2@@Z */ +/* ?_Init@?$collate(a)G@std@@IAEXABV_Locinfo(a)2@@Z */ +/* ?_Init@?$collate(a)G@std@@IEAAXAEBV_Locinfo(a)2@@Z */ +DEFINE_THISCALL_WRAPPER(collate_wchar__Init, 8) +void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) +{ + TRACE("(%p %p)\n", this, locinfo); + this->coll = _Locinfo__Getcoll(locinfo); +} + /* ??0?$collate(a)_W@std@@IAE(a)PBDI@Z */ /* ??0?$collate(a)_W@std@@IEAA(a)PEBD_K@Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_name, 12) collate* __thiscall collate_wchar_ctor_name(collate *this, const char *name, MSVCP_size_t refs) { - FIXME("(%p %s %lu) stub\n", this, name, refs); + _Lockit lockit; + _Locinfo locinfo; + + TRACE("(%p %s %lu)\n", this, name, refs); + + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + + _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); + _Locinfo_ctor_cstr(&locinfo, name); + collate_wchar__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + _Lockit_dtor(&lockit); + return this; } /* ??0?$collate(a)G@std@@IAE(a)PBDI@Z */ @@ -858,9 +880,12 @@ collate* __thiscall collate_short_ctor_name(collate *this, const char *name, MSV DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_locinfo, 12) collate* __thiscall collate_wchar_ctor_locinfo(collate *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + collate_wchar__Init(this, locinfo); + return this; } /* ??0?$collate(a)G@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -878,9 +903,7 @@ collate* __thiscall collate_short_ctor_locinfo(collate *this, _Locinfo *locinfo, DEFINE_THISCALL_WRAPPER(collate_wchar_ctor_refs, 8) collate* __thiscall collate_wchar_ctor_refs(collate *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + return collate_wchar_ctor_name(this, "C", refs); } /* ??0?$collate(a)G@std@@QAE(a)I@Z */ @@ -900,7 +923,7 @@ collate* __thiscall collate_short_ctor_refs(collate *this, MSVCP_size_t refs) DEFINE_THISCALL_WRAPPER(collate_wchar_dtor, 4) void __thiscall collate_wchar_dtor(collate *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); } DEFINE_THISCALL_WRAPPER(MSVCP_collate_wchar_vector_dtor, 8) @@ -934,9 +957,7 @@ collate* __thiscall MSVCP_collate_short_vector_dtor(collate *this, unsigned int DEFINE_THISCALL_WRAPPER(collate_wchar_ctor, 4) collate* __thiscall collate_wchar_ctor(collate *this) { - FIXME("(%p) stub\n", this); - this->facet.vtable = &MSVCP_collate_wchar_vtable; - return NULL; + return collate_wchar_ctor_name(this, "C", 0); } /* ??_F?$collate(a)G@std@@QAEXXZ */ @@ -955,18 +976,28 @@ collate* __thiscall collate_short_ctor(collate *this) /* ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z */ MSVCP_size_t __cdecl collate_wchar__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + *facet = MSVCRT_operator_new(sizeof(collate)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + collate_wchar_ctor_name((collate*)*facet, + MSVCP_basic_string_char_c_str(&loc->ptr->name), 0); + } + + return LC_COLLATE; } -/* ?_Init@?$collate(a)_W@std@@IAEXABV_Locinfo(a)2@@Z */ -/* ?_Init@?$collate(a)_W@std@@IEAAXAEBV_Locinfo(a)2@@Z */ -/* ?_Init@?$collate(a)G@std@@IAEXABV_Locinfo(a)2@@Z */ -/* ?_Init@?$collate(a)G@std@@IEAAXAEBV_Locinfo(a)2@@Z */ -DEFINE_THISCALL_WRAPPER(collate_wchar__Init, 8) -void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) +/* _Wcscoll */ +int __cdecl _Wcscoll(const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, + const wchar_t *last2, const _Collvec *coll) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%s %s)\n", debugstr_wn(first1, last1-first1), debugstr_wn(first2, last2-first2)); + return CompareStringW(coll->handle, 0, first1, last1-first1, first2, last2-first2)-2; } /* ?do_compare@?$collate(a)_W@std@@MBEHPB_W000(a)Z */ @@ -974,11 +1005,14 @@ void __thiscall collate_wchar__Init(collate *this, const _Locinfo *locinfo) /* ?do_compare@?$collate(a)G@std@@MBEHPBG000(a)Z */ /* ?do_compare@?$collate(a)G@std@@MEBAHPEBG000(a)Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_do_compare, 20) +#define call_collate_wchar_do_compare(this, first1, last1, first2, last2) CALL_VTBL_FUNC(this, 4, int, \ + (const collate*, const wchar_t*, const wchar_t*, const wchar_t*, const wchar_t*), \ + (this, first1, last1, first2, last2)) int __thiscall collate_wchar_do_compare(const collate *this, const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2) { - FIXME("(%p %p %p %p %p) stub\n", this, first1, last1, first2, last2); - return 0; + TRACE("(%p %p %p %p %p)\n", this, first1, last1, first2, last2); + return _Wcscoll(first1, last1, first2, last2, &this->coll); } /* ?compare@?$collate(a)_W@std@@QBEHPB_W000(a)Z */ @@ -989,8 +1023,8 @@ DEFINE_THISCALL_WRAPPER(collate_wchar_compare, 20) int __thiscall collate_wchar_compare(const collate *this, const wchar_t *first1, const wchar_t *last1, const wchar_t *first2, const wchar_t *last2) { - FIXME("(%p %p %p %p %p) stub\n", this, first1, last1, first2, last2); - return 0; + TRACE("(%p %p %p %p %p)\n", this, first1, last1, first2, last2); + return call_collate_wchar_do_compare(this, first1, last1, first2, last2); } /* ?do_hash@?$collate(a)_W@std@@MBEJPB_W0(a)Z */ @@ -998,11 +1032,18 @@ int __thiscall collate_wchar_compare(const collate *this, const wchar_t *first1, /* ?do_hash@?$collate(a)G@std@@MBEJPBG0(a)Z */ /* ?do_hash@?$collate(a)G@std@@MEBAJPEBG0(a)Z */ DEFINE_THISCALL_WRAPPER(collate_wchar_do_hash, 12) +#define call_collate_wchar_do_hash(this, first, last) CALL_VTBL_FUNC(this, 12, LONG, \ + (const collate*, const wchar_t*, const wchar_t*), (this, first, last)) LONG __thiscall collate_wchar_do_hash(const collate *this, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return 0; + ULONG ret = 0; + + TRACE("(%p %p %p)\n", this, first, last); + + for(; first<last; first++) + ret = (ret<<8 | ret>>24) + *first; + return ret; } /* ?hash@?$collate(a)_W@std@@QBEJPB_W0(a)Z */ @@ -1013,8 +1054,8 @@ DEFINE_THISCALL_WRAPPER(collate_wchar_hash, 12) LONG __thiscall collate_wchar_hash(const collate *this, const wchar_t *first, const wchar_t *last) { - FIXME("(%p %p %p) stub\n", this, first, last); - return 0; + TRACE("(%p %p %p)\n", this, first, last); + return call_collate_wchar_do_hash(this, first, last); } /* ?do_transform@?$collate(a)_W@std@@MBE?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)PB_W0@Z */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 687bacc..f53b579 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5803,7 +5803,7 @@ @ stub _Towlower @ stub _Towupper @ stub _Wcrtomb -@ stub _Wcscoll +@ cdecl _Wcscoll(ptr ptr ptr ptr ptr) @ stub _Wcsxfrm # extern _Xbig @ stub __Wcrtomb_lk

1 0

Piotr Caban : msvcp90: Added ctype<char> constructors implementation.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 72d18e01116e81b8c033b9dfdb76a22cf575a995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d18e01116e81b8c033b9dfd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 21 15:58:03 2011 +0100 msvcp90: Added ctype<char> constructors implementation. --- dlls/msvcp90/locale.c | 60 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b8c4b11..bf32d85 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -73,7 +73,7 @@ typedef struct { typedef struct { LCID handle; unsigned page; - short *table; + const short *table; int delfl; } _Ctypevec; @@ -477,18 +477,20 @@ _Ctypevec __cdecl _Getctype(void) { _Ctypevec ret; _locale_t locale = _get_current_locale(); + short *table; TRACE("\n"); ret.page = locale->locinfo->lc_codepage; ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; ret.delfl = TRUE; - ret.table = malloc(sizeof(short[256])); - if(!ret.table) { + table = malloc(sizeof(short[256])); + if(!table) { _free_locale(locale); throw_exception(EXCEPTION_BAD_ALLOC, NULL); } - memcpy(ret.table, locale->locinfo->pctype, sizeof(short[256])); + memcpy(table, locale->locinfo->pctype, sizeof(short[256])); + ret.table = table; _free_locale(locale); return ret; } @@ -1156,8 +1158,8 @@ extern const vtable_ptr MSVCP_ctype_char_vtable; /* ?_Id_func@?$ctype(a)D@std@@SAAEAVid(a)locale@2(a)XZ */ locale_id* __cdecl ctype_char__Id_func(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &ctype_char_id; } /* ?_Init@?$ctype(a)D@std@@IAEXABV_Locinfo(a)2@@Z */ @@ -1165,7 +1167,8 @@ locale_id* __cdecl ctype_char__Id_func(void) DEFINE_THISCALL_WRAPPER(ctype_char__Init, 8) void __thiscall ctype_char__Init(ctype_char *this, _Locinfo *locinfo) { - FIXME("(%p %p) stub\n", this, locinfo); + TRACE("(%p %p)\n", this, locinfo); + this->ctype = _Locinfo__Getctype(locinfo); } /* ?_Tidy@?$ctype(a)D@std@@IAEXXZ */ @@ -1173,15 +1176,18 @@ void __thiscall ctype_char__Init(ctype_char *this, _Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(ctype_char__Tidy, 4) void __thiscall ctype_char__Tidy(ctype_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + if(this->ctype.delfl) + free((short*)this->ctype.table); } /* ?classic_table@?$ctype(a)D@std@@KAPBFXZ */ /* ?classic_table@?$ctype(a)D@std@@KAPEBFXZ */ const short* __cdecl ctype_char_classic_table(void) { - FIXME("() stub\n"); - return NULL; + TRACE("()\n"); + return &((short*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_ctype"))[1]; } /* ??0?$ctype(a)D@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -1190,9 +1196,11 @@ DEFINE_THISCALL_WRAPPER(ctype_char_ctor_locinfo, 12) ctype_char* __thiscall ctype_char_ctor_locinfo(ctype_char *this, _Locinfo *locinfo, MSVCP_size_t refs) { - FIXME("(%p %p %lu) stub\n", this, locinfo, refs); + TRACE("(%p %p %lu)\n", this, locinfo, refs); + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_char_vtable; - return NULL; + ctype_char__Init(this, locinfo); + return this; } /* ??0?$ctype(a)D@std@@QAE(a)PBF_NI@Z */ @@ -1201,9 +1209,26 @@ DEFINE_THISCALL_WRAPPER(ctype_char_ctor_table, 16) ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, const short *table, MSVCP_bool delete, MSVCP_size_t refs) { - FIXME("(%p %p %d %lu) stub\n", this, table, delete, refs); + _Lockit lockit; + _Locinfo locinfo; + + TRACE("(%p %p %d %lu)\n", this, table, delete, refs); + + ctype_base_ctor_refs(&this->base, refs); this->base.facet.vtable = &MSVCP_ctype_char_vtable; - return NULL; + + _Lockit_ctor_locktype(&lockit, _LOCK_LOCALE); + _Locinfo_ctor(&locinfo); + ctype_char__Init(this, &locinfo); + _Locinfo_dtor(&locinfo); + _Lockit_dtor(&lockit); + + if(table) { + ctype_char__Tidy(this); + this->ctype.table = table; + this->ctype.delfl = delete; + } + return this; } /* ??_F?$ctype(a)D@std@@QAEXXZ */ @@ -1211,9 +1236,7 @@ ctype_char* __thiscall ctype_char_ctor_table(ctype_char *this, DEFINE_THISCALL_WRAPPER(ctype_char_ctor, 4) ctype_char* __thiscall ctype_char_ctor(ctype_char *this) { - FIXME("(%p) stub\n", this); - this->base.facet.vtable = &MSVCP_ctype_char_vtable; - return NULL; + return ctype_char_ctor_table(this, NULL, FALSE, 0); } /* ??1?$ctype(a)D@std@@MAE(a)XZ */ @@ -1221,7 +1244,8 @@ ctype_char* __thiscall ctype_char_ctor(ctype_char *this) DEFINE_THISCALL_WRAPPER(ctype_char_dtor, 4) void __thiscall ctype_char_dtor(ctype_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + ctype_char__Tidy(this); } DEFINE_THISCALL_WRAPPER(MSVCP_ctype_char_vector_dtor, 8)

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetInt() test.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: d984a524e7ceacca522fab8e62a754169d6ab18f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d984a524e7ceacca522fab8e6… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Dec 21 15:03:00 2011 +0100 d3dx9/tests: Add effect parameter value GetInt() test. --- dlls/d3dx9_36/tests/effect.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 517a7de..0fbe980 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -22,6 +22,33 @@ #include "d3dx9.h" /* helper functions */ +static inline INT get_int(D3DXPARAMETER_TYPE type, LPCVOID data) +{ + INT i; + + switch (type) + { + case D3DXPT_FLOAT: + i = *(FLOAT *)data; + break; + + case D3DXPT_INT: + i = *(INT *)data; + break; + + case D3DXPT_BOOL: + i = *(BOOL *)data; + break; + + default: + i = 0; + ok(0, "Unhandled type %x.\n", type); + break; + } + + return i; +} + static inline BOOL get_bool(LPCVOID data) { return (*(BOOL *)data) ? TRUE : FALSE; @@ -465,6 +492,8 @@ test_effect_parameter_value_data[] = #undef ADD_PARAMETER_VALUE #define EFFECT_PARAMETER_VALUE_ARRAY_SIZE 48 +/* Constants for special INT/FLOAT conversation */ +#define INT_FLOAT_MULTI 255.0f static void test_effect_parameter_value_GetValue(const struct test_effect_parameter_value_result *res, ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) @@ -574,6 +603,49 @@ static void test_effect_parameter_value_GetBoolArray(const struct test_effect_pa } } +static void test_effect_parameter_value_GetInt(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + INT ivalue = 0xabababab; + HRESULT hr; + + hr = effect->lpVtbl->GetInt(effect, parameter, &ivalue); + if (!res_desc->Elements && res_desc->Columns == 1 && res_desc->Rows == 1) + { + ok(hr == D3D_OK, "%u - %s: GetInt failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + ok(ivalue == get_int(res_desc->Type, res_value), "%u - %s: GetInt ivalue failed, got %i, expected %i\n", + i, res_full_name, ivalue, get_int(res_desc->Type, res_value)); + } + else if(!res_desc->Elements && res_desc->Type == D3DXPT_FLOAT && + ((res_desc->Class == D3DXPC_VECTOR && res_desc->Columns != 2) || + (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Rows != 2 && res_desc->Columns == 1))) + { + INT tmp; + + ok(hr == D3D_OK, "%u - %s: GetInt failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + tmp = (INT)(min(max(0.0f, *((FLOAT *)res_value + 2)), 1.0f) * INT_FLOAT_MULTI); + tmp += ((INT)(min(max(0.0f, *((FLOAT *)res_value + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; + tmp += ((INT)(min(max(0.0f, *((FLOAT *)res_value + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; + if (res_desc->Columns * res_desc->Rows > 3) + { + tmp += ((INT)(min(max(0.0f, *((FLOAT *)res_value + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; + } + + ok(ivalue == tmp, "%u - %s: GetInt ivalue failed, got %x, expected %x\n", + i, res_full_name, ivalue, tmp); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetInt failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + ok(ivalue == 0xabababab, "%u - %s: GetInt ivalue failed, got %i, expected %i\n", + i, res_full_name, ivalue, 0xabababab); + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -646,6 +718,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetValue(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBool(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetBoolArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetInt(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Jörg Höhle : winealsa.drv: Request ALSA period time to match MMDevAPI period time.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 54402a7c82017ec844a971b4a87c318713e3372b URL: http://source.winehq.org/git/wine.git/?a=commit;h=54402a7c82017ec844a971b4a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Dec 12 10:20:49 2011 -0600 winealsa.drv: Request ALSA period time to match MMDevAPI period time. --- dlls/winealsa.drv/mmdevdrv.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index dcf7d32..e79a7b6 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -939,14 +939,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } - alsa_period_us = duration / 100; /* duration / 10 converted to us */ + This->mmdev_period_rt = period; + alsa_period_us = This->mmdev_period_rt / 10; if((err = snd_pcm_hw_params_set_period_time_near(This->pcm_handle, - This->hw_params, &alsa_period_us, NULL)) < 0){ + This->hw_params, &alsa_period_us, NULL)) < 0) WARN("Unable to set period time near %u: %d (%s)\n", alsa_period_us, err, snd_strerror(err)); - hr = E_FAIL; - goto exit; - } if((err = snd_pcm_hw_params(This->pcm_handle, This->hw_params)) < 0){ WARN("Unable to set hw params: %d (%s)\n", err, snd_strerror(err)); @@ -960,7 +958,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, hr = E_FAIL; goto exit; } - TRACE("alsa_period_frames: %lu\n", This->alsa_period_frames); if((err = snd_pcm_hw_params_get_buffer_size(This->hw_params, &This->alsa_bufsize_frames)) < 0){ @@ -1008,8 +1005,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } - This->mmdev_period_rt = period; - /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room * with 120% of the period time. */ @@ -1063,6 +1058,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->initted = TRUE; + TRACE("ALSA period: %lu frames\n", This->alsa_period_frames); + TRACE("ALSA buffer: %lu frames\n", This->alsa_bufsize_frames); + TRACE("MMDevice period: %u frames\n", This->mmdev_period_frames); + TRACE("MMDevice buffer: %u frames\n", This->bufsize_frames); + exit: HeapFree(GetProcessHeap(), 0, sw_params); if(FAILED(hr)){

1 0

Francois Gouget : include: Import shtypes.idl in shdeprecated.idl.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 4378241ffec5fb6d81d4ca5ca06c773edc20d423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4378241ffec5fb6d81d4ca5ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 21 14:21:24 2011 +0100 include: Import shtypes.idl in shdeprecated.idl. --- include/shdeprecated.idl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 9a382d7..ec05f4f 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -20,6 +20,7 @@ import "objidl.idl"; import "ocidl.idl"; +import "shtypes.idl"; import "shobjidl.idl"; import "hlink.idl"; import "exdisp.idl";

1 0

Alexandre Julliard : msvcrt: Fix formatting of pointers in printf.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 88d632aec35185b024193a780093976c1177783c URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d632aec35185b024193a780… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 16:05:04 2011 +0100 msvcrt: Fix formatting of pointers in printf. --- dlls/msvcrt/printf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index fa3bdef..5c49739 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -485,7 +485,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API i = flags.Precision; flags.Precision = 2*sizeof(void*); FUNC_NAME(pf_integer_conv)(buf, sizeof(buf)/sizeof(APICHAR), &flags, - pf_args(args_ctx, pos, VT_INT, valist).get_int); + (ULONG_PTR)pf_args(args_ctx, pos, VT_PTR, valist).get_ptr); flags.PadZero = 0; flags.Precision = i;

1 0

Francois Gouget : include: indexsrv.idl should import oaidl, not objidl.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 8c9a67934b1724cb76a684bcdde5adfe1dccbb02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c9a67934b1724cb76a684bcd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 21 14:27:48 2011 +0100 include: indexsrv.idl should import oaidl, not objidl. --- include/indexsrv.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/indexsrv.idl b/include/indexsrv.idl index 397e691..3a272df 100644 --- a/include/indexsrv.idl +++ b/include/indexsrv.idl @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "objidl.idl"; +import "oaidl.idl"; /* FIXME: import "filter.idl"; */ /*

1 0

Gabriele Moabiti : wineconsole: Light and dark gray colors are exchanged in the user backend.
by Alexandre Julliard Dec. 21, 2011

Dec. 21, 2011

Module: wine Branch: master Commit: 70cdcba836aab1b417e11b1671fc858dc3ac389f URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cdcba836aab1b417e11b167… Author: Gabriele Moabiti <gabmoa(a)yahoo.it> Date: Tue Dec 20 22:35:33 2011 +0100 wineconsole: Light and dark gray colors are exchanged in the user backend. --- programs/wineconsole/user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index dafab16..46963ce 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -34,8 +34,8 @@ UINT g_uiDefaultCharset; const COLORREF WCUSER_ColorMap[16] = { RGB(0x00, 0x00, 0x00), RGB(0x00, 0x00, 0x80), RGB(0x00, 0x80, 0x00), RGB(0x00, 0x80, 0x80), - RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0x80, 0x80, 0x80), - RGB(0xC0, 0xC0, 0xC0), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), + RGB(0x80, 0x00, 0x00), RGB(0x80, 0x00, 0x80), RGB(0x80, 0x80, 0x00), RGB(0xC0, 0xC0, 0xC0), + RGB(0x80, 0x80, 0x80), RGB(0x00, 0x00, 0xFF), RGB(0x00, 0xFF, 0x00), RGB(0x00, 0xFF, 0xFF), RGB(0xFF, 0x00, 0x00), RGB(0xFF, 0x00, 0xFF), RGB(0xFF, 0xFF, 0x00), RGB(0xFF, 0xFF, 0xFF), };

1 0