Module: wine
Branch: master
Commit: 1451998c326f8b90c91b8b3c835bbf413c710b0a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1451998c326f8b90c91b8b3c8…
Author: Vitaliy Margolen <wine-patches(a)kievinfo.com>
Date: Sat Mar 29 13:21:22 2008 -0600
net: Update help.
---
programs/net/En.rc | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/programs/net/En.rc b/programs/net/En.rc
index aff6d1d..913dcc4 100644
--- a/programs/net/En.rc
+++ b/programs/net/En.rc
@@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
STRINGTABLE
{
- STRING_USAGE, "The syntax of this command is:\n\nNET [ HELP | START | STOP ]\n"
+ STRING_USAGE, "The syntax of this command is:\n\nNET [ HELP | START | STOP | USE]\n"
STRING_START_USAGE, "Specify service name to start.\n"
STRING_STOP_USAGE, "Specify service name to stop.\n"
STRING_STOP_DEP, "Stopping dependent service: %s\n"
@@ -36,8 +36,9 @@ STRINGTABLE
STRING_STOP_SVC, "The %s service is stopping.\n"
STRING_STOP_SVC_SUCCESS, "The %s service was stopped successfully.\n"
STRING_STOP_SVC_FAIL, "The %s service failed to stop.\n"
- STRING_HELP_USAGE, "The syntax of this command is:\n\nNET HELP command\n -or-\nNET command /HELP\n\n Commands available are:\n NET HELP NET START NET STOP\n"
+ STRING_HELP_USAGE, "The syntax of this command is:\n\nNET HELP command\n -or-\nNET command /HELP\n\n"\
+ " Commands available are:\n NET HELP NET START NET STOP NET USE\n"
STRING_NO_ENTRIES, "There are no entries in the list.\n"
- STRING_USE_HEADER, "\nStatus Local Remote\n---------------------------------------------------------------\n"
- STRING_USE_ENTRY, "%s %S %S Open resources: %lu\n"
+ STRING_USE_HEADER, "\nStatus Local Remote\n---------------------------------------------------------------\n"
+ STRING_USE_ENTRY, "%s %S %S Open resources: %lu\n"
}
Module: wine
Branch: master
Commit: 76014205de3cbd73fe761db8f86fcdb178bb0189
URL: http://source.winehq.org/git/wine.git/?a=commit;h=76014205de3cbd73fe761db8f…
Author: Roderick Colenbrander <thunderbird2k(a)gmx.net>
Date: Sat Mar 29 14:48:15 2008 +0000
wined3d: Fix a postpixelshader_blending bug.
---
dlls/d3d9/tests/visual.c | 2 +-
dlls/wined3d/state.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 8916649..a129621 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -7857,7 +7857,7 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device)
* reports. On Vista Nvidia seems to report 0x00ffffff on Geforce7 cards. */
color = getPixelColor(device, 320, 240);
trace("[No blending] %s: expected %x or 0x00ffffff, result=%x\n", test_formats[fmt_index].fmtName, test_formats[fmt_index].resultColorNoBlending, color);
- todo_wine ok((color == 0x00ffffff) || (color == test_formats[fmt_index].resultColorNoBlending), "Offscreen failed for %s: expected garbage but color %#08x, matches the result we would have with blending. (todo)\n", test_formats[fmt_index].fmtName, color);
+ ok((color == 0x00ffffff) || (color == test_formats[fmt_index].resultColorNoBlending), "Offscreen failed for %s: expected no color blending but received it anyway.\n", test_formats[fmt_index].fmtName);
}
IDirect3DDevice9_SetTexture(device, 0, NULL);
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 1718273..8a8a634 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -246,8 +246,9 @@ static void state_blend(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D
const GlPixelFormatDesc *glDesc;
getFormatDescEntry(target->resource.format, &GLINFO_LOCATION, &glDesc);
- /* When pixel shaders are used on a format that doesn't offer blending, disable blending else we could face a big performance penalty. */
- if(!(glDesc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING) && use_ps(stateblock->wineD3DDevice)) {
+ /* Disable blending in all cases even without pixelshaders. With blending on we could face a big performance penalty.
+ * The d3d9 visual test confirms the behavior. */
+ if(!(glDesc->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) {
glDisable(GL_BLEND);
checkGLcall("glDisable GL_BLEND");
return;