wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Maarten Lankhorst : mmdevapi: Add OSS to blacklist on linux.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 3d6908c53d236c0fc8316f2da8b11382699ec4c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6908c53d236c0fc8316f2da… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 14 20:17:07 2010 +0200 mmdevapi: Add OSS to blacklist on linux. --- dlls/mmdevapi/devenum.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 9619aa6..0f6f45d 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -733,6 +733,10 @@ static void openal_setformat(MMDevice *This, DWORD freq) } static int blacklist(const char *dev) { +#ifdef __linux__ + if (strncmp(dev, "OSS ", 4)) + return 1; +#endif if (strstr(dev, "ALSA") && strstr(dev, "hw:")) return 1; return 0;

1 0

Roderick Colenbrander : wined3d: Remove paletteOverride from BltOverride offscreen->render_target blit.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: bf58d819688a7347dd5028a3dd2993d5c9088a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf58d819688a7347dd5028a3d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 15 12:42:00 2010 +0200 wined3d: Remove paletteOverride from BltOverride offscreen->render_target blit. This code was needed when the destination uses 8-bit and the source lacked a palette. Since we don't allow destination fixups, this code doesn't do anything. At a later stage something like this should perhaps be readded to specific backends. --- dlls/wined3d/surface.c | 33 +-------------------------------- 1 files changed, 1 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bb77ef5..fc24bb4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3575,21 +3575,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const DWORD oldCKeyFlags = Src->CKeyFlags; WINEDDCOLORKEY oldBltCKey = Src->SrcBltCKey; struct wined3d_context *context; - BOOL paletteOverride = FALSE; TRACE("Blt from surface %p to rendertarget %p\n", Src, This); - /* When blitting from an offscreen surface to a rendertarget, the source - * surface is not required to have a palette. Our rendering / conversion - * code further down the road retrieves the palette from the surface, so - * it must have a palette set. */ - if (Src->resource.format_desc->format == WINED3DFMT_P8_UINT && !Src->palette) - { - paletteOverride = TRUE; - TRACE("Source surface (%p) lacks palette, overriding palette with palette %p of destination surface (%p)\n", Src, This->palette, This); - Src->palette = This->palette; - } - if (!(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) && fbo_blit_supported(&myDevice->adapter->gl_info, BLIT_OP_BLIT, &src_rect, Src->resource.usage, Src->resource.pool, Src->resource.format_desc, @@ -3601,10 +3589,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const */ stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &src_rect, (IWineD3DSurface *)This, &dst_rect, Filter); - - /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ - if(paletteOverride) - Src->palette = NULL; return WINED3D_OK; } @@ -3613,13 +3597,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const &src_rect, Src->resource.usage, Src->resource.pool, Src->resource.format_desc, &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)) { - HRESULT hr = arbfp_blit_surface(myDevice, Src, &src_rect, This, &dst_rect, BLIT_OP_BLIT, Filter); - - /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ - if(paletteOverride) - Src->palette = NULL; - - return hr; + return arbfp_blit_surface(myDevice, Src, &src_rect, This, &dst_rect, BLIT_OP_BLIT, Filter); } /* Color keying: Check if we have to do a color keyed blt, @@ -3669,11 +3647,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)) { FIXME("Unsupported blit operation falling back to software\n"); - - /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ - if(paletteOverride) - Src->palette = NULL; - return WINED3DERR_INVALIDCALL; } @@ -3712,10 +3685,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const Src->CKeyFlags = oldCKeyFlags; Src->SrcBltCKey = oldBltCKey; - /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ - if(paletteOverride) - Src->palette = NULL; - LEAVE_GL(); /* Leave the opengl state valid for blitting */

1 0

Roderick Colenbrander : wined3d: We don't need color keying for sysmem-> drawable uploads.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 4cb62559073dc41a42bb30cabcd2ee51c1e454b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb62559073dc41a42bb30cab… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 15 12:41:59 2010 +0200 wined3d: We don't need color keying for sysmem->drawable uploads. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2986bc0..bb77ef5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4425,7 +4425,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); } - d3dfmt_get_conv(This, TRUE /* We need color keying */, FALSE /* We won't use textures */, &desc, &convert); + d3dfmt_get_conv(This, FALSE /* We need color keying */, FALSE /* We won't use textures */, &desc, &convert); /* The width is in 'length' not in bytes */ width = This->currentDesc.Width;

1 0

Roderick Colenbrander : wined3d: Remove call to d3dfmt_get_conv from read_from_framebuffer_texture.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 2a949ec323aac6f1826148ef97ab6ad992bfc9ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a949ec323aac6f1826148ef9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 15 12:41:58 2010 +0200 wined3d: Remove call to d3dfmt_get_conv from read_from_framebuffer_texture. --- dlls/wined3d/surface.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e3cef9..2986bc0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1487,13 +1487,9 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - struct wined3d_format_desc desc; - CONVERT_TYPES convert; GLint prevRead; BOOL alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &desc, &convert); - /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any * states in the stateblock, and no driver was found yet that had bugs in that regard. @@ -1535,7 +1531,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) if (!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, gl_info, &desc, srgb, This->pow2Width, This->pow2Height); + surface_allocate_surface(This, gl_info, This->resource.format_desc, srgb, This->pow2Width, This->pow2Height); This->Flags |= alloc_flag; }

1 0

Roderick Colenbrander : wined3d: Remove temporary conv_byte_count fixup from d3dfmt_get_conv.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 1a61f46bbb198c31da3245ea3a3d475624183117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a61f46bbb198c31da3245ea3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 15 12:41:57 2010 +0200 wined3d: Remove temporary conv_byte_count fixup from d3dfmt_get_conv. --- dlls/wined3d/surface.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 309a62a..9e3cef9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2138,6 +2138,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ RECT rect = {0, 0, This->pow2Width, This->pow2Height}; /* Copy the default values from the surface. Below we might perform fixups */ + /* TODO: get rid of color keying desc fixups by using e.g. a table. */ *desc = *This->resource.format_desc; *convert = NO_CONVERSION; @@ -2192,6 +2193,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->glFormat = GL_RGBA; desc->glInternal = GL_RGB5_A1; desc->glType = GL_UNSIGNED_SHORT_5_5_5_1; + desc->conv_byte_count = 2; } break; @@ -2201,6 +2203,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->glFormat = GL_BGRA; desc->glInternal = GL_RGB5_A1; desc->glType = GL_UNSIGNED_SHORT_1_5_5_5_REV; + desc->conv_byte_count = 2; } break; @@ -2220,6 +2223,7 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ desc->glFormat = GL_RGBA; desc->glInternal = GL_RGBA8; desc->glType = GL_UNSIGNED_INT_8_8_8_8; + desc->conv_byte_count = 4; } break; @@ -2227,14 +2231,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ break; } - /* At the moment we don't override the byte_count when it is the same before - * and after conversion. Until that is fixed (which mostly applies to non-ck formats), - * make sure we explicitly set conv_byte_count. - * TODO: get rid of this. - */ - if(!desc->conv_byte_count) - desc->conv_byte_count = desc->byte_count; - return WINED3D_OK; }

1 0

Alistair Leslie-Hughes : msxml4: Add Schema interfaces.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: cf087f749b893611a0ad217cc877faffe4dbf57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf087f749b893611a0ad217cc… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 15 21:14:08 2010 +1000 msxml4: Add Schema interfaces. --- include/msxml2.idl | 610 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msxml2did.h | 82 +++++++ 2 files changed, 692 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf087f749b893611a0ad2…

1 0

Piotr Caban : msvcrt: Use per thread locale in many functions.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: d1fa8b64e42a646b7452fd0cc1a480531d0180c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fa8b64e42a646b7452fd0cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:47 2010 +0200 msvcrt: Use per thread locale in many functions. --- dlls/msvcrt/ctype.c | 12 ++++--- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 75 ++++++++++++++++++++++++++------------------------ 4 files changed, 48 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d1fa8b64e42a646b7452f…

1 0

Piotr Caban : msvcrt: Make setlocale working with per thread locales.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 87dee43b0accad4f26806d75277c954e670dacb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87dee43b0accad4f26806d752… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:33 2010 +0200 msvcrt: Make setlocale working with per thread locales. --- dlls/msvcrt/locale.c | 122 ++++++++++++++++++++++++++------------------------ 1 files changed, 63 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87dee43b0accad4f26806…

1 0

Piotr Caban : msvcrt: Added multiple locales parsing to _create_locale.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 5efff1641384622e1b49b804a45723d2aca60510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5efff1641384622e1b49b804a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:17 2010 +0200 msvcrt: Added multiple locales parsing to _create_locale. --- dlls/msvcrt/locale.c | 129 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5efff1641384622e1b49b…

1 0

Piotr Caban : msvcrt: Move locale string interpretation to MSVCRT_locale_to_LCID.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 6ad7b4ff5cca4810eb8c15c70542046a02ae629a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad7b4ff5cca4810eb8c15c70… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:26:01 2010 +0200 msvcrt: Move locale string interpretation to MSVCRT_locale_to_LCID. --- dlls/msvcrt/locale.c | 164 ++++++++++++++++++++++++-------------------------- 1 files changed, 78 insertions(+), 86 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index bc65f04..f654169 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -193,66 +193,86 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO extern int atoi(const char *); /* Internal: Find the LCID for a locale specification */ -static LCID MSVCRT_locale_to_LCID(locale_search_t* locale) +static LCID MSVCRT_locale_to_LCID(const char *locale) { - LCID lcid; - EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, - (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, - (LONG_PTR)locale); - - if (!locale->match_flags) - return 0; + LCID lcid; + locale_search_t search; + char *cp, *region; - /* If we were given something that didn't match, fail */ - if (locale->search_country[0] && !(locale->match_flags & FOUND_COUNTRY)) - return 0; + memset(&search, 0, sizeof(locale_search_t)); - lcid = MAKELCID(locale->found_lang_id, SORT_DEFAULT); + cp = strchr(locale, '.'); + region = strchr(locale, '_'); - /* Populate partial locale, translating LCID to locale string elements */ - if (!locale->found_codepage[0]) - { - /* Even if a codepage is not enumerated for a locale - * it can be set if valid */ - if (locale->search_codepage[0]) - { - if (IsValidCodePage(atoi(locale->search_codepage))) - memcpy(locale->found_codepage,locale->search_codepage,MAX_ELEM_LEN); - else - { - /* Special codepage values: OEM & ANSI */ - if (strcasecmp(locale->search_codepage,"OCP")) - { - GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); - } - else if (strcasecmp(locale->search_codepage,"ACP")) - { - GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); + lstrcpynA(search.search_language, locale, MAX_ELEM_LEN); + if(region) { + lstrcpynA(search.search_country, region+1, MAX_ELEM_LEN); + if(region-locale < MAX_ELEM_LEN) + search.search_language[region-locale] = '\0'; + } else + search.search_country[0] = '\0'; + + if(cp) { + lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); + if(cp-region < MAX_ELEM_LEN) + search.search_country[cp-region] = '\0'; + if(cp-locale < MAX_ELEM_LEN) + search.search_language[cp-locale] = '\0'; + } else + search.search_codepage[0] = '\0'; + + /* FIXME: MSVCRT_locale_to_LCID is not finding remaped values */ + remap_synonym(search.search_country); + + EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, + (LPCSTR)LOCALE_ILANGUAGE,find_best_locale_proc, + (LONG_PTR)&search); + + if (!search.match_flags) + return 0; + + /* If we were given something that didn't match, fail */ + if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) + return 0; + + lcid = MAKELCID(search.found_lang_id, SORT_DEFAULT); + + /* Populate partial locale, translating LCID to locale string elements */ + if (!search.found_codepage[0]) { + /* Even if a codepage is not enumerated for a locale + * it can be set if valid */ + if (search.search_codepage[0]) { + if (IsValidCodePage(atoi(search.search_codepage))) + memcpy(search.found_codepage,search.search_codepage,MAX_ELEM_LEN); + else { + /* Special codepage values: OEM & ANSI */ + if (strcasecmp(search.search_codepage,"OCP")) { + GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, + search.found_codepage, MAX_ELEM_LEN); + } else if (strcasecmp(search.search_codepage,"ACP")) { + GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, + search.found_codepage, MAX_ELEM_LEN); + } else + return 0; + + if (!atoi(search.found_codepage)) + return 0; + } + } else { + /* Prefer ANSI codepages if present */ + GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, + search.found_codepage, MAX_ELEM_LEN); + if (!search.found_codepage[0] || !atoi(search.found_codepage)) + GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, + search.found_codepage, MAX_ELEM_LEN); } - else - return 0; - - if (!atoi(locale->found_codepage)) - return 0; - } - } - else - { - /* Prefer ANSI codepages if present */ - GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); - if (!locale->found_codepage[0] || !atoi(locale->found_codepage)) - GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, - locale->found_codepage, MAX_ELEM_LEN); } - } - GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE|LOCALE_NOUSEROVERRIDE, - locale->found_language, MAX_ELEM_LEN); - GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY|LOCALE_NOUSEROVERRIDE, - locale->found_country, MAX_ELEM_LEN); - return lcid; + + GetLocaleInfoA(lcid, LOCALE_SENGLANGUAGE|LOCALE_NOUSEROVERRIDE, + search.found_language, MAX_ELEM_LEN); + GetLocaleInfoA(lcid, LOCALE_SENGCOUNTRY|LOCALE_NOUSEROVERRIDE, + search.found_country, MAX_ELEM_LEN); + return lcid; } /* INTERNAL: Set lc_handle, lc_id and lc_category in threadlocinfo struct */ @@ -572,35 +592,7 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) */ return NULL; } else { - locale_search_t search; - char *cp, *region; - - memset(&search, 0, sizeof(locale_search_t)); - - cp = strchr(locale, '.'); - region = strchr(locale, '_'); - - lstrcpynA(search.search_language, locale, MAX_ELEM_LEN); - if(region) { - lstrcpynA(search.search_country, region+1, MAX_ELEM_LEN); - if(region-locale < MAX_ELEM_LEN) - search.search_language[region-locale] = '\0'; - } else - search.search_country[0] = '\0'; - - if(cp) { - lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); - if(cp-region < MAX_ELEM_LEN) - search.search_country[cp-region] = '\0'; - if(cp-locale < MAX_ELEM_LEN) - search.search_language[cp-locale] = '\0'; - } else - search.search_codepage[0] = '\0'; - - /* FIXME: MSVCRT_locale_to_LCID is not finding remaped values */ - remap_synonym(search.search_country); - - lcid = MSVCRT_locale_to_LCID(&search); + lcid = MSVCRT_locale_to_LCID(locale); if(!lcid) return NULL; }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
90
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 April 2010