Replace "Static" with "classname" so that results match the behaviour of the

Windows' resource compiler.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index b0bf165b24f290ed0d81e4e0322bea3aad33a498..de484f103130697a0294d542b909f0eaf822a3c8 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-03  Nick Clifton  <nickc@redhat.com>
+
+       * binutils-all/windres/dialogid.rc: Replace "Static" with
+       "classname" so that compilation will match behaviour of the
+       Windows resource compiler.
+
 2003-03-31  Nick Clifton  <nickc@redhat.com>
 
        * binutils-all/windres/dialogid.rc: New test source file.

diff --git a/binutils/testsuite/binutils-all/windres/dialogid.rc b/binutils/testsuite/binutils-all/windres/dialogid.rc
index 16ffb1e76531728972b470f9acb626f368626890..43bf1ec8e5e9603eb8e64053ac01e07f3817740c 100644 (file)
--- a/binutils/testsuite/binutils-all/windres/dialogid.rc
+++ b/binutils/testsuite/binutils-all/windres/dialogid.rc
@@ -4,6 +4,6 @@
 101 DIALOGEX 0, 0, 200, 200
 
 BEGIN
-CONTROL 108, -1, "Static", 77, 11, 11, 83, 162
-CONTROL "stringid", 102, "Static", 0x5000120e, 5, 5, 10, 10
+CONTROL 108, -1, "classname", 77, 11, 11, 83, 162
+CONTROL "stringid", 102, "classname", 0x5000120e, 5, 5, 10, 10
 END

diff --git a/binutils/testsuite/binutils-all/windres/dialogid.rsd b/binutils/testsuite/binutils-all/windres/dialogid.rsd
index d484186155bc757b02bd5d9642c88033f17f1186..1e6bb1885dc7ac05b489afa6c05e3b9f0af1d792 100644 (file)
--- a/binutils/testsuite/binutils-all/windres/dialogid.rsd
+++ b/binutils/testsuite/binutils-all/windres/dialogid.rsd
@@ -1,13 +1,18 @@
+
+fred.res:     file format binary
+
+Contents of section .data:
  0000 00000000 20000000 ffff0000 ffff0000  .... ...........
  0010 00000000 00000000 00000000 00000000  ................
- 0020 86000000 20000000 ffff0500 ffff6500  .... .........e.
+ 0020 94000000 20000000 ffff0500 ffff6500  .... .........e.
  0030 00000000 30100904 00000000 00000000  ....0...........
  0040 0100ffff 00000000 00000000 00008880  ................
  0050 02000000 0000c800 c8000000 00000000  ................
  0060 00000000 00000000 4d000050 0b000b00  ........M..P....
- 0070 5300a200 ffff0000 53007400 61007400  S.......S.t.a.t.
- 0080 69006300 0000ffff 6c000000 00000000  i.c.....l.......
- 0090 00000000 0e120050 05000500 0a000a00  .......P........
- 00a0 66000000 53007400 61007400 69006300  f...S.t.a.t.i.c.
- 00b0 00007300 74007200 69006e00 67006900  ..s.t.r.i.n.g.i.
- 00c0 64000000 00000000                    d.......        
+ 0070 5300a200 ffff0000 63006c00 61007300  S.......c.l.a.s.
+ 0080 73006e00 61006d00 65000000 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...
+ 00c0 73007400 72006900 6e006700 69006400  s.t.r.i.n.g.i.d.
+ 00d0 00000000                             ....