- Wine-Devel - list.winehq.org

windres: -J -I (take 3)
by Dimitrie O. Paun March 21, 2003

March 21, 2003

On March 20, 2003 06:44 pm, Dimitrie O. Paun wrote: > So I think this is ready for the prime-time. I would appreciate any > feedback on the matter. To be honest, I could not compile the > resulting code, as it is complaining I do not have ../bfd/bfd.h: > > make: *** No rule to make target `../bfd/bfd.h', needed by `windres.o'. > Stop. Famous last words. I figured out how to compile it, and sure enough I've found a small compilation bug (I got unused to the old K&R style of function definitions). Anyway it's fixed now, so here it is again, with the ChangeLog: 2003-03-21 Dimitrie O. Paun <dpaun(a)rogers.com> * windres.c (format_from_name): make the exit on error behaviour optional. (main): Rename the -I option to -J. Introduce -I as synonym for --include-dir. For backwards compatibility also support the old -I behaviour, but issue a deprecation warning. * doc/binutils.texi: Rename -I to -J. Document the new behaviour of the -I option. * testsuite/binutils-all/windres/windres.exp: Add test for the new -J option. Index: binutils/windres.c =================================================================== RCS file: /cvs/src/src/binutils/windres.c,v retrieving revision 1.13 diff -u -r1.13 windres.c --- binutils/windres.c 5 May 2002 23:25:27 -0000 1.13 +++ binutils/windres.c 21 Mar 2003 07:09:12 -0000 @@ -110,8 +110,7 @@ #define OPTION_DEFINE 150 #define OPTION_HELP (OPTION_DEFINE + 1) -#define OPTION_INCLUDE_DIR (OPTION_HELP + 1) -#define OPTION_LANGUAGE (OPTION_INCLUDE_DIR + 1) +#define OPTION_LANGUAGE (OPTION_HELP + 1) #define OPTION_PREPROCESSOR (OPTION_LANGUAGE + 1) #define OPTION_USE_TEMP_FILE (OPTION_PREPROCESSOR + 1) #define OPTION_NO_USE_TEMP_FILE (OPTION_USE_TEMP_FILE + 1) @@ -122,8 +121,8 @@ { {"define", required_argument, 0, OPTION_DEFINE}, {"help", no_argument, 0, OPTION_HELP}, - {"include-dir", required_argument, 0, OPTION_INCLUDE_DIR}, - {"input-format", required_argument, 0, 'I'}, + {"include-dir", required_argument, 0, 'I'}, + {"input-format", required_argument, 0, 'J'}, {"language", required_argument, 0, OPTION_LANGUAGE}, {"output-format", required_argument, 0, 'O'}, {"preprocessor", required_argument, 0, OPTION_PREPROCESSOR}, @@ -140,7 +139,7 @@ static void res_init PARAMS ((void)); static int extended_menuitems PARAMS ((const struct menuitem *)); -static enum res_format format_from_name PARAMS ((const char *)); +static enum res_format format_from_name PARAMS ((const char *, int)); static enum res_format format_from_filename PARAMS ((const char *, int)); static void usage PARAMS ((FILE *, int)); static int cmp_res_entry PARAMS ((const PTR, const PTR)); @@ -588,8 +587,9 @@ /* Convert a string to a format type, or exit if it can't be done. */ static enum res_format -format_from_name (name) +format_from_name (name, exit_on_error) const char *name; + int exit_on_error; { const struct format_map *m; @@ -597,7 +597,7 @@ if (strcasecmp (m->name, name) == 0) break; - if (m->name == NULL) + if (m->name == NULL && exit_on_error) { non_fatal (_("unknown format type `%s'"), name); fprintf (stderr, _("%s: supported formats:"), program_name); @@ -779,6 +779,7 @@ char *input_filename; char *output_filename; enum res_format input_format; + enum res_format input_format_tmp; enum res_format output_format; char *target; char *preprocessor; @@ -828,12 +829,12 @@ output_filename = optarg; break; - case 'I': - input_format = format_from_name (optarg); + case 'J': + input_format = format_from_name (optarg, 1); break; case 'O': - output_format = format_from_name (optarg); + output_format = format_from_name (optarg, 1); break; case 'F': @@ -868,7 +869,16 @@ verbose ++; break; - case OPTION_INCLUDE_DIR: + case 'I': + /* for backward compatibility, should be removed in the future */ + input_format_tmp = format_from_name (optarg, 0); + if (input_format_tmp != RES_FORMAT_UNKNOWN) + { + fprintf (stderr, _("Option -I is deprecated for setting the input format, please use -J instead.\n")); + input_format = input_format_tmp; + break; + } + if (preprocargs == NULL) { quotedarg = quot (optarg); Index: binutils/doc/binutils.texi =================================================================== RCS file: /cvs/src/src/binutils/doc/binutils.texi,v retrieving revision 1.30 diff -u -r1.30 binutils.texi --- binutils/doc/binutils.texi 24 Feb 2003 16:20:28 -0000 1.30 +++ binutils/doc/binutils.texi 20 Mar 2003 15:10:43 -0000 @@ -2569,7 +2569,7 @@ non-option argument, then @command{windres} will write to standard output. @command{windres} can not write a COFF file to standard output. -(a)item -I @var{format} +(a)item -J @var{format} @itemx --input-format @var{format} The input format to read. @var{format} may be @samp{res}, @samp{rc}, or @samp{coff}. If no input format is specified, @command{windres} will @@ -2597,11 +2597,17 @@ to use, including any leading arguments. The default preprocessor argument is @code{gcc -E -xc-header -DRC_INVOKED}. +(a)item -I @var{directory} @item --include-dir @var{directory} Specify an include directory to use when reading an @code{rc} file. @command{windres} will pass this to the preprocessor as an @option{-I} option. @command{windres} will also search this directory when looking for -files named in the @code{rc} file. +files named in the @code{rc} file. If the argument passed to this command +matches any of the supported @var{formats} (as descrived in the @option{-J} +option), it will issue a deprecation warning, and behave just like the +(a)option{-J} option. New programs should not use this behaviour. If a +directory happens to match a @var{format}, simple prefix it with @samp{./} +to disable the backward compatibility. @item -D @var{target} @itemx --define @var{sym}[=@var{val}] Index: binutils/testsuite/binutils-all/windres/windres.exp =================================================================== RCS file: /cvs/src/src/binutils/testsuite/binutils-all/windres/windres.exp,v retrieving revision 1.3 diff -u -r1.3 windres.exp --- binutils/testsuite/binutils-all/windres/windres.exp 27 Jul 2001 16:16:07 -0000 1.3 +++ binutils/testsuite/binutils-all/windres/windres.exp 20 Mar 2003 23:24:05 -0000 @@ -81,6 +81,40 @@ setup_xfail *-* } + verbose "$wr -J rc -O res $res tmpdir/$broot.res" 1 + catch "exec $wr -J rc -O res $res tmpdir/$broot.res" err + + if ![string match "" $err] then { + send_log "$err\n" + verbose "$err" 1 + fail "windres/$broot (parse)" + continue; + } + pass "windres/$broot (parse)" + + set rc [open $res] + while { [gets $rc line] != -1 } { + if ![regexp "^(//|/\*|#)" $line] { + break + } + if [regexp "parse-only" $line] { + file delete "tmpdir/$broot.res" + set done 1 + break; + } + if [regexp "\[xc\]fail *(\[^ \]*)" $line junk sys] { + setup_xfail $sys + continue; + } + } + if { $done != 0 } { + continue; + } + + if { "$broot" != "bmpalign" && "$target_xfail" == "yes" } { + setup_xfail *-* + } + verbose "$wr -I rc -O res $res tmpdir/$broot.res" 1 catch "exec $wr -I rc -O res $res tmpdir/$broot.res" err -- Dimi.

1 0

Inserting banner in signature / on website ?
by Sylvain Petreolle March 21, 2003

March 21, 2003

Your banner idea seems to be a good idea to promote CodeWeavers and Wine in a general manner. Could you give code to insert it in a mail signature or on a website ? ===== Sylvain Petreolle (spetreolle at users dot sourceforge dot net) Fight Spam ! EuroCauce: http://www.euro.cauce.org/en/index.html ICQ #170597259 "Don't think you are. Know you are." Morpheus, in "Matrix". ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

2 1

WINE conformance tests
by Peter Berghmans March 21, 2003

March 21, 2003

--- Peter Berghmans <peter.berghmans(a)pandora.be> wrote: > Hello, > > I saw on the WINE website you are responsible for > writing conformance tests. > I'd like to contribute; Could you explain what > already exists and how it works ? > I am a professional software engineer by the way. Peter, thank you for the suggestion. Sorry it took long time to answer - I checked this email account only today. Unfortunately I don't have enough time now to contribute to Wine :-( Please contact wine-devel mailing list, everybody will be happy to help you. This page has more information what you can do for the project (in case you have not visited it): http://www.winehq.com/about/index.php?contrib Regards, Andriy Palamarchuk

2 1

windres: -J -I (take 2) (fwd)
by Dimitrie O. Paun March 20, 2003

March 20, 2003

FIY. -- Dimi. ---------- Forwarded message ---------- Date: Thu, 20 Mar 2003 18:44:53 -0500 (EST) From: Dimitrie O. Paun <dimi(a)intelliware.ca> To: binutils(a)sourceware.org Subject: windres: -J -I (take 2) Here is the patch again, this time with (hopefully) correct ChangeLog, and updated documentation & tests. The tests proved to be simpler than I thought. There was already a test for the old behaviour of -I, which I've left in there, as the change is supposed to be backwards compatible. I simply duplicated the code for the -J option, which is supposed to behave as the old -I option. As for the include, the tests uses the include directive in all tests, so if that is broken, things will fail. So I think this is ready for the prime-time. I would appreciate any feedback on the matter. To be honest, I could not compile the resulting code, as it is complaining I do not have ../bfd/bfd.h: make: *** No rule to make target `../bfd/bfd.h', needed by `windres.o'. Stop. Any pointers on that? Also, as stated earlier, I've started the FSF assignment process, is there anyway you guys can apply this patch soon? It seems like the process allows for this sort of thing. 2003-03-20 Dimitrie O. Paun <dpaun(a)rogers.com> * windres.c (format_from_name): make the exit on error behaviour optional. (main): Rename the -I option to -J. Introduce -I as synonym for --include-dir. For backwards compatibility also support the old -I behaviour, but issue a deprecation warning. * doc/binutils.texi: Rename -I to -J. Document the new behaviour of the -I option. * testsuite/binutils-all/windres/windres.exp: Add test for the new -J option. Index: binutils/windres.c =================================================================== RCS file: /cvs/src/src/binutils/windres.c,v retrieving revision 1.13 diff -u -r1.13 windres.c --- binutils/windres.c 5 May 2002 23:25:27 -0000 1.13 +++ binutils/windres.c 17 Mar 2003 07:14:16 -0000 @@ -110,8 +110,7 @@ #define OPTION_DEFINE 150 #define OPTION_HELP (OPTION_DEFINE + 1) -#define OPTION_INCLUDE_DIR (OPTION_HELP + 1) -#define OPTION_LANGUAGE (OPTION_INCLUDE_DIR + 1) +#define OPTION_LANGUAGE (OPTION_HELP + 1) #define OPTION_PREPROCESSOR (OPTION_LANGUAGE + 1) #define OPTION_USE_TEMP_FILE (OPTION_PREPROCESSOR + 1) #define OPTION_NO_USE_TEMP_FILE (OPTION_USE_TEMP_FILE + 1) @@ -122,8 +121,8 @@ { {"define", required_argument, 0, OPTION_DEFINE}, {"help", no_argument, 0, OPTION_HELP}, - {"include-dir", required_argument, 0, OPTION_INCLUDE_DIR}, - {"input-format", required_argument, 0, 'I'}, + {"include-dir", required_argument, 0, 'I'}, + {"input-format", required_argument, 0, 'J'}, {"language", required_argument, 0, OPTION_LANGUAGE}, {"output-format", required_argument, 0, 'O'}, {"preprocessor", required_argument, 0, OPTION_PREPROCESSOR}, @@ -140,7 +139,7 @@ static void res_init PARAMS ((void)); static int extended_menuitems PARAMS ((const struct menuitem *)); -static enum res_format format_from_name PARAMS ((const char *)); +static enum res_format format_from_name PARAMS ((const char *, int)); static enum res_format format_from_filename PARAMS ((const char *, int)); static void usage PARAMS ((FILE *, int)); static int cmp_res_entry PARAMS ((const PTR, const PTR)); @@ -588,7 +587,7 @@ /* Convert a string to a format type, or exit if it can't be done. */ static enum res_format -format_from_name (name) +format_from_name (name, int exit_on_error) const char *name; { const struct format_map *m; @@ -597,7 +596,7 @@ if (strcasecmp (m->name, name) == 0) break; - if (m->name == NULL) + if (m->name == NULL && exit_on_error) { non_fatal (_("unknown format type `%s'"), name); fprintf (stderr, _("%s: supported formats:"), program_name); @@ -779,6 +778,7 @@ char *input_filename; char *output_filename; enum res_format input_format; + enum res_format input_format_tmp; enum res_format output_format; char *target; char *preprocessor; @@ -828,12 +828,12 @@ output_filename = optarg; break; - case 'I': - input_format = format_from_name (optarg); + case 'J': + input_format = format_from_name (optarg, 1); break; case 'O': - output_format = format_from_name (optarg); + output_format = format_from_name (optarg, 1); break; case 'F': @@ -868,7 +868,16 @@ verbose ++; break; - case OPTION_INCLUDE_DIR: + case 'I': + /* for backward compatibility, should be removed in the future */ + input_format_tmp = format_from_name (optarg, 0); + if (input_format_tmp != RES_FORMAT_UNKNOWN) + { + fprintf (stderr, _("Option -I is deprecated for setting the input format, please use -J instead.\n")); + input_format = input_format_tmp; + break; + } + if (preprocargs == NULL) { quotedarg = quot (optarg); Index: binutils/doc/binutils.texi =================================================================== RCS file: /cvs/src/src/binutils/doc/binutils.texi,v retrieving revision 1.30 diff -u -r1.30 binutils.texi --- binutils/doc/binutils.texi 24 Feb 2003 16:20:28 -0000 1.30 +++ binutils/doc/binutils.texi 20 Mar 2003 15:10:43 -0000 @@ -2569,7 +2569,7 @@ non-option argument, then @command{windres} will write to standard output. @command{windres} can not write a COFF file to standard output. -(a)item -I @var{format} +(a)item -J @var{format} @itemx --input-format @var{format} The input format to read. @var{format} may be @samp{res}, @samp{rc}, or @samp{coff}. If no input format is specified, @command{windres} will @@ -2597,11 +2597,17 @@ to use, including any leading arguments. The default preprocessor argument is @code{gcc -E -xc-header -DRC_INVOKED}. +(a)item -I @var{directory} @item --include-dir @var{directory} Specify an include directory to use when reading an @code{rc} file. @command{windres} will pass this to the preprocessor as an @option{-I} option. @command{windres} will also search this directory when looking for -files named in the @code{rc} file. +files named in the @code{rc} file. If the argument passed to this command +matches any of the supported @var{formats} (as descrived in the @option{-J} +option), it will issue a deprecation warning, and behave just like the +(a)option{-J} option. New programs should not use this behaviour. If a +directory happens to match a @var{format}, simple prefix it with @samp{./} +to disable the backward compatibility. @item -D @var{target} @itemx --define @var{sym}[=@var{val}] Index: binutils/testsuite/binutils-all/windres/windres.exp =================================================================== RCS file: /cvs/src/src/binutils/testsuite/binutils-all/windres/windres.exp,v retrieving revision 1.3 diff -u -r1.3 windres.exp --- binutils/testsuite/binutils-all/windres/windres.exp 27 Jul 2001 16:16:07 -0000 1.3 +++ binutils/testsuite/binutils-all/windres/windres.exp 20 Mar 2003 23:24:05 -0000 @@ -81,6 +81,40 @@ setup_xfail *-* } + verbose "$wr -J rc -O res $res tmpdir/$broot.res" 1 + catch "exec $wr -J rc -O res $res tmpdir/$broot.res" err + + if ![string match "" $err] then { + send_log "$err\n" + verbose "$err" 1 + fail "windres/$broot (parse)" + continue; + } + pass "windres/$broot (parse)" + + set rc [open $res] + while { [gets $rc line] != -1 } { + if ![regexp "^(//|/\*|#)" $line] { + break + } + if [regexp "parse-only" $line] { + file delete "tmpdir/$broot.res" + set done 1 + break; + } + if [regexp "\[xc\]fail *(\[^ \]*)" $line junk sys] { + setup_xfail $sys + continue; + } + } + if { $done != 0 } { + continue; + } + + if { "$broot" != "bmpalign" && "$target_xfail" == "yes" } { + setup_xfail *-* + } + verbose "$wr -I rc -O res $res tmpdir/$broot.res" 1 catch "exec $wr -I rc -O res $res tmpdir/$broot.res" err -- Dimi.

1 0

Re: Java in wine?
by David.Goodenough＠DGA.co.uk March 20, 2003

March 20, 2003

Have you tried the IBM JRE? David Mike Hearn <m.hearn(a)signal.qi To: Dan Kegel <dank(a)kegel.com> netiq.com> cc: m.hearn(a)signal.dera.gov.uk, Wine Devel Sent by: <wine-devel(a)winehq.com> wine-devel-admin(a)w Subject: Re: Java in wine? inehq.com 20/03/2003 16:50 > What version of Java does the app require? Unfortunately 1.4 > I wonder if perhaps some older Sun JREs run better > on Wine than hotspot does. I haven't tried any, but > who knows, it might be worth trying. The 1.2 version at least starts, but apparently it's not sufficient for this app. <sigh> And I thought java was supposed to make stuff more portable :/ > - Dan -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

1 0

Re: winehq/ ./classic_styles.css ./index.php ./red ...
by Dimitrie O. Paun March 20, 2003

March 20, 2003

On Thu, 20 Mar 2003, Jeremy Newman wrote: > Log message: > adding banner ads (gotta pay for the hosting somehow :D ) > tweaked templates for banner ad support Oh, please! Are we really gonna carry adds?!? -- Dimi.

3 2

ole/
by Dimitrie O. Paun March 20, 2003

March 20, 2003

I can't wait for ole/ to go away: [dimi(a)dimi wine.src]$ ls ole CVS ole2nls.c I hope it's in the plans to nuke it soon. -- Dimi.

2 1

Java in wine?
by Mike Hearn March 20, 2003

March 20, 2003

Hi, Perhaps a bit offtopic, but my company has asked me to try and get a desktop java app we use/are developing here running under Linux. You'd think, being written in Java, that it'd just be a case of installing the JVM and running it. Unfortunately, because Java is rather poor at desktop apps, they've used a load of windows extensions via JNI to try and make it integrate better. That means, the only solution is probably to run a JVM under Wine (short of rewriting all the native code, which they don't want to do). Now, I tried the Sun JRE, and it wasn't happy. I expect HotSpot does some wierd stuff under the covers. So I'm wondering if anybody has walked this road before, and if there are any other JVMs that might work better under Wine? thanks -mike -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

5 5

'make depend' b0rken on fresh check-out
by Lionel Ulmer March 20, 2003

March 20, 2003

Hi all, It seems that 'make depend' is broken on a fresh CVS check-out on a clean tree. This is because 'makedep' is linked against 'libs/port' which is NOT built yet (kinda ironic to have dependencies problem building our dependency tool :-) ). """ Configure finished. Do 'make depend && make' to compile Wine. cd ./tools && make basename tools/makedep make[1]: Entering directory /usr/local/src/Wine/CVS/wine_work/tools' gcc -c -I. -I. -I../include -I../include -g -O2 -Wall -mpreferred-stack-boundary=2 -gstabs+ -DLEX_OUTPUT_ROOT="\"lex.yy\"" -DINCLUDEDIR="\"/usr/local/src/Wine/Build_02/include/wine\"" -DBINDIR="\"/usr/local/src/Wine/Build_02/bin\"" -D_REENTRANT -o makedep.o makedep.c gcc -g -O2 -Wall -mpreferred-stack-boundary=2 -gstabs+ -o makedep makedep.o -L../libs/port -lwine_port /usr/local/bin/ld: cannot find -lwine_port collect2: ld returned 1 exit status make[1]: *** [makedep] Error 1 make[1]: Leaving directory /usr/local/src/Wine/CVS/wine_work/tools' make: *** [tools/makedep] Error 2 """ Doing first 'make' in the 'libs/port' directory fixed the issue. Lionel PS: any news about the Wine conference :-) ? -- Lionel Ulmer - http://www.bbrox.org/

3 2

Fix for ArrangeCtrlPositions in commdlg 2
by Maxime Bellengé March 20, 2003

March 20, 2003

It is good I think. All cases must be correct. Now the open file dialog should look as it should. Thanks to Mike Mc Cormack for the tests. By the way, do you think we should implement a look & feel like w2k and wxp in addition to the existing one ? ChangeLog: - Fix how the size of the dialog is computed and the child component placed. -- Maxime Bellengé <maxime.bellenge(a)wanadoo.fr>

2 1