Jacek Caban : shdocvw: Don't do verb that is already done.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue May 23 15:22:45 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 4ee19c81bb267daa377ed8bfe778f7c96a60ec58
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4ee19c81bb267daa377ed8bfe778f7c96a60ec58
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue May 23 20:06:55 2006 +0200
shdocvw: Don't do verb that is already done.
---
dlls/shdocvw/oleobject.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c
index c6a35aa..d9fec8e 100644
--- a/dlls/shdocvw/oleobject.c
+++ b/dlls/shdocvw/oleobject.c
@@ -103,14 +103,12 @@ static HRESULT activate_inplace(WebBrows
{
HRESULT hres;
+ if(This->inplace)
+ return S_OK;
+
if(!active_site)
return E_INVALIDARG;
- if(This->inplace) {
- IOleInPlaceSite_Release(This->inplace);
- This->inplace = NULL;
- }
-
hres = IOleClientSite_QueryInterface(active_site, &IID_IOleInPlaceSite,
(void**)&This->inplace);
if(FAILED(hres)) {
@@ -158,6 +156,9 @@ static HRESULT activate_ui(WebBrowser *T
static const WCHAR wszitem[] = {'i','t','e','m',0};
+ if(This->inplace)
+ return S_OK;
+
hres = activate_inplace(This, active_site, parent_hwnd);
if(FAILED(hres))
return hres;
More information about the wine-cvs
mailing list