wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Thomas Faber : msvcp60: Fix build with MSVC.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 44feaf9bd8dd6402d3f5aabd12a0c0634e3714a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44feaf9bd8dd6402d3f5aabd1… Author: Thomas Faber <thfabba(a)gmx.de> Date: Wed Mar 7 09:23:50 2012 +0100 msvcp60: Fix build with MSVC. --- dlls/msvcp60/memory.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp60/memory.c b/dlls/msvcp60/memory.c index 6f6a77a..4407cfe 100644 --- a/dlls/msvcp60/memory.c +++ b/dlls/msvcp60/memory.c @@ -80,7 +80,7 @@ void __thiscall MSVCP_allocator_char_deallocate(void *this, char *ptr, MSVCP_siz DEFINE_THISCALL_WRAPPER(MSVCP_allocator_char_allocate, 8) char* __thiscall MSVCP_allocator_char_allocate(void *this, MSVCP_size_t count) { - return MSVCRT_operator_new(sizeof(char[count])); + return MSVCRT_operator_new(count); } /* ?allocate@?$allocator@D@std@@QAEPADIPBX@Z */ @@ -177,7 +177,7 @@ wchar_t* __thiscall MSVCP_allocator_wchar_allocate(void *this, MSVCP_size_t coun return NULL; } - return MSVCRT_operator_new(sizeof(wchar_t[count])); + return MSVCRT_operator_new(count * sizeof(wchar_t)); } /* ?allocate@?$allocator@_W@std@@QAEPA_WIPBX@Z */ @@ -276,7 +276,7 @@ unsigned short* __thiscall MSVCP_allocator_short_allocate( return NULL; } - return MSVCRT_operator_new(sizeof(unsigned short[count])); + return MSVCRT_operator_new(count * sizeof(unsigned short)); } /* ?allocate@?$allocator@G@std@@QAEPAGIPBX@Z */

1 0

Christian Costa : configure: Check if version of msgfmt (from gettext) is recent enough.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 949693011dfc91c38a79c779b96df0ac4d8f54e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=949693011dfc91c38a79c779b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 5 20:00:20 2012 +0100 configure: Check if version of msgfmt (from gettext) is recent enough. --- configure | 24 ++++++++++++++++++++++-- configure.ac | 19 ++++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6e81f94..55464c7 100755 --- a/configure +++ b/configure @@ -5150,11 +5150,31 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether msgfmt supports contexts" >&5 +$as_echo_n "checking whether msgfmt supports contexts... " >&6; } + cat >conftest.po <<EOF +# comment +msgctxt "ctxt" +msgid "id" +msgstr "str" +EOF + if $MSGFMT -o /dev/null conftest.po 2>&5 + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + MSGFMT=false + fi +fi if test "$MSGFMT" = false; then : case "x$with_gettext" in - x) as_fn_append wine_warnings "|gettext tools not found, translations won't be built." ;; + x) as_fn_append wine_warnings "|gettext tools not found (or too old), translations won't be built." ;; xno) ;; - *) as_fn_error $? "gettext tools not found, translations won't be built. + *) as_fn_error $? "gettext tools not found (or too old), translations won't be built. This is an error since --with-gettext was requested." "$LINENO" 5 ;; esac fi diff --git a/configure.ac b/configure.ac index 0b68774..357c829 100644 --- a/configure.ac +++ b/configure.ac @@ -349,8 +349,25 @@ else fi test "x$with_gettext" != xno || MSGFMT=false +if test "$MSGFMT" != "false" +then + AC_MSG_CHECKING([whether msgfmt supports contexts]) + cat >conftest.po <<EOF +# comment +msgctxt "ctxt" +msgid "id" +msgstr "str" +EOF + if $MSGFMT -o /dev/null conftest.po 2>&AS_MESSAGE_LOG_FD + then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + MSGFMT=false + fi +fi WINE_WARNING_WITH(gettext,[test "$MSGFMT" = false], - [gettext tools not found, translations won't be built.]) + [gettext tools not found (or too old), translations won't be built.]) dnl **** Check for some libraries ****

1 0

André Hentschel : Fix Google donation (German)
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 86def7a5ad9322a13aff012dc2b58e3e35a35e03 URL: http://source.winehq.org/git/website.git/?a=commit;h=86def7a5ad9322a13aff01… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 9 17:36:05 2012 +0100 Fix Google donation (German) --- templates/de/contributing.template | 6 +++--- templates/de/donate.template | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index 3a5ac31..c4c5e33 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -351,7 +351,7 @@ <table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF"> <tr bgcolor="#ffffff"> <td align="center"> - <script type="text/javascript"> + <script type="text/javascript"> function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ return true; @@ -366,13 +366,13 @@ <input name="item_name_1" type="hidden" value="Directed Donation to the Wine Project via Software Freedom Conservancy"/> <input name="item_description_1" type="hidden" value="A directed donation for the Wine project via the Software Freedom Conservancy"/> <input name="item_quantity_1" type="hidden" value="1"/> - <input name="item_currency_1" type="hidden" value="EUR"/> + <input name="item_currency_1" type="hidden" value="USD"/> <input name="item_is_modifiable_1" type="hidden" value="true"/> <input name="item_min_price_1" type="hidden" value="10.0"/> <input name="item_max_price_1" type="hidden" value="25000.0"/> <input name="_charset_" type="hidden" value="utf-8"/> $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/><br /> - <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> + <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> </form> </td> <td>über Google Checkout</td> diff --git a/templates/de/donate.template b/templates/de/donate.template index fd023e2..313631b 100644 --- a/templates/de/donate.template +++ b/templates/de/donate.template @@ -14,7 +14,7 @@ <tr bgcolor="#ffffff"> <td align="center"> - <script type="text/javascript"> + <script type="text/javascript"> function validateAmount(amount){ if(amount.value.match( /^[0-9]+(\.([0-9]+))?$/)){ return true; @@ -29,13 +29,13 @@ <input name="item_name_1" type="hidden" value="Directed Donation to the Wine Project via Software Freedom Conservancy"/> <input name="item_description_1" type="hidden" value="A directed donation for the Wine project via the Software Freedom Conservancy"/> <input name="item_quantity_1" type="hidden" value="1"/> - <input name="item_currency_1" type="hidden" value="EUR"/> + <input name="item_currency_1" type="hidden" value="USD"/> <input name="item_is_modifiable_1" type="hidden" value="true"/> <input name="item_min_price_1" type="hidden" value="10.0"/> <input name="item_max_price_1" type="hidden" value="25000.0"/> <input name="_charset_" type="hidden" value="utf-8"/> $ <input id="item_price_1" name="item_price_1" onfocus="this.style.color='black'; this.value='';" size="11" style="color:grey;" type="text" value="Enter Amount"/><br /> - <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> + <input alt="Donate" src="https://checkout.google.com/buttons/donateNow.gif?merchant_id=6228369851249…" type="image"/> </form> </td> <td valign="top">

1 0

Jeremy Newman : fix missing closing body tag
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 5258c47055f7da71d657e98779859af7069f09a7 URL: http://source.winehq.org/git/website.git/?a=commit;h=5258c47055f7da71d657e9… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Mar 9 09:53:16 2012 -0600 fix missing closing body tag --- news/es/2012030701.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/news/es/2012030701.xml b/news/es/2012030701.xml index 762bc0a..0246b40 100644 --- a/news/es/2012030701.xml +++ b/news/es/2012030701.xml @@ -9,4 +9,5 @@ <p></p> <p><p>El código fuente se encuentra <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.tar.bz2">ya disponible </a>. Los paquetes binarios están en el proceso de ser construidos, y aparecerán pronto en sus respectivos <a href="{$root}/download">lugares de descarga </a>. +</body> </news>

1 0

Jaime Rave : Spanish version of the about page
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: ab0987e295c7276dcba8f3abec1fd8d2a10f865a URL: http://source.winehq.org/git/website.git/?a=commit;h=ab0987e295c7276dcba8f3… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Thu Mar 8 23:57:11 2012 -0500 Spanish version of the about page -- Jaime Andres Rave Ingeniero de Sistemas - T.P. 08255178427ATL Miembro de la Fundación de Software Libre de Colombia http://www.fslcol.org/ http://sobrelibertad.blogspot.com/ 3003160361 >From 1b430c605b676d25ab05bb576c2647e3924440bd Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave(a)gmail.com> Date: Thu, 8 Mar 2012 23:53:28 -0500 Subject: Spanish version the the about page --- templates/es/about.template | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/templates/es/about.template b/templates/es/about.template new file mode 100644 index 0000000..83f2249 --- /dev/null +++ b/templates/es/about.template @@ -0,0 +1,27 @@ + + + +<h1 class="title">Acerca de Wine</h1> + +<p>Wine te permite correr software de Windows en otros sistemas operativos. Con Wine, puede instalar y correr estas aplicaciones igual que lo haría en Windows.</p> + +<p>Wine se encuentra todavía en desarrollo. No todos los programas funcionan aun, sin embargo hay <a href="http://wiki.winehq.org/UsageStatistics" title="Wine Usage Statistics">varios millones de personas</a> usando Wine para ejecutar sus programas.</p> + +<h3>Código Abierto y Guiado por el Usuario</h3> + +<p>Wine siempre será <a href="http://wiki.winehq.org/Licensing" title="Wine licensing">software libre</a>. Aproximadamente la mitad del código fuente de Wine es escrito por voluntarios. El resto es patrocinado por intereses comerciales, especialmente de <a href="http://www.codeweavers.com/products/" title="CodeWeavers CrossOver Office">CodeWeavers</a> quienes venden una versión de Wine con soporte.</p> + +<p>Wine depende altamente en su comunidad de usuarios. Sus pruebas llenan nuestra <a href="http://appdb.winehq.org/" title="Wine Application Database">Base de datos de Aplicaciones</a> para seguir que tan bien funcionan los programas, y todas las respuestas en los <a href="http://forums.winehq.org/" title="WineHQ Forums">foros</a> vienen de voluntarios.</p> + +<h3>Aprenda mas:</h3> +<ul> + <li><a href="http://wiki.winehq.org/ImportanceOfWine">¿Por que es tan Importante Wine?</a></li> + <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Mitos Comunes sobre Wine</a></li> + <li><a href="http://wiki.winehq.org/WineHistory">Historia del Proyecto Wine</a></li> + <li><a href="http://wiki.winehq.org/ProjectOrganization">Organización y Liderazgo</a></li> +</ul> + +<hr> +<div class="link-container"> + <p class="right-link">Wine's History: <a href="{$root}/history">Siguiente</a></p> +</div>

1 0

Jaime Rave : Spanish translation for release 1.4
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 4b69a4b950e8d03fca8bb20d3a3678f5c4ee2076 URL: http://source.winehq.org/git/website.git/?a=commit;h=4b69a4b950e8d03fca8bb2… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Fri Mar 9 00:05:16 2012 -0500 Spanish translation for release 1.4 -- Jaime Andres Rave Ingeniero de Sistemas - T.P. 08255178427ATL Miembro de la Fundación de Software Libre de Colombia http://www.fslcol.org/ http://sobrelibertad.blogspot.com/ 3003160361 >From 87ea2d180f269eea072520c99367d25f9a173eae Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave(a)gmail.com> Date: Thu, 8 Mar 2012 23:03:37 -0500 Subject: Spanish translation for release 1.4 --- news/es/2012030701.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/es/2012030701.xml b/news/es/2012030701.xml new file mode 100644 index 0000000..762bc0a --- /dev/null +++ b/news/es/2012030701.xml @@ -0,0 +1,12 @@ +<news> +<date>Marzo 7, 2012</date> +<title>Wine 1.4 Liberado</title> +<body> +<p> El equipo de Wine está orgulloso de anunciar que la versión estable de Wine 1.4 se encuentra ya disponible.</p> +<p> Este lanzamiento representa 20 meses de arduo trabajo y más de 16,000 cambios individuales. Los aspectos más sobresalientes son un nuevo motor gráfico DIB, una pila de audio rediseñada, y soporte completo para texto bidireccional y la forma de los caracteres. </p> +<p> También contiene muchas mejoras en otros ámbitos, así como el soporte para muchas aplicaciones nuevas, destacando Microsoft Office 2010. Mira las <a href="{$root}/announce/1.4">notas del lanzamiento </a> para un resumen de los cambios más importantes. </p> +<p> Este lanzamiento está dedicado a la memoria de Gé (Greg) van Geldorp, quien falleció en Mayo del 2011. Greg manejó por si solo el diseño, construcción y mantenimiento del Tesbot de Wine, el cual se convirtió en la piedra angular de nuestro proceso de desarrollo. La alta calidad de este lanzamiento se debe en gran parte a su trabajo. Le echamos de menos todos nosotros. </p> +<p></p> +<p><p>El código fuente se encuentra <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.tar.bz2">ya disponible </a>. +Los paquetes binarios están en el proceso de ser construidos, y aparecerán pronto en sus respectivos <a href="{$root}/download">lugares de descarga </a>. +</news>

1 0

Jaime Rave : Fixes for the spanish version of the homepage
by Jeremy Newman 09 Mar '12

09 Mar '12

Module: website Branch: master Commit: 8a0a984857468c9e6cf5c18656078d87863e374b URL: http://source.winehq.org/git/website.git/?a=commit;h=8a0a984857468c9e6cf5c1… Author: Jaime Rave <jaimerave(a)gmail.com> Date: Thu Mar 8 23:56:40 2012 -0500 Fixes for the spanish version of the homepage -- Jaime Andres Rave Ingeniero de Sistemas - T.P. 08255178427ATL Miembro de la Fundación de Software Libre de Colombia http://www.fslcol.org/ http://sobrelibertad.blogspot.com/ 3003160361 >From 983d4c5b15a9620c64b7d7fbc5c163b37962f0f4 Mon Sep 17 00:00:00 2001 From: Jaime Rave <jaimerave(a)gmail.com> Date: Thu, 8 Mar 2012 23:52:41 -0500 Subject: Fixes for the spanish version of the home page --- include/data.php | 2 +- templates/es/home.template | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/data.php b/include/data.php index d5805fe..0c4dea8 100644 --- a/include/data.php +++ b/include/data.php @@ -38,7 +38,7 @@ class data ), 'es' => array( 'name' => 'Español', - 'change' => 'Cambiar la Lengua' + 'change' => 'Cambiar Idioma' ), 'fr' => array( 'name' => 'Français', diff --git a/templates/es/home.template b/templates/es/home.template index b725fa2..98eb209 100644 --- a/templates/es/home.template +++ b/templates/es/home.template @@ -1,7 +1,7 @@ - - + +  - +  <div id="main_left"> @@ -39,7 +39,7 @@ <div class="icon"></div> <div class="text"> <div class="title"><a href="{$root}/devel/">Desarrollo</a></div> - <div class="subtitle">Conviértete en un desarrollador de Wine.</div> + <div class="subtitle">Conviértase en un desarrollador de Wine.</div> </div> </div> @@ -64,20 +64,20 @@ <b class="rtop"><b class="r1"></b><b class="r2"></b><b class="r3"></b><b class="r4"></b></b> <div class="content" style="padding: 5px 10px 5px 10px; height: 85px; overflow: auto;"> - <h3 class="title" style="margin: 0;">Último lanzamiento</h3> + <h3 class="title" style="margin: 0;">Últimos lanzamientos</h3> <table style="margin: 7px 0 0 15px; border-spacing: 0; border: 0;"> <tr><td>Estable:</td> <td style="padding-left: 15px; padding-bottom: 2px;"> <b><a href="{$root}/announce/{$config_stable_release}">Wine {$config_stable_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">cambios</a>) </span> </td></tr> <tr><td>Desarrollo:</td> <td style="padding-left: 15px;"> <b><a href="{$root}/announce/{$config_master_release}">Wine {$config_master_release}</a></b> <span class="small"> - (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">shortlog</a>) + (<a href="http://source.winehq.org/git/wine.git?a=shortlog;h=refs/tags/wine-{$config_…">cambios</a>) </span> </td></tr> </table>

1 0

Christian Costa : d3dxof: Check the right offset before dereferencing next byte.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: b9353b73ae47dc7cdfcb55f5b7c3a1d8778954a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9353b73ae47dc7cdfcb55f5b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 8 09:17:02 2012 +0100 d3dxof: Check the right offset before dereferencing next byte. --- dlls/d3dxof/parsing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index f40c202..9f426c4 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -605,7 +605,7 @@ static BOOL is_string(parse_buffer* buf) if (*buf->buffer != '"') return FALSE; - while (pos < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) + while ((pos+1) < buf->rem_bytes && !is_operator(c = *(buf->buffer+pos+1))) { if (c == '"') {

1 0

Christian Costa : d3dxof/tests: Improve some messages.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: bfd56e5bdc8001d39b16d10af0352a0524118c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfd56e5bdc8001d39b16d10af… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 8 09:16:54 2012 +0100 d3dxof/tests: Improve some messages. --- dlls/d3dxof/tests/d3dxof.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 21eba9c..5293b44 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -673,11 +673,11 @@ static void test_dump(void) if (!ReadFile(hFile, pvData, 10000, &cbSize, NULL)) { - skip("Template file is too big\n"); + skip("Templates file is too big\n"); goto exit; } - printf("Load %d bytes\n", cbSize); + printf("Load templates file (%d bytes)\n", cbSize); hr = pDirectXFileCreate(&lpDirectXFile); ok(hr == DXFILE_OK, "DirectXFileCreate: %x\n", hr);

1 0

Christian Costa : d3dxof/tests: Do not print the string when GetName returned 0 byte.
by Alexandre Julliard 08 Mar '12

08 Mar '12

Module: wine Branch: master Commit: 235bb47d180736af936d267b8337090520f51293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=235bb47d180736af936d267b8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Mar 8 09:16:46 2012 +0100 d3dxof/tests: Do not print the string when GetName returned 0 byte. --- dlls/d3dxof/tests/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 0c3a295..21eba9c 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -576,7 +576,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) printf(" "); debugstr_guid(str_clsid, &clsid); debugstr_guid(str_clsid_type, clsid_type); - printf("Found object '%s' - %s - %s - %d\n", name, str_clsid, str_clsid_type, size); + printf("Found object '%s' - %s - %s - %d\n", len ? name : "", str_clsid, str_clsid_type, size); if (EXPAND_STRING && size == 4) {

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
71
Older →

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 March 2012