November 2012 - Wine-commits

Jacek Caban : mshtml: Added IHTMLObjectElement:: name property implementation.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 1017c2b3ee44b0e520527fc40ea6b1d91fa56041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1017c2b3ee44b0e520527fc40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 7 12:55:28 2012 +0100 mshtml: Added IHTMLObjectElement::name property implementation. --- dlls/mshtml/htmlobject.c | 21 +++++++++++++++++---- dlls/mshtml/tests/dom.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index fc22419..9e9bbdd 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -162,15 +162,28 @@ static HRESULT WINAPI HTMLObjectElement_get_align(IHTMLObjectElement *iface, BST static HRESULT WINAPI HTMLObjectElement_put_name(IHTMLObjectElement *iface, BSTR v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLObjectElement_SetName(This->nsobject, &nsstr); + nsAString_Finish(&nsstr); + return NS_SUCCEEDED(nsres) ? S_OK : E_FAIL; } static HRESULT WINAPI HTMLObjectElement_get_name(IHTMLObjectElement *iface, BSTR *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLObjectElement_GetName(This->nsobject, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLObjectElement_put_codeBase(IHTMLObjectElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 26567d2..3f9bd5f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -56,7 +56,7 @@ static const char elem_test_str[] = "<textarea id=\"X\">text text</textarea>" "<table id=\"tbl\"><tbody><tr></tr><tr id=\"row2\"><td>td1 text</td><td>td2 text</td></tr></tbody></table>" "<script id=\"sc\" type=\"text/javascript\">\n</script>" - "<test /><object id=\"objid\" vspace=100></object><embed />" + "<test /><object id=\"objid\" name=\"objname\" vspace=100></object><embed />" "<img id=\"imgid\" name=\"WineImg\"/>" "<iframe src=\"about:blank\" id=\"ifr\"></iframe>" "<form id=\"frm\"></form>" @@ -1573,6 +1573,40 @@ static void _test_object_vspace(unsigned line, IUnknown *unk, LONG exl) IHTMLObjectElement_Release(object); } +#define test_object_name(a,b) _test_object_name(__LINE__,a,b) +static void _test_object_name(unsigned line, IHTMLElement *elem, const char *exname) +{ + IHTMLObjectElement *object = _get_object_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLObjectElement_get_name(object, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(str, exname), "name=%s, expected %s\n", wine_dbgstr_w(str), exname); + else + ok_(__FILE__,line)(!str, "name=%s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLObjectElement_Release(object); +} + +#define set_object_name(a,b) _set_object_name(__LINE__,a,b) +static void _set_object_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLObjectElement *object = _get_object_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = a2bstr(name); + hres = IHTMLObjectElement_put_name(object, str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(str); + IHTMLObjectElement_Release(object); + + _test_object_name(line, elem, name); +} + #define create_option_elem(d,t,v) _create_option_elem(__LINE__,d,t,v) static IHTMLOptionElement *_create_option_elem(unsigned line, IHTMLDocument2 *doc, const char *txt, const char *val) @@ -5914,6 +5948,9 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_object_vspace((IUnknown*)elem, 100); + test_object_name(elem, "objname"); + set_object_name(elem, "test"); + set_object_name(elem, NULL); IHTMLElement_Release(elem); }

1 0

Piotr Caban : msvcrt: Fixed __p___mb_cur_max tests.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 9c319baa6670219e4ea6c6ae35f238c087ef2094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c319baa6670219e4ea6c6ae3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 12:51:51 2012 +0100 msvcrt: Fixed __p___mb_cur_max tests. --- dlls/msvcrt/tests/locale.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 73eeb91..6b09cdf 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -745,6 +745,10 @@ static void test__Gettnames(void) static void test___mb_cur_max_func(void) { int mb_cur_max; + CPINFO cp; + + setlocale(LC_ALL, "C"); + GetCPInfo(CP_ACP, &cp); /* for newer Windows */ if(!p___mb_cur_max_func) @@ -768,7 +772,13 @@ static void test___mb_cur_max_func(void) win_skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); - ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + if (cp.MaxCharSize != 1) { + todo_wine ok(mb_cur_max == cp.MaxCharSize, "mb_cur_max = %d, expected %d\n", + mb_cur_max, cp.MaxCharSize); + } + else { + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + } /* some old Windows don't set chinese */ if (!setlocale(LC_ALL, "chinese"))

1 0

Piotr Caban : msvcp90: Fixed long long printing in tests.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 9b0ce65bb68e003436efdba8c05ca8948e4c262b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0ce65bb68e003436efdba8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:14:45 2012 +0100 msvcp90: Fixed long long printing in tests. --- dlls/msvcp90/tests/ios.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index d7b7d1f..4370f0e 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -828,7 +828,8 @@ static void test_num_get_get_uint64(void) next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %llu found %llu\n", (unsigned long long)tests[i].val, (unsigned long long)val); + ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), + (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); if(tests[i].lcl) @@ -854,7 +855,8 @@ static void test_num_get_get_uint64(void) nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %llu found %llu\n", (unsigned long long)tests[i].val, (unsigned long long)val); + ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), + (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus);

1 0

Piotr Caban : msvcp90: Destroy string returned by basic_stringbuf_char_str_get.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 654a3ec500f2bcb227c2c81a756947fe5d8504d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=654a3ec500f2bcb227c2c81a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:10 2012 +0100 msvcp90: Destroy string returned by basic_stringbuf_char_str_get. --- dlls/msvcp90/tests/ios.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 4370f0e..4875e85 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1094,6 +1094,7 @@ static void test_num_put_put_double(void) str = call_func1(p_basic_string_char_cstr, &pstr); ok(!strcmp(tests[i].str, str), "wrong output, expected = %s found = %s\n", tests[i].str, str); + call_func1(p_basic_string_char_dtor, &pstr); if(tests[i].lcl) call_func1(p_locale_dtor, &lcl); @@ -1120,6 +1121,7 @@ static void test_num_put_put_double(void) AtoW(wide, tests[i].str, strlen(tests[i].str)); ok(!lstrcmpW(wide, wstr), "wrong output, expected = %s found = %s\n", tests[i].str, wine_dbgstr_w(wstr)); + call_func1(p_basic_string_wchar_dtor, &pwstr); if(tests[i].lcl) call_func1(p_locale_dtor, &lcl);

1 0

Piotr Caban : msvcp: Fixed uninitialized variable access in num_get:: _Getffld and _Getifld functions.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 605ea649853743396cfecaee7067b7baf94482f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605ea649853743396cfecaee7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:29 2012 +0100 msvcp: Fixed uninitialized variable access in num_get::_Getffld and _Getifld functions. --- dlls/msvcp100/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp60/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp71/locale.c | 34 ++++++++++++++-------------------- dlls/msvcp90/locale.c | 34 ++++++++++++++-------------------- 4 files changed, 56 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=605ea649853743396cfec…

1 0

Piotr Caban : msvcp60: Fixed basic_streambuf class structure.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: f6542bbb96587e179a25f3991c25a3410acef7b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6542bbb96587e179a25f3991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:42 2012 +0100 msvcp60: Fixed basic_streambuf class structure. --- dlls/msvcp60/ios.c | 142 ++++++++++++++++++++++++-------------------------- dlls/msvcp60/msvcp.h | 4 +- 2 files changed, 71 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6542bbb96587e179a25f…

1 0

Hans Leidekker : msi: Return correct length for the empty string from deformat_string.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 462ec1ba435eb4e5178f029efb836afdef9c9ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ec1ba435eb4e5178f029ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:55:26 2012 +0100 msi: Return correct length for the empty string from deformat_string. --- dlls/msi/format.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 033f69c..756c4d1 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -1023,24 +1023,23 @@ done: } /* wrapper to resist a need for a full rewrite right now */ -DWORD deformat_string( MSIPACKAGE *package, const WCHAR *ptr, WCHAR **data ) +DWORD deformat_string( MSIPACKAGE *package, const WCHAR *fmt, WCHAR **data ) { - if (ptr) - { - DWORD len = 0; - MSIRECORD *rec = MSI_CreateRecord( 1 ); - - MSI_RecordSetStringW( rec, 0, ptr ); - MSI_FormatRecordW( package, rec, NULL, &len ); + DWORD len; + MSIRECORD *rec; - len++; - *data = msi_alloc( len * sizeof(WCHAR) ); - if (len > 1) MSI_FormatRecordW( package, rec, *data, &len ); - else *data[0] = 0; + *data = NULL; + if (!fmt) return 0; + if (!(rec = MSI_CreateRecord( 1 ))) return 0; + MSI_RecordSetStringW( rec, 0, fmt ); + MSI_FormatRecordW( package, rec, NULL, &len ); + if (!(*data = msi_alloc( ++len * sizeof(WCHAR) ))) + { msiobj_release( &rec->hdr ); - return len; + return 0; } - *data = NULL; - return 0; + MSI_FormatRecordW( package, rec, *data, &len ); + msiobj_release( &rec->hdr ); + return len; }

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWPALETTE.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 6eaf601dcecff03c46ff430733c930a932510aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaf601dcecff03c46ff43073… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:23 2012 +0100 ddraw: Avoid LPDIRECTDRAWPALETTE. --- include/ddraw.h | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaf601dcecff03c46ff4…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWCLIPPER.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 46524c8d7e21b6b86930a20f806c2c4f2cb5e798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46524c8d7e21b6b86930a20f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:24 2012 +0100 ddraw: Avoid LPDIRECTDRAWCLIPPER. --- include/ddraw.h | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=46524c8d7e21b6b86930a…

1 0

Henri Verbeet : ddraw/tests: Avoid LPDIRECTDRAW7.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 8fd29034d02f06566358f219e33324cc6076e858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd29034d02f06566358f219e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 6 22:13:25 2012 +0100 ddraw/tests: Avoid LPDIRECTDRAW7. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 75d3792..147e48c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -29,7 +29,7 @@ #include "d3d.h" #include "unknwn.h" -static LPDIRECTDRAW7 lpDD = NULL; +static IDirectDraw7 *lpDD; static LPDIRECT3D7 lpD3D = NULL; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth;

1 0