October 2014 - Wine-Commits

Nikolay Sivov : include: Added GetLocaleInfoEx() definition.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 52e4c5a802cd24dd8d569336d323488f5f8fcd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e4c5a802cd24dd8d569336d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 08:13:47 2014 +0400 include: Added GetLocaleInfoEx() definition. --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 13274be..58344b4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -835,6 +835,7 @@ WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); WINBASEAPI INT WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT); WINBASEAPI INT WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT); #define GetLocaleInfo WINELIB_NAME_AW(GetLocaleInfo) +WINBASEAPI INT WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,INT); WINBASEAPI INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,INT); WINBASEAPI INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,INT); #define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat)

1 0

Piotr Caban : msvcp90: Added locale_ctor_locale_cstr implementation.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

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(a)std@@QAE(a)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(a)std@@QAE(a)PBDH@Z */

1 0

Frédéric Delanoy : French translation for release 1.7.28
by Jeremy Newman Oct. 6, 2014

Oct. 6, 2014

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 Oct. 6, 2014

Oct. 6, 2014

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

Łukasz Wojniłowicz : Polish translation for release 1.7.28
by Jeremy Newman Oct. 6, 2014

Oct. 6, 2014

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

Alexandre Julliard : Wine release 1.7.28
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

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

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8A8.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

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

Alexandre Julliard : Release 1.7.28.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

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

Ken Thomases : winemac: Don' t invalidate the window shadow on every draw if it' s merely shaped and not color-keyed or using per-pixel alpha.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 170d80dc90fc3fb23d64f2a05f081747dd5a26c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170d80dc90fc3fb23d64f2a05… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 2 17:06:14 2014 -0500 winemac: Don't invalidate the window shadow on every draw if it's merely shaped and not color-keyed or using per-pixel alpha. This avoids flickering and tearing on some versions of OS X during frequent redrawing in a shaped window, such as when scrolling a document in Word 2007. Since we aren't guaranteed that the window surface has updated bits for us to draw, we mark the whole content view as needing redisplay and draw the window's shape in the background color on the first -drawRect: after the shape change. --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ba1b914..d9a421e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -236,6 +236,17 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([window contentView] != self) return; + if (window.shapeChangedSinceLastDraw && window.shape && !window.colorKeyed && !window.usePerPixelAlpha) + { + [[NSColor clearColor] setFill]; + NSRectFill(rect); + + [window.shape addClip]; + + [[NSColor windowBackgroundColor] setFill]; + NSRectFill(rect); + } + if (window.surface && window.surface_mutex && !pthread_mutex_lock(window.surface_mutex)) { @@ -289,7 +300,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // If the window may be transparent, then we have to invalidate the // shadow every time we draw. Also, if this is the first time we've // drawn since changing from transparent to opaque. - if (![window isOpaque] || window.shapeChangedSinceLastDraw) + if (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw) { window.shapeChangedSinceLastDraw = FALSE; [window invalidateShadow]; @@ -1373,11 +1384,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { if (![self isOpaque] && !self.needsTransparency) { + self.shapeChangedSinceLastDraw = TRUE; + [[self contentView] setNeedsDisplay:YES]; [self setBackgroundColor:[NSColor windowBackgroundColor]]; [self setOpaque:YES]; } else if ([self isOpaque] && self.needsTransparency) { + self.shapeChangedSinceLastDraw = TRUE; + [[self contentView] setNeedsDisplay:YES]; [self setBackgroundColor:[NSColor clearColor]]; [self setOpaque:NO]; }

1 0

Tag wine-1.7.28 : Alexandre Julliard : Release 1.7.28
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

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