October 2011 - Wine-Commits

Dmitry Timoshkov : ntdll: Take into account timezone bias changes when detecting daylight saving rules .
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: 0e44bda72a716a34106382f1b4ef5f376f28f267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e44bda72a716a34106382f1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 18 15:34:05 2011 +0900 ntdll: Take into account timezone bias changes when detecting daylight saving rules. --- dlls/ntdll/time.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 5a120f4..d233f23 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -728,18 +728,20 @@ static time_t find_dst_change(unsigned long min, unsigned long max, int *is_dst) static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) { static RTL_TIME_ZONE_INFORMATION cached_tzi; - static int current_year = -1; + static int current_year = -1, current_bias = 65535; struct tm *tm; time_t year_start, year_end, tmp, dlt = 0, std = 0; - int is_dst, current_is_dst; + int is_dst, current_is_dst, bias; RtlEnterCriticalSection( &TIME_tz_section ); year_start = time(NULL); - tm = localtime(&year_start); + tm = gmtime(&year_start); + bias = (LONG)(mktime(tm) - year_start) / 60; + tm = localtime(&year_start); current_is_dst = tm->tm_isdst; - if (current_year == tm->tm_year) + if (current_year == tm->tm_year && current_bias == bias) { *tzi = cached_tzi; RtlLeaveCriticalSection( &TIME_tz_section ); @@ -748,8 +750,11 @@ static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) memset(tzi, 0, sizeof(*tzi)); - TRACE("tz data will be valid through year %d\n", tm->tm_year + 1900); + TRACE("tz data will be valid through year %d, bias %d\n", tm->tm_year + 1900, bias); current_year = tm->tm_year; + current_bias = bias; + + tzi->Bias = bias; tm->tm_isdst = 0; tm->tm_mday = 1; @@ -764,10 +769,6 @@ static int init_tz_info(RTL_TIME_ZONE_INFORMATION *tzi) year_end = mktime(tm); TRACE("year_end: %s", ctime(&year_end)); - tm = gmtime(&year_start); - tzi->Bias = (LONG)(mktime(tm) - year_start) / 60; - TRACE("bias: %d\n", tzi->Bias); - tmp = find_dst_change(year_start, year_end, &is_dst); if (is_dst) dlt = tmp;

1 0

Piotr Caban : shell32: Don' t convert output parameter in SHBrowseForFolderA (Valgrind).
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: bfad4fa9673e533c5357f7a3b21532d3806ed564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfad4fa9673e533c5357f7a3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 15:23:26 2011 +0200 shell32: Don't convert output parameter in SHBrowseForFolderA (Valgrind). --- dlls/shell32/brsfolder.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 0a780b9..38195fe 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -1068,10 +1068,7 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi) bi.hwndOwner = lpbi->hwndOwner; bi.pidlRoot = lpbi->pidlRoot; if (lpbi->pszDisplayName) - { bi.pszDisplayName = HeapAlloc( GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, MAX_PATH ); - } else bi.pszDisplayName = NULL;

1 0

Dan Kegel : mlang/tests: Don't call lstrcpyW on a null string.
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: f91c8578bb6ccb8af25d08387bb48ad86529ec7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f91c8578bb6ccb8af25d08387… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Oct 17 08:24:40 2011 -0700 mlang/tests: Don't call lstrcpyW on a null string. --- dlls/mlang/tests/mlang.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 651d45a..42ad1f8 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1203,21 +1203,25 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) "#%02d: got '%s' (expected '%s')\n", i, rfc1766A, info_table[i].rfc1766); /* Some IE versions truncate an oversized name one character to short */ - lstrcpyW(short_broken_name, info_table[i].broken_name); - short_broken_name[MAX_LOCALE_NAME - 2] = '\0'; + if (info_table[i].broken_name) { + lstrcpyW(short_broken_name, info_table[i].broken_name); + short_broken_name[MAX_LOCALE_NAME - 2] = 0; + } if (info_table[i].todo & TODO_NAME) { todo_wine ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || + (info_table[i].broken_name && ( broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ - broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)), + broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)))), "#%02d: got %s (expected %s)\n", i, wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); } else ok( (!lstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || + (info_table[i].broken_name && ( broken(!lstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ - broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)), + broken(!lstrcmpW(prfc->wszLocaleName, short_broken_name)))), "#%02d: got %s (expected %s)\n", i, wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename));

1 0

Piotr Caban : shell32/tests: Fix uninitialized memory access (Valgrind).
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: 0655a6e56340c438c8de14d1e43978042a62894d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0655a6e56340c438c8de14d1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 15:23:49 2011 +0200 shell32/tests: Fix uninitialized memory access (Valgrind). --- dlls/shell32/tests/brsfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/brsfolder.c b/dlls/shell32/tests/brsfolder.c index 7b87967..f8e8e16 100644 --- a/dlls/shell32/tests/brsfolder.c +++ b/dlls/shell32/tests/brsfolder.c @@ -200,7 +200,7 @@ static void test_click_make_new_folder_button(void) bi.ulFlags = BIF_NEWDIALOGSTYLE; bi.lpfn = create_new_folder_callback; /* Use test folder as the root folder for dialog box */ - MultiByteToWideChar(CP_UTF8, 0, test_folder_path, MAX_PATH, + MultiByteToWideChar(CP_UTF8, 0, test_folder_path, -1, test_folder_pathW, MAX_PATH); hr = SHGetDesktopFolder(&test_folder_object); ok (SUCCEEDED(hr), "SHGetDesktopFolder failed with hr 0x%08x\n", hr);

1 0

Aric Stewart : user32: Use Uniscribe in the single line edit control.
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: acaa0dc2dacb4d6e6f223213ce9a1e27b0b8e8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=acaa0dc2dacb4d6e6f223213c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 17 09:07:06 2011 -0500 user32: Use Uniscribe in the single line edit control. --- dlls/user32/edit.c | 253 +++++++++++++++++++++++++++++----------------------- 1 files changed, 143 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acaa0dc2dacb4d6e6f223…

1 0

Francois Gouget : xcopy: Reorder the functions to avoid forward declarations.
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: 8a7bc4c727fe6330efdfbbb24e6666ee39364c0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7bc4c727fe6330efdfbbb24… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 18 16:43:04 2011 +0200 xcopy: Reorder the functions to avoid forward declarations. --- programs/xcopy/xcopy.c | 1335 ++++++++++++++++++++++++------------------------ 1 files changed, 660 insertions(+), 675 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a7bc4c727fe6330efdfb…

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::elementFromPoint implementation .
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: 3c4b2a0b43a13166711bfe26674550d79849b7db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c4b2a0b43a13166711bfe266… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 15:07:50 2011 +0200 mshtml: Added IHTMLDocument2::elementFromPoint implementation. --- dlls/mshtml/htmldoc.c | 34 ++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/htmldoc.c | 22 ++++++++++++++++++++-- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9af5c8f..9ab287d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1297,8 +1297,38 @@ static HRESULT WINAPI HTMLDocument_elementFromPoint(IHTMLDocument2 *iface, LONG IHTMLElement **elementHit) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%d %d %p)\n", This, x, y, elementHit); - return E_NOTIMPL; + nsIDOMNSDocument *nsdoc; + nsIDOMElement *nselem; + HTMLDOMNode *node; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%d %d %p)\n", This, x, y, elementHit); + + nsres = nsIDOMHTMLDocument_QueryInterface(This->doc_node->nsdoc, &IID_nsIDOMNSDocument, (void**)&nsdoc); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMNSDocument iface: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMNSDocument_ElementFromPoint(nsdoc, x, y, &nselem); + nsIDOMNSDocument_Release(nsdoc); + if(NS_FAILED(nsres)) { + ERR("ElementFromPoint failed: %08x\n", nsres); + return E_FAIL; + } + + if(!nselem) { + *elementHit = NULL; + return S_OK; + } + + hres = get_node(This->doc_node, (nsIDOMNode*)nselem, TRUE, &node); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + return IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)elementHit); } static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTMLWindow2 **p) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f7aef38..02c9eab 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -213,10 +213,10 @@ static const char *nav_url; static const char html_page[] = "<html>" "<head><link rel=\"stylesheet\" type=\"text/css\" href=\"test.css\"></head>" -"<body>test</body>" +"<body><div>test</div></body>" "</html>"; -static const char css_data[] = "body {color: red}"; +static const char css_data[] = "body {color: red; margin: 0}"; static const WCHAR http_urlW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; @@ -4429,6 +4429,23 @@ static void test_open_window(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } +static void test_elem_from_point(IHTMLDocument2 *doc) +{ + IHTMLElement *elem; + BSTR tag; + HRESULT hres; + + elem = NULL; + hres = IHTMLDocument2_elementFromPoint(doc, 3, 3, &elem); + ok(hres == S_OK, "elementFromPoint failed: %08x\n", hres); + ok(elem != NULL, "elem == NULL\n"); + + hres = IHTMLElement_get_tagName(elem, &tag); + IHTMLElement_Release(elem); + ok(hres == S_OK, "get_tagName failed: %08x\n", hres); + ok(!strcmp_wa(tag, "DIV"), "tag = %s\n", wine_dbgstr_w(tag)); +} + static void test_clear(IHTMLDocument2 *doc) { HRESULT hres; @@ -5526,6 +5543,7 @@ static void test_HTMLDocument(BOOL do_load) set_custom_uihandler(doc, &CustomDocHostUIHandler); test_download(DWL_CSS|DWL_TRYCSS); test_GetCurMoniker((IUnknown*)doc, &Moniker, NULL); + test_elem_from_point(doc); } test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED);

1 0

Austin English : d3d9/tests: Only skip the visual tests if d3d cannot be initialized on Windows.
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: c3f6f96df43e859c03b382ccb4f5b02ed23e9628 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f6f96df43e859c03b382ccb… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Oct 17 15:25:21 2011 -0700 d3d9/tests: Only skip the visual tests if d3d cannot be initialized on Windows. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 972f8d6..75132ff 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -174,7 +174,7 @@ static IDirect3DDevice9 *init_d3d9(void) d3d9_ptr = d3d9_create(D3D_SDK_VERSION); if (!d3d9_ptr) { - skip("could not create D3D9\n"); + win_skip("could not create D3D9\n"); return NULL; }

1 0

Jacek Caban : urlmon: Skip tests that fail on too old IEs.
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: ca293d442be8ad78c176f8ee82927e42b2cfc6e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca293d442be8ad78c176f8ee8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 18 15:16:29 2011 +0200 urlmon: Skip tests that fail on too old IEs. --- dlls/urlmon/tests/url.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6067f08..fe98089 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3622,15 +3622,17 @@ static void test_StdURLMoniker(void) ok(hres == S_OK, "CreateAsyncBindCtx failed: %08x\n\n", hres); CHECK_CALLED(QueryInterface_IServiceProvider); - unk = (void*)0xdeadbeef; - hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); - ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); - ok(!unk, "unk = %p\n", unk); + if(pCreateUri) { /* Skip these tests on old IEs */ + unk = (void*)0xdeadbeef; + hres = IMoniker_BindToStorage(mon, bctx, NULL, &IID_IStream, (void**)&unk); + ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(!unk, "unk = %p\n", unk); - unk = (void*)0xdeadbeef; - hres = IMoniker_BindToObject(mon, bctx, NULL, &IID_IUnknown, (void**)&unk); - ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); - ok(!unk, "unk = %p\n", unk); + unk = (void*)0xdeadbeef; + hres = IMoniker_BindToObject(mon, bctx, NULL, &IID_IUnknown, (void**)&unk); + ok(hres == MK_E_SYNTAX, "BindToStorage failed: %08x, expected MK_E_SYNTAX\n", hres); + ok(!unk, "unk = %p\n", unk); + } IMoniker_Release(mon); }

1 0

Piotr Caban : msvcrt: Initialize all ctype fields.
by Alexandre Julliard Oct. 18, 2011

Oct. 18, 2011

Module: wine Branch: master Commit: 0bb641ad59a279e9d2c9d0f2d402d0ab90479972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bb641ad59a279e9d2c9d0f2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 18 15:22:46 2011 +0200 msvcrt: Initialize all ctype fields. --- dlls/msvcrt/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c64e3d9..b196cee 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -805,6 +805,9 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) for(i=1; i<257; i++) { buf[0] = i-1; + /* builtin GetStringTypeA doesn't set output to 0 on invalid input */ + loc->locinfo->ctype1[i] = 0; + GetStringTypeA(lcid[MSVCRT_LC_CTYPE], CT_CTYPE1, buf, 1, loc->locinfo->ctype1+i); }

1 0