[ros-diffs] [akhaldi] 64353: [IEFRAME] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Sat Sep 27 19:41:46 2014
New Revision: 64353

URL: http://svn.reactos.org/svn/reactos?rev=64353&view=rev
Log:
[IEFRAME]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/reactos/dll/win32/ieframe/ie.c
    trunk/reactos/dll/win32/ieframe/ieframe.h
    trunk/reactos/dll/win32/ieframe/navigate.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/ieframe/ie.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ie.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ie.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ie.c	[iso-8859-1] Sat Sep 27 19:41:46 2014
@@ -354,8 +354,11 @@
 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)

Modified: trunk/reactos/dll/win32/ieframe/ieframe.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe.…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/ieframe.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/ieframe.h	[iso-8859-1] Sat Sep 27 19:41:46 2014
@@ -326,8 +326,6 @@
 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;
 

Modified: trunk/reactos/dll/win32/ieframe/navigate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/navigate.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/navigate.c	[iso-8859-1] Sat Sep 27 19:41:46 2014
@@ -653,7 +653,7 @@
         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 @@
 
     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);

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Sat Sep 27 19:41:46 2014
@@ -82,7 +82,7 @@
 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