wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Detlef Riekenberg : bugzilla: Replace the link for "FIXMEs" with a link for "Regressions"
by Jeremy Newman 19 Feb '08

19 Feb '08

Module: bugzilla Branch: master Commit: 07297528958be3109231c542c9706ae0b8918381 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=07297528958be3109231c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 12 22:48:46 2008 +0100 bugzilla: Replace the link for "FIXMEs" with a link for "Regressions" FIXME is not used as a marker for "High priority bugs" Changelog: Replace the link for "FIXMEs" with a link for "Regressions" -- By by ... Detlef >From 1e54d35fdece27609fb3948ffbb39de229f51edf Mon Sep 17 00:00:00 2001 From: Detlef Riekenebrg <wine.dev(a)web.de> Date: Tue, 12 Feb 2008 22:43:30 +0100 Subject: [PATCH] Replace the FIXME quick link with a quick link for regressions --- template/en/default/global/sidebar.html.tmpl | 2 +- template/en/default/index.html.tmpl | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index cf9e664..5822272 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -32,10 +32,10 @@ bt = 'Task Lists' %] <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.0.0&order=bugs.bug_severity" class="menuItem">Wine 1.0</a></span></td></tr> + <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=regression&keywords_type=anywords" class="menuItem">Regressions</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords" class="menuItem">Tasklist</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklet&keywords_type=anywords" class="menuItem">Tasklets</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=downloads&keywords_type=anywords" class="menuItem">with download</a></span></td></tr> - <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=FIXME&keywords_type=anywords" class="menuItem">FIXMEs</a></span></td></tr> [% INCLUDE global/menu_end.html.tmpl %] [% IF user.id %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 027da7d..ef9213f 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -172,6 +172,10 @@ function addSidebar() { These bugs are scheduled to be fixed before Wine 1.0 is released. </li> + <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Regressions</a><br> + Bugs introduced as result of a regression. + </li> + <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">Task List</a><br> Available large scale tasks. </li> @@ -185,9 +189,6 @@ function addSidebar() { Bugs in downloadable Applications. </li> - <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">FIXMEs</a><br> - High priority bugs. - </li> </ol> <p><a href="http://www.bugzilla.org/docs/3.0/html/">More Help</a> on using Bugzilla.</p>

1 0

Detlef Riekenberg : bugzilla: Add a quick link for downloadable Applications
by Jeremy Newman 19 Feb '08

19 Feb '08

Module: bugzilla Branch: master Commit: 7f6a671eab3732d481f795035ce73bf086f15d18 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=7f6a671eab3732d481f79… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 12 22:47:17 2008 +0100 bugzilla: Add a quick link for downloadable Applications (resend with "bugzilla" in the subject) Add a quick link for bugs in downloadable Applications (it's the most used keyword) -- By by ... Detlef >From 8bba1254a5fb27d88ee94763156a86e974151857 Mon Sep 17 00:00:00 2001 From: Detlef Riekenebrg <wine.dev(a)web.de> Date: Tue, 12 Feb 2008 22:28:33 +0100 Subject: [PATCH] Add a quick link for downloadable Applications --- template/en/default/global/sidebar.html.tmpl | 1 + template/en/default/index.html.tmpl | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/template/en/default/global/sidebar.html.tmpl b/template/en/default/global/sidebar.html.tmpl index 15ec5bd..cf9e664 100644 --- a/template/en/default/global/sidebar.html.tmpl +++ b/template/en/default/global/sidebar.html.tmpl @@ -34,6 +34,7 @@ <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&target_milestone=1.0.0&order=bugs.bug_severity" class="menuItem">Wine 1.0</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklist&keywords_type=anywords" class="menuItem">Tasklist</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=tasklet&keywords_type=anywords" class="menuItem">Tasklets</a></span></td></tr> + <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=downloads&keywords_type=anywords" class="menuItem">with download</a></span></td></tr> <tr class="sideMenu"><td width="100%"><span class="menuItem"> <a href="buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Wine&keywords=FIXME&keywords_type=anywords" class="menuItem">FIXMEs</a></span></td></tr> [% INCLUDE global/menu_end.html.tmpl %] diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index ce0b867..027da7d 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -181,6 +181,10 @@ function addSidebar() { Small tasks available to be worked on. </li> + <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">With download</a><br> + Bugs in downloadable Applications. + </li> + <li><a href="http://bugs.winehq.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&a…">FIXMEs</a><br> High priority bugs. </li>

1 0

Detlef Riekenberg : bugzilla: Increase the width of the Version column
by Jeremy Newman 19 Feb '08

19 Feb '08

Module: bugzilla Branch: master Commit: 027e86601d0ae07771190d8c82133bb292944730 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=027e86601d0ae07771190… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 12 22:17:55 2008 +0100 bugzilla: Increase the width of the Version column The current width is to small to distinguish "0.9.54" and "0.9.55" Increase the width of the Version column -- By by ... Detlef >From 514712038922a2ff29c109f79deafa1d37e44c23 Mon Sep 17 00:00:00 2001 From: Detlef Riekenebrg <wine.dev(a)web.de> Date: Tue, 12 Feb 2008 22:13:05 +0100 Subject: [PATCH] Increase the width of the Version column --- template/en/default/list/table.html.tmpl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl index 5889936..c565aaf 100644 --- a/template/en/default/list/table.html.tmpl +++ b/template/en/default/list/table.html.tmpl @@ -56,7 +56,7 @@ "status_whiteboard" => { title => "Whiteboard" , wrap => 1 } , "component" => { maxlength => 8 , title => "Comp" } , "product" => { maxlength => 8 } , - "version" => { maxlength => 5 , title => "Vers" } , + "version" => { maxlength => 6 , title => "Vers" } , "op_sys" => { maxlength => 4 } , "target_milestone" => { title => "TargetM" } , "percentage_complete" => { format_value => "%d %%" } ,

1 0

Dan Kegel : website: add links to most popular active Wine forums
by Jeremy Newman 19 Feb '08

19 Feb '08

Module: website Branch: master Commit: 351e44eea0141fce30cef5c1977cdefe884c91a2 URL: http://source.winehq.org/git/website.git/?a=commit;h=351e44eea0141fce30cef5… Author: Dan Kegel <dank(a)kegel.com> Date: Mon Feb 18 21:45:01 2008 -0800 website: add links to most popular active Wine forums Perhaps this will help slake the thirst of those who periodically ask if Wine needs a forum. --- templates/en/forums.template | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index f8c1636..a806f60 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -1,25 +1,30 @@  -<h1>Key Mailing Lists</h1> +<h1>Key Mailing Lists / Forums</h1> -<p>Wine has a lot of different mailing lists for many purposes. -However, most users will likely be most interested in two:</p> +<p>Wine has many mailing lists and forums. +Here are the most useful ones for users:</p> <ul> - <li><a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users</a>. - The Wine-Users mailing list is intended for general - users of Wine and people that volunteer to help them. This list - started as the Usenet group comp.emulators.ms-windows.wine and - <a href="http://groups.google.com/group/comp.emulators.ms-windows.wine">the Google Groups page</a> - is a good place to browse and search this list.</li><br /> - - <li><a href="http://www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce</a>. You should - subscribe to this mailing list if you want to get notified about new Wine releases.</li> + <li>The <a href="http://www.winehq.org/mailman/listinfo/wine-users">Wine-Users Mailing List</a> (and [<a href="http://www.winehq.org/pipermail/wine-users/">web archive</a>) - best place for Wine user support + </li><br /> + + <li>Ubuntu users may also want to visit the <a href="http://ubuntuforums.org/forumdisplay.php?f=313">Wine area at Ubuntu Forums</a> + + <li>Users might also want to visit the <a href="http://www.linuxforums.org/forum/wine/">Wine area at Linux Forums</a> + + <li>If you want to be notified about new releases, subscribe to the <a href="http://www.winehq.org/mailman/listinfo/wine-announce">Wine-Announce mailing list</a></li> </ul> +Please don't create another English language Wine forum (except perhaps +a Wine area in a popular distro's main forum). +<p> +If you know of another active Wine forum - especially a non-english one +- please let us know so we can add it to the list. +(Email to dank(a)kegel.com would do.) -<h1>All Mailing Lists</h1> +<h1>All WineHQ Mailing Lists</h1> <p>WineHQ has mailing lists for submitting patches, tracking Git commits, and discussing Wine. They feature a very customizable user

1 0

Alexandre Julliard : Avoid the nounistd option that doesn' t exist on older flex, define YY_NO_UNISTD_H instead.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 41fbacefa1ce573c14cdc147caf7771ad4bb8c15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41fbacefa1ce573c14cdc147c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 19 15:42:49 2008 +0100 Avoid the nounistd option that doesn't exist on older flex, define YY_NO_UNISTD_H instead. --- libs/wpp/ppl.l | 5 ++++- programs/winedbg/debug.l | 7 ++++++- programs/winhelp/macro.lex.l | 10 ++++++++-- tools/widl/parser.l | 6 +++--- tools/wrc/parser.l | 7 ++++++- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 198fcdb..5c39dbb 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -128,7 +128,6 @@ %option 8bit never-interactive %option nounput %option prefix="ppy_" -%option nounistd %x pp_pp %x pp_eol @@ -164,6 +163,10 @@ ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] #include <ctype.h> #include <assert.h> +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #include "wpp_private.h" #include "ppy.tab.h" diff --git a/programs/winedbg/debug.l b/programs/winedbg/debug.l index 6e6c888..a0512c1 100644 --- a/programs/winedbg/debug.l +++ b/programs/winedbg/debug.l @@ -19,13 +19,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -%option nounput interactive 8bit prefix="dbg_" nounistd +%option nounput interactive 8bit prefix="dbg_" %{ +#include "config.h" #include <stdlib.h> #include <string.h> #include <stdarg.h> +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #include "debugger.h" #include "dbg.tab.h" diff --git a/programs/winhelp/macro.lex.l b/programs/winhelp/macro.lex.l index 55e7ad6..97640b4 100644 --- a/programs/winhelp/macro.lex.l +++ b/programs/winhelp/macro.lex.l @@ -1,4 +1,4 @@ -%{ +%{ /* -*-C-*- */ /* * Help Viewer * @@ -20,10 +20,16 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ %} -%option nounput interactive 8bit nounistd +%option nounput interactive 8bit %x quote %{ +#include "config.h" #include <assert.h> + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #include "macro.h" #include "wine/debug.h" diff --git a/tools/widl/parser.l b/tools/widl/parser.l index a701453..af9445b 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -21,7 +21,6 @@ %option stack %option nounput noyy_top_state %option 8bit never-interactive prefix="parser_" -%option nounistd nl \r?\n ws [ \f\t\r] @@ -45,8 +44,9 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* #include <string.h> #include <ctype.h> #include <assert.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> + +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H #endif #include "widl.h" diff --git a/tools/wrc/parser.l b/tools/wrc/parser.l index f4d0c19..1cae89a 100644 --- a/tools/wrc/parser.l +++ b/tools/wrc/parser.l @@ -87,7 +87,6 @@ %option nounput noyy_top_state noyywrap %option 8bit never-interactive %option prefix="parser_" -%option nounistd /* Some shortcut definitions */ ws [ \f\t\r] @@ -97,12 +96,18 @@ cident [a-zA-Z_][0-9a-zA-Z_]* /*#define LEX_DEBUG*/ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <assert.h> +#ifndef HAVE_UNISTD_H +#define YY_NO_UNISTD_H +#endif + #include "wine/unicode.h" #include "wrc.h" #include "utils.h"

1 0

Aric Stewart : gdi32: Japanese Windows had a default fallback Font SystemLink of Microsoft Sans Serif . Implement that for Japanese.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: a41e77448ca23a5da1e38c469b3096b9fa902adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41e77448ca23a5da1e38c469… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 18 09:49:07 2008 -0600 gdi32: Japanese Windows had a default fallback Font SystemLink of Microsoft Sans Serif. Implement that for Japanese. --- dlls/gdi32/freetype.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 08e6638..ca50d35 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -466,6 +466,9 @@ static CRITICAL_SECTION freetype_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; +static const WCHAR szDefaultFallbackLink[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0}; +static BOOL use_default_fallback = FALSE; + static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); /**************************************** @@ -2072,6 +2075,10 @@ static void update_font_info(void) (WCHAR *)&oem_cp, sizeof(oem_cp)/sizeof(WCHAR)); sprintf( cpbuf, "%u,%u", ansi_cp, oem_cp ); + /* Setup DefaultFallback usage */ + if (ansi_cp == 932) + use_default_fallback = TRUE; + len = sizeof(buf); if (RegQueryValueExA(hkey, "Codepages", 0, &type, (BYTE *)buf, &len) == ERROR_SUCCESS && type == REG_SZ) { @@ -2846,6 +2853,30 @@ static BOOL create_child_font_list(GdiFont *font) break; } } + /* + * if not SYMBOL or OEM then we also get all the fonts for Microsoft + * Sans Serif. This is how asian windows get default fallbacks for fonts + */ + if (use_default_fallback && font->charset != SYMBOL_CHARSET && + font->charset != OEM_CHARSET && + strcmpW(font->name,szDefaultFallbackLink) != 0) + LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + if(!strcmpW(font_link->font_name,szDefaultFallbackLink)) + { + TRACE("found entry in default fallback list\n"); + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) + { + new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); + new_child->face = font_link_entry->face; + new_child->font = NULL; + list_add_tail(&font->child_fonts, &new_child->entry); + TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); + } + ret = TRUE; + break; + } + } return ret; }

1 0

Stefan Dösinger : d3d9: Some Windows drivers do not like reversed fog.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 22f379ccacccd675a0e9195eb8dcffc305baac6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f379ccacccd675a0e9195eb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 12 17:05:40 2008 +0100 d3d9: Some Windows drivers do not like reversed fog. The fog test used start = 0.9 and end = 0.1. This is perfectly ok in theory, but some Windows drivers do not like it. Since this test tests how fog is calculated with Vertex and Pixel shaders put the fog range in the normal order(start = 0.1, end = 0.9), this fixes a number of fog failures on ATI cards on Windows. --- dlls/d3d9/tests/visual.c | 59 ++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2858ee6..e2a001f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1156,51 +1156,54 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) } test_data[] = { /* only pixel shader: */ {0, 1, 0, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {0, 1, 1, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {0, 1, 2, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {0, 1, 3, 0, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {0, 1, 3, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* vertex shader */ {1, 0, 0, 0, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, {1, 0, 0, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {1, 0, 1, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, + {1, 0, 2, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {1, 0, 3, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* vertex shader and pixel shader */ {1, 1, 0, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {1, 1, 1, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, {1, 1, 2, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, + {1, 1, 3, 3, - {0x0000ff00, 0x0000ff00, 0x0020df00, 0x0040bf00, 0x005fa000, 0x007f8000, - 0x009f6000, 0x00bf4000, 0x00df2000, 0x00ff0000, 0x00ff0000}}, + {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, + 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, + #if 0 /* FIXME: these fail on GeForce 8500 */ /* foggy vertex shader */ @@ -1235,8 +1238,8 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) }; /* NOTE: changing these values will not affect the tests with foggy vertex shader, as the values are hardcoded in the shader*/ - start.f=0.9f; - end.f=0.1f; + start.f=0.1f; + end.f=0.9f; hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]); ok(SUCCEEDED(hr), "CreateVertexShader failed (%08x)\n", hr);

1 0

Stefan Dösinger : d3d9: Do not expect consistent failures.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 1a906aace73e34f2aa1853c3e019ab4172d12b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a906aace73e34f2aa1853c3e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 12 02:34:27 2008 +0100 d3d9: Do not expect consistent failures. The drivers for some radeon cards are not prepared for the things the fixed function type test does and fail inconsistently. Thus skip the color comparison if one of the two draws fails, and do not write an extra complaint about the inconsistency --- dlls/d3d9/tests/visual.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 56a67b6..2858ee6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5588,20 +5588,31 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) { 90, 300, 0.1, 2.0, 0x00ffff00}, { 570, 300, 0.1, 2.0, 0x00ffff00} }; + D3DCAPS9 caps; + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "GetDeviceCaps failed, hr = %08x\n", hr); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0); ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_d3dcolor, &dcl_color); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_ubyte4n, &dcl_ubyte); - ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_short4, &dcl_short); ok(SUCCEEDED(hr) || hr == E_FAIL, "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_float, &dcl_float); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); - hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_ubyte4n_2streams, &dcl_ubyte_2); - ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); + if(caps.DeclTypes & D3DDTCAPS_UBYTE4N) { + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_ubyte4n_2streams, &dcl_ubyte_2); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_ubyte4n, &dcl_ubyte); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); + } else { + trace("D3DDTCAPS_UBYTE4N not supported\n"); + dcl_ubyte_2 = NULL; + dcl_ubyte = NULL; + } hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_d3dcolor_2streams, &dcl_color_2); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_positiont, &dcl_positiont); @@ -5857,7 +5868,10 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) "pixel 572/302 has color %08x, expected 0x000000ff\n", color); /* This test is pointless without those two declarations: */ - if(!dcl_color_2 || !dcl_ubyte_2) goto out; + if((!dcl_color_2) || (!dcl_ubyte_2)) { + skip("color-ubyte switching test declarations aren't supported\n"); + goto out; + } hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quads), (void **) &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %s\n", DXGetErrorString9(hr)); @@ -5907,7 +5921,7 @@ static void fixed_function_decl_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, 8, 2); ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "IDirect3DDevice9_DrawPrimitive failed, hr = %#08x\n", hr); - ok(ub_ok == SUCCEEDED(hr), "dcl_ubyte_2 returned two different results\n"); + ub_ok = (SUCCEEDED(hr) && ub_ok); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %s\n", DXGetErrorString9(hr));

1 0

Stefan Dösinger : d3d9: Add a stencil+culling test.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 27dd3428d72915e020d5a59d78c75611cf8e991e URL: http://source.winehq.org/git/wine.git/?a=commit;h=27dd3428d72915e020d5a59d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 17 23:31:55 2008 +0100 d3d9: Add a stencil+culling test. --- dlls/d3d9/tests/visual.c | 189 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 188 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=27dd3428d72915e020d5a…

1 0

Stefan Dösinger : wined3d: Enable the texcoord init workaround on radeon HD cards on MacOS.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: f952419651bf15e5daef4362ea5c455b66cd3698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f952419651bf15e5daef4362e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 14 18:38:02 2008 +0100 wined3d: Enable the texcoord init workaround on radeon HD cards on MacOS. --- dlls/wined3d/directx.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9c3e68..c3afa7f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3024,8 +3024,14 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This * makes the shader slower and eats instruction slots which should be available to the d3d app. + * + * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards blacklist + * all radeon cards on Macs but whitelist the good ones, that way we're prepared for the future. If + * this workaround is activated on cards that do not need it it won't break things, just affect + * performance negatively */ - if(gl_info->gl_vendor == VENDOR_INTEL) { + if(gl_info->gl_vendor == VENDOR_INTEL || + (gl_info->gl_vendor == VENDOR_ATI && gl_info->gl_card != CARD_ATI_RADEON_X1600)) { TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); gl_info->set_texcoord_w = TRUE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2008