Author: tfaber
Date: Sun Jul 14 13:01:55 2013
New Revision: 59482
URL:
http://svn.reactos.org/svn/reactos?rev=59482&view=rev
Log:
[IEFRAME][MSHTML_WINETEST]
- Use SHANDLE_PTR in IWebBrowserApp::get_HWND. Already sent to Wine.
Modified:
trunk/reactos/dll/win32/ieframe/CMakeLists.txt
trunk/reactos/dll/win32/ieframe/ie.c
trunk/reactos/dll/win32/ieframe/webbrowser.c
trunk/rostests/winetests/mshtml/CMakeLists.txt
trunk/rostests/winetests/mshtml/htmldoc.c
Modified: trunk/reactos/dll/win32/ieframe/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:01:55 2013
@@ -28,12 +28,6 @@
add_library(ieframe SHARED ${SOURCE} ieframe.rc)
-if(NOT MSVC)
- # FIXME:
http://www.cmake.org/Bug/view.php?id=12998
- #allow_warnings(aclui)
- set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS
"-Wno-error")
-endif()
-
add_typelib(ieframe_v1.idl)
list(APPEND ieframe_rc_deps
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] Sun Jul 14 13:01:55 2013
@@ -358,7 +358,7 @@
return E_NOTIMPL;
}
-static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, LONG *pHWND)
+static HRESULT WINAPI InternetExplorer_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND)
{
InternetExplorer *This = impl_from_IWebBrowser2(iface);
FIXME("(%p)->(%p)\n", This, pHWND);
Modified: trunk/reactos/dll/win32/ieframe/webbrowser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/webbrows…
==============================================================================
--- trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ieframe/webbrowser.c [iso-8859-1] Sun Jul 14 13:01:55 2013
@@ -565,7 +565,7 @@
return S_OK;
}
-static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND)
+static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND)
{
WebBrowser *This = impl_from_IWebBrowser2(iface);
Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis…
==============================================================================
--- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Sun Jul 14 13:01:55 2013
@@ -28,12 +28,6 @@
set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS
"${mshtml_winetest_rc_deps}")
-if(NOT MSVC)
- # FIXME:
http://www.cmake.org/Bug/view.php?id=12998
- #allow_warnings(mshtml_winetest)
- set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS
"-Wno-error")
-endif()
-
target_link_libraries(mshtml_winetest wine uuid strmiids)
set_module_type(mshtml_winetest win32cui)
add_importlibs(mshtml_winetest wininet ole32 oleaut32 user32 gdi32 urlmon advapi32 msvcrt
kernel32 ntdll)
Modified: trunk/rostests/winetests/mshtml/htmldoc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.…
==============================================================================
--- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Sun Jul 14 13:01:55 2013
@@ -4176,7 +4176,7 @@
return E_NOTIMPL;
}
-static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, LONG *pHWND)
+static HRESULT WINAPI WebBrowser_get_HWND(IWebBrowser2 *iface, SHANDLE_PTR *pHWND)
{
ok(0, "unexpected call\n");
return E_NOTIMPL;