From 74bb9cd27242b9320f99ff4d2b50c3051576cc14 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 8 Feb 2022 16:53:51 +0800 Subject: ... --- src/common/Base.cpp | 2 +- src/common/Exception.cpp | 2 +- src/common/Format.cpp | 2 +- src/common/Logger.cpp | 2 +- src/common/PropertyTree.cpp | 4 +-- src/common/String.cpp | 6 ++-- src/common/StringUtil.cpp | 6 ++-- src/common/io/MemoryStream.cpp | 2 +- src/common/io/Resource.cpp | 4 +-- src/common/io/Stream.cpp | 2 +- src/common/platform/Exception.cpp | 2 +- src/common/platform/osx/Convert.cpp | 2 +- src/common/platform/osx/Exception.cpp | 2 +- src/common/platform/unix/ErrnoException.cpp | 4 +-- src/common/platform/unix/UnixFileStream.cpp | 8 +++--- src/common/platform/win/BridgeComStream.cpp | 4 +-- src/common/platform/win/BrigdeComStream.h | 43 +++++++++++++++++++++++++++++ src/common/platform/win/BrigdeComStream.hpp | 43 ----------------------------- src/common/platform/win/ComAutoInit.cpp | 4 +-- src/common/platform/win/Exception.cpp | 4 +-- src/common/platform/win/StreamConvert.cpp | 16 +++++------ src/common/platform/win/Win32FileStream.cpp | 6 ++-- 22 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 src/common/platform/win/BrigdeComStream.h delete mode 100644 src/common/platform/win/BrigdeComStream.hpp (limited to 'src/common') diff --git a/src/common/Base.cpp b/src/common/Base.cpp index dbbc0d61..b6d39fef 100644 --- a/src/common/Base.cpp +++ b/src/common/Base.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Base.hpp" +#include "cru/common/Base.h" #include diff --git a/src/common/Exception.cpp b/src/common/Exception.cpp index 779c65d6..86816720 100644 --- a/src/common/Exception.cpp +++ b/src/common/Exception.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Exception.hpp" +#include "cru/common/Exception.h" namespace cru { Exception::Exception() {} diff --git a/src/common/Format.cpp b/src/common/Format.cpp index 2d3b50eb..3362db65 100644 --- a/src/common/Format.cpp +++ b/src/common/Format.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Format.hpp" +#include "cru/common/Format.h" namespace cru { namespace details { diff --git a/src/common/Logger.cpp b/src/common/Logger.cpp index 3034c0ad..49261396 100644 --- a/src/common/Logger.cpp +++ b/src/common/Logger.cpp @@ -1,4 +1,4 @@ -#include "cru/common/Logger.hpp" +#include "cru/common/Logger.h" #include #include diff --git a/src/common/PropertyTree.cpp b/src/common/PropertyTree.cpp index cc3e9cb5..b587becb 100644 --- a/src/common/PropertyTree.cpp +++ b/src/common/PropertyTree.cpp @@ -1,6 +1,6 @@ -#include "cru/common/PropertyTree.hpp" +#include "cru/common/PropertyTree.h" #include -#include "cru/common/Exception.hpp" +#include "cru/common/Exception.h" namespace cru { String PropertySubTreeRef::CombineKey(StringView left, StringView right) { diff --git a/src/common/String.cpp b/src/common/String.cpp index a43c2abd..22008f6d 100644 --- a/src/common/String.cpp +++ b/src/common/String.cpp @@ -1,6 +1,6 @@ -#include "cru/common/String.hpp" -#include "cru/common/Exception.hpp" -#include "cru/common/StringUtil.hpp" +#include "cru/common/String.h" +#include "cru/common/Exception.h" +#include "cru/common/StringUtil.h" #include #include diff --git a/src/common/StringUtil.cpp b/src/common/StringUtil.cpp index 2bec815d..f584fd4e 100644 --- a/src/common/StringUtil.cpp +++ b/src/common/StringUtil.cpp @@ -1,6 +1,6 @@ -#include "cru/common/StringUtil.hpp" -#include "cru/common/Base.hpp" -#include "cru/common/Exception.hpp" +#include "cru/common/StringUtil.h" +#include "cru/common/Base.h" +#include "cru/common/Exception.h" namespace cru { using details::ExtractBits; diff --git a/src/common/io/MemoryStream.cpp b/src/common/io/MemoryStream.cpp index dcb7a032..7507875b 100644 --- a/src/common/io/MemoryStream.cpp +++ b/src/common/io/MemoryStream.cpp @@ -1,4 +1,4 @@ -#include "cru/common/io/MemoryStream.hpp" +#include "cru/common/io/MemoryStream.h" namespace cru::io { MemoryStream::~MemoryStream() { diff --git a/src/common/io/Resource.cpp b/src/common/io/Resource.cpp index da16b578..0ee7f753 100644 --- a/src/common/io/Resource.cpp +++ b/src/common/io/Resource.cpp @@ -1,5 +1,5 @@ -#include "cru/common/io/Resource.hpp" -#include "cru/common/Exception.hpp" +#include "cru/common/io/Resource.h" +#include "cru/common/Exception.h" #if defined(CRU_PLATFORM_OSX) #include diff --git a/src/common/io/Stream.cpp b/src/common/io/Stream.cpp index ad1dbd0e..bc045f03 100644 --- a/src/common/io/Stream.cpp +++ b/src/common/io/Stream.cpp @@ -1,4 +1,4 @@ -#include "cru/common/io/Stream.hpp" +#include "cru/common/io/Stream.h" namespace cru::io { Index Stream::Tell() { return Seek(0, SeekOrigin::Current); } diff --git a/src/common/platform/Exception.cpp b/src/common/platform/Exception.cpp index c13c8b1e..1c5db390 100644 --- a/src/common/platform/Exception.cpp +++ b/src/common/platform/Exception.cpp @@ -1 +1 @@ -#include "cru/common/platform/Exception.hpp" +#include "cru/common/platform/Exception.h" diff --git a/src/common/platform/osx/Convert.cpp b/src/common/platform/osx/Convert.cpp index e5105698..4792df1f 100644 --- a/src/common/platform/osx/Convert.cpp +++ b/src/common/platform/osx/Convert.cpp @@ -1,4 +1,4 @@ -#include "cru/common/platform/osx/Convert.hpp" +#include "cru/common/platform/osx/Convert.h" namespace cru::platform::osx { CFStringRef Convert(const String& string) { diff --git a/src/common/platform/osx/Exception.cpp b/src/common/platform/osx/Exception.cpp index b02fd458..e03faa4c 100644 --- a/src/common/platform/osx/Exception.cpp +++ b/src/common/platform/osx/Exception.cpp @@ -1 +1 @@ -#include "cru/common/platform//osx/Exception.hpp" +#include "cru/common/platform//osx/Exception.h" diff --git a/src/common/platform/unix/ErrnoException.cpp b/src/common/platform/unix/ErrnoException.cpp index 14e6a5a2..f2171943 100644 --- a/src/common/platform/unix/ErrnoException.cpp +++ b/src/common/platform/unix/ErrnoException.cpp @@ -1,6 +1,6 @@ -#include "cru/common/platform/unix/ErrnoException.hpp" +#include "cru/common/platform/unix/ErrnoException.h" -#include "cru/common/Format.hpp" +#include "cru/common/Format.h" #include diff --git a/src/common/platform/unix/UnixFileStream.cpp b/src/common/platform/unix/UnixFileStream.cpp index dd883497..cf268288 100644 --- a/src/common/platform/unix/UnixFileStream.cpp +++ b/src/common/platform/unix/UnixFileStream.cpp @@ -1,7 +1,7 @@ -#include "cru/common/platform/unix/UnixFileStream.hpp" -#include "cru/common/Format.hpp" -#include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/platform/unix/ErrnoException.hpp" +#include "cru/common/platform/unix/UnixFileStream.h" +#include "cru/common/Format.h" +#include "cru/common/io/OpenFileFlag.h" +#include "cru/common/platform/unix/ErrnoException.h" #include #include diff --git a/src/common/platform/win/BridgeComStream.cpp b/src/common/platform/win/BridgeComStream.cpp index 48ba8154..4c83fd45 100644 --- a/src/common/platform/win/BridgeComStream.cpp +++ b/src/common/platform/win/BridgeComStream.cpp @@ -1,5 +1,5 @@ -#include "BrigdeComStream.hpp" -#include "cru/common/io/Stream.hpp" +#include "BrigdeComStream.h" +#include "cru/common/io/Stream.h" namespace cru::platform::win { BridgeComStream::BridgeComStream(io::Stream *stream) diff --git a/src/common/platform/win/BrigdeComStream.h b/src/common/platform/win/BrigdeComStream.h new file mode 100644 index 00000000..7c8a79d1 --- /dev/null +++ b/src/common/platform/win/BrigdeComStream.h @@ -0,0 +1,43 @@ +#pragma once +#include "cru/common/platform/win/WinPreConfig.h" + +#include "cru/common/io/Stream.h" + +#include + +namespace cru::platform::win { +class BridgeComStream : public IStream { + public: + explicit BridgeComStream(io::Stream* stream); + + CRU_DELETE_COPY(BridgeComStream) + CRU_DELETE_MOVE(BridgeComStream) + + ~BridgeComStream(); + + public: + ULONG AddRef() override; + ULONG Release() override; + HRESULT QueryInterface(REFIID riid, void** ppvObject) override; + + HRESULT Read(void* pv, ULONG cb, ULONG* pcbRead) override; + HRESULT Write(const void* pv, ULONG cb, ULONG* pcbWritten) override; + HRESULT Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER* plibNewPosition) override; + HRESULT SetSize(ULARGE_INTEGER libNewSize) override; + HRESULT CopyTo(IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, + ULARGE_INTEGER* pcbWritten) override; + HRESULT Commit(DWORD grfCommitFlags) override; + HRESULT Revert() override; + HRESULT LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, + DWORD dwLockType) override; + HRESULT UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, + DWORD dwLockType) override; + HRESULT Stat(STATSTG* pstatstg, DWORD grfStatFlag) override; + HRESULT Clone(IStream** ppstm) override; + + private: + io::Stream* stream_; + ULONG ref_count_; +}; +} // namespace cru::platform::win diff --git a/src/common/platform/win/BrigdeComStream.hpp b/src/common/platform/win/BrigdeComStream.hpp deleted file mode 100644 index 228c16f6..00000000 --- a/src/common/platform/win/BrigdeComStream.hpp +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once -#include "cru/common/platform/win/WinPreConfig.hpp" - -#include "cru/common/io/Stream.hpp" - -#include - -namespace cru::platform::win { -class BridgeComStream : public IStream { - public: - explicit BridgeComStream(io::Stream* stream); - - CRU_DELETE_COPY(BridgeComStream) - CRU_DELETE_MOVE(BridgeComStream) - - ~BridgeComStream(); - - public: - ULONG AddRef() override; - ULONG Release() override; - HRESULT QueryInterface(REFIID riid, void** ppvObject) override; - - HRESULT Read(void* pv, ULONG cb, ULONG* pcbRead) override; - HRESULT Write(const void* pv, ULONG cb, ULONG* pcbWritten) override; - HRESULT Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, - ULARGE_INTEGER* plibNewPosition) override; - HRESULT SetSize(ULARGE_INTEGER libNewSize) override; - HRESULT CopyTo(IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, - ULARGE_INTEGER* pcbWritten) override; - HRESULT Commit(DWORD grfCommitFlags) override; - HRESULT Revert() override; - HRESULT LockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, - DWORD dwLockType) override; - HRESULT UnlockRegion(ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, - DWORD dwLockType) override; - HRESULT Stat(STATSTG* pstatstg, DWORD grfStatFlag) override; - HRESULT Clone(IStream** ppstm) override; - - private: - io::Stream* stream_; - ULONG ref_count_; -}; -} // namespace cru::platform::win diff --git a/src/common/platform/win/ComAutoInit.cpp b/src/common/platform/win/ComAutoInit.cpp index e336be59..55a53a8d 100644 --- a/src/common/platform/win/ComAutoInit.cpp +++ b/src/common/platform/win/ComAutoInit.cpp @@ -1,5 +1,5 @@ -#include "cru/common/platform/win/ComAutoInit.hpp" -#include "cru/common/platform/win/Exception.hpp" +#include "cru/common/platform/win/ComAutoInit.h" +#include "cru/common/platform/win/Exception.h" #include diff --git a/src/common/platform/win/Exception.cpp b/src/common/platform/win/Exception.cpp index 70cfcb3c..a20e8a31 100644 --- a/src/common/platform/win/Exception.cpp +++ b/src/common/platform/win/Exception.cpp @@ -1,5 +1,5 @@ -#include "cru/common/platform/win/Exception.hpp" -#include "cru/common/Format.hpp" +#include "cru/common/platform/win/Exception.h" +#include "cru/common/Format.h" #include diff --git a/src/common/platform/win/StreamConvert.cpp b/src/common/platform/win/StreamConvert.cpp index 1d077573..8e2648c2 100644 --- a/src/common/platform/win/StreamConvert.cpp +++ b/src/common/platform/win/StreamConvert.cpp @@ -1,11 +1,11 @@ -#include "cru/common/platform/win/StreamConvert.hpp" -#include "BrigdeComStream.hpp" -#include "cru/common/Exception.hpp" -#include "cru/common/io/MemoryStream.hpp" -#include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/platform/win/ComAutoInit.hpp" -#include "cru/common/platform/win/Exception.hpp" -#include "cru/common/platform/win/Win32FileStream.hpp" +#include "cru/common/platform/win/StreamConvert.h" +#include "BrigdeComStream.h" +#include "cru/common/Exception.h" +#include "cru/common/io/MemoryStream.h" +#include "cru/common/io/OpenFileFlag.h" +#include "cru/common/platform/win/ComAutoInit.h" +#include "cru/common/platform/win/Exception.h" +#include "cru/common/platform/win/Win32FileStream.h" #include #include diff --git a/src/common/platform/win/Win32FileStream.cpp b/src/common/platform/win/Win32FileStream.cpp index db3a1e01..92420bbe 100644 --- a/src/common/platform/win/Win32FileStream.cpp +++ b/src/common/platform/win/Win32FileStream.cpp @@ -1,7 +1,7 @@ -#include "cru/common/platform/win/Win32FileStream.hpp" +#include "cru/common/platform/win/Win32FileStream.h" -#include "cru/common/io/OpenFileFlag.hpp" -#include "cru/common/platform/win/Exception.hpp" +#include "cru/common/io/OpenFileFlag.h" +#include "cru/common/platform/win/Exception.h" #include #include -- cgit v1.2.3