Module: appdb
Branch: master
Commit: 95a38adbdc8d9c0f6647db2720c3722653430061
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=95a38adbdc8d9c0f6647db27…
Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com>
Date: Tue May 6 12:54:43 2008 +1000
Update the AppDB general help page, also make it valid html.
---
help/generic.help | 55 +++++++++++++++++++++++++++--------------------------
1 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/help/generic.help b/help/generic.help
index 160fda3..eb8e04b 100644
--- a/help/generic.help
+++ b/help/generic.help
@@ -1,34 +1,36 @@
<!--TITLE: General help on running appliations under Wine -->
-This is meant as generic instructions in case an AppDB entry
-for a certain program doesn't exist.
+<center>This is meant as a general guide in case an AppDB entry
+for a certain program hasn't been created.</center>
<ol>
-<li> Make sure your Wine release is recent.</li><p>
+<li> Make sure your Wine release is recent.<p>
<ul>
- <li><a href="http://www.winehq.org/site/download"> Official WineHQ builds</a>
- for Linux Red Hat, Mandrake, SuSE, Slackware and FreeBSD, hosted by
+ <li><a href="http://www.winehq.org/site/download"> Official WineHQ builds</a>
+ for all the popular platforms and distributions, hosted by
<a href="http://sourceforge.net/project/showfiles.php?group_id=6241">SourceForge.net</a>.</li>
- <li><a href="http://www.winehq.org/site/cvs">Official WineHQ Source</a> for information on how to
- build and install Wine via source read over the
- <a href="http://www.winehq.org/site/howto"> Wine HowTo</a>.</li>
- </ul>
- <p>
+ <li>Consult <a href="http://www.winehq.org/site/git">the git instructions</a> for information on obtaining the latest source.
+ <p>For how to build and install Wine via source consult the README or for building Wine on a 64bit GNU/Linux read over the
+ <a href="http://wiki.winehq.org/WineOn64bit">WineOn64bit wiki entry</a>.</li>
+ </ul>
+</li>
+<li><p>Run your program by changing into the directory where it is located, and then type 'wine yourprogram.exe'.
+ <br>Alternately your file manager should know to open .exe files with 'wine').</li>
-<li> Run your program (something like ‘wine yourprogram.exe’, or tell your file manager to open .exe files with 'wine').</li><p>
+<li><p>If there is an an error about missing files, or does not start at all, make sure you are in the directory where it was installed.</li>
-<li> If it gives an error about missing files, or does not start at all, try running it from the directory where it was installed.</li><p>
+<li><p> Many newer games contain copy protection, which is sometimes not supported in Wine. <br>Third party applications may be able to circumvent this,
+ when this is required an application cannot be rated higher than Gold</li>
-<li> Many newer games contain copy protection, which is often not supported in Wine. Cracks are available from sites such as <a href="http://www.megagames.com/trainers.html" target="_blank">MegaGames</a>.</li><p>
-
-<li> In case of failure, try different builtin, native DLL settings:
-Run Wine with ‘WINEDEBUG=+loaddll wine yourprogram.exe’ to find out which
+<li><p> In case of failure, try different builtin, native DLL settings:
+Run Wine with 'WINEDEBUG=+loaddll wine yourprogram.exe' to find out which
DLLs are loaded as native or builtin.
-Then make sure appropriate native versions are in the
-c:\windows\system32 directory as configured in Winecfg’s DLL overrides tab. There are four options you can choose from when setting
-dll overrides.</li><p>
+<br>Then make sure appropriate native versions are in the
+c:\windows\system32 directory as configured in winecfg's DLL overrides tab.
+<br>There are four options you can choose from when setting
+dll overrides.<p>
<pre>
(native, builtin)
@@ -36,20 +38,19 @@ dll overrides.</li><p>
(native)
(builtin)
</pre>
+</li>
+<li><p> For sound problems, run ‘winecfg’ and look at the audio tab.</li>
-<li> For sound problems, run ‘winecfg’ and look at the audio tab.</li><p>
-
-<li> In case of persisting failure, you may want to read over the
+<li><p> In case of persisting failure, you may want to read over the
<a href="http://www.winehq.org/site/documentation">Wine Documentation</a>
and you may also want to read the
-<a href="http://www.winehq.org/site/docs/wine-faq/index">Wine FAQ</a>.</li><p>
+<a href="http://www.winehq.org/site/docs/wine-faq/index">Wine FAQ</a>.</li>
-<li> The Wine <a href="http://winehq.org/site/getting_help">'Getting Help'</a> page shows the current methods of getting help with Wine.</li><p>
+<li><p> The Wine <a href="http://www.winehq.org/site/getting_help">'Getting Help'</a> page shows the current methods of getting help with Wine.</li>
-<li> If you have more questions, please contact us
-at <a href="mailto:appdb@winehq.org">appdb(a)winehq.org</a>.</li></p>
+<li><p> If you have more questions, please contact us
+at <a href="mailto:appdb@winehq.org">appdb(a)winehq.org</a>.</li>
</ol>
<p> </p>
-
Module: appdb
Branch: master
Commit: e18e751706bee33a7dbb8efe0d59fd3af745b374
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e18e751706bee33a7dbb8efe…
Author: Jeff Zaroyko <jeffzaroyko(a)gmail.com>
Date: Tue Apr 22 23:49:46 2008 +1000
make the screenshot submission rules more noticeable
---
screenshots.php | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/screenshots.php b/screenshots.php
index 2430e1a..b81c53d 100644
--- a/screenshots.php
+++ b/screenshots.php
@@ -133,9 +133,12 @@ if($hResult && query_num_rows($hResult))
// if the user is logged in
if($aClean['iVersionId'] && $_SESSION['current']->isLoggedIn())
{
- echo "<p align=\"center\">When submitting screenshots please ensure that the focus is on the application running inside Wine.";
- echo "<br>This means if the application is running in a window then please crop the image so that only the application is shown and not your desktop.";
- echo "<br>Do not upload screenshots of error messages, installers, game menus etc.</p>";
+ echo "<p align=\"center\">";
+ echo "<table><tr><th>Please follow these simple rules</th></tr>";
+ echo "<tr><td><ul>";
+ echo "<li>Do not upload screenshots of error messages, installers, game menus etc.</li>";
+ echo "<li>Crop the image so that only the application is shown and not your desktop.</li>";
+ echo "</ul></td></tr></table></p>";
echo '<form enctype="multipart/form-data" action="screenshots.php" name="sImageForm" method="post">',"\n";
echo html_frame_start("Upload Screenshot","400","",0);
Module: wine
Branch: master
Commit: 76029ee9ec73940b738f5c5cc6b6bc04120e7309
URL: http://source.winehq.org/git/wine.git/?a=commit;h=76029ee9ec73940b738f5c5cc…
Author: Dylan Smith <dylan.ah.smith(a)gmail.com>
Date: Mon May 5 15:11:50 2008 -0400
richedit: The wrong bits were cleared from wBorders in PARAFORMAT2.
---
dlls/riched20/editor.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 9e93091..1ae0e23 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -620,31 +620,31 @@ static void ME_RTFParAttrHook(RTF_Info *info)
case rtfBorderSingle:
ME_GetSelectionParaFormat(info->editor, &fmt);
/* we assume that borders have been created before (RTF spec) */
- fmt.wBorders &= ~0x70;
+ fmt.wBorders &= ~0x700;
fmt.wBorders |= 1 << 8;
break;
case rtfBorderThick:
ME_GetSelectionParaFormat(info->editor, &fmt);
/* we assume that borders have been created before (RTF spec) */
- fmt.wBorders &= ~0x70;
+ fmt.wBorders &= ~0x700;
fmt.wBorders |= 2 << 8;
break;
case rtfBorderShadow:
ME_GetSelectionParaFormat(info->editor, &fmt);
/* we assume that borders have been created before (RTF spec) */
- fmt.wBorders &= ~0x70;
+ fmt.wBorders &= ~0x700;
fmt.wBorders |= 10 << 8;
break;
case rtfBorderDouble:
ME_GetSelectionParaFormat(info->editor, &fmt);
/* we assume that borders have been created before (RTF spec) */
- fmt.wBorders &= ~0x70;
+ fmt.wBorders &= ~0x700;
fmt.wBorders |= 7 << 8;
break;
case rtfBorderDot:
ME_GetSelectionParaFormat(info->editor, &fmt);
/* we assume that borders have been created before (RTF spec) */
- fmt.wBorders &= ~0x70;
+ fmt.wBorders &= ~0x700;
fmt.wBorders |= 11 << 8;
break;
case rtfBorderWidth:
Module: wine
Branch: master
Commit: 7b5561cbb8bd24d64aaa06f42876f4e4e1e3f3f5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5561cbb8bd24d64aaa06f42…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net>
Date: Sat May 3 14:37:09 2008 +0000
wined3d: Allow stencil support when it wasn't requested on broken drivers.
---
dlls/wined3d/context.c | 6 ++++--
dlls/wined3d/directx.c | 23 ++++++++++++++++++++++-
dlls/wined3d/wined3d_private.h | 1 +
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index 3341555..14d8fce 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -169,8 +169,10 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, WINED3DF
exactDepthMatch = FALSE;
/* In all cases make sure the number of stencil bits matches our requirements
- * even when we don't need stencil because it could affect performance */
- if(!(cfgs->stencilSize == stencilBits))
+ * even when we don't need stencil because it could affect performance EXCEPT
+ * on cards which don't offer depth formats without stencil like the i915 drivers
+ * on Linux. */
+ if(stencilBits != cfgs->stencilSize && !(This->adapter->brokenStencil && stencilBits <= cfgs->stencilSize))
continue;
/* Check multisampling support */
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 8ac6473..32f7323 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1706,7 +1706,9 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const WineD3D_Pixel
if(!(cfg->depthSize == depthSize || (!lockable && cfg->depthSize > depthSize)))
return FALSE;
- if(cfg->stencilSize != stencilSize)
+ /* Some cards like Intel i915 ones only offer D24S8 but lots of games also need a format without stencil, so
+ * allow more stencil bits than requested. */
+ if(cfg->stencilSize < stencilSize)
return FALSE;
return TRUE;
@@ -3839,6 +3841,7 @@ BOOL InitAdapters(void) {
int values[10];
int nAttribs = 0;
int res;
+ int i;
WineD3D_PixelFormat *cfgs;
int attribute;
DISPLAY_DEVICEW DisplayDevice;
@@ -3953,6 +3956,24 @@ BOOL InitAdapters(void) {
cfgs++;
}
+ /* D16, D24X8 and D24S8 are common depth / depth+stencil formats. All drivers support them though this doesn't
+ * mean that the format is offered in hardware. For instance Geforce8 cards don't have offer D16 in hardware
+ * but just fake it using D24(X8?) which is fine. D3D also allows that.
+ * Some display drivers (i915 on Linux) only report mixed depth+stencil formats like D24S8. MSDN clearly mentions
+ * that only on lockable formats (e.g. D16_locked) the bit order is guaranteed and that on other formats the
+ * driver is allowed to consume more bits EXCEPT for stencil bits.
+ *
+ * Mark an adapter with this broken stencil behavior.
+ */
+ Adapters[0].brokenStencil = TRUE;
+ for(i=0, cfgs=Adapters[0].cfgs; i<Adapters[0].nCfgs; i++) {
+ /* Nearly all drivers offer depth formats without stencil, only on i915 this if-statement won't be entered. */
+ if(cfgs[i].depthSize && !cfgs[i].stencilSize) {
+ Adapters[0].brokenStencil = FALSE;
+ break;
+ }
+ }
+
fixup_extensions(&Adapters[0].gl_info);
WineD3D_ReleaseFakeGLContext();
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 17a8fb0..083b0d8 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -702,6 +702,7 @@ struct WineD3DAdapter
WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */
int nCfgs;
WineD3D_PixelFormat *cfgs;
+ BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */
unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */
unsigned int UsedTextureRam;
};
Module: wine
Branch: master
Commit: 2e04c18cf44c40648ab6610af71f732a8f6a8ef1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e04c18cf44c40648ab6610af…
Author: Kai Blin <kai.blin(a)gmail.com>
Date: Mon May 5 20:17:53 2008 +0200
secur32: Remove test for sft->Reserved8 field.
This seems to be set on Win98.
---
dlls/secur32/tests/secur32.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c
index 99d5069..ceacae2 100644
--- a/dlls/secur32/tests/secur32.c
+++ b/dlls/secur32/tests/secur32.c
@@ -101,7 +101,6 @@ static void test_InitSecurityInterface(void)
ok(sftA->Reserved3 != NULL, "Reserved3 should not be NULL in security function table\n");
todo_wine
ok(sftA->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n");
- ok(!sftA->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftA->Reserved8);
if (!pInitSecurityInterfaceW)
{
@@ -117,7 +116,6 @@ static void test_InitSecurityInterface(void)
ok(sftW->Reserved3 != NULL, "Reserved3 should note be NULL in security function table\n");
todo_wine
ok(sftW->Reserved4 != NULL, "Reserved4 should not be NULL in security function table\n");
- ok(!sftW->Reserved8, "Reserved8 should be NULL instead of %p in security function table\n", sftW->Reserved8);
}
START_TEST(secur32)