Module: wine Branch: master Commit: df1a5cb9d0d5120d359cc8cfbbc1b3eb853fc3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1a5cb9d0d5120d359cc8cfbb...
Author: Francois Gouget fgouget@free.fr Date: Wed Dec 28 10:40:07 2011 +0100
include: Move the ITargetFramePriv* interfaces to htiface.idl.
---
.gitignore | 1 + dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/htiface.idl | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/htiframe.idl | 61 ------------------------------------ 5 files changed, 87 insertions(+), 61 deletions(-)
diff --git a/.gitignore b/.gitignore index 97c1f18..f8756f7 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,7 @@ include/exdisp.h include/fusion.h include/gameux.h include/hlink.h +include/htiface.h include/htiframe.h include/httprequest.h include/iads.h diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 0a60a5c..3318dd6 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -69,6 +69,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "hlink.h" #include "optary.h" #include "indexsrv.h" +#include "htiface.h" #include "htiframe.h" #include "urlhist.h" #include "hlguids.h" diff --git a/include/Makefile.in b/include/Makefile.in index 2d139e4..0c4122e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -38,6 +38,7 @@ PUBLIC_IDL_H_SRCS = \ fusion.idl \ gameux.idl \ hlink.idl \ + htiface.idl \ htiframe.idl \ httprequest.idl \ iads.idl \ diff --git a/include/htiface.idl b/include/htiface.idl new file mode 100644 index 0000000..2c98ec2 --- /dev/null +++ b/include/htiface.idl @@ -0,0 +1,84 @@ +/* + * Copyright 2006,2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "objidl.idl"; +import "oleidl.idl"; +import "urlmon.idl"; + +cpp_quote("#include <htiframe.h>") + + +/***************************************************************************** + * ITargetFramePriv interface + */ +[ + object, + uuid(9216e421-2bf5-11d0-82b4-00a0c90c29c5), + pointer_default(unique) +] +interface ITargetFramePriv : IUnknown +{ + typedef [unique] ITargetFramePriv *LPTARGETFRAMEPRIV; + + HRESULT FindFrameDownwards( + [in] LPCWSTR pszTargetName, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT FindFrameInContext( + [in] LPCWSTR pszTargetName, + [in] IUnknown *punkContextFrame, + [in] DWORD dwFlags, + [out] IUnknown **ppunkTargetFrame); + + HRESULT OnChildFrameActivate([in] IUnknown *pUnkChildFrame); + HRESULT OnChildFrameDeactivate([in] IUnknown *pUnkChildFrame); + + HRESULT NavigateHack( + [in] DWORD grfHLNF, + [in, unique] LPBC pbc, + [in, unique] IBindStatusCallback *pibsc, + [in, unique] LPCWSTR pszTargetName, + [in] LPCWSTR pszUrl, + [in, unique] LPCWSTR pszLocation); + + HRESULT FindBrowserByIndex( + [in] DWORD dwID, + [out] IUnknown **ppunkBrowser); +} + +/***************************************************************************** + * ITargetFramePriv2 interface + */ +[ + object, + uuid(b2c867e6-69d6-46f2-a611-ded9a4bd7fef), + pointer_default(unique) +] +interface ITargetFramePriv2 : ITargetFramePriv +{ + typedef [unique] ITargetFramePriv2 *LPTARGETFRAMEPRIV2; + + HRESULT AggregatedNavigation2( + [in] DWORD grfHLNF, + [in, unique] LPBC pbc, + [in, unique] IBindStatusCallback *pibsc, + [in, unique] LPCWSTR pszTargetName, + [in] IUri *pUri, + [in, unique] LPCWSTR pszLocation); +} diff --git a/include/htiframe.idl b/include/htiframe.idl index 6bf0680..a14de89 100644 --- a/include/htiframe.idl +++ b/include/htiframe.idl @@ -18,7 +18,6 @@
import "objidl.idl"; import "oleidl.idl"; -import "urlmon.idl";
/***************************************************************************** * ITargetNotify interface @@ -133,63 +132,3 @@ interface ITargetContainer : IUnknown HRESULT GetFramesContainer([out] IOleContainer **ppContainer);
} - -/***************************************************************************** - * ITargetFramePriv interface - */ -[ - object, - uuid(9216e421-2bf5-11d0-82b4-00a0c90c29c5), - pointer_default(unique) -] -interface ITargetFramePriv : IUnknown -{ - typedef [unique] ITargetFramePriv *LPTARGETFRAMEPRIV; - - HRESULT FindFrameDownwards( - [in] LPCWSTR pszTargetName, - [in] DWORD dwFlags, - [out] IUnknown **ppunkTargetFrame); - - HRESULT FindFrameInContext( - [in] LPCWSTR pszTargetName, - [in] IUnknown *punkContextFrame, - [in] DWORD dwFlags, - [out] IUnknown **ppunkTargetFrame); - - HRESULT OnChildFrameActivate([in] IUnknown *pUnkChildFrame); - HRESULT OnChildFrameDeactivate([in] IUnknown *pUnkChildFrame); - - HRESULT NavigateHack( - [in] DWORD grfHLNF, - [in, unique] LPBC pbc, - [in, unique] IBindStatusCallback *pibsc, - [in, unique] LPCWSTR pszTargetName, - [in] LPCWSTR pszUrl, - [in, unique] LPCWSTR pszLocation); - - HRESULT FindBrowserByIndex( - [in] DWORD dwID, - [out] IUnknown **ppunkBrowser); -} - -/***************************************************************************** - * ITargetFramePriv2 interface - */ -[ - object, - uuid(b2c867e6-69d6-46f2-a611-ded9a4bd7fef), - pointer_default(unique) -] -interface ITargetFramePriv2 : ITargetFramePriv -{ - typedef [unique] ITargetFramePriv2 *LPTARGETFRAMEPRIV2; - - HRESULT AggregatedNavigation2( - [in] DWORD grfHLNF, - [in, unique] LPBC pbc, - [in, unique] IBindStatusCallback *pibsc, - [in, unique] LPCWSTR pszTargetName, - [in] IUri *pUri, - [in, unique] LPCWSTR pszLocation); -}