wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Piotr Caban : msvcp90: Added locale_ctor_locale_cstr implementation.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: d274fdb029ed7bfeee9d5bdd0d28ca9c61641659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d274fdb029ed7bfeee9d5bdd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 4 17:32:20 2014 +0200 msvcp90: Added locale_ctor_locale_cstr implementation. --- dlls/msvcp60/locale.c | 24 ++++++++++++++++++++++-- dlls/msvcp90/locale.c | 24 ++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 326a51a..4828dd3 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -8218,8 +8218,28 @@ locale* __thiscall locale_copy_ctor(locale *this, const locale *copy) DEFINE_THISCALL_WRAPPER(locale_ctor_locale_cstr, 16) locale* __thiscall locale_ctor_locale_cstr(locale *this, const locale *loc, const char *locname, category cat) { - FIXME("(%p %p %s %d) stub\n", this, loc, locname, cat); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %p %s %d)\n", this, loc, locname, cat); + + _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); + if(!memcmp(basic_string_char_c_str(&locinfo.newlocname), "*", 2)) { + _Locinfo_dtor(&locinfo); + MSVCRT_operator_delete(this->ptr); + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + } + + this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!this->ptr) { + ERR("Out of memory\n"); + _Locinfo_dtor(&locinfo); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_copy_ctor(this->ptr, loc->ptr); + + locale__Locimp__Makeloc(&locinfo, cat, this->ptr, NULL); + _Locinfo_dtor(&locinfo); + return this; } /* ??0locale@std@@QAE@PBDH@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 587aca6..551a924d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9958,8 +9958,28 @@ locale* __thiscall locale_copy_ctor(locale *this, const locale *copy) DEFINE_THISCALL_WRAPPER(locale_ctor_locale_cstr, 16) locale* __thiscall locale_ctor_locale_cstr(locale *this, const locale *loc, const char *locname, category cat) { - FIXME("(%p %p %s %d) stub\n", this, loc, locname, cat); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %p %s %d)\n", this, loc, locname, cat); + + _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); + if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) { + _Locinfo_dtor(&locinfo); + MSVCRT_operator_delete(this->ptr); + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + } + + this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!this->ptr) { + ERR("Out of memory\n"); + _Locinfo_dtor(&locinfo); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_copy_ctor(this->ptr, loc->ptr); + + locale__Locimp__Makeloc(&locinfo, cat, this->ptr, NULL); + _Locinfo_dtor(&locinfo); + return this; } /* ??0locale@std@@QAE@PBDH@Z */

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 06 Oct '14

06 Oct '14

Module: wine Branch: master Commit: 311e21d2b2814692ce7811032aee6df9fe6f9737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311e21d2b2814692ce7811032… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Oct 4 10:01:36 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index e179796..2ee9944 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-08-05 21:59+0300\n" +"PO-Revision-Date: 2014-10-04 10:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3543,16 +3543,12 @@ msgid "Expected ')'" msgstr "Tikėtasi „)“" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Subjekto rakto identifikatorius" +msgstr "Tikėtasi identifikatoriaus" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Tikėtasi „;“" +msgstr "Tikėtasi „=“" #: jscript.rc:42 msgid "Invalid character" @@ -3583,20 +3579,16 @@ msgid "Label not found" msgstr "Žymė nerasta" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Tikėtasi „;“" +msgstr "Tikėtasi „@end“" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Sąlyginis kompiliavimas išjungtas" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Tikėtasi „;“" +msgstr "Tikėtasi „@“" #: jscript.rc:54 msgid "Number expected"

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.28
by Jeremy Newman 06 Oct '14

06 Oct '14

Module: website Branch: master Commit: 961748b546c93956be19494a8c34bf4af30d671c URL: http://source.winehq.org/git/website.git/?a=commit;h=961748b546c93956be1949… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 3 19:10:26 2014 +0200 Polish translation for release 1.7.28 --- news/pl/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014100301.xml b/news/pl/2014100301.xml new file mode 100644 index 0000000..334c926 --- /dev/null +++ b/news/pl/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 3, 2014</date> +<title>Wydano Wine 1.7.28</title> +<body> + Wydanie rozwojowe Wine 1.7.28 jest już dostępne. + <a href="{$root}/announce/1.7.28">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla warunkowej kompilacji w JavaScript.</li> + <li>Wsparcie dla dwukierunkowego tekstu w DirectWrite.</li> + <li>Zalążki wsparcia dla głosu DirectPlay.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.7.28
by Jeremy Newman 06 Oct '14

06 Oct '14

Module: website Branch: master Commit: 4f7e307a341f16f36bfd6d9b28f97782af62bbf8 URL: http://source.winehq.org/git/website.git/?a=commit;h=4f7e307a341f16f36bfd6d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Oct 5 08:31:20 2014 +0200 French translation for release 1.7.28 --- news/fr/2014100301.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014100301.xml b/news/fr/2014100301.xml new file mode 100644 index 0000000..89fcd27 --- /dev/null +++ b/news/fr/2014100301.xml @@ -0,0 +1,14 @@ +<news> +<date>3 octobre 2014</date> +<title>Sortie de Wine 1.7.28</title> +<body> + La version de développement 1.7.28 de Wine est disponible. + <a href="{$root}/announce/1.7.28">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la compilation conditionnelle dans JavaScript.</li> + <li>Prise en charge du texte bidirectionnel dans DirectWrite.</li> + <li>Squelettes de fonctions pour la prise en charge de DirectPlay Voice.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.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

Julian Rüger : German translation for release 1.7.28
by Jeremy Newman 06 Oct '14

06 Oct '14

Module: website Branch: master Commit: 69378f1d7212a97815b05997dd033d0f92f966e0 URL: http://source.winehq.org/git/website.git/?a=commit;h=69378f1d7212a97815b059… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 6 14:39:48 2014 +0200 German translation for release 1.7.28 --- news/de/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014100301.xml b/news/de/2014100301.xml new file mode 100644 index 0000000..8ce8662 --- /dev/null +++ b/news/de/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>3. Oktober 2014</date> +<title>Wine 1.7.28 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.28 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.28">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für bedingte Kompilierung von JavaScript.</li> + <li>Unterstützung von bidirektionellem Text in DirectWrite.</li> + <li>Stubs für DirectPlay-Voice-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.28
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: website Branch: master Commit: 1e07fbe25aad94a2ca4e6bcd2aaa90d33db3eadf URL: http://source.winehq.org/git/website.git/?a=commit;h=1e07fbe25aad94a2ca4e6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 3 10:04:22 2014 +0200 Wine release 1.7.28 --- news/en/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014100301.xml b/news/en/2014100301.xml new file mode 100644 index 0000000..bfc0422 --- /dev/null +++ b/news/en/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>October 3, 2014</date> +<title>Wine 1.7.28 Released</title> +<body> + The Wine development release 1.7.28 is now available. + <a href="{$root}/announce/1.7.28">What's new</a> in this release: +<ul> + <li>Support for conditional compilation in JavaScript.</li> + <li>Bidirectional text support in DirectWrite.</li> + <li>Stubs for DirectPlay Voice support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.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

Tag wine-1.7.28 : Alexandre Julliard : Release 1.7.28
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: refs/tags/wine-1.7.28 Tag: dd9a271fb1a5d67040526df0e8f6b243a88ee171 URL: http://source.winehq.org/git/wine.git/?a=tag;h=dd9a271fb1a5d67040526df0e8f6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 3 09:55:56 2014 +0200 Release 1.7.28

1 0

Alexandre Julliard : Release 1.7.28.
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: master Commit: 14302ee5e79ef4975f72cf7786d6cf5d8c31a0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14302ee5e79ef4975f72cf778… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 3 09:55:56 2014 +0200 Release 1.7.28. --- ANNOUNCE | 393 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 226 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14302ee5e79ef4975f72c…

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8A8.
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: master Commit: 7d42d9ea91d4b38a995159542ccbc3ec05626b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d42d9ea91d4b38a995159542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:20 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8A8. --- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e5f34f0..a8e0f51 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3282,14 +3282,33 @@ static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, uns } } +static void convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const DWORD *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (DWORD *)&src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + src_color &= ~0xff000000; + dst_row[x] = src_color; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { struct wined3d_palette *palette = NULL; struct wined3d_texture *texture; - const BYTE *source; - unsigned int x, y; - BYTE *dest; TRACE("src %p, dst %p, pitch %u, width %u, height %u, outpitch %u, conversion_type %#x, surface %p.\n", src, dst, pitch, width, height, outpitch, conversion_type, surface); @@ -3325,20 +3344,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8A8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = *(const DWORD *)source; - if (color_in_range(&texture->src_blt_color_key, color)) - color &= ~0xff000000; - *(DWORD*)dest = color; - source += 4; - dest += 4; - } - } + convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; default:

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard 03 Oct '14

03 Oct '14

Module: wine Branch: master Commit: dabe5b4479521e16a040849b34dea247dd520dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabe5b4479521e16a040849b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:19 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7dde5e4..e5f34f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3259,6 +3259,29 @@ static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsig } } +static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const DWORD *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (DWORD *)&src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + dst_row[x] = src_color & ~0xff000000; + else + dst_row[x] = src_color | 0xff000000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3297,21 +3320,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = *(const DWORD *)source; - if (color_in_range(&texture->src_blt_color_key, color)) - *(DWORD *)dest = color & ~0xff000000; - else - *(DWORD *)dest = color | 0xff000000; - source += 4; - dest += 4; - } - } + convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B8G8R8A8:

1 0

← Newer
1
...
32
33
34
35
36
37
38
39
40
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 October 2014