[ros-diffs] [tfaber] 59483: [BROWSEUI] - This is not Wine source. Remove hacks accordingly

Author: tfaber
Date: Sun Jul 14 13:18:32 2013
New Revision: 59483

URL: http://svn.reactos.org/svn/reactos?rev=59483&view=rev
Log:
[BROWSEUI]
- This is not Wine source. Remove hacks accordingly

Modified:
    trunk/reactos/dll/win32/browseui/CMakeLists.txt
    trunk/reactos/dll/win32/browseui/bandsitemenu.cpp
    trunk/reactos/dll/win32/browseui/browseui.cpp
    trunk/reactos/dll/win32/browseui/shellbrowser.cpp

Modified: trunk/reactos/dll/win32/browseui/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/browseui/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/CMakeLists.txt	[iso-8859-1] Sun Jul 14 13:18:32 2013
@@ -1,8 +1,5 @@
 
 set_cpp(WITH_RUNTIME)
-
-add_definitions(
-    -D__WINESRC__)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
@@ -38,12 +35,6 @@
     ${SOURCE}
     browseui.rc)
 
-if(NOT MSVC)
-    # FIXME: http://www.cmake.org/Bug/view.php?id=12998
-    #allow_warnings(browseui)
-    set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS
"-Wno-error")
-endif()
-
 set_module_type(browseui win32dll UNICODE)
 
 target_link_libraries(browseui

Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit…
==============================================================================
--- trunk/reactos/dll/win32/browseui/bandsitemenu.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/bandsitemenu.cpp	[iso-8859-1] Sun Jul 14 13:18:32
2013
@@ -40,7 +40,7 @@
 HRESULT STDMETHODCALLTYPE CBandSiteMenu::QueryContextMenu(
     HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags)
 {
-    FIXME("(%p, %p, %p, %p, %p, %p)\n", this, hmenu, indexMenu, idCmdFirst,
idCmdLast, uFlags);
+    FIXME("(%p, %p, %u, %u, %u, 0x%x)\n", this, hmenu, indexMenu, idCmdFirst,
idCmdLast, uFlags);
     return E_NOTIMPL;
 }
 
@@ -53,7 +53,7 @@
 HRESULT STDMETHODCALLTYPE CBandSiteMenu::GetCommandString(UINT_PTR idCmd, UINT uType,
     UINT *pwReserved, LPSTR pszName, UINT cchMax)
 {
-    FIXME("(%p, %p, %p, %p, %p, %p)\n", this, idCmd, uType, pwReserved,
pszName, cchMax);
+    FIXME("(%p, %p, %u, %p, %p, %u)\n", this, idCmd, uType, pwReserved,
pszName, cchMax);
     return E_NOTIMPL;
 }
 
@@ -65,6 +65,6 @@
 
 HRESULT STDMETHODCALLTYPE CBandSiteMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM
lParam, LRESULT *plResult)
 {
-    FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam);
+    FIXME("(%p, %u, %p, %p, %p)\n", this, uMsg, wParam, lParam, plResult);
     return E_NOTIMPL;
 }

Modified: trunk/reactos/dll/win32/browseui/browseui.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu…
==============================================================================
--- trunk/reactos/dll/win32/browseui/browseui.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/browseui.cpp	[iso-8859-1] Sun Jul 14 13:18:32 2013
@@ -110,7 +110,7 @@
 /***********************************************************************
  *              DllGetVersion (BROWSEUI.@)
  */
-HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info)
+STDAPI DllGetVersion(DLLVERSIONINFO *info)
 {
     if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support
DLLVERSIONINFO2\n");
 

Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr…
==============================================================================
--- trunk/reactos/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp	[iso-8859-1] Sun Jul 14 13:18:32
2013
@@ -532,13 +532,6 @@
     virtual HRESULT STDMETHODCALLTYPE get_Document(IDispatch **ppDisp);
     virtual HRESULT STDMETHODCALLTYPE get_TopLevelContainer(VARIANT_BOOL *pBool);
     virtual HRESULT STDMETHODCALLTYPE get_Type(BSTR *Type);
-
-// WIDL temp hack : when the interface contains 'long' WIDL writes it out as a
'LONG'
-// Setting the prototype to LONG in this class breaks building with MSVC so we use
-// the correct 'long' type here and temp hack it for WIDL generated prototypes.
-#ifdef __exdisp_h__
-#define long LONG
-#endif
     virtual HRESULT STDMETHODCALLTYPE get_Left(long *pl);
     virtual HRESULT STDMETHODCALLTYPE put_Left(long Left);
     virtual HRESULT STDMETHODCALLTYPE get_Top(long *pl);
@@ -547,9 +540,6 @@
     virtual HRESULT STDMETHODCALLTYPE put_Width(long Width);
     virtual HRESULT STDMETHODCALLTYPE get_Height(long *pl);
     virtual HRESULT STDMETHODCALLTYPE put_Height(long Height);
-#ifdef __exdisp_h__
-#undef long
-#endif
     virtual HRESULT STDMETHODCALLTYPE get_LocationName(BSTR *LocationName);
     virtual HRESULT STDMETHODCALLTYPE get_LocationURL(BSTR *LocationURL);
     virtual HRESULT STDMETHODCALLTYPE get_Busy(VARIANT_BOOL *pBool);
@@ -612,9 +602,6 @@
     virtual HRESULT STDMETHODCALLTYPE SaveHistory(IStream *pStream);
     virtual HRESULT STDMETHODCALLTYPE SetPositionCookie(DWORD dwPositioncookie);
     virtual HRESULT STDMETHODCALLTYPE GetPositionCookie(DWORD *pdwPositioncookie);
-
-    // *** IBrowserService2 methods ***
-
 
     // message handlers
     LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled);