November 2014 - Wine-commits

Sebastian Lackner : comctl32: Allow broken behaviour in StrRStr functions.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: 735e2cd7749b4d4aa1b46a6d2c6f4b54bd4efb33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=735e2cd7749b4d4aa1b46a6d2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:36:22 2014 +0100 comctl32: Allow broken behaviour in StrRStr functions. --- dlls/comctl32/string.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/string.c b/dlls/comctl32/string.c index 5e28b8f..112d9d3 100644 --- a/dlls/comctl32/string.c +++ b/dlls/comctl32/string.c @@ -674,18 +674,20 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; - if (!lpszEnd) - lpszEnd = lpszStr + lstrlenA(lpszStr); - if (IsDBCSLeadByte(*lpszSearch)) - ch1 = *lpszSearch << 8 | lpszSearch[1]; + ch1 = *lpszSearch << 8 | (UCHAR)lpszSearch[1]; else ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); + if (!lpszEnd) + lpszEnd = lpszStr + lstrlenA(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenA(lpszEnd)); + while (lpszStr + iLen <= lpszEnd && *lpszStr) { - ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | lpszStr[1] : *lpszStr; + ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | (UCHAR)lpszStr[1] : *lpszStr; if (!COMCTL32_ChrCmpIA(ch1, ch2)) { if (!StrCmpNIA(lpszStr, lpszSearch, iLen)) @@ -711,10 +713,13 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; + iLen = strlenW(lpszSearch); + if (!lpszEnd) lpszEnd = lpszStr + strlenW(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenW(lpszEnd)); - iLen = strlenW(lpszSearch); while (lpszStr + iLen <= lpszEnd && *lpszStr) {

1 0

Sebastian Lackner : reg.exe: Fix incorrect usage of CompareString in get_rootkey.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: f6b552324ee619d943d6caa659b5426c77c0faf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b552324ee619d943d6caa65… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:54:41 2014 +0100 reg.exe: Fix incorrect usage of CompareString in get_rootkey. --- programs/reg/reg.c | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index d299cbf..e9c7d16 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -67,6 +67,22 @@ static int reg_message(int msg) return reg_printfW(formatW, msg_buffer); } +static int reg_StrCmpNIW(LPCWSTR str, LPCWSTR comp, int len) +{ + int i; + + for (i = 0; i < len; i++) + { + if (!str[i]) + { + len = i + 1; + break; + } + } + + return CompareStringW(CP_ACP, NORM_IGNORECASE, str, len, comp, len) - CSTR_EQUAL; +} + static HKEY get_rootkey(LPWSTR key) { static const WCHAR szHKLM[] = {'H','K','L','M',0}; @@ -80,20 +96,20 @@ static HKEY get_rootkey(LPWSTR key) static const WCHAR szHKCC[] = {'H','K','C','C',0}; static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==CSTR_EQUAL) + if (!reg_StrCmpNIW(key, szHKLM, 4) || + !reg_StrCmpNIW(key, szHKEY_LOCAL_MACHINE, 18)) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKCU, 4) || + !reg_StrCmpNIW(key, szHKEY_CURRENT_USER, 17)) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKCR, 4) || + !reg_StrCmpNIW(key, szHKEY_CLASSES_ROOT, 17)) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKU, 3) || + !reg_StrCmpNIW(key, szHKEY_USERS, 10)) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==CSTR_EQUAL || - CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==CSTR_EQUAL) + else if (!reg_StrCmpNIW(key, szHKCC, 4) || + !reg_StrCmpNIW(key, szHKEY_CURRENT_CONFIG, 19)) return HKEY_CURRENT_CONFIG; else return NULL; }

1 0

Sebastian Lackner : regedit: Fix incorrect usage of CompareString in parseKeyName.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: fb37d215cd31bcd0adafa87c1d216027cff028db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb37d215cd31bcd0adafa87c1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:55:58 2014 +0100 regedit: Fix incorrect usage of CompareString in parseKeyName. --- programs/regedit/regproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 1adeddf..80beb21 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -320,7 +320,7 @@ static BOOL parseKeyName(LPWSTR lpKeyName, HKEY *hKey, LPWSTR *lpKeyPath) *hKey = NULL; for (i = 0; i < REG_CLASS_NUMBER; i++) { - if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], len) == CSTR_EQUAL && + if (CompareStringW(LOCALE_USER_DEFAULT, 0, lpKeyName, len, reg_class_namesW[i], -1) == CSTR_EQUAL && len == lstrlenW(reg_class_namesW[i])) { *hKey = reg_class_keys[i]; break;

1 0

Nikolay Sivov : dwrite: Handle Unicode platform when looking for name record codepage.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: c457d0f107e3893bccf3dc6d9254ec8fba197f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c457d0f107e3893bccf3dc6d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 13:52:09 2014 +0300 dwrite: Handle Unicode platform when looking for name record codepage. --- dlls/dwrite/opentype.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c893227..1f5e178 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -930,6 +930,8 @@ static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT UINT codepage = 0; switch (platform) { + case OPENTYPE_PLATFORM_UNICODE: + break; case OPENTYPE_PLATFORM_MAC: switch (encoding) {

1 0

Nikolay Sivov : dwrite: Implement SetCurrentTransform() for bitmap render target.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: 9db50228dd3dcda87f1b678a7fd99f5e5e82fea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db50228dd3dcda87f1b678a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 15:35:50 2014 +0300 dwrite: Implement SetCurrentTransform() for bitmap render target. --- dlls/dwrite/gdiinterop.c | 18 +++++++++++++----- dlls/dwrite/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 3715bf0..1496efd 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -31,6 +31,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +static const DWRITE_MATRIX identity = +{ + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f +}; + struct gdiinterop { IDWriteGdiInterop IDWriteGdiInterop_iface; IDWriteFactory *factory; @@ -171,8 +178,11 @@ static HRESULT WINAPI rendertarget_GetCurrentTransform(IDWriteBitmapRenderTarget static HRESULT WINAPI rendertarget_SetCurrentTransform(IDWriteBitmapRenderTarget *iface, DWRITE_MATRIX const *transform) { struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget(iface); - FIXME("(%p)->(%p): stub\n", This, transform); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, transform); + + This->m = transform ? *transform : identity; + return S_OK; } static HRESULT WINAPI rendertarget_GetSize(IDWriteBitmapRenderTarget *iface, SIZE *size) @@ -233,9 +243,7 @@ static HRESULT create_rendertarget(HDC hdc, UINT32 width, UINT32 height, IDWrite return hr; } - target->m.m11 = target->m.m22 = 1.0; - target->m.m12 = target->m.m21 = 0.0; - target->m.dx = target->m.dy = 0.0; + target->m = identity; target->pixels_per_dip = 1.0; *ret = &target->IDWriteBitmapRenderTarget_iface; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ed43839..cc0b23c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -666,6 +666,25 @@ if (0) /* crashes on native */ ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + memset(&m, 0, sizeof(m)); + hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&m, 0xcc, sizeof(m)); + hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(m.m11 == 0.0 && m.m22 == 0.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); + ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + + hr = IDWriteBitmapRenderTarget_SetCurrentTransform(target, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&m, 0xcc, sizeof(m)); + hr = IDWriteBitmapRenderTarget_GetCurrentTransform(target, &m); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(m.m11 == 1.0 && m.m22 == 1.0 && m.m12 == 0.0 && m.m21 == 0.0, "got %.1f,%.1f,%.1f,%.1f\n", m.m11, m.m22, m.m12, m.m21); + ok(m.dx == 0.0 && m.dy == 0.0, "got %.1f,%.1f\n", m.dx, m.dy); + /* pixels per dip */ pdip = IDWriteBitmapRenderTarget_GetPixelsPerDip(target); ok(pdip == 1.0, "got %.2f\n", pdip);

1 0

Hans Leidekker : ieframe: Send command state change notifications from history navigation handlers.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: d22928fb3cf57cb29ba7c6fbdda0f097af7d038e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22928fb3cf57cb29ba7c6fbd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 19 13:40:49 2014 +0100 ieframe: Send command state change notifications from history navigation handlers. --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 35 ++++++++ dlls/ieframe/oleobject.c | 3 + dlls/ieframe/tests/webbrowser.c | 173 +++++++++++++++++++++++++++++++++++----- 4 files changed, 191 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d22928fb3cf57cb29ba7c…

1 0

Jacek Caban : mshtml: Added IHTMLStyleSheet::cssText tests.
by Alexandre Julliard 18 Nov '14

18 Nov '14

Module: wine Branch: master Commit: 90017fb3d80898c7b53520c96182f7a6bb590db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90017fb3d80898c7b53520c96… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:04:17 2014 +0100 mshtml: Added IHTMLStyleSheet::cssText tests. --- dlls/mshtml/tests/dom.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 39c3a7d..978b79c 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -478,6 +478,20 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(stra, buf); } +static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) +{ + int len, prefix_len; + CHAR buf[512]; + + len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL)-1; + prefix_len = lstrlenA(prefix); + if(len < prefix_len) + return FALSE; + + buf[prefix_len] = 0; + return !lstrcmpA(buf, prefix); +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -2155,8 +2169,8 @@ static void _test_range_paste_html(unsigned line, IHTMLTxtRange *range, const ch HRESULT hres; hres = IHTMLTxtRange_pasteHTML(range, str); - ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); - SysFreeString(str); + ok_(__FILE__,line)(hres == S_OK, "pasteHTML failed: %08x\n", hres); + SysFreeString(str); } #define test_range_parent(r,t) _test_range_parent(__LINE__,r,t) @@ -6911,6 +6925,43 @@ static void test_iframe_elem(IHTMLElement *elem) IHTMLDocument2_Release(content_doc); } +#define test_stylesheet_csstext(a,b,c) _test_stylesheet_csstext(__LINE__,a,b,c) +static void _test_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *exstr, BOOL is_todo) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLStyleSheet_get_cssText(stylesheet, &str); + ok_(__FILE__,line)(hres == S_OK, "get_cssText failed: %08x\n", hres); + if(!is_todo) { + if(exstr) + ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); + }else todo_wine { + if(exstr) + ok_(__FILE__,line)(is_prefix_wa(str, exstr), "cssText = %s\n", wine_dbgstr_w(str)); + else + ok_(__FILE__,line)(!str, "cssText = %s\n", wine_dbgstr_w(str)); + } + + SysFreeString(str); +} + +#define set_stylesheet_csstext(a,b,c) _set_stylesheet_csstext(__LINE__,a,b,c) +static void _set_stylesheet_csstext(unsigned line, IHTMLStyleSheet *stylesheet, const char *csstext, BOOL is_todo) +{ + BSTR str = a2bstr(csstext); + HRESULT hres; + + hres = IHTMLStyleSheet_put_cssText(stylesheet, str); + if(!is_todo) + ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + else + todo_wine ok_(__FILE__,line)(hres == S_OK, "put_cssText failed: %08x\n", hres); + SysFreeString(str); +} + static void test_stylesheet(IDispatch *disp) { IHTMLStyleSheetRulesCollection *col = NULL; @@ -6936,6 +6987,14 @@ static void test_stylesheet(IDispatch *disp) ok(href == NULL, "got href != NULL\n"); SysFreeString(href); + test_stylesheet_csstext(stylesheet, ".body {", FALSE); + set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }\n.body { margin-right: 2px; }", TRUE); + test_stylesheet_csstext(stylesheet, ".div {", TRUE); + set_stylesheet_csstext(stylesheet, "", FALSE); + test_stylesheet_csstext(stylesheet, NULL, FALSE); + set_stylesheet_csstext(stylesheet, ".div { margin-right: 1px; }", FALSE); + test_stylesheet_csstext(stylesheet, ".div {", FALSE); + IHTMLStyleSheet_Release(stylesheet); }

1 0

Jacek Caban : mshtml: Added support for IHTMLFrameBase:: put_src call on detached element.
by Alexandre Julliard 18 Nov '14

18 Nov '14

Module: wine Branch: master Commit: 49c7277505edfad6488a05d66f593bb5e03f87d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49c7277505edfad6488a05d66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:00:58 2014 +0100 mshtml: Added support for IHTMLFrameBase::put_src call on detached element. --- dlls/mshtml/htmlframebase.c | 17 +++++++++++++++-- dlls/mshtml/tests/nav_test.html | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 9808379..e0c64f4 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -134,8 +134,21 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); if(!This->content_window || !This->element.node.doc || !This->element.node.doc->basedoc.window) { - FIXME("detached element\n"); - return E_FAIL; + nsAString nsstr; + nsresult nsres; + + nsAString_InitDepend(&nsstr, v); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetSrc(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_SetSrc(This->nsiframe, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetSrc failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } return navigate_url(This->content_window, v, This->element.node.doc->basedoc.window->uri, BINDING_NAVIGATED); diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index 536b238..11c4c0c 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -43,9 +43,24 @@ function window_navigate_test() { iframe.contentWindow.navigate("about:blank"); } +function detached_src_test() { + var iframe = document.createElement("iframe"); + var onload_called = false; + + iframe.onload = function() { + onload_called = true; + next_test(); + } + + iframe.src = "blank.html"; + document.body.appendChild(iframe); + ok(onload_called === false, "called onload too early?"); +} + var tests = [ nav_back_test, window_navigate_test, + detached_src_test, function() { external.reportSuccess(); } ];

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase::get_src implementation.
by Alexandre Julliard 18 Nov '14

18 Nov '14

Module: wine Branch: master Commit: 516ed8e71297e105ee71c7a48f88cd5e2803388f URL: http://source.winehq.org/git/wine.git/?a=commit;h=516ed8e71297e105ee71c7a48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 18 15:01:10 2014 +0100 mshtml: Added IHTMLFrameBase::get_src implementation. --- dlls/mshtml/htmlframebase.c | 18 ++++++++++++++++-- dlls/mshtml/tests/dom.c | 23 +++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index e0c64f4..bd5c1de 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -157,8 +157,22 @@ static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached frame object\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&nsstr, NULL); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_GetSrc(This->nsframe, &nsstr); + else + nsres = nsIDOMHTMLIFrameElement_GetSrc(This->nsiframe, &nsstr); + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 978b79c..f0896f6 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5283,6 +5283,27 @@ static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const ch IHTMLFrameBase_Release(fbase); } +#define test_framebase_src(a,b) _test_framebase_src(__LINE__,a,b) +static void _test_framebase_src(unsigned line, IHTMLElement *elem, const char *src) +{ + BSTR str = (void*)0xdeadbeef; + IHTMLFrameBase *fbase; + HRESULT hres; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + hres = IHTMLFrameBase_get_src(fbase, &str); + ok_(__FILE__,line)(hres == S_OK, "IHTMLFrameBase_get_src failed: 0x%08x\n", hres); + if(src) + ok_(__FILE__,line)(!strcmp_wa(str, src), "src = %s, expected %s\n", wine_dbgstr_w(str), src); + else + ok_(__FILE__,line)(!str, "src = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLFrameBase_Release(fbase); +} + #define test_framebase_marginheight(a,b) _test_framebase_marginheight(__LINE__,a,b) static void _test_framebase_marginheight(unsigned line, IHTMLFrameBase *framebase, const char *exval) { @@ -6890,6 +6911,7 @@ static void test_iframe_elem(IHTMLElement *elem) set_iframe_width(elem, "150px"); set_iframe_width(elem, "70%"); test_iframe_width(elem, "70%"); + test_framebase_src(elem, "about:blank"); str = a2bstr("text/html"); V_VT(&errv) = VT_ERROR; @@ -8636,6 +8658,7 @@ static void test_frameset(IHTMLDocument2 *doc) test_framebase_put_name(elem, "frame name"); test_framebase_put_name(elem, NULL); test_framebase_put_name(elem, "nm1"); + test_framebase_src(elem, "about:blank"); IHTMLElement_Release(elem); /* get_name with no name attr */

1 0

Sebastian Lackner : server: Avoid leaking file descriptor on error in create_thread function.
by Alexandre Julliard 18 Nov '14

18 Nov '14

Module: wine Branch: master Commit: 0e2e9e4efcaf72d1f50efc6fec8ca402951d1006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2e9e4efcaf72d1f50efc6fe… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Nov 17 19:23:13 2014 +0100 server: Avoid leaking file descriptor on error in create_thread function. --- server/thread.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/thread.c b/server/thread.c index 97860ee..ba3f1d5 100644 --- a/server/thread.c +++ b/server/thread.c @@ -219,11 +219,16 @@ struct thread *create_thread( int fd, struct process *process ) if (process->is_terminating) { + close( fd ); set_error( STATUS_PROCESS_IS_TERMINATING ); return NULL; } - if (!(thread = alloc_object( &thread_ops ))) return NULL; + if (!(thread = alloc_object( &thread_ops ))) + { + close( fd ); + return NULL; + } init_thread_structure( thread ); @@ -236,6 +241,7 @@ struct thread *create_thread( int fd, struct process *process ) if (!(thread->id = alloc_ptid( thread ))) { + close( fd ); release_object( thread ); return NULL; }

1 0