Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved 64-bit support #13

Merged
merged 7 commits into from
Jan 26, 2019
Merged

Improved 64-bit support #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f185700
Update zlib.rbbas
charonn0 Jan 15, 2019
3e9c6e3
Now use one of three different structures depending on what size is e…
charonn0 Jan 15, 2019
9f80188
Fix struct
charonn0 Jan 16, 2019
6388b94
Make mLastError an Int32 explicitly
charonn0 Jan 19, 2019
6f08791
Make LastError methods return Int32 too
charonn0 Jan 19, 2019
5a02631
Merge branch 'master' into x64Struct
charonn0 Jan 26, 2019
2d7f778
Delete merge leftover
charonn0 Jan 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PKZip/ZipReader.rbbas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Protected Class ZipReader
#tag EndMethod

#tag Method, Flags = &h0
Function LastError() As Integer
Function LastError() As Int32
Return mLastError
End Function
#tag EndMethod
Expand Down Expand Up @@ -411,7 +411,7 @@ Protected Class ZipReader
#tag EndProperty

#tag Property, Flags = &h1
Protected mLastError As Integer
Protected mLastError As Int32
#tag EndProperty

#tag Property, Flags = &h1
Expand Down
4 changes: 2 additions & 2 deletions PKZip/ZipWriter.rbbas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Protected Class ZipWriter
#tag EndMethod

#tag Method, Flags = &h0
Function LastError() As Integer
Function LastError() As Int32
Return mLastError
End Function
#tag EndMethod
Expand Down Expand Up @@ -384,7 +384,7 @@ Protected Class ZipWriter
#tag EndProperty

#tag Property, Flags = &h1
Protected mLastError As Integer
Protected mLastError As Int32
#tag EndProperty


Expand Down
4 changes: 2 additions & 2 deletions USTAR/TarReader.rbbas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Protected Class TarReader
#tag EndMethod

#tag Method, Flags = &h0
Function LastError() As Integer
Function LastError() As Int32
Return mLastError
End Function
#tag EndMethod
Expand Down Expand Up @@ -236,7 +236,7 @@ Protected Class TarReader
#tag EndProperty

#tag Property, Flags = &h21
Private mLastError As Integer
Private mLastError As Int32
#tag EndProperty

#tag Property, Flags = &h21
Expand Down
4 changes: 2 additions & 2 deletions USTAR/TarWriter.rbbas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Protected Class TarWriter
#tag EndMethod

#tag Method, Flags = &h0
Function LastError() As Integer
Function LastError() As Int32
Return mLastError
End Function
#tag EndMethod
Expand Down Expand Up @@ -185,7 +185,7 @@ Protected Class TarWriter
#tag EndProperty

#tag Property, Flags = &h21
Private mLastError As Integer
Private mLastError As Int32
#tag EndProperty


Expand Down
29 changes: 10 additions & 19 deletions zlib/Deflater.rbbas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ Inherits FlateEngine

If CompressionStrategy <> Z_DEFAULT_STRATEGY Or Encoding <> DEFLATE_ENCODING Or MemoryLevel <> DEFAULT_MEM_LVL Then
' Open the compressed stream using custom options
mLastError = deflateInit2_(zstruct, CompressionLevel, Z_DEFLATED, Encoding, MemoryLevel, CompressionStrategy, "1.2.8" + Chr(0), zstruct.Size)
mLastError = deflateInit2_(zstruct, CompressionLevel, Z_DEFLATED, Encoding, MemoryLevel, CompressionStrategy, "1.2.8" + Chr(0), Me.Size)

Else
' process zlib-wrapped deflate data
mLastError = deflateInit_(zstruct, CompressionLevel, "1.2.8" + Chr(0), zstruct.Size)
mLastError = deflateInit_(zstruct, CompressionLevel, "1.2.8" + Chr(0), Me.Size)

End If

Expand Down Expand Up @@ -93,29 +93,29 @@ Inherits FlateEngine
If ReadCount > -1 Then sz = Min(ReadCount - count, CHUNK_SIZE) Else sz = CHUNK_SIZE
If ReadFrom <> Nil And sz > 0 Then chunk = ReadFrom.Read(sz) Else chunk = ""

zstruct.avail_in = chunk.Size
zstruct.next_in = chunk
Me.avail_in = chunk.Size
Me.next_in = chunk
count = count + chunk.Size

Do
' provide more output space
zstruct.next_out = outbuff
zstruct.avail_out = outbuff.Size
mLastError = deflate(zstruct, Flushing)
Me.next_out = outbuff
Me.avail_out = outbuff.Size
mLastError = deflate_(zstruct, Flushing)
If mLastError = Z_STREAM_ERROR Then Return False ' the stream state is inconsistent!!!
' consume any output
Dim have As UInt32 = CHUNK_SIZE - zstruct.avail_out
Dim have As UInt32 = CHUNK_SIZE - Me.avail_out
If have > 0 Then
If have <> outbuff.Size Then outbuff.Size = have
WriteTo.Write(outbuff)
End If
' keep going until zlib doesn't use all the output space or an error
Loop Until mLastError <> Z_OK Or zstruct.avail_out <> 0
Loop Until mLastError <> Z_OK Or Me.avail_out <> 0

Loop Until (ReadCount > -1 And count >= ReadCount) Or ReadFrom = Nil Or ReadFrom.EOF

If Flushing = Z_FINISH And mLastError <> Z_STREAM_END Then Raise New zlibException(mLastError)
Return zstruct.avail_in = 0 And (mLastError = Z_OK Or mLastError = Z_STREAM_END)
Return Me.avail_in = 0 And (mLastError = Z_OK Or mLastError = Z_STREAM_END)


End Function
Expand Down Expand Up @@ -192,15 +192,6 @@ Inherits FlateEngine
#tag EndMethod


#tag ComputedProperty, Flags = &h0
#tag Getter
Get
Return zstruct.data_type
End Get
#tag EndGetter
DataType As UInt32
#tag EndComputedProperty

#tag ComputedProperty, Flags = &h0
#tag Getter
Get
Expand Down
Loading