November 2014 - Wine-Commits

Stefan Dösinger : ddraw/tests: Test messages on focus loss.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: be01a7637dd823b99d113d1e80e51ecc60e086fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be01a7637dd823b99d113d1e8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:52 2014 +0100 ddraw/tests: Test messages on focus loss. --- dlls/ddraw/tests/ddraw1.c | 100 +++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 104 ++++++++++++++++++++++++++++++++-------------- 4 files changed, 290 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be01a7637dd823b99d113…

1 0

Stefan Dösinger : wined3d: Restore the display mode on focus change.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: f6dde7062413a1dfdd71acc92c5178ac66f3ade0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dde7062413a1dfdd71acc92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:57 2014 +0100 wined3d: Restore the display mode on focus change. --- dlls/d3d8/tests/device.c | 6 +-- dlls/d3d9/directx.c | 3 ++ dlls/d3d9/tests/d3d9ex.c | 6 +-- dlls/d3d9/tests/device.c | 6 +-- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddraw1.c | 8 ++-- dlls/ddraw/tests/ddraw2.c | 8 ++-- dlls/ddraw/tests/ddraw4.c | 8 ++-- dlls/ddraw/tests/ddraw7.c | 8 ++-- dlls/wined3d/device.c | 4 +- dlls/wined3d/directx.c | 92 +++++++++++++++++++++++++----------------- dlls/wined3d/swapchain.c | 36 ++++++++++++----- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 1 + 14 files changed, 115 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6dde7062413a1dfdd71a…

1 0

Stefan Dösinger : ddraw/tests: Test mode changes on focus loss and restore.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: a9e0ece68a5f0fe65910c80d30ab55e928d1a6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e0ece68a5f0fe65910c80d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:56 2014 +0100 ddraw/tests: Test mode changes on focus loss and restore. --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 20 ++++++++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9e0ece68a5f0fe65910c…

1 0

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

Nov. 19, 2014

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 : shlwapi: Fix incorrect usage of CompareString in StrRStrIA.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: 80d98683d02977f93def88254414b3210af558c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d98683d02977f93def88254… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:17:58 2014 +0100 shlwapi: Fix incorrect usage of CompareString in StrRStrIA. --- dlls/shlwapi/string.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index eaaaf3b..316dd3f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -585,6 +585,7 @@ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch) */ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) { + LPSTR lpszRet = NULL; WORD ch1, ch2; INT iLen; @@ -593,28 +594,28 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; - if (!lpszEnd) - lpszEnd = lpszStr + lstrlenA(lpszStr); - if (lpszEnd == lpszStr) - return NULL; - if (IsDBCSLeadByte(*lpszSearch)) ch1 = *lpszSearch << 8 | (UCHAR)lpszSearch[1]; else ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - do + if (!lpszEnd) + lpszEnd = lpszStr + lstrlenA(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenA(lpszEnd)); + + while (lpszStr + iLen <= lpszEnd && *lpszStr) { - lpszEnd = CharPrevA(lpszStr, lpszEnd); - ch2 = IsDBCSLeadByte(*lpszEnd)? *lpszEnd << 8 | (UCHAR)lpszEnd[1] : *lpszEnd; + ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | (UCHAR)lpszStr[1] : *lpszStr; if (!ChrCmpIA(ch1, ch2)) { - if (!StrCmpNIA(lpszEnd, lpszSearch, iLen)) - return (LPSTR)lpszEnd; + if (!StrCmpNIA(lpszStr, lpszSearch, iLen)) + lpszRet = (LPSTR)lpszStr; } - } while (lpszEnd > lpszStr); - return NULL; + lpszStr = CharNextA(lpszStr); + } + return lpszRet; } /*************************************************************************

1 0

Nikolay Sivov : ole32/tests: Release() doesn't return HRESULT code.
by Alexandre Julliard Nov. 19, 2014

Nov. 19, 2014

Module: wine Branch: master Commit: f7fdaf1c9fbced30b5145d43f036fccb5329c1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fdaf1c9fbced30b5145d43f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 09:40:37 2014 +0300 ole32/tests: Release() doesn't return HRESULT code. --- dlls/ole32/tests/moniker.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 1ff7159..695f67a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2022,9 +2022,7 @@ static void test_save_load_filemoniker(void) hr = IMoniker_Save(pMk, pStm, TRUE); ok_ole_success(hr, "IMoniker_Save"); - - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); + IMoniker_Release(pMk); /* overwrite the constants with various values */ hr = IStream_Seek(pStm, zero_pos, STREAM_SEEK_SET, NULL); @@ -2055,11 +2053,8 @@ static void test_save_load_filemoniker(void) hr = IMoniker_Load(pMk, pStm); ok_ole_success(hr, "IMoniker_Load"); - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); - - hr = IStream_Release(pStm); - ok_ole_success(hr, "IStream_Release"); + IMoniker_Release(pMk); + IStream_Release(pStm); } START_TEST(moniker)

1 0

Jacek Caban : mshtml: Added IHTMLFrameBase::get_src implementation.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

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

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

Nov. 18, 2014

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 IHTMLStyleSheet::cssText tests.
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

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

Nikolay Sivov : dwrite/tests: Some tests for ReadFileFragment().
by Alexandre Julliard Nov. 18, 2014

Nov. 18, 2014

Module: wine Branch: master Commit: e6cd0f7d8c4ad51135e0d56161258beb90905fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6cd0f7d8c4ad51135e0d5616… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 18 13:18:46 2014 +0300 dwrite/tests: Some tests for ReadFileFragment(). --- dlls/dwrite/tests/font.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ba916a9..ed43839 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2412,6 +2412,77 @@ static void test_CreateStreamFromKey(void) DeleteFileW(test_fontfile); } +static void test_ReadFileFragment(void) +{ + IDWriteLocalFontFileLoader *localloader; + IDWriteFontFileStream *stream; + IDWriteFontFileLoader *loader; + IDWriteFactory *factory; + IDWriteFontFile *file; + const void *fragment, *fragment2; + void *key, *context, *context2; + UINT64 filesize; + UINT32 size; + HRESULT hr; + + factory = create_factory(); + + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + key = NULL; + size = 0; + hr = IDWriteFontFile_GetReferenceKey(file, (const void**)&key, &size); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(size != 0, "got %u\n", size); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + IDWriteFontFileLoader_Release(loader); + + hr = IDWriteLocalFontFileLoader_CreateStreamFromKey(localloader, key, size, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFileStream_GetFileSize(stream, &filesize); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* reading past the end of the stream */ + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize+1, &context); +todo_wine { + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(context == NULL, "got %p\n", context); + ok(fragment == NULL, "got %p\n", fragment); +} + fragment = (void*)0xdeadbeef; + context = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, filesize, &context); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(context == NULL, "got %p\n", context); + ok(fragment != NULL, "got %p\n", fragment); + + fragment2 = (void*)0xdeadbeef; + context2 = (void*)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment2, 0, filesize, &context2); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(context2 == NULL, "got %p\n", context2); + ok(fragment == fragment2, "got %p, %p\n", fragment, fragment2); +} + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFileStream_ReleaseFileFragment(stream, context2); + + IDWriteFontFileStream_Release(stream); + IDWriteLocalFontFileLoader_Release(localloader); + IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); +} + START_TEST(font) { IDWriteFactory *factory; @@ -2444,6 +2515,7 @@ START_TEST(font) test_TryGetFontTable(); test_ConvertFontToLOGFONT(); test_CreateStreamFromKey(); + test_ReadFileFragment(); IDWriteFactory_Release(factory); }

1 0