Skip to content

Commit

Permalink
[#15] change nested struct creations to use "own = false"
Browse files Browse the repository at this point in the history 
* omit those for which only a pointer is stored in the structure
  • Loading branch information
maul.esel committed Feb 25, 2012
1 parent 8882741 commit c2b7ce8
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions Structure Classes/ARRAYDESC.ahk
View file
Expand Up @@ -103,12 +103,12 @@ class ARRAYDESC extends StructBase
local instance := new ARRAYDESC()
instance.SetOriginalPointer(ptr, own)

instance.tdescElem := TYPEDESC.FromStructPtr(ptr)
instance.tdescElem := TYPEDESC.FromStructPtr(ptr, false)
instance.cDims := NumGet(1*ptr, td_size, "UShort")

instance.rgbounds := []
Loop instance.cDims
instance.rgbounds.Insert(SAFEARRAYBOUND.FromStructPtr(ptr + td_size + 2 + (A_Index - 1) * sab_size))
instance.rgbounds.Insert(SAFEARRAYBOUND.FromStructPtr(ptr + td_size + 2 + (A_Index - 1) * sab_size, false))

return instance
}
Expand Down
2 changes: 1 addition & 1 deletion Structure Classes/CUSTDATA.ahk
View file
Expand Up @@ -105,7 +105,7 @@ class CUSTDATA extends StructBase
{
local instance, array := [], size := CUSTDATAITEM.GetRequiredSize(), count := NumGet(1*ptr, 00, "UInt"), arr_ptr := NumGet(1*ptr, 04, "Ptr")
Loop count
array.Insert(CUSTDATAITEM.FromStructPtr(arr_ptr + (A_Index - 1) * size))
array.Insert(CUSTDATAITEM.FromStructPtr(arr_ptr + (A_Index - 1) * size, false))

instance := new CUSTDATA(array, count)
instance.SetOriginalPointer(ptr, own)
Expand Down
6 changes: 3 additions & 3 deletions Structure Classes/ELEMDESC.ahk
View file
Expand Up @@ -91,9 +91,9 @@ class ELEMDESC extends StructBase
local instance := new ELEMDESC()
instance.SetOriginalPointer(ptr, own)

instance.tdesc := TYPEDESC.FromStructPtr(ptr)
, instance.idldesc := IDLDESC.FromStructPtr(ptr + td_size)
, instance.paramdesc := PARAMDESC.FromStructPtr(ptr + td_size)
instance.tdesc := TYPEDESC.FromStructPtr(ptr, false)
, instance.idldesc := IDLDESC.FromStructPtr(ptr + td_size, false)
, instance.paramdesc := PARAMDESC.FromStructPtr(ptr + td_size, false)

return instance
}
Expand Down
2 changes: 1 addition & 1 deletion Structure Classes/FUNCDESC.ahk
View file
Expand Up @@ -155,7 +155,7 @@ class FUNCDESC extends StructBase
, instance.cParams := NumGet(1*ptr, 16 + 2 * A_PtrSize, "Short")
, instance.cParamsOpt := NumGet(1*ptr, 18 + 2 * A_PtrSize, "Short")
, instance.oVft := NumGet(1*ptr, 20 + 2 * A_PtrSize, "Short")
, instance.elemdescFunc := ELEMDESC.FromStructPtr(ptr + 24 + 2 * A_PtrSize)
, instance.elemdescFunc := ELEMDESC.FromStructPtr(ptr + 24 + 2 * A_PtrSize, false)
, instance.wFuncFlags := NumGet(1*ptr, 24 + 2 * A_PtrSize + ed_size, "Short")

return instance
Expand Down
2 changes: 1 addition & 1 deletion Structure Classes/IMAGEINFO.ahk
View file
Expand Up @@ -108,7 +108,7 @@ class IMAGEINFO extends StructBase
{
local instance := new IMAGEINFO(NumGet(1*ptr, 00+0*A_PtrSize, "UPtr")
, NumGet(1*ptr, 00+1*A_PtrSize, "UPtr")
, RECT.FromStructPtr(ptr + 08 + 2*A_PtrSize))
, RECT.FromStructPtr(ptr + 08 + 2*A_PtrSize, false))
instance.SetOriginalPointer(ptr, own)
return instance
}
Expand Down
2 changes: 1 addition & 1 deletion Structure Classes/PARAMDESC.ahk
View file
Expand Up @@ -85,7 +85,7 @@ class PARAMDESC extends StructBase
*/
FromStructPtr(ptr, own := true)
{
local instance := new PARAMDESC(NumGet(1*ptr, 20, "UShort"), PARAMDESCEX.FromStructPtr(ptr))
local instance := new PARAMDESC(NumGet(1*ptr, 20, "UShort"), PARAMDESCEX.FromStructPtr(ptr, false))
instance.SetOriginalPointer(ptr, own)
return instance
}
Expand Down
2 changes: 1 addition & 1 deletion Structure Classes/REOBJECT.ahk
View file
Expand Up @@ -153,7 +153,7 @@ class REOBJECT extends StructBase
instance.poleobj := NumGet(1*ptr, 24+0*A_PtrSize, "UPtr")
instance.pstg := NumGet(1*ptr, 24+1*A_PtrSize, "UPtr")
instance.polesite := NumGet(1*ptr, 24+2*A_PtrSize, "UPtr")
instance.sizel := SIZE.FromStructPtr(ptr + 24+3*A_PtrSize)
instance.sizel := SIZE.FromStructPtr(ptr + 24+3*A_PtrSize, false)
instance.dvaspect := NumGet(1*ptr, 32+3*A_PtrSize, "UInt")
instance.dwFlags := NumGet(1*ptr, 36+3*A_PtrSize, "UInt")
instance.dwUser := NumGet(1*ptr, 40+3*A_PtrSize, "UInt")
Expand Down
6 changes: 3 additions & 3 deletions Structure Classes/STATSTG.ahk
View file
Expand Up @@ -147,9 +147,9 @@ class STATSTG extends StructBase
instance.pwcsName := StrGet(NumGet(1*ptr, 0, "UPtr"), "UTF-16")
instance.type := NumGet(1*ptr, 00 + 1*A_PtrSize, "UInt")
instance.cbSize := NumGet(1*ptr, 04 + 1*A_PtrSize, "UInt64")
instance.mtime := FILETIME.FromStructPtr(ptr + 12 + A_PtrSize)
instance.ctime := FILETIME.FromStructPtr(ptr + 20 + A_PtrSize)
instance.atime := FILETIME.FromStructPtr(ptr + 28 + A_PtrSize)
instance.mtime := FILETIME.FromStructPtr(ptr + 12 + A_PtrSize, false)
instance.ctime := FILETIME.FromStructPtr(ptr + 20 + A_PtrSize, false)
instance.atime := FILETIME.FromStructPtr(ptr + 28 + A_PtrSize, false)
instance.grfMode := NumGet(1*ptr, 36 + 1*A_PtrSize, "UInt")
instance.grfLocksSupported := NumGet(1*ptr, 40 + 1*A_PtrSize, "UInt")
instance.clsid := CCFramework.GUID2String(ptr + 44 + A_PtrSize)
Expand Down
4 changes: 2 additions & 2 deletions Structure Classes/TYPEATTR.ahk
View file
Expand Up @@ -207,8 +207,8 @@ class TYPEATTR extends StructBase
instance.wTypeFlags := NumGet(1*ptr, 50+1*A_PtrSize, "UShort")
instance.wMajorVerNum := NumGet(1*ptr, 52+1*A_PtrSize, "UShort")
instance.wMinorVerNum := NumGet(1*ptr, 54+1*A_PtrSize, "UShort")
instance.tdescAlias := TYPEDESC.FromStructPtr(ptr+56+A_PtrSize)
instance.idldescType := IDLDESC.FromStructPtr(ptr+56+A_PtrSize+instance.tdescAlias.GetRequiredSize())
instance.tdescAlias := TYPEDESC.FromStructPtr(ptr+56+A_PtrSize, false)
instance.idldescType := IDLDESC.FromStructPtr(ptr+56+A_PtrSize+instance.tdescAlias.GetRequiredSize(), false)

return instance
}
Expand Down
2 changes: 1 addition & 1 deletion Structure Classes/VARDESC.ahk
View file
Expand Up @@ -126,7 +126,7 @@ class VARDESC extends StructBase
instance.oInst := NumGet(1*ptr, 04 + A_PtrSize, "UInt")
else if (instance.varkind == 2)
instance.lpvarValue := CCFramework.BuildVARIANT(NumGet(1*ptr, 04 + A_PtrSize, "Ptr"))
instance.elemdescVar := ELEMDESC.FromStructPtr(ptr + 04 + 2 * A_PtrSize)
instance.elemdescVar := ELEMDESC.FromStructPtr(ptr + 04 + 2 * A_PtrSize, false)
, instance.wVarFlags := NumGet(1*ptr, 04 + 2 * A_PtrSize + ed_size, "UShort")

return instance
Expand Down
6 changes: 3 additions & 3 deletions Structure Classes/WIN32_FIND_DATA.ahk
View file
Expand Up @@ -134,9 +134,9 @@ class WIN32_FIND_DATA extends StructBase
instance.SetOriginalPointer(ptr, own)

instance.dwFileAttributes := NumGet(1*ptr, 00, "UInt")
instance.ftCreationTime := FILETIME.FromStructPtr(ptr + 04)
instance.ftLastAccessTime := FILETIME.FromStructPtr(ptr + 12)
instance.ftLastWriteTime := FILETIME.FromStructPtr(ptr + 20)
instance.ftCreationTime := FILETIME.FromStructPtr(ptr + 04, false)
instance.ftLastAccessTime := FILETIME.FromStructPtr(ptr + 12, false)
instance.ftLastWriteTime := FILETIME.FromStructPtr(ptr + 20, false)
instance.nFileSizeHigh := NumGet(1*ptr, 28, "UInt")
instance.nFileSizeLow := NumGet(1*ptr, 32, "UInt")
instance.dwReserved0 := NumGet(1*ptr, 36, "UInt")
Expand Down

0 comments on commit c2b7ce8

Please sign in to comment.