Module: wine
Branch: master
Commit: 78d963039bb64b20dd469a26da0837d24f1e496d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d963039bb64b20dd469a26d…
Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date: Thu Jun 12 20:54:27 2008 +0200
wined3d: Do not PreLoad the new render target.
There is no reason to do that, now that the SetGLTextureDesc bug is
fixed. This avoids an infinite recursion because PreLoad calls
ActivateContext at some point.
---
dlls/wined3d/context.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 5eb1f6d..203152b 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -943,13 +943,6 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf
break;
}
- if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) {
- /* Make sure we have a OpenGL texture name so the PreLoad() used to read the buffer
- * back when we are done won't mark us dirty.
- */
- IWineD3DSurface_PreLoad(target);
- }
-
if(!oldRenderOffscreen) {
Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable);
Context_MarkStateDirty(context, STATE_VDECL, StateTable);
Module: wine
Branch: master
Commit: 6ab3d17104ddfcbe489d2a9ca21ded83ae559b93
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab3d17104ddfcbe489d2a9ca…
Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date: Thu Jun 12 20:48:33 2008 +0200
wined3d: Remove a broken AddDirtyRect call.
---
dlls/wined3d/surface.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index adddaa9..d892031 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -628,7 +628,16 @@ void WINAPI IWineD3DSurfaceImpl_SetGlTextureDesc(IWineD3DSurface *iface, UINT te
TRACE("(%p) : setting textureName %u, target %i\n", This, textureName, target);
if (This->glDescription.textureName == 0 && textureName != 0) {
IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE);
- IWineD3DSurface_AddDirtyRect(iface, NULL);
+ if((This->Flags & SFLAG_LOCATIONS) == 0) {
+ /* In 1.0-rc4 and earlier, AddDirtyRect was called in the place of this if condition.
+ * This had the problem that a correctly set INDRAWABLE flag was removed if the PreLoad
+ * during the offscreen rendering readback triggered the creation of the GL texture.
+ * The change intended to keep the INDRAWABLE intact. To prevent unintended side effects
+ * before release, set the INSYSMEM flag like the old AddDirtyRect did.
+ */
+ WARN("Wine 1.0 safety path hit\n");
+ This->Flags |= SFLAG_INSYSMEM;
+ }
}
if(target == GL_TEXTURE_RECTANGLE_ARB && This->glDescription.target != target) {
This->Flags &= ~SFLAG_NORMCOORD;
Module: appdb
Branch: master
Commit: d995dc1a1688e2503144028693fc3503bf59efa8
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d995dc1a1688e25031440286…
Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com>
Date: Fri Jun 13 12:42:39 2008 +1000
enforce duties of maintainers by reminding them sooner and removing their maintainer status if nothing is done in 6 days.
---
include/maintainer.php | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/maintainer.php b/include/maintainer.php
index 2226934..7ad0a86 100644
--- a/include/maintainer.php
+++ b/include/maintainer.php
@@ -7,7 +7,7 @@ require_once(BASE."include/version.php");
require_once(BASE."include/user.php");
//FIXME: when we have php5 move this into the maintainer class as a constant var
-define('iNotificationIntervalDays', 7); // days between each notification level
+define('iNotificationIntervalDays', 2); // days between each notification level
// class that can retrieve the queued entries for a given maintainer instance
class queuedEntries
@@ -1294,15 +1294,17 @@ class maintainer
$oNotificationUpdate->sMsg.= " If the queued entries are not processsed within";
$oNotificationUpdate->sMsg.= " the next ".iNotificationIntervalDays. " days we will";
$oNotificationUpdate->sMsg.= " remove your maintainership for this application/version";
- $oNotificationUpdate->sMsg.= " so a more active person can fill the spot.";
+ $oNotificationUpdate->sMsg.= " so a more active person can fill the spot.".
+ " It's important to process queued items in a timely manner".
+ " to provide a good user experience.";
break;
case 3: // remove their maintainership and notify the maintainer why we are doing so
$oNotificationUpdate->sMsg.= "\nThis your third notification of queued entries.";
$oNotificationUpdate->sMsg.= " Because your queued entries have not been processed";
$oNotificationUpdate->sMsg.= " after two notifications we are removing your maintainer";
$oNotificationUpdate->sMsg.= " role for this application/version. Removing inactive";
- $oNotificationUpdate->sMsg.= " maintainers lets us free up slots for other potential";
- $oNotificationUpdate->sMsg.= " maintainers.\n";
+ $oNotificationUpdate->sMsg.= " maintainers makes our job easier, since we want to know"
+ ." not to wait for a maintainer to oversee submissions.";
$oNotificationUpdate->sMsg.= " If you are still interested in being a maintainer please";
$oNotificationUpdate->sMsg.= " submit a maintainer request.";
$this->delete(); // delete ourselves from the database
Module: docs
Branch: master
Commit: 1e0e47035f5a80f7847c94c8c96265fa39031d67
URL: http://source.winehq.org/git/docs.git/?a=commit;h=1e0e47035f5a80f7847c94c8c…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Thu Jun 12 14:18:48 2008 +0200
wineusr-guide: Removed some obsolete information.
---
en/wineusr-bugs.sgml | 79 ++-----------------------------------------
en/wineusr-configuring.sgml | 25 ++++++++------
en/wineusr-running.sgml | 1 -
3 files changed, 17 insertions(+), 88 deletions(-)
diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml
index 94ef63e..753129d 100644
--- a/en/wineusr-bugs.sgml
+++ b/en/wineusr-bugs.sgml
@@ -69,12 +69,6 @@
Make sure that there are no problems whatsoever with the
packages
that Wine depends on (gcc, glibc, X libraries, OpenGL (!), ...)
-
- E.g. some people have strange failures to find stuff when
- using "wrong" header files for the "right" libraries !!!
- (which results in days of debugging to desperately try to find
- out why that lowlevel function fails in a way that is completely
- beyond imagination... ARGH !)
</para>
</sect2>
@@ -82,9 +76,8 @@
<title>Use different GUI (Window Manager) modes</title>
<para>
- Instruct Wine via config file to use either desktop mode,
- managed mode or plain ugly "normal" mode.
- That can make one hell of a difference, too.
+ Instruct Wine via Winecfg to use either desktop mode,
+ or normal managed mode. That can make a lot of difference, too.
</para>
</sect2>
@@ -98,14 +91,6 @@
Some might work in the future, though.
(the CD-ROM layer isn't really full-featured yet).
</para>
-
- <para>
- Go to <ulink
- url="http://www.gamecopyworld.com">GameCopyWorld</ulink>
- and try to find a decent crack for your game that gets rid of
- that ugly copy protection.
- I hope you do have a legal copy of the program, though... :-)
- </para>
</sect2>
<sect2>
@@ -116,8 +101,6 @@
dramatic impact.
Configure Wine to do the opposite of what you used to have.
-
- Also, install DCOM98 or DCOM95. This can be very beneficial.
</para>
</sect2>
@@ -134,11 +117,7 @@
Use the setup process that's recommended for your Wine distribution
to create new configuration.
Use information in old <filename>~/.wine</filename>
- directory as a reference.
- For source wine distribution to configure Wine run
- tools/wineinstall script as a user you want to do the configuration
- for.
- This is a pretty safe operation. Later you can remove the new
+ directory as a reference. Later you can remove the new
<filename>~/.wine</filename> directory and rename your old one back.
</para>
</sect2>
@@ -359,57 +338,6 @@
of the problem you are researching. See wine man page for full list
of the parameters.
</para>
- <para>
- To get the trace output, use one of the following methods:
- </para>
- <sect3>
- <title>The Easy Way</title>
- <orderedlist>
- <listitem>
- <para>
- This method is meant to allow even a total novice to
- submit a relevant trace log in the event of a crash.
- </para>
- <para>
- Your computer <emphasis>must</emphasis> have perl on it
- for this method to work. To find out if you have perl,
- run <command>which perl</command>. If it returns something like
- <filename>/usr/bin/perl</filename>, you're in business.
- Otherwise, skip on down to "The Hard Way". If you aren't
- sure, just keep on going. When you try to run the
- script, it will become <emphasis>very</emphasis> apparent
- if you don't have perl.
- </para>
- </listitem>
- <listitem>
- <para>
- Change directory to <filename><dirs to wine>/tools</filename>
- </para>
- </listitem>
- <listitem>
- <para>
- Type in <command>./bug_report.pl</command> and follow
- the directions.
- </para>
- </listitem>
- <listitem>
- <para>
- Post the bug to
- <ulink url="http://bugs.winehq.org/">Wine Bugzilla</ulink>.
- Please, search Bugzilla database to check whether your problem is
- already found before posting a bug report.
- Include your own detailed description of the problem with
- relevant information. Attach the "Nice Formatted Report"
- to the submitted bug. Do not cut and paste the report
- in the bug description - it is pretty big.
- Keep the full debug output in case it will be needed by
- Wine developers.
- </para>
- </listitem>
- </orderedlist>
- </sect3>
- <sect3>
- <title>The Hard Way</title>
<para>
It is likely that only the last 100 or so lines of the
trace are necessary to find out where the program crashes.
@@ -491,7 +419,6 @@
output file <filename>report_file</filename> to the original
bug report and add any other relevant information.
</para>
- </sect3>
</sect2>
</sect1>
</chapter>
diff --git a/en/wineusr-configuring.sgml b/en/wineusr-configuring.sgml
index e18b291..e990345 100644
--- a/en/wineusr-configuring.sgml
+++ b/en/wineusr-configuring.sgml
@@ -525,16 +525,20 @@
</varlistentry>
</variablelist>
<para>
- These files are automatically created by
- <command>wineprefixcreate</command> the first time you use
+ These files are automatically created the first time you use
Wine. A set of global settings is stored in the
- <filename>c:\windows\inf\wine.inf</filename> and is processed by the
- <filename>rundll32.exe</filename> program. The first time you run
- Wine the <filename>wine.inf</filename> file gets processed to
- populate the initial registry. For more details, check
- out the <filename>wineprefixcreate</filename> script to see how
- it's all done. After updating Wine, <command>wineprefixcreate</command>
- can also be used to update the default registry entries.
+ <filename>wine.inf</filename> file and is processed by
+ the <filename>rundll32.exe</filename> program. The first
+ time you run Wine the <filename>wine.inf</filename> file
+ gets processed to populate the initial registry. The
+ registry is also updated automatically
+ if <filename>wine.inf</filename> changes, for instance when
+ upgrading to a newer Wine version.
+ </para>
+ <para>
+ Note: Older Wine versions (before 1.0) required you to run
+ the <command>wineprefixcreate</command> command manually to
+ upgrade your settings. This is no longer necessary.
</para>
<para>
Like we mentioned, you can edit those .reg files using whatever text
@@ -607,8 +611,7 @@
the registry settings are compatible with the drive mappings
in <filename>~/.wine/dosdevices</filename>
of each individual user. As a general rule of thumb, the closer
- you keep your drive mappings to the default configuration
- provided by <command>wineprefixcreate</command>, the easier
+ you keep your drive mappings to the default configuration, the easier
this will be to manage. You may or may not be able to share
some or all of the actual "<filename>c:</filename>" drive you
originally installed the application to. Some applications
diff --git a/en/wineusr-running.sgml b/en/wineusr-running.sgml
index 99f3d4d..f36383f 100644
--- a/en/wineusr-running.sgml
+++ b/en/wineusr-running.sgml
@@ -78,7 +78,6 @@
</para>
<para>
<screen>
-Wine 20040405
Usage: wine PROGRAM [ARGUMENTS...] Run the specified program
wine --help Display this help and exit
wine --version Output version information and exit