[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    Wrc 1.0.18
From:       Bertho Stultiens <bertho () panter ! soci ! aau ! dk>
Date:       1999-12-28 20:07:41
[Download RAW message or body]

Hej Y'all,

The previous patch was incomplete and that is solved now. All generated
labels should be unique now if the resource itself is unique.

This is probably the last patch in the 1.0.x version series of wrc. I am
currently solving some nasty incompatibility issues, including proper
line-continuation and preprocessing. Also user-type resource
compatibility and filename scanning should improve for version 1.1.0.

Greetings Bertho


Changelog:
	* Generated labels of resource names must be unique throughout
	  the generated code.
["wrc-1.0.18.diff" (text/plain)]

diff -urX diffexclude cleancvs/tools/wrc/CHANGES cvs/tools/wrc/CHANGES
--- cleancvs/tools/wrc/CHANGES	Sun Dec 19 21:48:17 1999
+++ cvs/tools/wrc/CHANGES	Tue Dec 28 20:55:43 1999
@@ -1,4 +1,19 @@
 ---------------------------------------------------------------------------
+Version 1.0.18 (28-Dec-1999)
+
+Bertho Stultiens <bertho@akhphd.au.dk>
+- Bugfix: The named resources were not named correctly for indirectly
+  addressable resources, which resulted in an undefined variable. The
+  previous fix was incomplete (I was probably sleeping while I made it).
+
+---------------------------------------------------------------------------
+Version 1.0.17 (20-Dec-1999)
+
+Bertho Stultiens <bertho@akhphd.au.dk>
+- Bugfix: Named resources of different types generated the same assembly-
+  label twice, resulting in a compile failure.
+
+---------------------------------------------------------------------------
 Version 1.0.16 (6-Nov-1999)
 
 Juergen.Schmied@debitel.net
diff -urX diffexclude cleancvs/tools/wrc/wrc.h cvs/tools/wrc/wrc.h
--- cleancvs/tools/wrc/wrc.h	Sun Dec 19 21:48:18 1999
+++ cvs/tools/wrc/wrc.h	Tue Dec 28 20:44:48 1999
@@ -12,8 +12,8 @@
 #include "wrctypes.h"
 #endif
 
-#define WRC_VERSION	"1.0.16"
-#define WRC_RELEASEDATE	"(6-Nov-1999)"
+#define WRC_VERSION	"1.0.18"
+#define WRC_RELEASEDATE	"(28-Dec-1999)"
 #define WRC_FULLVERSION WRC_VERSION " " WRC_RELEASEDATE
 
 /* Only used in heavy debugging sessions */
diff -urX diffexclude cleancvs/tools/wrc/writeres.c cvs/tools/wrc/writeres.c
--- cleancvs/tools/wrc/writeres.c	Sun Jul 18 15:36:03 1999
+++ cvs/tools/wrc/writeres.c	Tue Dec 28 20:45:51 1999
@@ -633,10 +633,9 @@
 				fprintf(fp, "\t.long\t%d\n", rsc->name->name.i_name);
 			else
 			{
-				char *label = prep_nid_for_label(rsc->name);
-				fprintf(fp, "\t.long\t(%s_%s_name - %s%s) | 0x80000000\n",
+				fprintf(fp, "\t.long\t(%s%s_name - %s%s) | 0x80000000\n",
 					prefix,
-					label,
+					rsc->c_name,
 					prefix,
 					_PEResTab);
 			}
@@ -872,10 +871,9 @@
 
 				if(rsc->name->type == name_str)
 				{
-					char *name = prep_nid_for_label(rsc->name);
-					fprintf(fp, "%s_%s_name:\n",
+					fprintf(fp, "%s%s_name:\n",
 						prefix,
-						name);
+						rsc->c_name);
 					write_name_str(fp, rsc->name);
 				}
 			}
@@ -1024,7 +1022,6 @@
 		{
 			int type;
 			char *type_name = NULL;
-			char *label;
 
 			if(!rsc->binres)
 				continue;
@@ -1063,12 +1060,10 @@
 			fprintf(fo, "%s%s:\n", prefix, rsc->c_name);
 			if(global)
 				fprintf(fo, "\t.globl\t%s%s\n", prefix, rsc->c_name);
-			label = prep_nid_for_label(rsc->name);
-			fprintf(fo, "\t.long\t%d, %s%s%s%s, %d, %s%s%s%s, %s%s_data, %d\n",
+			fprintf(fo, "\t.long\t%d, %s%s%s, %d, %s%s%s%s, %s%s_data, %d\n",
 				rsc->name->type == name_ord ? rsc->name->name.i_name : 0,
 				rsc->name->type == name_ord ? "0" : prefix,
-				rsc->name->type == name_ord ? "" : "_",
-				rsc->name->type == name_ord ? "" : label,
+				rsc->name->type == name_ord ? "" : rsc->c_name,
 				rsc->name->type == name_ord ? "" : "_name",
 				type,
 				type ? "0" : prefix,


[prev in list] [next in list] [prev in thread] [next in thread]