re: WINE and demoscene products

2010-06-11 Thread Dan Kegel
Yeah, that's pretty cool.  I ran Lifeforce as a demo at several talks
last year, it was very convincing.  (Although, frankly, running
retail DVD-ROM games on day of beta or release is an even more
convincing feat if we can pull it off.)

As somebody else pointed out, there are already appdb entries for
quite a few demos:
http://appdb.winehq.org/objectManager.php?sClass=category&iId=95
It'd be nice if someone filled in any missing ones there.

(I'm not sure how much overlap there is between demos and
real games, but the idea of a really small graphical app is
appealing, one would expect they'd be easier to diagnose?)
- Dan




snoop,relay,trace

2010-06-11 Thread Hin-Tak Leung
I am thinking of going barbaric and doing WINEDEBUG=+relay,+snoop,+trace to see 
how mt.exe get the wrong image size in 

http://bugs.winehq.org/show_bug.cgi?id=22812

and just grep for the wrong/right sizes (0x "2b000", "176128", 0x "2b200", 
"176640" )  to see where mt gets it from but none turn up. Since it is a 
relatively simple command line I thought that would work. or is there any other 
WINEDEBUG= is worth trying?

Also I am thinking since the image size is normally padded to 0x1000, (and it 
says so), so a PE with an image size that looks like N200 is automatically 
wrong, is that correct?


  




WINE and demoscene products

2010-06-11 Thread Wolfram Sang
Hi,

demos [1] from the demoscene are pretty demanding and freely available
stresstests, especially for everything 3D-related. The size-optimized
productions (4KB, 64KB) might also exploit some lesser known side effects
of bringing up a program. A review of running the most popular demos with
wine 1.2-rc2 was recently posted here [2]. Out of 25, 14 are flawless and
4 OK - pretty good numbers IMO. (BTW the demos can be downloaded using the
search function of the website.)

Regards,

   Wolfram

[1] http://en.wikipedia.org/wiki/Demo_%28computer_programming%29
[2] http://pouet.net/topic.php?which=7400




Re: Three year sever outstanding bug requiring minor fix

2010-06-11 Thread Aneurin Price
Is it a legal requirement that everyone working on WINE must be a
complete arsehole, or just a project requirement?

Nye




Re: Test suite success rate

2010-06-11 Thread André Hentschel
Am 11.06.2010 20:43, schrieb Peter Davies:
> How do I get the test suite to report it success rate (as a whole) in
> a "%d tests executed (%d marked as todo, %d %s), %d skipped.\n" style.
> 
> Peter
> 
> 

"%d tests executed" will be a huge number!

-- 

Best Regards, André Hentschel




Re: Test suite success rate

2010-06-11 Thread Paul Vriens

On 06/11/2010 08:43 PM, Peter Davies wrote:

How do I get the test suite to report it success rate (as a whole) in
a "%d tests executed (%d marked as todo, %d %s), %d skipped.\n" style.

Peter




I guess the only way is to parse the report file yourself. The current 
'parser' only calculates per module-test (as can been seen on 
test.winehq.org).


--
Cheers,

Paul.




Test suite success rate

2010-06-11 Thread Peter Davies
How do I get the test suite to report it success rate (as a whole) in
a "%d tests executed (%d marked as todo, %d %s), %d skipped.\n" style.

Peter




Re: gdi32: Add CreateFontIndirectEx implementation (try2)

2010-06-11 Thread Alexandre Julliard
Nikolay Sivov  writes:

> try2: function body moved to *Ex call, and CreateFontIndirect use it.

You should also print FIXMEs if the ignored data is used by the app.

-- 
Alexandre Julliard
julli...@winehq.org




Re: No test summary line found

2010-06-11 Thread Paul Vriens

On 06/11/2010 02:19 PM, GOUJON Alexandre wrote:

Le 11/06/2010 13:54, Paul Vriens a écrit :

I don't know if you have an account on the testbot so I tested it for
you:

"I submitted [to wineTestBot] my patch before sending it to wine-patches"
But many thanks for your help !!!

In that case, we have to use broken(), haven't we ?


broken() can only be used to cater for a wrong return value (or 
parameter in general). It won't protect against a crash as the test will 
be run regardless.


You need to find a way to detect NT4 (but not by checking the version) 
and skip those tests that crash.


--
Cheers,

Paul.




Two enhancement requests for winetricks

2010-06-11 Thread Joerg-Cyril.Hoehle
Hi,

Jan Hoogenraad wrote:
>Each debugging request for wine states that I should remove all winetricks.
AppDB should request something similar: minimal use of winetricks.
>However I have no way to tell, and no way to safely remove them.

IMHO one solution to your problem is to learn to use different .wine prefixes.

Both developers and AppDB users want a repeatable process to make the
app run (or crash).  If you install all your software into a single
.wine hierarchy (like you'd do on MS-Windows), then you cannot tell
anyone what you did to make the app work in Wine.  All you have is "I
started with Wine-0.9.48, upgraded to wine-1.1.6 at some time, now to
wine-1.2rc2, used "winetricks X" and Y, perhaps I used "winetricks
directx" but I can't remember for sure, I installed apps A, B and C
(they may have installed more components) and I edited the registry a
few times.  Given all that, app Z works fine in on my machine."

This is a mess much like a typical MS-Windows installation.
With Wine, you can do better than that.

What people want to hear from you is as follows:
 - Create a fresh .wine prefix with wine-X.Y;
 - Install Indeo Video codecs via "winetricks indeo" because I found out
   that the app expects them but does not install them itself;
 - Install the app from CD;
 - From a DirectX install into a separate .wine-* prefix,
   solely copy d3dx9_36.dll into system32/ (or the app's directory)
 - Change setting Y in winecfg, e.g. native d3dx9_36;
 - App Z works (or crashes like that ...).
That is a minimal instruction set.

I have like a dozen .wine-* directory hierarchies. I never use .wine
itself except for regression testing, such that I can rm -rf ~/.wine
and create a fresh one at any time.

That's why I don't need an uninstaller. rm -rf ~/.wine-xyz or
rm -rf ~/wineapps/... *is* the uninstaller (.wine-xyz/drive_c/Programs/Apps/
symlinks to $HOME/wineapps such that the apps live independently on a 
particular .wine prefix).

Regards,
Jörg Höhle




Re: Three year sever outstanding bug requiring minor fix

2010-06-11 Thread Stephen Eilert
On Wed, Jun 9, 2010 at 12:52 PM, velociraptor Genjix
 wrote:
> Hey,
> Please look into this issue,
> http://bugs.winehq.org/show_bug.cgi?id=15118
> It seems like a fairly trivial fix which renders this application useless. A
> detailed description of the implementation needed is provided in that
> ticket.
> Thank you

Seriously.

I fail to see how you can find the fix "easy". I've read the problem
description and it doesn't appear to be easy at all.

How is Wine supposed to support transparent windows? With Compiz? With
the Composite extension? How to check for them? What if they are not
available?

Yes, one could just set the appropriate xatom flags and be done with
it, but if a compositing window manager is not present it won't do
anything.

Also, I am not sure about the click through flag, that would require
some spelunking to find out how wine supports it, if at all.

All in all, it doesn't appear to be trivial. It doesn't even have a
proposed patch!

Repeating assertions in the bug report and the mailing list is a good
way to annoy people.

One thing that you should understand is that "widely wanted features"
mean exactly nothing. Being "widely wanted" won't make the feature
easier to implement, test or integrate.

You could offer a business proposition to CodeWeavers or Transgaming,
for them to implement a feature, offer a bounty, code it yourself or
even pay someone you know to do it for you. You could even work with
other people in UK who like playing poker to pool the resources for
such task.

That would be more productive.


-- Stephen

Sent from my Emacs




Re: No test summary line found

2010-06-11 Thread GOUJON Alexandre

Le 11/06/2010 13:54, Paul Vriens a écrit :
I don't know if you have an account on the testbot so I tested it for 
you: 

"I submitted [to wineTestBot] my patch before sending it to wine-patches"
But many thanks for your help !!!

In that case, we have to use broken(), haven't we ?




Re: No test summary line found

2010-06-11 Thread Paul Vriens

On 06/11/2010 01:20 PM, Paul Vriens wrote:

On 06/11/2010 01:13 PM, GOUJON Alexandre wrote:

Le 11/06/2010 11:58, Paul Vriens a écrit :

Those are the results from the testbot:

I know, I received the log by mail and I submitted my patch before
sending it to wine-patches but I didn't understand it as an error.


This means this new test is crashing on (that) NT4.


WNT4WSSP6.log
advapi32:security start - -
security.c:1427: Tests skipped: CreateWellKnownSid not available
security.c:1084: AccessCheck with MAXIMUM_ALLOWED got Access 0x00060019
security.c:1140: Tests skipped: AddAccessAllowedAceEx is not available
security.c:1223: Tests skipped: ConvertSidToStringSidA is not available
security.c:1997: Tests skipped: NULL account name doesn't work on NT4
security.c:2073: Tests skipped: CreateWellKnownSid not available
advapi32:security done (3221225477)

No test summary line found


3221225477 = 0xC005 = STATUS_ACCESS_VIOLATION but where does it come
from ?
There is neither backtrace nor timeout log/explanation.


Submit your patch to the testbot and run them on NT4 only. Make sure you
leave the WINETEST_DEBUG flag and set the WINETEST_REPORT_SUCCESS one.
That should show you the last successful ok-test.



Whatever its origin, the next test after test_LookupAccountName() is
test_security_descriptor() whereas my patch just modified
test_GetNamedSecurityInfoA().

And a last question : Does win_skip do return ?


win_skip is just to show (on test.winehq.org) that one or more tests are
skipped. The difference between skip and win_skip is that skip can be
used on all platforms, win_skip only on Windows (it will show a failure
on Wine).


Some tests add a return after it, and others no.


That depends on the kinds of tests. If you want to test a function and
the OS doesn't implement it than it makes no sense to continue so you
return. If you only need to skip a particular test you do continue.



I don't know if you have an account on the testbot so I tested it for you:

https://testbot.winehq.org/JobDetails.pl?Key=2586&log_201=1&scrshot_201=1#k201

What you can see is the last successful test was on line 2671. This 
means that most likely the first of your added tests already crashes on NT4:


2671 ok(group != NULL, "group should not be NULL\n");
2672
2673 LocalFree(pSecDesc);
2674
2675
2676 /* NULL descriptor tests */
2677
2678 error = pGetNamedSecurityInfoA(windows_dir, 
SE_FILE_OBJECT,DACL_SECURIT

2679 NULL, NULL, NULL, NULL, NULL);
2680 ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed 
with er

2681

--
Cheers,

Paul.




Re: [PATCH 2/5] include: Add IEnumShellItems interface declaration.

2010-06-11 Thread Huw Davies

On 11 Jun 2010, at 12:17, David Hedberg  wrote:


---
dlls/actxprxy/usrmarshal.c |   21 +
include/shobjidl.idl   |   30 ++
2 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c
index f2aacf8..85e534c 100644
--- a/dlls/actxprxy/usrmarshal.c
+++ b/dlls/actxprxy/usrmarshal.c
+
+HRESULT CALLBACK IEnumShellItems_Next_Proxy(
+IEnumShellItems *This,
+ULONG celt,
+IShellItem **rgelt,
+ULONG *pceltFetched)
+{
+TRACE("(%p)\n", This);
+return IEnumShellItems_RemoteNext_Proxy( This, celt, rgelt,  
pceltFetched );

+}


pceltFetched could be a NULL ptr here, so you should pass the address  
of a local variable in that case. See ole32/usrmarshal.c for examples  
on how to marshal IEnum*_Next


Huw.





Re: No test summary line found

2010-06-11 Thread Paul Vriens

On 06/11/2010 01:13 PM, GOUJON Alexandre wrote:

Le 11/06/2010 11:58, Paul Vriens a écrit :

Those are the results from the testbot:

I know, I received the log by mail and I submitted my patch before
sending it to wine-patches but I didn't understand it as an error.


This means this new test is crashing on (that) NT4.


WNT4WSSP6.log
advapi32:security start - -
security.c:1427: Tests skipped: CreateWellKnownSid not available
security.c:1084: AccessCheck with MAXIMUM_ALLOWED got Access 0x00060019
security.c:1140: Tests skipped: AddAccessAllowedAceEx is not available
security.c:1223: Tests skipped: ConvertSidToStringSidA is not available
security.c:1997: Tests skipped: NULL account name doesn't work on NT4
security.c:2073: Tests skipped: CreateWellKnownSid not available
advapi32:security done (3221225477)

No test summary line found


3221225477 = 0xC005 = STATUS_ACCESS_VIOLATION but where does it come
from ?
There is neither backtrace nor timeout log/explanation.


Submit your patch to the testbot and run them on NT4 only. Make sure you 
leave the WINETEST_DEBUG flag and set the WINETEST_REPORT_SUCCESS one. 
That should show you the last successful ok-test.




Whatever its origin, the next test after test_LookupAccountName() is
test_security_descriptor() whereas my patch just modified
test_GetNamedSecurityInfoA().

And a last question : Does win_skip do return ?


win_skip is just to show (on test.winehq.org) that one or more tests are 
skipped. The difference between skip and win_skip is that skip can be 
used on all platforms, win_skip only on Windows (it will show a failure 
on Wine).



Some tests add a return after it, and others no.


That depends on the kinds of tests. If you want to test a function and 
the OS doesn't implement it than it makes no sense to continue so you 
return. If you only need to skip a particular test you do continue.


--
Cheers,

Paul.




Re: No test summary line found

2010-06-11 Thread GOUJON Alexandre

Le 11/06/2010 11:58, Paul Vriens a écrit :

Those are the results from the testbot:
I know, I received the log by mail and I submitted my patch before 
sending it to wine-patches but I didn't understand it as an error.



This means this new test is crashing on (that) NT4.


WNT4WSSP6.log
advapi32:security start - -
security.c:1427: Tests skipped: CreateWellKnownSid not available
security.c:1084: AccessCheck with MAXIMUM_ALLOWED got Access 0x00060019
security.c:1140: Tests skipped: AddAccessAllowedAceEx is not available
security.c:1223: Tests skipped: ConvertSidToStringSidA is not available
security.c:1997: Tests skipped: NULL account name doesn't work on NT4
security.c:2073: Tests skipped: CreateWellKnownSid not available
advapi32:security done (3221225477)

No test summary line found


3221225477 = 0xC005 = STATUS_ACCESS_VIOLATION but where does it come from ?
There is neither backtrace nor timeout log/explanation.

Whatever its origin, the next test after test_LookupAccountName() is 
test_security_descriptor() whereas my patch just modified 
test_GetNamedSecurityInfoA().

And a last question : Does win_skip do return ?
Some tests add a return after it, and others no.

Thanks





Re: Updating Ukrainian translations to kernel32

2010-06-11 Thread Nikolay Sivov

On 6/11/2010 09:30, Dmitry Timoshkov wrote:

Igor Paliychuk  wrote:

   

Updating Ukrainian translations to kernel32(ukr.nls).
file : ukrainian-kernel32-ukr-nls.patch
 

You forgot to mention what's wrong with current ukr.nls.
   
I asked Igor to update genitive months names, so it was basically 
incomplete. Also there's some typo fixes in a patch.






Re: No test summary line found

2010-06-11 Thread Paul Vriens

On 06/11/2010 11:42 AM, GOUJON Alexandre wrote:

Hi,

I'm wondering if my patch (62325) hasn't been reviewed yet or if you
expect a strict error-free patch.
Indeed, http://source.winehq.org/patches/data/62325.testfail shows a "No
test summary line found" for WNT4WSSP6.
If it's an issue, how to fix it ?

Thanks



Hi,

Those are the results from the testbot:

http://testbot.winehq.org/JobDetails.pl?Key=2467&scrshot_202=1#k202

This means this new test is crashing on (that) NT4.

--
Cheers,

Paul.




Re: gdi32: CreateFontIndirectEx implementation on top of CreateFontIndirect

2010-06-11 Thread Alexandre Julliard
Nikolay Sivov  writes:

> From fb4317a2a39475c225fe04946795892c4891cd26 Mon Sep 17 00:00:00 2001
> From: Nikolay Sivov 
> Date: Fri, 11 Jun 2010 01:42:06 +0400
> Subject: [PATCH] CreateFontIndirectEx implementation on top of 
> CreateFontIndirect

It should of course be the other way around.

-- 
Alexandre Julliard
julli...@winehq.org




No test summary line found

2010-06-11 Thread GOUJON Alexandre

Hi,

I'm wondering if my patch (62325) hasn't been reviewed yet or if you 
expect a strict error-free patch.
Indeed, http://source.winehq.org/patches/data/62325.testfail shows a "No 
test summary line found" for WNT4WSSP6.

If it's an issue, how to fix it ?

Thanks




Re: configure.ac: when checking for ALSA, look for snd_pcm_recover() instead of snd_pcm_hw_params_get_access()

2010-06-11 Thread Andrew Nguyen
On Fri, Jun 11, 2010 at 3:34 AM, Maarten Lankhorst
 wrote:
> Hello Andrew,
>
> On 11-06-10 10:18, Andrew Nguyen wrote:
>>
>> On Sun, Jun 6, 2010 at 4:03 PM, Maarten Lankhorst
>>   wrote:
>>
>>>
>>> Is snd_pcm_recover the only function missing? If so change it to dlsym,
>>> and
>>> add a copy of snd_pcm_recover to wine if it cannot find the libalsa one..
>>>
>>
>> Is it a problem to eschew the use of dlsym? It feels like modifying
>> winealsa.drv to dynamically load libasound correctly would be much
>> more burdensome than simply replicating the snd_pcm_recover
>> implementation. I have a provisional patch that replaces a half-baked
>> snd_pcm_recover-like internal helper with the actual snd_pcm_recover
>> implementation from libasound. I would welcome any feedback on it.
>>
>
> Nah, I dislike the overuse of dlsym in wine too.
>
> Can you name the function wine_snd_pcm_recover, and fix the SNDERR()
> macro's? Otherwise looks good to me.
>
> ~Maarten
>

Done. I've sent a final patch.




Re: IDL trouble (patch: adding IEnumShellItems interface declaration.)

2010-06-11 Thread Huw Davies

On 11 Jun 2010, at 02:42, David Hedberg  wrote:


Hello everyone,

I'm having some trouble with this simple patch. Specifically, it  
breaks compiling of dlls/actxprxy, producing the message:


*

/home/david/Projects/wine/git/dlls/actxprxy/actxprxy_shobjidl_p.c: 
6507: undefined reference to `IEnumShellItems_Next_Stub'
actxprxy_shobjidl_p.o:(.data.rel.ro+0xf0): undefined reference to  
`IEnumShellItems_Next_Proxy'

*

It compiles if I remove the [call_as] attribute, but I guess that  
would kind of break the interface. Any obvious mistakes in the  
patch, or grammar not supported by widl?


You need to add an implementation of IEnumShellItems_Next_Proxy/Stub  
to usrmarshal.c


Huw.




RE: Three year sever outstanding bug requiring minor fix

2010-06-11 Thread velociraptor Genjix

Hey,
Sorry I didn't mean any offence caused. It's just I saw that the new wine 
release is going to fix bugs and tried to bring it to your attention.
I saw the guy Will Tipton in that bug ticket provided a detailed analysis of 
the problem so it looked easy since you already would know the problem (or at 
least a lot less difficult).
Not only that but it has 9 votes and is a widely wanted asked for feature if 
you check google,
http://www.google.co.uk/search?sourceid=chrome&ie=UTF-8&q=pokertracker+wine
I didn't mean to be making people upset, it was more a helpful suggestion. 
Maybe caused by english language being not my first.
> Date: Wed, 9 Jun 2010 11:00:16 -0700
> From: jjmckenzi...@earthlink.net
> To: wine-devel@winehq.org
> Subject: Re: Three year sever outstanding bug requiring minor fix
> 
> velociraptor Genjix  wrote at Jun 9, 2010 8:52 AM
> >
> >Hey,
> >Please look into this issue,
> >http://bugs.winehq.org/show_bug.cgi?id=15118
> >It seems like a fairly trivial fix which renders this application useless. A 
> >detailed
> >description of the implementation needed is provided in that ticket.
> 
> If it were a 'trival' fix, it would have been a long time ago.  Something 
> that looks, on the surface, to be simple, maybe very complex.  For instance, 
> I have been working on a fix for one function in the richedit area has taken 
> over four years.  
> 
> Now as to your concern, tough.  This project, for the most part is volunteer. 
>  So, if you want it fixed, do it yourself or find someone who can.  
> Otherwise, you'll have to wait for someone to come by, find this interesting 
> and then fix it.  There is a part of the project that is paid, and they work 
> for a company called CodeWeavers.  Maybe they have found a fix and 
> incorporated it into their product line.  That you'll have to pay for.
> 
> Remember, we fix things as WE find the time and the incorporation process is 
> very strict.  This takes time and some folks will pick up a project, only to 
> set it down because they become busy with other things in life or they just 
> don't have the tenancity to see it through.
> 
> James McKenzie
> 
> 
> 
  
_
http://clk.atdmt.com/UKM/go/19780/direct/01/
We want to hear all your funny, exciting and crazy Hotmail stories. Tell us now


Re: configure.ac: when checking for ALSA, look for snd_pcm_recover() instead of snd_pcm_hw_params_get_access()

2010-06-11 Thread Maarten Lankhorst

Hello Andrew,

On 11-06-10 10:18, Andrew Nguyen wrote:

On Sun, Jun 6, 2010 at 4:03 PM, Maarten Lankhorst
  wrote:
   

Is snd_pcm_recover the only function missing? If so change it to dlsym, and
add a copy of snd_pcm_recover to wine if it cannot find the libalsa one..
 

Is it a problem to eschew the use of dlsym? It feels like modifying
winealsa.drv to dynamically load libasound correctly would be much
more burdensome than simply replicating the snd_pcm_recover
implementation. I have a provisional patch that replaces a half-baked
snd_pcm_recover-like internal helper with the actual snd_pcm_recover
implementation from libasound. I would welcome any feedback on it.
   

Nah, I dislike the overuse of dlsym in wine too.

Can you name the function wine_snd_pcm_recover, and fix the SNDERR() 
macro's? Otherwise looks good to me.


~Maarten




Re: configure.ac: when checking for ALSA, look for snd_pcm_recover() instead of snd_pcm_hw_params_get_access()

2010-06-11 Thread Andrew Nguyen
On Sun, Jun 6, 2010 at 4:03 PM, Maarten Lankhorst
 wrote:
> Is snd_pcm_recover the only function missing? If so change it to dlsym, and
> add a copy of snd_pcm_recover to wine if it cannot find the libalsa one..

Is it a problem to eschew the use of dlsym? It feels like modifying
winealsa.drv to dynamically load libasound correctly would be much
more burdensome than simply replicating the snd_pcm_recover
implementation. I have a provisional patch that replaces a half-baked
snd_pcm_recover-like internal helper with the actual snd_pcm_recover
implementation from libasound. I would welcome any feedback on it.
diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c
index 9eb50cd..af9547c 100644
--- a/dlls/winealsa.drv/alsa.c
+++ b/dlls/winealsa.drv/alsa.c
@@ -2,6 +2,7 @@
  * Wine Driver for ALSA
  *
  * Copyright   2002 Eric Pouech
+ * Copyright   2006 Jaroslav Kysela
  * Copyright   2007 Maarten Lankhorst
  *
  * This file has a few shared generic subroutines shared among the alsa
@@ -558,22 +559,40 @@ out:
 /**
  * ALSA_XRUNRecovery   [internal]
  *
- * used to recovery from XRUN errors (buffer underflow/overflow)
+ * Code copied from alsa-lib v1.0.23 snd_pcm_recover implementation.
+ * used to recover from XRUN errors (buffer underflow/overflow)
  */
-int ALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err)
+int ALSA_XRUNRecovery(snd_pcm_t *pcm, int err, int silent)
 {
-if (err == -EPIPE) {/* under-run */
-err = snd_pcm_prepare(wwo->pcm);
-if (err < 0)
- ERR( "underrun recovery failed. prepare failed: %s\n", 
snd_strerror(err));
+if (err > 0)
+err = -err;
+if (err == -EINTR) /* nothing to do, continue */
 return 0;
-} else if (err == -ESTRPIPE) {
-while ((err = snd_pcm_resume(wwo->pcm)) == -EAGAIN)
-sleep(1);   /* wait until the suspend flag is released */
+if (err == -EPIPE) {
+const char *s;
+if (snd_pcm_stream(pcm) == SND_PCM_STREAM_PLAYBACK)
+s = "underrun";
+else
+s = "overrun";
+if (!silent)
+SNDERR("%s occured", s);
+err = snd_pcm_prepare(pcm);
+if (err < 0) {
+SNDERR("cannot recovery from %s, prepare failed: %s", s, 
snd_strerror(err));
+return err;
+}
+return 0;
+}
+if (err == -ESTRPIPE) {
+while ((err = snd_pcm_resume(pcm)) == -EAGAIN)
+/* wait until suspend flag is released */
+poll(NULL, 0, 1000);
 if (err < 0) {
-err = snd_pcm_prepare(wwo->pcm);
-if (err < 0)
-ERR("recovery from suspend failed, prepare failed: %s\n", 
snd_strerror(err));
+err = snd_pcm_prepare(pcm);
+if (err < 0) {
+SNDERR("cannot recovery from suspend, prepare failed: %s", 
snd_strerror(err));
+return err;
+}
 }
 return 0;
 }
diff --git a/dlls/winealsa.drv/alsa.h b/dlls/winealsa.drv/alsa.h
index 7c2f0f4..5315b67 100644
--- a/dlls/winealsa.drv/alsa.h
+++ b/dlls/winealsa.drv/alsa.h
@@ -187,7 +187,7 @@ const char * ALSA_getFormat(WORD wFormatTag);
 BOOL   ALSA_NearMatch(int rate1, int rate2);
 DWORD  ALSA_bytes_to_mmtime(LPMMTIME lpTime, DWORD position, WAVEFORMATPCMEX* 
format);
 void   ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, 
snd_pcm_sw_params_t * sw, int full);
-intALSA_XRUNRecovery(WINE_WAVEDEV * wwo, int err);
+intALSA_XRUNRecovery(snd_pcm_t *pcm, int err, int silent);
 void   ALSA_copyFormat(LPWAVEFORMATEX wf1, LPWAVEFORMATPCMEX wf2);
 BOOL   ALSA_supportedFormat(LPWAVEFORMATEX wf);
 
diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c
index bb81621..c4f32b0 100644
--- a/dlls/winealsa.drv/dsoutput.c
+++ b/dlls/winealsa.drv/dsoutput.c
@@ -406,7 +406,7 @@ static HRESULT WINAPI 
IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface,
 if (ret == -EPIPE)
 {
 WARN("Underrun occurred\n");
-snd_pcm_recover(This->pcm, -EPIPE, 1);
+ALSA_XRUNRecovery(This->pcm, -EPIPE, 1);
 ret = snd_pcm_writei(This->pcm, pvAudio1, writelen);
 
 /* Advance mmap pointer a little to make dsound notice the 
underrun and respond to it */
diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c
index 4001f26..da5ba58 100644
--- a/dlls/winealsa.drv/waveout.c
+++ b/dlls/winealsa.drv/waveout.c
@@ -110,7 +110,7 @@ static BOOL wodUpdatePlayedTotal(WINE_WAVEDEV* wwo, 
snd_pcm_status_t* ps)
 if (state != SND_PCM_STATE_RUNNING && state != SND_PCM_STATE_PREPARED)
 {
 WARN("Unexpected state (%d) while updating Total Played, resetting\n", 
state);
-snd_pcm_recover(wwo->pcm, -EPIPE, 0);
+ALSA_XRUNRecovery(wwo->pcm, -EPIPE, 0);
 delay=0;
 }
 
@@ -244,7 +244,7 @@ static int wodPlayer

Re: [1/3] d3dx9: Allow sampler declaration without sampler type.

2010-06-11 Thread Stefan Dösinger

Am 11.06.2010 um 04:59 schrieb James McKenzie:

> Stefan Dösinger wrote:
>> It wasn't intended as an objection. It was mostly curiosity, because we have 
>> no test in d3d9 that checks for similar behavior, and trying to actually use 
>> such a shader for rendering would be somewhat odd.
>>  
> It might be a good idea to create the test first before attempting to commit 
> this patch.  AJ probably would want this.
We don't know the validator's interface. It is undocumented. We're currently 
testing what it accepts and rejects by running native vsa.exe or psa.exe and 
see if it accepts the shader with validation on or off.
(the validator is implemented in d3d9.dll, not d3dx9.dll)

So implementing such a test is not trivial.





Re: resources: Convert Polish resources to UTF8.

2010-06-11 Thread GOUJON Alexandre

Le 11/06/2010 03:52, James McKenzie a écrit :
How can I get OLDER information on patches from previous releases? 

You should have a look at http://www.winehq.org/mailman/listinfo.
Everything is archived (patches submitted, commits and of course this 
mailing list)


It's very useful when someone tried to do something before but was 
rejected/incomplete.