May 2010 - Wine-devel - list.winehq.org

Re: Remove variable doRecursive which is not really used from WCMD_for.
by Nikolay Sivov 02 May '10

02 May '10

On 5/1/2010 18:24, Gerald Pfeifer wrote: > --- > programs/cmd/builtins.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > Please use consistent naming for patches and mail subjects. It's described in http://wiki.winehq.org/SubmittingPatches. I'm not sure it makes sense to resend all these, but GERALD: as a start word is unacceptable of course.

2 1

Re: Minor dlls/dbghelp/dwarf.c simplification
by Gerald Pfeifer 02 May '10

02 May '10

Eric Pouech wrote: > this is wrong: dwarf_parse family set makes the pointer in the cxt > advance by the size of the object which is being parse You're right. I had, in fact, checked this very question, but doing so just again I see where I missed the += in the code. Thanks for catching this, Eric! > and actually, the correct fix would be to make use of those variables > (like checking if the version is a known one), instead of throwing > things away Are you planning to go into that direction? If not, I'd suggest the patch below. (I'm not sure whether checking for the DWARF version is going to help -- do we want to abort for newer versions when these actually should be compatible?) Gerald From: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun, 2 May 2010 22:05:20 Subject: dbghelp: Remove two variables which are not really used in dwarf2_parse_line_numbers. --- dlls/dbghelp/dwarf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4be0f6a..99960d8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1920,7 +1920,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { dwarf2_traverse_context_t traverse; unsigned long length; - unsigned version, header_len, insn_size, default_stmt; + unsigned insn_size, default_stmt; unsigned line_range, opcode_base; int line_base; const unsigned char* opcode_len; @@ -1939,8 +1939,8 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, length = dwarf2_parse_u4(&traverse); traverse.end_data = sections[section_line].address + offset + length; - version = dwarf2_parse_u2(&traverse); - header_len = dwarf2_parse_u4(&traverse); + dwarf2_parse_u2(&traverse); + dwarf2_parse_u4(&traverse); insn_size = dwarf2_parse_byte(&traverse); default_stmt = dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse); -- 1.6.6.2

1 0

Unable to start WoW from git 1.1.29 while 1.1.29 tarball works.
by Johann "Myrkraverk" Oskarsson 02 May '10

02 May '10

Hello all. I am unable to start WoW when I compile release 1.1.29 from the git repo, while compiling the 1.1.29 release tarball allows me to play WoW. System info: % uname -a; isainfo -k SunOS asuka 5.11 snv_115 i86pc i386 i86pc amd64 Git compile steps taken: git checkout wine-1.1.29 git clean -x -f ./configure --prefix=/opt/myrkraverk/wine-git && gmake depend && gmake WoW now fails to start with some console output like: [johann(a)asuka]~/src/external/git/wine/wine% Can't attach process 0011: error 6 wine: Call from 7fd69d43 to unimplemented function user32.dll.UserRegisterWowHandlers, aborting fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for 80000100 err:module:DelayLoadFailureHook failed to delay load user32.dll.LoadStringW More pastes here: http://paste.lisp.org/display/98679 I did not use any special flags or environment variables to compile the tarball, apart from the prefix. This is my showstopper to regression test bug 22033: http://bugs.winehq.org/show_bug.cgi?id=22033 Any help apreciated. Johann

1 1

new wisotool 20100424: new verbs 3dmark2000, 3dmark2001, 3dmark03, 3dmark05, 3dmark06, baldursgate2, gta_vc, pcmark04, pcmark05, unigine_heaven
by Dan Kegel 02 May '10

02 May '10

wisotool is a handy winetricks-like script for automatically installing games from .iso files copied from your own dvds (or, if the game is freely downloadable, it will download it). Just like winetricks, it is intended to make testing Wine easier, but might be useful for people who simply want to install games. Unlike winetricks, wisotool is quiet by default; it doesn't ask any questions (except, for now, it prompts for the root password so it can mount the .iso file; later it will use fuse instead). This version is the first to be called a release. Currently supported apps are: 3dmark03 3D Mark 03 (Futuremark, 2003) [download] 3dmark05 3D Mark 05 (Futuremark, 2005) [download] 3dmark06 3D Mark 06 (Futuremark, 2006) [download] 3dmark2000 3DMark2000 (MadOnion.com, 2000) [download] 3dmark2001 3DMark2001 (MadOnion.com, 2001) [download] assassinscreed Assassins Creed (Ubisoft, 2008) baldursgate2 Baldurs Gate 2 - Shadows of Amn (Bioware, 2000) diablo2 Diablo II (Blizzard, 2000) dragonage Dragon Age: Origins (Bioware, 2009) gta_vc Grand Theft Auto: Vice City (Rockstar, 2003) morrowind The Elder Scrolls III: Morrowind (Bethesda, 2002) pcmark04 PC Mark 04 (Futuremark, 2004) [download] pcmark05 PC Mark 05 (Futuremark, 2005) [download] plantsvszombies Plants vs. Zombies (PopCap Games, 2009) [download] quake3 Quake 3 (ID Software, 1999) re5bench Resident Evil 5 Benchmark (Capcom, 2009) [download] sims3 The Sims 3 (EA, 2009) starcraft2 Starcraft II beta (Blizzard, 2010) starcraft Starcraft Battle Chest (Blizzard, 1998) stfu Starwars: The Force Unleashed (Aspyr, 2009) unigine_heaven Unigen Heaven 2 Benchmark (Unigen, 2010) [download] wog World of Goo demo (2D Boy, 2008) [download] It's available at http://kegel.com/wine/wisotool You can read more about it at http://wiki.winehq.org/wisotool Please report bugs via http://code.google.com/p/winezeug/issues/

3 5

3dmark2000, 3dmark06 results on both Wine and Vista
by Dan Kegel 02 May '10

02 May '10

I did some apples-to-apples 3d benchmarking today on a dual boot system. It looks offhand like Windows is about twice as fast as Wine on these benchmarks on my system. cpu: e8400 ram: 4GB video card: nvidia GT 240 Ubuntu 32 10.04 video drivers: 195.36.15 Vista 64 video drivers: 8.17.11.9713 Test procedure: On Ubuntu, grab latest wine from git, apply patch from http://bugs.winehq.org/show_bug.cgi?id=9210 so 3dmark06 will run. On Windows, install cygwin and a few of its packages (cabextract, wget, svn, etc.) Then on both systems do svn checkout http://winezeug.googlecode.com/svn/trunk/ winezeug sh winezeug sh yagmarktest That will run the tests in a loop and save a report for each run in the current directory. Results at http://kegel.com/wine/yagmarkdata/e8400/ Summary: Ubuntu: 6 runs 3dmark2000: min 4145, median 4154, max 4170 3dmark2001: min 18884, median 19261, max 19520 3dmark2006: min 17315, median 18154, max 18498 Vista: 2 runs: 3dmark2000: 8206, 8219 3dmark2006: 30278, 32384 Notes: 1) 3dmark2001 hangs for me on vista 64 bits, so no results for that test on that OS, I had to edit yagmarktest to remove it from the loop. Does it work for anyone else? 2) nvidia drivers occasionally crash X when running or quitting 3dmark2000 or 3dmark06; it's happened to me three times. 3) test script is fragile, don't touch the mouse or keyboard while it's running 4) shadows appear to be missing on wine in firefly forest in 3dmark06 and giant mecha truck test in 3dmark01? 5) format of my log files is ugly and will change.

6 8

Re: Destroy the window we created at the end of wait_idle_thread.
by testbot＠testbot.winehq.org 01 May '10

01 May '10

Hi, 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=1857 Your paranoid android. === W7PROX64 (64 bit msg) === Timeout

1 0

Re: user32: Focus editboxes when the context menu is opened. (try 3)
by Paul Vriens 01 May '10

01 May '10

On 04/24/2010 10:08 PM, Vincent Povirk wrote: > + case WM_CAPTURECHANGED: > + if (hWnd != (HWND)lParam) > + { > + got_wm_capturechanged = 1; > + EndMenu(); > + } > + break; Hi Vincent, EndMenu is not available on Win95 so no user32 tests are run on that platform at the moment. Can we skip just this call to EndMenu on Win95, should we skip this whole new test (test_contextmenu_focus) on Win95 or is there an alternative? -- Cheers, Paul.

2 2

Re: Minor dlls/mshtml/htmlbody.c simplification (RESEND)
by Nikolay Sivov 01 May '10

01 May '10

On 5/1/2010 04:04, Gerald Pfeifer wrote: > On Wed, 28 Apr 2010, Nikolay Sivov wrote: > >> Please follow wine-devel comments: >> >> http://www.winehq.org/pipermail/wine-devel/2010-April/083175.html >> > Ouch, I had missed this message -- certainly did not mean to ignore > the good feedback. > > Is the following what you had in mind? > > Gerald > > > ChangeLog: > Fix return value for HTMLBodyElement_get_text. > > --- > dlls/mshtml/htmlbody.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c > index 5c66e65..65aa549 100644 > --- a/dlls/mshtml/htmlbody.c > +++ b/dlls/mshtml/htmlbody.c > @@ -443,7 +443,7 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT > HTMLBodyElement *This = HTMLBODY_THIS(iface); > nsAString text; > nsresult nsres; > - HRESULT hres; > + HRESULT hres = S_OK; > > TRACE("(%p)->(%p)\n", This, p); > > @@ -462,7 +462,7 @@ static HRESULT WINAPI HTMLBodyElement_get_text(IHTMLBodyElement *iface, VARIANT > > nsAString_Finish(&text); > > - return S_OK; > + return hres; > } > > static HRESULT WINAPI HTMLBodyElement_put_link(IHTMLBodyElement *iface, VARIANT v) > Yes, but you don't have to initialize it to S_OK.

1 0