November 2006 - Wine-devel - list.winehq.org

Re: sfd2ttf - modify buglist entry
by theun.wine.mail＠planet.nl 27 Nov '06

27 Nov '06

----- Oorspronkelijk bericht ----- Van: Markus Amsler <markus.amsler(a)oribi.org> Datum: zaterdag, november 25, 2006 11:05 pm Onderwerp: Re: sfd2ttf > theun.wine.mail(a)planet.nl wrote: > > Hi, > > > >>From the buglist I gather that the fontforge dependency is still > an issue. > > > > I've taken a look at the sources and I think a can strip it down to > > about 5 to 10 pages of code without a major rewrite. > > > > If this is acceptable, I'd be happy to spend my time. > > > > Are you sure? > > The problem is TTF generation. There's no library and it's not > trivial. > With 5 to 10 pages its impossible to generate a valid, non-empty > TTF file. > > I tried it once with dropping all unnecesary features (Apple > Advanced > Typography, Codpages, ...) and managed to get it down to 500 KB. > Without > Code obfuscation or comment dropping my guessed minimum was around > 350 > KB which would be around 150-200 pages of code. And we agreed > that's too > much, so I stopped my efforts. > You can download my latest version from [1]. There was also a > sfd2ttf > thread some time ago. > > So sfd2ttf is not feasible, and AJ wonn't commit TTF files so I > think we > could resolve this bug as WONTFIX. > > Markus > > [1] http://oribi.org/download/sfd2ttf.tar.gz > > Obviously, you've already put quite a bit of effort in sfd2ttf and the result is there. Since it also clear that the sfd2ttf entry in the buglist in far from up to date, I think it's a good idea to modify the entry to reflect the current status. Hopefully, this will prevent other potential contributers from wasting their time. Thanks, Theun van der Veen.

1 0

Yet another Wine success story: the CD-ROM in today's LA Times runs ok
by Dan Kegel 26 Nov '06

26 Nov '06

The Sunday Los Angeles Times had a CD-ROM insert today (a promo from Vonage about upcoming Hollywood films, go figure). With some trepidation, I tried it out with Wine... and it worked flawlessly (OK, maybe there was one audio stutter). It was a Flash 8 executable, and played very smoothly on my beefy Athlon laptop. Congratulations again to Team Wine... - Dan

1 0

Re: [AppDB] (resend) Add basic rating logic checking
by Chris Morgan 26 Nov '06

26 Nov '06

On Sunday 26 November 2006 12:49 pm, Alexander Nicolaysen Sørnes wrote: > Add basic rating logic checking, by asking the user to correct the error if > > - Installs? = No and the rating is Platinum > - Runs? is not 'yes' and rating is not Garbage > > > Regards, > > Alexander N. Sørnes When the erorr occurs is the users data retained so they can correct the error and continue without re-entering it? Chris

1 0

Re: [6/6] Add a partial COFF library support to the winedump
by Eric Pouech 26 Nov '06

26 Nov '06

Dmitry Timoshkov a écrit : > Hello, > > this implementation is able to parse imports libraries from the PSDK > and hopefully should help interested parties to check/synchronize ordinal > imports between Wine and Windows. > > The dumper is not able (yet) to parse import libraries with the long format > described in Portable Executable and Common Object File Format Specification > and uuid.lib. > > I think it's a bad idea to "force" the kind of file on the command line for dumping I'd rather see winedump guess the file format based on the file header, as we do for .exe, .dll, .mdmp, .pdb, .dbg... we didn't do it for emf and lnk because it seems they don't have a simple header to find it out, but .lib files definitively have you should also provide support for the -C option (symbol demangling) BTW, I have a couple of patches for debug files dumping (.pdb, .dbg...), that should help the dumping of debug information from a coff file (when needed) A+

2 3

sfd2ttf
by theun.wine.mail＠planet.nl 25 Nov '06

25 Nov '06

Hi, >From the buglist I gather that the fontforge dependency is still an issue. I've taken a look at the sources and I think a can strip it down to about 5 to 10 pages of code without a major rewrite. If this is acceptable, I'd be happy to spend my time. Theun van der Veen

2 1

Re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Vitaliy Margolen 25 Nov '06

25 Nov '06

Jeremy White wrote: > I would strongly recommend that this be done instead with > xdg-utils: > > http://portland.freedesktop.org/wiki/XdgUtils Sure, but they can not handle files with spaces in them. Also they don't work as-is with Wine's winemenubuilder. Which will require at least one more wrapper script. Also they don't allow installing icons without specifying size. And all in all it will be 4 large scripts instead of 1 small. > That will allow us to avoid the pain of maintaining our own > implementation, and allow distro vendors to make their distro > work with Wine just by supplying a working version of xdg-utils. It's been discussed multiple times here. And last time I remember agreement was not to introduce any additional dependencies. I have also checked, and not a single distro had those installed. I do not want to depend on something that's no one has, and no way to distribute it to users either. > The trick is whether or not we can persuade Alexandre and/or all > of the Wine packagers to include xdg-utils by default in distributions. That's not his call but packagers. And the problem will remain the same. Vitaliy.

2 1

Extending the testframe to cope with different windows versions
by Paul Vriens 25 Nov '06

25 Nov '06

Hi, after my last patch to yet 'remove' another test I had another look at tests.winehq.org. With the arrival of IE7 and of course a lot of changes to dll's (not even mentioning Vista) it looks like Windows versions are starting to behave not even close to similar. How can we deal with these differences? Several tests we have already include checks against a lot of possible return values or errorcodes. It's a shame when we have to stop running a test because it fails on 1 or more versions of Windows. If the end-result is that we start excluding more-and-more tests, then we should start doubting the usefulness of the regression tests. Any ideas ? Cheers, Paul.

4 5

Re: winex11.drv: Cast-qual warning fix + remove superfluous HeapFree()
by Paul Vriens 25 Nov '06

25 Nov '06

On Sat, 2006-11-25 at 12:41 +0000, Andrew Talbot wrote: > Changelog: > winex11.drv: Cast-qual warning fix + remove superfluous HeapFree(). > > diff -urN a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c > --- a/dlls/winex11.drv/clipboard.c 2006-10-09 20:06:04.000000000 +0100 > +++ b/dlls/winex11.drv/clipboard.c 2006-11-25 12:37:27.000000000 +0000 > @@ -511,7 +511,8 @@ > { > LPWINE_CLIPFORMAT lpFormat; > LPWINE_CLIPFORMAT lpNewFormat; > - > + LPWSTR new_name; > + > /* allocate storage for new format entry */ > lpNewFormat = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_CLIPFORMAT)); > > @@ -521,14 +522,13 @@ > return NULL; > } > > - if (!(lpNewFormat->Name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) > + if (!(new_name = HeapAlloc(GetProcessHeap(), 0, (strlenW(FormatName)+1)*sizeof(WCHAR)))) > { > WARN("No more memory for the new format name!\n"); > - HeapFree(GetProcessHeap(), 0, lpNewFormat); > return NULL; > } > > - strcpyW((LPWSTR)lpNewFormat->Name, FormatName); > + lpNewFormat->Name = strcpyW(new_name, FormatName); > lpNewFormat->wFlags = 0; > lpNewFormat->wFormatID = GlobalAddAtomW(lpNewFormat->Name); > lpNewFormat->drvData = prop; > > Just out of curiosity. Why is the HeapFree superfluous? It is allocated a few lines above and not free-ed in this fail condition. Cheers, Paul.

2 3

Re: wineshelllink: Use FreeDesktop standard to create Wine menu structure.
by Jeremy White 24 Nov '06

24 Nov '06

I would strongly recommend that this be done instead with xdg-utils: http://portland.freedesktop.org/wiki/XdgUtils That will allow us to avoid the pain of maintaining our own implementation, and allow distro vendors to make their distro work with Wine just by supplying a working version of xdg-utils. The trick is whether or not we can persuade Alexandre and/or all of the Wine packagers to include xdg-utils by default in distributions. Cheers, Jeremy Vitaliy Margolen wrote: > Change Log: > wineshelllink: Use FreeDesktop standard to create Wine menu structure. > > The major changes include: > - Use WM independent paths for all generated files. > - Dynamically build .menu and .directory files to create menu structure. > - Store icons in local icon store using their "cryptic" names to avoid conflicts. > - Number of other changes required for compatibility. > Note: .desktop links are still stored in a directory structure representing > Start Menu. This is done for possible future expansion. > > This new approach should work with KDE, Gnome and other XDG compliant managers. > I have verified this with recent versions of KDE and Gnome on several distros. > > However there are might be some problems with some custom changes some distros > might have. As an example SuSE has special feature that doesn't work right: > https://bugzilla.novell.com/show_bug.cgi?id=188110 > > The question of removing these links after programs have been uninstalled still open. > There are number of possible ways to solve it. The simplest would be symlinking > directories containing .desktop files. However that might brake whole menu structure. > --- > tools/wineshelllink | 258 ++++++++++++++++++++++---------------------------- > 1 files changed, 114 insertions(+), 144 deletions(-) > > > ------------------------------------------------------------------------ > > diff --git a/tools/wineshelllink b/tools/wineshelllink > index db65efa..5d91afc 100755 > --- a/tools/wineshelllink > +++ b/tools/wineshelllink > @@ -4,6 +4,7 @@ > # This is used by the IShellLink interface > # > # Copyright 2000 Alexandre Julliard > +# Copyright 2006 Vitaliy Margolen > # > # This library is free software; you can redistribute it and/or > # modify it under the terms of the GNU Lesser General Public > @@ -22,8 +23,7 @@ > > # Note that the link is a relative unix-style path name. Since the / character > # is not valid in Windows filenames it is an adequate separator to show the > -# menu structure. (This program may need to split the menu structure out for > -# implementing xdg-style menus) > +# menu structure. > > mode="" > args="" > @@ -82,176 +82,146 @@ if [ -z "$link" ] ; then > usage > fi > > -kde_entry() > +desktop_entry() > { > - xname=`basename "$link"` > - cat <<EOF > -# KDE Config File > -[KDE Desktop Entry] > -Name=$xname > -Exec=wine '$path' $args > -Type=Application > -Comment=$descr > -EOF > - [ -z "$workdir" ] || echo "Path=\"$workdir\"" > - [ -z "$xpmicon" ] || echo "Icon=$xpmicon" > -} > - > -gnome_entry() > -{ > - xname=`basename "$link"` > cat <<EOF > [Desktop Entry] > -Name=$xname > +Name=$linkname > Exec=wine "$path" $args > Type=Application > -Comment=$descr > EOF > + [ -z "$descr" ] || echo "Comment=$descr" > [ -z "$workdir" ] || echo "Path=$workdir" > [ -z "$xpmicon" ] || echo "Icon=$xpmicon" > } > > -mdk_entry() > +directory_entry() > { > - base=`basename "$link"` > - section=`dirname "$link"` > - [ -z "$icon" ] || xicon="icon=\"$xpmicon\"" > - pathmenu=`echo "$path" | sed 's+\\\\+\\\\\\\\+g'` > - echo "?package(local.Wine):needs=x11 section=\"/Wine/$section\" title=\"$base\" longtitle=\"$descr\" command=\"wine '$pathmenu' $args\" $xicon" > + cat <<EOF > +[Desktop Entry] > +Type=Directory > +EOF > + if [ "$1" == "wine" ] ; then > + echo "Name=Wine" > + echo "Icon=wine" > + else > + echo "Name=$1" > + echo "Icon=folder" > + fi > } > > # copy the icon file to a specified dir and set xpmicon to the resulting path > copy_icon() > { > - dir="$1" > - mkdir -p "$dir" > - mkdir -p "$dir/""`dirname "$link"`" || true > - if [ -f "$icon" ] > - then > - cp "$icon" "$dir/$link.xpm" > - xpmicon="$dir/$link.xpm" > - else > - xpmicon="" > - fi > + if [ -f "$icon" ] > + then > + xpmicon=`basename "$icon" .xpm` > + > + mkdir -p "$1" > + cp "$icon" "$1/$xpmicon.xpm" > + else > + xpmicon="" > + fi > } > > -# Debian/Mandrake > - > -type update-menus > /dev/null 2>&1 > -if [ $? = 0 -a $mode = "menu" ] > -then > - iconname="`basename "$link"`.xpm" > - dir="$HOME/.menu/icons" > - if [ -f "$icon" ] > - then > - mkdir -p "$dir" > - cp "$icon" "$dir/$iconname" > - xpmicon="$dir/$iconname" > - else > - xpmicon="" > - fi > - mdk_entry >> "$HOME/.menu/wine" > - if [ -d "/usr/lib/menu" ] && [ -w "/usr/lib/menu" ] > - then > - mdk_entry >> "/usr/lib/menu/wine" > - fi > - update-menus > /dev/null 2>&1 > -fi > +# XDG > > -# KDE > +xdg_config_dir="$XDG_CONFIG_HOME" > +[ -n "$xdg_user_dir" ] || xdg_config_dir="$HOME/.config" > +xdg_config_dir="$xdg_config_dir/menus/applications-merged" > > -if [ -d "$HOME/.kde" ] > -then > - kdeversion=0 > - if type kde-config >/dev/null 2>&1 > - then > - kdeversion=`kde-config -v | grep KDE: | sed -n "s/^KDE: $[^.]*$\..*$/\1/p"` > - fi > +xdg_data_dir="$XDG_DATA_HOME" > +[ -n "$xdg_data_dir" ] || xdg_data_dir="$HOME/.local/share" > > - if [ $kdeversion -ge 2 ] > - then > - copy_icon "$HOME/.kde/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde/share/applnk/Wine/$link.desktop" > - elif [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > +# Create common directories > +mkdir -p "$xdg_config_dir" > +mkdir -p "$xdg_data_dir/desktop-directories" > + > +get_menu_entries() > +{ > + tmp="$xdg_config_dir/$1.menu" > + > + if [ -r "$tmp" ] ; then > + awk ' > +BEGIN { RS="<" } > +/^Filename/ { > + if (match($0,/>/)) { > + print substr($0,RSTART+1) > + } > +}' $tmp > fi > - else > - copy_icon "$HOME/.kde/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - kde_entry > "$HOME/.kde/share/applnk/Wine/$link.kdelnk" > +} > > - # KDE 1.x kludge. Wake up KDE, if we can find kpanel running > - type kwmcom >/dev/null 2>/dev/null && \ > - ps u -C kpanel >/dev/null 2>/dev/null && \ > - kwmcom kpanel:restart > +# Input > +# menu file name > +# new item > +write_menu_file() > +{ > + tmpfile=`mktemp` > + ( > + echo '<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"' > + echo '"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">' > + echo '<Menu>' > + echo ' <Name>Applications</Name>' > + > + IFS="-" > + > + fullname='wine' > + for i in $1; do > + echo " <Menu>" > + echo " <Name>$fullname-$i</Name>" > + echo " <Directory>$fullname-$i.directory</Directory>" > + > + dir_file_name="$xdg_data_dir/desktop-directories/$fullname-$i.directory" > + if [ ! -f "$dir_file_name" ] ; then > + directory_entry "$i" > "$dir_file_name" > + fi > + test "$i" = "wine" || fullname="$fullname-$i" > + done > + > + echo " <Include>" > + > + IFS=" > +" > + for i in $(get_menu_entries "$1"); do > + test "$i" = "$2" && continue > + echo " <Filename>$i</Filename>" > + done > + > + # New record > + echo " <Filename>$2</Filename>" > + echo " </Include>" > + > + IFS='-' > + for i in $1; do > + echo " </Menu>" > + done > + echo '</Menu>' > + ) > $tmpfile > + chmod 0600 $tmpfile > + > + mv -f $tmpfile "$xdg_config_dir/$1.menu" > +} > > - elif [ -d "$HOME/Desktop" ] > - then > - kde_entry > "$HOME/Desktop/$link.kdelnk" > - # KDE 1.x kludge: wake up KDE, if we can find kfm running... > - type kfmclient >/dev/null 2>/dev/null && \ > - ps u -C kfm >/dev/null 2>/dev/null && \ > - kfmclient refreshDesktop > - fi > - fi > -fi > > -if [ -d "$HOME/.kde2" ] > -then > - copy_icon "$HOME/.kde2/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde2/share/applnk/Wine/$link.desktop" > - else > - if [ -d "$HOME/Desktop2" ] > - then > - gnome_entry > "$HOME/Desktop2/$link.desktop" > - fi > - if [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > - fi > - fi > -fi > +copy_icon "$xdg_data_dir/icons" > > -if [ -d "$HOME/.kde3/share/applnk" ] > -then > - copy_icon "$HOME/.kde3/share/applnk/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.kde3/share/applnk/Wine/$link.desktop" > - else > - if [ -d "$HOME/Desktop3" ] > - then > - gnome_entry > "$HOME/Desktop3/$link.desktop" > - fi > - if [ -d "$HOME/Desktop2" ] > - then > - gnome_entry > "$HOME/Desktop2/$link.desktop" > - fi > - if [ -d "$HOME/Desktop" ] > - then > - gnome_entry > "$HOME/Desktop/$link.desktop" > +linkname=`basename "$link"` > + > +if [ $mode = "menu" ] ; then > + mkdir -p "$xdg_data_dir/applications/wine/`dirname "$link"`" > + > + linkpath=`dirname "$link" | sed 's!/!-!g'` > + if [ "$linkpath" == "." ] ; then > + linkpath="" > + else > + linkpath="-$linkpath" > fi > - fi > -fi > > -# Gnome > - > -if [ -d "$HOME/.gnome" ] > -then > - copy_icon "$HOME/.gnome/apps/Wine" > - if [ $mode = "menu" ] > - then > - gnome_entry > "$HOME/.gnome/apps/Wine/$link.desktop" > - elif [ -d "$HOME/.gnome-desktop" ] > - then > - gnome_entry > "$HOME/.gnome-desktop/$link.desktop" > - fi > + desktop_entry > "$xdg_data_dir/applications/wine/$link.desktop" > + write_menu_file "wine$linkpath" "wine$linkpath-$linkname.desktop" > +else > + desktop_entry > "$HOME/Desktop/$linkname.desktop" > fi > > exit 0 > > > > ------------------------------------------------------------------------ > >

2 1

WM_SETFONT support
by Jing Li 24 Nov '06

24 Nov '06

Hi, I am building a dialog box which is used to display the license agreement information. I create my dialog template with the dialog editor. The dialog box contains the "Microsoft Rich Textbox Control" (ActiveX control). When the function DialogBox() is called to display the dialog box, the command "WM_SETFONT" is sent to my dialog procedure and the dialog box does not pop up at all. Do you know how to deal with this problem? The only information I've got from MSDN is "The dialog box procedure is responsible for saving the font handle passed with the WM_SETFONT message and selecting the handle into the display device context whenever it writes text to the window." Thanks a lot for your response and help. Regards, Jing

2 1