Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:05:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IEFRAME]

Browse source 
* Sync with Wine 1.7.27.
CORE-8540

svn path=/trunk/; revision=64353
This commit is contained in:
Amine Khaldi 2014-09-27 19:41:46 +00:00
parent 4c6f195547
commit 8cba99245c
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
reactos/dll/win32/ieframe/ie.c
View file

@ -354,8 +354,11 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name)
static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND)
{
InternetExplorer *This = impl_from_IWebBrowser2(iface);
FIXME("(%p)->(%p)\n", This, pHWND);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, pHWND);
*pHWND = (SHANDLE_PTR)This->frame_hwnd;
return S_OK;
}
static HRESULT WINAPI InternetExplorer_get_FullName(IWebBrowser2 *iface, BSTR *FullName)

2
reactos/dll/win32/ieframe/ieframe.h
View file

@ -326,8 +326,6 @@ HRESULT WINAPI InternetShortcut_Create(IClassFactory*,IUnknown*,REFIID,void**) D
HRESULT WINAPI WebBrowser_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
HRESULT WINAPI WebBrowserV1_Create(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
const char *debugstr_variant(const VARIANT*) DECLSPEC_HIDDEN;
extern LONG module_ref DECLSPEC_HIDDEN;
extern HINSTANCE ieframe_instance DECLSPEC_HIDDEN;

10
reactos/dll/win32/ieframe/navigate.c
View file

@ -653,7 +653,7 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon)
return CreateURLMoniker(NULL, url, mon);
size = sizeof(new_url)/sizeof(WCHAR);
hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE);
hres = UrlApplySchemeW(url, new_url, &size, URL_APPLY_GUESSSCHEME | URL_APPLY_GUESSFILE | URL_APPLY_DEFAULT);
TRACE("was %s got %s\n", debugstr_w(url), debugstr_w(new_url));
if(FAILED(hres)) {
WARN("UrlApplyScheme failed: %08x\n", hres);
@ -914,11 +914,9 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags,
TRACE("navigating to %s\n", debugstr_w(url));
if((Flags && V_VT(Flags) != VT_EMPTY)
|| (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY))
FIXME("Unsupported args (Flags %p:%d; TargetFrameName %p:%d)\n",
Flags, Flags ? V_VT(Flags) : -1, TargetFrameName,
TargetFrameName ? V_VT(TargetFrameName) : -1);
if((Flags && V_VT(Flags) != VT_EMPTY && V_VT(Flags) != VT_ERROR)
|| (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY && V_VT(TargetFrameName) != VT_ERROR))
FIXME("Unsupported args (Flags %s; TargetFrameName %s)\n", debugstr_variant(Flags), debugstr_variant(TargetFrameName));
if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1) && V_ARRAY(PostData)) {
SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data);

2
reactos/media/doc/README.WINE
View file

@ -82,7 +82,7 @@ reactos/dll/win32/hnetcfg # Synced to Wine-1.7.27
reactos/dll/win32/httpapi # Synced to Wine-1.7.17
reactos/dll/win32/iccvid # Synced to Wine-1.7.17
reactos/dll/win32/icmp # Out of sync
reactos/dll/win32/ieframe # Synced to Wine-1.7.17
reactos/dll/win32/ieframe # Synced to Wine-1.7.27
reactos/dll/win32/imaadp32.acm # Synced to Wine-1.7.17
reactos/dll/win32/imagehlp # Synced to Wine-1.7.17
reactos/dll/win32/imm32 # Synced to Wine-1.7.17