June 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Avoid checking depth/ stencil and compressed formats in init_format_fbo_compat_info().
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 7599520321e3fbb7fe6ed4cfe237c564c4647f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7599520321e3fbb7fe6ed4cfe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 12 09:46:04 2009 +0200 wined3d: Avoid checking depth/stencil and compressed formats in init_format_fbo_compat_info(). Checking these is somewhat pointless since they should never be color-renderable according to the FBO spec. This patch also happens to avoid dereferencing a NULL pointer inside fglrx. --- dlls/wined3d/utils.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 211e717..1e3e3fb 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -596,6 +596,20 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (!desc->glInternal) continue; + if (desc->Flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + { + TRACE("Skipping format %s because it's a depth/stencil format.\n", + debug_d3dformat(desc->format)); + continue; + } + + if (desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + TRACE("Skipping format %s because it's a compressed format.\n", + debug_d3dformat(desc->format)); + continue; + } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { TRACE("Checking if format %s is supported as FBO color attachment...\n", debug_d3dformat(desc->format));

1 0

Detlef Riekenberg : shlwapi: Forward DnsRecordSetCompare to dnsapi.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: 131ab8d8251b957aa8a4e0f47dd2562a60359d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=131ab8d8251b957aa8a4e0f47… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 12 10:56:34 2009 +0200 shlwapi: Forward DnsRecordSetCompare to dnsapi. --- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index c178148..bafe9f2 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = shlwapi.dll IMPORTLIB = shlwapi IMPORTS = uuid user32 gdi32 advapi32 kernel32 ntdll -DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version +DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version dnsapi C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index d9cc3a5..b7ea3aa 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -193,7 +193,7 @@ 193 stdcall -noname SHGetCurColorRes() 194 stdcall -noname SHWaitForSendMessageThread(ptr long) 195 stdcall -noname SHIsExpandableFolder(ptr ptr) -196 stub -noname DnsRecordSetCompare #stdcall @(ptr ptr ptr ptr) dnsapi.DnsRecordSetCompare +196 stdcall -noname DnsRecordSetCompare(ptr ptr ptr ptr) dnsapi.DnsRecordSetCompare 197 stdcall -noname SHFillRectClr(long ptr long) 198 stdcall -noname SHSearchMapInt(ptr ptr long long) 199 stdcall -noname IUnknown_Set(ptr ptr)

1 0

Detlef Riekenberg : mlang: Implement IMultiLanguage_GetRfc1766Info.
by Alexandre Julliard 12 Jun '09

12 Jun '09

Module: wine Branch: master Commit: e51dc8f2d3243fed2ee5eb169b5c55567b5b39c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e51dc8f2d3243fed2ee5eb169… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Jun 12 11:19:42 2009 +0200 mlang: Implement IMultiLanguage_GetRfc1766Info. --- dlls/mlang/mlang.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 6199da0..4d3c2e5 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -2536,8 +2536,38 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766Info( LCID Locale, PRFC1766INFO pRfc1766Info) { - FIXME("\n"); - return E_NOTIMPL; + LCTYPE type = LOCALE_SLANGUAGE; + + TRACE("(%p, 0x%04x, %p)\n", iface, Locale, pRfc1766Info); + + if (!pRfc1766Info) + return E_INVALIDARG; + + if ((PRIMARYLANGID(Locale) == LANG_ENGLISH) || + (PRIMARYLANGID(Locale) == LANG_CHINESE) || + (PRIMARYLANGID(Locale) == LANG_ARABIC)) { + + if (!SUBLANGID(Locale)) + type = LOCALE_SENGLANGUAGE; /* suppress country */ + } + else + { + if (!SUBLANGID(Locale)) { + TRACE("SUBLANGID missing in 0x%04x\n", Locale); + return E_FAIL; + } + } + + pRfc1766Info->lcid = Locale; + pRfc1766Info->wszRfc1766[0] = 0; + pRfc1766Info->wszLocaleName[0] = 0; + + if ((!lcid_to_rfc1766W(Locale, pRfc1766Info->wszRfc1766, MAX_RFC1766_NAME)) && + (GetLocaleInfoW(Locale, type, pRfc1766Info->wszLocaleName, MAX_LOCALE_NAME) > 0)) + return S_OK; + + /* Locale not supported */ + return E_INVALIDARG; } static HRESULT WINAPI fnIMultiLanguage_CreateConvertCharset(

1 0

Alexander Nicolaysen Sørnes : Allow selecting stable Wine versions even if they are old
by Alexander Nicolaysen Sørnes 12 Jun '09

12 Jun '09

Module: appdb Branch: master Commit: 591cf938b52f4ac74b1fb0a259346e776ce02ba1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=591cf938b52f4ac74b1fb0a2… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Thu Jun 11 22:51:02 2009 +0200 Allow selecting stable Wine versions even if they are old --- include/config.php.sample | 4 ++++ include/util.php | 25 ++++++++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/include/config.php.sample b/include/config.php.sample index 4a33336..6caf756 100644 --- a/include/config.php.sample +++ b/include/config.php.sample @@ -33,6 +33,10 @@ define("BUGZILLA_ROOT","http://bugs.winehq.org/"); // path to bugzilla // How old (days) a test report has to before it is judged to be aged define("TESTDATA_AGED_THRESHOLD", 175); +// Show versions from these branches even if they are not among the most recent ones +// Separate by commas if there are more than one +define("STABLE_BRANCHES", "1.0.");); + /* * apps database info */ diff --git a/include/util.php b/include/util.php index bf6f8df..acdac5a 100644 --- a/include/util.php +++ b/include/util.php @@ -169,16 +169,27 @@ function get_bugzilla_versions() { $aVersions = array(); $sTable = BUGZILLA_DB.".versions"; - $sWhere = "WHERE product_id=".BUGZILLA_PRODUCT_ID; - $sQuery = "SELECT value FROM $sTable $sWhere ORDER BY id desc limit 6"; - $hResult = query_bugzilladb($sQuery); - if(!$hResult) return $aVersions; // empty + // The empty string will fetch the most recent versions + $aBranches = array(''); - // build the list of versions - while(list($sValue) = query_fetch_row($hResult)) + // Get a list of stable branches + if(STABLE_BRANCHES) + $aBranches = array_merge($aBranches, explode(',', STABLE_BRANCHES)); + + foreach($aBranches as $sBranch) { - $aVersions[] = $sValue; + $sWhere = "WHERE product_id =".BUGZILLA_PRODUCT_ID." AND value LIKE '$sBranch%'"; + $sQuery = "SELECT value FROM $sTable $sWhere ORDER BY id desc limit 6"; + $hResult = query_bugzilladb($sQuery); + if($hResult) + { + while(list($sValue) = query_fetch_row($hResult)) + { + if(!in_array($sValue, $aVersions)) + $aVersions[] = $sValue; + } + } } return $aVersions;

1 0

Ken Sharp : Correct French news link
by Jeremy Newman 11 Jun '09

11 Jun '09

Module: website Branch: master Commit: d45d23806d4e38a72b28fc84a140b6c1795b8c0e URL: http://source.winehq.org/git/website.git/?a=commit;h=d45d23806d4e38a72b28fc… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 10 20:14:03 2009 +0100 Correct French news link This look a lot like a comment, but is it? >From 280be9a399f8a74e9940311d2a824cf7f6d78ab7 Mon Sep 17 00:00:00 2001 From: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed, 10 Jun 2009 19:45:45 +0100 Subject: [PATCH] Correct French news link --- templates/fr/news.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/fr/news.template b/templates/fr/news.template index d75bb20..68585e5 100644 --- a/templates/fr/news.template +++ b/templates/fr/news.template @@ -3,7 +3,7 @@ <h1 class="title">Nouvelles</h1> - + <ul class="rss"> <li><a href="{$root}/news/rss/">Flux RSS des nouvelles de WineHQ</a></li>

1 0

Ken Sharp : website: Fix 404 bug link
by Jeremy Newman 11 Jun '09

11 Jun '09

Module: website Branch: master Commit: 55174b22746cdc9c6bda015cc4e28bd20d8cbc0d URL: http://source.winehq.org/git/website.git/?a=commit;h=55174b22746cdc9c6bda01… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 10 20:23:33 2009 +0100 website: Fix 404 bug link >From cec67fbb170be00e3acd96c17ca445ec3b4acfce Mon Sep 17 00:00:00 2001 From: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed, 10 Jun 2009 20:22:18 +0100 Subject: [PATCH] Fix 404 bug link --- templates/en/global/404.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/global/404.template b/templates/en/global/404.template index f6e00f2..bcdf221 100644 --- a/templates/en/global/404.template +++ b/templates/en/global/404.template @@ -13,6 +13,6 @@ <p> If you followed a link from a WineHQ.org page and reached this page in error, please report it to the WineHQ.org - <a href="http://bugs.winehq.org/enter_bug.cgi?product=WineHQ.com">Bugzilla</a>. + <a href="http://bugs.winehq.org/enter_bug.cgi?product=WineHQ.org">Bugzilla</a>. </p>

1 0

Ken Sharp : Update status page URLs
by Jeremy Newman 11 Jun '09

11 Jun '09

Module: website Branch: master Commit: ccbe4d746e98a327822d9492286cc2826edea6fc URL: http://source.winehq.org/git/website.git/?a=commit;h=ccbe4d746e98a327822d94… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Jun 10 23:21:03 2009 +0100 Update status page URLs >From 5a06743eae77164b6cbce19ac49ac9c0f090c20b Mon Sep 17 00:00:00 2001 From: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed, 10 Jun 2009 23:17:53 +0100 Subject: [PATCH] Update status page URLs --- templates/en/status/directx.template | 178 ++++++------ templates/en/status/dlls.template | 520 +++++++++++++++--------------- templates/en/status/multimedia.template | 128 ++++---- templates/en/status/ui.template | 88 +++--- 4 files changed, 457 insertions(+), 457 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=ccbe4d746e98a32782…

1 0

Jeremy Newman : adding curtime_year template var
by Jeremy Newman 11 Jun '09

11 Jun '09

Module: website Branch: master Commit: e3dbdb3de82d0757d81649b0af07fddfdbbd9c84 URL: http://source.winehq.org/git/website.git/?a=commit;h=e3dbdb3de82d0757d81649… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jun 11 11:10:49 2009 -0500 adding curtime_year template var --- include/html.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/html.php b/include/html.php index 650cee9..1b1b3d4 100644 --- a/include/html.php +++ b/include/html.php @@ -1203,6 +1203,7 @@ class html $vars['request_delim'] = ($_GET ? ';' : '?'); $vars['server_name'] =& $_SERVER['SERVER_NAME']; $vars['base_url'] =& $GLOBALS['config']->base_url; + $vars['curtime_year'] = date('Y', time()); // language vars if (defined("PAGE") and (PAGE == "home" or PAGE == "lang"))

1 0

Jeremy Newman : use the current year for copyrights
by Jeremy Newman 11 Jun '09

11 Jun '09

Module: website Branch: master Commit: c4031fa47c1be7d5dc9d418a9730366d9db7c105 URL: http://source.winehq.org/git/website.git/?a=commit;h=c4031fa47c1be7d5dc9d41… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jun 11 11:11:11 2009 -0500 use the current year for copyrights --- include/themes/winehq/content.template | 2 +- include/themes/winehq/content_nobox.template | 2 +- templates/en/license.template | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/themes/winehq/content.template b/include/themes/winehq/content.template index d2a8d27..272ae0a 100644 --- a/include/themes/winehq/content.template +++ b/include/themes/winehq/content.template @@ -8,7 +8,7 @@ <meta name="description" content="Open Source Software for running Windows applications on other operating systems."> <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> <meta name="robots" content="index, follow"> - <meta name="copyright" content="Copyright 2008. WineHQ.org All Rights Reserved."> + <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org All Rights Reserved."> <meta name="author" content="Jeremy Newman"> <meta name="language" content="English"> <meta name="revisit-after" content="1"> diff --git a/include/themes/winehq/content_nobox.template b/include/themes/winehq/content_nobox.template index 4099cd6..78f4285 100644 --- a/include/themes/winehq/content_nobox.template +++ b/include/themes/winehq/content_nobox.template @@ -8,7 +8,7 @@ <meta name="description" content="Open Source Software for running Windows applications on other operating systems."> <meta name="keywords" content="windows, linux, macintosh, solaris, freebsd"> <meta name="robots" content="index, follow"> - <meta name="copyright" content="Copyright 2008. WineHQ.org All Rights Reserved."> + <meta name="copyright" content="Copyright {$curtime_year}. WineHQ.org All Rights Reserved."> <meta name="author" content="Jeremy Newman"> <meta name="language" content="English"> <meta name="revisit-after" content="1"> diff --git a/templates/en/license.template b/templates/en/license.template index bf5a7e3..122c986 100644 --- a/templates/en/license.template +++ b/templates/en/license.template @@ -3,7 +3,7 @@ <h1 class="title">Wine License</h1> -<p>Copyright (c) 1993-2005 the Wine project authors (see the file +<p>Copyright (c) 1993-{$curtime_year} the Wine project authors (see the file <a href="http://source.winehq.org/source/AUTHORS">AUTHORS</a> for a complete list)</p>

1 0

Dmitry Timoshkov : user32: Add support for SPI_GETFOCUSBORDERWIDTH and SPI_GETFOCUSBORDERHEIGHT.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 8e0600221d189e5f7d449e7c08bd9a630183bf3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e0600221d189e5f7d449e7c0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 11 21:48:58 2009 +0900 user32: Add support for SPI_GETFOCUSBORDERWIDTH and SPI_GETFOCUSBORDERHEIGHT. --- dlls/user32/sysparams.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 0563271..94757a3 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2435,10 +2435,17 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = FALSE; break; - WINE_SPI_FIXME(SPI_GETFOCUSBORDERWIDTH); /* 0x200E _WIN32_WINNT >= 0x510 */ - WINE_SPI_FIXME(SPI_SETFOCUSBORDERWIDTH); /* 0x200F _WIN32_WINNT >= 0x510 */ - WINE_SPI_FIXME(SPI_GETFOCUSBORDERHEIGHT); /* 0x2010 _WIN32_WINNT >= 0x510 */ + case SPI_GETFOCUSBORDERWIDTH: /* 0x200E _WIN32_WINNT >= 0x510 */ + case SPI_GETFOCUSBORDERHEIGHT: /* 0x200F _WIN32_WINNT >= 0x510 */ + if (!pvParam) + ret = FALSE; + else + *(UINT *)pvParam = 1; + break; + + WINE_SPI_FIXME(SPI_SETFOCUSBORDERWIDTH); /* 0x2010 _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_SETFOCUSBORDERHEIGHT); /* 0x2011 _WIN32_WINNT >= 0x510 */ + case SPI_GETFONTSMOOTHINGORIENTATION: /* 0x2012 */ spi_idx = SPI_SETFONTSMOOTHINGORIENTATION_IDX; if (!spi_loaded[spi_idx])

1 0