wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Bug 1232450 - use UniquePtr<T[]> instead of nsAutoArrayPtr<T> in xulrunner/; r=Yoric"

Browse Source 
This reverts commit bf65fa24b6.
This commit is contained in:
Jacek Caban 2016-01-15 14:29:51 +01:00
parent b843f0cdd5
commit abd2edda78
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xulrunner/tools/redit/redit.cpp
View File

@ -15,7 +15,7 @@
// Mozilla headers (alphabetical)
#include "mozilla/FileUtils.h" // ScopedClose
#include "mozilla/UniquePtrExtensions.h"
#include "nsAutoPtr.h" // nsAutoArrayPtr
/*
Icon files are made up of:
@ -120,12 +120,12 @@ wmain(int argc, wchar_t** argv)
// Load all the data from the icon file
long filesize = _filelength(file);
auto data = MakeUniqueFallible<BYTE[]>(filesize);
nsAutoArrayPtr<BYTE> data(new BYTE[filesize]);
if(!data) {
fprintf(stderr, "Failed to allocate memory for icon file.\n");
return 1;
}
_read(file, data.get(), filesize);
_read(file, data, filesize);
IconHeader* header = reinterpret_cast<IconHeader*>(data.get());
@ -139,18 +139,18 @@ wmain(int argc, wchar_t** argv)
// Allocate the group resource entry
long groupSize = sizeof(IconHeader)
+ header->ImageCount * sizeof(IconResEntry);
auto group = MakeUniqueFallible<BYTE[]>(groupSize);
nsAutoArrayPtr<BYTE> group(new BYTE[groupSize]);
if(!group) {
fprintf(stderr, "Failed to allocate memory for new images.\n");
return 1;
}
memcpy(group.get(), data.get(), sizeof(IconHeader));
memcpy(group, data, sizeof(IconHeader));
IconDirEntry* sourceIcon =
reinterpret_cast<IconDirEntry*>(data.get()
reinterpret_cast<IconDirEntry*>(data
+ sizeof(IconHeader));
IconResEntry* targetIcon =
reinterpret_cast<IconResEntry*>(group.get()
reinterpret_cast<IconResEntry*>(group
+ sizeof(IconHeader));
for (int id = 1; id <= header->ImageCount; id++) {