November 2014 - Wine-Commits

Nikolay Sivov : dwrite: Load freetype on module attach, create one FT_Face per fontface.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: a77b9ed0c733fcb71fe3189f533f80166efc577e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77b9ed0c733fcb71fe3189f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 21 11:48:23 2014 +0300 dwrite: Load freetype on module attach, create one FT_Face per fontface. --- dlls/dwrite/Makefile.in | 2 + dlls/dwrite/dwrite_private.h | 7 +++ dlls/dwrite/font.c | 25 ++++++++ dlls/dwrite/freetype.c | 138 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 1 + 5 files changed, 173 insertions(+) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 2090883..ded14db 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,12 +1,14 @@ MODULE = dwrite.dll IMPORTLIB = dwrite IMPORTS = user32 gdi32 +EXTRAINCL = $(FREETYPE_CFLAGS) C_SRCS = \ analyzer.c \ bidi.c \ bracket.c \ font.c \ + freetype.c \ gdiinterop.c \ layout.c \ linebreak.c \ diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3b1d283..c600f3e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -119,9 +119,16 @@ extern void opentype_get_font_properties(const void*,const void*,DWRITE_FONT_STR extern void opentype_get_font_metrics(const void*,const void*,const void*,DWRITE_FONT_METRICS1*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +/* BiDi helpers */ extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*) DECLSPEC_HIDDEN; extern WCHAR bidi_get_mirrored_char(WCHAR) DECLSPEC_HIDDEN; +/* FreeType integration */ +struct ft_fontface; +extern BOOL init_freetype(void) DECLSPEC_HIDDEN; +extern HRESULT alloc_ft_fontface(const void*,UINT32,UINT32,struct ft_fontface**) DECLSPEC_HIDDEN; +extern void release_ft_fontface(struct ft_fontface*) DECLSPEC_HIDDEN; + /* Glyph shaping */ enum SCRIPT_JUSTIFY { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ed38a6f..eb7a274 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -119,6 +119,7 @@ struct dwrite_fontface { DWRITE_FONT_METRICS1 metrics; struct dwrite_fonttable cmap; + struct ft_fontface *ft; }; struct dwrite_fontfile { @@ -254,6 +255,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) if (This->files[i]) IDWriteFontFile_Release(This->files[i]); } + release_ft_fontface(This->ft); heap_free(This); } @@ -1928,9 +1930,14 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace2 **ret) { struct dwrite_fontface *fontface; + const void *data_ptr; HRESULT hr = S_OK; + void *context; + UINT64 size; int i; + *ret = NULL; + fontface = heap_alloc(sizeof(struct dwrite_fontface)); if (!fontface) return E_OUTOFMEMORY; @@ -1954,6 +1961,7 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW fontface->cmap.size = 0; fontface->index = index; fontface->simulations = simulations; + fontface->ft = NULL; for (i = 0; i < fontface->file_count; i++) { hr = get_stream_from_file(font_files[i], &fontface->streams[i]); @@ -1968,8 +1976,25 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW get_font_properties_from_stream(fontface->streams[0], facetype, index, &fontface->metrics, NULL, NULL, NULL); + hr = IDWriteFontFileStream_GetFileSize(fontface->streams[0], &size); + if (FAILED(hr)) + goto fail; + + hr = IDWriteFontFileStream_ReadFileFragment(fontface->streams[0], &data_ptr, 0, size, &context); + if (FAILED(hr)) + goto fail; + + hr = alloc_ft_fontface(data_ptr, size, fontface->index, &fontface->ft); + IDWriteFontFileStream_ReleaseFileFragment(fontface->streams[0], context); + if (FAILED(hr)) + goto fail; + *ret = &fontface->IDWriteFontFace2_iface; return S_OK; + +fail: + IDWriteFontFace2_Release(&fontface->IDWriteFontFace2_iface); + return hr; } /* IDWriteLocalFontFileLoader and its required IDWriteFontFileStream */ diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c new file mode 100644 index 0000000..86d85b3 --- /dev/null +++ b/dlls/dwrite/freetype.c @@ -0,0 +1,138 @@ +/* + * FreeType integration + * + * Copyright 2014 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#ifdef HAVE_FT2BUILD_H +#include <ft2build.h> +#include FT_FREETYPE_H +#endif /* HAVE_FT2BUILD_H */ + +#include "windef.h" +#include "wine/library.h" +#include "wine/debug.h" + +#include "dwrite_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +#ifdef HAVE_FREETYPE + +static void *ft_handle = NULL; +static FT_Library library = 0; +typedef struct +{ + FT_Int major; + FT_Int minor; + FT_Int patch; +} FT_Version_t; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f = NULL +MAKE_FUNCPTR(FT_Done_Face); +MAKE_FUNCPTR(FT_Init_FreeType); +MAKE_FUNCPTR(FT_Library_Version); +MAKE_FUNCPTR(FT_New_Memory_Face); +#undef MAKE_FUNCPTR + +struct ft_fontface +{ + FT_Face face; +}; + +BOOL init_freetype(void) +{ + FT_Version_t FT_Version; + + ft_handle = wine_dlopen(SONAME_LIBFREETYPE, RTLD_NOW, NULL, 0); + if (!ft_handle) { + WINE_MESSAGE("Wine cannot find the FreeType font library.\n"); + return FALSE; + } + +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ft_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); goto sym_not_found;} + LOAD_FUNCPTR(FT_Done_Face) + LOAD_FUNCPTR(FT_Init_FreeType) + LOAD_FUNCPTR(FT_Library_Version) + LOAD_FUNCPTR(FT_New_Memory_Face) +#undef LOAD_FUNCPTR + + if (pFT_Init_FreeType(&library) != 0) { + ERR("Can't init FreeType library\n"); + wine_dlclose(ft_handle, NULL, 0); + ft_handle = NULL; + return FALSE; + } + pFT_Library_Version(library, &FT_Version.major, &FT_Version.minor, &FT_Version.patch); + + TRACE("FreeType version is %d.%d.%d\n", FT_Version.major, FT_Version.minor, FT_Version.patch); + return TRUE; + +sym_not_found: + WINE_MESSAGE("Wine cannot find certain functions that it needs from FreeType library.\n"); + wine_dlclose(ft_handle, NULL, 0); + ft_handle = NULL; + return FALSE; +} + +HRESULT alloc_ft_fontface(const void *data_ptr, UINT32 data_size, UINT32 index, struct ft_fontface **ftface) +{ + FT_Face face; + FT_Error err; + + *ftface = heap_alloc_zero(sizeof(struct ft_fontface)); + if (!*ftface) + return E_OUTOFMEMORY; + + err = pFT_New_Memory_Face(library, data_ptr, data_size, index, &face); + if (err) { + ERR("FT_New_Memory_Face rets %d\n", err); + return E_FAIL; + } + (*ftface)->face = face; + + return S_OK; +} + +void release_ft_fontface(struct ft_fontface *ftface) +{ + if (!ftface) return; + pFT_Done_Face(ftface->face); + heap_free(ftface); +} + +#else /* HAVE_FREETYPE */ + +BOOL init_freetype(void) +{ + return FALSE; +} + +HRESULT alloc_ft_fontface(const void *data_ptr, UINT32 data_size, UINT32 index, struct ft_fontface **face) +{ + *face = NULL; + return S_FALSE; +} + +void release_ft_fontface(struct ft_fontface *face) +{ +} + +#endif /* HAVE_FREETYPE */ diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 1292086..79aa7d0 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -45,6 +45,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinstDLL ); + init_freetype(); break; case DLL_PROCESS_DETACH: if (reserved) break;

1 0

Jacek Caban : mshtml: Merge htmlelem3.c into htmlelem.c.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: 6485a67a90c7d514ea9e700075fe9e07923e44d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6485a67a90c7d514ea9e70007… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 16:12:39 2014 +0100 mshtml: Merge htmlelem3.c into htmlelem.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlelem.c | 648 +++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlelem3.c | 683 ------------------------------------------- dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 646 insertions(+), 687 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6485a67a90c7d514ea9e7…

1 0

Jacek Caban : mshtml: Added IHTMLTextNode2::appendData implementation.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: 5ecea72a505f715d2569832e3e8cb1d2c2bc49f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ecea72a505f715d2569832e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 21 13:02:17 2014 +0100 mshtml: Added IHTMLTextNode2::appendData implementation. --- dlls/mshtml/htmltextnode.c | 16 ++++++++++++++-- dlls/mshtml/tests/dom.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 66af237..fd4795b 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -237,8 +237,20 @@ static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, L static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR string) { HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(string)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(string)); + + nsAString_InitDepend(&nsstr, string); + nsres = nsIDOMText_AppendData(This->nstext, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("AppendData failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLDOMTextNode2_insertData(IHTMLDOMTextNode2 *iface, LONG offset, BSTR string) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f0896f6..a919b3d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -264,6 +264,7 @@ static const IID * const text_iids[] = { &IID_IHTMLDOMNode, &IID_IHTMLDOMNode2, &IID_IHTMLDOMTextNode, + &IID_IHTMLDOMTextNode2, NULL }; @@ -873,6 +874,17 @@ static IHTMLDOMTextNode *_get_text_iface(unsigned line, IUnknown *unk) return text; } +#define get_text2_iface(u) _get_text2_iface(__LINE__,u) +static IHTMLDOMTextNode2 *_get_text2_iface(unsigned line, IUnknown *unk) +{ + IHTMLDOMTextNode2 *text2; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMTextNode2, (void**)&text2); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDOMTextNode2: %08x\n", hres); + return text2; +} + #define get_comment_iface(u) _get_comment_iface(__LINE__,u) static IHTMLCommentElement *_get_comment_iface(unsigned line, IUnknown *unk) { @@ -2709,6 +2721,19 @@ static void _set_text_data(unsigned line, IUnknown *unk, const char *data) SysFreeString(str); } +#define text_append_data(a,b) _text_append_data(__LINE__,a,b) +static void _text_append_data(unsigned line, IUnknown *unk, const char *data) +{ + IHTMLDOMTextNode2 *text = _get_text2_iface(line, unk); + BSTR str = a2bstr(data); + HRESULT hres; + + hres = IHTMLDOMTextNode2_appendData(text, str); + ok_(__FILE__,line)(hres == S_OK, "appendData failed: %08x\n", hres); + IHTMLDOMTextNode2_Release(text); + SysFreeString(str); +} + #define test_select_set_disabled(i,b) _test_select_set_disabled(__LINE__,i,b) static void _test_select_set_disabled(unsigned line, IHTMLSelectElement *select, VARIANT_BOOL b) { @@ -8155,6 +8180,11 @@ static void test_create_elems(IHTMLDocument2 *doc) test_text_data((IUnknown*)node, "abc"); set_text_data((IUnknown*)node, "test"); test_text_data((IUnknown*)node, "test"); + text_append_data((IUnknown*)node, " append"); + test_text_data((IUnknown*)node, "test append"); + text_append_data((IUnknown*)node, NULL); + test_text_data((IUnknown*)node, "test append"); + set_text_data((IUnknown*)node, "test"); V_VT(&var) = VT_NULL; node2 = test_node_insertbefore((IUnknown*)body, node, &var);

1 0

Drew Ronneberg : user32/tests: Add tests for calling ShowWindow(SW_HIDE) on a hidden window.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: 0908c43327a6d0eb2fd2052339a75aba568d89af URL: http://source.winehq.org/git/wine.git/?a=commit;h=0908c43327a6d0eb2fd205233… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Tue Nov 18 22:14:21 2014 -0500 user32/tests: Add tests for calling ShowWindow(SW_HIDE) on a hidden window. --- dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9b7453f..d829c5f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4621,9 +4621,21 @@ static void test_MsgWaitForMultipleObjects(HWND hwnd) ok(ret == WAIT_IO_COMPLETION, "MsgWaitForMultipleObjectsEx returned %x\n", ret); } +static DWORD CALLBACK show_window_thread(LPVOID arg) +{ + HWND hwnd = arg; + + /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ + ShowWindow(hwnd, SW_HIDE); + + return 0; +} + /* test if we receive the right sequence of messages */ static void test_messages(void) { + DWORD tid; + HANDLE hthread; HWND hwnd, hparent, hchild; HWND hchild2, hbutton; HMENU hmenu; @@ -4656,6 +4668,22 @@ static void test_messages(void) flush_events(); ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); + /* test ShowWindow(SW_HIDE) on a hidden window - single threaded */ + ShowWindow(hwnd, SW_HIDE); + flush_events(); + ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); + + if (0) + { + /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ + hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(hthread); + flush_events(); + ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); + } + ShowWindow(hwnd, SW_SHOW); flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE);

1 0

Jacek Caban : mshtml: Don't try to null terminate post data if it' s not available.
by Alexandre Julliard Nov. 21, 2014

Nov. 21, 2014

Module: wine Branch: master Commit: ec97e3fd57e84a4d231c0ee567ea1b1fcfbbf4f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec97e3fd57e84a4d231c0ee56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 17:59:42 2014 +0100 mshtml: Don't try to null terminate post data if it's not available. --- dlls/mshtml/navigate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 39f298f..85e47aa 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -902,7 +902,8 @@ static HRESULT read_post_data_stream(nsIInputStream *stream, BOOL contains_heade post_data = new_data; } - post_data[data_len] = 0; + if(post_data) + post_data[data_len] = 0; request_data->post_data = post_data; request_data->post_data_len = data_len; TRACE("post_data = %s\n", debugstr_an(request_data->post_data, request_data->post_data_len));

1 0

Jactry Zeng : explorer: Remove unnecessary backslash when parsing / select and /root.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: eaa747311fb13e6e6bf5753afe91bb0016b5d8c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa747311fb13e6e6bf5753af… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Nov 20 21:22:29 2014 +0800 explorer: Remove unnecessary backslash when parsing /select and /root. --- programs/explorer/explorer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 1b900d0..a4f93bc 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -639,6 +639,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) while (*source && *source != ',') target[i++] = *source++; target[i] = 0; } + PathRemoveBackslashW(target); return i; }

1 0

Michael Stefaniuc : shell32/tests: Fix a copy and paste error (PVS-Studio) .
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 61ed9130bf5d76ede29ef83c99fccb14ad93247a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ed9130bf5d76ede29ef83c9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 20 13:43:54 2014 +0100 shell32/tests: Fix a copy and paste error (PVS-Studio). --- dlls/shell32/tests/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 51de635..07e4ee2 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -251,7 +251,7 @@ static void test_get_file_info(void) ok(rc == 1, "SHGetFileInfoA(c:\\nonexistent) should return 1, got 0x%x\n", rc); if (rc) { - ok(strcpy(shfi.szDisplayName, "dummy") != 0, "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); + ok(strcmp(shfi.szDisplayName, "dummy"), "SHGetFileInfoA(c:\\nonexistent) displayname is not set\n"); ok(shfi.iIcon != 0xdeadbeef, "SHGetFileInfoA(c:\\nonexistent) iIcon is not set\n"); }

1 0

Jacek Caban : mshtml: Added nsIURI::GetPrePath implementation.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: 9a68ef40dd25394dcf396342b8d7ea5a26d9378a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a68ef40dd25394dcf396342b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 14:45:35 2014 +0100 mshtml: Added nsIURI::GetPrePath implementation. --- dlls/mshtml/nsio.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index c016914..d8e1712 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2076,8 +2076,42 @@ static nsresult NSAPI nsURI_SetSpec(nsIFileURL *iface, const nsACString *aSpec) static nsresult NSAPI nsURI_GetPrePath(nsIFileURL *iface, nsACString *aPrePath) { nsWineURI *This = impl_from_nsIFileURL(iface); - FIXME("(%p)->(%p)\n", This, aPrePath); - return NS_ERROR_NOT_IMPLEMENTED; + IUriBuilder *uri_builder; + BSTR display_uri; + IUri *uri; + int len; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, aPrePath); + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = CreateIUriBuilder(This->uri, 0, 0, &uri_builder); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUriBuilder_RemoveProperties(uri_builder, Uri_HAS_PATH|Uri_HAS_QUERY|Uri_HAS_FRAGMENT); + if(SUCCEEDED(hres)) + hres = IUriBuilder_CreateUriSimple(uri_builder, 0, 0, &uri); + IUriBuilder_Release(uri_builder); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + hres = IUri_GetDisplayUri(uri, &display_uri); + IUri_Release(uri); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + /* Remove trailing slash that may be appended as default path. */ + len = SysStringLen(display_uri); + if(len && display_uri[len-1] == '/') + display_uri[len-1] = 0; + + nsres = return_wstr_nsacstr(aPrePath, display_uri, -1); + SysFreeString(display_uri); + return nsres; } static nsresult NSAPI nsURI_GetScheme(nsIFileURL *iface, nsACString *aScheme)

1 0

Jacek Caban : mshtml: Added missing nsIHttpChannelInternal functions.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: bcce460f9ed667e037afade8882682c310c516c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcce460f9ed667e037afade88… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 14:45:27 2014 +0100 mshtml: Added missing nsIHttpChannelInternal functions. --- dlls/mshtml/nsio.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9216c1f..c016914 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1824,6 +1824,43 @@ static nsresult NSAPI nsHttpChannelInternal_SetLoadUnblocked(nsIHttpChannelInter return NS_ERROR_NOT_IMPLEMENTED; } +static nsresult NSAPI nsHttpChannelInternal_GetResponseTimeoutEnabled(nsIHttpChannelInternal *iface, + cpp_bool *aResponseTimeoutEnabled) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aResponseTimeoutEnabled); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_SetResponseTimeoutEnabled(nsIHttpChannelInternal *iface, + cpp_bool aResponseTimeoutEnabled) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%x)\n", This, aResponseTimeoutEnabled); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_GetApiRedirectToURI(nsIHttpChannelInternal *iface, nsIURI **aApiRedirectToURI) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aApiRedirectToURI); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_AddRedirect(nsIHttpChannelInternal *iface, nsIPrincipal *aPrincipal) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aPrincipal); + return NS_ERROR_NOT_IMPLEMENTED; +} + +static nsresult NSAPI nsHttpChannelInternal_GetLastModifiedTime(nsIHttpChannelInternal *iface, PRTime *aLastModifiedTime) +{ + nsChannel *This = impl_from_nsIHttpChannelInternal(iface); + FIXME("(%p)->(%p)\n", This, aLastModifiedTime); + return NS_ERROR_NOT_IMPLEMENTED; +} + static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_QueryInterface, nsHttpChannelInternal_AddRef, @@ -1851,7 +1888,12 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_GetLoadAsBlocking, nsHttpChannelInternal_SetLoadAsBlocking, nsHttpChannelInternal_GetLoadUnblocked, - nsHttpChannelInternal_SetLoadUnblocked + nsHttpChannelInternal_SetLoadUnblocked, + nsHttpChannelInternal_GetResponseTimeoutEnabled, + nsHttpChannelInternal_SetResponseTimeoutEnabled, + nsHttpChannelInternal_GetApiRedirectToURI, + nsHttpChannelInternal_AddRedirect, + nsHttpChannelInternal_GetLastModifiedTime };

1 0

Jacek Caban : mshtml: Added IHTMLDOMTextNode2 stub interface.
by Alexandre Julliard Nov. 20, 2014

Nov. 20, 2014

Module: wine Branch: master Commit: d3714ba72d09fa3edfadf37dbbeacdb9eaec0be3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3714ba72d09fa3edfadf37db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 20 11:19:41 2014 +0100 mshtml: Added IHTMLDOMTextNode2 stub interface. --- dlls/mshtml/htmltextnode.c | 119 +++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + 2 files changed, 115 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 27e00c0..66af237 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); struct HTMLDOMTextNode { HTMLDOMNode node; IHTMLDOMTextNode IHTMLDOMTextNode_iface; + IHTMLDOMTextNode2 IHTMLDOMTextNode2_iface; nsIDOMText *nstext; }; @@ -170,6 +171,112 @@ static const IHTMLDOMTextNodeVtbl HTMLDOMTextNodeVtbl = { HTMLDOMTextNode_splitText }; +static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode2(IHTMLDOMTextNode2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode2_iface); +} + +static HRESULT WINAPI HTMLDOMTextNode2_QueryInterface(IHTMLDOMTextNode2 *iface, REFIID riid, void **ppv) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + + return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLDOMTextNode2_AddRef(IHTMLDOMTextNode2 *iface) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + + return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLDOMTextNode2_Release(IHTMLDOMTextNode2 *iface) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + + return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfoCount(IHTMLDOMTextNode2 *iface, UINT *pctinfo) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_GetTypeInfoCount(&This->node.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfo(IHTMLDOMTextNode2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_GetTypeInfo(&This->node.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMTextNode2_GetIDsOfNames(IHTMLDOMTextNode2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_GetIDsOfNames(&This->node.dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMTextNode2_Invoke(IHTMLDOMTextNode2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + return IDispatchEx_Invoke(&This->node.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %d %p)\n", This, offset, count, string); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_appendData(IHTMLDOMTextNode2 *iface, BSTR string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(string)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_insertData(IHTMLDOMTextNode2 *iface, LONG offset, BSTR string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %s)\n", This, offset, debugstr_w(string)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_deleteData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %d)\n", This, offset, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMTextNode2_replaceData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR string) +{ + HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); + FIXME("(%p)->(%d %d %s)\n", This, offset, count, debugstr_w(string)); + return E_NOTIMPL; +} + +static const IHTMLDOMTextNode2Vtbl HTMLDOMTextNode2Vtbl = { + HTMLDOMTextNode2_QueryInterface, + HTMLDOMTextNode2_AddRef, + HTMLDOMTextNode2_Release, + HTMLDOMTextNode2_GetTypeInfoCount, + HTMLDOMTextNode2_GetTypeInfo, + HTMLDOMTextNode2_GetIDsOfNames, + HTMLDOMTextNode2_Invoke, + HTMLDOMTextNode2_substringData, + HTMLDOMTextNode2_appendData, + HTMLDOMTextNode2_insertData, + HTMLDOMTextNode2_deleteData, + HTMLDOMTextNode2_replaceData +}; + static inline HTMLDOMTextNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) { return CONTAINING_RECORD(iface, HTMLDOMTextNode, node); @@ -179,14 +286,14 @@ static HRESULT HTMLDOMTextNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLDOMTextNode *This = impl_from_HTMLDOMNode(iface); - *ppv = NULL; + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - if(IsEqualGUID(&IID_IHTMLDOMTextNode, riid)) { - TRACE("(%p)->(IID_IHTMLDOMTextNode %p)\n", This, ppv); + if(IsEqualGUID(&IID_IHTMLDOMTextNode, riid)) *ppv = &This->IHTMLDOMTextNode_iface; - }else { + else if(IsEqualGUID(&IID_IHTMLDOMTextNode2, riid)) + *ppv = &This->IHTMLDOMTextNode2_iface; + else return HTMLDOMNode_QI(&This->node, riid, ppv); - } IUnknown_AddRef((IUnknown*)*ppv); return S_OK; @@ -212,6 +319,7 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = { IHTMLDOMNode_tid, IHTMLDOMNode2_tid, IHTMLDOMTextNode_tid, + IHTMLDOMTextNode2_tid, 0 }; static dispex_static_data_t HTMLDOMTextNode_dispex = { @@ -232,6 +340,7 @@ HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDO ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; ret->IHTMLDOMTextNode_iface.lpVtbl = &HTMLDOMTextNodeVtbl; + ret->IHTMLDOMTextNode2_iface.lpVtbl = &HTMLDOMTextNode2Vtbl; init_dispex(&ret->node.dispex, (IUnknown*)&ret->IHTMLDOMTextNode_iface, &HTMLDOMTextNode_dispex); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9c38df7..1870e03 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -140,6 +140,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLDOMNode) \ XIID(IHTMLDOMNode2) \ XIID(IHTMLDOMTextNode) \ + XIID(IHTMLDOMTextNode2) \ XIID(IHTMLElement) \ XIID(IHTMLElement2) \ XIID(IHTMLElement3) \

1 0