March 2016 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the texture dimension helpers in arbfp_blit_surface().
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: a54c438e0d947c983f2d64bc2ad98e7d747a5bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a54c438e0d947c983f2d64bc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:14 2016 +0200 wined3d: Use the texture dimension helpers in arbfp_blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d2c1d3d..d56123f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7903,8 +7903,8 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ * rectangle instead. */ surface_load_fb_texture(src_surface, FALSE, context); - src_rect.top = src_surface->resource.height - src_rect.top; - src_rect.bottom = src_surface->resource.height - src_rect.bottom; + src_rect.top = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.top; + src_rect.bottom = wined3d_texture_get_level_height(src_texture, src_surface->texture_level) - src_rect.bottom; } else wined3d_texture_load(src_texture, context, FALSE);

1 0

Vincent Povirk : mscoree: Enable crash chaining in Mono.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: ccac8a455b6a3eb95cc637b3d30f320dab491249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccac8a455b6a3eb95cc637b3d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 30 12:17:34 2016 -0500 mscoree: Enable crash chaining in Mono. This allows winedbg to handle crashes and print native stack traces, after Mono has attempted to print a managed stack trace. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ca6914e..252740d 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -100,6 +100,7 @@ MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); void (CDECL *mono_runtime_quit)(void); +static void (CDECL *mono_set_crash_chaining)(BOOL chain_signals); static void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); @@ -126,6 +127,10 @@ static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle, return mono_image_open(fname, status); } +static void CDECL set_crash_chaining_dummy(BOOL crash_chaining) +{ +} + static void CDECL set_print_handler_dummy(MonoPrintCallback callback) { } @@ -217,6 +222,7 @@ static HRESULT load_mono(LPCWSTR mono_path) } while (0); LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy); + LOAD_OPT_MONO_FUNCTION(mono_set_crash_chaining, set_crash_chaining_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_print_handler, set_print_handler_dummy); LOAD_OPT_MONO_FUNCTION(mono_trace_set_printerr_handler, set_print_handler_dummy); @@ -224,6 +230,8 @@ static HRESULT load_mono(LPCWSTR mono_path) mono_profiler_install(NULL, mono_shutdown_callback_fn); + mono_set_crash_chaining(TRUE); + mono_trace_set_print_handler(mono_print_handler_fn); mono_trace_set_printerr_handler(mono_print_handler_fn);

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in prepare_ds_clear().
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: 8ade2418ef467552436700afeda7511d1257107b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ade2418ef467552436700afe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:17 2016 +0200 wined3d: Use the texture dimension helpers in prepare_ds_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 033bb58..395bbee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -241,7 +241,9 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context { /* Depth buffer was discarded, make it entirely current in its new location since * there is no other place where we would get data anyway. */ - SetRect(out_rect, 0, 0, ds->resource.width, ds->resource.height); + SetRect(out_rect, 0, 0, + wined3d_texture_get_level_width(ds->container, ds->texture_level), + wined3d_texture_get_level_height(ds->container, ds->texture_level)); return; }

1 0

Alexandre Julliard : makedep: Rename top_dir_path to top_src_dir_path for consistency.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: 5bec183195fdba3752de4bf0fb433ac97a662b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bec183195fdba3752de4bf0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 14:39:32 2016 +0900 makedep: Rename top_dir_path to top_src_dir_path for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2a9782a..47efda3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -654,9 +654,9 @@ static char *top_obj_dir_path( const struct makefile *make, const char *path ) /******************************************************************* - * top_dir_path + * top_src_dir_path */ -static char *top_dir_path( const struct makefile *make, const char *path ) +static char *top_src_dir_path( const struct makefile *make, const char *path ) { if (make->top_src_dir) return concat_paths( make->top_src_dir, path ); return top_obj_dir_path( make, path ); @@ -1296,7 +1296,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p char *src_path = root_dir_path( path ); struct file *ret = load_file( src_path ); - if (ret) *filename = top_dir_path( make, path ); + if (ret) *filename = top_src_dir_path( make, path ); free( src_path ); return ret; } @@ -2147,7 +2147,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct output_filenames_obj_dir( make, targets ); output( "\n" ); - install_sh = top_dir_path( make, "tools/install-sh" ); + install_sh = top_src_dir_path( make, "tools/install-sh" ); for (i = 0; i < files.count; i += 2) { const char *file = files.str[i]; @@ -2318,8 +2318,10 @@ static struct strarray output_sources( const struct makefile *make ) if (make->src_dir) strarray_add( &includes, strmake( "-I%s", make->src_dir )); if (make->parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( make, make->parent_dir ))); strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( make, "include" ))); - if (make->top_src_dir) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include" ))); - if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include/msvcrt" ))); + if (make->top_src_dir) + strarray_add( &includes, strmake( "-I%s", top_src_dir_path( make, "include" ))); + if (make->use_msvcrt) + strarray_add( &includes, strmake( "-I%s", top_src_dir_path( make, "include/msvcrt" ))); for (i = 0; i < make->include_paths.count; i++) strarray_add( &includes, strmake( "-I%s", obj_dir_path( make, make->include_paths.str[i] ))); @@ -2527,7 +2529,7 @@ static struct strarray output_sources( const struct makefile *make ) { output( "%s: %s\n", ttf_file, source->filename ); output( "\t%s -script %s %s $@\n", - fontforge, top_dir_path( make, "fonts/genttf.ff" ), source->filename ); + fontforge, top_src_dir_path( make, "fonts/genttf.ff" ), source->filename ); if (!(source->file->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file ); } if (source->file->flags & FLAG_INSTALL) @@ -2560,7 +2562,7 @@ static struct strarray output_sources( const struct makefile *make ) output( "%s.ico %s.bmp: %s\n", src_dir_path( make, obj ), src_dir_path( make, obj ), source->filename ); output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, - top_dir_path( make, "tools/buildimage" ), source->filename ); + top_src_dir_path( make, "tools/buildimage" ), source->filename ); } } else if (!strcmp( ext, "po" )) /* po file */ @@ -2633,8 +2635,9 @@ static struct strarray output_sources( const struct makefile *make ) strarray_add( &ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", - top_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), make->testdll, - replace_extension( make->testdll, ".dll", "_test.exe" ), dll_ext, obj ); + top_src_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), + make->testdll, replace_extension( make->testdll, ".dll", "_test.exe" ), + dll_ext, obj ); } if (!strcmp( ext, "c" ) && !(source->file->flags & FLAG_GENERATED)) strarray_add( &c2man_files, source->filename ); @@ -2764,33 +2767,33 @@ static struct strarray output_sources( const struct makefile *make ) if (c2man_files.count) { output( "manpages::\n" ); - output( "\t%s -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s/man%s", top_obj_dir_path( make, "documentation" ), man_ext )); output_filenames( c2man_files ); output( "\n" ); output( "htmlpages::\n" ); - output( "\t%s -Th -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Th -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/html" ))); output_filenames( c2man_files ); output( "\n" ); output( "sgmlpages::\n" ); - output( "\t%s -Ts -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Ts -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/api-guide" ))); output_filenames( c2man_files ); output( "\n" ); output( "xmlpages::\n" ); - output( "\t%s -Tx -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Tx -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/api-guide-xml" ))); output_filenames( c2man_files ); @@ -3088,8 +3091,8 @@ static struct strarray output_sources( const struct makefile *make ) { const struct makefile *submake = make->submakes[i]; - strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( submake, - strmake ( "%s.in", output_makefile_name )))); + strarray_add( &makefile_deps, top_src_dir_path( make, base_dir_path( submake, + strmake ( "%s.in", output_makefile_name )))); strarray_add( &distclean_files, base_dir_path( submake, output_makefile_name )); if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( submake, ".gitignore" )); if (submake->testdll) strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" )); @@ -3415,7 +3418,7 @@ static void load_sources( struct makefile *make ) make->src_dir = concat_paths( make->top_src_dir, make->base_dir ); } strarray_set_value( &make->vars, "top_builddir", top_obj_dir_path( make, "" )); - strarray_set_value( &make->vars, "top_srcdir", top_dir_path( make, "" )); + strarray_set_value( &make->vars, "top_srcdir", top_src_dir_path( make, "" )); strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" )); make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" );

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_invalidate_location().
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: 984934f685d8d9d85d0be2fd4b96afd260718b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=984934f685d8d9d85d0be2fd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 30 21:30:19 2016 +0200 wined3d: Introduce wined3d_texture_invalidate_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 4 +-- dlls/wined3d/device.c | 19 +++++++++----- dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/surface.c | 39 +++++++++------------------ dlls/wined3d/swapchain.c | 33 ++++++++++++----------- dlls/wined3d/texture.c | 55 +++++++++++++++++++++------------------ dlls/wined3d/volume.c | 23 ++++------------ dlls/wined3d/wined3d_private.h | 4 +-- 9 files changed, 84 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=984934f685d8d9d85d0be…

1 0

Alexandre Julliard : winegcc: Support building from the top directory.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: 2b525db8a29080b650f57647a8839ee0b5c959f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b525db8a29080b650f57647a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 14:34:46 2016 +0900 winegcc: Support building from the top directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1ddafc6..119e12b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1464,6 +1464,11 @@ int main(int argc, char **argv) /* don't pass it to the compiler, this generates warnings */ raw_compiler_arg = raw_linker_arg = 0; } + else if (!strcmp(str, "tools/winebuild")) + { + opts.wine_objdir = "."; + raw_compiler_arg = raw_linker_arg = 0; + } if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); break;

1 0

Hans Leidekker : webservices: Add a helper to determine node type.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 49bc8b4cc7109c7deab1e7fa15ad47a0cc50f41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=49bc8b4cc7109c7deab1e7fa1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 30 14:12:16 2016 +0200 webservices: Add a helper to determine node type. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 38 +++++++++++++++++----------------- dlls/webservices/webservices_private.h | 5 +++++ dlls/webservices/writer.c | 10 ++++----- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9ae6254..c97fd7e 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -303,7 +303,7 @@ void free_attribute( WS_XML_ATTRIBUTE *attr ) void free_node( struct node *node ) { if (!node) return; - switch (node->hdr.node.nodeType) + switch (node_type( node )) { case WS_XML_NODE_TYPE_ELEMENT: { @@ -337,7 +337,7 @@ void free_node( struct node *node ) break; default: - ERR( "unhandled type %u\n", node->hdr.node.nodeType ); + ERR( "unhandled type %u\n", node_type( node ) ); break; } heap_free( node ); @@ -1117,12 +1117,12 @@ static struct node *read_find_parent( struct reader *reader, const WS_XML_STRING for (parent = reader->current; parent; parent = parent->parent) { - if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF) + if (node_type( parent ) == WS_XML_NODE_TYPE_BOF) { if (!localname) return parent; return NULL; } - else if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + else if (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) { if (!localname) return parent; @@ -1540,7 +1540,7 @@ static BOOL move_to_root_element( struct reader *reader ) if (!(ptr = list_head( &reader->root->children ))) return FALSE; node = LIST_ENTRY( ptr, struct node, entry ); - if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = node; return TRUE; @@ -1548,7 +1548,7 @@ static BOOL move_to_root_element( struct reader *reader ) while ((ptr = list_next( &reader->root->children, &node->entry ))) { struct node *next = LIST_ENTRY( ptr, struct node, entry ); - if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = next; return TRUE; @@ -1566,7 +1566,7 @@ static BOOL move_to_next_element( struct reader *reader ) while ((ptr = list_next( &node->parent->children, &node->entry ))) { struct node *next = LIST_ENTRY( ptr, struct node, entry ); - if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = next; return TRUE; @@ -1584,7 +1584,7 @@ static BOOL move_to_prev_element( struct reader *reader ) while ((ptr = list_prev( &node->parent->children, &node->entry ))) { struct node *prev = LIST_ENTRY( ptr, struct node, entry ); - if (prev->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( prev ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = prev; return TRUE; @@ -1601,7 +1601,7 @@ static BOOL move_to_child_element( struct reader *reader ) if (!(ptr = list_head( &reader->current->children ))) return FALSE; node = LIST_ENTRY( ptr, struct node, entry ); - if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = node; return TRUE; @@ -1609,7 +1609,7 @@ static BOOL move_to_child_element( struct reader *reader ) while ((ptr = list_next( &reader->current->children, &node->entry ))) { struct node *next = LIST_ENTRY( ptr, struct node, entry ); - if (next->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + if (node_type( next ) == WS_XML_NODE_TYPE_ELEMENT) { reader->current = next; return TRUE; @@ -1624,12 +1624,12 @@ static BOOL move_to_end_element( struct reader *reader ) struct list *ptr; struct node *node = reader->current; - if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) return FALSE; + if (node_type( node ) != WS_XML_NODE_TYPE_ELEMENT) return FALSE; if ((ptr = list_tail( &node->children ))) { struct node *tail = LIST_ENTRY( ptr, struct node, entry ); - if (tail->hdr.node.nodeType == WS_XML_NODE_TYPE_END_ELEMENT) + if (node_type( tail ) == WS_XML_NODE_TYPE_END_ELEMENT) { reader->current = tail; return TRUE; @@ -1642,8 +1642,8 @@ static BOOL move_to_parent_element( struct reader *reader ) { struct node *parent = reader->current->parent; - if (parent && (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT || - parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF)) + if (parent && (node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT || + node_type( parent ) == WS_XML_NODE_TYPE_BOF)) { reader->current = parent; return TRUE; @@ -1905,7 +1905,7 @@ static HRESULT read_get_node_text( struct reader *reader, WS_XML_UTF8_TEXT **ret { WS_XML_TEXT_NODE *text; - if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_TEXT) + if (node_type( reader->current ) != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; text = (WS_XML_TEXT_NODE *)&reader->current->hdr.node; @@ -1923,7 +1923,7 @@ static HRESULT read_get_attribute_text( struct reader *reader, ULONG index, WS_X WS_XML_ELEMENT_NODE *elem = &reader->current->hdr; WS_XML_ATTRIBUTE *attr; - if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_FORMAT; attr = elem->attributes[index]; @@ -1977,7 +1977,7 @@ HRESULT WINAPI WsFindAttribute( WS_XML_READER *handle, const WS_XML_STRING *loca if (!reader || !localname || !ns || !index) return E_INVALIDARG; - if (reader->current->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) + if (node_type( reader->current ) != WS_XML_NODE_TYPE_ELEMENT) return WS_E_INVALID_OPERATION; if (!find_attribute( reader, localname, ns, index )) @@ -2689,7 +2689,7 @@ static BOOL is_empty_text_node( const struct node *node ) const WS_XML_UTF8_TEXT *utf8; ULONG i; - if (node->hdr.node.nodeType != WS_XML_NODE_TYPE_TEXT) return FALSE; + if (node_type( node ) != WS_XML_NODE_TYPE_TEXT) return FALSE; if (text->text->textType != WS_XML_TEXT_TYPE_UTF8) { ERR( "unhandled text type %u\n", text->text->textType ); @@ -2719,7 +2719,7 @@ static HRESULT read_type_next_node( struct reader *reader, const WS_XML_STRING * for (;;) { if ((hr = read_node( reader ) != S_OK)) return hr; - type = reader->current->hdr.node.nodeType; + type = node_type( reader->current ); if (type == WS_XML_NODE_TYPE_COMMENT || (type == WS_XML_NODE_TYPE_TEXT && is_empty_text_node( reader->current ))) continue; break; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index aa14416..548da06 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -46,6 +46,11 @@ struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; +static inline WS_XML_NODE_TYPE node_type( const struct node *node ) +{ + return node->hdr.node.nodeType; +} + static inline void *heap_alloc( SIZE_T size ) { return HeapAlloc( GetProcessHeap(), 0, size ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0c5f3cf5..8f6c6aa 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -601,8 +601,8 @@ static struct node *write_find_parent_element( struct writer *writer ) { struct node *node = writer->current; - if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node; - if (node->parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node->parent; + if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) return node; + if (node_type( node->parent ) == WS_XML_NODE_TYPE_ELEMENT) return node->parent; return NULL; } @@ -894,15 +894,15 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { struct node *node; - WS_XML_ELEMENT_NODE *elem, *current = &writer->current->hdr; + WS_XML_ELEMENT_NODE *elem; HRESULT hr; /* flush current start element if necessary */ if (writer->state == WRITER_STATE_STARTELEMENT && ((hr = write_endstartelement( writer )) != S_OK)) return hr; - if (!prefix && current->node.nodeType == WS_XML_NODE_TYPE_ELEMENT) - prefix = current->prefix; + if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) + prefix = writer->current->hdr.prefix; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; elem = &node->hdr;

1 0

Jacek Caban : mshtml: Added support for IHTMLDOMAttribute2:: get_value on detached attributes.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 7ad4aeb7352e302d4a9f7399caccaf92bb23f27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad4aeb7352e302d4a9f7399c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:58 2016 +0200 mshtml: Added support for IHTMLDOMAttribute2::get_value on detached attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 11 +++++------ dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 8b21eea..bd7cb82 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -310,12 +310,11 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BST TRACE("(%p)->(%p)\n", This, p); - if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; - } - - hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + V_VT(&val) = VT_EMPTY; + if(This->elem) + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + else + hres = VariantCopy(&val, &This->value); if(SUCCEEDED(hres)) hres = attr_value_to_string(&val); if(FAILED(hres)) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f64bd82..41dddab 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8610,11 +8610,18 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); + test_attr_value(attr, "1"); V_VT(&v) = VT_EMPTY; put_attr_node_value(attr, v); get_attr_node_value(attr, &v, VT_EMPTY); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("testing"); + put_attr_node_value(attr, v); + SysFreeString(V_BSTR(&v)); + test_attr_value(attr, "testing"); + IHTMLDOMAttribute_Release(attr); }

1 0

Jacek Caban : mshtml: Split conversion to string out of get_elem_attr_value_by_dispid.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: a3ab8d679225562dc3eed427173c2966698c3529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab8d679225562dc3eed4271… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:44 2016 +0200 mshtml: Split conversion to string out of get_elem_attr_value_by_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 6 +++-- dlls/mshtml/htmlelem.c | 61 ++++++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 7 ++--- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 97a4ce2..8b21eea 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -169,7 +169,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, V if(!This->elem) return VariantCopy(p, &This->value); - return get_elem_attr_value_by_dispid(This->elem, This->dispid, 0, p); + return get_elem_attr_value_by_dispid(This->elem, This->dispid, p); } static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) @@ -315,7 +315,9 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BST return E_UNEXPECTED; } - hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, ATTRFLAG_ASSTRING, &val); + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + if(SUCCEEDED(hres)) + hres = attr_value_to_string(&val); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cb0b864..c7090e6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -63,6 +63,10 @@ static const WCHAR textareaW[] = {'T','E','X','T','A','R','E','A',0}; static const WCHAR title_tagW[]= {'T','I','T','L','E',0}; static const WCHAR trW[] = {'T','R',0}; +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + typedef struct { const WCHAR *name; HRESULT (*constructor)(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**); @@ -638,39 +642,39 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, NULL, &excep, NULL); } -HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD flags, VARIANT *ret) +HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *ret) { DISPPARAMS dispParams = {NULL, NULL, 0, 0}; EXCEPINFO excep; + + return IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); +} + +HRESULT attr_value_to_string(VARIANT *v) +{ HRESULT hres; static const WCHAR nullW[] = {'n','u','l','l',0}; - hres = IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); - if(FAILED(hres)) - return hres; - - if(flags & ATTRFLAG_ASSTRING) { - switch(V_VT(ret)) { - case VT_BSTR: - break; - case VT_NULL: - V_BSTR(ret) = SysAllocString(nullW); - if(!V_BSTR(ret)) - return E_OUTOFMEMORY; - V_VT(ret) = VT_BSTR; - break; - case VT_DISPATCH: - IDispatch_Release(V_DISPATCH(ret)); - V_VT(ret) = VT_BSTR; - V_BSTR(ret) = SysAllocString(NULL); - break; - default: - hres = VariantChangeType(ret, ret, 0, VT_BSTR); - if(FAILED(hres)) - return hres; - } + switch(V_VT(v)) { + case VT_BSTR: + break; + case VT_NULL: + V_BSTR(v) = SysAllocString(nullW); + if(!V_BSTR(v)) + return E_OUTOFMEMORY; + V_VT(v) = VT_BSTR; + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(v)); + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(v, v, 0, VT_BSTR); + if(FAILED(hres)) + return hres; } return S_OK; @@ -700,7 +704,10 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - return get_elem_attr_value_by_dispid(This, dispid, lFlags, AttributeValue); + hres = get_elem_attr_value_by_dispid(This, dispid, AttributeValue); + if(SUCCEEDED(hres) && (lFlags & ATTRFLAG_ASSTRING)) + hres = attr_value_to_string(AttributeValue); + return hres; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36c95ce..611cb8b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1016,11 +1016,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; -#define ATTRFLAG_CASESENSITIVE 0x0001 -#define ATTRFLAG_ASSTRING 0x0002 -#define ATTRFLAG_EXPANDURL 0x0004 - -HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,DWORD,VARIANT*) DECLSPEC_HIDDEN; +HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN;

1 0

Piotr Caban : ieframe: Add ITargetFrame stub.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: dfc60ddbc83df77c89f4d3a1978639a94d714417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfc60ddbc83df77c89f4d3a19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 30 11:31:08 2016 +0200 ieframe: Add ITargetFrame stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/client.c | 5 ++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 149 +++++++++++++++++++++++++++++++++++++++- dlls/ieframe/tests/webbrowser.c | 6 ++ 4 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index d82195f..4846e28 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -668,6 +668,11 @@ static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, RE return IWebBrowser2_QueryInterface(This->wb, riid, ppv); } + if(IsEqualGUID(&IID_ITargetFrame, guidService)) { + TRACE("(%p)->(IID_ITargetFrame %s %p)\n", This, debugstr_guid(riid), ppv); + return IWebBrowser2_QueryInterface(This->wb, riid, ppv); + } + if(IsEqualGUID(&IID_IWebBrowserApp, guidService)) { TRACE("IWebBrowserApp service\n"); return IWebBrowser2_QueryInterface(This->wb, riid, ppv); diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 371cb03..3880354 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -55,6 +55,7 @@ typedef struct { typedef struct { IHlinkFrame IHlinkFrame_iface; + ITargetFrame ITargetFrame_iface; ITargetFrame2 ITargetFrame2_iface; ITargetFramePriv2 ITargetFramePriv2_iface; IWebBrowserPriv2IE9 IWebBrowserPriv2IE9_iface; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 88bc7e6..296ed19 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1241,6 +1241,149 @@ static const IHlinkFrameVtbl HlinkFrameVtbl = { HlinkFrame_UpdateHlink }; +static inline HlinkFrame *impl_from_ITargetFrame(ITargetFrame *iface) +{ + return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame_iface); +} + +static HRESULT WINAPI TargetFrame_QueryInterface(ITargetFrame *iface, REFIID riid, void **ppv) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_QueryInterface(This->outer, riid, ppv); +} + +static ULONG WINAPI TargetFrame_AddRef(ITargetFrame *iface) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI TargetFrame_Release(ITargetFrame *iface) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI TargetFrame_SetFrameName(ITargetFrame *iface, LPCWSTR pszFrameName) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameName)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameName(ITargetFrame *iface, LPWSTR *ppszFrameName) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameName); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetParentFrame(ITargetFrame *iface, IUnknown **ppunkParent) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppunkParent); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_FindFrame(ITargetFrame *iface, LPCWSTR pszTargetName, + IUnknown *ppunkContextFrame, DWORD dwFlags, IUnknown **ppunkTargetFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s %p %x %p)\n", This, debugstr_w(pszTargetName), + ppunkContextFrame, dwFlags, ppunkTargetFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameSrc(ITargetFrame *iface, LPCWSTR pszFrameSrc) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(pszFrameSrc)); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameSrc(ITargetFrame *iface, LPWSTR *ppszFrameSrc) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppszFrameSrc); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFramesContainer(ITargetFrame *iface, IOleContainer **ppContainer) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, ppContainer); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameOptions(ITargetFrame *iface, DWORD dwFlags) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%x)\n", This, dwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameOptions(ITargetFrame *iface, DWORD *pdwFlags) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pdwFlags); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_SetFrameMargins(ITargetFrame *iface, DWORD dwWidth, DWORD dwHeight) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%d %d)\n", This, dwWidth, dwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_GetFrameMargins(ITargetFrame *iface, DWORD *pdwWidth, DWORD *pdwHeight) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p %p)\n", This, pdwWidth, pdwHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_RemoteNavigate(ITargetFrame *iface, ULONG cLength, ULONG *pulData) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%u %p)\n", This, cLength, pulData); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_OnChildFrameActivate(ITargetFrame *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static HRESULT WINAPI TargetFrame_OnChildFrameDeactivate(ITargetFrame *iface, IUnknown *pUnkChildFrame) +{ + HlinkFrame *This = impl_from_ITargetFrame(iface); + FIXME("(%p)->(%p)\n", This, pUnkChildFrame); + return E_NOTIMPL; +} + +static const ITargetFrameVtbl TargetFrameVtbl = { + TargetFrame_QueryInterface, + TargetFrame_AddRef, + TargetFrame_Release, + TargetFrame_SetFrameName, + TargetFrame_GetFrameName, + TargetFrame_GetParentFrame, + TargetFrame_FindFrame, + TargetFrame_SetFrameSrc, + TargetFrame_GetFrameSrc, + TargetFrame_GetFramesContainer, + TargetFrame_SetFrameOptions, + TargetFrame_GetFrameOptions, + TargetFrame_SetFrameMargins, + TargetFrame_GetFrameMargins, + TargetFrame_RemoteNavigate, + TargetFrame_OnChildFrameActivate, + TargetFrame_OnChildFrameDeactivate +}; + static inline HlinkFrame *impl_from_ITargetFrame2(ITargetFrame2 *iface) { return CONTAINING_RECORD(iface, HlinkFrame, ITargetFrame2_iface); @@ -1517,6 +1660,9 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHlinkFrame, riid)) { TRACE("(%p)->(IID_IHlinkFrame %p)\n", This, ppv); *ppv = &This->IHlinkFrame_iface; + }else if(IsEqualGUID(&IID_ITargetFrame, riid)) { + TRACE("(%p)->(IID_ITargetFrame %p)\n", This, ppv); + *ppv = &This->ITargetFrame_iface; }else if(IsEqualGUID(&IID_ITargetFrame2, riid)) { TRACE("(%p)->(IID_ITargetFrame2 %p)\n", This, ppv); *ppv = &This->ITargetFrame2_iface; @@ -1539,7 +1685,8 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv) void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host) { - This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; + This->IHlinkFrame_iface.lpVtbl = &HlinkFrameVtbl; + This->ITargetFrame_iface.lpVtbl = &TargetFrameVtbl; This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl; This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl; This->IWebBrowserPriv2IE9_iface.lpVtbl = &WebBrowserPriv2IE9Vtbl; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index b2bbebd..4d28073 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "exdisp.h" #include "htiframe.h" +#include "htiface.h" #include "mshtmhst.h" #include "mshtmcid.h" #include "mshtml.h" @@ -3547,6 +3548,11 @@ static void test_dochost_qs(IWebBrowser2 *webbrowser) ok(iface_cmp(service, (IUnknown*)webbrowser), "service != unk\n"); IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_ITargetFrame, &IID_ITargetFrame, (void**)&service); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + ok(iface_cmp(service, (IUnknown*)webbrowser), "service != unk\n"); + IUnknown_Release(service); + hres = IServiceProvider_QueryService(serv_prov, &IID_IShellBrowser, &IID_IShellBrowser, (void**)&service); ok(hres == S_OK, "QueryService failed: %08x\n", hres); IUnknown_Release(service);

1 0