September 2007 - Wine-commits

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

11 Sep '07

Module: website Branch: master Commit: 9048f5e3472720498eb1d96503cc94b5202fd830 URL: http://source.winehq.org/git/website.git/?a=commit;h=9048f5e3472720498eb1d9… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:11:58 2007 -0500 Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. --- wwn/wn20070319_326.xml | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/wwn/wn20070319_326.xml b/wwn/wn20070319_326.xml index a10abe2..db13fe1 100644 --- a/wwn/wn20070319_326.xml +++ b/wwn/wn20070319_326.xml @@ -6,7 +6,7 @@ <author contact="http://www.theshell.com/~vinn">Brian Vincent</author> <issue num="326" date="03/19/2007" /> <intro> This is the 326th issue of the Wine Weekly News publication. -Its main goal is to buy hamburgers buns. It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </intro> +Its main goal is to buy hamburger buns. It also serves to inform you of what's going on around Wine. Wine is an open source implementation of the Windows API on top of X and Unix. Think of it as a Windows compatibility layer. Wine does not require Microsoft Windows, as it is a completely alternative implementation consisting of 100% Microsoft-free code, but it can optionally use native system DLLs if they are available. You can find more info at <a href="http://www.winehq.org">www.winehq.org</a> </intro> <stats posts="193" size="346" contrib="68" multiples="35" lastweek="41"> <person posts="12" size="12" who="hverbeet at gmail.com (H. Verbeet)" /> @@ -127,7 +127,7 @@ needs some attention. Maarten already has some familiarity with this which is even better. He wrote: <quote who="Maarten Lankhorst"> For the summer of code I'm planning to improve the dsound code and alsa -code, to make alsa finally better then OSS, in a way that has a will get +code, to make alsa finally better than OSS, in a way that will get accepted into the wine tree, for that I'm thinking of improving on the following fronts: @@ -140,7 +140,7 @@ code, to allow creation of multiple dmix devices.</li> the alsa problem that only up to a certain amount can be allocated for buffers, certain programs (for example winamp) may require more.</li> <li> Remove the queuing thread and use Lock() and Unlock() instead.</li> -<li> Make it run so well, people wouldn't want to use OSS any more.</li> +<li> Make it run so well, people wouldn't want to use OSS anymore.</li> </ul> Both dsound/winealsa:<ul> @@ -210,22 +210,22 @@ more work. Stefan Dösinger disagreed a bit and thought there might be a place for some options: <quote who="Stefan Dosinger"> -GLSL is OK IMO, because some drivers(*cough* macos *cough*) have serious +GLSL is OK IMO, because some drivers (*cough* macos *cough*) have serious problems with glsl. It could be included into the shader dropdown box. The issue that needs to be dealt with is that we can't combine arb vertex shaders and glsl pixel shaders or vice versa. Video memory size maybe too. There are vendor dependent ways to read it, but implementing them is pretty nasty (requires some private to winex11.drv). -Altough we had that discussion a number of times already and we only agreed +Although we had that discussion a number of times already and we only agreed on a registry key so far. Offscreen rendering should have fbos fixed and made default, otherwise use -backbuffer(not pbuffer because backbuffer with aux buffers is cheaper). I +backbuffer (not pbuffer because backbuffer with aux buffers is cheaper). I don't think it is a good idea to add it to winecfg -I don't think render target locking should be configureable as is. That -rendering should be fixed to catch NOP locks some games do(which does the +I don't think render target locking should be configurable as is. That +rendering should be fixed to catch NOP locks some games do (which does the same as glFinish() on windows). What I have considered is some performance vs correctness slider. With @@ -234,9 +234,9 @@ are disabled. If the correctness is decreased even more some properly implemented, but known to be expensive settings could be deactivated, like smooth shading, per pixel fog (ok. not sure if that is expensive). Windows drivers have such a setting, so why shouldn't we :-) . This slider could also -cover some software emulated features like vertex blending(if we ever get +cover some software emulated features like vertex blending (if we ever get that). -Of course we shouldn't pollute the wined3d code with if(someSetting) +Of course we shouldn't pollute the wined3d code with if (someSetting) statements either. </quote> @@ -275,23 +275,23 @@ tests were run separately on Linux or to just verify that running the tests separately on Windows didn't produce a different result. </section> <section - title="Status of MacOS X Port" + title="Status of Mac OS X Port" subject="Status of Wine & Mac OS X" archive="http://www.winehq.com/pipermail/wine-devel/2007-March/055019.html" posts="4" > <topic>Ports</topic> -Rafa Campos wanted to know how the port of Wine to MacOS X was +Rafa Campos wanted to know how the port of Wine to Mac OS X was progressing: <quote who="Rafa Campos"> -I was looking thorugh the mailing list archives about the status of wine +I was looking through the mailing list archives about the status of wine working in Intel-Macs. I'd like to start helping the wine project making some effort in Macintel computer, and i like to reach some 3D approach that works in Mac. </quote> - Well, it just so happens that MacOS X is now a first + Well, it just so happens that Mac OS X is now a first class citizen when it comes to running Wine. Alexandre replied first, <quote who="Alexandre Julliard"> It should work pretty much the same as on Linux. You do need an X11 @@ -309,8 +309,8 @@ but there are maybe others. What needs work for getting 3D stuff working better is the quartz backend. I haven't done any comparison benchmarks yet, but I think we're loosing a bit -of performance due to the X server(But not as much as many mac users think), -and there are some window setup issues because of the X server and quartz-wm +of performance due to the X server (But not as much as many mac users think), +and there are some window setup issues because of the X server and quartz-wm. </quote>

1 0

Alexandre Julliard : Replaced .cvsignore by .gitignore.
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: 602b5a0814387dd3fbbf3a11af5837e3db5f05ea URL: http://source.winehq.org/git/website.git/?a=commit;h=602b5a0814387dd3fbbf3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 11 15:16:20 2007 +0200 Replaced .cvsignore by .gitignore. --- .cvsignore | 7 ------- .gitignore | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 8782f53..0000000 --- a/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -data -Docs -docs -hypermail -webalizer -wineconf - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6136d3a --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/data +/docs +/hypermail +/webalizer +/wineconf +templates/en/docs +templates/en/winapi_stats.template

1 0

Jeremy Newman : Revert "WWN 326 spelling fixes"
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: 0a365cdaf71cac9bca312c69e912a69e9c708183 URL: http://source.winehq.org/git/website.git/?a=commit;h=0a365cdaf71cac9bca312c… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:07:01 2007 -0500 Revert "WWN 326 spelling fixes" This reverts commit f0bb8d40bf284b38285ad556bb8ff90bcc3e7691. --- .dotest/0001 | 205 -------------------------------------------------- .dotest/binary | 1 - .dotest/final-commit | 12 --- .dotest/info | 5 - .dotest/keep | 1 - .dotest/last | 1 - .dotest/msg | 10 --- .dotest/msg-clean | 10 --- .dotest/next | 1 - .dotest/patch | 117 ---------------------------- .dotest/sign | 1 - .dotest/utf8 | 1 - .dotest/whitespace | 1 - 13 files changed, 0 insertions(+), 366 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0a365cdaf71cac9bca…

1 0

Jeremy Newman : Revert "Replaced .cvsignore by .gitignore."
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: 00ba502ccac4afd53d5a9874829ce3f5fefde0d7 URL: http://source.winehq.org/git/website.git/?a=commit;h=00ba502ccac4afd53d5a98… Author: Jeremy Newman <jnewman(a)jnewman.(none)> Date: Tue Sep 11 10:04:30 2007 -0500 Revert "Replaced .cvsignore by .gitignore." This reverts commit f9a109e4bb844f854bc4e2dfc4cb8b53419f5194. --- .cvsignore | 7 +++++++ .gitignore | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..8782f53 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,7 @@ +data +Docs +docs +hypermail +webalizer +wineconf + diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6136d3a..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/data -/docs -/hypermail -/webalizer -/wineconf -templates/en/docs -templates/en/winapi_stats.template

1 0

Francois Gouget : WWN 326 spelling fixes
by Jeremy Newman 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: f0bb8d40bf284b38285ad556bb8ff90bcc3e7691 URL: http://source.winehq.org/git/website.git/?a=commit;h=f0bb8d40bf284b38285ad5… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Sep 11 16:26:24 2007 +0200 WWN 326 spelling fixes Changelog: * wwn/wn20070319_326.xml Francois Gouget <fgouget(a)free.fr> Assorted spelling fixes. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Hiroshima '45 - Czernobyl '86 - Windows '95 --- .dotest/0001 | 205 ++++++++++++++++++++++++++++++++++++++++++++++++++ .dotest/binary | 1 + .dotest/final-commit | 12 +++ .dotest/info | 5 + .dotest/keep | 1 + .dotest/last | 1 + .dotest/msg | 10 +++ .dotest/msg-clean | 10 +++ .dotest/next | 1 + .dotest/patch | 117 ++++++++++++++++++++++++++++ .dotest/sign | 1 + .dotest/utf8 | 1 + .dotest/whitespace | 1 + 13 files changed, 366 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=f0bb8d40bf284b3828…

1 0

Alexandre Julliard : Replaced .cvsignore by .gitignore.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: website Branch: master Commit: f9a109e4bb844f854bc4e2dfc4cb8b53419f5194 URL: http://source.winehq.org/git/website.git/?a=commit;h=f9a109e4bb844f854bc4e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 11 15:16:20 2007 +0200 Replaced .cvsignore by .gitignore. --- .cvsignore | 7 ------- .gitignore | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 8782f53..0000000 --- a/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -data -Docs -docs -hypermail -webalizer -wineconf - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6136d3a --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +/data +/docs +/hypermail +/webalizer +/wineconf +templates/en/docs +templates/en/winapi_stats.template

1 0

Stefan Dösinger : wined3d: Fix WINED3DFMT_X8L8V8U8.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: 41bf0d48db6e375f912599662ac518f94dcf246e URL: http://source.winehq.org/git/wine.git/?a=commit;h=41bf0d48db6e375f912599662… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sat Sep 1 20:00:10 2007 +0200 wined3d: Fix WINED3DFMT_X8L8V8U8. --- dlls/d3d9/tests/visual.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 74 +++++++++++++++++++++++++-------- dlls/wined3d/utils.c | 2 +- 3 files changed, 161 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41bf0d48db6e375f91259…

1 0

Rob Shearman : ole32: Add cross-process running-object table support.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: cfc50f89d7445b7eaa37e73f1c5b2553f2fc61d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc50f89d7445b7eaa37e73f1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Sep 10 16:10:45 2007 +0100 ole32: Add cross-process running-object table support. --- .gitignore | 4 + dlls/ole32/Makefile.in | 3 + dlls/ole32/irot.idl | 19 ++ dlls/ole32/moniker.c | 383 ++++++++++++++++++++++++++++++++++--------- include/wine/irot.idl | 93 +++++++++++ programs/rpcss/Makefile.in | 6 +- programs/rpcss/irot.idl | 19 ++ programs/rpcss/irotp.c | 365 +++++++++++++++++++++++++++++++++++++++++ programs/rpcss/rpcss_main.c | 19 ++- tools/make_makefiles | 1 + 10 files changed, 833 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfc50f89d7445b7eaa37e…

1 0

Maarten Lankhorst : dsound: Support arbitrarily sized buffers for waveout.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: d65ae3ffe9533fbadd7a4ea92240840f6b7e045f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65ae3ffe9533fbadd7a4ea92… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Sep 6 17:35:58 2007 +0200 dsound: Support arbitrarily sized buffers for waveout. --- dlls/dsound/mixer.c | 28 +++++++++++++++++----------- dlls/dsound/primary.c | 14 +++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index fcbf678..2486e72 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -802,18 +802,24 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) TRACE("wave_fragpos = %i, wave_writepos = %i, pwqueue = %i, prebuf = %i\n", wave_fragpos, wave_writepos, device->pwqueue, device->prebuf); - if(force == FALSE){ + if (!force) + { /* check remaining prebuffered frags */ - prebuf_frags = DSOUND_BufPtrDiff(device->buflen, device->mixpos, wave_writepos); - prebuf_frags = prebuf_frags / device->fraglen; + prebuf_frags = device->mixpos / device->fraglen; + if (prebuf_frags == device->helfrags) + --prebuf_frags; + TRACE("wave_fragpos = %d, mixpos_frags = %d\n", wave_fragpos, prebuf_frags); + if (prebuf_frags < wave_fragpos) + prebuf_frags += device->helfrags; + prebuf_frags -= wave_fragpos; + TRACE("wanted prebuf_frags = %d\n", prebuf_frags); } - else{ + else /* buffer the maximum amount of frags */ prebuf_frags = device->prebuf; - } /* limit to the queue we have left */ - if((prebuf_frags + device->pwqueue) > device->prebuf) + if ((prebuf_frags + device->pwqueue) > device->prebuf) prebuf_frags = device->prebuf - device->pwqueue; TRACE("prebuf_frags = %i\n", prebuf_frags); @@ -846,7 +852,6 @@ static void DSOUND_WaveQueue(DirectSoundDevice *device, BOOL force) */ static void DSOUND_PerformMix(DirectSoundDevice *device) { - TRACE("(%p)\n", device); /* **** */ @@ -907,6 +912,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) /* calc maximum prebuff */ prebuff_max = (device->prebuf * device->fraglen); + if (!device->hwbuf && playpos + prebuff_max >= device->helfrags * device->fraglen) + prebuff_max += device->buflen - device->helfrags * device->fraglen; /* check how close we are to an underrun. It occurs when the writepos overtakes the mixpos */ prebuff_left = DSOUND_BufPtrDiff(device->buflen, device->mixpos, playpos); @@ -964,9 +971,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) if (prebuff_left >= device->fraglen){ /* update the wave queue if using wave system */ - if(device->hwbuf == NULL){ - DSOUND_WaveQueue(device,TRUE); - } + if (!device->hwbuf) + DSOUND_WaveQueue(device, FALSE); /* buffers are full. start playing if applicable */ if(device->state == STATE_STARTING){ @@ -1005,7 +1011,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) } else { /* update the wave queue if using wave system */ - if(device->hwbuf == NULL) + if (!device->hwbuf) DSOUND_WaveQueue(device, TRUE); else /* Keep alsa happy, which needs GetPosition called once every 10 ms */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ce2f943..a27ee14 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -381,23 +381,19 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP return err; } } else { + TRACE("pwplay=%i, pwqueue=%i\n", device->pwplay, device->pwqueue); /* check if playpos was requested */ - if (playpos) { + if (playpos) /* use the cached play position */ *playpos = device->pwplay * device->fraglen; - } /* check if writepos was requested */ - if (writepos) { - TRACE("pwplay=%i, pwqueue=%i\n", device->pwplay, device->pwqueue); - + if (writepos) /* the writepos is the first non-queued position */ - *writepos = (device->pwplay + device->pwqueue) * device->fraglen; - *writepos %= device->buflen; - } + *writepos = ((device->pwplay + device->pwqueue) % device->helfrags) * device->fraglen; } - TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:0, writepos?*writepos:0, device, GetTickCount()); + TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, device, GetTickCount()); return DS_OK; }

1 0

Stefan Dösinger : wined3d: Fix the z range.
by Alexandre Julliard 11 Sep '07

11 Sep '07

Module: wine Branch: master Commit: a305af0b30b0e1440575dfd286727861f13975e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a305af0b30b0e1440575dfd28… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Aug 31 20:32:52 2007 +0200 wined3d: Fix the z range. --- dlls/d3d9/tests/visual.c | 188 +++++++++++++++++++++++++++++++++++++++---- dlls/wined3d/state.c | 33 +++++++- dlls/wined3d/vertexshader.c | 12 +++ 3 files changed, 213 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a305af0b30b0e1440575d…

1 0