Jacek Caban : mshtml:
Rename get_property to get_client_disp_property and make it available
for other files .
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Aug 17 05:04:37 CDT 2006
Module: wine
Branch: master
Commit: 40f3ad06e9756af618085560352754d8dea57620
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40f3ad06e9756af618085560352754d8dea57620
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Aug 17 03:34:22 2006 +0200
mshtml: Rename get_property to get_client_disp_property and make it available for other files.
---
dlls/mshtml/mshtml_private.h | 1 +
dlls/mshtml/oleobj.c | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index 8e956bc..7abcf7e 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -288,6 +288,7 @@ void HTMLDocument_ShowContextMenu(HTMLDo
void show_tooltip(HTMLDocument*,DWORD,DWORD,LPCWSTR);
void hide_tooltip(HTMLDocument*);
+HRESULT get_client_disp_property(IOleClientSite*,DISPID,VARIANT*);
HRESULT ProtocolFactory_Create(REFCLSID,REFIID,void**);
diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c
index 981f65b..127a8aa 100644
--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -520,7 +520,7 @@ static HRESULT WINAPI OleControl_OnMnemo
return E_NOTIMPL;
}
-static HRESULT get_property(IOleClientSite *client, DISPID dispid, VARIANT *res)
+HRESULT get_client_disp_property(IOleClientSite *client, DISPID dispid, VARIANT *res)
{
IDispatch *disp = NULL;
DISPPARAMS dispparams = {NULL, 0};
@@ -548,7 +548,7 @@ static HRESULT on_change_dlcontrol(HTMLD
VARIANT res;
HRESULT hres;
- hres = get_property(This->client, DISPID_AMBIENT_DLCONTROL, &res);
+ hres = get_client_disp_property(This->client, DISPID_AMBIENT_DLCONTROL, &res);
if(SUCCEEDED(hres))
FIXME("unsupported dlcontrol %08lx\n", V_I4(&res));
@@ -569,7 +569,7 @@ static HRESULT WINAPI OleControl_OnAmbie
switch(dispID) {
case DISPID_AMBIENT_USERMODE:
TRACE("(%p)->(DISPID_AMBIENT_USERMODE)\n", This);
- hres = get_property(This->client, DISPID_AMBIENT_USERMODE, &res);
+ hres = get_client_disp_property(This->client, DISPID_AMBIENT_USERMODE, &res);
if(FAILED(hres))
return S_OK;
@@ -590,7 +590,7 @@ static HRESULT WINAPI OleControl_OnAmbie
case DISPID_AMBIENT_OFFLINEIFNOTCONNECTED:
TRACE("(%p)->(DISPID_AMBIENT_OFFLINEIFNOTCONNECTED)\n", This);
on_change_dlcontrol(This);
- hres = get_property(This->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &res);
+ hres = get_client_disp_property(This->client, DISPID_AMBIENT_OFFLINEIFNOTCONNECTED, &res);
if(FAILED(hres))
return S_OK;
@@ -606,7 +606,7 @@ static HRESULT WINAPI OleControl_OnAmbie
case DISPID_AMBIENT_SILENT:
TRACE("(%p)->(DISPID_AMBIENT_SILENT)\n", This);
on_change_dlcontrol(This);
- hres = get_property(This->client, DISPID_AMBIENT_SILENT, &res);
+ hres = get_client_disp_property(This->client, DISPID_AMBIENT_SILENT, &res);
if(FAILED(hres))
return S_OK;
@@ -621,7 +621,7 @@ static HRESULT WINAPI OleControl_OnAmbie
return S_OK;
case DISPID_AMBIENT_USERAGENT:
TRACE("(%p)->(DISPID_AMBIENT_USERAGENT)\n", This);
- hres = get_property(This->client, DISPID_AMBIENT_USERAGENT, &res);
+ hres = get_client_disp_property(This->client, DISPID_AMBIENT_USERAGENT, &res);
if(FAILED(hres))
return S_OK;
@@ -630,7 +630,7 @@ static HRESULT WINAPI OleControl_OnAmbie
return S_OK;
case DISPID_AMBIENT_PALETTE:
TRACE("(%p)->(DISPID_AMBIENT_PALETTE)\n", This);
- hres = get_property(This->client, DISPID_AMBIENT_PALETTE, &res);
+ hres = get_client_disp_property(This->client, DISPID_AMBIENT_PALETTE, &res);
if(FAILED(hres))
return S_OK;
More information about the wine-cvs
mailing list