ChangeSet ID: 28239
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner(a)winehq.org 2006/09/25 21:10:59
Modified files:
include : query.php
Log message:
Chris Morgan <cmorgan(a)alum.wpi.edu>
query_error() can infinitely recurse as errors are inserted into the database and if the database doesn't exist
then the db insertion will fail and result in a call to query_error(). Once we've entered query_error() once if we enter it
again we should simply return
Patch: http://cvs.winehq.org/patch.py?id=28239
Old revision New revision Changes Path
1.7 1.8 +12 -0 appdb/include/query.php
Index: appdb/include/query.php
diff -u -p appdb/include/query.php:1.7 appdb/include/query.php:1.8
--- appdb/include/query.php:1.7 26 Sep 2006 2:10:59 -0000
+++ appdb/include/query.php 26 Sep 2006 2:10:59 -0000
@@ -138,6 +138,16 @@ function query_bugzilladb($sQuery,$sComm
function query_error($sQuery, $sComment="")
{
+ static $bInQueryError = false;
+
+ // if we are already reporting an error we can't report it again
+ // as that indicates that error reporting itself produced an error
+ if($bInQueryError)
+ return;
+
+ // record that we are inside of this function, we don't want to recurse
+ $bInQueryError = true;
+
error_log::log_error(ERROR_SQL, "Query: '".$sQuery."' ".
"mysql_errno(): '".mysql_errno()."' ".
"mysql_error(): '".mysql_error()."' ".
@@ -145,6 +155,8 @@ function query_error($sQuery, $sComment=
$sStatusMessage = "<p><b>An internal error has occurred and has been logged and reported to appdb admins</b></p>";
addmsg($sStatusMessage);
+
+ $bInQueryError = false; // clear variable upon exit
}
?>
ChangeSet ID: 28238
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner(a)winehq.org 2006/09/25 21:09:26
Modified files:
include : version.php
Log message:
Chris Morgan <cmorgan(a)alum.wpi.edu>
Version::aBuglinkIds doesn't exist anymore, retrieve buglink ids with Version::get_buglink_ids() and use the returned ids
in Version::delete() in place of the class variable that no longer exists
Patch: http://cvs.winehq.org/patch.py?id=28238
Old revision New revision Changes Path
1.81 1.82 +2 -3 appdb/include/version.php
Index: appdb/include/version.php
diff -u -p appdb/include/version.php:1.81 appdb/include/version.php:1.82
--- appdb/include/version.php:1.81 26 Sep 2006 2: 9:26 -0000
+++ appdb/include/version.php 26 Sep 2006 2: 9:26 -0000
@@ -251,9 +251,8 @@ class Version {
$oUrl->delete($bSilent);
}
-
-
- foreach($this->aBuglinkIds as $iBug_id)
+ $aBuglinkIds = $this->get_buglink_ids();
+ foreach($aBuglinkIds as $iBug_id)
{
$oBug = new Bug($iBug_id);
$oBug->delete($bSilent);
ChangeSet ID: 28237
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner(a)winehq.org 2006/09/25 21:05:55
Modified files:
include : application.php
unit_test : run_tests.php
Added files:
unit_test : test_application.php
Log message:
"EA Durbin" <ead1234(a)hotmail.com>
Chris Morgan <cmorgan(a)alum.wpi.edu>
Application::delete() should retrieve the applications versions immediately prior to deleting to ensure that
an application object created prior to its child versions doesn't leave orphaned versions. Add unit test for
Application::delete() to test for the offending behavior.
Patch: http://cvs.winehq.org/patch.py?id=28237
Old revision New revision Changes Path
1.71 1.72 +27 -9 appdb/include/application.php
1.5 1.6 +2 -1 appdb/unit_test/run_tests.php
Added 1.1 +0 -0 appdb/unit_test/test_application.php
ChangeSet ID: 28235
CVSROOT: /opt/cvs-commit
Module name: lostwages
Changes by: jnewman(a)winehq.org 2006/09/25 15:43:50
Modified files:
templates/en : press.template who.template
wwn : wn20060919_320.xml
Log message:
Francois Gouget <fgouget(a)free.fr>
Assorted spelling fixes.
Patch: http://cvs.winehq.org/patch.py?id=28235
Old revision New revision Changes Path
1.39 1.40 +2 -2 lostwages/templates/en/press.template
1.29 1.30 +1 -1 lostwages/templates/en/who.template
1.3 1.4 +18 -18 lostwages/wwn/wn20060919_320.xml
Index: lostwages/templates/en/press.template
diff -u -p lostwages/templates/en/press.template:1.39 lostwages/templates/en/press.template:1.40
--- lostwages/templates/en/press.template:1.39 25 Sep 2006 20:43:50 -0000
+++ lostwages/templates/en/press.template 25 Sep 2006 20:43:50 -0000
@@ -3,8 +3,8 @@
<h1>Press articles covering Wine</h1>
<ul>
- <li> <a href="http://www.theinquirer.net/default.aspx?article=34181">TheINQUIRER</a> September 6, 2006 - Crossover allows Windows to run on a Mac
- <li> <a href="http://apple.slashdot.org/article.pl?sid=06/09/05/2213244">Slashdot</a> September 5, 2006 - Codeweavers Releases CrossOver For Intel Mac
+ <li> <a href="http://www.theinquirer.net/default.aspx?article=34181">TheINQUIRER</a> September 6, 2006 - CrossOver allows Windows to run on a Mac
+ <li> <a href="http://apple.slashdot.org/article.pl?sid=06/09/05/2213244">Slashdot</a> September 5, 2006 - CodeWeavers Releases CrossOver For Intel Mac
<li> <a href=" http://www.tuxmagazine.com/node/1000223">TuxMagazine</a> September 2, 2006 - Issue #17 Has articles covering Wine and CrossOver Office
<li> <a href="http://www.linux-gamers.net/modules/news/article.php?storyid=1767">Linux-Gamers</a> August 28, 2006 - A tool to capture in-game videos
<li> <a href="http://www.linux-gamers.net/modules/wiwimod/index.php?page=HOWTO%20Steam">Linux-Gamers</a> August 11, 2006 - Steam, Half-Life, Half-Life 2, Counter-Strike 1.6 and Source with Wine
Index: lostwages/templates/en/who.template
diff -u -p lostwages/templates/en/who.template:1.29 lostwages/templates/en/who.template:1.30
--- lostwages/templates/en/who.template:1.29 25 Sep 2006 20:43:50 -0000
+++ lostwages/templates/en/who.template 25 Sep 2006 20:43:50 -0000
@@ -140,7 +140,7 @@ Please email additions, corrections, and
<td></td></tr></table>
<p>
Ex-game and audio developer who now earns a living by doing boring
- web work at a large Polish Internet portal. In his non-existent spare
+ web work at a large Polish Internet portal. In his nonexistent spare
time, he works on the rich text editor clone for Wine.
</p></blockquote>
Index: lostwages/wwn/wn20060919_320.xml
diff -u -p lostwages/wwn/wn20060919_320.xml:1.3 lostwages/wwn/wn20060919_320.xml:1.4
--- lostwages/wwn/wn20060919_320.xml:1.3 25 Sep 2006 20:43:50 -0000
+++ lostwages/wwn/wn20060919_320.xml 25 Sep 2006 20:43:50 -0000
@@ -36,18 +36,18 @@ University of Reading. We were fortunat
donations that paid for the event. Lars Mathiassen and the <a
href="http://www.tightpoker.com">Party Poker Strategy Guide</a> guys contributed
to Wine and paid for the rental of the facilities and the lunch catering. All
-in all, it was came together really well and the entire Wine team was quite
+in all, it came together really well and the entire Wine team was quite
thankful.
</p><p>
While the event officially started on Saturday morning, many people arrived on
-Friday and gathered at a local pub, Queen's Head. We wandered off to an Indian
+Friday and gathered at a local pub, the Queen's Head. We wandered off to an Indian
restaurant for dinner shortly thereafter and then back to the pub. It was good
-to catch up with everyone and meet some new developers. Click on the link
-above to see everyone in attendance. Not pictured were Oliver Stieber and Hans
+to catch up with everyone and meet some of the new developers. Click on the link
+above to see everyone in attendance. Not pictured here were Oliver Stieber and Hans
Leidekker. </p><p>
-As usual, the highlight of Saturday morning was Alexandre's key note to kick
+As usual, the highlight of Saturday morning was Alexandre's keynote to kick
off the conference. There's been a decent amount of changes since the last
time we got together, although these days there are a lot less architectural
changes. One of the highlights since the last conference was the beta release,
@@ -82,7 +82,7 @@ Wine can act as a non-profit organizatio
Delving into technical details, Alexandre began discussing the MacOS port.
It's an area he's been involved in a lot over the past year and for the most
part it works pretty well now. With only a single vendor to deal with it's led
-to fewer compatibility headaches but Alexandre noted that Wine (Codeweavers)
+to fewer compatibility headaches but Alexandre noted that Wine (CodeWeavers)
"gets a lot of help from Apple, they listen to us, but we don't get a lot of
fixes". Their kernel is pretty buggy but perhaps part of that is because,
"Wine is exercising parts of the code no one else is". Performance sucks and
@@ -101,7 +101,7 @@ pretty good. Several things have stabil
libwine. The last change with regard to libwine was the merge of Unicode
support directly into it. The wineserver protocol has mostly stabilized, but
Alexandre doesn't feel it's as necessary as he once thought to have that set in
-stone. Only a few core DLL's need it. Speaking of core DLL's, Alexandre
+stone. Only a few core DLLs need it. Speaking of core DLLs, Alexandre
mentioned he was going to put together a graph showing the decrease in changes
to things like kernel32, ntdll, and user32, but the graphs didn't exactly show
the number decreasing. A small part of that has to do with some of the
@@ -134,7 +134,7 @@ White jokingly suggested "Wine 2007" for
Overall, I'd say the tone was quite positive this year. After WineConf 2004 in
St. Paul there was a general feeling Wine had <i>a lot</i> to get done, even
-more than most people though. After Stuttgart in 2005 everyone was excited
+more than most people thought. After Stuttgart in 2005 everyone was excited
because a beta release release seemed to be around the corner. Now it seems
like 1.0 will be following along shortly. That's not to say Wine works
flawlessly, but the architectural elements are all in place and no one seems to
@@ -147,15 +147,15 @@ lies, and future improvements. </p><p>
Currently the rendering code is now shared between all versions of Direct3D
from version 1 through version 9. There's been a huge improvement in shader
-code with shaders implemented in with GLSL and the GL_ARB_*_program extensions.
+code with shaders implemented with GLSL and the GL_ARB_*_program extensions.
There's support for up to shader model 3.0. </p><p>
But what would a Direct3D presentation be without some eye candy? Stefan
-showed off some screenshots of some games. There was also a small contingent
+showed off screenshots of some games. There was also a small contingent
of DirectX folks in attendance with some really high-powered laptops that could
show off the games. It's quite impressive to see the latest and greatest games
running on Linux. Jon Parshall extensively, um, "tested" World of Warcraft
-throughout the conference (did you finally make it level 48, Jon?) Tom
+throughout the conference (did you finally make it to level 48, Jon?) Tom
Wickline had 3DMark2000, 3DMark2001SE and 3DMark2003 running all of there test.
There is still some artifacts in the rendering of a couple of the test, but the
DirectX guys knew what was to blame for it. Stefan showed off the
@@ -164,10 +164,10 @@ Microsoft DirectX logo "proving" DirectX
Much of the current work surrounds context and state management. It's known
that better state management would improve performance and Wine is taking the
dumb approach right now. Other things on the to-do list include better
-offscreen rendering with FBO's and pbuffers and multithreading support. In the
+offscreen rendering with FBOs and pbuffers and multithreading support. In the
OpenGL world, it seems the decision has been made to move Direct3D to the WGL
framework. This will also allow Wine's Direct3D code to run on Windows as
-well. Talking with Stefan later, it doesn't sound like there will be much of
+well. Talking with Stefan later, it doesn't sound like there will be much of a
performance penalty by going through that layer since the OpenGL calls will
mostly get passed straight through. </p><p>
@@ -226,7 +226,7 @@ Future work involves a lot of bug testin
the code since currently only about 50% of it is covered with tests. Other
hurdles include needing to implement MkParseDisplayName, message filters (the
fact we don't have them could be obscuring other problems right now), and
-making the running object table accessible across process. The hackish way to
+making the running object table accessible across process boundaries. The hackish way to
do the latter would be with shared memory, but since that approach won't be
accepted by Alexandre it'll probably be necessary to create an rpcss.exe that
acts as a controlling process for passing the RPC calls between processes.
@@ -284,7 +284,7 @@ most likely via RPC, and that will requi
We all headed off to a pub for dinner and drinks. CodeWeavers picked up the
tab and thanked everyone for their efforts. During dinner Jeremy White pulled
-out a donation he'd received several years ago from Tom Wickline as bounty for
+out a donation he'd received several years ago from Tom Wickline as a bounty for
getting DirectX working. With the past year worth of efforts, Jeremy felt it
was time to cash in on it. </p><p>
@@ -345,7 +345,7 @@ SHA1 signatures to manage a changed file
Wine's git tree takes up only 90MB of disk space, compared to over 200 for the
old CVS tree. That includes ancient versions of Wine that were added to git
-that never existed in CVS. All in all, there's almost 13 years worth of meta
+and never existed in CVS. All in all, there's almost 13 years worth of meta
data and files. </p><p>
As far as working with git, the general idea seems to be to branch and commit
@@ -373,7 +373,7 @@ could be doing to take the load off him.
We discussed moving code review practices outward a bit so Alexandre doesn't
have to do as much. Right now a lot of new developers get discouraged because
-patches just into the void (as a reminder, just keep bugging Alexandre if that
+patches just fall into the void (as a reminder, just keep bugging Alexandre if that
happens to find out why.) Ideally a patch for, say MSI, would get reviewed by
someone knowledgeable in that area, such as Mike McCormack. In the end we
decided we probably already do that as good as we can and we sort of have de
@@ -409,7 +409,7 @@ pulled from there if needed. </p><p>
Quite a few people were interested in the MacOS work and up to that point it
really hadn't been shown off. Andrew Bogott went to the podium with his Mac
-loaded with the CrossOver beta product and it was quite impressive. The
+loaded with the CrossOver Mac beta and it was quite impressive. The
interface with OS X was quite smooth and exactly like what you'd expect. I had
a new copy of MS Office 2003 lying around and Andrew popped it in and installed
it. Within a few minutes it was running and completely usable. The
ChangeSet ID: 28233
CVSROOT: /opt/cvs-commit
Module name: lostwages
Changes by: jnewman(a)winehq.org 2006/09/25 15:37:56
Modified files:
wwn : wn20050930_292.xml wn20060919_320.xml
Log message:
Tom Wickline <twickline(a)gmail.com>
update wwn 292 to state that builtin usp10.dll is currently
working, update wwn 320 to list all of the benchmarks that were being
run at Wineconf 2006.
Patch: http://cvs.winehq.org/patch.py?id=28233
Old revision New revision Changes Path
1.5 1.6 +2 -0 lostwages/wwn/wn20050930_292.xml
1.2 1.3 +5 -5 lostwages/wwn/wn20060919_320.xml
Index: lostwages/wwn/wn20050930_292.xml
diff -u -p lostwages/wwn/wn20050930_292.xml:1.5 lostwages/wwn/wn20050930_292.xml:1.6
--- lostwages/wwn/wn20050930_292.xml:1.5 25 Sep 2006 20:37:56 -0000
+++ lostwages/wwn/wn20050930_292.xml 25 Sep 2006 20:37:56 -0000
@@ -395,6 +395,8 @@ Try the
will need to fill out the ScriptFreeCache entry in the spec file).
</p></quote>
+<p>Update 09/23/06: builtin usp10.dll currently works with Lotus Notes.</p>
+
</section>
<section
Index: lostwages/wwn/wn20060919_320.xml
diff -u -p lostwages/wwn/wn20060919_320.xml:1.2 lostwages/wwn/wn20060919_320.xml:1.3
--- lostwages/wwn/wn20060919_320.xml:1.2 25 Sep 2006 20:37:56 -0000
+++ lostwages/wwn/wn20060919_320.xml 25 Sep 2006 20:37:56 -0000
@@ -156,10 +156,10 @@ of DirectX folks in attendance with some
show off the games. It's quite impressive to see the latest and greatest games
running on Linux. Jon Parshall extensively, um, "tested" World of Warcraft
throughout the conference (did you finally make it level 48, Jon?) Tom
-Wickline had 3DMark2003 running most demos. There are still quite a few
-artifacts in a lot of the rendering, but the DirectX guys usually knew what was
-to blame for it. Stefan showed off the Microsoft DirectX logo "proving"
-DirectX is properly detected. </p><p>
+Wickline had 3DMark2000, 3DMark2001SE and 3DMark2003 running all of there test.
+There is still some artifacts in the rendering of a couple of the test, but the
+DirectX guys knew what was to blame for it. Stefan showed off the
+Microsoft DirectX logo "proving" DirectX is being properly detected. </p><p>
Much of the current work surrounds context and state management. It's known
that better state management would improve performance and Wine is taking the
@@ -199,7 +199,7 @@ with them and that's a problem. Another
we noted above there's work being done on that area. </p><p>
Phil Costin brought up another topic that needs to be addressed: figuring out
-how much video memory cards have. Currently Wine just reports 16MB available,
+how much video memory cards have. Currently Wine just reports 64MB available,
however games really need to know the true amount so they know how many
textures can be uploaded. One idea was to just stuff textures into memory
until no more fit, however there's never a point with OpenGL where no more fit.