eliminate GCC4 warnings

svn path=/trunk/; revision=15225

diff --git a/reactos/subsys/system/ibrowser/Makefile b/reactos/subsys/system/ibrowser/Makefile
index 1abc8a1..9f6de5e 100644 (file)
--- a/reactos/subsys/system/ibrowser/Makefile
+++ b/reactos/subsys/system/ibrowser/Makefile
@@ -17,7 +17,7 @@ TARGET_INSTALLDIR := system32
 TARGET_CFLAGS := \
        -D__USE_W32API -DWIN32 -D_ROS_ \
        -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 \
-       -DUNICODE -fexceptions -Wall \
+       -DUNICODE -fexceptions -Wall -Wno-unused-value \
        -I../../../include/expat
 
 TARGET_CPPFLAGS := $(TARGET_CFLAGS)

diff --git a/reactos/subsys/system/ibrowser/Makefile.MinGW b/reactos/subsys/system/ibrowser/Makefile.MinGW
index 1d23264..cd1d90f 100644 (file)
--- a/reactos/subsys/system/ibrowser/Makefile.MinGW
+++ b/reactos/subsys/system/ibrowser/Makefile.MinGW
@@ -8,7 +8,7 @@ CC = gcc
 CXX = g++\r
 LINK = g++\r
 \r
-CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC)\r
+CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC)\r
 RCFLAGS        = -DWIN32 -D__WINDRES__\r
 LFLAGS = -Wl,--subsystem,windows\r
 \r

diff --git a/reactos/subsys/system/ibrowser/Makefile.PCH b/reactos/subsys/system/ibrowser/Makefile.PCH
index f21c622..769da64 100644 (file)
--- a/reactos/subsys/system/ibrowser/Makefile.PCH
+++ b/reactos/subsys/system/ibrowser/Makefile.PCH
@@ -10,7 +10,7 @@ CC = gcc
 CXX = g++\r
 LINK = g++\r
 \r
-CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -I. -I$(EXPAT_INC)\r
+CFLAGS = -DWIN32 -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -DWINVER=0x0500 -fexceptions -Wall -Wno-unused-value -I. -I$(EXPAT_INC)\r
 RCFLAGS        = -DWIN32 -D__WINDRES__\r
 LFLAGS = -Wl,--subsystem,windows\r
 \r

diff --git a/reactos/subsys/system/ibrowser/webchild.h b/reactos/subsys/system/ibrowser/webchild.h
index e2ceb6f..442bd42 100644 (file)
--- a/reactos/subsys/system/ibrowser/webchild.h
+++ b/reactos/subsys/system/ibrowser/webchild.h
@@ -115,25 +115,38 @@ template<typename BASE> struct IComSrvQI : public BASE
        {
        }
 
-       STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) {*ppv=0;
-        if (IsEqualIID(riid, _uuid_base) ||
-                IsEqualIID(riid, IID_IUnknown)) {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;}
-        return E_NOINTERFACE;}
+       STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv)
+       {
+               *ppv = NULL;
+
+               if (IsEqualIID(riid, _uuid_base) || IsEqualIID(riid, IID_IUnknown))
+                       {*ppv=static_cast<BASE*>(this); this->AddRef(); return S_OK;}
+
+               return E_NOINTERFACE;
+       }
 
 protected:
        IComSrvQI() {}
+       virtual ~IComSrvQI() {}
 
        REFIID  _uuid_base;
 };
 
 template<> struct IComSrvQI<IUnknown> : public IUnknown
 {
-       STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv) {*ppv=0;
-        if (IsEqualIID(riid, IID_IUnknown)) {*ppv=this; AddRef(); return S_OK;}
-        return E_NOINTERFACE;}
+       STDMETHODIMP QueryInterface(REFIID riid, LPVOID* ppv)
+       {
+               *ppv = NULL;
+
+               if (IsEqualIID(riid, IID_IUnknown))
+                       {*ppv=this; AddRef(); return S_OK;}
+
+               return E_NOINTERFACE;
+       }
 
 protected:
        IComSrvQI<IUnknown>() {}
+       virtual ~IComSrvQI<IUnknown>() {}
 };
 
 
@@ -455,6 +468,8 @@ protected:
 
 struct DWebBrowserEvents2IF
 {
+       virtual ~DWebBrowserEvents2IF() {}
+
     virtual void StatusTextChange(const BStr& text)
                {}
 
@@ -594,6 +609,9 @@ protected:
  // MinGW defines a wrong FixedDWebBrowserEvents2 interface with virtual functions for DISPID calls, so we use our own, corrected version:
 interface FixedDWebBrowserEvents2 : public IDispatch
 {
+#ifdef __GNUC__
+       virtual ~FixedDWebBrowserEvents2() {}
+#endif
 };
 
 struct ANSUNC DWebBrowserEvents2Impl : public SimpleComObject,