October 2014 - Wine-commits

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

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

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

Nikolay Sivov : dwrite: Implement CreateNumberSubstitution().
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 7c035744f6bc1cbaa763554aa9cf023d8790fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c035744f6bc1cbaa763554aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 16:14:41 2014 +0400 dwrite: Implement CreateNumberSubstitution(). --- dlls/dwrite/analyzer.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/analyzer.c | 36 +++++++++++++++++ include/winnls.h | 3 +- 5 files changed, 134 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2470fa2..7c32e6b 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -165,6 +165,20 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Yiii */ { 0x69696959, 460, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, TRUE } }; +struct dwrite_numbersubstitution { + IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; + LONG ref; + + DWRITE_NUMBER_SUBSTITUTION_METHOD method; + WCHAR *locale; + BOOL ignore_user_override; +}; + +static inline struct dwrite_numbersubstitution *impl_from_IDWriteNumberSubstitution(IDWriteNumberSubstitution *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_numbersubstitution, IDWriteNumberSubstitution_iface); +} + static inline UINT16 get_char_script(WCHAR c) { UINT16 script = get_table_entry(wine_scripts_table, c); @@ -1044,3 +1058,82 @@ HRESULT get_textanalyzer(IDWriteTextAnalyzer **ret) *ret = (IDWriteTextAnalyzer*)&textanalyzer; return S_OK; } + +static HRESULT WINAPI dwritenumbersubstitution_QueryInterface(IDWriteNumberSubstitution *iface, REFIID riid, void **obj) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteNumberSubstitution) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDWriteNumberSubstitution_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *iface) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution *iface) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) { + heap_free(This->locale); + heap_free(This); + } + + return ref; +} + +static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { + dwritenumbersubstitution_QueryInterface, + dwritenumbersubstitution_AddRef, + dwritenumbersubstitution_Release +}; + +HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD method, const WCHAR *locale, + BOOL ignore_user_override, IDWriteNumberSubstitution **ret) +{ + struct dwrite_numbersubstitution *substitution; + + *ret = NULL; + + if (method < DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE || method > DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL) + return E_INVALIDARG; + + if (method != DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE && !IsValidLocaleName(locale)) + return E_INVALIDARG; + + substitution = heap_alloc(sizeof(*substitution)); + if (!substitution) + return E_OUTOFMEMORY; + + substitution->IDWriteNumberSubstitution_iface.lpVtbl = &numbersubstitutionvtbl; + substitution->ref = 1; + substitution->ignore_user_override = ignore_user_override; + substitution->method = method; + substitution->locale = heap_strdupW(locale); + if (locale && !substitution->locale) { + heap_free(substitution); + return E_OUTOFMEMORY; + } + + *ret = &substitution->IDWriteNumberSubstitution_iface; + return S_OK; +} diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ccad5a8..3ca7114 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -89,6 +89,7 @@ static inline unsigned short get_table_entry(const unsigned short *table, WCHAR extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC_HIDDEN; +extern HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD,const WCHAR *locale,BOOL,IDWriteNumberSubstitution**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 7d62871..033e89a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -749,8 +749,8 @@ static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory *ifa WCHAR const* locale, BOOL ignore_user_override, IDWriteNumberSubstitution **substitution) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%d %s %d %p): stub\n", This, method, debugstr_w(locale), ignore_user_override, substitution); - return E_NOTIMPL; + TRACE("(%p)->(%d %s %d %p)\n", This, method, debugstr_w(locale), ignore_user_override, substitution); + return create_numbersubstitution(method, locale, ignore_user_override, substitution); } static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory *iface, DWRITE_GLYPH_RUN const *glyph_run, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 45e2e07..31532ca 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1046,11 +1046,46 @@ if (0) { /* crashes on native */ ok(indices[0] == 0, "%d: got %d\n", i, indices[0]); } + IDWriteFont_Release(font); IDWriteFontFace_Release(fontface); IDWriteGdiInterop_Release(interop); IDWriteTextAnalyzer1_Release(analyzer1); } +static void test_numbersubstitution(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + IDWriteNumberSubstitution *substitution; + HRESULT hr; + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, NULL, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); + + /* invalid method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL+1, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, -1, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale, but it's not needed for this method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, dummyW, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); +} + START_TEST(analyzer) { HRESULT hr; @@ -1070,6 +1105,7 @@ START_TEST(analyzer) test_AnalyzeLineBreakpoints(); test_GetScriptProperties(); test_GetTextComplexity(); + test_numbersubstitution(); IDWriteFactory_Release(factory); } diff --git a/include/winnls.h b/include/winnls.h index 9b353cb..13274be 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -863,8 +863,9 @@ WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE); WINBASEAPI BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); WINNORMALIZEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT); WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); -WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); +WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); +WINBASEAPI BOOL WINAPI IsValidLocaleName(LPCWSTR); WINBASEAPI INT WINAPI LCIDToLocaleName(LCID,LPWSTR,INT,DWORD); WINBASEAPI INT WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT); WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT);

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 2c7be38bb4079aab316dd5efe0306bb79344ce7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7be38bb4079aab316dd5efe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:37 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73b872f..a4a11c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1607,7 +1607,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; @@ -3264,17 +3264,17 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ - for (y = 0; y < height; y++) + for (y = 0; y < height; ++y) { source = src + pitch * y; dest = dst + outpitch * y; - for (x = 0; x < width; x++) { - DWORD color = 0xffffff & *(const DWORD*)source; - DWORD dstcolor = color << 8; - if (!color_in_range(&surface->container->src_blt_color_key, color)) - dstcolor |= 0xff; - *(DWORD*)dest = dstcolor; + for (x = 0; x < width; ++x) + { + DWORD color = *(const DWORD *)source; + if (color_in_range(&surface->container->src_blt_color_key, color)) + *(DWORD *)dest = color & ~0xff000000; + else + *(DWORD *)dest = color | 0xff000000; source += 4; dest += 4; }

1 0

Henri Verbeet : wined3d: Just store the wined3d format in color_key_info[] .
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 5802f72adfad0ef5bebc139a3775bc35c4274bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5802f72adfad0ef5bebc139a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:38 2014 +0200 wined3d: Just store the wined3d format in color_key_info[]. --- dlls/wined3d/surface.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4a11c1..cf057e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1591,28 +1591,28 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_format *dst_format; + enum wined3d_format_id dst_format_id; unsigned int i; static const struct { enum wined3d_format_id src_format; enum wined3d_conversion_type conversion_type; - GLint gl_internal; - GLint gl_format; - GLint gl_type; - unsigned int conv_byte_count; + enum wined3d_format_id dst_format; } color_key_info[] = { - {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, WINED3DFMT_B5G5R5A1_UNORM}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, WINED3DFMT_B5G5R5A1_UNORM}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, WINED3DFMT_B8G8R8A8_UNORM}, }; *format = *texture->resource.format; *conversion_type = WINED3D_CT_NONE; + dst_format_id = format->id; if (colorkey_active) { @@ -1622,10 +1622,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp continue; *conversion_type = color_key_info[i].conversion_type; - format->glInternal = color_key_info[i].gl_internal; - format->glFormat = color_key_info[i].gl_format; - format->glType = color_key_info[i].gl_type; - format->conv_byte_count = color_key_info[i].conv_byte_count; + dst_format_id = color_key_info[i].dst_format; break; } } @@ -1638,10 +1635,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp && texture == texture->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_P8; - format->glInternal = GL_RGBA8; - format->glFormat = GL_BGRA; - format->glType = GL_UNSIGNED_INT_8_8_8_8_REV; - format->conv_byte_count = 4; + dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } } else if (texture->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) @@ -1653,8 +1647,13 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp if (*conversion_type != WINED3D_CT_NONE) { - format->rtInternal = format->glInternal; + dst_format = wined3d_get_format(gl_info, dst_format_id); + format->glInternal = dst_format->glInternal; format->glGammaInternal = format->glInternal; + format->rtInternal = format->glInternal; + format->glFormat = dst_format->glFormat; + format->glType = dst_format->glType; + format->conv_byte_count = dst_format->byte_count; } }

1 0

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

02 Oct '14

Module: wine Branch: master Commit: e10a46c30006d90dae9190b0ffb3985a7b3fc6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10a46c30006d90dae9190b0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:39 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_P8. --- dlls/wined3d/surface.c | 87 ++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cf057e2..0f13c9d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3156,9 +3156,47 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } +static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) +{ + const BYTE *src_row; + unsigned int x, y; + DWORD *dst_row; + + if (!palette) + { + /* FIXME: This should probably use the system palette. */ + FIXME("P8 surface loaded without a palette.\n"); + + for (y = 0; y < height; ++y) + { + memset(&dst[dst_pitch * y], 0, width * 4); + } + + return; + } + + for (y = 0; y < height; ++y) + { + src_row = &src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + BYTE src_color = src_row[x]; + dst_row[x] = 0xff000000 + | (palette->colors[src_color].rgbRed << 16) + | (palette->colors[src_color].rgbGreen << 8) + | palette->colors[src_color].rgbBlue; + } + } +} + 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; @@ -3166,43 +3204,14 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI 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); + texture = surface->container; switch (conversion_type) { case WINED3D_CT_P8: - if (surface->container->swapchain && surface->container->swapchain->palette) - { - const struct wined3d_palette *palette = surface->container->swapchain->palette; - for (y = 0; y < height; y++) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; x++) - { - BYTE color = *source++; - *dest++ = palette->colors[color].rgbBlue; - *dest++ = palette->colors[color].rgbGreen; - *dest++ = palette->colors[color].rgbRed; - *dest++ = 0; - } - } - } - else - { - /* This should probably use the system palette, but unless - * the X server is running in P8 mode there is no such thing. - * The probably best solution is to set the fixed 20 colors - * from the default windows palette and set the rest to black, - * white, or some ugly pink. For now use black for the entire - * palette. Don't use pink everywhere. Age of Empires 2 draws - * a front buffer filled with zeroes without a palette when - * starting and we don't want the screen to flash in an ugly - * color. */ - FIXME("P8 surface loaded without a palette.\n"); - for (y = 0; y < height; ++y) - { - memset(&dst[outpitch * y], 0, width * 4); - } - } + if (texture->swapchain && texture->swapchain->palette) + palette = texture->swapchain->palette; + convert_p8_uint_b8g8r8a8_unorm(src, pitch, dst, outpitch, + width, height, palette, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B5G6R5: @@ -3213,7 +3222,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { WORD color = *(const WORD *)source; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); else *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); @@ -3235,7 +3244,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = color; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) *Dest |= (1 << 15); else *Dest &= ~(1 << 15); @@ -3253,7 +3262,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) color |= 0xff000000; *(DWORD *)dest = color; source += 3; @@ -3270,7 +3279,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = *(const DWORD *)source; - if (color_in_range(&surface->container->src_blt_color_key, color)) + if (color_in_range(&texture->src_blt_color_key, color)) *(DWORD *)dest = color & ~0xff000000; else *(DWORD *)dest = color | 0xff000000; @@ -3288,7 +3297,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = *(const DWORD *)source; - if (color_in_range(&surface->container->src_blt_color_key, color)) + if (color_in_range(&texture->src_blt_color_key, color)) color &= ~0xff000000; *(DWORD*)dest = color; source += 4;

1 0

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

02 Oct '14

Module: wine Branch: master Commit: e377ad45fac4b35cb76e2917f763173a1c09a0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e377ad45fac4b35cb76e2917f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:40 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5. --- 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 0f13c9d..6b13dd0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3192,6 +3192,29 @@ static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pit } } +static void convert_b5g6r5_unorm_b5g5r5a1_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 WORD *src_row; + unsigned int x, y; + WORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (WORD *)&src[src_pitch * y]; + dst_row = (WORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + WORD src_color = src_row[x]; + if (!color_in_range(color_key, src_color)) + dst_row[x] = 0x8000 | ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + else + dst_row[x] = ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + } + } +} + 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) { @@ -3215,21 +3238,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G6R5: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - WORD color = *(const WORD *)source; - if (!color_in_range(&texture->src_blt_color_key, color)) - *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); - else - *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); - source += 2; - dest += 2; - } - } + convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B5G5R5X1:

1 0

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

02 Oct '14

Module: wine Branch: master Commit: dabb07aea60a81e7ec0b670215f064b28c4d1d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabb07aea60a81e7ec0b67021… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:41 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G5R5X1. --- dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6b13dd0..86aa235 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3215,6 +3215,29 @@ static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsig } } +static void convert_b5g5r5x1_unorm_b5g5r5a1_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 WORD *src_row; + unsigned int x, y; + WORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (WORD *)&src[src_pitch * y]; + dst_row = (WORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + WORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + dst_row[x] = src_color & ~0x8000; + else + dst_row[x] = src_color | 0x8000; + } + } +} + 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) { @@ -3243,26 +3266,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G5R5X1: - { - /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ - const WORD *Source; - WORD *Dest; - TRACE("Color keyed 5551\n"); - for (y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD color = *Source++; - *Dest = color; - if (!color_in_range(&texture->src_blt_color_key, color)) - *Dest |= (1 << 15); - else - *Dest &= ~(1 << 15); - Dest++; - } - } - } - break; + convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); + break; case WINED3D_CT_CK_B8G8R8: for (y = 0; y < height; ++y)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 02 Oct '14

02 Oct '14

Module: wine Branch: master Commit: 82f9e8a79ee31546df654acaf047964420a681ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f9e8a79ee31546df654acaf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 2 10:04:36 2014 +0200 po: Update French translation. --- po/fr.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6648d6a..29e5942 100644 --- a/po/fr.po +++ b/po/fr.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-04-19 09:10+0100\n" +"PO-Revision-Date: 2014-10-02 10:04+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3564,16 +3564,12 @@ msgid "Expected ')'" msgstr "« ) » attendu" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Identifiant de clé du sujet" +msgstr "Identifiant attendu" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "« ; » attendu" +msgstr "« = » attendu" #: jscript.rc:42 msgid "Invalid character" @@ -3604,20 +3600,16 @@ msgid "Label not found" msgstr "Étiquette introuvable" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "« ; » attendu" +msgstr "« @end » attendu" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "La compilation conditionnelle est désactivée" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "« ; » attendu" +msgstr "« @ » attendu" #: jscript.rc:54 msgid "Number expected"

1 0