INTEGRATION: CWS warnings01 (1.4.14); FILE MERGED

2006/03/10 15:11:02 pl 1.4.14.1: #i55991# removed warnings for windows platform

3 files changed, 33 insertions, 15 deletions

diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 0ba9402f59a0..a0bd6366365b 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: propsheets.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:04:10 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:23:03 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -57,7 +57,13 @@
 #include "listviewbuilder.hxx"
 #endif
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <shellapi.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 
 #include <string>
 #include <vector>
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 1ed12ea79f44..efc2463905f8 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: thumbviewer.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:05:26 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:23:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -70,7 +70,13 @@
 #include <utility>
 #include <stdlib.h>
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <shellapi.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 #include <memory>
 
 extern HINSTANCE g_hModule;
@@ -227,7 +233,7 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Read(void *pv, ULONG cb, ULONG *pcb
     return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *)
 {
     size_t size = ref_zip_buffer_.size();
     size_t p = 0;
@@ -247,7 +253,7 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Seek(LARGE_INTEGER dlibMove, DWORD
    HRESULT hr = STG_E_INVALIDFUNCTION;
 
    p += dlibMove.LowPart;
-   if ((p >= 0) && (p < size))
+   if (p < size)
    {
         pos_ = p;
         hr = S_OK;
@@ -282,28 +288,28 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Stat(STATSTG *pstatstg, DWORD grfSt
     return S_OK;
 }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Write(void const *pv, ULONG cb, ULONG *pcbWritten)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Write(void const *, ULONG, ULONG *)
 { return E_NOTIMPL; }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::SetSize(ULARGE_INTEGER libNewSize)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::SetSize(ULARGE_INTEGER)
 { return E_NOTIMPL; }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::CopyTo(IStream *pstm, ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::CopyTo(IStream *, ULARGE_INTEGER, ULARGE_INTEGER *, ULARGE_INTEGER *)
 { return E_NOTIMPL; }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Commit(DWORD grfCommitFlags)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Commit(DWORD)
 { return E_NOTIMPL; }
 
 HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Revert(void)
 { return E_NOTIMPL; }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::LockRegion(ULARGE_INTEGER, ULARGE_INTEGER, DWORD)
 { return E_NOTIMPL; }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::UnlockRegion(ULARGE_INTEGER, ULARGE_INTEGER, DWORD)
 { return E_NOTIMPL; }
 
-HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Clone(IStream **ppstm)
+HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Clone(IStream **)
 {  return E_NOTIMPL; }
 
 
diff --git a/shell/source/win32/shlxthandler/util/dbgmacros.cxx b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
index c27fd12bffdf..06f3437fd962 100644
--- a/shell/source/win32/shlxthandler/util/dbgmacros.cxx
+++ b/shell/source/win32/shlxthandler/util/dbgmacros.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbgmacros.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 20:05:43 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 14:23:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -33,7 +33,13 @@
  *
  ************************************************************************/
 
+#if defined _MSC_VER
+#pragma warning(push, 1)
+#endif
 #include <windows.h>
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
 #include <stdio.h>
 
 #ifndef DBGMACROS_HXX_INCLUDED