diff --git a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp index 64b88c6fe..a85b8ae9f 100644 --- a/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp +++ b/code/nel/tools/3d/object_viewer/snapshot_tool_dlg.cpp @@ -121,8 +121,8 @@ void CSnapshotToolDlg::stringFromRegistry(HKEY hKey, const TCHAR *name, CString return; } - CUniquePtr tmpDest(new TCHAR[size]); - result = RegQueryValueEx(hKey, name, NULL, &type, (BYTE*)tmpDest.get(), &size); + std::vector tmpDest(size); + result = RegQueryValueEx(hKey, name, NULL, &type, (BYTE*)&tmpDest[0], &size); if (result != ERROR_SUCCESS) { @@ -130,7 +130,7 @@ void CSnapshotToolDlg::stringFromRegistry(HKEY hKey, const TCHAR *name, CString return; } - dest = tmpDest.get(); + dest = &tmpDest[0]; } diff --git a/code/ryzom/client/src/seven_zip/seven_zip.cpp b/code/ryzom/client/src/seven_zip/seven_zip.cpp index 7899e7380..0fb18838a 100644 --- a/code/ryzom/client/src/seven_zip/seven_zip.cpp +++ b/code/ryzom/client/src/seven_zip/seven_zip.cpp @@ -196,26 +196,26 @@ bool unpackLZMA(const std::string &lzmaFile, const std::string &destFileName) } // allocate input buffer for props - CUniquePtr propsBuffer(new uint8[LZMA_PROPS_SIZE]); + std::vector propsBuffer(LZMA_PROPS_SIZE); // size of LZMA content inSize -= LZMA_PROPS_SIZE + 8; // allocate input buffer for lzma data - CUniquePtr inBuffer(new uint8[inSize]); + std::vector inBuffer(inSize); uint64 fileSize = 0; try { // read props - inStream.serialBuffer(propsBuffer.get(), LZMA_PROPS_SIZE); + inStream.serialBuffer(&propsBuffer[0], LZMA_PROPS_SIZE); // read uncompressed size inStream.serial(fileSize); // read lzma content - inStream.serialBuffer(inBuffer.get(), inSize); + inStream.serialBuffer(&inBuffer[0], inSize); } catch(const EReadError &e) { @@ -224,14 +224,14 @@ bool unpackLZMA(const std::string &lzmaFile, const std::string &destFileName) } // allocate the output buffer - CUniquePtr outBuffer(new uint8[fileSize]); + std::vector outBuffer(fileSize); // in and out file sizes SizeT outProcessed = (SizeT)fileSize; SizeT inProcessed = (SizeT)inSize; // decompress the file in memory - sint res = LzmaUncompress(outBuffer.get(), &outProcessed, inBuffer.get(), &inProcessed, propsBuffer.get(), LZMA_PROPS_SIZE); + sint res = LzmaUncompress(&outBuffer[0], &outProcessed, &inBuffer[0], &inProcessed, &propsBuffer[0], LZMA_PROPS_SIZE); if (res != 0 || outProcessed != fileSize) { @@ -245,7 +245,7 @@ bool unpackLZMA(const std::string &lzmaFile, const std::string &destFileName) try { // write content - outStream.serialBuffer(outBuffer.get(), (uint)fileSize); + outStream.serialBuffer(&outBuffer[0], (uint)fileSize); } catch(const EFile &e) { @@ -273,12 +273,12 @@ bool packLZMA(const std::string &srcFileName, const std::string &lzmaFileName) } // allocate input buffer - CUniquePtr inBuffer(new uint8[inSize]); + std::vector inBuffer(inSize); try { // read file in buffer - inStream.serialBuffer(inBuffer.get(), inSize); + inStream.serialBuffer(&inBuffer[0], inSize); } catch(const EReadError &e) { @@ -288,11 +288,11 @@ bool packLZMA(const std::string &srcFileName, const std::string &lzmaFileName) // allocate output buffer size_t outSize = (11 * inSize / 10) + 65536; // worst case = 1.1 * size + 64K - CUniquePtr outBuffer(new uint8[outSize]); + std::vector outBuffer(outSize); // allocate buffer for props size_t outPropsSize = LZMA_PROPS_SIZE; - CUniquePtr outProps(new uint8[outPropsSize]); + std::vector outProps(outPropsSize); // compress with best compression and other default settings sint res = LzmaCompress(outBuffer.get(), &outSize, inBuffer.get(), inSize, outProps.get(), &outPropsSize, 9, 1 << 27, -1, -1, -1, -1, 1);