Re: More benchmarks of 3d performance comparing windows and linux

2010-05-10 Thread Tom Wickline
On Mon, May 10, 2010 at 8:46 AM, Dan Kegel d...@kegel.com wrote:

 On Sun, May 9, 2010 at 4:14 PM, Dan Kegel d...@kegel.com wrote:
  in general, Wine's D3D version achieves only half to three-quarters the
 performance
  of Vista's.

 I just tried 'winetricks glsl-disable' on heaven2_d3d9.  It sped it up
 about 8% (to 16.0 fps), but added some fun problems (e.g. scenes
 7, 10, and 12 have a black sky).


 Hello Dan,

May I ask why no 3Dmark 03 or 05 benchmark results?
Sorry if I missed a previous answer to this question.

Tom



Re: gdi32/tests: Add a test to check for ERROR_NOACCESS when passing an invalid buffer to GetObject

2010-05-10 Thread Jerome Leclanche
I just tried messing around with it, but all I can get is a timeout
like this in the tests:
err:ntdll:RtlpWaitForCriticalSection section 0x688add20 gdiobj.c:
gdi_section wait timed out in thread 0024, blocked by 0023, retrying
(60 sec)

Or worse, a crash in the app:
err:gdi:GDI_CheckNotLock BUG: holding GDI lock
wine: Unhandled exception 0x8003 at address 0x7edebb63 (thread
0009), starting debugger...
DebugBreak () at /home/adys/src/wine/dlls/kernel32/../../include/winternl.h:1957
0x7edebb63 DebugBreak+0x3
[/home/adys/src/wine/dlls/kernel32/../../include/winternl.h:1957] in
kernel32: int$3
1957static inline void WINAPI DbgBreakPoint(void) { __asm__
__volatile__(int3); }

What am I missing?


J. Leclanche



On Mon, May 10, 2010 at 6:31 AM, Vitaliy Margolen
wine-de...@kievinfo.com wrote:
 On 05/09/2010 03:15 PM, Jerome Leclanche wrote:
 On Sun, May 9, 2010 at 11:55 PM, Jerome Leclanche adys...@gmail.com wrote:
 Testcase for bug 18864.

 This patch reveals a crash in GetObject in wine which I'm unsure how
 to fix. Someone proposed using IsBadWritePtr(), but from what I
 understand, this is not a recommended solution. Any idea?
 If it doesn't crash on windows and you have a program that depends on broken
 behavior - wrap the entire function with exception handler block. For
 example see lstrcatA  co.

 Vitaliy.





Re: Release plans

2010-05-10 Thread Alexandre Julliard
Hin-Tak Leung hintak_le...@yahoo.co.uk writes:

 Alexandre Julliard wrote:
 Ben Klein shackl...@gmail.com writes:

 I'm more interested to know in the status of WoW64 in Wine. Can 64bit
 and 32bit Wine be installed sensibly and concurrently?

 Yes, everything should work as expected now. Please test it.

 The last time I checked it was possible to re-use an old wineprefix
 (created by 32-bit wine under x86_64 platform) with 64-bit wine - is
 it still the case? My .wine is a bit big and I'd hate to have to
 re-create it... :-(.

You can use a 32-bit prefix with 64-bit Wine, but of course only in
32-bit mode, you won't be able to run 64-bit apps with it.

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




CVS repository problem

2010-05-10 Thread Paul Chitescu
Hi!

Something is - again - wrong with CVS. Although I fetched a wine with git I 
tried to verify some patches I had in the CVS tree.

cvs -z3 -q up -APd

cvs update: failed to create lock directory for `/home/wine/wine/dlls/acledit' 
(/home/wine/wine/dlls/acledit/#cvs.lock): Permission denied
cvs update: failed to obtain dir lock in repository 
`/home/wine/wine/dlls/acledit'
cvs [update aborted]: read lock failed - giving up

Maybe a chown -R would help?


Paul Chitescu




Re: CVS repository problem

2010-05-10 Thread Alexandre Julliard
Paul Chitescu pa...@voip.null.ro writes:

 Something is - again - wrong with CVS. Although I fetched a wine with git I 
 tried to verify some patches I had in the CVS tree.

 cvs -z3 -q up -APd

 cvs update: failed to create lock directory for 
 `/home/wine/wine/dlls/acledit' 
 (/home/wine/wine/dlls/acledit/#cvs.lock): Permission denied
 cvs update: failed to obtain dir lock in repository 
 `/home/wine/wine/dlls/acledit'
 cvs [update aborted]: read lock failed - giving up

 Maybe a chown -R would help?

I tried to fix the CVS gateway this weekend, but apparently it doesn't
quite work yet. I tried to fix the permissions now, we'll see. If it
still doesn't work I'm going to pull the plug on it, I don't want to
waste more time maintaining that stuff.

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




Re: RFC on console management

2010-05-10 Thread Alexandre Julliard
Eric Pouech eric.pou...@orange.fr writes:

 Scenario I (aka Client side)
 
 Create simple wineserver objects (ie not linked to wineconsole) for
 bare console handles. All the management would be done in kernel32, by
 distinguishing bare console handles from wineserver console handles.

This seems preferable, if it can be done without making the kernel32
code too ugly.

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




Re: user32/tests: Remove SetShellWindowEx from test_shell_window.

2010-05-10 Thread Gerald Pfeifer
On Sun, 9 May 2010, test...@testbot.winehq.org wrote:
 While running your changed tests on Windows, I think I found new 
 failures. Being a bot and all I'm not very good at pattern recognition, 
 so I might be wrong, but could you please double-check? Full results can 
 be found at http://testbot.winehq.org/JobDetails.pl?Key=1974

That really cannot be related to my test (unless there is some most
subtle timing issue involved, perhaps, which is completel unrelated).

It appears as if these tests all run into problems on the W7 flavor,
regardless and independently of my patch.

Gerald




Re: user32/tests: Remove variable atom which is not really used from test_Expose.

2010-05-10 Thread Gerald Pfeifer
On Sun, 9 May 2010, test...@testbot.winehq.org wrote:
 Full results can be found at
 http://testbot.winehq.org/JobDetails.pl?Key=1983

Another false positive.

  W7PROcompleted 39
  W7PROX64 completed 19
  W7PROX64 completed 19

...is the same before and after this patch of mine.

Gerald




Re: Release plans

2010-05-10 Thread Hin-Tak Leung

Alexandre Julliard wrote:

Ben Klein shackl...@gmail.com writes:


I'm more interested to know in the status of WoW64 in Wine. Can 64bit
and 32bit Wine be installed sensibly and concurrently?


Yes, everything should work as expected now. Please test it.


The last time I checked it was possible to re-use an old wineprefix (created by 
32-bit wine under x86_64 platform) with 64-bit wine - is it still the case? My 
.wine is a bit big and I'd hate to have to re-create it... :-(.


Hin-Tak





Re: CVS repository problem

2010-05-10 Thread Paul Chitescu
On Monday 10 May 2010 12:50:56 pm Alexandre Julliard wrote:
 Paul Chitescu pa...@voip.null.ro writes:
 
  Something is - again - wrong with CVS. Although I fetched a wine with git 
I 
  tried to verify some patches I had in the CVS tree.
 
  cvs -z3 -q up -APd
 
  cvs update: failed to create lock directory for 
`/home/wine/wine/dlls/acledit' 
  (/home/wine/wine/dlls/acledit/#cvs.lock): Permission denied
  cvs update: failed to obtain dir lock in repository 
  `/home/wine/wine/dlls/acledit'
  cvs [update aborted]: read lock failed - giving up
 
  Maybe a chown -R would help?
 
 I tried to fix the CVS gateway this weekend, but apparently it doesn't
 quite work yet. I tried to fix the permissions now, we'll see. If it
 still doesn't work I'm going to pull the plug on it, I don't want to
 waste more time maintaining that stuff.
 
 -- 
 Alexandre Julliard
 julli...@winehq.org

Seems fixed now, thanks.

Paul





Re: shdocvw: implement IWebBrowser2::get_LocationName

2010-05-10 Thread Jacek Caban

Hi Andrey,

On 5/9/10 9:30 PM, Andrey Turkin wrote:

---
 dlls/shdocvw/tests/webbrowser.c |   27 ---
 dlls/shdocvw/webbrowser.c   |   24 ++--
 2 files changed, 46 insertions(+), 5 deletions(-)


+if (This-doc_host.document  SUCCEEDED(IUnknown_QueryInterface(
+This-doc_host.document,IID_IHTMLDocument2, (void**)doc))) {
+hres = IHTMLDocument2_get_title(doc, LocationName);
+IHTMLDocument2_Release(doc);


There is no reason to make this MSHTML-specific by using IHTMLDocument2 
here.


Jacek




Re: shdocvw: implement IWebBrowser2::get_LocationName

2010-05-10 Thread Andrey Turkin

10.05.2010 15:02, Jacek Caban wrote:

Hi Andrey,

On 5/9/10 9:30 PM, Andrey Turkin wrote:

---
 dlls/shdocvw/tests/webbrowser.c |   27 ---
 dlls/shdocvw/webbrowser.c   |   24 ++--
 2 files changed, 46 insertions(+), 5 deletions(-)


+if (This-doc_host.document  SUCCEEDED(IUnknown_QueryInterface(
+This-doc_host.document,IID_IHTMLDocument2, 
(void**)doc))) {

+hres = IHTMLDocument2_get_title(doc, LocationName);
+IHTMLDocument2_Release(doc);


There is no reason to make this MSHTML-specific by using 
IHTMLDocument2 here.


Jacek

If there is more generic way to get HTML title for the document then it 
certainly can be used instead; I just don't know any - hints/suggestions 
would be welcome.





Re: More benchmarks of 3d performance comparing windows and linux

2010-05-10 Thread Dan Kegel
On Mon, May 10, 2010 at 12:49 AM, Tom Wickline twickl...@gmail.com wrote:
 May I ask why no 3Dmark 03 or 05 benchmark results?

I'm trying to take care of Henri and Stefan's wishes/needs:

http://www.winehq.org/pipermail/wine-devel/2010-April/083083.html
http://www.winehq.org/pipermail/wine-devel/2010-April/083091.html

and figured that before I added too many more benchmarks,
I should get the automated daily report going.  Adding
wine3d3-on-windows tests, and ut2004, halflife2 and team fortress 2,
and maybe Resident Evil 5 benchmark,
are also on the to-do list.  (Though that last one might require
OCR; anyone know how to get FPS out of it into a text file on Windows?)

Patches to add support for more benchmarks would be welcome.
(I hesitate to use Steam or Battle.net for any of these benchmarks
because autoupdates and login problems make games hard to
script.)
I'm looking forward to the windows version of Phoronix Test Suite,
will probably add it when it's ready.
Are there any other benchmarks we should consider adding?
- Dan




Re: How to change text on winehq.org ?

2010-05-10 Thread Marco Meijer

Thank you,

That looks not very difficult. I think I can do it.

Marco

Op 10-5-10 5:22, Vitaliy Margolen schreef:

On 05/09/2010 03:50 PM, marco wrote:
   

Thank you all for your reply,

Do I have to install git en download the complete source of the website?
 

Yes and yes. Here is the page with lots of details:
http://wiki.winehq.org/GitWine

All you really need to do is:
1. Install git
2. Get WineHQ's source (assuming you want to put it into your home directory):
$ cd ~
$ git clone git://source.winehq.org/git/website.git
$ cd website.git
3. Set your complete name and e-mail address as it would appear on all your
patches:
$ git config --global user.name Your Name
$ git config --global user.email m...@example.com
4. Edit files as required
5. Make sure everything works.
6. Commit changes with:
$ git commit -a
7. Create a patch to be sent to wine-patches mailing list:
$ git format-patch --keep-subject HEAD^


Vitaliy.


   






Re: More benchmarks of 3d performance comparing windows and linux

2010-05-10 Thread Stefan Dösinger

Am 10.05.2010 um 14:49 schrieb Dan Kegel:
 (I hesitate to use Steam or Battle.net for any of these benchmarks
 because autoupdates and login problems make games hard to
 script.)
Steam is pretty nice in this regard. Everything you need can be controlled via 
Command line, e.g.

Steam.exe -login user pass -applaunch 220 -novid -console -window -w 1024 
-h 768 -dxlevel 90 +timedemo mytimedemo

Everything after -applaunch 220 is a game argument. With Source engine games 
you can pass anything you can enter on the console via +command. You can't 
make the game quit that way though, because if you pass +timedemo xxx +quit 
it will quit right after starting the timedemo - the timedemo command doesn't 
block.

For killing Steam I'm using killall Steam.exe.

This page has the game appids: 
http://developer.valvesoftware.com/wiki/Steam_Application_IDs

However, this won't fix any issues caused by autoupdates. The updates might 
have an impact on performance, and especially with the newer games(TF2, L4D) 
the timedemo format changes, and your recorded demo becomes useless. This 
didn't happen recently with TF2 though, I am still using my timedemo from 2006

Also, there's an add popup after the game quits, which can be annoying if you 
run multiple tests without restarting Steam. It can be disabled via a Steam 
setting(or registry key)





Re: Remove variable hFont which is not really used from MF_PlayMetaFile. (RESEND)

2010-05-10 Thread Alexandre Julliard
Gerald Pfeifer ger...@pfeifer.com writes:

 ---
  dlls/gdi32/metafile.c |2 --
  1 files changed, 0 insertions(+), 2 deletions(-)

It seems pretty clear that it should be used, not removed.

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




Re: advpack: Remove two variables which are not really used and two extraneous invocations of get_parameter from RegisterOCX. (RESEND)

2010-05-10 Thread Alexandre Julliard
Gerald Pfeifer ger...@pfeifer.com writes:

 This passes testing fine for me and there are no further invocations of
 get_parameter in this function (which operates on a copy), so this also
 looks like an optimization?

They should be used, as the comment above indicates.

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




Re: Improve error handling in scmdatabase_autostart_services. (RESEND)

2010-05-10 Thread Alexandre Julliard
Gerald Pfeifer ger...@pfeifer.com writes:

 I noticed that we are not using the error code coming from service_start, 
 and indeed there was a FIXME there already.  Would it make sense to handle
 this (at least) somehow like the patch below?

 If preferred, I could also yank the err variable, but I figured you'd
 prefer the error handling.  (Or is there a mistake I made when adding
 that handling?)

Printing an ERR is not error handling.

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




Re: Release plans

2010-05-10 Thread Hin-Tak Leung
--- On Mon, 10/5/10, Alexandre Julliard julli...@winehq.org wrote:

  The last time I checked it was possible to re-use an
 old wineprefix
  (created by 32-bit wine under x86_64 platform) with
 64-bit wine - is
  it still the case? My .wine is a bit big and I'd hate
 to have to
  re-create it... :-(.

I meant to write wasn't possible . Sorry about that.

 You can use a 32-bit prefix with 64-bit Wine, but of course
 only in
 32-bit mode, you won't be able to run 64-bit apps with it.

It is all a bit confusing - see 
(https://bugzilla.redhat.com/show_bug.cgi?id=533806) I think the last time I 
tried both, I did encounter the problem with 
'/home/myuzer/.wine' is a 32-bit prefix, it cannot be used with 64-bit
Wine.

I think a wiki/FAQ could be useful - there is an FAQ somewhere which says one 
should use a different prefix for 32-bit wine vs 64-bit wine on platforms which 
can do both. My concern is that I have a fairly big ${HOME}/.wine and I'd 
prefer to continue to use it, or at least it doesn't get messed up if I switch 
to 64-bit wine.


  




Re: RFC on console management

2010-05-10 Thread Eric Pouech

Le 10/05/2010 12:06, Alexandre Julliard a écrit :

Eric Pouecheric.pou...@orange.fr  writes:

   

Scenario I (aka Client side)

Create simple wineserver objects (ie not linked to wineconsole) for
bare console handles. All the management would be done in kernel32, by
distinguishing bare console handles from wineserver console handles.
 

This seems preferable, if it can be done without making the kernel32
code too ugly.

   

what I foresee is:
- some extensions in server for managing the objects (wineconsole-less 
console handles)
- evolution in kernel32 limited (except when dealing with line edition 
where it will include libterm and/or termcap support for translating the 
TTY character into windows keycode)


the most impacting issue IMO is the impact of matching unix way of 
controling the terminal with what windows does
as explained, if process B is a child of process A, and A is started 
from command line
- under windows, if A dies, B is still attached to cmd and can get input 
from it (even if from a process point of view it's not reparented to cmd)
- under unix, normally if A dies, B can still output to the shell, but 
it will no longer be able to get input from it


the solutions 
- let A run until all of its children have died (tricky it we want to 
hide A from the windows process list)
- have another program be the parent of all processes started from 
command line (and wineconsole could do the trick)


A+

--
Eric Pouech
The problem with designing something completely foolproof is to underestimate the 
ingenuity of a complete idiot. (Douglas Adams)







Re: More benchmarks of 3d performance comparing windows and linux

2010-05-10 Thread Octavian Voicu
On Mon, May 10, 2010 at 3:49 PM, Dan Kegel d...@kegel.com wrote:
 Are there any other benchmarks we should consider adding?

Eve Online:
- there are many Eve players who depend on wine, so making it run
faster should make many happy
- lots of graphics options (so many different aspects can be tested)

Downside is that it is an MMORPG, and I don't know how easy it can be
scripted. Maybe some other Eve players here have more experience with
that. There is an in-game FPS window which draws a graph, but I'm not
sure about writing FPS to files. Also, there is both a live server
(Singularity) and a test server (Tranquility).

Another problem is that wine-1.43 seems to give an error with d3d when
starting up (unimplemented function d3dx9_36.dll.D3DXCreateEffectEx --
I did notice there is a recent patch in git that adds a stub). I
should reinstall the game with an empty prefix and test again. A few
wine betas ago it was surely working, so if there are any regressions
they will hopefully be fixed soon.

Octavian




today's performance results

2010-05-10 Thread Dan Kegel
http://kegel.com/wine/yagmarkdata/wine-1.1.44-19-vs-wine-1.1.44-72.txt
shows yesterday's wine's performance compared to today's.
Highlights:

Comparing wine-1.1.44-19 with wine-1.1.44-72
benchmark_variablewine-1.1.44-19 wine-1.1.44-72 ratio
3dmark06_3DMark_Score 3377.003388.001.00
3dmark2000_3DMark_Result  16662.00   16917.00   1.02
3dmark2001_3DMark_Score   15691.00   17633.00   1.12
heaven2_d3d9_FPS  9.31   11.08  1.19
heaven2_gl_FPS16.12  16.21  1.01

Golly, looks like
http://www.winehq.org/pipermail/wine-cvs/2010-May/066833.html
was a win.

Here are a few notes about the raw results.

A couple benchmarks (really short ones?) seem to have strongly bimodal
distributions on Wine.
For instance, here are ten measurements on each OS of
3dmark06_CPU2_Red_Valley:

wine-1.1.44-19 1.33  1.36  1.36  1.36  1.37  1.37  1.37  1.37  1.37  1.37
wine-1.1.44-72 1.30  1.31  1.31  1.31  1.31  1.32  1.32  1.32  1.32  1.38
Vista  1.39  1.39  1.39  1.39  1.39  1.39  1.39  1.39  1.39  1.39

For some reason, today's wine usually had the slow result, whereas yesterday
it usually had the fast result. Vista didn't suffer from this, and was
slightly faster, too.
Why does Wine return a slow result sometimes?

3dmark2000_Game_1_Helicopter_High_Detail was quite variable under Wine
(and slightly better today), but hardly varied at all on Vista:
wine-1.1.44-19 133.70 133.90 141.60 145.00 145.40 151.60 159.30 161.80
164.40 173.60
wine-1.1.44-72 139.50 144.70 154.10 157.40 157.90 162.40 170.50 178.80
180.80 198.60
Vista  281.60 282.50 282.90 283.20 283.40 283.60 283.70 283.80
284.00 284.50

What can explain such variability?

heaven2_d3d9_FPS, on the other hand, didn't vary much on Wine - and was
quite a bit better today:
wine-1.1.44-19  9.23  9.28  9.30  9.30  9.30  9.31  9.31  9.32  9.32  9.32

wine-1.1.44-72 11.05 11.07 11.07 11.07 11.08 11.08 11.08 11.09 11.10 11.10
Vista  18.37 18.37 18.38 18.38 18.38 18.38 18.38 18.38 18.38 18.38

Perhaps I should strip down my system and run fvwm95 rather than Gnome,
etc.,
to see if I can reduce the noise a bit more.
- Dan



Re: today's performance results

2010-05-10 Thread Edward Savage
On Tue, May 11, 2010 at 3:27 PM, Dan Kegel d...@kegel.com wrote:
 Why does Wine return a slow result sometimes?

Solar flares! ;)

I can't stay I notice this discrepancy in actual game play day after
day though.

I personally would be looking at memory available as the cause.  In
general you want to make sure you have plenty free as any excessive
swapping causes performance loss.  You can test this yourself by
trying a game with 1gb free memory and then trying the game again with
only enough to fit the games memory requirements (or even force it
over).  The difference will be easily noticeable.