December 2010 - Wine-commits

Rico Schüller : d3dcompiler: Add initial reflection parsing.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 5b2286a5bde2ae3e62354afc22055db818c40086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2286a5bde2ae3e62354afc2… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri Nov 26 12:43:51 2010 +0100 d3dcompiler: Add initial reflection parsing. --- dlls/d3dcompiler_43/d3dcompiler_43_main.c | 20 +++++++++++++--- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++- dlls/d3dcompiler_43/reflection.c | 34 +++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/d3dcompiler_43_main.c index e4f8f99..365b631 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_43_main.c +++ b/dlls/d3dcompiler_43/d3dcompiler_43_main.c @@ -127,8 +127,15 @@ HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size, UINT flags, ID HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector) { struct d3dcompiler_shader_reflection *object; + HRESULT hr; - FIXME("data %p, data_size %lu, riid %s, blob %p stub!\n", data, data_size, debugstr_guid(riid), reflector); + TRACE("data %p, data_size %lu, riid %s, blob %p\n", data, data_size, debugstr_guid(riid), reflector); + + if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection)) + { + WARN("Wrong riid %s, accept only %s!\n", debugstr_guid(riid), debugstr_guid(&IID_ID3D11ShaderReflection)); + return E_NOINTERFACE; + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -137,10 +144,15 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void return E_OUTOFMEMORY; } - object->vtbl = &d3dcompiler_shader_reflection_vtbl; - object->refcount = 1; + hr = d3dcompiler_shader_reflection_init(object, data, data_size); + if (FAILED(hr)) + { + WARN("Failed to initialize shader reflection\n"); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } - *reflector = (ID3D11ShaderReflection *)object; + *reflector = object; TRACE("Created ID3D11ShaderReflection %p\n", object); diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 0b99629..c27e3d8 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -58,13 +58,15 @@ HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_P HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; /* ID3D11ShaderReflection */ -extern const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl DECLSPEC_HIDDEN; struct d3dcompiler_shader_reflection { const struct ID3D11ShaderReflectionVtbl *vtbl; LONG refcount; }; +/* reflection handling */ +HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection *reflection, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; + /* Shader assembler definitions */ typedef enum _shader_type { ST_VERTEX, diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index f92c986..e733a8f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -241,3 +241,37 @@ const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = d3dcompiler_shader_reflection_GetMinFeatureLevel, d3dcompiler_shader_reflection_GetThreadGroupSize, }; + +HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection *reflection, + const void *data, SIZE_T data_size) +{ + struct dxbc src_dxbc; + HRESULT hr; + unsigned int i; + + reflection->vtbl = &d3dcompiler_shader_reflection_vtbl; + reflection->refcount = 1; + + hr = dxbc_parse(data, data_size, &src_dxbc); + if (FAILED(hr)) + { + WARN("Failed to parse reflection\n"); + return hr; + } + + for (i = 0; i < src_dxbc.count; ++i) + { + struct dxbc_section *section = &src_dxbc.sections[i]; + + switch (section->tag) + { + default: + FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); + break; + } + } + + dxbc_destroy(&src_dxbc); + + return hr; +}

1 0

Alexandre Julliard : winex11: Only map the window the first time that WS_VISIBLE is set through WM_SETREDRAW .
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 026d41c504175b8ee3a8681a585d2a424622c3d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026d41c504175b8ee3a8681a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 19:45:34 2010 +0100 winex11: Only map the window the first time that WS_VISIBLE is set through WM_SETREDRAW. --- dlls/winex11.drv/window.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index dee77bd..2447a5f 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1819,17 +1819,16 @@ void CDECL X11DRV_SetWindowText( HWND hwnd, LPCWSTR text ) */ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) { - struct x11drv_win_data *data; + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); DWORD changed; if (hwnd == GetDesktopWindow()) return; changed = style->styleNew ^ style->styleOld; - if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE)) + /* if WS_VISIBLE was set through WM_SETREDRAW, map the window if it's the first time */ + if (offset == GWL_STYLE && (changed & WS_VISIBLE) && (style->styleNew & WS_VISIBLE) && !data) { - /* we don't unmap windows, that causes trouble with the window manager */ - if (!(data = X11DRV_get_win_data( hwnd )) && - !(data = X11DRV_create_win_data( hwnd ))) return; + if (!(data = X11DRV_create_win_data( hwnd ))) return; if (data->whole_window && is_window_rect_mapped( &data->window_rect )) { @@ -1838,20 +1837,13 @@ void CDECL X11DRV_SetWindowStyle( HWND hwnd, INT offset, STYLESTRUCT *style ) if (!data->mapped) map_window( display, data, style->styleNew ); } } + if (!data || !data->whole_window) return; if (offset == GWL_STYLE && (changed & WS_DISABLED)) - { - data = X11DRV_get_win_data( hwnd ); - if (data && data->whole_window) - set_wm_hints( thread_display(), data ); - } + set_wm_hints( thread_display(), data ); - if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) - { - /* changing WS_EX_LAYERED resets attributes */ - if ((data = X11DRV_get_win_data( hwnd )) && data->whole_window) - sync_window_opacity( thread_display(), data->whole_window, 0, 0, 0 ); - } + if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ + sync_window_opacity( thread_display(), data->whole_window, 0, 0, 0 ); }

1 0

Alexandre Julliard : user32: Return some fake information for an inter-process GetWindowPlacement.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 1829fc51c1d93b46915a340e14303401862defd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1829fc51c1d93b46915a340e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 20:43:26 2010 +0100 user32: Return some fake information for an inter-process GetWindowPlacement. --- dlls/user32/winpos.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 716616f..6b623d2 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1229,8 +1229,18 @@ BOOL WINAPI GetWindowPlacement( HWND hwnd, WINDOWPLACEMENT *wndpl ) } if (pWnd == WND_OTHER_PROCESS) { - if (IsWindow( hwnd )) FIXME( "not supported on other process window %p\n", hwnd ); - return FALSE; + if (!IsWindow( hwnd )) return FALSE; + FIXME( "not supported on other process window %p\n", hwnd ); + /* provide some dummy information */ + wndpl->length = sizeof(*wndpl); + wndpl->showCmd = SW_SHOWNORMAL; + wndpl->flags = 0; + wndpl->ptMinPosition.x = -1; + wndpl->ptMinPosition.y = -1; + wndpl->ptMaxPosition.x = -1; + wndpl->ptMaxPosition.y = -1; + GetWindowRect( hwnd, &wndpl->rcNormalPosition ); + return TRUE; } /* update the placement according to the current style */

1 0

Alexandre Julliard : msxml4: Add a typelib resource.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: 5293d1fd03b06593c193e73c5e34a11f6849f153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5293d1fd03b06593c193e73c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 20:52:26 2010 +0100 msxml4: Add a typelib resource. --- .gitignore | 1 + dlls/msxml4/Makefile.in | 4 + dlls/msxml4/msxml4_tlb.idl | 3240 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml4/rsrc.rc | 22 + 4 files changed, 3267 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5293d1fd03b06593c193e…

1 0

Alexandre Julliard : msxml4: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: wine Branch: master Commit: f4b7222b98a89ca964f69621c846f6d570ebebab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b7222b98a89ca964f69621c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 9 21:04:15 2010 +0100 msxml4: Convert dll registration to the IRegistrar mechanism. --- dlls/msxml4/Makefile.in | 4 +- dlls/msxml4/main.c | 25 +++- dlls/msxml4/msxml4_tlb.idl | 33 +++ dlls/msxml4/regsvr.c | 471 -------------------------------------------- 4 files changed, 58 insertions(+), 475 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4b7222b98a89ca964f69…

1 0

Alexandre Julliard : winetest: Add support for tests skipped by the user.
by Alexandre Julliard 10 Dec '10

10 Dec '10

Module: tools Branch: master Commit: 76d99803791cd5527ca2beca2f77589616ca4a1f URL: http://source.winehq.org/git/tools.git/?a=commit;h=76d99803791cd5527ca2beca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 17:40:57 2010 +0100 winetest: Add support for tests skipped by the user. --- winetest/dissect | 18 ++++++++++++++++-- winetest/gather | 28 ++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 00edcc5..9dd1903 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -233,6 +233,10 @@ while ($_ = <IN>) { { print SUM "- $module - missing - - - - -\n"; } + elsif ($2 eq "skipped") + { + print SUM "- $module - skipped - - - - -\n"; + } } /^Test output:/ or mydie "no test header: $_"; @@ -245,14 +249,20 @@ my $testbox; while (<IN>) { if (!defined $dll) { # new test next if /^\s*$/; - m[([_.a-z0-9]+):([_a-z0-9]+) start ([/_.a-z0-9]+) (-|[.0-9a-f]+)\r?$] + m[([_.a-z0-9]+):([_a-z0-9]+) (start|skipped) ([/_.a-z0-9]+) (-|[.0-9a-f]+)\r?$] or next; - ($dll,$unit,$source,$rev) = ($1,$2,$3,$4); + ($dll,$unit,$source,$rev) = ($1,$2,$4,$5); $testbox = create_box( "$dll:$unit", "testfile", "<a href=\"$gitweb/?a=history;f=$source;hb=$testbuild\">$source</a>" ); if (defined($dllinfo{$dll}->{version}) && !defined($dllinfo{$dll}->{first})) { $dllinfo{$dll}->{first} = "$dll:$unit"; } + if ($3 eq "skipped") + { + $testbox->{data} .= sprintf "<div class=\"test result skipped\">Skipped by user request.</div>\n"; + print SUM "- $dll $unit skipped - - - $source $rev\n"; + $dll = undef; + } } elsif (/^(.*$unit.*: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; $total += $2; @@ -320,6 +330,10 @@ foreach my $dll (sort keys %dllinfo) { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing</td></tr>\n", escapeHTML($dll); } + elsif ($dllinfo{$dll}->{version} eq "skipped") + { + $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">skipped by user request</td></tr>\n", escapeHTML($dll); + } elsif ($dllinfo{$dll}->{version} eq "load error 1157") { $box->{data} .= sprintf "<tr><td>%s</td><td class=\"skipped\">missing dependencies</td></tr>\n", escapeHTML($dll); diff --git a/winetest/gather b/winetest/gather index 6cfc954..ccce11c 100755 --- a/winetest/gather +++ b/winetest/gather @@ -144,7 +144,12 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { if ($count eq "missing") { - $report->{dllmissing}->{$dll} = 1; + $report->{dllmissing}->{$dll} = "dll missing"; + next; + } + if ($unit eq "-" and $count eq "skipped") + { + $report->{dllmissing}->{$dll} = "skipped"; next; } @@ -160,6 +165,11 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { } else { $report->{$testname} = { status => $todos }; } + } elsif ($count eq "skipped") { + $report->{$testname} = { status => "skipped", + count => [ 1, 1 ], + skips => [ 1, 1 ] + }; } else { $report->{$testname} = { status => "run", count => [ $count, $count ], @@ -199,11 +209,11 @@ sub merge_status($$) my ($group_result, $result) = @_; if (!defined $group_result->{status}) { $group_result->{status} = $result->{status}; - } elsif ($group_result->{status} eq "dll missing" and + } elsif ($group_result->{status} =~ /^(dll missing|skipped)$/ and $result->{status} eq "run") { $group_result->{status} = "run"; } elsif ($group_result->{status} eq "run" and - $result->{status} eq "dll missing") { + $result->{status} =~ /^(dll missing|skipped)$/) { ; # Nothing to do } elsif ($group_result->{status} ne $result->{status}) { $group_result->{status} = "mixed"; @@ -232,7 +242,7 @@ foreach my $group (@groups) { my $filelimit = $report->{filelimit}; if (exists $report->{dllmissing}->{$dll}) { # Mark this test as missing because of a missing dll - $report->{$testname} = { status => "dll missing", + $report->{$testname} = { status => $report->{dllmissing}->{$dll}, count => [ 1, 1 ], skips => [ 1, 1 ] }; @@ -256,6 +266,7 @@ foreach my $group (@groups) { } $group->{$testname} = $group_result; if ($group_result->{status} eq "dll missing" or + $group_result->{status} eq "skipped" or ($group_result->{status} eq "run" and $group_result->{errors}->[1] == 0 and $group_result->{todos}->[1] == 0 and @@ -278,7 +289,7 @@ foreach my $group (@groups) { $report->{todos} = 0; foreach my $testname (sort keys %alltests) { my $result = $report->{$testname}; - if ($result->{status} !~ /^(?:dll missing|run)$/ or + if ($result->{status} !~ /^(?:dll missing|run|skipped)$/ or ($result->{status} eq "run" and $result->{errors}->[1] != 0)) { @@ -427,7 +438,7 @@ sub get_result_class($) $class .= " also-skip" if ($result->{skips}->[1]); return "result $class"; } - if ($result->{status} eq "dll missing") + if ($result->{status} eq "dll missing" or $result->{status} eq "skipped") { return "result pass also-skip"; } @@ -455,6 +466,7 @@ sub get_result_title($$) $dll.=".dll" if ($dll !~ /\./); return "No tests run as $dll is not present on this system"; } + if ($result->{status} eq "skipped") { return "Test skipped by user request"; } if ($result->{status} eq "winetest crash") { return "Test did not run as winetest crashed"; } if ($result->{status} eq "filelimit") { return "Test is missing because of a partial report file"; } if ($result->{status} eq "missing") { return "Test did not run for an unknown reason"; } @@ -526,6 +538,10 @@ sub singletest($$$) { { $msg = "not run"; } + elsif ($status eq "skipped") + { + $msg = "skipped"; + } elsif ($status eq "mixed") { $msg = "mixed";

1 0

Jacek Caban : mshtml: Associate PluginHost with containing HTMLDocumentDode .
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: b962fff243906ba56295aeeacf66142f0388638b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b962fff243906ba56295aeeac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 16:27:51 2010 +0100 mshtml: Associate PluginHost with containing HTMLDocumentDode. --- dlls/mshtml/htmldoc.c | 3 +++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/npplugin.c | 2 +- dlls/mshtml/pluginhost.c | 17 ++++++++++++++++- dlls/mshtml/pluginhost.h | 6 +++++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index e9a0cd6..a4c1451 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -35,6 +35,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "pluginhost.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -1897,6 +1898,7 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_selection(This); detach_ranges(This); + detach_plugin_hosts(This); release_nodes(This); if(This->nsdoc) { @@ -1982,6 +1984,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLWindow *wi list_init(&doc->bindings); list_init(&doc->selection_list); list_init(&doc->range_list); + list_init(&doc->plugin_hosts); return doc; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c27a068..269962f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -618,6 +618,7 @@ struct HTMLDocumentNode { struct list bindings; struct list selection_list; struct list range_list; + struct list plugin_hosts; }; #define HTMLWINDOW2(x) ((IHTMLWindow2*) &(x)->lpHTMLWindow2Vtbl) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 60f2125..a1c1c47 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -272,7 +272,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I PluginHost *host; HRESULT hres; - hres = create_plugin_host(obj, &host); + hres = create_plugin_host(window->doc, obj, &host); nsIDOMElement_Release(nselem); IUnknown_Release(obj); if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index e7f39d8..27404f6 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -160,6 +160,7 @@ static ULONG WINAPI PHClientSite_Release(IOleClientSite *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + list_remove(&This->entry); if(This->plugin_unk) IUnknown_Release(This->plugin_unk); heap_free(This); @@ -731,7 +732,18 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { PHServiceProvider_QueryService }; -HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) +void detach_plugin_hosts(HTMLDocumentNode *doc) +{ + PluginHost *iter; + + while(!list_empty(&doc->plugin_hosts)) { + iter = LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry); + list_remove(&iter->entry); + iter->doc = NULL; + } +} + +HRESULT create_plugin_host(HTMLDocumentNode *doc, IUnknown *unk, PluginHost **ret) { PluginHost *host; @@ -753,6 +765,9 @@ HRESULT create_plugin_host(IUnknown *unk, PluginHost **ret) IUnknown_AddRef(unk); host->plugin_unk = unk; + host->doc = doc; + list_add_tail(&doc->plugin_hosts, &host->entry); + *ret = host; return S_OK; } diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 2b66696..ab61523 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -32,7 +32,11 @@ typedef struct { IUnknown *plugin_unk; HWND hwnd; + + HTMLDocumentNode *doc; + struct list entry; } PluginHost; -HRESULT create_plugin_host(IUnknown*,PluginHost**); +HRESULT create_plugin_host(HTMLDocumentNode*,IUnknown*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); +void detach_plugin_hosts(HTMLDocumentNode*);

1 0

Jacek Caban : mshtml: Inherit HTMLObjectElement from new HTMLPluginContainer object.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: bfc49aa7f308f2e7446efae19e1f3adbbff59571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc49aa7f308f2e7446efae19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 16:28:18 2010 +0100 mshtml: Inherit HTMLObjectElement from new HTMLPluginContainer object. --- dlls/mshtml/htmlobject.c | 33 +++++++++++++++++++-------------- dlls/mshtml/pluginhost.c | 3 +++ dlls/mshtml/pluginhost.h | 10 +++++++++- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 482bac9..a2f5322 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -29,11 +29,12 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "pluginhost.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - HTMLElement element; + HTMLPluginContainer plugin_container; IHTMLObjectElement IHTMLObjectElement_iface; @@ -50,34 +51,34 @@ static HRESULT WINAPI HTMLObjectElement_QueryInterface(IHTMLObjectElement *iface { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->plugin_container.element.node), riid, ppv); } static ULONG WINAPI HTMLObjectElement_AddRef(IHTMLObjectElement *iface) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->plugin_container.element.node)); } static ULONG WINAPI HTMLObjectElement_Release(IHTMLObjectElement *iface) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->plugin_container.element.node)); } static HRESULT WINAPI HTMLObjectElement_GetTypeInfoCount(IHTMLObjectElement *iface, UINT *pctinfo) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->plugin_container.element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLObjectElement_GetTypeInfo(IHTMLObjectElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->plugin_container.element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLObjectElement_GetIDsOfNames(IHTMLObjectElement *iface, REFIID riid, @@ -85,7 +86,7 @@ static HRESULT WINAPI HTMLObjectElement_GetIDsOfNames(IHTMLObjectElement *iface, LCID lcid, DISPID *rgDispId) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->plugin_container.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI HTMLObjectElement_Invoke(IHTMLObjectElement *iface, DISPID dispIdMember, @@ -93,7 +94,7 @@ static HRESULT WINAPI HTMLObjectElement_Invoke(IHTMLObjectElement *iface, DISPID VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, + return IDispatchEx_Invoke(DISPATCHEX(&This->plugin_container.element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } @@ -390,7 +391,7 @@ static const IHTMLObjectElementVtbl HTMLObjectElementVtbl = { HTMLObjectElement_get_hspace }; -#define HTMLOBJECT_NODE_THIS(iface) DEFINE_THIS2(HTMLObjectElement, element.node, iface) +#define HTMLOBJECT_NODE_THIS(iface) DEFINE_THIS2(HTMLObjectElement, plugin_container.element.node, iface) static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { @@ -405,8 +406,12 @@ static HRESULT HTMLObjectElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLObjectElement, riid)) { TRACE("(%p)->(IID_IHTMLObjectElement %p)\n", This, ppv); *ppv = &This->IHTMLObjectElement_iface; + }else if(IsEqualGUID(&IID_HTMLPluginContainer, riid)) { + TRACE("(%p)->(IID_HTMLPluginContainer %p)\n", This, ppv); + *ppv = &This->plugin_container; + return S_OK; }else { - return HTMLElement_QI(&This->element.node, riid, ppv); + return HTMLElement_QI(&This->plugin_container.element.node, riid, ppv); } IUnknown_AddRef((IUnknown*)*ppv); @@ -420,7 +425,7 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) if(This->nsobject) nsIDOMHTMLObjectElement_Release(This->nsobject); - HTMLElement_destructor(&This->element.node); + HTMLElement_destructor(&This->plugin_container.element.node); } static HRESULT HTMLObjectElement_get_readystate(HTMLDOMNode *iface, BSTR *p) @@ -466,7 +471,7 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele return E_OUTOFMEMORY; ret->IHTMLObjectElement_iface.lpVtbl = &HTMLObjectElementVtbl; - ret->element.node.vtbl = &HTMLObjectElementImplVtbl; + ret->plugin_container.element.node.vtbl = &HTMLObjectElementImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLObjectElement, (void**)&ret->nsobject); if(NS_FAILED(nsres)) { @@ -475,8 +480,8 @@ HRESULT HTMLObjectElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele return E_FAIL; } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLObjectElement_dispex); + HTMLElement_Init(&ret->plugin_container.element, doc, nselem, &HTMLObjectElement_dispex); - *elem = &ret->element; + *elem = &ret->plugin_container.element; return S_OK; } diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 27404f6..2af929c 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +const IID IID_HTMLPluginContainer = + {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}}; + static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index ab61523..1c80a9c 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -typedef struct HTMLObjectElement HTMLObjectElement; +typedef struct HTMLPluginContainer HTMLPluginContainer; typedef struct { IOleClientSite IOleClientSite_iface; @@ -37,6 +37,14 @@ typedef struct { struct list entry; } PluginHost; +struct HTMLPluginContainer { + HTMLElement element; + + PluginHost *plugin_host; +}; + +extern const IID IID_HTMLPluginContainer; + HRESULT create_plugin_host(HTMLDocumentNode*,IUnknown*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); void detach_plugin_hosts(HTMLDocumentNode*);

1 0

Jacek Caban : mshtml: Associate PluginHost with containing element.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 483fe27730f8b5c06e1718b25a3c27483622f398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483fe27730f8b5c06e1718b25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 16:28:34 2010 +0100 mshtml: Associate PluginHost with containing element. --- dlls/mshtml/htmlobject.c | 2 ++ dlls/mshtml/npplugin.c | 2 +- dlls/mshtml/pluginhost.c | 32 +++++++++++++++++++++++++++++++- dlls/mshtml/pluginhost.h | 4 +++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index a2f5322..c911dd8 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -422,6 +422,8 @@ static void HTMLObjectElement_destructor(HTMLDOMNode *iface) { HTMLObjectElement *This = HTMLOBJECT_NODE_THIS(iface); + if(This->plugin_container.plugin_host) + This->plugin_container.plugin_host->element = NULL; if(This->nsobject) nsIDOMHTMLObjectElement_Release(This->nsobject); diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index a1c1c47..93e22da 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -272,7 +272,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I PluginHost *host; HRESULT hres; - hres = create_plugin_host(window->doc, obj, &host); + hres = create_plugin_host(window->doc, nselem, obj, &host); nsIDOMElement_Release(nselem); IUnknown_Release(obj); if(SUCCEEDED(hres)) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 2af929c..785abdd 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -164,6 +164,8 @@ static ULONG WINAPI PHClientSite_Release(IOleClientSite *iface) if(!ref) { list_remove(&This->entry); + if(This->element) + This->element->plugin_host = NULL; if(This->plugin_unk) IUnknown_Release(This->plugin_unk); heap_free(This); @@ -735,6 +737,27 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { PHServiceProvider_QueryService }; +static HRESULT assoc_element(PluginHost *host, HTMLDocumentNode *doc, nsIDOMElement *nselem) +{ + HTMLPluginContainer *container_elem; + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(doc, (nsIDOMNode*)nselem, TRUE, &node); + if(FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(HTMLDOMNODE(node), &IID_HTMLPluginContainer, (void**)&container_elem); + if(FAILED(hres)) { + ERR("Not an object element\n"); + return hres; + } + + container_elem->plugin_host = host; + host->element = container_elem; + return S_OK; +} + void detach_plugin_hosts(HTMLDocumentNode *doc) { PluginHost *iter; @@ -746,9 +769,10 @@ void detach_plugin_hosts(HTMLDocumentNode *doc) } } -HRESULT create_plugin_host(HTMLDocumentNode *doc, IUnknown *unk, PluginHost **ret) +HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, PluginHost **ret) { PluginHost *host; + HRESULT hres; host = heap_alloc_zero(sizeof(*host)); if(!host) @@ -765,6 +789,12 @@ HRESULT create_plugin_host(HTMLDocumentNode *doc, IUnknown *unk, PluginHost **re host->ref = 1; + hres = assoc_element(host, doc, nselem); + if(FAILED(hres)) { + heap_free(host); + return hres; + } + IUnknown_AddRef(unk); host->plugin_unk = unk; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 1c80a9c..d030a3e 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -35,6 +35,8 @@ typedef struct { HTMLDocumentNode *doc; struct list entry; + + HTMLPluginContainer *element; } PluginHost; struct HTMLPluginContainer { @@ -45,6 +47,6 @@ struct HTMLPluginContainer { extern const IID IID_HTMLPluginContainer; -HRESULT create_plugin_host(HTMLDocumentNode*,IUnknown*,PluginHost**); +HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); void detach_plugin_hosts(HTMLDocumentNode*);

1 0

Jacek Caban : mshtml: Added support for CONFIRMSAFETYACTION_LOADOBJECT flag in CONFIRMSAFETY struct .
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 331460793c7bdcb1a4ccc16cc98864aabc217345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331460793c7bdcb1a4ccc16cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 9 16:28:58 2010 +0100 mshtml: Added support for CONFIRMSAFETYACTION_LOADOBJECT flag in CONFIRMSAFETY struct. --- dlls/mshtml/secmgr.c | 72 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 54 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index c74e19f..9673e8e 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -84,6 +84,30 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost pContext, cbContext, dwFlags, dwReserved); } +static HRESULT confirm_safety_load(HTMLDocumentNode *This, struct CONFIRMSAFETY *cs, DWORD *ret) +{ + IObjectSafety *obj_safety; + HRESULT hres; + + hres = IUnknown_QueryInterface(cs->pUnk, &IID_IObjectSafety, (void**)&obj_safety); + if(SUCCEEDED(hres)) { + hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatch, + INTERFACESAFE_FOR_UNTRUSTED_DATA, INTERFACESAFE_FOR_UNTRUSTED_DATA); + IObjectSafety_Release(obj_safety); + *ret = SUCCEEDED(hres) ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; + }else { + CATID init_catid = CATID_SafeForInitializing; + + hres = ICatInformation_IsClassOfCategories(This->catmgr, &cs->clsid, 1, &init_catid, 0, NULL); + if(FAILED(hres)) + return hres; + + *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; + } + + return S_OK; +} + static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct CONFIRMSAFETY *cs, DWORD *ret) { DWORD policy, enabled_opts, supported_opts; @@ -102,7 +126,27 @@ static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct C } hres = IUnknown_QueryInterface(cs->pUnk, &IID_IObjectSafety, (void**)&obj_safety); - if(FAILED(hres)) { + if(SUCCEEDED(hres)) { + hres = IObjectSafety_GetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, &supported_opts, &enabled_opts); + if(FAILED(hres)) + supported_opts = 0; + + enabled_opts = INTERFACESAFE_FOR_UNTRUSTED_CALLER; + if(supported_opts & INTERFACE_USES_SECURITY_MANAGER) + enabled_opts |= INTERFACE_USES_SECURITY_MANAGER; + + hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, enabled_opts, enabled_opts); + if(FAILED(hres)) { + enabled_opts &= ~INTERFACE_USES_SECURITY_MANAGER; + hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatch, enabled_opts, enabled_opts); + } + IObjectSafety_Release(obj_safety); + + if(FAILED(hres)) { + *ret = URLPOLICY_DISALLOW; + return S_OK; + } + }else { CATID scripting_catid = CATID_SafeForScripting; if(!This->catmgr) { @@ -116,26 +160,16 @@ static HRESULT confirm_safety(HTMLDocumentNode *This, const WCHAR *url, struct C if(FAILED(hres)) return hres; - *ret = hres == S_OK ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; - return S_OK; + if(hres != S_OK) { + *ret = URLPOLICY_DISALLOW; + return S_OK; + } } - hres = IObjectSafety_GetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, &supported_opts, &enabled_opts); - if(FAILED(hres)) - supported_opts = 0; - - enabled_opts = INTERFACESAFE_FOR_UNTRUSTED_CALLER; - if(supported_opts & INTERFACE_USES_SECURITY_MANAGER) - enabled_opts |= INTERFACE_USES_SECURITY_MANAGER; + if(cs->dwFlags & CONFIRMSAFETYACTION_LOADOBJECT) + return confirm_safety_load(This, cs, ret); - hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, enabled_opts, enabled_opts); - if(FAILED(hres)) { - enabled_opts &= ~INTERFACE_USES_SECURITY_MANAGER; - hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatch, enabled_opts, enabled_opts); - } - IObjectSafety_Release(obj_safety); - - *ret = SUCCEEDED(hres) ? URLPOLICY_ALLOW : URLPOLICY_DISALLOW; + *ret = URLPOLICY_ALLOW; return S_OK; } @@ -166,6 +200,8 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos } cs = (struct CONFIRMSAFETY*)pContext; + TRACE("cs = {%s %p %x}\n", debugstr_guid(&cs->clsid), cs->pUnk, cs->dwFlags); + hres = IUnknown_QueryInterface(cs->pUnk, &IID_IActiveScript, (void**)&active_script); if(SUCCEEDED(hres)) { FIXME("Got IAciveScript iface\n");

1 0