March 2008 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IActiveScriptSite::GetItemInfo implementation.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 438350321163d99497a667000e9f5358be4e54bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=438350321163d99497a667000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Mar 29 17:35:15 2008 +0000 mshtml: Added IActiveScriptSite::GetItemInfo implementation. --- dlls/mshtml/script.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6d41d32..a33e8db 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -255,8 +255,27 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC DWORD dwReturnMask, IUnknown **ppiunkItem, ITypeInfo **ppti) { ScriptHost *This = ACTSCPSITE_THIS(iface); - FIXME("(%p)->(%s %x %p %p)\n", This, debugstr_w(pstrName), dwReturnMask, ppiunkItem, ppti); - return E_NOTIMPL; + + TRACE("(%p)->(%s %x %p %p)\n", This, debugstr_w(pstrName), dwReturnMask, ppiunkItem, ppti); + + if(dwReturnMask != SCRIPTINFO_IUNKNOWN) { + FIXME("Unsupported mask %x\n", dwReturnMask); + return E_NOTIMPL; + } + + *ppiunkItem = NULL; + + if(strcmpW(pstrName, windowW)) + return DISP_E_MEMBERNOTFOUND; + + if(!This->doc) + return E_FAIL; + + /* FIXME: Return proxy object */ + *ppiunkItem = (IUnknown*)HTMLWINDOW2(This->doc->window); + IUnknown_AddRef(*ppiunkItem); + + return S_OK; } static HRESULT WINAPI ActiveScriptSite_GetDocVersionString(IActiveScriptSite *iface, BSTR *pbstrVersion)

1 0

Alexander Nicolaysen Sørnes : kernel32: Set processorLevel to cpu family.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 10e9c6bfd17b05dbd7a98fa5f7ee3422bee7995a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10e9c6bfd17b05dbd7a98fa5f… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Mar 30 00:44:19 2008 +0100 kernel32: Set processorLevel to cpu family. --- dlls/kernel32/cpu.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index a2ecb34..a49df99 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -454,19 +454,10 @@ VOID WINAPI GetSystemInfo( case 5: cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; cachedsi.wProcessorLevel= 5; break; - case 6: cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.wProcessorLevel= 6; - break; - case 1: /* two-figure levels */ - if (value[1] == '5') - { - cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; - cachedsi.wProcessorLevel= 6; - break; - } - /* fall through */ + default: - FIXME("unknown cpu family '%s', please report ! (-> setting to 386)\n", value); + cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM; + cachedsi.wProcessorLevel = atoi(value); break; } }

1 0

Vitaliy Margolen : net: Update help.
by Alexandre Julliard 31 Mar '08

31 Mar '08

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" }

1 0

Vitaliy Margolen : mshtml: Add Russian translation.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 0350c39110f4c5545a31e68ea44f2d9910ee506b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0350c39110f4c5545a31e68ea… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Mar 29 13:21:25 2008 -0600 mshtml: Add Russian translation. --- dlls/mshtml/Ru.rc | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/rsrc.rc | 1 + 2 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc new file mode 100644 index 0000000..3c8207f --- /dev/null +++ b/dlls/mshtml/Ru.rc @@ -0,0 +1,55 @@ +/* + * Copyright 2008 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "� �� HTML ��." + IDS_HTMLDOCUMENT "�� HTML" + IDS_DOWNLOADING "��..." + IDS_INSTALLING "��..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "�� HTML ��. �� Wine �� " \ + "�� Gecko (Mozilla HTML engine). �� , �� Wine " \ + "�� Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT + CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "��" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "�� ", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&��:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&��:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/mshtml/rsrc.rc b/dlls/mshtml/rsrc.rc index 97c1900..dae59c7 100644 --- a/dlls/mshtml/rsrc.rc +++ b/dlls/mshtml/rsrc.rc @@ -44,6 +44,7 @@ #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Ru.rc" #include "Sv.rc" #include "Tr.rc"

1 0

Vitaliy Margolen : Update Russian translations.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 66417eea640c38e97e799ac7919be80405c5b365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66417eea640c38e97e799ac79… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Mar 29 13:21:32 2008 -0600 Update Russian translations. --- dlls/shell32/shell32_Ru.rc | 2 ++ dlls/wininet/wininet_Ru.rc | 5 +++++ programs/net/Ru.rc | 8 ++++++-- programs/winecfg/Ru.rc | 5 ++--- programs/wineconsole/wineconsole_Ru.rc | 15 +++++++++++++++ 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index 4efd62a..ec7ace6 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -143,10 +143,12 @@ CAPTION " FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + PUSHBUTTON "&�� Wine...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 + LTEXT "�� Wine %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 LTEXT "�� Wine:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 } diff --git a/dlls/wininet/wininet_Ru.rc b/dlls/wininet/wininet_Ru.rc index 59506a2..d75985b 100644 --- a/dlls/wininet/wininet_Ru.rc +++ b/dlls/wininet/wininet_Ru.rc @@ -39,3 +39,8 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "��", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP } + +STRINGTABLE DISCARDABLE +{ + IDS_LANCONNECTION "�� " +} diff --git a/programs/net/Ru.rc b/programs/net/Ru.rc index 17c2c81..7a1a870 100644 --- a/programs/net/Ru.rc +++ b/programs/net/Ru.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "��:\n\nNET [ HELP | START | STOP ]\n" + STRING_USAGE, "��:\n\nNET [ HELP | START | STOP | USE ]\n" STRING_START_USAGE, "�� .\n" STRING_STOP_USAGE, "�� .\n" STRING_STOP_DEP, "�� : %s\n" @@ -36,5 +36,9 @@ STRINGTABLE STRING_STOP_SVC, "�� %s.\n" STRING_STOP_SVC_SUCCESS, "�� %s �� .\n" STRING_STOP_SVC_FAIL, "�� %s.\n" - STRING_HELP_USAGE, "��:\n\nNET HELP ��\n -��-\nNET �� /HELP\n\n �� :\n NET HELP NET START NET STOP\n" + STRING_HELP_USAGE, "��:\n\nNET HELP ��\n -��-\nNET �� /HELP\n\n"\ + " �� :\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "�� .\n" + STRING_USE_HEADER, "\n�� \n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S �� : %lu\n" } diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 910c04f..d358588 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -69,13 +69,12 @@ BEGIN CONTROL "�� DirectX �� ",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,14,235,8 CONTROL "�� Wine",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,34,230,8 + CONTROL "�� ",IDC_ENABLE_DESKTOP,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 LTEXT "�� , �� '�� ' �� . �� , �� , �� .", IDC_STATIC,15,117,228,36 LTEXT "�� :",IDC_DESKTOP_SIZE,15,167,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,167,8,8,WS_DISABLED - CONTROL "�� ",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,152,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED EDITTEXT IDC_DESKTOP_HEIGHT,117,167,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 8eea4df..3fc25b4 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -38,6 +38,21 @@ IDS_DLG_TIT_DEFAULT, " IDS_DLG_TIT_CURRENT, "�� - �� " IDS_DLG_TIT_ERROR, "�� " IDS_DLG_ERR_SBWINSIZE, "�� " + +IDS_CMD_INVALID_EVENT_ID "wineconsole: �� \n" +IDS_CMD_INVALID_BACKEND "wineconsole: �� backend\n" +IDS_CMD_INVALID_OPTION "wineconsole: �� \n" +IDS_CMD_ABOUT "�� Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole: �� '%s'.\n"\ + "�� .\n" + +IDS_USAGE_HEADER "\n��:\n wineconsole [��] <��>\n\n��:\n" +IDS_USAGE_BACKEND " --backend={user|curses} �� 'user' �� \n"\ + " �� . 'curses' - ��\n"\ + " �� \n"\ +IDS_USAGE_COMMAND " <��> �� Wine\n" +IDS_USAGE_FOOTER "\n��:\n wineconsole cmd\n�� Wine � �� Wine\n\n" + END IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105

1 0

Andrew Talbot : user32: Void functions should not return a value.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: c9566d556cbca61da444c8face74a2abcc14bd71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9566d556cbca61da444c8fac… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 29 19:10:23 2008 +0000 user32: Void functions should not return a value. --- dlls/user32/driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 94a7fff..1251ee4 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -702,8 +702,8 @@ static void loaderdrv_SetWindowPos( HWND hwnd, HWND insert_after, UINT swp_flags const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, const RECT *valid_rects ) { - return load_driver()->pSetWindowPos( hwnd, insert_after, swp_flags, window_rect, - client_rect, visible_rect, valid_rects ); + load_driver()->pSetWindowPos( hwnd, insert_after, swp_flags, window_rect, + client_rect, visible_rect, valid_rects ); } static int loaderdrv_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )

1 0

Michael Stefaniuc : notepad: Update the German translation.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 8a8d50a9de180c450254efbd2fabae9053ddd24e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8d50a9de180c450254efbd2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Mar 29 23:22:45 2008 +0100 notepad: Update the German translation. --- programs/notepad/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/De.rc b/programs/notepad/De.rc index 569a805..2739b27 100644 --- a/programs/notepad/De.rc +++ b/programs/notepad/De.rc @@ -59,7 +59,7 @@ POPUP "&Hilfe" { MENUITEM "&Suchen...", CMD_HELP_SEARCH MENUITEM "&Hilfe benutzen", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad...", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&�ber Notepad...", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Michael Stefaniuc : wordpad: Update the German translation.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: a1cec6b6191121a224db321fa78b9eb5ba6ede7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cec6b6191121a224db321fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Mar 29 23:23:07 2008 +0100 wordpad: Update the German translation. --- programs/wordpad/De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/De.rc b/programs/wordpad/De.rc index c5be02f..bf5b1e1 100644 --- a/programs/wordpad/De.rc +++ b/programs/wordpad/De.rc @@ -57,7 +57,7 @@ BEGIN MENUITEM "Zeichen&format", ID_EDIT_CHARFORMAT MENUITEM "&Standardzeichenformat", ID_EDIT_DEFCHARFORMAT MENUITEM "&Absatzformat", ID_EDIT_PARAFORMAT - MENUITEM "&Get text", ID_EDIT_GETTEXT + MENUITEM "&Text holen", ID_EDIT_GETTEXT END END POPUP "&Ansicht" @@ -213,8 +213,8 @@ BEGIN STRING_PREVIEW_PRINT, "&Drucken" STRING_PREVIEW_NEXTPAGE, "&N�chste" STRING_PREVIEW_PREVPAGE, "&Vorherige" - STRING_PREVIEW_TWOPAGES, "Two pages" - STRING_PREVIEW_ONEPAGE, "One page" + STRING_PREVIEW_TWOPAGES, "Zwei Seiten" + STRING_PREVIEW_ONEPAGE, "Eine Seite" STRING_PREVIEW_CLOSE, "&Schlie�en" END

1 0

Dmitry Timoshkov : wine.inf: Update timezone information.
by Alexandre Julliard 31 Mar '08

31 Mar '08

Module: wine Branch: master Commit: 529f25dc60f385f7e037886f42187e79c6e517f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529f25dc60f385f7e037886f4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Mar 30 18:38:39 2008 +0900 wine.inf: Update timezone information. --- tools/wine.inf | 542 +++++++++++++++++++++++++++++--------------------------- 1 files changed, 277 insertions(+), 265 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=529f25dc60f385f7e0378…

1 0

Roderick Colenbrander : wined3d: Fix a postpixelshader_blending bug.
by Alexandre Julliard 31 Mar '08

31 Mar '08

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;

1 0