August 2011 - Wine-commits - list.winehq.org

Matteo Bruni : wined3d: Store maximum vertex attributes count.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: c74c544cc63db4db465504e2602224155a0d1dca URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74c544cc63db4db465504e26… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Aug 26 01:12:30 2011 +0200 wined3d: Store maximum vertex attributes count. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/state.c | 8 +------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 506b875..515bc46 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2253,6 +2253,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.vertex_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; gl_info->limits.sampler_stages = 1; + gl_info->limits.vertex_attribs = 16; gl_info->limits.glsl_vs_float_constants = 0; gl_info->limits.glsl_ps_float_constants = 0; gl_info->limits.arb_vs_float_constants = 0; @@ -2446,6 +2447,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->limits.vertex_samplers = tmp; glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, &tmp); gl_info->limits.combined_samplers = tmp; + glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &tmp); + gl_info->limits.vertex_attribs = tmp; /* Loading GLSL sampler uniforms is much simpler if we can assume that the sampler setup * is known at shader link time. In a vertex shader + pixel shader combination this isn't diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 1535e3a..c4e0513 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3999,15 +3999,9 @@ static inline void unload_numbered_array(struct wined3d_context *context, int i) static void unload_numbered_arrays(struct wined3d_context *context) { /* disable any attribs (this is the same for both GLSL and ARB modes) */ - GLint maxAttribs = 16; int i; - /* Leave all the attribs disabled */ - glGetIntegerv(GL_MAX_VERTEX_ATTRIBS_ARB, &maxAttribs); - /* MESA does not support it right not */ - if (glGetError() != GL_NO_ERROR) - maxAttribs = 16; - for (i = 0; i < maxAttribs; ++i) { + for (i = 0; i < context->gl_info->limits.vertex_attribs; ++i) { unload_numbered_array(context, i); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 47eee79..8fb5d27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1456,6 +1456,7 @@ struct wined3d_gl_limits UINT anisotropy; float shininess; UINT samples; + UINT vertex_attribs; UINT glsl_varyings; UINT glsl_vs_float_constants;

1 0

Andrew Talbot : comctl32: Fix a logical operator typo.
by Alexandre Julliard 29 Aug '11

29 Aug '11

Module: wine Branch: master Commit: dd5a1913ae4b8025418a9f688882114a007bd41c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5a1913ae4b8025418a9f688… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 27 17:42:27 2011 +0100 comctl32: Fix a logical operator typo. --- dlls/comctl32/tooltips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 2b29790..162867d 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2014,7 +2014,7 @@ TOOLTIPS_SetFont (TOOLTIPS_INFO *infoPtr, HFONT hFont, BOOL redraw) lf.lfWeight = FW_BOLD; infoPtr->hTitleFont = CreateFontIndirectW(&lf); - if (redraw & (infoPtr->nCurrentTool != -1)) { + if (redraw && infoPtr->nCurrentTool != -1) { FIXME("full redraw needed!\n"); }

1 0

Frédéric Delanoy : French translation for release 1.3.27
by Jeremy Newman 29 Aug '11

29 Aug '11

Module: website Branch: master Commit: abf4bdda302b7614c84ac1e3c965e27db016a4d1 URL: http://source.winehq.org/git/website.git/?a=commit;h=abf4bdda302b7614c84ac1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Aug 26 20:59:38 2011 +0200 French translation for release 1.3.27 --- news/fr/2011082601.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011082601.xml b/news/fr/2011082601.xml new file mode 100644 index 0000000..9eee3b2 --- /dev/null +++ b/news/fr/2011082601.xml @@ -0,0 +1,20 @@ +<news> +<date>26 août 2011</date> +<title>Sortie de Wine 1.3.27</title> +<body> + La version de développement 1.3.27 de Wine est disponible. + <a href="{$root}/announce/1.3.27">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge du multisampling dans Direct3D.</li> + <li>Nouvelle version du moteur Gecko.</li> + <li>Amélioration de la gestion des proxys réseau.</li> + <li>Meilleure prise en charge de l'écriture dans MSXML.</li> + <li>Fichiers manifestes côte à côte pour les bibliothèques intégrées</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

André Hentschel : Wine 1.3.27 freigegeben
by Jeremy Newman 29 Aug '11

29 Aug '11

Module: website Branch: master Commit: 7ac3379fbf443d6cff20b99d0bc349ef8d76f7a2 URL: http://source.winehq.org/git/website.git/?a=commit;h=7ac3379fbf443d6cff20b9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Aug 27 13:51:10 2011 +0200 Wine 1.3.27 freigegeben --- news/de/2011082601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011082601.xml b/news/de/2011082601.xml new file mode 100644 index 0000000..79789bf --- /dev/null +++ b/news/de/2011082601.xml @@ -0,0 +1,17 @@ +<news> +<date>26. August 2011</date> +<title>Wine 1.3.27 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.27 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.27">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für Multisampling in Direct3D.</li> + <li>Neue Version der Gecko Engine.</li> + <li>Verbesserungen am Netzwerk Proxy Handling.</li> + <li>Besserere Unterstützung für das Schreiben mit MSXML.</li> + <li>Side-by-side Manifeste für die eingebauten Bibliotheken.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.3.27
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: website Branch: master Commit: 591542f9b2cdc16a9e0014c9754152686901e17f URL: http://source.winehq.org/git/website.git/?a=commit;h=591542f9b2cdc16a9e0014… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 20:18:10 2011 +0200 Wine release 1.3.27 --- news/en/2011082601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011082601.xml b/news/en/2011082601.xml new file mode 100644 index 0000000..e5355cd --- /dev/null +++ b/news/en/2011082601.xml @@ -0,0 +1,17 @@ +<news> +<date>August 26, 2011</date> +<title>Wine 1.3.27 Released</title> +<body> + The Wine development release 1.3.27 is now available. + <a href="{$root}/announce/1.3.27">What's new</a> in this release: +<ul> + <li>Support for multisampling in Direct3D.</li> + <li>New version of the Gecko engine.</li> + <li>Improvements to the network proxy handling.</li> + <li>Better write support in MSXML.</li> + <li>Side-by-side manifests for built-in libraries.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.3.27.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 6a6aab27633405aeb5e464943110960f0099dffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6aab27633405aeb5e464943… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 20:07:20 2011 +0200 Release 1.3.27. --- ANNOUNCE | 1141 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 512 insertions(+), 649 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a6aab27633405aeb5e46…

1 0

Tag wine-1.3.27 : Alexandre Julliard : Release 1.3.27
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: refs/tags/wine-1.3.27 Tag: 80cd640606813f7cc9aa86ad5ad1bb33a5f95a6a URL: http://source.winehq.org/git/wine.git/?a=tag;h=80cd640606813f7cc9aa86ad5ad1… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 20:07:22 2011 +0200 Release 1.3.27

1 0

Francois Gouget : psapi/tests: Fix the EnumProcessModules() test and provide more diagnostic information if it fails.
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 187de1794eb73a4a0918414fed11b7ca451f095f URL: http://source.winehq.org/git/wine.git/?a=commit;h=187de1794eb73a4a0918414fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 26 16:09:03 2011 +0200 psapi/tests: Fix the EnumProcessModules() test and provide more diagnostic information if it fails. On some Windows systems aclayers.dll gets injected into the process and brings in a lot of extra dlls. --- dlls/psapi/tests/psapi_main.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index c4c129b..8a1cfc1 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -107,10 +107,26 @@ static void test_EnumProcessModules(void) ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); if(ret != 1) return; - ok(cbNeeded / sizeof(HMODULE) >= 3 && cbNeeded / sizeof(HMODULE) <= 5 * sizeof(HMODULE), - "cbNeeded=%d\n", cbNeeded); ok(hMod == GetModuleHandle(NULL), "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); + ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); + /* Windows sometimes has a bunch of extra dlls, presumably brought in by + * aclayers.dll. + */ + if (cbNeeded < 4 * sizeof(HMODULE) || cbNeeded > 30 * sizeof(HMODULE)) + { + HMODULE hmods[100]; + int i; + ok(0, "cbNeeded=%d\n", cbNeeded); + + pEnumProcessModules(hpQV, hmods, sizeof(hmods), &cbNeeded); + for (i = 0 ; i < cbNeeded/sizeof(*hmods); i++) + { + char path[1024]; + GetModuleFileNameA(hmods[i], path, sizeof(path)); + trace("i=%d hmod=%p path=[%s]\n", i, hmods[i], path); + } + } } static void test_GetModuleInformation(void)

1 0

Francois Gouget : winefile: The title format string cannot really be translated so remove it from the resources .
by Alexandre Julliard 26 Aug '11

26 Aug '11

Module: wine Branch: master Commit: 580ece97a039b71bf9c6440e4af9d1988ffab304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=580ece97a039b71bf9c6440e4… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 26 15:32:46 2011 +0200 winefile: The title format string cannot really be translated so remove it from the resources. --- po/ar.po | 26 +++++++++++--------------- po/bg.po | 26 +++++++++++--------------- po/ca.po | 26 +++++++++++--------------- po/cs.po | 26 +++++++++++--------------- po/da.po | 26 +++++++++++--------------- po/de.po | 26 +++++++++++--------------- po/el.po | 26 +++++++++++--------------- po/en.po | 26 +++++++++++--------------- po/en_US.po | 26 +++++++++++--------------- po/eo.po | 26 +++++++++++--------------- po/es.po | 26 +++++++++++--------------- po/fa.po | 26 +++++++++++--------------- po/fi.po | 26 +++++++++++--------------- po/fr.po | 26 +++++++++++--------------- po/he.po | 26 +++++++++++--------------- po/hi.po | 26 +++++++++++--------------- po/hu.po | 26 +++++++++++--------------- po/it.po | 26 +++++++++++--------------- po/ja.po | 26 +++++++++++--------------- po/ko.po | 26 +++++++++++--------------- po/lt.po | 26 +++++++++++--------------- po/ml.po | 26 +++++++++++--------------- po/nb_NO.po | 26 +++++++++++--------------- po/nl.po | 26 +++++++++++--------------- po/or.po | 26 +++++++++++--------------- po/pa.po | 26 +++++++++++--------------- po/pl.po | 26 +++++++++++--------------- po/pt_BR.po | 26 +++++++++++--------------- po/pt_PT.po | 26 +++++++++++--------------- po/rm.po | 26 +++++++++++--------------- po/ro.po | 26 +++++++++++--------------- po/ru.po | 26 +++++++++++--------------- po/sk.po | 26 +++++++++++--------------- po/sl.po | 26 +++++++++++--------------- po/sr_RS(a)cyrillic.po | 26 +++++++++++--------------- po/sr_RS(a)latin.po | 26 +++++++++++--------------- po/sv.po | 26 +++++++++++--------------- po/te.po | 26 +++++++++++--------------- po/th.po | 26 +++++++++++--------------- po/tr.po | 26 +++++++++++--------------- po/uk.po | 26 +++++++++++--------------- po/wa.po | 26 +++++++++++--------------- po/wine.pot | 26 +++++++++++--------------- po/zh_CN.po | 26 +++++++++++--------------- po/zh_TW.po | 26 +++++++++++--------------- programs/winefile/resource.h | 1 - programs/winefile/winefile.c | 4 ++-- programs/winefile/winefile.rc | 1 - 48 files changed, 497 insertions(+), 679 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=580ece97a039b71bf9c64…

1 0

Francois Gouget : avifil32: The stream format string cannot really be translated so remove it from the resources .
by Alexandre Julliard 26 Aug '11

26 Aug '11

1 0