April 2003 - Wine-Devel - list.winehq.org

windres: -fo (fwd)
by Dimitrie O. Paun April 22, 2003

April 22, 2003

---------- Forwarded message ---------- Date: Tue, 22 Apr 2003 14:07:11 -0400 (EDT) From: Dimitrie O. Paun <dimi(a)intelliware.ca> To: binutils(a)sources.redhat.com Subject: windres: -fo This one is the last (famous last words :)) patch in my series of compatibility patches. With this one in, we can hopefully get rid of the ugly ifdefs in Makefiles. You gotta hate MS for the ugly choice of option names... :( BTW, this is now also supported by wrc, so we get the tree way compatibility: windres, wrc, rc. 2003-04-22 Dimitrie O. Paun <dpaun(a)rogers.com> * windres.c: Support -fo for compatibility with rc. (main): Support the -fo option as a synonym for -o. * doc/binutils.texi: Added -fo to the list of options. Index: windres.c =================================================================== RCS file: /cvs/src/src/binutils/windres.c,v retrieving revision 1.17 diff -u -r1.17 windres.c --- windres.c 22 Apr 2003 17:31:08 -0000 1.17 +++ windres.c 22 Apr 2003 18:01:56 -0000 @@ -698,7 +698,7 @@ program_name); fprintf (stream, _(" The options are:\n\ -i --input=<file> Name input file\n\ - -o --output=<file> Name output file\n\ + -o -fo --output=<file> Name output file\n\ -J --input-format=<format> Specify input format\n\ -O --output-format=<format> Specify output format\n\ -F --target=<target> Specify COFF target\n\ @@ -813,7 +813,7 @@ language = 0x409; /* LANG_ENGLISH, SUBLANG_ENGLISH_US. */ use_temp_file = 0; - while ((c = getopt_long (argc, argv, "i:l:o:I:J:O:F:D:U:rhHvV", long_options, + while ((c = getopt_long (argc, argv, "f:i:l:o:I:J:O:F:D:U:rhHvV", long_options, (int *) 0)) != EOF) { switch (c) @@ -822,6 +822,10 @@ input_filename = optarg; break; + case 'f': + if (*optarg != 'o') fatal (_("Unknown option -f%s.\n"), optarg); + optarg++; + /* fall through */ case 'o': output_filename = optarg; break; Index: doc/binutils.texi =================================================================== RCS file: /cvs/src/src/binutils/doc/binutils.texi,v retrieving revision 1.37 diff -u -r1.37 binutils.texi --- doc/binutils.texi 22 Apr 2003 17:31:08 -0000 1.37 +++ doc/binutils.texi 22 Apr 2003 18:02:05 -0000 @@ -2570,6 +2570,7 @@ standard input. @item -o @var{filename} +(a)item -fo(a)var{filename} @itemx --output @var{filename} The name of the output file. If this option is not used, then @command{windres} will use the first non-option argument, after any used -- Dimi.

1 0

new script uses winedump
by David Miller April 22, 2003

April 22, 2003

I have modified the script which cross references dll imports to use winedump instead of dumpbin. It runs in linux now so that more people are able to run it. It is available at http://home.ptd.net/~compsol Please send any questions or comments to me.

1 0

windres: -J -I (take 4)
by Dimitrie O. Paun April 22, 2003

April 22, 2003

OK, I've received the copyright assignment notification on Apr 10, 2003. (I've forwarded a copy to the list, let me know if you did not get it). So I guess it's prime time for this little patch of mine. Please apply. I have one more patch in mind for windres, and I'm happy :) 2003-04-15 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: windres.c =================================================================== RCS file: /cvs/src/src/binutils/windres.c,v retrieving revision 1.16 diff -u -r1.16 windres.c --- windres.c 5 Apr 2003 08:21:46 -0000 1.16 +++ windres.c 16 Apr 2003 03:14:37 -0000 @@ -106,8 +106,7 @@ /* 150 isn't special; it's just an arbitrary non-ASCII char value. */ -#define OPTION_INCLUDE_DIR 150 -#define OPTION_PREPROCESSOR (OPTION_INCLUDE_DIR + 1) +#define OPTION_PREPROCESSOR 150 #define OPTION_USE_TEMP_FILE (OPTION_PREPROCESSOR + 1) #define OPTION_NO_USE_TEMP_FILE (OPTION_USE_TEMP_FILE + 1) #define OPTION_YYDEBUG (OPTION_NO_USE_TEMP_FILE + 1) @@ -116,8 +115,8 @@ { {"define", required_argument, 0, 'D'}, {"help", no_argument, 0, 'h'}, - {"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, 'l'}, {"output-format", required_argument, 0, 'O'}, {"preprocessor", required_argument, 0, OPTION_PREPROCESSOR}, @@ -135,7 +134,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)); @@ -583,8 +582,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; @@ -592,7 +592,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); @@ -699,15 +699,15 @@ fprintf (stream, _(" The options are:\n\ -i --input=<file> Name input file\n\ -o --output=<file> Name output file\n\ - -I --input-format=<format> Specify input format\n\ + -J --input-format=<format> Specify input format\n\ -O --output-format=<format> Specify output format\n\ -F --target=<target> Specify COFF target\n\ --preprocessor=<program> Program to use to preprocess rc file\n\ - --include-dir=<dir> Include directory when preprocessing rc file\n\ + -I --include-dir=<dir> Include directory when preprocessing rc file\n\ -D --define <sym>[=<val>] Define SYM when preprocessing rc file\n\ -U --undefine <sym> Undefine SYM when preprocessing rc file\n\ -v --verbose Verbose - tells you what it's doing\n\ - --language=<val> Set language when reading rc file\n\ + -l --language=<val> Set language when reading rc file\n\ --use-temp-file Use a temporary file instead of popen to read\n\ the preprocessor output\n\ --no-use-temp-file Use popen (default)\n")); @@ -776,6 +776,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; @@ -812,7 +813,7 @@ language = 0x409; /* LANG_ENGLISH, SUBLANG_ENGLISH_US. */ use_temp_file = 0; - while ((c = getopt_long (argc, argv, "i:l:o:I:O:F:D:U:rhHvV", long_options, + while ((c = getopt_long (argc, argv, "i:l:o:I:J:O:F:D:U:rhHvV", long_options, (int *) 0)) != EOF) { switch (c) @@ -825,12 +826,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': @@ -869,7 +870,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: doc/binutils.texi =================================================================== RCS file: /cvs/src/src/binutils/doc/binutils.texi,v retrieving revision 1.36 diff -u -r1.36 binutils.texi --- doc/binutils.texi 9 Apr 2003 09:55:13 -0000 1.36 +++ doc/binutils.texi 16 Apr 2003 03:14:42 -0000 @@ -2577,7 +2577,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 @@ -2605,11 +2605,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: 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 --- testsuite/binutils-all/windres/windres.exp 27 Jul 2001 16:16:07 -0000 1.3 +++ testsuite/binutils-all/windres/windres.exp 16 Apr 2003 03:14:43 -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.

2 1

vxd idea
by Vilppa Salt April 22, 2003

April 22, 2003

Hi Could this Qemu emulator be used for running applications with vxd files on x86? If ring 0 is reserved so could it be emulated with qemu and mapped appropriately inside Wine? --- Vilppa- Sunpoint.net ilmoittaa: Sunpoint.net tarjoaa kaikille rekisteröityneille käyttäjilleen kuukausimaksuttoman Internet -yhteyden (pvm). http://www.sunpoint.net/SunAds/click.htm?mode=footer&id=71&jump=http%3A%2F%…

2 1

Re: named pipe patch
by Dan Kegel April 22, 2003

April 22, 2003

Bill Medland wrote: >>Agreed. But blocking is hard. It may require the full rewrite of >>wine's named pipe support the other guy is working on. > > > It probably requires more than that; I reckon it may require a rewrite of the > general flushing code. Since it has to block, I don't know where the waiting > is supposed to happen (in the server or in the client) I had an idea on this -- might not be so hard after all. >>My guess is that the data loss you were running into is the >>main real-world issue, and the fact we don't blocking on pipe flush >>won't be a showstopper. Please do try my patch, and >>let me know what you see in practice. I'd like to know if >>what I'm doing is even close. > > > Doesn't seem to work, I'm afraid. OK, I'll chuck that part of my patch then. > Don't bother trying to hack it on my behalf, just do it for yourself. I get > around it by sticking a 50ms sleep in the server before the flush; it's long > enough to force a process switch and for the client to read the pipe. It'll > do for a few months while I am developing and hopefully the proper fix will > be out then. I bet I can stick in a test on bytes in the pipe and loop appropriately. My need has vanished -- now I'm just trying to achieve win32 compliance. - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

1 0

RE: FoxPro & Wine :)
by Patrik Stridvall April 22, 2003

April 22, 2003

> Dimitrie O. Paun wrote: > > On April 22, 2003 01:17 am, Dan Kegel wrote: > > > >>It may not be, but at least it brings it into the realm > >>of Microsoft moves we've seen before. (cf. MFC dlls, which are > >>never distributed with Windows itself, and may legally > >>tie all MFC apps to run on Windows alone, if the MFC EULA > >>holds. Or so I recall.) > > > > > > And the question is: is this enforceable? > > And the answer is: if it isn't, neither is the (L)GPL. Why > would MS not > be able to place restrictions on distribution of their own > copyrighted code? With risk of rekindling the LGPL debate, I have to agree. Both the Wine LGPL issue and the Microsoft "DLL" redistribution issue above have one thing in common: "Somebody is both trying to have the cake and eat it." I have a long time, invain it seems, been trying to argue that copyright law neither: 1. Should (from a sane public policy point of view) 2. Intends (from what copyright traditionally is meant for) 3. Does (from a strict, by the letter, analysis on the law) support the view that it is allowed to both "have the cake and eat it". Very, very simplified. You have basicly have two choices: 1. Distribute your work (or part of it) for free 2. Distribute your work (or part of it) for a fee. if you choose (1) because you for some reason doesn't think (2) is to your advantages you have no right to complain that things didn't work out as you hoped. In the Microsoft Visual FoxPro it is quite obvious that demanding a fee for the "runtime" would reduce the number of developers using the product, so they didn't. Now they have to live with the consequences...

2 1

re: FoxPro & Wine :)
by Dan Kegel April 22, 2003

April 22, 2003

Dimi wrote: > Summary: Microsoft threatens developers for running > Visual FoxPro on Linux using Wine. > > http://yro.slashdot.org/yro/03/04/21/2045200.shtml?tid=109&tid=125 > > I still don't get it how it is legal to tie a product to the OS. It's the redistributable files. See http://www.linuxtransfer.com/h/misc_vfplinuxjackofhearts.htm for the details. - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

7 8

getopt_long not found, even though it is present
by Gerald Pfeifer April 22, 2003

April 22, 2003

Assume we are on a system which does have /usr/local/include/getopt.h, and support for getopt_long, but where getopt_long is _not_ in libc. Our configure then diagnoses #define HAVE_GETOPT_H 1 /* #undef HAVE_GETOPT_LONG */ which leads a compilation error for tools/wrc/wrc.c which includes "wine/port.h" and <getopt.h>, for _both_ define struct option. As far as I can see, the problem here is that in tools/wrc/wrc.c we check for the presence of HAVE_GETOPT_H, while in wine/port.h we check for HAVE_GETOPT_LONG. The patch below is one way to fix this problem, another way would be to move the #inclusion of <getopt.h> from individual files to wine/port.h. Yet another option would be the hack autoconf to try linking libgnugetopt when looking for getopt_long, but I don't know how to hack this into configure. How should we resolve this? Gerald Index: wrc.c =================================================================== RCS file: /home/wine/wine/tools/wrc/wrc.c,v retrieving revision 1.33 diff -u -3 -p -r1.33 wrc.c --- wrc.c 28 Mar 2003 19:31:49 -0000 1.33 +++ wrc.c 17 Apr 2003 10:18:18 -0000 @@ -32,7 +32,9 @@ #include <ctype.h> #include <signal.h> #ifdef HAVE_GETOPT_H -# include <getopt.h> +# ifdef HAVE_GETOPT_LONG +# include <getopt.h> +# endif #endif #include "wrc.h"

1 1

Abiword on Wine. Still pathological text display.
by Dan Kegel April 22, 2003

April 22, 2003

Various people have tried running Abiword on Wine in the past. I and one other person had trouble with 0.9 and 0.99: http://www.winehq.com/hypermail/wine-devel/2001/08/0036.html http://www.abisource.com/mailinglists/abiword-dev/01/November/0005.html http://www.kegel.com/linux/winelog.html#abiword I thought I'd see if things were working any better today, with Abiword 1.0.5 and Wine cvs (April 19, 2003). Installation on redhat 9 went perfectly -- I even got a nice desktop icon -- but when I ran Abiword, it used a dingbats font for the UI! After I finished laughing, I ran --debugmsg +font, and saw trace:font:WineEngCreateFontInstance L"System", h=16, it=0, weight=400, PandF=22, charset=0 orient 0 escapement 0 trace:font:WineEngCreateFontInstance Chosen: L"Dingbats" L"Regular" I'm running a vanilla Red Hat 9 installation, and I'd expect *some* system font to be a better match for System than the one Wine picked, "Dingbats". Amusingly, it looks like what's going on is that Abiword itself installs Dingbats into %WINDIR%/Fonts. Since I'm using a fake Windows, this is then the *only* font in that directory, and it's used for all matches. Heh. OK, so I removed that one font. That lets AbiWord present a user interface (yay), but just try typing into it! Each successive line displays more or less directly on top of the previous one. This is the same failure mode I observed in my previous runs. Wine has evidently not progressed much in this area. Guess it's time to open a bug report in the wine bug tracker (perhaps marking it as related to http://bugs.winehq.com/show_bug.cgi?id=698 ). (And ask the guy who rated AbiWord "works great" what he was smoking. Maybe he was using a real Windows installation?) - Dan -- Dan Kegel http://www.kegel.com http://counter.li.org/cgi-bin/runscript/display-person.cgi?user=78045

1 0

Solaris Maintenance
by Robert Lunnon April 21, 2003

April 21, 2003

I am doing some maintenance for Solaris x86 Two major (new) things were noted. 1. The introduction of ptrace(GETREGS... which is not supported under Solaris was patched with a suitable stub file. This will be moved to an emulation of ptrace using /proc debugging facilities as time allows. For now this works without the debugger. 2. There are some NULL pointers being passed to printf and friends again, this might work under linux/glibc but is not at all portable to other libc implementations where you can expect a segmentation fault If I might be so bold as to suggest the following advise 1. Check portability of interfaces you use against the docs for the platforms Wine supports. For Solaris look at http://docs.sun.com 2. Be carefull about passing null pointers to library functions unless the documentation for all affected systems says it's allowable. Be particularly careful with printf and friends because NULL gets accepted silently on linux (quite improperly IMHO). Now I have one question Someone cleaned up a whole pile of NULL pointer passing to printf some time ago, how was this done ? I.E. was there a generallised solution to this problem or was it an instance by instance search and destroy mission ? Thanks Bob

1 0