On December 9, 2002 04:57 pm, Francois Gouget wrote:
I agree with that one. As it is wrc just convert the filenames to lowercase before trying to include them which is just plain wrong. In particular it causes compilation errors if the file really has a mized-case which is not that uncommon.
ChangeLog Remove the -L wrc option, as no automatic fudging of filenames can ever be correct.
Index: tools/wrc/parser.y =================================================================== RCS file: /var/cvs/wine/tools/wrc/parser.y,v retrieving revision 1.33 diff -u -r1.33 parser.y --- tools/wrc/parser.y 15 Aug 2002 21:57:36 -0000 1.33 +++ tools/wrc/parser.y 17 Dec 2002 05:33:45 -0000 @@ -2694,11 +2694,6 @@ *cptr = '/'; }
- /* Convert to lower case. Seems to be reasonable to do */ - for(cptr = str->str.cstr; !leave_case && *cptr; cptr++) - { - *cptr = tolower(*cptr); - } return str; }
Index: tools/wrc/wrc.c =================================================================== RCS file: /var/cvs/wine/tools/wrc/wrc.c,v retrieving revision 1.21 diff -u -r1.21 wrc.c --- tools/wrc/wrc.c 12 Dec 2002 22:23:55 -0000 1.21 +++ tools/wrc/wrc.c 17 Dec 2002 05:32:44 -0000 @@ -104,7 +104,6 @@ " -I path Set include search dir to path (multiple -I allowed)\n" " -J Do not search the standard include path\n" " -l lan Set default language to lan (default is neutral {0, 0})\n" - " -L Leave case of embedded filenames as is\n" " -m Do not remap numerical resource IDs\n" " -n Do not generate .s file\n" " -N Do not preprocess input\n" @@ -252,12 +251,6 @@ int auto_register = 0;
/* - * Set when the case of embedded filenames should not be converted - * to lower case (-L option) - */ -int leave_case = 0; - -/* * The output byte-order of resources (set with -B) */ int byteorder = WRC_BO_NATIVE; @@ -433,9 +426,6 @@ error("Language %04x is not supported",lan); currentlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan)); } - break; - case 'L': - leave_case = 1; break; case 'm': remap = 0; Index: tools/wrc/wrc.h =================================================================== RCS file: /var/cvs/wine/tools/wrc/wrc.h,v retrieving revision 1.24 diff -u -r1.24 wrc.h --- tools/wrc/wrc.h 31 May 2002 23:41:01 -0000 1.24 +++ tools/wrc/wrc.h 17 Dec 2002 05:32:50 -0000 @@ -64,7 +64,6 @@ extern DWORD codepage; extern int pedantic; extern int auto_register; -extern int leave_case; extern int byteorder; extern int preprocess_only; extern int no_preprocess;