resedit 1.6 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4e01f23eab7befb55f58374b179252e580ba27
-  data.tar.gz: c70bea5859d5fcdb2c62379956034d641336d320
+  metadata.gz: 778c2b706f9f0dc7daf38221fdd1b31c1bcb24e0
+  data.tar.gz: e55fc3fdbd514f958173df1d9f0f315df937e161
 SHA512:
-  metadata.gz: bec413733f867fe85b74bfbb07f99bcb4be3b161f3a3539cf50ed5312e03365accff257b81a107308c1ad205e0c8eb7779f330bb62414e3c508af802ce64edab
-  data.tar.gz: f6ef54cd8d085aaf2821f3b7821ccdbaa4c15ac26a4cf38b734091f0095b6626a7333f673a1ccaa72bc49075fbec2d57839dd9588391a46fc25ea7dc2744b9a0
+  metadata.gz: 50651c92183dd3bbdeb1305cb7e6ea03d482f23d2f21bbdc3dc9815b04f9c48e898243f32f21f7237f74ed5fb4028e2c9e08e8dba4c15def232509c61539ca93
+  data.tar.gz: 31a923d1fc346ee0aac0534670d21df368cb97a725a83cb4be6761d98000e86615d903cfe4cf13fbaa65beb58cdc97a518ce8698e4cef2d36e481b216308b86b

data/lib/resedit.rb

@@ -10,6 +10,7 @@ require 'resedit/app/font_convert'
 require 'resedit/app/text_convert'
 require 'resedit/convert/bitconv'
 require 'resedit/convert/codepatch'
+require 'resedit/convert/colors'
 require 'resedit/mz/mz'
 require 'resedit/classes/colorizer'
 require 'resedit/classes/hexwriter'
@@ -17,5 +18,5 @@ require 'resedit/classes/changeable'
 
 
 module Resedit
-    VERSION = "1.6"
+    VERSION = "1.7"
 end

data/lib/resedit/classes/changeable.rb

@@ -76,17 +76,21 @@ module Resedit
                 return ofs
             end
 
-            def change(ofs, data)
-                return @sz + @n.change(ofs - @sz, data) if ofs > @sz
+            def change(ofs, data, fix=false)
+                return @sz + @n.change(ofs - @sz, data, fix) if ofs > @sz
                 nxt = data.length - @sz + ofs
                 size = nxt>0 ? data.length-nxt : data.length
-                @n.change(0, data[size..-1]) if nxt > 0
+                @n.change(0, data[size..-1], fix) if nxt > 0
                 if @nbuf
                     @nbuf = @nbuf[0,ofs] + data[0, size] + @nbuf[ofs+size..-1]
                     mode()
                     return ofs
                 end
-                split(ofs, data[0, size])
+                if fix
+                    @obuf = @obuf[0, ofs] + data[0, size] + @obuf[ofs+size..-1]
+                else
+                    split(ofs, data[0, size])
+                end
                 mode()
                 return ofs
             end
@@ -186,8 +190,10 @@ module Resedit
             @root = Change.new(data)
         end
 
+        def setData(data); @root = Change.new(data) end
 
         def mode(how)
+            return if @mode==how
             @root.mode(how)
             @mode = how
         end
@@ -209,6 +215,11 @@ module Resedit
             return ofs
         end
 
+        def fix(ofs, bytes)
+            @root.change(ofs, bytes, true)
+            return ofs
+        end
+
         def changed?(ofs, size=1); return @root.changed?(ofs, size) end
 
         def debug(); LOG.level = Logger::DEBUG end
@@ -264,6 +275,19 @@ module Resedit
             return @root.hex(writer, ofs, size, col)
         end
 
+        def print(what, how)
+            mode(parseHow(how))
+            if what=="changes"
+                getChanges().each{|ofs,bts|
+                    printf("%08X: %s -> %s\n", ofs, bts[0].bytes.map { |b| sprintf("%02X",b) }.join,
+                         colStr(bts[1].bytes.map { |b| sprintf("%02X",b) }.join))
+                }
+                puts
+                return true
+            end
+            return false
+        end
+
 
         def saveData(file)
             mode(HOW_CHANGED)

data/lib/resedit/convert/codepatch.rb

@@ -21,8 +21,9 @@ module Resedit
             end
 
             def addr(idx, adr)
-                adr[0] += @ofs[idx]
-                return adr
+                ret = [adr[0], adr[1]]
+                ret[0] += @ofs[idx]
+                return ret
             end
 
             def hexdata()

data/lib/resedit/convert/colors.rb

@@ -0,0 +1,75 @@
+
+module Resedit
+
+    class Color
+        attr_accessor :a, :r, :g, :b, :amath
+
+        def initialize(valOrR, g=nil, b=nil, a=0xFF)
+            @amath = false
+            if g == nil
+                @r = (valOrR >> 16) & 0xFF
+                @g = (valOrR >> 8) & 0xFF
+                @b = valOrR & 0xFF
+                @a = (valOrR >> 24) & 0xFF
+            else
+                @r, @g, @b, @a = valOrR, g, b, a
+            end
+        end
+
+        def to_s()
+            return "[#{@a.to_s(16)} #{@r.to_s(16)} #{@g.to_s(16)} #{@b.to_s(16)}]"
+        end
+
+        def to_i()
+            return (@a<<24)|(@r<<16)|(@g<<8)|@b
+        end
+
+        def add(col)
+            @a = [0xFF, @a + col.a].min if @amath
+            @r = [0xFF, @r + col.r].min
+            @g = [0xFF, @g + col.g].min
+            @b = [0xFF, @b + col.b].min
+            return self
+        end
+
+        def mul(m)
+            @a = [0xFF, (@a * m).to_i()].min if @amath
+            @r = [0xFF, (@r * m).to_i()].min
+            @g = [0xFF, (@g * m).to_i()].min
+            @b = [0xFF, (@b * m).to_i()].min
+            return self
+        end
+
+        def *(m); Color.new(@r,@g,@b,@a).mul(m) end
+
+        def +(col); Color.new(@r,@g,@b,@a).add(col) end
+
+    end
+
+    class ColorMap
+
+        def initialize(from, to)
+            @from = Color.new(from)
+            @to = Color.new(to)
+        end
+
+        def gradient(steps)
+            map = [@from]
+            c = steps-1.0
+            for i in 1..steps-2
+                v = 1.0 * i / c
+                map += [ (@from*(1.0-v) + @to*v).to_i ]
+            end
+            map += [@to]
+            #puts map
+            return map
+        end
+
+        def mapBpp(bpp)
+            return gradient(1<<bpp)
+        end
+
+
+    end
+
+end

data/lib/resedit/font/font.rb

@@ -1,26 +1,50 @@
 require 'resedit/font/font_char'
 require 'resedit/image/image_factory'
+require 'resedit/convert/colors'
 
 module Resedit
 
     class Font
-        attr_reader :count, :width, :height
+        attr_reader :count, :width, :height, :bpp
         attr_accessor :gridColor, :charColor, :userData, :widthColor, :bgColor
 
         # charWidth, charHeight, characters count
-        def initialize(width, height, count=256)
+        def initialize(width, height, count: 256, bpp: 1)
             @width, @height, @count = width, height, count
             @gridColor = 0xFFEEEEEE
             @charColor = 0xFF000000
             @bgColor = 0xFFFFFFFF
             @widthColor = 0xFFFF0000
             @chars = {}
+            @bpp = bpp
             @userData = nil
+            @colmap = nil
+            @valmap = nil
+        end
+
+        def buildBppMap()
+            return [@bgColor, @charColor] if @bpp==1
+            return ColorMap.new(@bgColor, @charColor).mapBpp(@bpp)
+        end
+
+        def colorMap(val)
+            @colmap = buildBppMap() if !@colmap
+            #@puts "#{val} = #{@colmap[val].to_s(16)}"
+            return @colmap[val]
+        end
+
+        def valueMap(col)
+            if !@valmap
+                @valmap = Hash[buildBppMap().each_with_index.map {|x,i| [x, i]}] if !@valmap
+            end
+            val=@valmap[col]
+            raise "Wrong color in font #{col.to_s(16)}" if val==nil
+            return val
         end
 
         def setChar(id, data, width=nil, flags=nil)
             width=@width if !width
-            @chars[id] = FontChar.new(@width, @height, id, data, width, flags)
+            @chars[id] = FontChar.new(self, @height, id, data, width, flags)
         end
 
         def getChar(id)
@@ -51,10 +75,10 @@ module Resedit
             img.fill(@bgColor)
             #draw grid
             for i in 0..16
-                img.vline(i*(@width+1), gridColor)
+                img.vline(i*(@width+1), @gridColor)
             end
             for j in 0..rows
-                img.hline(j*(@height+1), gridColor)
+                img.hline(j*(@height+1), @gridColor)
             end
             #draw letters
             @chars.each { |idx,c|
@@ -62,9 +86,10 @@ module Resedit
                 y = idx/16
                 x += 1+x*@width
                 y += 1+y*@height
-                c.draw(img, @charColor, x, y, @widthColor)
+                c.draw(img, x, y)
             }
             img.save(filename)
+            @colmap = nil
         end
 
         def load(filename)
@@ -76,10 +101,11 @@ module Resedit
                 y = idx/16
                 x += 1+x*@width
                 y += 1+y*@height
-                c = FontChar.new(width,height,idx)
-                c.scan(img, @charColor, x, y, @widthColor, [@bgColor, @gridColor])
+                c = FontChar.new(self, height, idx)
+                c.scan(img, x, y)
                 @chars[c.index] = c if c.data
             end
+            @valmap = nil
         end
 
     end

data/lib/resedit/font/font_char.rb

@@ -3,25 +3,27 @@ module Resedit
     class FontChar
         attr_accessor :index, :data, :realWidth, :flags
 
-        def initialize(width, height, index, data=nil, realWidth=nil, flags=nil)
-            @width, @height, @index = width, height, index
+        def initialize(font, height, index, data=nil, realWidth=nil, flags=nil)
+            @font = font
+            @width = font.width
+            @height, @index = height, index
             @realWidth=realWidth
             @flags = flags
-            @data=data if (data && data.length==width*height)
+            @data=data if (data && data.length==@width*height)
         end
 
-        def hasPixel(x, y)
-            @data[y*@width+x] != 0
-        end
+        def hasPixel(x, y); @data[y*@width+x] != 0 end
+
+        def valueAt(x,y); @data[y*@width+x] end
 
-        def draw(image, color, x, y, wColor)
+        def draw(image, x, y)
             for j in 0..@height-1
                 for i in 0..@width-1
-                    image.setPixel(x+i, y+j, color) if hasPixel(i,j)
+                    image.setPixel(x+i, y+j, @font.colorMap(valueAt(i,j))) if hasPixel(i,j)
                 end
             end
             if @realWidth
-                image.setPixel(x+@realWidth, y, wColor)
+                image.setPixel(x+@realWidth, y, @font.widthColor)
             end
             if @flags && @flags.length>0
                 for i in 0..@flags.length-1
@@ -30,13 +32,12 @@ module Resedit
             end
         end
 
-        def readFlags(image, x, y, bgcolors)
+        def readFlags(image, x, y)
             empty = true
             flags = []
             for i in 0..@height-2
-                flags += [bgcolors[0]]
                 col = image.getPixel(x, y+i)
-                if bgcolors.include?(col)
+                if col==@font.bgColor || col==@font.gridColor
                     next
                 end
                 empty=false
@@ -47,24 +48,28 @@ module Resedit
         end
 
 
-        def scan(image, color, x, y, wColor, bgcolors)
+        def scan(image, x, y)
+            wColor = @font.widthColor
+            bgColor = @font.bgColor
             @data=[0]*@width*@height
             @realWidth = nil
+            width = @width
             _hasData = false
             for j in 0..@height-1
-                for i in 0..@width-1
+                for i in 0..width-1
                     col=image.getPixel(x+i, y+j)
-                    if col==color
-                        @data[j*@width+i]= 1
-                        _hasData = true
-                    end
-                    if col ==wColor
+                    if col == wColor
                         @realWidth = i
+                        width = @realWidth
+                        break
+                    elsif col != bgColor
+                        @data[j*@width+i] = @font.valueMap(col)
+                        _hasData = true
                     end
                 end
             end
             fx = x + (@realWidth ? @realWidth : @width)
-            @flags = readFlags(image, fx, y+1, bgcolors)
+            @flags = readFlags(image, fx, y+1)
             @data=nil if !_hasData
             return @data!=nil
         end

data/lib/resedit/mz/mz.rb

@@ -153,6 +153,10 @@ module Resedit
             log("Reverted")
         end
 
+        def hexify(str)
+            str.each_byte.map { |b| sprintf("%02X",b) }.join
+        end
+
 
         def save(filename, final=nil)
             raise "Unknown final: " + final if final && final != "final"

data/lib/resedit/mz/mz_body.rb

@@ -27,7 +27,9 @@ module Resedit
             for i in 0..@mz.header.info[:NumberOfRelocations]-1
                 r = @mz.header.getRelocation(i)
                 @segments.add(r[1])
-                val = segData(r, 2).unpack('v')[0]
+                sd = segData(r, 2)
+                next if !sd
+                val = sd.unpack('v')[0]
                 @segments.add(val)
             end
         end
@@ -39,7 +41,7 @@ module Resedit
                 @segments.add(r[1])
                 ofs = seg2Linear(r[0], r[1])
                 val = getData(ofs, 2).unpack('v')[0] + add
-                change(ofs, [val].pack('v'))
+                fix(ofs, [val].pack('v'))
                 @segments.add(val)
             end
         end
@@ -68,7 +70,7 @@ module Resedit
 
         def segData(reloc, size, isStr=false)
             ofs = seg2Linear(reloc[0], reloc[1])
-            #return "None" if ofs > @root.size()
+            return nil if ofs > @root.size()
             return getData(ofs, size) if !isStr
             return colVal(ofs, size)
         end
@@ -87,6 +89,7 @@ module Resedit
 
         def append(bytes, where=nil)
             mode(HOW_CHANGED)
+            relfix = @mz.header.relocFix
             res = @addsz
             buf = @addsz>0 ? @root.nbuf[0, @addsz] : ''
             buf += bytes
@@ -96,7 +99,7 @@ module Resedit
             insert(0, bytes + "\x00"*(sz-@addsz))
             seg = linear2seg(res)
             res = [res, seg, sz/0x10]
-            patchRelocs(sz/0x10)
+            patchRelocs(sz/0x10 - relfix)
             return res
         end
 

data/lib/resedit/mz/mz_header.rb

@@ -7,8 +7,10 @@ module Resedit
         BLK = 0x200
         PARA = 0x10
         HSIZE = 0x1C
+        HDRDESCR = [:Magic, :BytesInLastBlock, :BlocksInFile, :NumberOfRelocations, :HeaderParagraphs, :MinExtraParagraphs, :MaxExtraParagraphs,
+                    :SS, :SP, :Checksum, :IP, :CS, :RelocTableOffset, :OverlayNumber]
 
-        attr_reader :info, :mz
+        attr_reader :info, :mz, :relocFix
 
         def initialize(mz, file, size)
             raise "Not MZ file" if size < HSIZE
@@ -18,6 +20,7 @@ module Resedit
             @_infoOrig = loadInfo()
             @_info = nil
             @info = @_infoOrig
+            @relocFix = 0
             raise "Not MZ file" if MAGIC != @info[:Magic]
             addData(file, headerSize() - HSIZE)
         end
@@ -42,21 +45,24 @@ module Resedit
 
         def loadInfo()
             v = getData(0, HSIZE).unpack('v*')
-            return  {:Magic => v[0], :BytesInLastBlock => v[1], :BlocksInFile => v[2], :NumberOfRelocations => v[3],
-                     :HeaderParagraphs => v[4], :MinExtraParagraphs => v[5], :MaxExtraParagraphs => v[6],
-                     :SS => v[7], :SP => v[8], :Checksum => v[9], :IP => v[10], :CS => v[11],
-                     :RelocTableOffset => v[12], :OverlayNumber => v[13]
-                     }
+            return HDRDESCR.map.with_index { |x, i| [x, v[i]] }.to_h
         end
 
 
+        def setInfo(field, values)
+            raise "Unknown header field #{field}" if !HDRDESCR.include?(field)
+            values = [values] if !values.is_a?(Array)
+            change(HDRDESCR.index(field)*2, values.pack('v*'))
+        end
+
         def changeSize(size)
             mode(HOW_CHANGED)
             mod = size % BLK
-            ch = [mod, size / BLK + (mod ? 1 : 0)]
-            change(2, ch.pack('vv'))
+            setInfo(:BytesInLastBlock, [mod, size / BLK + (mod ? 1 : 0)])
         end
 
+        def setBodySize(size); changeSize(size + headerSize()) end
+
         def rebuildHeader(codesize)
             mode(HOW_ORIGINAL)
             ss = @info[:SS]
@@ -65,22 +71,35 @@ module Resedit
             codesize += PARA - codesize % PARA if codesize % PARA!=0
             changeSize(sz + codesize + headerSize())
             paras = codesize / PARA
-            change(14, [ss+paras].pack('v'))
-            change(22, [cs+paras].pack('v'))
+            setInfo(:SS, ss+paras)
+            setInfo(:CS, cs+paras)
             for i in 0..@mz.header.info[:NumberOfRelocations]-1
                 rel = getRelocation(i)
-                rel[1]+=paras
-                setRelocation(i, rel)
+                rel[1] += paras-@relocFix
+                fix(@info[:RelocTableOffset] + i * 4, rel.pack('vv'))
             end
+            mode(HOW_CHANGED)
+            @relocFix = paras
+            MZEnv.instance().set(:relocFix, paras.to_s)
             return codesize
         end
 
         def addHeaderSize(size)
             mode(HOW_CHANGED)
             paras = size/16 + (size%16 == 0 ? 0 : 1)
-            append("00" * (paras * PARA))
+            insert(headerSize(), "\x00" * (paras * PARA))
             changeSize(fileSize() + paras * PARA)
-            change(8, [@info[:HeaderParagraphs] + paras].pack('v'))
+            setInfo(:HeaderParagraphs, @info[:HeaderParagraphs] + paras)
+            mode(HOW_CHANGED)
+        end
+
+        def loadChanges(file)
+            super(file)
+            mode(HOW_ORIGINAL)
+            ocs = @info[:CS]
+            mode(HOW_CHANGED)
+            ncs = @info[:CS]
+            @relocFix = ncs - ocs
         end
 
 
@@ -99,12 +118,12 @@ module Resedit
 
 
         def getRelocation(idx)
-            raise "Wrong relocation index " if idx<0 || idx>@info[:NumberOfRelocations]
+            raise "Wrong relocation index " if idx<0 || idx >= @info[:NumberOfRelocations]
             return getData(@info[:RelocTableOffset] + idx * 4, 4).unpack('vv')
         end
 
         def setRelocation(idx, data)
-            raise "Wrong relocation index " if idx<0 || idx>@info[:NumberOfRelocations]
+            raise "Wrong relocation index " if idx<0 || idx >= @info[:NumberOfRelocations]
             change(@info[:RelocTableOffset] + idx * 4, data.pack('vv'))
         end
 
@@ -114,6 +133,16 @@ module Resedit
             return headerSize() - HSIZE - @info[:NumberOfRelocations] * 4
         end
 
+        def setSpaceForRelocs(count)
+            add = count - @info[:NumberOfRelocations]
+            return if add<=0
+            add -= freeSpace()/4
+            return if add<=0
+            addHeaderSize(add*4)
+            setInfo(:NumberOfRelocations, count)
+            mode(HOW_CHANGED)
+        end
+
         def addReloc(ofs)
             mode(HOW_CHANGED)
             #check relocation exists
@@ -124,15 +153,9 @@ module Resedit
                 end
             end
             #add relocation
-            if freeSpace()<4
-                addHeaderSize(4)
-                mode(HOW_CHANGED)
-            end
+            setSpaceForRelocs(@info[:NumberOfRelocations]+1)
             val = @mz.body.linear2seg(ofs)
-            pos = @info[:RelocTableOffset]+@info[:NumberOfRelocations]*4
-            cnt = @info[:NumberOfRelocations]
-            change(pos, val.pack('vv'))
-            change(6, [cnt+1].pack('v'))
+            setRelocation(@info[:NumberOfRelocations], val)
             return true
         end
 
@@ -153,6 +176,7 @@ module Resedit
                 printf("code size: %s\n", colStr(fsz - hsz, @mz.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)
                 return true
             end
             @mz.body.mode(@mode)
@@ -167,6 +191,7 @@ module Resedit
                 end
                 return true
             end
+            return super(what, how)
         end
 
 

data/lib/resedit/mz/mzenv.rb

@@ -20,10 +20,15 @@ module Resedit
 
         def s2i(str)
             ss=str.split(':')
-            if ss.length == 2
+            if ss.length == 2 || ss.length == 3
                 ss[0] = '0x'+ss[0] if ss[0][0,2]!='0x'
                 ss[1] = '0x'+ss[1] if ss[1][0,2]!='0x'
-                return (s2i(ss[0]) << 4) + s2i(ss[1])
+                fix = 0
+                if ss.length == 3
+                    raise "Dont known how to #{ss[2]} address" if ss[2]!="fix"
+                    fix = relocFix
+                end
+                return ((s2i(ss[0])+fix) << 4) + s2i(ss[1])
             end
             return eval(str, binding())
         end

data/lib/resedit/text/text.rb

@@ -58,7 +58,7 @@ module Resedit
 
         def load(filename, count=nil)
             @lines = @formatter.loadLines(filename)
-            raise "Wrong lines count: "+filename if count && count!=@lines.length
+            raise "Wrong lines count: #{filename} #{count} #{@lines.length}" if count && count!=@lines.length
             if @escaper
                 nl=[]
                 @lines.each {|l|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resedit
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - bjfn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-15 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -59,6 +59,7 @@ files:
 - lib/resedit/classes/hexwriter.rb
 - lib/resedit/convert/bitconv.rb
 - lib/resedit/convert/codepatch.rb
+- lib/resedit/convert/colors.rb
 - lib/resedit/font/font.rb
 - lib/resedit/font/font_char.rb
 - lib/resedit/image/image.rb