April 2010 - Wine-Devel - list.winehq.org

Re: new wisotool 20100424: new verbs 3dmark2000, 3dmark2001, 3dmark03, 3dmark05, 3dmark06, baldursgate2, gta_vc, pcmark04, pcmark05, unigine_heaven

by Vincent Pelletier

Le jeudi 29 avril 2010 12:57:49, Vincent Pelletier a écrit : > Le mercredi 28 avril 2010 09:13:24, Vincent Pelletier a écrit : > > I'm trying to add support for GOG.com installers. > > Please review attached patch. Patch updated. Now tested on windows (...though not all games) from auth cookie creation to bat script execution (test case: duke nukem 3d). Curl tested (downloading and auth cookie generation). Incremental changelog (skip to "Changelog" to just know what it does): - changed cookie support in download so it take a filename as parameter, not a chunk of HTTP headers - fixed download url for duke nukem 3d, as it is different from game id - removed (expanded) AHK marcos, as advised by Austin English on IRC - auth cookie generation (you now only need your login & password, the rest is automatic) - fix duke nukem 3d and far cry to disable foxit reader installation (and prune references to adobe in the source) - add support for evil genius - consider an empty file as non-existent (re-download it) note: it didn't appear to have expected effect... I'll doublecheck after a good night of sleep Changelog: - add cookie support in "download" (required as GOG.com requires auth to download games) - add generic automation for gog installer (based on http://www.jrsoftware.org/isinfo.php) - Add support for: duke nukem 3d duke nukem manhattan project ut2004 abe's oddisee abe's exoddus beyond good and evil far cry descent 1 & 2 (single package) evil genius Updated "please review": - _load_gog parameters. They are ugly IMO, because many are optional. But I don't see how to do better (especially, how to extend them to include optional SHA1 values). - posix-ish scripting (only tested with bash) Regards, -- Vincent Pelletier

April 30, 2010

Re: [2/4] rsaenh: Fixing a testfailure because Win7 seems to support salt with AES

by André Hentschel

Am 30.04.2010 19:52, schrieb Juan Lang: > Hi Andre, I don't object to this patch per se, but: > - ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == > ERROR_NO_TOKEN /* Win7 */), > - "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); > + todo_wine ok(broken(!result && GetLastError() == NTE_BAD_KEY) || > result /* Win7 */, > + "CryptGetKeyParam failed, got %08x\n", GetLastError()); > > Why don't you fix rsaenh while you're at it? It'd be an exceedingly > easy patch. Look for KP_SALT in rsaenh.c, and you'll see what I mean. > --Juan next patch set ill do. as it has to be tested some more it is better to take some time which i just rarely have. thx -- Best Regards, André Hentschel

April 30, 2010

Re: [2/4] rsaenh: Fixing a testfailure because Win7 seems to support salt with AES

by Juan Lang

Hi Andre, I don't object to this patch per se, but: - ok(!result && (GetLastError() == NTE_BAD_KEY || GetLastError() == ERROR_NO_TOKEN /* Win7 */), - "expected NTE_BAD_KEY or ERROR_NO_TOKEN, got %08x\n", GetLastError()); + todo_wine ok(broken(!result && GetLastError() == NTE_BAD_KEY) || result /* Win7 */, + "CryptGetKeyParam failed, got %08x\n", GetLastError()); Why don't you fix rsaenh while you're at it? It'd be an exceedingly easy patch. Look for KP_SALT in rsaenh.c, and you'll see what I mean. --Juan

April 30, 2010

South East Linux Fest

by Steven Edwards

Hi, I'm going to be running a both at the South East Linux Fest in Spartanburg SC June 11th-13th. If any wine hackers or lurkers from the South Eastern United States want to come out and help, drop me a note privately. I can't offer much in accommodation but I'll provide beer. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

April 30, 2010

Re: (resend) shell32: handle NULL pName in ShellLink fnSetDescription.

by testbot＠testbot.winehq.org

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=1835 Your paranoid android. === WNT4WSSP6 (32 bit shelllink) === shelllink.c:144: Test failed: GetDescription returned 'Some description'

April 30, 2010

Bugzilla not updated on server

by Vitaliy Margolen

Alexandre committed a patch to remove few no longer working links. But the bugzilla on Wine's server still showing those links. Is the bugzilla automatically being pulled from git? Vitaliy.

April 30, 2010

Re: Benchmarking D3D?

by Austin English

On Sun, Apr 18, 2010 at 1:42 PM, Roderick Colenbrander <thunderbird2k(a)gmail.com> wrote: > I have been looking into nvperfkit the past few days. The current > Linux version is based on the 173.x drivers (ancient but they would > work fine for your geforce 7600). As a workaround I have been > experimenting a bit on Windows mostly in the hope to get NVPerfkit > running on WineD3D there. In the end WineD3D worked and perfkit also > installed (there were some issues for 32-bit apps on Win7) but then it > appeared that my GPU is too new yet (it is a GTS 360M), so it doesn't > work yet. I had a bit of luck using wined3d on windows 7 with perfkit. After getting a simple opengl demo to work with perfkit, I moved on to a simple d3d benchmark + wined3d + perfkit, and was able to get some profiling data. Unfortunately, the program I was wanting to get data for uses a couple loaders and the 'core' executable is 3 layers deep. Perfkit puts it data in stdout (popping up a console and piping it there), and for the first two demos I was able to redirect to a file with cygwin and some creative piping. For the other program, however, I haven't had any luck, though I'm not sure if the piping isn't strong enough, if the program is redirecting output somewhere else, or it's getting lost in the multiple executables... -- -Austin

April 30, 2010

Re: new wisotool 20100424: new verbs 3dmark2000, 3dmark2001, 3dmark03, 3dmark05, 3dmark06, baldursgate2, gta_vc, pcmark04, pcmark05, unigine_heaven

by Austin English

On Wed, Apr 28, 2010 at 6:00 AM, <wylda(a)volny.cz> wrote: >> I'm ripping it now, but it's pretty slow, comparatively. Tons of: >> Found L-EC error at sector 1589216 - ignored. > > Good luck and hopefully your DVD drive will survive it ;) > > After long tests, i choosed (year ago) Alcohol 120% as the ripping tool, > because it produced most number of working backup copies and makes them > fast. > > However, if the safedisc image will work most depends on DVD drive. Again > from personal test of 5 bought drives Samsung SH-S223F is winner for > me. > > And for loading such image under linux i use http://www.cdemu.org so > mounting an image is done by: > > cdemu load 0 my_image.mds > cdemu unload 0 my_image.mds > > This SW need a kernel module, so it's not easy as other tools, but the > reward is, you can SafeDisc/SecuROM working without needing a crack > (of course the image have to firstly work under WinXP and wine have > to support such protection like SecuROM v7.30.0014). > > Unfortunately SecuROM v7.27.0014 doen't work in wine, because of "Unsupported > ioctl 2d0c04", but bug 20935 Anastasius how to overcome, but i don't > know where to put the heck 0. > > > So if wisotool would support "cdemu load", that would be tool even for > me ;) I just tested Bioshock under windows 7 with Alcohol 120%, and got it to install with a couple emulation settings. Rebooting to Ubuntu + cdemu, it worked as well, if 'DPM emulation' is enabled (I was very pleasantly surprised)! Time permitting, I'll try to add it to wisotool soon. -- -Austin

April 30, 2010

Re: shell32: add configure option --disable-unixfs

by Dan Kegel

On Wed, Apr 28, 2010 at 12:48 PM, Alexandre Julliard <julliard(a)winehq.org> wrote: > Dan Kegel <dank(a)kegel.com> writes: > >> Fixes http://bugs.winehq.org/show_bug.cgi?id=22450 > > There's no reason to do that in configure. Right then, I'll do something in the registry. (Although maybe I can live with the existing registry key if I also do echo disable > $WINEPREFIX/.update-timestamp )

April 29, 2010

Re: ws2_32: negate return value of SIOCATMARK (try 2)

by André Hentschel

Am 29.04.2010 18:39, schrieb Mike Kaplinskiy: > 2010/4/28 André Hentschel <nerv(a)dawncrow.de>: >> confirmed by Mike Kaplinskiy >> >> try 1 was on 4th November 2009 >> >> --- >> dlls/ws2_32/socket.c | 16 ++++++++++++++-- >> dlls/ws2_32/tests/sock.c | 2 +- >> 2 files changed, 15 insertions(+), 3 deletions(-) >> >> diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c >> index e6a6973..62598d2 100644 >> --- a/dlls/ws2_32/socket.c >> +++ b/dlls/ws2_32/socket.c >> @@ -2800,8 +2800,20 @@ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) >> return 0; >> >> case WS_SIOCATMARK: >> - newcmd=SIOCATMARK; >> - break; >> + fd = get_sock_fd( s, 0, NULL ); >> + if (fd != -1) >> + { >> + if( ioctl(fd, newcmd, (char*)argp ) == 0 ) >> + { >> + release_sock_fd( s, fd ); >> + /* return value must be inverted here */ >> + *argp = !*argp; >> + return 0; >> + } >> + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); >> + release_sock_fd( s, fd ); >> + } >> + return SOCKET_ERROR; >> >> case WS_FIOASYNC: >> WARN("Warning: WS1.1 shouldn't be using async I/O\n"); >> diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c >> index 88b62e3..7a7c688 100644 >> --- a/dlls/ws2_32/tests/sock.c >> +++ b/dlls/ws2_32/tests/sock.c >> @@ -2486,7 +2486,7 @@ static void test_ioctlsocket(void) >> >> ret = ioctlsocket(sock, SIOCATMARK, &arg); >> if(ret != SOCKET_ERROR) >> - todo_wine ok(arg, "expected a non-zero value\n"); >> + ok(arg, "expected a non-zero value\n"); >> } >> >> static int drain_pause=0; >> -- >> >> Best Regards, André Hentschel >> >> >> >> > > Hey André, > > I don't think we should rush this. The documentation says that the > return values are basically opposites, but I think we need more tests > with actual OOB data and different settings of SO_OOBINBLINE. MSDN has > far too little information about SIOCATMARK and some things they say > don't make a lot of sense. > > Mike. Ok, i just wanted to give it a second try. So ill hand it out to you as i have no idea about OOB data, i know what it is generally but thats all. Thx! -- Best Regards, André Hentschel

April 29, 2010