From f001f43b6549fbabae20db543751ba2afbc89166 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 14 Jul 2013 13:01:55 +0000
Subject: [PATCH] [IEFRAME][MSHTML_WINETEST] - Use SHANDLE_PTR in
 IWebBrowserApp::get_HWND. Already sent to Wine.

svn path=/trunk/; revision=59482
---
 reactos/dll/win32/ieframe/CMakeLists.txt | 6 ------
 reactos/dll/win32/ieframe/ie.c           | 2 +-
 reactos/dll/win32/ieframe/webbrowser.c   | 2 +-
 rostests/winetests/mshtml/CMakeLists.txt | 6 ------
 rostests/winetests/mshtml/htmldoc.c      | 2 +-
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/reactos/dll/win32/ieframe/CMakeLists.txt b/reactos/dll/win32/ieframe/CMakeLists.txt
index 819fa541036..8101a0a7ede 100644
--- a/reactos/dll/win32/ieframe/CMakeLists.txt
+++ b/reactos/dll/win32/ieframe/CMakeLists.txt
@@ -28,12 +28,6 @@ list(APPEND SOURCE
 
 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
diff --git a/reactos/dll/win32/ieframe/ie.c b/reactos/dll/win32/ieframe/ie.c
index d8cdc63c3b6..29446656d08 100644
--- a/reactos/dll/win32/ieframe/ie.c
+++ b/reactos/dll/win32/ieframe/ie.c
@@ -358,7 +358,7 @@ static HRESULT WINAPI InternetExplorer_get_Name(IWebBrowser2 *iface, BSTR *Name)
     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);
diff --git a/reactos/dll/win32/ieframe/webbrowser.c b/reactos/dll/win32/ieframe/webbrowser.c
index fcfb65495ef..5239caaff95 100644
--- a/reactos/dll/win32/ieframe/webbrowser.c
+++ b/reactos/dll/win32/ieframe/webbrowser.c
@@ -565,7 +565,7 @@ static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name)
     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);
 
diff --git a/rostests/winetests/mshtml/CMakeLists.txt b/rostests/winetests/mshtml/CMakeLists.txt
index 141d00463b1..c387d0288cd 100644
--- a/rostests/winetests/mshtml/CMakeLists.txt
+++ b/rostests/winetests/mshtml/CMakeLists.txt
@@ -28,12 +28,6 @@ list(APPEND mshtml_winetest_rc_deps
 
 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)
diff --git a/rostests/winetests/mshtml/htmldoc.c b/rostests/winetests/mshtml/htmldoc.c
index 578410a47d2..d0b49680cd5 100644
--- a/rostests/winetests/mshtml/htmldoc.c
+++ b/rostests/winetests/mshtml/htmldoc.c
@@ -4176,7 +4176,7 @@ static HRESULT WINAPI WebBrowser_get_Name(IWebBrowser2 *iface, BSTR *Name)
     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;