ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Merge hlink.c into persist.c. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-11-07 14:28:15 +01:00 committed by Alexandre Julliard
parent 409bafcc73
commit 2de948e86c
5 changed files with 86 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/mshtml/Makefile.in
View File

@ -7,7 +7,6 @@ C_SRCS = \
conpoint.c \
dispex.c \
editor.c \
hlink.c \
htmlanchor.c \
htmlarea.c \
htmlattr.c \

123
dlls/mshtml/hlink.c
View File

@ -1,123 +0,0 @@
/*
* Copyright 2005-2006 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
*/
#include <stdarg.h>
#define COBJMACROS
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "wine/debug.h"
#include "mshtml_private.h"
#include "binding.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/**********************************************************
* IHlinkTarget implementation
*/
static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface)
{
return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface);
}
static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
return htmldoc_query_interface(This, riid, ppv);
}
static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
return htmldoc_addref(This);
}
static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
return htmldoc_release(This);
}
static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%p)\n", This, pihlbc);
return E_NOTIMPL;
}
static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%p)\n", This, ppihlbc);
return E_NOTIMPL;
}
static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation));
if(grfHLNF)
FIXME("Unsupported grfHLNF=%08x\n", grfHLNF);
if(pwzJumpLocation)
FIXME("JumpLocation not supported\n");
if(!This->doc_obj->client)
return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL);
return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL);
}
static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign,
IMoniker **ppimkLocation)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation);
return E_NOTIMPL;
}
static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation,
LPWSTR *ppwzFriendlyName)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName);
return E_NOTIMPL;
}
static const IHlinkTargetVtbl HlinkTargetVtbl = {
HlinkTarget_QueryInterface,
HlinkTarget_AddRef,
HlinkTarget_Release,
HlinkTarget_SetBrowseContext,
HlinkTarget_GetBrowseContext,
HlinkTarget_Navigate,
HlinkTarget_GetMoniker,
HlinkTarget_GetFriendlyName
};
void HTMLDocument_Hlink_Init(HTMLDocument *This)
{
This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl;
}

1
dlls/mshtml/htmldoc.c
View File

@ -4866,7 +4866,6 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex)
HTMLDocument_View_Init(doc);
HTMLDocument_Window_Init(doc);
HTMLDocument_Service_Init(doc);
HTMLDocument_Hlink_Init(doc);
ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocument_cpc);
}

1
dlls/mshtml/mshtml_private.h
View File

@ -869,7 +869,6 @@ void HTMLDocument_OleObj_Init(HTMLDocument*) DECLSPEC_HIDDEN;
void HTMLDocument_View_Init(HTMLDocument*) DECLSPEC_HIDDEN;
void HTMLDocument_Window_Init(HTMLDocument*) DECLSPEC_HIDDEN;
void HTMLDocument_Service_Init(HTMLDocument*) DECLSPEC_HIDDEN;
void HTMLDocument_Hlink_Init(HTMLDocument*) DECLSPEC_HIDDEN;
void TargetContainer_Init(HTMLDocumentObj*) DECLSPEC_HIDDEN;
void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN;

86
dlls/mshtml/persist.c
View File

@ -1137,6 +1137,91 @@ static const IPersistHistoryVtbl PersistHistoryVtbl = {
PersistHistory_GetPositionCookie
};
/**********************************************************
* IHlinkTarget implementation
*/
static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface)
{
return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface);
}
static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
return htmldoc_query_interface(This, riid, ppv);
}
static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
return htmldoc_addref(This);
}
static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
return htmldoc_release(This);
}
static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%p)\n", This, pihlbc);
return E_NOTIMPL;
}
static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%p)\n", This, ppihlbc);
return E_NOTIMPL;
}
static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation));
if(grfHLNF)
FIXME("Unsupported grfHLNF=%08x\n", grfHLNF);
if(pwzJumpLocation)
FIXME("JumpLocation not supported\n");
if(!This->doc_obj->client)
return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL);
return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL);
}
static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign,
IMoniker **ppimkLocation)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation);
return E_NOTIMPL;
}
static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation,
LPWSTR *ppwzFriendlyName)
{
HTMLDocument *This = impl_from_IHlinkTarget(iface);
FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName);
return E_NOTIMPL;
}
static const IHlinkTargetVtbl HlinkTargetVtbl = {
HlinkTarget_QueryInterface,
HlinkTarget_AddRef,
HlinkTarget_Release,
HlinkTarget_SetBrowseContext,
HlinkTarget_GetBrowseContext,
HlinkTarget_Navigate,
HlinkTarget_GetMoniker,
HlinkTarget_GetFriendlyName
};
void HTMLDocument_Persist_Init(HTMLDocument *This)
{
This->IPersistMoniker_iface.lpVtbl = &PersistMonikerVtbl;
@ -1144,4 +1229,5 @@ void HTMLDocument_Persist_Init(HTMLDocument *This)
This->IMonikerProp_iface.lpVtbl = &MonikerPropVtbl;
This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl;
This->IPersistHistory_iface.lpVtbl = &PersistHistoryVtbl;
This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl;
}