September 2017 - Wine-Commits

Alex Henrie : shell32/tests: Add tests for FolderItems_Item and FolderItems_get_Count.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 02efd35ce2a14ad7118f6c0bfa06966c82211b46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02efd35ce2a14ad7118f6c0bf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 11 23:16:40 2017 -0600 shell32/tests: Add tests for FolderItems_Item and FolderItems_get_Count. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/Makefile.in | 2 +- dlls/shell32/tests/shelldispatch.c | 322 ++++++++++++++++++++++++++++++++++--- 2 files changed, 302 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02efd35ce2a14ad7118f6…

1 0

Nikolay Sivov : usp10/tests: Remove workarounds that are no longer useful.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 3d1b4d37382c059ad968d99f07ac083066869189 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d1b4d37382c059ad968d99f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 20:15:33 2017 +0300 usp10/tests: Remove workarounds that are no longer useful. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index e562c5c..524c47f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -58,8 +58,6 @@ static HRESULT (WINAPI *pScriptItemizeOpenType)( const WCHAR *pwcInChars, int cI static HRESULT (WINAPI *pScriptShapeOpenType)( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, OPENTYPE_TAG tagLangSys, int *rcRangeChars, TEXTRANGE_PROPERTIES **rpRangeProperties, int cRanges, const WCHAR *pwcChars, int cChars, int cMaxGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProps, WORD *pwOutGlyphs, SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs); -static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); - static HRESULT (WINAPI *pScriptGetFontScriptTags)( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags); static HRESULT (WINAPI *pScriptGetFontLanguageTags)( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, int cMaxTags, OPENTYPE_TAG *pLangSysTags, int *pcTags); static HRESULT (WINAPI *pScriptGetFontFeatureTags)( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, OPENTYPE_TAG tagLangSys, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags); @@ -600,8 +598,6 @@ static void test_ScriptItemize( void ) HRESULT hr; int nItems; - pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); - memset(&Control, 0, sizeof(Control)); memset(&State, 0, sizeof(State)); @@ -1313,7 +1309,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co WORD glyph = 0; *origFont = SelectObject(hdc,*hfont); - if (pGetGlyphIndicesW && (pGetGlyphIndicesW(hdc, &check, 1, &glyph, 0) == GDI_ERROR || glyph ==0)) + if (GetGlyphIndicesW(hdc, &check, 1, &glyph, 0) == GDI_ERROR || glyph == 0) { winetest_trace(" Font fails to contain required glyphs\n"); SelectObject(hdc,*origFont); @@ -2538,12 +2534,6 @@ static void test_ScriptGetFontProperties(HDC hdc) ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); - if (!pGetGlyphIndicesW) - { - win_skip("Skip on WINNT4\n"); - return; - } memset(&lf, 0, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; efnd.total = 0; @@ -2577,7 +2567,7 @@ static void test_ScriptGetFontProperties(HDC hdc) ret = GetTextMetricsA(hdc, &tmA); ok(ret != 0, "GetTextMetricsA failed!\n"); - ret = pGetGlyphIndicesW(hdc, invalids, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ret = GetGlyphIndicesW(hdc, invalids, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); ok(sfp.wgBlank == tmA.tmBreakChar || sfp.wgBlank == gi[0], "bitmap font %s wgBlank %04x tmBreakChar %04x Space %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar, gi[0]); @@ -2623,13 +2613,13 @@ static void test_ScriptGetFontProperties(HDC hdc) } str[0] = 0x0020; /* U+0020: numeric space */ - ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ret = GetGlyphIndicesW(hdc, str, 1, gi, 0); ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); ok(sfp.wgBlank == gi[0], "truetype font %s wgBlank %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgBlank, gi[0]); ok(sfp.wgDefault == 0 || broken(is_arabic), "truetype font %s wgDefault %04x\n", lf.lfFaceName, sfp.wgDefault); - ret = pGetGlyphIndicesW(hdc, invalids, 3, gi, GGI_MARK_NONEXISTING_GLYPHS); + ret = GetGlyphIndicesW(hdc, invalids, 3, gi, GGI_MARK_NONEXISTING_GLYPHS); ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); if (gi[2] != 0xFFFF) /* index of default non exist char */ ok(sfp.wgInvalid == gi[2], "truetype font %s wgInvalid %04x gi[2] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[2]); @@ -2641,7 +2631,7 @@ static void test_ScriptGetFontProperties(HDC hdc) ok(sfp.wgInvalid == 0, "truetype font %s wgInvalid %04x expect 0\n", lf.lfFaceName, sfp.wgInvalid); str[0] = 0x0640; /* U+0640: kashida */ - ret = pGetGlyphIndicesW(hdc, str, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ret = GetGlyphIndicesW(hdc, str, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); is_arial = !lstrcmpA(lf.lfFaceName, "Arial"); is_times_new_roman= !lstrcmpA(lf.lfFaceName, "Times New Roman"); @@ -3649,27 +3639,10 @@ static void test_digit_substitution(void) LGRPID_GEORGIAN, LGRPID_ARMENIAN }; - HMODULE hKernel32; - static BOOL (WINAPI * pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROCA,LGRPID,DWORD,LONG_PTR); - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pEnumLanguageGroupLocalesA = (void*)GetProcAddress(hKernel32, "EnumLanguageGroupLocalesA"); - - if (!pEnumLanguageGroupLocalesA) - { - win_skip("EnumLanguageGroupLocalesA not available on this platform\n"); - return; - } for (i = 0; i < sizeof(groups)/sizeof(groups[0]); i++) { - ret = pEnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0); - if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - win_skip("EnumLanguageGroupLocalesA not implemented on this platform\n"); - break; - } - + ret = EnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0); ok(ret, "EnumLanguageGroupLocalesA failed unexpectedly: %u\n", GetLastError()); } }

1 0

Nikolay Sivov : usp10/tests: Move initialization to a separate function, add another ScriptShape() test.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 8b880d05d612383fb4d10bed8ef53ecdef153e25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b880d05d612383fb4d10bed8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 11 20:15:32 2017 +0300 usp10/tests: Move initialization to a separate function, add another ScriptShape() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 54d7ba7..e562c5c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -598,13 +598,8 @@ static void test_ScriptItemize( void ) SCRIPT_CONTROL Control; SCRIPT_STATE State; HRESULT hr; - HMODULE usp10; int nItems; - usp10 = LoadLibraryA("usp10.dll"); - ok (usp10 != 0,"Unable to LoadLibrary on usp10.dll\n"); - pScriptItemizeOpenType = (void*)GetProcAddress(usp10, "ScriptItemizeOpenType"); - pScriptShapeOpenType = (void*)GetProcAddress(usp10, "ScriptShapeOpenType"); pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); memset(&Control, 0, sizeof(Control)); @@ -1810,6 +1805,7 @@ static void test_ScriptShape(HDC hdc) { static const WCHAR test1[] = {'w', 'i', 'n', 'e',0}; static const WCHAR test2[] = {0x202B, 'i', 'n', 0x202C,0}; + static const WCHAR test3[] = {0x30b7}; HRESULT hr; SCRIPT_CACHE sc = NULL; WORD glyphs[4], glyphs2[4], logclust[4], glyphs3[4]; @@ -2041,6 +2037,23 @@ static void test_ScriptShape(HDC hdc) DeleteObject(SelectObject(hdc, oldfont)); ScriptFreeCache(&sc); } + + /* Text does not support this range. */ + memset(items, 0, sizeof(items)); + nb = 0; + hr = ScriptItemize(test3, sizeof(test3)/sizeof(test3[0]), sizeof(items)/sizeof(items[0]), NULL, NULL, items, &nb); + ok(hr == S_OK, "ScriptItemize failed, hr %#x.\n", hr); + ok(items[0].a.eScript > 0, "Expected script id.\n"); + ok(nb == 1, "Unexpected number of items.\n"); + + memset(glyphs, 0xff, sizeof(glyphs)); + nb = 0; + hr = ScriptShape(hdc, &sc, test3, sizeof(test3)/sizeof(test3[0]), sizeof(glyphs)/sizeof(glyphs[0]), &items[0].a, + glyphs, logclust, attrs, &nb); + ok(hr == S_OK, "ScriptShape failed, hr %#x.\n", hr); + ok(nb == 1, "Unexpected glyph count %u\n", nb); + ok(glyphs[0] == 0, "Unexpected glyph id\n"); + ScriptFreeCache(&sc); } static void test_ScriptPlace(HDC hdc) @@ -3777,9 +3790,6 @@ static void test_newlines(void) static void test_ScriptGetFontFunctions(HDC hdc) { HRESULT hr; - pScriptGetFontScriptTags = (void*)GetProcAddress(GetModuleHandleA("usp10.dll"), "ScriptGetFontScriptTags"); - pScriptGetFontLanguageTags = (void*)GetProcAddress(GetModuleHandleA("usp10.dll"), "ScriptGetFontLanguageTags"); - pScriptGetFontFeatureTags = (void*)GetProcAddress(GetModuleHandleA("usp10.dll"), "ScriptGetFontFeatureTags"); if (!pScriptGetFontScriptTags || !pScriptGetFontLanguageTags || !pScriptGetFontFeatureTags) { win_skip("ScriptGetFontScriptTags,ScriptGetFontLanguageTags or ScriptGetFontFeatureTags not available on this platform\n"); @@ -4005,6 +4015,19 @@ static void test_ScriptIsComplex(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); } +static void init_tests(void) +{ + HMODULE module = GetModuleHandleA("usp10.dll"); + + ok(module != 0, "Expected usp10.dll to be loaded.\n"); + + pScriptItemizeOpenType = (void *)GetProcAddress(module, "ScriptItemizeOpenType"); + pScriptShapeOpenType = (void *)GetProcAddress(module, "ScriptShapeOpenType"); + pScriptGetFontScriptTags = (void *)GetProcAddress(module, "ScriptGetFontScriptTags"); + pScriptGetFontLanguageTags = (void *)GetProcAddress(module, "ScriptGetFontLanguageTags"); + pScriptGetFontFeatureTags = (void *)GetProcAddress(module, "ScriptGetFontFeatureTags"); +} + START_TEST(usp10) { HWND hwnd; @@ -4034,6 +4057,8 @@ START_TEST(usp10) hfont = SelectObject(hdc, CreateFontIndirectA(&lf)); ok(hfont != NULL, "SelectObject failed: %p\n", hfont); + init_tests(); + test_ScriptItemize(); test_ScriptItemize_surrogates(); test_ScriptItemIzeShapePlace(hdc,pwOutGlyphs);

1 0

Alex Henrie : shell32: Implement FolderItems_get_Count.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: aac8d46c21677eca13a165e2d2380b3c92b7e3cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac8d46c21677eca13a165e2d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Sep 11 23:16:42 2017 -0600 shell32: Implement FolderItems_get_Count. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 7 +++++-- dlls/shell32/tests/shelldispatch.c | 8 -------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shelldispatch.c b/dlls/shell32/shelldispatch.c index 64ffd34..ec52c6d 100644 --- a/dlls/shell32/shelldispatch.c +++ b/dlls/shell32/shelldispatch.c @@ -1061,9 +1061,12 @@ static HRESULT WINAPI FolderItemsImpl_Invoke(FolderItems3 *iface, static HRESULT WINAPI FolderItemsImpl_get_Count(FolderItems3 *iface, LONG *count) { - FIXME("(%p,%p)\n", iface, count); + FolderItemsImpl *This = impl_from_FolderItems(iface); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, count); + + *count = PathIsDirectoryW(V_BSTR(&This->dir)) ? This->item_count : 0; + return S_OK; } static HRESULT WINAPI FolderItemsImpl_get_Application(FolderItems3 *iface, IDispatch **ppid) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 63d6f94..0529bb2 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -444,9 +444,7 @@ static void test_items(void) r = FolderItems_get_Count(items, NULL); r = FolderItems_get_Count(items, &count); -todo_wine ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); -todo_wine ok(!count, "expected 0 files, got %d\n", count); V_VT(&var) = VT_I4; @@ -484,9 +482,7 @@ todo_wine /* test that get_Count is not aware of the newly created files */ count = -1; r = FolderItems_get_Count(items, &count); -todo_wine ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); -todo_wine ok(!count, "expected 0 files, got %d\n", count); /* test that the newly created files CAN be retrieved by string index */ @@ -514,9 +510,7 @@ todo_wine count = -1; r = FolderItems_get_Count(items, &count); -todo_wine ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); -todo_wine ok(count == sizeof(file_defs)/sizeof(file_defs[0]), "expected %d files, got %d\n", (LONG)(sizeof(file_defs)/sizeof(file_defs[0])), count); @@ -737,9 +731,7 @@ todo_wine /* test that everything stops working after the directory has been removed */ count = -1; r = FolderItems_get_Count(items, &count); -todo_wine ok(r == S_OK, "FolderItems::get_Count failed: %08x\n", r); -todo_wine ok(!count, "expected 0 files, got %d\n", count); item = NULL;

1 0

Rafał Mużyło : itss: Fix handling non-ASCII content paths.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: f4fe2b2dc8fe88308a16381b7ca8156e63ab056b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fe2b2dc8fe88308a16381b7… Author: Rafał Mużyło <galtgendo(a)o2.pl> Date: Tue Sep 12 19:09:04 2017 +0200 itss: Fix handling non-ASCII content paths. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/chm_lib.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index f258623..829f758 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -935,15 +935,10 @@ static UInt64 _chm_parse_cword(UChar **pEntry) /* parse a utf-8 string into an ASCII char buffer */ static BOOL _chm_parse_UTF8(UChar **pEntry, UInt64 count, WCHAR *path) { - /* MJM - Modified to return real Unicode strings */ - while (count != 0) - { - *path++ = (*(*pEntry)++); - --count; - } - - *path = '\0'; - return TRUE; + DWORD length = MultiByteToWideChar(CP_UTF8, 0, (char *)*pEntry, count, path, CHM_MAX_PATHLEN); + path[length] = '\0'; + *pEntry += count; + return !!length; } /* parse a PMGL entry into a chmUnitInfo struct; return 1 on success. */

1 0

Jacek Caban : mshtml: Added IHTMLDocument7::head property implementation.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: b244182bae54d7c46e7a4f46a2868c6983c4b9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b244182bae54d7c46e7a4f46a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:15:37 2017 +0200 mshtml: Added IHTMLDocument7::head property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 34 ++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/elements.js | 11 ++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index db6ee57..413b0bd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4038,8 +4038,38 @@ static HRESULT WINAPI HTMLDocument7_get_body(IHTMLDocument7 *iface, IHTMLElement static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement **p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLHeadElement *nshead; + nsIDOMElement *nselem; + HTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("No document\n"); + return E_FAIL; + } + + nsres = nsIDOMHTMLDocument_GetHead(This->doc_node->nsdoc, &nshead); + assert(nsres == NS_OK); + + if(!nshead) { + *p = NULL; + return S_OK; + } + + nsres = nsIDOMHTMLHeadElement_QueryInterface(nshead, &IID_nsIDOMElement, (void**)&nselem); + nsIDOMHTMLHeadElement_Release(nshead); + assert(nsres == NS_OK); + + hres = get_elem(This->doc_node, nselem, &elem); + nsIDOMElement_Release(nselem); + if(FAILED(hres)) + return hres; + + *p = &elem->IHTMLElement_iface; + return S_OK; } static const IHTMLDocument7Vtbl HTMLDocument7Vtbl = { diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index ac1e2d0..56c4e2f 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -96,8 +96,17 @@ function test_ElementTraversal() { next_test(); } +function test_head() { + var h = document.head; + ok(h.tagName === "HEAD", "h.tagName = " + h.tagName); + ok(h === document.getElementsByTagName("head")[0], "unexpected head element"); + + next_test(); +} + var tests = [ test_input_selection, test_textContent, - test_ElementTraversal + test_ElementTraversal, + test_head ];

1 0

Jacek Caban : mshtml: Expose IHTMLDocument7 interface to scripts.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 2936f1135184e5e65304f560a5ec7b1cc19d197d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2936f1135184e5e65304f560a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:15:23 2017 +0200 mshtml: Expose IHTMLDocument7 interface to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 357dbcf..db6ee57 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4939,6 +4939,9 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t { HTMLDOMNode_init_dispex_info(info, mode); + if(mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(info, IHTMLDocument7_tid, NULL); + /* Depending on compatibility version, we add interfaces in different order * so that the right getElementById implementation is used. */ if(mode < COMPAT_MODE_IE8) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f10a793..ecd72b8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -146,6 +146,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLDocument4) \ XIID(IHTMLDocument5) \ XIID(IHTMLDocument6) \ + XIID(IHTMLDocument7) \ XIID(IHTMLDOMAttribute) \ XIID(IHTMLDOMAttribute2) \ XIID(IHTMLDOMChildrenCollection) \ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9453bdc..20b5882 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -51,6 +51,11 @@ function test_doc_props() { test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9); + test_exposed("defaultView", v >= 9); + test_exposed("head", v >= 9); + + test_exposed("parentWindow", true); + if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow"); next_test(); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument7:: get_characterSet implementation and use it in get_charset.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: 2fc598ddb0f16852db5ed65d793df3afbb61000a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc598ddb0f16852db5ed65d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 12 13:14:19 2017 +0200 mshtml: Added IHTMLDocument7::get_characterSet implementation and use it in get_charset. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 418e152..f9775f8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -918,19 +918,10 @@ static HRESULT WINAPI HTMLDocument_put_charset(IHTMLDocument2 *iface, BSTR v) static HRESULT WINAPI HTMLDocument_get_charset(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - nsAString charset_str; - nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->doc_node->nsdoc) { - FIXME("NULL nsdoc\n"); - return E_FAIL; - } - - nsAString_Init(&charset_str, NULL); - nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str); - return return_nsstr(nsres, &charset_str, p); + return IHTMLDocument7_get_characterSet(&This->IHTMLDocument7_iface, p); } static HRESULT WINAPI HTMLDocument_put_defaultCharset(IHTMLDocument2 *iface, BSTR v) @@ -3321,8 +3312,19 @@ static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument7(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString charset_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + if(!This->doc_node->nsdoc) { + FIXME("NULL nsdoc\n"); + return E_FAIL; + } + + nsAString_Init(&charset_str, NULL); + nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str); + return return_nsstr(nsres, &charset_str, p); } static HRESULT WINAPI HTMLDocument7_createElement(IHTMLDocument7 *iface, BSTR bstrTag, IHTMLElement **newElem)

1 0

Vincent Povirk : shell32: Stub SHOpenWithDialog.
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: fcd7d4404ac17d5fe002182efe3e67385ac0ed39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd7d4404ac17d5fe002182ef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Sep 11 15:26:53 2017 -0500 shell32: Stub SHOpenWithDialog. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dialogs.c | 6 ++++++ dlls/shell32/shell32.spec | 1 + include/shlobj.h | 24 ++++++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index 28a25fd..5d7e079 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -71,6 +71,12 @@ INT WINAPI PickIconDlg( return 0xffffffff; } +HRESULT WINAPI SHOpenWithDialog(HWND parent, const OPENASINFO *info) +{ + FIXME("stub\n"); + return E_NOTIMPL; +} + /************************************************************************* * RunFileDlgW [internal] * diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index dd4accb..6974332 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -410,6 +410,7 @@ @ stdcall SHLoadInProc(ptr) @ stdcall SHLoadNonloadedIconOverlayIdentifiers() @ stdcall SHOpenFolderAndSelectItems(ptr long ptr long) +@ stdcall SHOpenWithDialog(long ptr) @ stdcall SHParseDisplayName(wstr ptr ptr long ptr) @ stdcall SHPathPrepareForWriteA(long ptr str long) @ stdcall SHPathPrepareForWriteW(long ptr wstr long) diff --git a/include/shlobj.h b/include/shlobj.h index ccbf008..66596a3 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -152,6 +152,30 @@ BOOL WINAPI SHObjectProperties(HWND,DWORD,LPCWSTR,LPCWSTR); int WINAPI PathCleanupSpec(LPCWSTR,LPWSTR); +/* SHOpenWithDialog API */ + +typedef enum +{ + OAIF_ALLOW_REGISTRATION = 0x00000001, + OAIF_REGISTER_EXT = 0x00000002, + OAIF_EXEC = 0x00000004, + OAIF_FORCE_REGISTRATION = 0x00000008, + OAIF_HIDE_REGISTRATION = 0x00000020, + OAIF_URL_PROTOCOL = 0x00000040, + OAIF_FILE_IS_URI = 0x00000080 +} OPEN_AS_INFO_FLAGS; + +#include <pshpack8.h> +typedef struct +{ + LPCWSTR pcszFile; + LPCWSTR pcszClass; + OPEN_AS_INFO_FLAGS oaifInFlags; +} OPENASINFO; +#include <poppack.h> + +HRESULT WINAPI SHOpenWithDialog(HWND,const OPENASINFO*); + /* Shell_MergeMenus flags */ #define MM_ADDSEPARATOR 0x00000001 #define MM_SUBMENUSHAVEIDS 0x00000002

1 0

Hugh McMaster : setupapi: Recursively remove any subkeys before calling NtDeleteKey().
by Alexandre Julliard Sept. 12, 2017

Sept. 12, 2017

Module: wine Branch: master Commit: c9308b8d6b1e2f4dd39b19a6890423cd42fd4620 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9308b8d6b1e2f4dd39b19a68… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Sep 12 06:08:13 2017 +0000 setupapi: Recursively remove any subkeys before calling NtDeleteKey(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/install.c | 6 +++++- dlls/setupapi/tests/install.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index a8d38aa..0593df8 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -320,7 +320,11 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context } else RegDeleteValueW( hkey, value ); } - else NtDeleteKey( hkey ); + else + { + RegDeleteTreeW( hkey, NULL ); + NtDeleteKey( hkey ); + } return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 558453c..3ca7f26 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -174,7 +174,6 @@ static void test_registry(void) /* Check if the registry key is recursively deleted */ res = RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\setupapitest", &key); - todo_wine ok(res == ERROR_FILE_NOT_FOUND, "Didn't expect the registry key to exist\n"); /* Just in case */ if (res == ERROR_SUCCESS)

1 0