summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-07-13 12:26:51 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-13 14:02:17 +0200
commite61c2222550342457e93372aa6b03ea299e53722 (patch)
tree0bb0f649fdc748398def14e3d3b19eff994fe237
parent958898510ceec7ff8f2fdb36165f981456f29be5 (diff)
warning C4267: conversion from 'size_t' to 'DWORD'
Change-Id: Idd467f2963099e2ae6bb76f405124dfa32c8cc9a
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx4
-rw-r--r--shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index 1e7499edd6ab..9f37b3b62c0d 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -341,7 +341,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat)
continue;
}
m_pwsBuffer = m_pContentReader -> getChunkBuffer()[m_ChunkPosition].second;
- m_ulUnicodeBufferLen = m_pwsBuffer.length();
+ m_ulUnicodeBufferLen = static_cast<ULONG>(m_pwsBuffer.length());
DWORD ChunkLCID = LocaleSetToLCID( m_pContentReader -> getChunkBuffer()[m_ChunkPosition].first );
// Set chunk description
pStat->idChunk = m_ulChunkID;
@@ -1241,7 +1241,7 @@ namespace /* private */
0,
REG_MULTI_SZ,
reinterpret_cast<const BYTE*>(DllsToRegisterList),
- DllList.length() + 2);
+ static_cast<DWORD>(DllList.length() + 2));
RegCloseKey(hSubKey);
}
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 2312c26dc360..45918f5f5d81 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -247,7 +247,7 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Stat(STATSTG *pstatstg, DWORD grfSt
pstatstg->type = STGTY_LOCKBYTES;
ULARGE_INTEGER uli;
- uli.LowPart = ref_zip_buffer_.size();
+ uli.LowPart = static_cast<DWORD>(ref_zip_buffer_.size());
uli.HighPart = 0;
pstatstg->cbSize = uli;