Updated windres tool

2007-05-23 08:48:29 +00:00
parent 950c3b7d2c
commit 4a594fce16
28 changed files with 5799 additions and 3573 deletions
--- a/binutils/testsuite/binutils-all/windres/MSG00001.bin
+++ b/binutils/testsuite/binutils-all/windres/MSG00001.bin
--- a/binutils/testsuite/binutils-all/windres/dialogid.rsd
+++ b/binutils/testsuite/binutils-all/windres/dialogid.rsd
@@ -9,10 +9,10 @@ Contents of section .data:
 0040 0100ffff 00000000 00000000 00008880  ................
 0050 02000000 0000c800 c8000000 00000000  ................
 0060 00000000 00000000 4d000050 0b000b00  ........M..P....
- 0070 5300a200 ffff0000 63006c00 61007300  S.......c.l.a.s.
- 0080 73006e00 61006d00 65000000 ffff6c00  s.n.a.m.e.....l.
+ 0070 5300a200 ffffffff 43004c00 41005300  S.......C.L.A.S.
+ 0080 53004e00 41004d00 45000000 ffff6c00  S.N.A.M.E.....l.
 0090 00000000 00000000 00000000 0e120050  ...............P
- 00a0 05000500 0a000a00 66000000 63006c00  ........f...c.l.
- 00b0 61007300 73006e00 61006d00 65000000  a.s.s.n.a.m.e...
+ 00a0 05000500 0a000a00 66000000 43004c00  ........f...C.L.
+ 00b0 41005300 53004e00 41004d00 45000000  A.S.S.N.A.M.E...
 00c0 73007400 72006900 6e006700 69006400  s.t.r.i.n.g.i.d.
 00d0 00000000                             ....            
--- a/binutils/testsuite/binutils-all/windres/html.rc
+++ b/binutils/testsuite/binutils-all/windres/html.rc
@@ -0,0 +1,7 @@
+//#xfail x86_64-*-mingw*
+#include "windows.h"
+
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+
+129             HTML "html1.hm"
+130 		HTML "html2.hm"
--- a/binutils/testsuite/binutils-all/windres/html.rsd
+++ b/binutils/testsuite/binutils-all/windres/html.rsd
@@ -0,0 +1,45 @@
+
+html.res:     file format binary
+
+Contents of section .data:
+ 0000 00000000 20000000 ffff0000 ffff0000  .... ...........
+ 0010 00000000 00000000 00000000 00000000  ................
+ 0020 0d010000 20000000 ffff1700 ffff8100  .... ...........
+ 0030 00000000 30100704 00000000 00000000  ....0...........
+ 0040 3c21444f 43545950 4520646f 63747970  <!DOCTYPE doctyp
+ 0050 65205055 424c4943 20222d2f 2f773363  e PUBLIC "-//w3c
+ 0060 2f2f6474 64206874 6d6c2034 2e302074  //dtd html 4.0 t
+ 0070 72616e73 6974696f 6e616c2f 2f656e22  ransitional//en"
+ 0080 3e0d0a3c 68746d6c 3e0d0a3c 68656164  >..<html>..<head
+ 0090 3e0d0a20 203c6d65 74612063 6f6e7465  >..  <meta conte
+ 00a0 6e743d22 74657874 2f68746d 6c3b2063  nt="text/html; c
+ 00b0 68617273 65743d69 736f2d38 3835392d  harset=iso-8859-
+ 00c0 31222020 68747470 2d657175 69763d22  1"  http-equiv="
+ 00d0 436f6e74 656e742d 54797065 223e0d0a  Content-Type">..
+ 00e0 20203c74 69746c65 3e57696e 64726573    <title>Windres
+ 00f0 3c2f7469 746c653e 0d0a3c2f 68656164  </title>..</head
+ 0100 3e0d0a0d 0a3c626f 64793e0d 0a546869  >....<body>..Thi
+ 0110 73206973 20612074 65737420 70616765  s is a test page
+ 0120 20666f72 2077696e 64726573 2048544d   for windres HTM
+ 0130 4c207265 736f7572 63652e0d 0a3c2f62  L resource...</b
+ 0140 6f64793e 0d0a3c2f 68746d6c 3e000000  ody>..</html>...
+ 0150 14010000 20000000 ffff1700 ffff8200  .... ...........
+ 0160 00000000 30100704 00000000 00000000  ....0...........
+ 0170 3c21444f 43545950 4520646f 63747970  <!DOCTYPE doctyp
+ 0180 65205055 424c4943 20222d2f 2f773363  e PUBLIC "-//w3c
+ 0190 2f2f6474 64206874 6d6c2034 2e302074  //dtd html 4.0 t
+ 01a0 72616e73 6974696f 6e616c2f 2f656e22  ransitional//en"
+ 01b0 3e0d0a3c 68746d6c 3e0d0a3c 68656164  >..<html>..<head
+ 01c0 3e0d0a20 203c6d65 74612063 6f6e7465  >..  <meta conte
+ 01d0 6e743d22 74657874 2f68746d 6c3b2063  nt="text/html; c
+ 01e0 68617273 65743d69 736f2d38 3835392d  harset=iso-8859-
+ 01f0 31222020 68747470 2d657175 69763d22  1"  http-equiv="
+ 0200 436f6e74 656e742d 54797065 223e0d0a  Content-Type">..
+ 0210 20203c74 69746c65 3e57696e 64726573    <title>Windres
+ 0220 3c2f7469 746c653e 0d0a3c2f 68656164  </title>..</head
+ 0230 3e0d0a0d 0a3c626f 64793e0d 0a546869  >....<body>..Thi
+ 0240 73206973 20612073 65636f6e 64207465  s is a second te
+ 0250 73742070 61676520 666f7220 77696e64  st page for wind
+ 0260 72657320 48544d4c 20726573 6f757263  res HTML resourc
+ 0270 652e0d0a 3c2f626f 64793e0d 0a3c2f68  e...</body>..</h
+ 0280 746d6c3e                             tml>            
--- a/binutils/testsuite/binutils-all/windres/html1.hm
+++ b/binutils/testsuite/binutils-all/windres/html1.hm
@@ -0,0 +1,11 @@
+<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+  <meta content="text/html; charset=iso-8859-1"  http-equiv="Content-Type">
+  <title>Windres</title>
+</head>
+
+<body>
+This is a test page for windres HTML resource.
+</body>
+</html>
--- a/binutils/testsuite/binutils-all/windres/html2.hm
+++ b/binutils/testsuite/binutils-all/windres/html2.hm
@@ -0,0 +1,11 @@
+<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+  <meta content="text/html; charset=iso-8859-1"  http-equiv="Content-Type">
+  <title>Windres</title>
+</head>
+
+<body>
+This is a second test page for windres HTML resource.
+</body>
+</html>
--- a/binutils/testsuite/binutils-all/windres/messagetable.rc
+++ b/binutils/testsuite/binutils-all/windres/messagetable.rc
@@ -0,0 +1,6 @@
+//#xfail x86_64-*-mingw*
+#include "windows.h"
+
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+
+888 MESSAGETABLE MSG00001.bin
--- a/binutils/testsuite/binutils-all/windres/messagetable.rsd
+++ b/binutils/testsuite/binutils-all/windres/messagetable.rsd
@@ -0,0 +1,15 @@
+
+messagetable.res:     file format binary
+
+Contents of section .data:
+ 0000 00000000 20000000 ffff0000 ffff0000  .... ...........
+ 0010 00000000 00000000 00000000 00000000  ................
+ 0020 70000000 20000000 ffff0b00 ffff7803  p... .........x.
+ 0030 00000000 30100704 00000000 00000000  ....0...........
+ 0040 01000000 00000000 05000000 10000000  ................
+ 0050 14000000 4e6f7469 63653a20 25310d0a  ....Notice: %1..
+ 0060 00000000 0c000000 25310d0a 00000000  ........%1......
+ 0070 10000000 5761726e 3a202531 0d0a0000  ....Warn: %1....
+ 0080 10000000 4572726f 723a2025 310d0a00  ....Error: %1...
+ 0090 10000000 46617461 6c3a2025 310d0a00  ....Fatal: %1...
+ 00a0 10000000 25310d0a 25320d0a 00000000  ....%1..%2......
--- a/binutils/testsuite/binutils-all/windres/strtab2.rc
+++ b/binutils/testsuite/binutils-all/windres/strtab2.rc
@@ -0,0 +1,9 @@
+//#xfail x86_64-*-mingw*
+#include "windows.h"
+
+LANGUAGE 0, 0
+
+STRINGTABLE MOVEABLE PURE DISCARDABLE
+BEGIN
+  1 L"hello, world"
+END
--- a/binutils/testsuite/binutils-all/windres/strtab2.rsd
+++ b/binutils/testsuite/binutils-all/windres/strtab2.rsd
@@ -0,0 +1,8 @@
+ 0000 00000000 20000000 ffff0000 ffff0000  .... ...........
+ 0010 00000000 00000000 00000000 00000000  ................
+ 0020 38000000 20000000 ffff0600 ffff0100  8... ...........
+ 0030 00000000 30100000 00000000 00000000  ....0...........
+ 0040 00000c00 68006500 6c006c00 6f002c00  ....h.e.l.l.o.,.
+ 0050 20007700 6f007200 6c006400 00000000   .w.o.r.l.d.....
+ 0060 00000000 00000000 00000000 00000000  ................
+ 0070 00000000 00000000                    ........        
--- a/binutils/testsuite/binutils-all/windres/version.rc
+++ b/binutils/testsuite/binutils-all/windres/version.rc
@@ -0,0 +1,33 @@
+//#xfail x86_64-*-mingw*
+#include "windows.h"
+
+LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040704e4"
+        BEGIN
+            VALUE L"CompanyName", L"binutil\x0073"
+            VALUE "FileDescription", "RC compiler."
+            VALUE "FileVersion", "1.0.0.1"
+            VALUE "InternalName", "windres.exe"
+            VALUE "LegalCopyright", "(c) FSF. All rights are reserved."
+            VALUE "OriginalFilename", "windres.exe"
+            VALUE "ProductName", "windows resource compiler"
+            VALUE "ProductVersion", "1.0.0.1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x407, 1252
+    END
+END
--- a/binutils/testsuite/binutils-all/windres/version.rsd
+++ b/binutils/testsuite/binutils-all/windres/version.rsd
@@ -0,0 +1,55 @@
+
+version.res:     file format binary
+
+Contents of section .data:
+ 0000 00000000 20000000 ffff0000 ffff0000  .... ...........
+ 0010 00000000 00000000 00000000 00000000  ................
+ 0020 ec020000 20000000 ffff1000 ffff0100  .... ...........
+ 0030 00000000 00000704 00000000 00000000  ................
+ 0040 ec023400 00005600 53005f00 56004500  ..4...V.S._.V.E.
+ 0050 52005300 49004f00 4e005f00 49004e00  R.S.I.O.N._.I.N.
+ 0060 46004f00 00000000 bd04effe 00000100  F.O.............
+ 0070 00000100 01000000 00000100 01000000  ................
+ 0080 3f000000 00000000 04000000 01000000  ?...............
+ 0090 00000000 00000000 00000000 4c020000  ............L...
+ 00a0 00005300 74007200 69006e00 67004600  ..S.t.r.i.n.g.F.
+ 00b0 69006c00 65004900 6e006600 6f000000  i.l.e.I.n.f.o...
+ 00c0 28020000 00003000 34003000 37003000  (.....0.4.0.7.0.
+ 00d0 34006500 34000000 32000900 01004300  4.e.4...2.....C.
+ 00e0 6f006d00 70006100 6e007900 4e006100  o.m.p.a.n.y.N.a.
+ 00f0 6d006500 00000000 62006900 6e007500  m.e.....b.i.n.u.
+ 0100 74006900 6c007300 00000000 42000d00  t.i.l.s.....B...
+ 0110 01004600 69006c00 65004400 65007300  ..F.i.l.e.D.e.s.
+ 0120 63007200 69007000 74006900 6f006e00  c.r.i.p.t.i.o.n.
+ 0130 00000000 52004300 20006300 6f006d00  ....R.C. .c.o.m.
+ 0140 70006900 6c006500 72002e00 00000000  p.i.l.e.r.......
+ 0150 30000800 01004600 69006c00 65005600  0.....F.i.l.e.V.
+ 0160 65007200 73006900 6f006e00 00000000  e.r.s.i.o.n.....
+ 0170 31002e00 30002e00 30002e00 31000000  1...0...0...1...
+ 0180 38000c00 01004900 6e007400 65007200  8.....I.n.t.e.r.
+ 0190 6e006100 6c004e00 61006d00 65000000  n.a.l.N.a.m.e...
+ 01a0 77006900 6e006400 72006500 73002e00  w.i.n.d.r.e.s...
+ 01b0 65007800 65000000 68002200 01004c00  e.x.e...h."...L.
+ 01c0 65006700 61006c00 43006f00 70007900  e.g.a.l.C.o.p.y.
+ 01d0 72006900 67006800 74000000 28006300  r.i.g.h.t...(.c.
+ 01e0 29002000 46005300 46002e00 20004100  ). .F.S.F... .A.
+ 01f0 6c006c00 20007200 69006700 68007400  l.l. .r.i.g.h.t.
+ 0200 73002000 61007200 65002000 72006500  s. .a.r.e. .r.e.
+ 0210 73006500 72007600 65006400 2e000000  s.e.r.v.e.d.....
+ 0220 40000c00 01004f00 72006900 67006900  @.....O.r.i.g.i.
+ 0230 6e006100 6c004600 69006c00 65006e00  n.a.l.F.i.l.e.n.
+ 0240 61006d00 65000000 77006900 6e006400  a.m.e...w.i.n.d.
+ 0250 72006500 73002e00 65007800 65000000  r.e.s...e.x.e...
+ 0260 54001a00 01005000 72006f00 64007500  T.....P.r.o.d.u.
+ 0270 63007400 4e006100 6d006500 00000000  c.t.N.a.m.e.....
+ 0280 77006900 6e006400 6f007700 73002000  w.i.n.d.o.w.s. .
+ 0290 72006500 73006f00 75007200 63006500  r.e.s.o.u.r.c.e.
+ 02a0 20006300 6f006d00 70006900 6c006500   .c.o.m.p.i.l.e.
+ 02b0 72000000 34000800 01005000 72006f00  r...4.....P.r.o.
+ 02c0 64007500 63007400 56006500 72007300  d.u.c.t.V.e.r.s.
+ 02d0 69006f00 6e000000 31002e00 30002e00  i.o.n...1...0...
+ 02e0 30002e00 31000000 44000000 00005600  0...1...D.....V.
+ 02f0 61007200 46006900 6c006500 49006e00  a.r.F.i.l.e.I.n.
+ 0300 66006f00 00000000 24000400 00005400  f.o.....$.....T.
+ 0310 72006100 6e007300 6c006100 74006900  r.a.n.s.l.a.t.i.
+ 0320 6f006e00 00000000 0704e404           o.n.........