resedit 1.4 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6ddbe66a77c0195afafaaff1c2756e915f38614
-  data.tar.gz: c97154c36b5753121497f2d01ef6ce38fc0d1fc0
+  metadata.gz: c544c164c27a245f45cebe0ede011c1a8ebd19d2
+  data.tar.gz: a212b23cc05f16ec779469aecc74601b046ae468
 SHA512:
-  metadata.gz: e9d0e7a836d85b455f4b2172b4d891f9f938f55c38b275f8e7aaa0c88e36b362e9bb4601927fed859a48c1a2767f414092f1adc38672f115e84e1633cdf10127
-  data.tar.gz: 60b8f1b47633ea8520649b2be11592ec057e53f682caa1e98cb3ca5a9ab2429d7e20111d8a6a2f687a39e0ad994877ce1a58cf0cfabbea643f39ebb4accf2874
+  metadata.gz: 85deaaad0d6928ceafda0bb8a6642b8af902f061870c1e8a0fc2ba33bf3e3c25c97c83ac38c2858534214f058f713b3e955bba3fa995eacf77abb4b9ea47ea42
+  data.tar.gz: a8c03dcca383eb79c3215009e4c3563e73cce82e05bd590946926b70ef3a56d57433e57ca51dbb4ea2fbf07596cad6106ccf6fadc66ed6fbd9cd2510db6815de

data/lib/resedit.rb

@@ -13,5 +13,5 @@ require 'resedit/mz/mz'
 
 
 module Resedit
-    VERSION = "1.4"
+    VERSION = "1.5.1"
 end

data/lib/resedit/app/mz_command.rb

@@ -25,6 +25,7 @@ module Resedit
                 "append"=>[method(:append), "add bytes to current file", {"value" => "value", "type" => "value type", }],
                 "replace"=>[method(:replace), "replace added bytes", {"value" => "value", "type"=>"value type"}],
                 "change"=>[method(:change), "change bytes at offset", {"ofs" => "data ofset", "value" => "value", "disp" => "code/file", "type"=>"value type"}],
+                "reloc"=>[method(:reloc), "add relocation", {"value" => "value"}],
                 "revert"=>[method(:revert), "revert changes", {"ofs"=>"change offset/all"}],
                 "hex"=>[method(:hex), "print hex file", {"ofs" => "data offset", "size" => "data size", "how"=>"original/modified", "disp" => "code/file"}],
                 "dasm"=>[method(:dasm), "print disasm", {"ofs" => "data offset", "size" => "data size", "how"=>"original/modified"}],
@@ -142,6 +143,9 @@ module Resedit
             cur().change(params['ofs'], params['value'], params['disp'], params['type'])
         end
 
+        def reloc(params)
+            cur().reloc(params['value'])
+        end
 
         def revert(params)
             cur().revert(params['ofs'])

data/lib/resedit/app/std_commands.rb

@@ -28,7 +28,7 @@ module Resedit
             addParam('command', 'help on specific command', '')
         end
         def job(params)
-            if params['command']
+            if params['command'] != ''
                 cmd = App.get().cmds[params['command']]
                 raise "Unknown command: #{params['command']}" if !cmd
                 puts "Command:"

data/lib/resedit/mz/mz.rb

@@ -101,6 +101,7 @@ module Resedit
                 end
             }
             log("Appended at %s",s)
+            return res
         end
 
 
@@ -122,6 +123,12 @@ module Resedit
             log("Change added at %08X", res)
         end
 
+        def reloc(ofs)
+            ofs = s2i(ofs)
+            res = @header.addReloc(ofs)
+            log((res ? "Relocation added %08X" : "Relocation %08X already exists"), ofs)
+        end
+
 
         def dasm(ofs, size=nil, how=nil)
             ofs = s2i(ofs ? ofs : "entry")

data/lib/resedit/mz/mz_header.rb

@@ -49,14 +49,25 @@ module Resedit
         end
 
 
-        def setCodeSize(size)
+        def changeSize(size)
             mode(HOW_CHANGED)
-            size += headerSize()
             mod = size % BLK
             ch = [mod, size / BLK + (mod ? 1 : 0)]
             change(2, ch.pack('vv'))
         end
 
+        def setCodeSize(size)
+            changeSize(size + headerSize())
+        end
+
+        def addHeaderSize(size)
+            mode(HOW_CHANGED)
+            paras = size/16 + (size%16 == 0 ? 0 : 1)
+            append("00" * (paras * PARA))
+            changeSize(fileSize() + paras * PARA)
+            change(8, [@info[:HeaderParagraphs] + paras].pack('v'))
+        end
+
 
         def headerSize()
             return @info[:HeaderParagraphs] * PARA
@@ -83,6 +94,28 @@ module Resedit
             return headerSize() - HSIZE - @info[:NumberOfRelocations] * 4
         end
 
+        def addReloc(ofs)
+            mode(HOW_CHANGED)
+            #check relocation exists
+            for i in 0..@info[:NumberOfRelocations]-1
+                rel = getRelocation(i)
+                if @mz.body.seg2Linear(rel[0], rel[1]) == ofs
+                    return false
+                end
+            end
+            #add relocation
+            if freeSpace()<4
+                addHeaderSize(4)
+                mode(HOW_CHANGED)
+            end
+            val = @mz.body.linear2seg(ofs)
+            puts "VAL"+ val.to_s()
+            pos = @info[:RelocTableOffset]+@info[:NumberOfRelocations]*4
+            change(pos, val.pack('vv'))
+            change(6, [@info[:NumberOfRelocations]+1].pack('v'))
+            return true
+        end
+
 
         def print(what, how)
             mode(parseHow(how))
@@ -103,6 +136,7 @@ module Resedit
                 printf("free space in header: before relocs 0x%X,  after relocs 0x%X\n", freeSpace(true), freeSpace())
                 return true
             end
+            @mz.body.mode(@mode)
             if what == "reloc"
                 ofs = @info[:RelocTableOffset]
                 for i in 0..@info[:NumberOfRelocations]-1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resedit
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: 1.5.1
 platform: ruby
 authors:
 - bjfn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.3
 description: 
 email: 
 executables:
@@ -31,6 +45,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/resedit
+- lib/resedit.rb
 - lib/resedit/app/app.rb
 - lib/resedit/app/app_command.rb
 - lib/resedit/app/colorizer.rb
@@ -58,8 +74,6 @@ files:
 - lib/resedit/text/format_xml.rb
 - lib/resedit/text/huffman.rb
 - lib/resedit/text/text.rb
-- lib/resedit.rb
-- bin/resedit
 homepage: 
 licenses: []
 metadata: {}
@@ -69,17 +83,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: OG resource proc library!