September 2007 - Wine-commits

Alexandre Julliard : Move the documentation tools to the git repository.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: tools Branch: master Commit: 5a27329c2fa39b57226efc178b2e5ef35cdaa97b URL: http://source.winehq.org/git/tools.git/?a=commit;h=5a27329c2fa39b57226efc17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 11 21:34:04 2007 +0200 Move the documentation tools to the git repository. --- html2template | 93 ++++++++++++++++++++++++++++++++++++++++++++++ wine_release | 2 +- winedoc.css | 10 +++++ winedoc_release | 2 +- winehtml.dsl | 27 +++++++++++++ wineprint.dsl | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 243 insertions(+), 2 deletions(-) diff --git a/html2template b/html2template new file mode 100755 index 0000000..fa09567 --- /dev/null +++ b/html2template @@ -0,0 +1,93 @@ +#!/usr/bin/perl -w +# Francois Gouget <fgouget(a)codeweavers.com> +# Jeremy Newman <jnewman(a)codeweavers.com> +use strict; +use Getopt::Std; + +# This is a convenience script for building the website docs for +# www.winehq.com. WineHQ is a template based website so that the +# generated files must have a slightly special format: +# * everything outside the <body> tag must be stripped +# * the title is specified using a special tag on the first line +# * the filenames don't end in '.html' + +sub skip_to_gt($) +{ + my $line=$_[0]; + while (defined $line) + { + return $line if ($line =~ s/^[^>]*>//i); + $line=<>; + } + return undef; +} + +sub grab_cdata($) +{ + my $line=$_[0]; + my $cdata; + while (defined $line) + { + if ($line =~ s/^([^<]*)<.*$/$1/i) + { + chomp $line; + $cdata=(defined $cdata?"$cdata $line":$line); + return ($cdata,$line); + } + chomp $line; + $cdata=(defined $cdata?"$cdata $line":$line); + $line=<>; + } + return ($cdata,$line); +} + +sub convert_to_template() +{ + my $line; + while ($line=<>) + { + if ($line =~ s/^.*<title\s*//i) + { + $line=skip_to_gt($line); + my ($title,$line)=grab_cdata($line); + print "\n"; + } + elsif ($line =~ s/^.*<body//i) + { + $line=skip_to_gt($line); + last; + } + } + + my $exit; + do + { + $exit=($line =~ s/<\/body.*$//i); + $line=~s/(href=\"[^.\/]*)\.(htm|html)([^\"]*\")/$1$3/gi; + print $line; + } + while (!$exit and $line=<>); +} + +# +# main +# + +# get command line options +# $opts{'i'} = input file name +# $opts{'o'} = output file name +my %opts; +getopt('io', \%opts); + +if (defined($opts{'i'})) +{ + open STDIN, "<$opts{'i'}" or die "cannot read from $opts{'i'}: $!"; +} + +if (defined($opts{'o'})) +{ + open STDOUT, ">$opts{'o'}" or die "cannot write to $opts{'o'}: $!"; +} + +convert_to_template(); +exit 0; diff --git a/wine_release b/wine_release index 909ae14..e6ae152 100755 --- a/wine_release +++ b/wine_release @@ -69,7 +69,7 @@ for f in $manpages do name=`basename $f .man` make -C `dirname $f` $name.man - nroff -man $f | ../bin/man2html --pgsize=100000 | ../html2template -o $templates_dir/en/docs/$name.template + nroff -man $f | ../bin/man2html --pgsize=100000 | $tools_dir/html2template -o $templates_dir/en/docs/$name.template done git diff -M --stat wine-$oldver wine-$version >../ds$version.txt diff --git a/winedoc.css b/winedoc.css new file mode 100644 index 0000000..f93abba --- /dev/null +++ b/winedoc.css @@ -0,0 +1,10 @@ +body { background-color: #FFFFFF; color: #000000; } + +a:link { color: #a50d0d; } +a:visited { color: #505050; } +a:active { color: #a50d0d; } + +.screen { background-color: #E0D0D0; padding: 0.5ex; } +.question { border-top: dashed thin; font-weight: bolder; } + +.userinput { font-weight: bold; } diff --git a/winedoc_release b/winedoc_release index 0fc6c2d..165287f 100755 --- a/winedoc_release +++ b/winedoc_release @@ -37,7 +37,7 @@ echo "==== BUILDING SGML DOCUMENTATION ====" books="wineusr-guide winedev-guide winelib-guide" langs="en" site_base_dir="/home/winehq/opt/lostwages" -tools_dir="/home/winehq/opt/tools" +tools_dir="/home/winehq/opt/git-tools" guides_base_dir="$site_base_dir/docs" winehq_base_dir="$site_base_dir/templates" diff --git a/winehtml.dsl b/winehtml.dsl new file mode 100644 index 0000000..5270a99 --- /dev/null +++ b/winehtml.dsl @@ -0,0 +1,27 @@ +<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ +<!ENTITY walsh-style PUBLIC "-//Norman Walsh//DOCUMENT DocBook HTML Stylesheet//EN" CDATA DSSSL> +<!ENTITY cygnus-style SYSTEM "/usr/lib/sgml/stylesheet/dsssl/docbook/cygnus/cygnus-both.dsl" CDATA DSSSL> +]> + +<style-sheet> +<style-specification id="html" use="docbook"> +<style-specification-body> + +; Use the section id as the filename rather than +; cryptic filenames like x1547.html +(define %use-id-as-filename% #t) + +; Repeat the section number in each section to make it easier +; when browsing the doc +(define %section-autolabel% #t) + +; Use CSS to make the look of the documentation customizable +(define %stylesheet% "winedoc.css") +(define %stylesheet-type% "text/css") + +</style-specification-body> +</style-specification> + +<external-specification id="docbook" document="walsh-style"> + +</style-sheet> diff --git a/wineprint.dsl b/wineprint.dsl new file mode 100644 index 0000000..7f53b2f --- /dev/null +++ b/wineprint.dsl @@ -0,0 +1,111 @@ +<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [ +<!ENTITY print-ss PUBLIC "-//Norman Walsh//DOCUMENT DocBook Print Stylesheet//EN" CDATA DSSSL> +]> + +<style-sheet> + +<style-specification id="print" use="print-stylesheet"> +<style-specification-body> + +;; I was hoping that this would take out the many blank pages in the +;; PDF file, but it doesn't, it just slides the page numbers over. +(define %two-side% #f) + +(define %generate-book-titlepage% #t) + +;;Titlepage Not Separate +(define (chunk-skip-first-element-list) + (list (normalize "sect1") + (normalize "section"))) + +;;Titlepage Separate? +;(define (chunk-skip-first-element-list) +; '()) + +(define (list-element-list) + ;; fixes bug in Table of Contents generation + '()) + +(define (toc-depth nd) + 2) + +;; This seems to have no affect +(define %generate-book-titlepage-on-separate-page% #f) + +(define %body-start-indent% + ;; Default indent of body text + 2pi) + +(define %para-indent-firstpara% + ;; First line start-indent for the first paragraph + 0pt) + +(define %para-indent% + ;; First line start-indent for paragraphs (other than the first) + 0pt) + +(define %block-start-indent% + ;; Extra start-indent for block-elements + 2pt) + +;;Define distance between paragraphs +(define %para-sep% + (/ %bf-size% 2.0)) + +;;Define distance between block elements (figures, tables, etc.). +(define %block-sep% + (* %para-sep% 1.0)) +;; (* %para-sep% 2.0)) + +(define %hyphenation% + ;; Allow automatic hyphenation? + #t) + +(define %left-margin% 5pi) +(define %right-margin% 5pi) +(define %top-margin% 5pi) +(define %bottom-margin% 5pi) + +(define %footer-margin% 2pi) +(define %header-margin% 2pi) + +(define %line-spacing-factor% 1.3) + ;; Factor used to calculate leading + ;; The leading is calculated by multiplying the current font size by the + ;; '%line-spacing-factor%'. For example, if the font size is 10pt and + ;; the '%line-spacing-factor%' is 1.1, then the text will be + ;; printed "10-on-11". + +(define %head-before-factor% + ;; Factor used to calculate space above a title + ;; The space before a title is calculated by multiplying the font size + ;; used in the title by the '%head-before-factor%'. +;; 0.75) + 0.5) + +(define %head-after-factor% + ;; Factor used to calculate space below a title + ;; The space after a title is calculated by multiplying the font size used + ;; in the title by the '%head-after-factor%'. + 0.5) + +(define %input-whitespace-treatment% 'collapse) + +(define ($generate-book-lot-list$) + ;; Which Lists of Titles should be produced for Books? + (list )) + +(define tex-backend + ;; Are we using the TeX backend? + ;; This parameter exists so that '-V tex-backend' can be used on the + ;; command line to explicitly select the TeX backend. + #t) + +</style-specification-body> +</style-specification> + +<external-specification id="print-stylesheet" document="print-ss"> + +</style-sheet> + +

1 0

Alexandre Julliard : update-winehq: The website is in git now.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: tools Branch: master Commit: ff2562910007ee665513fda28e5bedf3d5306ae6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ff2562910007ee665513fda2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 11 21:17:07 2007 +0200 update-winehq: The website is in git now. --- update-winehq | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/update-winehq b/update-winehq index c6a7e87..4e6d186 100755 --- a/update-winehq +++ b/update-winehq @@ -6,7 +6,7 @@ # # Usage: update-winehq [announce-file] # -# Must be run from the top-level dir of a CVS checkout of the lostwages module +# Must be run from the top-level dir of a git checkout of the website module # sub xml_escape($) @@ -24,7 +24,7 @@ my $rel; my $changes = "\n"; die "Not in lostwages dir?" unless -d "news" && -f "include/winehq.conf"; -system("cvs", "-Q", "update", "include", "news") == 0 or die "cvs update failed"; +system("git", "pull") == 0 or die "git pull failed"; # Parse the ANNOUNCE file @@ -116,14 +116,16 @@ print "Created $newsfile\n"; # Commit changes -if (system("cvs", "-Q", "add", $newsfile)) +if (system("git", "add", $newsfile)) { unlink $newsfile; - die "cvs add $newsfile failed"; + die "git add $newsfile failed"; } -if (system("cvs", "commit", "-m", "Release $rel", "include/winehq.conf", $newsfile)) +if (system("git", "commit", "-m", "Wine release $rel", "include/winehq.conf", $newsfile)) { - unlink $newsfile; - die "cvs commit failed"; + system("git", "rm", "-f", $newsfile); + die "git commit failed"; } + +system("git", "push") == 0 or die "git push failed";

1 0

Alexandre Julliard : winapi_stats: Reimplement in perl, we don' t need a database for that.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: tools Branch: master Commit: ca8e577b311fb1296d9dd491894dc4b8c497b3a0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ca8e577b311fb1296d9dd491… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 11 21:21:50 2007 +0200 winapi_stats: Reimplement in perl, we don't need a database for that. --- winapi_stats | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ wine_release | 7 ++--- 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/winapi_stats b/winapi_stats new file mode 100755 index 0000000..9f5e774 --- /dev/null +++ b/winapi_stats @@ -0,0 +1,62 @@ +#!/usr/bin/perl +# +# Filter to generate the winapi stats table using winapi_extract. +# Must be run from the Wine top-level source directory. +# + +my %stats; + +open STATS, "-|" or exec "./tools/winapi/winapi_extract", "--pseudo-stub-statistics", "--no-verbose", "--no-progress" or die "cannot run winapi_extract"; +while (<STATS>) +{ + chomp; + if (/\*\.c: (.*): (\d+) of (\d+) functions are stubs $(\d+) real, (\d+) pseudo$ and (\d+) are forwards/) + { + my ($dll, $stubs, $total, $real, $pseudo, $forwards) = ($1, $2, $3, $4, $5, $6); + next if $dll =~ /^(wine.*\.drv|wine.*\.acm|wined3d|winedos|wprocs)$/; + $stats{$dll} = [ $stubs, $total, $real, $pseudo, $forwards ]; + ${$stats{" Total"}}[0] += $stubs; + ${$stats{" Total"}}[1] += $total; + ${$stats{" Total"}}[2] += $real; + ${$stats{" Total"}}[3] += $pseudo; + ${$stats{" Total"}}[4] += $forwards; + } +} +close STATS; + +my $bg = 0; + +print "\n\n"; +print "<h3>Win API Stats</h3>\n\n"; +print "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"3\">\n\n"; +print "<tr class=\"hdr\">\n"; +print "<th>Library</th>\n"; +print "<th>API count</th>\n"; +print "<th>% implemented</th>\n"; +print "<th>Total stubs</th>\n"; +print "<th>Real stubs</th>\n"; +print "<th>Pseudo stubs</th>\n"; +print "<th>Forwards</th>\n"; +print "</tr>\n"; + +foreach my $dll (sort keys %stats) +{ + my ($stubs, $total, $real, $pseudo, $forwards) = @{$stats{$dll}}; + my $color = $bg ? "white" : "grey"; + my $pct = $total ? ($total - $stubs) / $total * 100 : 0; + printf "<tr>\n"; + printf "<td class=\"%s\">%s</td>\n", $color, $dll; + printf "<td class=\"%s\">%u</td>\n", $color, $total; + printf "<td class=\"pct%u\">%u%%</td>\n", int(($pct + 2.5) / 5) * 5, $pct; + printf "<td class=\"%s\">%u</td>\n", $color, $stubs; + printf "<td class=\"%s\">%u</td>\n", $color, $real; + printf "<td class=\"%s\">%u</td>\n", $color, $pseudo; + printf "<td class=\"%s\">%u</td>\n", $color, $forwards; + printf "</tr>\n"; + $bg = !$bg; +} + +my $now = `date`; +chomp $now; +print "\n</table>\n</div>\n"; +print "last modified: $now\n"; diff --git a/wine_release b/wine_release index c3d1f60..909ae14 100755 --- a/wine_release +++ b/wine_release @@ -17,6 +17,7 @@ oldver=$1 version=$2 templates_dir="/home/winehq/opt/lostwages/templates" +tools_dir="/home/winehq/opt/git-tools" cd /home/winehq/opt/source @@ -24,7 +25,7 @@ cd /home/winehq/opt/source rm -rf wine-$version git clone -l -s -n git/wine.git wine-$version -(cd wine-$version && git checkout -b dummy wine-$version) +(cd wine-$version && git checkout wine-$version) # move wine link rm -f wine @@ -77,9 +78,7 @@ make htmlpages && rm -rf ../WineAPI && mv documentation/html ../WineAPI # Wine API Stats echo "==== UPDATING WINE API STATS PAGE ====" -./tools/winapi/winapi_extract --pseudo-stub-statistics --no-verbose --no-progress > winapi_stats.txt -../winapi_stats.php > $templates_dir/en/winapi_stats.template -rm -f winapi_stats.txt +$tools_dir/winapi_stats > winapi_stats.template && mv winapi_stats.template $templates_dir/en/winapi_stats.template # cleanup source tree git clean -q -d -x

1 0

Jeremy Newman : lostwages (winehq.org website source) has now been moved over to git
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: 9931bf32038bb3ea11926a5eadaa99ea7bd13327 URL: http://source.winehq.org/git/website.git/?a=commit;h=9931bf32038bb3ea11926a… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:43:09 2007 -0500 lostwages (winehq.org website source) has now been moved over to git --- templates/en/git.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/git.template b/templates/en/git.template index 8688d41..dcd73b9 100644 --- a/templates/en/git.template +++ b/templates/en/git.template @@ -93,6 +93,7 @@ git rebase origin exports the following modules: <ul> + <li><a href="http://source.winehq.org/git/website.git">website.git</a> -- source for the WineHQ.org website</li> <li><a href="http://source.winehq.org/git/bugzilla.git">bugzilla.git</a> -- source for the bugzilla version used on the WineHQ site</li> <li><a href="http://source.winehq.org/git/tools.git">tools.git</a> -- tools used on the WineHQ site</li> </ul> @@ -100,7 +101,6 @@ exports the following modules: The WineHQ CVS server exports the following modules: <ul> - <li><tt>lostwages</tt> -- source for the WineHQ web site</li> <li><tt>tools</tt> -- tools used on the WineHQ site</li> <li><tt>appdb</tt> -- source for the application database web site</li> </ul>

1 0

Jeremy Newman : Francois Gouget <fgouget@free.fr>
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: 2b9bf5c04adcc7779e4cfac7e2e75f422aee1ac0 URL: http://source.winehq.org/git/website.git/?a=commit;h=2b9bf5c04adcc7779e4cfa… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:15:43 2007 -0500 Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. --- wwn/wn20070410_328.xml | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/wwn/wn20070410_328.xml b/wwn/wn20070410_328.xml index ec97a9e..6df61fc 100644 --- a/wwn/wn20070410_328.xml +++ b/wwn/wn20070410_328.xml @@ -98,17 +98,17 @@ Its main goal is to buy a house. It also serves to inform you of what's going on posts="11" > <topic>Utilities</topic> -In the course of a different discussion, there was mention of a new +In the course of a different discussion, there was a mention of a new wrapper around Wine to automate some installation tasks. Vit Hrachovy let everyone know about Winebot: <quote who="Vit Hrachovy"> WineBot (<a href="http://winebot.sandbox.cz">http://winebot.sandbox.cz</a>) is a sort of lightweight -implementation of some core thoughts, but with command line based +implementation of some core thoughts, but with ca ommand line based interface and less dependencies. Both projects share some core ideas and -data file formats. WineBot goals are much smaller in scope than -Wine-Doors ones, going in smaller steps. +data file formats. The WineBot goals are much smaller in scope than +the Wine-Doors ones, going in smaller steps. The main goal is to replace obsolete and almost unmaintainable winetools project. @@ -152,7 +152,7 @@ projects haven't been updated as Wine has improved. Others make some serious configuration changes to Wine that make troubleshooting next to impossible from a developer standpoint. Finally, the biggest problem comes from the fact that the quick and simple method for getting programs -to work with Wine is to dump a ton of native Microsoft DLL's into the mix. +to work with Wine is to dump a ton of native Microsoft DLLs into the mix. The fact that CodeWeavers have done all of those things in their commercial CrossOver product is proof that such hacks are necessary to run a lot of applications with Wine. @@ -180,9 +180,9 @@ I'll first summarize some points extracted from the previous discussion: <li> If you are making it extremely easy for users to run with native dlls and hacky workarounds, then you are hurting Wine. Wine is still beta, and we need as much testing and bug reporting as possible. In short, you leech off the hard work of all the Wine developers and give nothing back in return (quite the opposite in fact).</li></ul> -Each Winebot package shall have a maintainer responsible for package quality and for interfacing with WINE project(AppDb, Bugzilla, Testing, Fixing). +Each Winebot package shall have a maintainer responsible for package quality and for interfacing with the WINE project (AppDb, Bugzilla, Testing, Fixing). -Every official Winebot maintainer will be bound by sort of Winebot manifest stating the Winebot project's attitude to WINE project. +Every official Winebot maintainer will be bound by a sort of Winebot manifest stating the Winebot project's attitude towards the WINE project. I'll write the manifest (a),(c) and post it onto Winebot Wiki. To create (b) I gladly accept any input to create a regression test repository, would You be so kind and point me to some list of programs / test miniprograms to make a reference implementation? @@ -190,9 +190,9 @@ To create (b) I gladly accept any input to create a regression test repository, <ul> <li> My goal _is_ to help Wine succeed. Hours I'm investing in Winebot are hours I'm spending on learning Wine. Recent discussion about missing reg.exe implementation originated from work on Winebot. I'm application maintainer on AppDb. I'm testing application compatibility on WINE versions back to 0.9.9. I've written Winebot especially to make the testing easier. I often install and uninstall Windows programs from WINE bottles, I'm used to bottles (WINEPREFIX) system, too. Having the installation of programs (and their dependencies) scripted is the first step for making automated testing. </li> -<li> All Winebot packages should install only minimum neccessary dependencies and their install scripts should be ideally only using normal application Windows installer. Any hacks above will be reported (in case they weren't reported already) to WINE bugzilla. +<li> All Winebot packages should install only the minimum necessary dependencies and their install scripts should be ideally only using normal application Windows installer. Any hacks above will be reported (in case they weren't reported already) to the WINE bugzilla. </li> -<li> That's a relict from winetools project. 'bottle initialization' will be removed soon as unnecessary. Working package dependencies allow to reconstruct every step of setup and every 'hack' in used packages. +<li> That's a relic from winetools project. 'bottle initialization' will be removed soon as unnecessary. Working package dependencies allow to reconstruct every step of setup and every 'hack' in used packages. </li> <li> Yes, I'm planning to set up a regression tests repository for WINE (and for Winebot too). As Winebot is using AutoHotKey system for installer automation, it can also run programs, check window properties and contents, click on specified button or areas, etc. For more information, see <a href="http://www.autohotkey.com"> @@ -247,7 +247,7 @@ twice. <quote who="John Smith"> I was able to reproduce the badpixmap bug on peachtree 2006 right after picking a company from the "open company" dialog. This patch seemed to fix -this (or atleast hide it from being as reproducible as it was). I had some +this (or at least hide it from being as reproducible as it was). I had some trouble applying it to current gitwine, but I typed it in manually and it worked fine.</quote> @@ -358,7 +358,7 @@ http://repo.or.cz/w/wine/hacks.git?a=commit;h=a3840322693b5630bf8ffd7f85e92… control the relay channel. It also doesn't help with processes not listening for events from the keyboard. -At any rate, Eric Pouech replied with a patch that taskmgr: +At any rate, Eric Pouech replied with a patch for taskmgr: <quote who="Eric Pouech"> I've just sent a fix for this one. @@ -376,10 +376,10 @@ new debug channels on the fly, even if it would be doable) <topic>Multimedia</topic> Sound has been a problem with Wine for a while. There's rumors some work on it this summer will fix things up, but we'll have to see. In -the mean time, Steven Edwards put together a little test and tossed it +the meantime, Steven Edwards put together a little test and tossed it out there to see what everyone thought: <quote who="Steven Edwards"> -Well it more of a request for adoption than an RFC..... +Well it is more of a request for adoption than an RFC..... If someone else wants to pick this up feel free. I am kind of blocked on time. Over the course of the past year the discussion about need @@ -391,10 +391,10 @@ wine bottle being popped or wine being poured but Alexandre said he would rather have a simple test so I elected to rip Francois winmm audio test as a base. -As for where to take it from here I am kind of at a loss. The more and -more I think about it there could be even better ways to test audio by -using DirectSound to generate a set of tones if thats even possible. -It would be cool if it was because then we could do a series of tests +As for where to take it from here I am kind of at a loss. The more +I think about it there could be even better ways to test audio by +using DirectSound to generate a set of tones if that's even possible. +It would be cool if it was, because then we could do a series of tests like a short tone testing WinMM then another short tone testing DirectSound. This might help users that have choppy sound or missing sound in games but not in other apps. Also how to handle the case @@ -403,21 +403,21 @@ messagebox does nothing, but if we implement the help system Jacek suggested we could provide information on how to debug sound problems linked from the dialog. Last but not least this sound is kind of boring so someone else that understands this code better can add some -sort of modulation to the tone to make it more appeling. If it was -writting in Qbasic I could have pulled it off but as it stands this is -the best your going to get from me. I learned a good bit over the 8 or -10 hours it took me to strip it down so its not a total loss even if -its rejected. +sort of modulation to the tone to make it more appealing. If I was +writing in Qbasic I could have pulled it off but as it stands this is +the best you're going to get from me. I learned a good bit over the 8 or +10 hours it took me to strip it down so it's not a total loss even if +it's rejected. If no one else wants to work on this and Alexandre does not hate it -then I will submit to wine-patches on Monday sans DEBUGING enabled in +then I will submit it to wine-patches on Monday sans DEBUGGING enabled in a proper git diff. </quote> Jan Zerebecki looked it over briefly and commented on specific aspects of it. He added, <quote who="Jan Zerebecki"> -Problems with dsound are usually bugs in Wines dsound code, so a +Problems with dsound are usually bugs in Wine's dsound code, so a button for users IMHO doesn't help. Maarten Lankhorst is currently working on extending the dsound wine test cases with something to reproduce some of these bugs and also on fixing @@ -440,7 +440,7 @@ I almost have a great success story to report; the only thing keeping it from being a success story is the current directory chosen by Nautilus when double-clicking on .exe files. -My wife hurt a finger trying to impersonate a Sampsonite Luggage gorilla, +My wife hurt a finger trying to impersonate a Samsonite Luggage gorilla, and had to go to a hand doctor. Along the way her hand got x-rayed, and the doctor handed her a cd-rom with the x-ray pictures on it. The disc has an autorun.inf on it that should start ViewSel.exe.

1 0

Jeremy Newman : Francois Gouget <fgouget@free.fr>
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: ce77a471342fc497080f938f26d6acf306f1943b URL: http://source.winehq.org/git/website.git/?a=commit;h=ce77a471342fc497080f93… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:16:22 2007 -0500 Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. --- wwn/wn20070416_329.xml | 95 ++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ce77a471342fc49708…

1 0

Jeremy Newman : Francois Gouget <fgouget@free.fr>
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: fd6467bd3c55b2bc961bfb67f449be5d6fd9fc4c URL: http://source.winehq.org/git/website.git/?a=commit;h=fd6467bd3c55b2bc961bfb… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:17:07 2007 -0500 Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. --- wwn/wn20070430_330.xml | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/wwn/wn20070430_330.xml b/wwn/wn20070430_330.xml index 841f193..8357f37 100644 --- a/wwn/wn20070430_330.xml +++ b/wwn/wn20070430_330.xml @@ -165,7 +165,7 @@ driver. I have played around with it before, but as far as I can tell a lot of things need to be changed in the dsound and winealsa code: <ul> <li> DirectSound doesn't have proper support for secondary buffers at driver -level None of the Wine drivers needed it before, but the directsound software +level. None of the Wine drivers needed it before, but the directsound software mixer works horrible, I'll try to get that working as well as fallback, but the mixing should really be done in alsa code if possible. </li> @@ -184,7 +184,7 @@ This is needed to manipulate the mixer the same way as it's manipulated under windows and Wine, I don't think it's hard to accomplish but it's worth it for applications that play around with volume controls. </li> -<li> Remove the seperate thread used in winealsa, rework the code so it's not +<li> Remove the separate thread used in winealsa, rework the code so it's not needed any more. The current thread only causes stuttering of audio, it's better to remove it entirely by using alsa lock and unlock calls, which notify that there is some sound that can be played. Alsa then takes care of the @@ -200,14 +200,14 @@ driver any more. No explanation needed. If this is true, ALSA can become the standard driver in Wine (instead of OSS) </li></ul> Why? -The direct3d code in Wine is getting better and better each release, games +The direct3d code in Wine is getting better and better with each release, games work better and better, but for sound in those games people still use OSS or -a badly working ALSA driver, I want to game on my Linux system and not have to +a badly working ALSA driver. I want to play games on my Linux system and not have to close all other applications to get proper sound, since OSS wants to have exclusive access to sound. </quote> -This is sorely needed area of attention. There's a lot of reasons +This is an area in sore need of attention. There's a lot of reasons why it gets complicated, but the biggest is probably that sound is so sensitive to delay. If your display doesn't quite refresh for a second most people barely notice. If sound blips out for a second @@ -222,13 +222,13 @@ this week: <li>Implement GetLineControls in mixer</li> <li>Implement Get/SetControlDetails in mixer</li> </ul> -</quote>` +</quote> How substantial is all that? Well, all total it's 1,533 lines of code. From the sounds of it, we're just seeing the tip of the iceberg. In other sound news, Emmanuel Maillard dropped a 400 line patch that -implements initial MIDI support on MacOS X. +implements initial MIDI support on Mac OS X. </section> <section title="Winscard Support" @@ -245,7 +245,7 @@ We have noticed that wine doesn't have the winscard dll responsible for the support of smart cards under windows. For the need of one of our projects, we are currently developing this dll for wine under Linux based on the pcsc-lite library. Once done, we'll share it with the community. However, we would like -to known the reason behind the lack of winscard support. Is it simply because +to know the reason behind the lack of winscard support. Is it simply because no one needed it before or maybe there is an issue with the pcsc-lite license? Thanks in advance for your information. </quote> @@ -256,7 +256,7 @@ along in writing it. Some folks would have rather seen a release early/release often approach, but it didn't appear that was going to be the case. Mounir replied a few days later with a 2800 line patch: <quote who="Mounir Idrassi"> -We have managed to integrate our winscard source code into the wine source tree, including the configure.ac and Makefine.in files. +We have managed to integrate our winscard source code into the wine source tree, including the configure.ac and Makefile.in files. As described in the developer's guide, I am attaching with this email the output of the command "git format-patch origin". Can someone please check if I have done it the right way? If this is ok, should I post it also to the patches mailing list. For your information, our implementation uses pcsc-lite through wine_dlopen and wine_dlsym, so pcsc-lite is not required at compile time. @@ -300,7 +300,7 @@ must be)</li></ul></li> <li> you still use C++ comments, whereas Wine only allows C comments</li> </ul> -from the inclusion into Wine, it's already way to big to be included in +from the inclusion into Wine, it's already way too big to be included in a single operation. So, you should split up your work in smaller pieces. For example: <ul> @@ -368,7 +368,7 @@ into writing some example code for Steve to test and then we'll look into kicking that off. That's it for the monday writeup, I expect that today will give more -intersting things to write about. +interesting things to write about. Day 2 @@ -446,9 +446,9 @@ audience. While OpenChange still has a bumpy road ahead, I'm pretty sure they will manage. OpenChange is the Samba of groupware, definetely a project to watch. -The most exiting talk of the day, at least in my personal biased opinion, was +The most exciting talk of the day, at least in my personal biased opinion, was in the case study track. But my perspective on that might be a little off, as -that was the talk I was giving. I think it was recieved well by the audience. +that was the talk I was giving. I think it was received well by the audience. It probably won't be too interesting for you folks as you already know what Wine is all about. ;) @@ -470,9 +470,9 @@ from a Wine perspective will certainly follow.</quote> posts="4" > <topic>Packaging</topic> -Marco Meijer announced he had created some Mandriva RPM's: +Marco Meijer announced he had created some Mandriva RPMs: <quote who="Marco Meijer"> -Ivan Leo Puoti has not much time lately to make the rpms for mandriva. +Ivan Leo Puoti has not had much time lately to make the rpms for mandriva. So I volunteered to make them. So I made a rpm from the latest rpm. @@ -520,7 +520,7 @@ debugging reports: when wine crashes (especially wine-preloader) </quote> -Stephan provided i +Stephan provided <a href="https://bugs.launchpad.net/ubuntu/+source/wine/+bug/90957">an example</a> of the debugging info currently generated. Marcus Meissner thought that information was pretty useless. He suggested setting Wine up to automatically @@ -544,7 +544,7 @@ for generating the backtrace. (Just replace it as traced binary.) In general the most useful pieces of information are ... complete terminal output, $PWD and the command used to start an application. Also -the exact Wine version $(wine --version), and where did it came from +the exact Wine version $(wine --version), and where did it come from (self-compiled or binary). All of them are absent from the report. </quote> @@ -560,7 +560,7 @@ the exact Wine version $(wine --version), and where did it came from Berlin on May 30th - June 2nd: <quote who="Stefan Munz"> Finally we got a Wine booth at Linuxtag 2007 in Berlin. Everybody who wants to -participate is welcome. I have to order exhibitor passes, so anyone you wants +participate is welcome. I have to order exhibitor passes, so if anyone you wants to help out please contact me :-) </quote> @@ -578,7 +578,7 @@ to help out please contact me :-) this post by Jeremy White: <quote who="Jeremy White"> Well, I was hoping that out of the chatter following my last email, -we'd have consenus about the location. +we'd have consensus about the location. However, the overwhelming silence didn't really help :-/. So, to try to help get some forward momentum, I thought we should turn to a survey @@ -595,7 +595,7 @@ At this point the choice for WineConf 2007 definitely seemed narrowed down to Zurich (with a possible satellite conference in LA), Amsterdam (or Utrecht), or Bratislava Slovakia. If you have any comments, say you only would vote for Zurich if LA was -truely going to work as a remote location, then you should add them in the +truly going to work as a remote location, then you should add them in the comment field. The extremely tentative dates are probably in late September or early October. The dates are dependent on the location. </section></kc>

1 0

Jeremy Newman : Francois Gouget <fgouget@free.fr>
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: 737a03588524f39156ebc1cf59f504a2004023d3 URL: http://source.winehq.org/git/website.git/?a=commit;h=737a03588524f39156ebc1… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:17:59 2007 -0500 Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. --- wwn/wn20070514_331.xml | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/wwn/wn20070514_331.xml b/wwn/wn20070514_331.xml index dc4c525..af12a1e 100644 --- a/wwn/wn20070514_331.xml +++ b/wwn/wn20070514_331.xml @@ -170,7 +170,7 @@ more apps. 0.9.37 had reached a milestone: <quote who="Stefan Dosinger"> -With Wine 0.9.37 we've archieved something that I allow myself to call a small +With Wine 0.9.37 we've achieved something that I allow myself to call a small milestone - All Direct3D7 Immediate mode SDK demos successfully perform their intended rendering. I have some screenshots on my university junk server: <ul> @@ -179,14 +179,14 @@ http://stud4.tuwien.ac.at/~e0526822/sdkdemos1.png</a></li> <li><a href="http://stud4.tuwien.ac.at/~e0526822/sdkdemos2.png"> http://stud4.tuwien.ac.at/~e0526822/sdkdemos2.png</a></li></ul> -Two major problems are left though, namely windowed opengl rendering(see the -junk where a menu bar should be) and GetDC(there should be a little bit of +Two major problems are left though, namely windowed opengl rendering (see the +junk where a menu bar should be) and GetDC (there should be a little bit of text rendered, I disabled render target locking to get proper performance). Some demos have a few smaller problems too. The bump earth and bump waves need -vendor specific extensions(GL_NV_texture_shader2 / GL_ATI_envmap_bumpmap) and +vendor specific extensions (GL_NV_texture_shader2 / GL_ATI_envmap_bumpmap) and the bend demo needs GL_ARB_vertex_blend which nvidia does not support. So I -took that screenshot on my mac running linux(ati radeon X1600. The mipmap +took that screenshot on my mac running linux (ati radeon X1600). The mipmap demo renders the mipmaped texture garbled, although this works on nvidia cards. The Z buffer demo says w buffers aren't supported, but the normal z buffer does what the w buffer is supposed to do. @@ -202,12 +202,12 @@ regressions I can get hold of, and I am trying to make D3D thread safe finally. From the application point of view my focus will stay on fixing older apps first, which somewhat includes getting thread safety, render target locking and GetDC working properly. My hope is also to fix the other -related DX7 sdk demos, like the DDraw demos(except overlays, they are highly +related DX7 sdk demos, like the DDraw demos (except overlays, they are highly tricky with the current wined3d-x11drv integration) and getting native d3drm.dll working. I also want to say thanks to all the small and big helpers who help with -technical advise, debugging and regression testing. Special thanks goes to +technical advice, debugging and regression testing. Special thanks goes to Henri without whom I'd be totally lost and who has to be credited for a huge majority of the shader work in the last half year, and a lot of other things too. @@ -221,7 +221,7 @@ attachments, not even as jpgs.</quote> Henri Verbeet then suggested D3D8 be the next target, although a lot of it is implemented. Stefan explained a little more about future DirectX work: <quote who="Stefan Dosinger"> -Yeah, thats the other thing of course :-) But as I said even d3d7 and ddraw +Yeah, that's the other thing of course :-) But as I said even d3d7 and ddraw had a few biggies I want to fix. Of course I may grab some low hanging fruits like kicking out the fvf code from d3d8 and wined3d :-) Or get the sdk demos going, they should all work now by looking at their names. @@ -245,11 +245,11 @@ working with regard to Direct3D. A largish patch arrived this week and before we get into it, we'll step back and give a little introduction. -Some new features added to Windows in the past few years requires some -new terminolgy to learn. Some of this functionality is used by .NET, though +Some new features added to Windows in the past few years require learning +some new terminolgy. Some of this functionality is used by .NET, though it's not strictly a .NET technology. So let's say you've got an assembly, a collection of PE files like -DLL's, and you want to describe how they all interelate and what version of +DLLs, and you want to describe how they all interelate and what version of DLL you want to use. What you'd do is create a manifest composed of an XML structure that defines how the different classes are bound together, dependencies, versioning info, @@ -283,14 +283,14 @@ so far: The following series provides a first real implementation of activation contexts. It has been written by Jacek Caban and myself. Even if individual patches show only one of the two names (for ease of packaging), reality is -different. In many cases, ideas, implementation, bug fix(es), improvement have +different. In many cases, ideas, implementation, bug fix(es), improvements have been done by both of us. Basically, this first series of patches implements: <ul> <li> searching and building the hierarchy of manifests needed by an application</li> <li> parsing of such manifests</li> -<li> implementation of the Query function on this hierarchy of manifest</li> +<li> implementation of the Query function on this hierarchy of manifests</li> <li> core activation context manipulation APIs (add/release ref, stacking...)</li> </ul> This doesn't allow yet to let an application with manifest being successfully @@ -375,14 +375,14 @@ USB interfaces that Windows has. CONNECTING WINE TO USB: A HOW-TO GUIDE -There is 4 ways to do it: +There are 4 ways to do it: <ol> <li> Make a kernel module in your OS (eg. a Linux kernel module) that exports the same interface that the software expects and works the same way as the Windows driver. Using USBSCAN.SYS as an example, reading does a USB bulk read, writing does a USB bulk write, and 13 or so i/o control codes do various other things, among them USB control -and interrupt tranfers. Change kernel32's CreateFileW() to open the +and interrupt transfers. Change kernel32's CreateFileW() to open the /dev device node used by the kernel module and send it to the wine server using wine_server_fd_to_handle(), then reading and writing will go to your kernel module, where you can implement them by doing USB @@ -391,7 +391,7 @@ capture i/o control codes used by your device, call wine_server_handle_to_fd(), and do an ioctl() on that fd to send that i/o control call to the kernel module, which then reacts appropriately. This way has been tested by me, it works and it's fast, -but it's non-portable (eg. Linux-only, and Linux's USB interface keep +but it's non-portable (eg. Linux-only, and Linux's USB interface keeps changing so an out-of-tree module will only work on some versions, the usual problems...), difficult (kernel-mode code is hard to write), and generally a royal PITA. @@ -442,7 +442,7 @@ allow device drivers to be written to a standard framework. posts="1" > <topic>Packaging</topic> -Marco Meijer packaged updated Mandriva RPM's and announced them: +Marco Meijer packaged updated Mandriva RPMs and announced them: <quote who="Marco Meijer"> As I have still no way to upload the mandriva wine rpm to the official winehq download server, I put it on my own website. @@ -461,7 +461,7 @@ http://www.xs4all.nl/~meijer2/wine/</a> > <topic>Debugging</topic> Markus Amsler felt the time it took to load debug symbols was way too -slow. For example, in World of Warcraft it's 100 seconds or so. He +long. For example, in World of Warcraft it's 100 seconds or so. He came up with a patch to use Wine's Heap memory functions directly and it reduced the load time to 18 seconds. There was some back and forth discussion with Eric Pouech, the resident dbghelp.dll guru, and some @@ -479,7 +479,7 @@ with bigger files. insert_first, process_heap are out.</li> <li> big pools have more memory overhead than big heaps.</li> <li> big pools are a lot slower than big heaps.</li> </ul> -IMO the best results would give removing the pools (like in +IMO the best results would be removing the pools (like in process_heap) and freeing unused memory manually, the other way round it was allocated. But at a first glance it looks like quite a bit of work, which I'm not sure is worth the result. I think the best approach would @@ -500,7 +500,7 @@ the pool. I even implemented a simple radix tree for the bucket storage. The initial bucket size has no measurable effect, so I left it at 1 to save some bytes. -Here the stats for this series: +Here are the stats for this series: <table> <tr><td>x </td><td>Memory after startup(kB)</td><td> Memory normal

1 0

Jeremy Newman : Francois Gouget <fgouget@free.fr>
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: c8481860227d6388110b15b53495b54319c277ad URL: http://source.winehq.org/git/website.git/?a=commit;h=c8481860227d6388110b15… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:18:31 2007 -0500 Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. --- wwn/wn20070526_332.xml | 80 ++++++++++++++++++++++++------------------------ 1 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=c8481860227d638811…

1 0

Jeremy Newman : Francois Gouget <fgouget@free.fr>
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: abe695e8fd96f5c1df0d6ef0f00dc988cc4548b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=abe695e8fd96f5c1df0d6e… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:14:31 2007 -0500 Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. --- wwn/wn20070330_327.xml | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=abe695e8fd96f5c1df…

1 0