October 2005 - Wine-Devel - list.winehq.org

Re: Compile error: dlls/kernel/time.c

by Vijay Kiran Kamuju

Well, if you could tell us what version of glibc broke it. We could fix it ine, by adding a check during configure. Thanks, vijay On 10/30/05, Ivan Gyurdiev <ivg2(a)cornell.edu> wrote: > I suspect a recent change in glibc (features.h) broke it... but > according to time.h, CLK_TCK is obsolete, and CLOCKS_PER_SEC is to be > used instead. > > gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ > -D_KERNEL32_ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 > -fno-strict-aliasing -gstabs+ -Wdeclaration-after-statement > -Wpointer-arith -g -O2 -o time.o time.c > time.c: In function 'TIME_ClockTimeToFileTime': > time.c:522: error: 'CLK_TCK' undeclared (first use in this function) > time.c:522: error: (Each undeclared identifier is reported only once > time.c:522: error: for each function it appears in.) > make[2]: *** [time.o] Error 1 > make[2]: Leaving directory `/home/phantom/src/wine/dlls/kernel' > make[1]: *** [kernel] Error 2 > make[1]: Leaving directory `/home/phantom/src/wine/dlls' > make: *** [dlls] Error 2 > > > >

Oct. 30, 2005

Re: Shell32 File Property Dialog

by Andreas Mohr

Hi, On Sat, Oct 29, 2005 at 08:59:51PM +0200, Johannes Anderwald wrote: > This patch adds file property dialog to shell32 > + LTEXT "Type of file:", 14004, 10, 30, 50, 10 Space missing?? > + LTEXT "Modied: ", 14016, 10, 90, 45, 10 "Modified: " > FIXME("Unhandled Verb %xl\n",LOWORD(lpcmi->lpVerb)); What kind of format specifier is that supposed to be? I don't know that one... Maybe use %p instead? (or %lx??) > HWND hDlgCtrl = GetDlgItem(hwndDlg, 14005); > > if (filext == NULL || hDlgCtrl == NULL) > return FALSE; Wasteful invocation of GetDlgItem() here, although the failure check is a bit "prettier" that way... > result = RegEnumValueW(hKey,0, name, &lname, NULL, NULL, (LPBYTE)value, &lvalue); space missing after hkey ;) > BOOL > SHFileGeneralGetFileTimeString(LPFILETIME lpFileTime, WCHAR * lpResult) > { > FILETIME ft; > SYSTEMTIME dt; > WORD wYear; > WCHAR wFormat[] = {'%','0','2','d','/','%','0','2','d','/','%','0','4','d',' ',' ','%','0','2','d',':','%','0','2','u',0}; static const WCHAR > TRACE("result %s \n",debug_strw(lpResult)); Superfluous space. > WARN("failed to open file \n"); > WARN("GetFileTime failed \n"); > TRACE("hDlgCtrl %x text %s \n",hDlgCtrl, debug_strw(resultstr)); > WARN("failed to open file \n"); > WARN("GetFileSize failed \n"); Dito (I prefer Wine to be smaller rather than the error message to be a bit "more readable" ;). (and probably more instances of superfluous space in this patch) > if (GetFileSize(hFile, NULL) == 0xFFFFFFFF) > { > CloseHandle(hFile); > return FALSE; > } > > dwFileLo = GetFileSize(hFile, &dwFileHi); > CloseHandle(hFile); > > if (dwFileLo == 0xFFFFFFFF && GetLastError() != NO_ERROR) > return FALSE; This whole check sounds very weird. Why are you checking with NULL hiword when there might be a > 4GB file? (and to make it worse, even one with e.g. a size of 0x12345678FFFFFFFF !!!!!!) And directly after that even doing a full large file check **again**? Not to mention that you're not using the INVALID_FILE_SIZE macro that I really, really think should be used since it's been created *exactly* for this purpose (and for the even better purpose of *never* managing to write/edit/delete a 0xFFFFFF or 0xFFFFFFF instead...) > FIXME("directory / drive resources dont exist yet \n"); ' missing ;) Sorry for this VERY anal review (it's got to be my most thorough WP review), and thanks very much for this large patch :) Andreas -- GNU/Linux. It's not the software that's free, it's you.

Oct. 30, 2005

Re: MSI: Extract file directly to their target location

by Mike McCormack

Thomas Weidenmueller wrote: > Never mind, i noticed you corrected that in the following patch I should have merged the two patches together, but I'm getting used to using git, and haven't figured out how to do that easily as yet. Mike

Oct. 30, 2005

Re: Shell32 File Property Dialog

by Mike McCormack

This version looks alot better than the first one. > * SH_FileTimerProc [Internal] > * > * is invoked every 100ms to check if the property sheet should be closed > * A timer is required because the property sheet pages are per default > * modeless and the property sheetpage does not have a window procedure This doesn't seem right to me. The property sheet should destroy all its pages when it is closed. Also, instead of attaching the new file, you can do: diff -u /dev/null dlls/shell32/fprop.c >> fp-051029.diff so that everything is in one diff. Mike

Oct. 30, 2005

Re: Half-Life 2 / Counter-Strike: Source under Wine

by James Liggett

I have single player HL2 running decent. Not quite excellent, but playable. Try running steam with this command: WINEDEBUG="-all" wine steam.exe And you should get anywhere from 10-30 FPS. It's not the best in the world, but at least you can play. :) I have started a new game, and I am now in the beginning of the car sequence, and aside from some textures being lit up and the flashlight not working, it's pretty nice. But, beware of problems with pixel shaders. The make CS and HL2 deathmatch totally useless (they give a white screen in menu. It's not frozen, but you can't see anything.) I don't see that behavior with single player because of the animated menus. Plus, pixel shaders screw things up big time anyway. It inverts colors and makes it look like NPCs are holding tree trunks. I'll put up some shots up later so you can see what I mean. James On Sat, 2005-10-29 at 17:48 -0500, Evil wrote: > One thing I've noticed while trying to get CS:S to work is that if I set > the resolution to something other than that of my desktop (1280x1024), > WINE does resize the screen to the appropriate rez... BUT moving my > mouse to the edge of the screen lets me scroll across the rest of my > virtual desktop. > > Maybe this is because I'm using xOrg 6.8.2? (I'm running Mandriva 2005LE) > > I would suspect this is part of the reason Counter-Strike gives me > 1frame per second: If OpenGL works like DirectX, maybe it's not > actually writing directly to video RAM and is instead copying from a > backbuffer in system RAM? I'm not familiar with OGL at all, so I don't > know if that's true or not. > > Things seem better when I run the game in my native resolution in that > at least I don't see my desktop newsticker crawling along the top. > However, performance is relatively unchanged (i.e. about half a frame a > second or less at the higher rez) > > I'm using an ATI 9600XT card with the latest (8.18) drivers. Native > Linux 3D apps run very nicely. > > -J > >

Oct. 29, 2005

Compile error: dlls/kernel/time.c

by Ivan Gyurdiev

I suspect a recent change in glibc (features.h) broke it... but according to time.h, CLK_TCK is obsolete, and CLOCKS_PER_SEC is to be used instead. gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_KERNEL32_ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wdeclaration-after-statement -Wpointer-arith -g -O2 -o time.o time.c time.c: In function ‘TIME_ClockTimeToFileTime’: time.c:522: error: ‘CLK_TCK’ undeclared (first use in this function) time.c:522: error: (Each undeclared identifier is reported only once time.c:522: error: for each function it appears in.) make[2]: *** [time.o] Error 1 make[2]: Leaving directory `/home/phantom/src/wine/dlls/kernel' make[1]: *** [kernel] Error 2 make[1]: Leaving directory `/home/phantom/src/wine/dlls' make: *** [dlls] Error 2

Oct. 29, 2005

Re: Talkback versions of wine

by Jonathan Wilson

> As far as possible, yes. I think the goal for 1.0 should be that > anybody has to be able to try Wine and see that it's for real. This > means they must not be stopped either by not being able to configure > it, or by apps failing to even start. I look forward to a day when vanilla WINE is good enough such that WineX/Cdega is no longer required :)

Oct. 29, 2005

Re: Half-Life 2 / Counter-Strike: Source under Wine

by Evil

One thing I've noticed while trying to get CS:S to work is that if I set the resolution to something other than that of my desktop (1280x1024), WINE does resize the screen to the appropriate rez... BUT moving my mouse to the edge of the screen lets me scroll across the rest of my virtual desktop. Maybe this is because I'm using xOrg 6.8.2? (I'm running Mandriva 2005LE) I would suspect this is part of the reason Counter-Strike gives me 1frame per second: If OpenGL works like DirectX, maybe it's not actually writing directly to video RAM and is instead copying from a backbuffer in system RAM? I'm not familiar with OGL at all, so I don't know if that's true or not. Things seem better when I run the game in my native resolution in that at least I don't see my desktop newsticker crawling along the top. However, performance is relatively unchanged (i.e. about half a frame a second or less at the higher rez) I'm using an ATI 9600XT card with the latest (8.18) drivers. Native Linux 3D apps run very nicely. -J

Oct. 29, 2005

Re: compile wine with icc

by Dimi Paun

On Sat, 2005-10-29 at 14:58 +0200, Tomas Carnecky wrote: > > I used something like CFLAGS="-g -Wbrief > > -wd108,144,167,181,188,193,279,556,810,869,981,1287,1418,1419,1572" I suppose these disables some warnings. Wouldn't they be useful for Wine if fixed? -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

Oct. 29, 2005

[Bugzilla] and [AppDB] add ability to mark Wine versions as 'obsolete', 'supported' or 'current'

by Tony Lambregts

This patch is meant to stimulate a discussion about how to deal with the fact we cannot reasonable support obsolete versions of wine ;^) For example we would like to be able to age Test Results and probably do not want submittions of test results or bugs that are from older versions of wine. On the other hand we should accept new bug reports from CVS and at least our current release. Since we cannot simply delete old versions in bugzilla I came up the following patch. To use this patch you need to run the following sql: use bugs; alter table versions add column status enum('obsolete','supported','current') NOT NULL default 'current'; change log: Add status ('obsolete','supported' or 'current') to versions table files changed: editversions.cgi Index: editversions.cgi =================================================================== RCS file: /home/wine/bugzilla/editversions.cgi,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 editversions.cgi --- editversions.cgi 1 Dec 2004 23:15:14 -0000 1.1.1.1 +++ editversions.cgi 29 Oct 2005 22:02:25 -0000 @@ -105,13 +105,28 @@ # Displays the form to edit a version # -sub EmitFormElements ($$) +sub EmitFormElements ($$$) { - my ($product, $version) = @_; + my ($product, $version, $status) = @_; + my @aStatus = ("obsolete","supported","current"); print " <TH ALIGN=\"right\">Version:</TH>\n"; print " <TD><INPUT SIZE=64 MAXLENGTH=64 NAME=\"version\" VALUE=\"" . value_quote($version) . "\">\n"; + print " </TD></TR>\n"; + print " <TH ALIGN=\"right\">Status:</TH>\n"; + print "<TD><select name=\"status\">\n"; + + for (my $i = 0; $i < @aStatus; ++$i) { + if ($aStatus[$i] eq $status) { + print "<option value=" .value_quote($aStatus[$i]). " selected>" .value_quote($aStatus[$i]). "\n"; + } + else { + print "<option value=" .value_quote($aStatus[$i]). ">" .value_quote($aStatus[$i]). "\n"; + } + } + print "</select></TD>\n"; + print " <INPUT TYPE=HIDDEN NAME=\"product\" VALUE=\"" . value_quote($product) . "\"></TD>\n"; } @@ -173,6 +188,7 @@ # my $product = trim($::FORM{product} || ''); my $version = trim($::FORM{version} || ''); +my $status = trim($::FORM{status} || ''); my $action = trim($::FORM{action} || ''); my $localtrailer; if ($version) { @@ -225,21 +241,24 @@ CheckProduct($product); my $product_id = get_product_id($product); - SendSQL("SELECT value + SendSQL("SELECT value, status FROM versions WHERE product_id=$product_id ORDER BY value"); print "<TABLE BORDER=1 CELLPADDING=4 CELLSPACING=0><TR BGCOLOR=\"#6666FF\">\n"; print " <TH ALIGN=\"left\">Edit version ...</TH>\n"; - #print " <TH ALIGN=\"left\">Bugs</TH>\n"; + print " <TH ALIGN=\"left\">Status</TH>\n"; print " <TH ALIGN=\"left\">Action</TH>\n"; print "</TR>"; while ( MoreSQLData() ) { - my $version = FetchOneColumn(); + my @data = FetchSQLData(); + my $version = $data[0]; + my $status = $data[1]; + print "<TR>\n"; - print " <TD VALIGN=\"top\"><A HREF=\"editversions.cgi?product=", url_quote($product), "&version=", url_quote($version), "&action=edit\"><B>$version</B></A></TD>\n"; - #print " <TD VALIGN=\"top\">$bugs</TD>\n"; + print " <TD VALIGN=\"top\"><A HREF=\"editversions.cgi?product=", url_quote($product), "&version=", url_quote($version),"&status=", url_quote($status), "&action=edit\"><B>$version</B></A></TD>\n"; + print " <TD VALIGN=\"top\">" ,$status, "</TD>\n"; print " <TD VALIGN=\"top\"><A HREF=\"editversions.cgi?product=", url_quote($product), "&version=", url_quote($version), "&action=del\"><B>Delete</B></A></TD>\n"; print "</TR>"; } @@ -271,7 +290,7 @@ print "<FORM METHOD=POST ACTION=editversions.cgi>\n"; print "<TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0><TR>\n"; - EmitFormElements($product, $version); + EmitFormElements($product, $version, $status); print "</TABLE>\n<HR>\n"; print "<INPUT TYPE=SUBMIT VALUE=\"Add\">\n"; @@ -312,9 +331,9 @@ # Add the new version SendSQL("INSERT INTO versions ( " . - "value, product_id" . + "value, status, product_id" . " ) VALUES ( " . - SqlQuote($version) . ", $product_id)"); + SqlQuote($version) .",". SqlQuote($status) .", $product_id)"); # Make versioncache flush unlink "data/versioncache"; @@ -467,7 +486,7 @@ print "<FORM METHOD=POST ACTION=editversions.cgi>\n"; print "<TABLE BORDER=0 CELLPADDING=4 CELLSPACING=0><TR>\n"; - EmitFormElements($product, $version); + EmitFormElements($product, $version, $status ); print "</TR></TABLE>\n"; @@ -523,13 +542,14 @@ delta_ts = delta_ts WHERE version=" . SqlQuote($versionold) . " AND product_id = $product_id"); + } SendSQL("UPDATE versions - SET value=" . SqlQuote($version) . " + SET value=" . SqlQuote($version) .",". "status=" . SqlQuote($status) . " WHERE product_id = $product_id AND value=" . SqlQuote($versionold)); unlink "data/versioncache"; print "Updated version.<BR>\n"; - } + SendSQL("UNLOCK TABLES"); PutTrailer($localtrailer);

Oct. 29, 2005