December 2010 - Wine-Commits

Jacek Caban : mshtml: Added more plugin in place activation support.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 41ca6568be0666dbd9063a2c298fd1d7dcf19ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41ca6568be0666dbd9063a2c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:58 2010 +0100 mshtml: Added more plugin in place activation support. --- dlls/mshtml/pluginhost.c | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index cc90dc7..8f280c5 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -208,21 +208,39 @@ static void activate_plugin(PluginHost *host) IOleObject_Release(ole_obj); if(FAILED(hres)) WARN("DoVerb failed: %08x\n", hres); + + if(host->ip_object) { + HWND hwnd; + + hres = IOleInPlaceObject_GetWindow(host->ip_object, &hwnd); + if(SUCCEEDED(hres)) + TRACE("hwnd %p\n", hwnd); + } } void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) { + BOOL rect_changed = FALSE; + if(!hwnd || (host->hwnd && host->hwnd != hwnd)) { FIXME("unhandled hwnd\n"); return; } - host->rect = *rect; + TRACE("%p %s\n", hwnd, wine_dbgstr_rect(rect)); + + if(memcmp(rect, &host->rect, sizeof(RECT))) { + host->rect = *rect; + rect_changed = TRUE; + } if(!host->hwnd) { host->hwnd = hwnd; activate_plugin(host); } + + if(rect_changed && host->ip_object) + IOleInPlaceObject_SetObjectRects(host->ip_object, &host->rect, &host->rect); } static inline PluginHost *impl_from_IOleClientSite(IOleClientSite *iface) @@ -602,8 +620,11 @@ static ULONG WINAPI PHInPlaceSite_Release(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_GetWindow(IOleInPlaceSiteEx *iface, HWND *phwnd) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)->(%p)\n", This, phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, phwnd); + + *phwnd = This->hwnd; + return S_OK; } static HRESULT WINAPI PHInPlaceSite_ContextSensitiveHelp(IOleInPlaceSiteEx *iface, BOOL fEnterMode) @@ -693,8 +714,15 @@ static HRESULT WINAPI PHInPlaceSite_OnUIDeactivate(IOleInPlaceSiteEx *iface, BOO static HRESULT WINAPI PHInPlaceSite_OnInPlaceDeactivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + if(This->ip_object) { + IOleInPlaceObject_Release(This->ip_object); + This->ip_object = NULL; + } + + return S_OK; } static HRESULT WINAPI PHInPlaceSite_DiscardUndoState(IOleInPlaceSiteEx *iface)

1 0

Jacek Caban : mshtml: Added more ActiveX tests.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 4fd57881374ba9cb04c7dec90e0727895980a8df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fd57881374ba9cb04c7dec90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:01:08 2010 +0100 mshtml: Added more ActiveX tests. --- dlls/mshtml/tests/activex.c | 443 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 438 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4fd57881374ba9cb04c7d…

1 0

André Hentschel : advapi32: Fix test failure on some NT4 machines.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: f36b59349832450b6456d58a6b580abc06901e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36b59349832450b6456d58a6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 12 22:28:18 2010 +0100 advapi32: Fix test failure on some NT4 machines. --- dlls/advapi32/tests/crypt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 6cfbbbf..99f113d 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -945,7 +945,8 @@ static void test_machine_guid(void) r); /* Create and release a provider */ ret = pCryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); - ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); + ok(ret || broken(!ret && GetLastError() == NTE_KEYSET_ENTRY_BAD /* NT4 */), + "CryptAcquireContextA failed: %08x\n", GetLastError()); pCryptReleaseContext(hCryptProv, 0); if (restoreGuid)

1 0

André Hentschel : rsaenh: Fix test failure on some NT4 machines.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 59852bc3a06c352947c7b475133371f4d9206da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59852bc3a06c352947c7b4751… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 12 22:28:44 2010 +0100 rsaenh: Fix test failure on some NT4 machines. --- dlls/rsaenh/tests/rsaenh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 5ee85f4..8f46a09 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2362,7 +2362,8 @@ static void test_rsa_round_trip(void) dataLen = strlen(test_string) + 1; result = CryptEncrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen, sizeof(data)); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptEncrypt failed: %08x\n", GetLastError()); /* export the key... */ result = CryptExportKey(keyExchangeKey, 0, PRIVATEKEYBLOB, 0, NULL, @@ -2382,7 +2383,8 @@ static void test_rsa_round_trip(void) * key. */ result = CryptDecrypt(keyExchangeKey, 0, TRUE, 0, data, &dataLen); - ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */), + ok(result || broken(GetLastError() == NTE_BAD_KEY /* Win9x/2000 */) || + broken(GetLastError() == NTE_PERM /* NT4 */), "CryptDecrypt failed: %08x\n", GetLastError()); if (result) {

1 0

Piotr Caban : sane.ds: Convert Polish translation to UTF-8.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: c0c781b14d4ad95de48095eb9f1bf9bdddd0dc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c781b14d4ad95de48095eb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 13 16:20:14 2010 +0100 sane.ds: Convert Polish translation to UTF-8. --- dlls/sane.ds/sane_Pl.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_Pl.rc b/dlls/sane.ds/sane_Pl.rc index 935c65c..11ffe0f 100644 --- a/dlls/sane.ds/sane_Pl.rc +++ b/dlls/sane.ds/sane_Pl.rc @@ -21,6 +21,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG 0, 0, 186, 46 @@ -28,7 +30,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTE CAPTION "Skanowanie" FONT 8, "MS Sans Serif" BEGIN - LTEXT "TRWA SKANOWANIE... Prosz� czeka�",IDC_STATIC,5,19,181,8, SS_CENTER + LTEXT "TRWA SKANOWANIE... Proszę czekać",IDC_STATIC,5,19,181,8, SS_CENTER END STRINGTABLE

1 0

André Hentschel : ntdll: Fix test failure on some NT4 machines.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 74fecb35138b2162c20d1c717267b28c57cfece3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74fecb35138b2162c20d1c717… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 12 22:28:36 2010 +0100 ntdll: Fix test failure on some NT4 machines. --- dlls/ntdll/tests/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c index 1e44da0..d9c83b3 100644 --- a/dlls/ntdll/tests/error.c +++ b/dlls/ntdll/tests/error.c @@ -224,7 +224,7 @@ static void run_error_tests(void) cmp(STATUS_WRONG_VOLUME, ERROR_WRONG_DISK); cmp(STATUS_NO_MEDIA, ERROR_NO_MEDIA_IN_DRIVE); cmp(STATUS_NO_MEDIA_IN_DEVICE, ERROR_NOT_READY); - cmp(STATUS_VOLUME_DISMOUNTED, ERROR_NOT_READY); + cmp2(STATUS_VOLUME_DISMOUNTED, ERROR_NOT_READY); cmp(STATUS_NONEXISTENT_SECTOR, ERROR_SECTOR_NOT_FOUND); cmp(STATUS_WORKING_SET_QUOTA, ERROR_WORKING_SET_QUOTA); cmp(STATUS_NO_MEMORY, ERROR_NOT_ENOUGH_MEMORY);

1 0

Jacek Caban : mshtml: Added PluginHost::GetWindowContext implementation.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 073a48abe45731ed09ee0a400913d42779a6a975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073a48abe45731ed09ee0a400… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:48 2010 +0100 mshtml: Added PluginHost::GetWindowContext implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/ipwindow.c | 353 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.c | 37 +++++- dlls/mshtml/pluginhost.h | 3 + 4 files changed, 392 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=073a48abe45731ed09ee0…

1 0

Jacek Caban : mshtml: Call DoVerb on embedded plugin.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 146b720f41f357f707f6af067f4fa5b5d153d439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=146b720f41f357f707f6af067… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:15 2010 +0100 mshtml: Call DoVerb on embedded plugin. --- dlls/mshtml/pluginhost.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index fc50be8..5b8ab71 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -88,6 +88,15 @@ static void update_readystate(PluginHost *host) } } +/* FIXME: We shouldn't need this function and we should embed plugin directly in the main document */ +void get_pos_rect(PluginHost *host, RECT *ret) +{ + ret->top = 0; + ret->left = 0; + ret->bottom = host->rect.bottom - host->rect.top; + ret->right = host->rect.right - host->rect.left; +} + static void load_prop_bag(PluginHost *host, IPersistPropertyBag *persist_prop_bag) { IPropertyBag *prop_bag; @@ -141,6 +150,9 @@ static void activate_plugin(PluginHost *host) { IClientSecurity *client_security; IQuickActivate *quick_activate; + IOleCommandTarget *cmdtrg; + IOleObject *ole_obj; + RECT rect; HRESULT hres; if(!host->plugin_unk) @@ -176,6 +188,26 @@ static void activate_plugin(PluginHost *host) } load_plugin(host); + + /* NOTE: Native QIs for IViewObjectEx, IActiveScript, an undocumented IID, IOleControl and IRunnableObject */ + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + FIXME("Use IOleCommandTarget\n"); + IOleCommandTarget_Release(cmdtrg); + } + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); + if(FAILED(hres)) { + FIXME("Plugin does not support IOleObject\n"); + return; + } + + get_pos_rect(host, &rect); + hres = IOleObject_DoVerb(ole_obj, OLEIVERB_INPLACEACTIVATE, NULL, &host->IOleClientSite_iface, 0, host->hwnd, &rect); + IOleObject_Release(ole_obj); + if(FAILED(hres)) + WARN("DoVerb failed: %08x\n", hres); } void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) @@ -185,6 +217,8 @@ void update_plugin_window(PluginHost *host, HWND hwnd, const RECT *rect) return; } + host->rect = *rect; + if(!host->hwnd) { host->hwnd = hwnd; activate_plugin(host);

1 0

Alexandre Julliard : comctl32: Fix positioning of tracking tooltips at the bottom of the screen.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 84a86d4897991360c6dc17f2ad9765282c32e06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a86d4897991360c6dc17f2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 13 16:24:49 2010 +0100 comctl32: Fix positioning of tracking tooltips at the bottom of the screen. --- dlls/comctl32/tooltips.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 5951796..774387a 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -636,7 +636,8 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) if (!(style & TTS_BALLOON)) rect.top -= (size.cy / 2); } - infoPtr->bToolBelow = TRUE; + if (!(infoPtr->bToolBelow = (infoPtr->yTrackPos + size.cy <= GetSystemMetrics(SM_CYSCREEN)))) + rect.top -= size.cy; if (!(toolPtr->uFlags & TTF_ABSOLUTE)) {

1 0

Jacek Caban : mshtml: Deactivate plugin when detaching from document.
by Alexandre Julliard Dec. 13, 2010

Dec. 13, 2010

Module: wine Branch: master Commit: 52cc865cdc2fd060f6bc4a0588cbf310a2dd809e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52cc865cdc2fd060f6bc4a058… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 13 16:00:37 2010 +0100 mshtml: Deactivate plugin when detaching from document. --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/htmlobject.c | 2 +- dlls/mshtml/npplugin.c | 1 + dlls/mshtml/pluginhost.c | 34 ++++++++++++++++++++++++++++------ dlls/mshtml/pluginhost.h | 2 +- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a4c1451..7cfa273 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1898,9 +1898,11 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) detach_selection(This); detach_ranges(This); - detach_plugin_hosts(This); release_nodes(This); + while(!list_empty(&This->plugin_hosts)) + detach_plugin_host(LIST_ENTRY(list_head(&This->plugin_hosts), PluginHost, entry)); + if(This->nsdoc) { release_mutation(This); nsIDOMHTMLDocument_Release(This->nsdoc); diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index c911dd8..1cb8d60 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -423,7 +423,7 @@ 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; + detach_plugin_host(This->plugin_container.plugin_host); if(This->nsobject) nsIDOMHTMLObjectElement_Release(This->nsobject); diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index ad88da2..20a30ab 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -296,6 +296,7 @@ static NPError CDECL NPP_Destroy(NPP instance, NPSavedData **save) if(!host) return NPERR_GENERIC_ERROR; + detach_plugin_host(host); IOleClientSite_Release(&host->IOleClientSite_iface); instance->pdata = NULL; return NPERR_NO_ERROR; diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8a7e2a6..bce884e 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -954,15 +954,37 @@ static HRESULT assoc_element(PluginHost *host, HTMLDocumentNode *doc, nsIDOMElem return S_OK; } -void detach_plugin_hosts(HTMLDocumentNode *doc) +void detach_plugin_host(PluginHost *host) { - PluginHost *iter; + HRESULT hres; + + TRACE("%p\n", host); + + if(!host->doc) + return; + + if(host->ip_object) + IOleInPlaceObject_InPlaceDeactivate(host->ip_object); - while(!list_empty(&doc->plugin_hosts)) { - iter = LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry); - list_remove(&iter->entry); - iter->doc = NULL; + if(host->plugin_unk) { + IOleObject *ole_obj; + + hres = IUnknown_QueryInterface(host->plugin_unk, &IID_IOleObject, (void**)&ole_obj); + if(SUCCEEDED(hres)) { + if(!host->ip_object) + IOleObject_Close(ole_obj, OLECLOSE_NOSAVE); + IOleObject_SetClientSite(ole_obj, NULL); + IOleObject_Release(ole_obj); + } } + + if(host->element) { + host->element->plugin_host = NULL; + host->element = NULL; + } + + list_remove(&host->entry); + host->doc = NULL; } HRESULT create_plugin_host(HTMLDocumentNode *doc, nsIDOMElement *nselem, IUnknown *unk, const CLSID *clsid, PluginHost **ret) diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 30af989..135b2a8 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -52,6 +52,6 @@ extern const IID IID_HTMLPluginContainer; HRESULT create_plugin_host(HTMLDocumentNode*,nsIDOMElement*,IUnknown*,const CLSID*,PluginHost**); void update_plugin_window(PluginHost*,HWND,const RECT*); -void detach_plugin_hosts(HTMLDocumentNode*); +void detach_plugin_host(PluginHost*); HRESULT create_param_prop_bag(nsIDOMHTMLElement*,IPropertyBag**);

1 0