OrcLib: MemoryStream: add parameter to ctor for initial allocation

Author: fabienfl-orc

src/OrcLib/EmbeddedResource.h

@@ -559,7 +559,7 @@ HRESULT Orc::EmbeddedResource::ExtractToBuffer(const std::wstring& szImageFileRe
                 if (item.Size > 0)
                 {
                     using namespace msl::utilities;
-                    if (FAILED(hr = stream->OpenForReadWrite(SafeInt<DWORD>(item.Size))))
+                    if (FAILED(hr = stream->OpenForReadWrite(4096, SafeInt<DWORD>(item.Size))))
                         return nullptr;
                     pOutput = stream;
                     return stream;

src/OrcLib/MemoryStream.cpp

@@ -93,15 +93,12 @@ MemoryStream::OpenForReadWrite
 Creates an empty stream which can be written to. All writes to the  stream will
 be kept in a growable memory buffer
 */
-HRESULT MemoryStream::OpenForReadWrite(DWORD dwReservedBytes)
+HRESULT MemoryStream::OpenForReadWrite(DWORD dwSize, DWORD dwReservedBytes)
 {
     HRESULT hr = E_FAIL;
     Close();
 
-    DWORD dwPageSize = 0L;
-    SystemDetails::GetPageSize(dwPageSize);
-
-    if (FAILED(hr = SetBufferSize(dwPageSize, dwReservedBytes)))
+    if (FAILED(hr = SetBufferSize(dwSize, dwReservedBytes)))
         return hr;
 
     m_bReadOnly = false;

src/OrcLib/MemoryStream.h

@@ -54,7 +54,7 @@ class MemoryStream : public ByteStream
     //
     // CByteStream implementation
     //
-    STDMETHOD(OpenForReadWrite)(DWORD dwReservedBytes = kDefaultReservedBytes);
+    STDMETHOD(OpenForReadWrite)(DWORD dwSize = 4096, DWORD dwReservedBytes = kDefaultReservedBytes);
 
     STDMETHOD(OpenForReadOnly)(__in PVOID pBuffer, __in size_t cbBuffer);
 

src/OrcLib/PEInfo.cpp

@@ -330,8 +330,8 @@ HRESULT PEInfo::OpenVersionInformation()
     rsrc_rsrc_offset = (size_t)-1;
     for (size_t i = 0; i < rsrc_entry_count; i++)
     {
-        PIMAGE_RESOURCE_DIRECTORY_ENTRY pde = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(
-            (LPBYTE)rsrc_dir + sizeof(IMAGE_RESOURCE_DIRECTORY) + i * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
+        PIMAGE_RESOURCE_DIRECTORY_ENTRY pde =
+            (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)rsrc_dir + sizeof(IMAGE_RESOURCE_DIRECTORY) + i * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
         if ((!pde->NameIsString) && (pde->Id == RESOURCE_ID_VERSION) && (pde->DataIsDirectory))
         {
             rsrc_rsrc_offset = pde->OffsetToDirectory;
@@ -361,8 +361,8 @@ HRESULT PEInfo::OpenVersionInformation()
     rsrc_rsrc_offset = (size_t)-1;
     for (size_t i = 0; i < rsrc_entry_count; i++)
     {
-        PIMAGE_RESOURCE_DIRECTORY_ENTRY pde = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(
-            (LPBYTE)rsrc_dir + sizeof(IMAGE_RESOURCE_DIRECTORY) + i * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
+        PIMAGE_RESOURCE_DIRECTORY_ENTRY pde =
+            (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)rsrc_dir + sizeof(IMAGE_RESOURCE_DIRECTORY) + i * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
         if (pde->DataIsDirectory)
         {
             rsrc_rsrc_offset = pde->OffsetToDirectory;  // take any available children
@@ -391,8 +391,8 @@ HRESULT PEInfo::OpenVersionInformation()
     rsrc_rsrc_offset = static_cast<size_t>(-1);
     for (size_t i = 0; i < rsrc_entry_count; i++)
     {
-        PIMAGE_RESOURCE_DIRECTORY_ENTRY pde = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(
-            (LPBYTE)rsrc_dir + sizeof(IMAGE_RESOURCE_DIRECTORY) + i * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
+        PIMAGE_RESOURCE_DIRECTORY_ENTRY pde =
+            (PIMAGE_RESOURCE_DIRECTORY_ENTRY)((LPBYTE)rsrc_dir + sizeof(IMAGE_RESOURCE_DIRECTORY) + i * sizeof(IMAGE_RESOURCE_DIRECTORY_ENTRY));
         if ((!pde->NameIsString) && (!pde->DataIsDirectory))
         {
             // TODO check LANG (pde->Id)
@@ -581,11 +581,9 @@ HRESULT PEInfo::OpenAllHash(Intentions localIntentions)
     if (memstream == nullptr)
         return E_OUTOFMEMORY;
 
-    if (FAILED(hr = memstream->OpenForReadWrite()))
+    if (FAILED(hr = memstream->OpenForReadWrite(stream->GetSize())))
         return hr;
 
-    if (FAILED(hr = memstream->SetSize(stream->GetSize())))
-        return hr;
     ULONGLONG ullWritten = 0LL;
     if (FAILED(hr = stream->CopyTo(*memstream, &ullWritten)))
         return hr;

src/OrcLib/TemporaryStream.cpp

@@ -91,12 +91,6 @@ STDMETHODIMP TemporaryStream::Open(
 
         m_pMemStream = make_shared<MemoryStream>();
 
-        if (FAILED(hr = m_pMemStream->SetSize(dwMemThreshold)))
-        {
-            Log::Error("Failed to resize memory buffer [{}]", SystemError(hr));
-            return hr;
-        }
-
         if (FAILED(hr = m_pMemStream->OpenForReadWrite(dwMemThreshold)))
         {
             Log::Debug("Failed to open memstream for {} bytes, using file stream", dwMemThreshold);