resedit 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a424846e1a332caa274f40012e49105a519e17ef
-  data.tar.gz: f74b80c08c7a3f50bd6cbf3b0eb12709bd196918
+  metadata.gz: 3f076cd96b73b751c42dbd40c51c2d2dcbfeda73
+  data.tar.gz: f6ed09115d8564692914c8108ab78a45ecde1ef5
 SHA512:
-  metadata.gz: 896f4e374b665fa48b197c86f740f0db2deffcdccf658d6b05804807c29507e048fee7b580583d28c972c2ee3dddb44fcad42f7085be8a022b75129a54d4e3c6
-  data.tar.gz: feee4a9822ed895a8cc3066c67e4ebd6ec5838b396bd6747329de9e7d8e31930c0fa756260de50ddcae343ef4879d1f7dc8cd330f9c18305d123870b3aa658b1
+  metadata.gz: 1e72a2f984596a199621dfcc47dd23d54314934104cffba37fd229f3a90446211004fba87ecc15fb8e5ef400b4ddde27265ea0e7c6a6e6b3cf99179ac14348a7
+  data.tar.gz: 2e944951d3a6c31cdbe60fbf417082b64a1b55dcf09570660635eaf9823448926480c44466470b390b2ee0e06819e397cb0f7d325f9bf013204a75ffa047e871

data/lib/resedit.rb

@@ -25,5 +25,5 @@ require 'resedit/mz/multiexe'
 
 
 module Resedit
-    VERSION = "1.8.4"
+    VERSION = "1.8.5"
 end

data/lib/resedit/mz/mz.rb

@@ -12,6 +12,7 @@ module Resedit
 
         def initialize(exe, file, size)
             super(exe, file, size)
+            @fsize = size
             @relocFix = 0
             @newOfs = false
             if @info[:RelocTableOffset]>=0x40
@@ -33,7 +34,7 @@ module Resedit
             cs = @info[:CS]
             sz = fileSize()-headerSize()
             codesize += PARA - codesize % PARA if codesize % PARA!=0
-            changeSize(sz + codesize + headerSize())
+            setFileSize(sz + codesize + headerSize())
             paras = codesize / PARA
             setInfo(:SS, ss+paras)
             setInfo(:CS, cs+paras)
@@ -44,7 +45,7 @@ module Resedit
             end
             mode(HOW_CHANGED)
             @relocFix = paras
-            MZEnv.instance().set(:relocFix, paras.to_s)
+            @exe.env.set(:relocFix, paras.to_s)
             return codesize
         end
 
@@ -98,8 +99,7 @@ module Resedit
             add = count - @info[:NumberOfRelocations]
             return if add<=0
             add -= freeSpace()/4
-            return if add<=0
-            addHeaderSize(add*4)
+            addHeaderSize(add*4) if add>0
             setInfo(:NumberOfRelocations, count)
             mode(HOW_CHANGED)
         end
@@ -109,14 +109,13 @@ module Resedit
             #check relocation exists
             for i in 0..@info[:NumberOfRelocations]-1
                 rel = getRelocation(i)
-                if @exe.body.seg2Linear(rel[0], rel[1]) == ofs
-                    return false
-                end
+                return false if @exe.body.seg2Linear(rel[0], rel[1]) == ofs
             end
             #add relocation
+            rid = @info[:NumberOfRelocations]
             setSpaceForRelocs(@info[:NumberOfRelocations]+1)
             val = @exe.body.linear2seg(ofs)
-            setRelocation(@info[:NumberOfRelocations], val)
+            setRelocation(rid, val)
             return true
         end
 
@@ -134,7 +133,7 @@ module Resedit
                 s = colStr(sprintf("%d (%X)", fsz,fsz), changed?(2, 4))
                 printf("mz file size: %s\treal file size: %d (0x%X)\n", s, @fsize, @fsize)
                 printf("header size: %s\n", colStr(hsz, changed?(8, 2)))
-                printf("code size: %s\n", colStr(fsz - hsz, @mz.body.changed?(0)))
+                printf("code size: %s\n", colStr(fsz - hsz, @exe.body.changed?(0)))
                 printf("reloc table size: %s\n", colStr(@info[:NumberOfRelocations] * 4, changed?(6, 2)))
                 printf("free space in header: before relocs 0x%X,  after relocs 0x%X\n", freeSpace(true), freeSpace())
                 printf("reloc fix: 0x%X\n", @relocFix)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resedit
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - bjfn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2019-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: OG resource proc library!