aaru-dps/fstester
1
0
Fork 0
mirror of https://github.com/aaru-dps/fstester.git synced 2025-12-16 19:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handles in Carbon are garbage-collected double-pointers, fix their usage.

Browse Source
This commit is contained in:
Natalia Portillo
2021-05-20 16:33:28 +01:00
parent 55f5042dfd
commit afae632ed2
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
setter/src/unix/darwin/carbon.c
View File

@@ -219,7 +219,9 @@ int CarbonResourceFork(const char* path)
if(h) if(h)
{ {
memcpy(h, IcnsResource, ICNS_RESOURCE_SIZE); HLock(h);
memcpy(*h, IcnsResource, ICNS_RESOURCE_SIZE);
HUnlock(h);
AddResource(h, rtIcons, -16455, IcnsResourceNamePascal); AddResource(h, rtIcons, -16455, IcnsResourceNamePascal);
WriteResource(h); WriteResource(h);
ReleaseResource(h); ReleaseResource(h);
@@ -276,7 +278,9 @@ int CarbonResourceFork(const char* path)
if(h) if(h)
{ {
memcpy(h, PictResource, PICT_RESOURCE_SIZE); HLock(h);
memcpy(*h, PictResource, PICT_RESOURCE_SIZE);
HUnlock(h);
AddResource(h, ftPICTFile, 29876, PictResourceNamePascal); AddResource(h, ftPICTFile, 29876, PictResourceNamePascal);
WriteResource(h); WriteResource(h);
ReleaseResource(h); ReleaseResource(h);
@@ -333,7 +337,9 @@ int CarbonResourceFork(const char* path)
if(h) if(h)
{ {
memcpy(h, VersResource, VERS_RESOURCE_SIZE); HLock(h);
memcpy(*h, VersResource, VERS_RESOURCE_SIZE);
HUnlock(h);
AddResource(h, rtVersion, 1, VersResourceNamePascal); AddResource(h, rtVersion, 1, VersResourceNamePascal);
WriteResource(h); WriteResource(h);
ReleaseResource(h); ReleaseResource(h);
@@ -390,7 +396,9 @@ int CarbonResourceFork(const char* path)
if(h) if(h)
{ {
memcpy(h, IcnsResource, ICNS_RESOURCE_SIZE); HLock(h);
memcpy(*h, IcnsResource, ICNS_RESOURCE_SIZE);
HUnlock(h);
AddResource(h, rtIcons, -16455, IcnsResourceNamePascal); AddResource(h, rtIcons, -16455, IcnsResourceNamePascal);
WriteResource(h); WriteResource(h);
ReleaseResource(h); ReleaseResource(h);
@@ -402,7 +410,9 @@ int CarbonResourceFork(const char* path)
if(h) if(h)
{ {
memcpy(h, PictResource, PICT_RESOURCE_SIZE); HLock(h);
memcpy(*h, PictResource, PICT_RESOURCE_SIZE);
HUnlock(h);
AddResource(h, ftPICTFile, -16455, PictResourceNamePascal); AddResource(h, ftPICTFile, -16455, PictResourceNamePascal);
WriteResource(h); WriteResource(h);
ReleaseResource(h); ReleaseResource(h);
@@ -414,7 +424,9 @@ int CarbonResourceFork(const char* path)
if(h) if(h)
{ {
memcpy(h, VersResource, VERS_RESOURCE_SIZE); HLock(h);
memcpy(*h, VersResource, VERS_RESOURCE_SIZE);
HUnlock(h);
AddResource(h, rtVersion, 1, VersResourceNamePascal); AddResource(h, rtVersion, 1, VersResourceNamePascal);
WriteResource(h); WriteResource(h);
ReleaseResource(h); ReleaseResource(h);