April 2010 - Wine-Commits - list.winehq.org

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

April 15, 2010

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

Maarten Lankhorst : mmdevapi: Add OSS to blacklist on linux.
by Alexandre Julliard April 15, 2010

April 15, 2010

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 April 15, 2010

April 15, 2010

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

Maarten Lankhorst : mmdevapi: Don' t load openal on older openal-soft versions.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: e9cee6fbe03c1b63dbe38726b5e42b4f64f05daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9cee6fbe03c1b63dbe38726b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 14 21:18:42 2010 +0200 mmdevapi: Don't load openal on older openal-soft versions. --- dlls/mmdevapi/devenum.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 0f6f45d..41011e7 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -732,16 +732,40 @@ static void openal_setformat(MMDevice *This, DWORD freq) } } +static int blacklist_pulse; + static int blacklist(const char *dev) { #ifdef __linux__ if (strncmp(dev, "OSS ", 4)) return 1; #endif + if (blacklist_pulse && !strncmp(dev, "PulseAudio ", 11)) + return 1; if (strstr(dev, "ALSA") && strstr(dev, "hw:")) return 1; return 0; } +static void pulse_fixup(const char *devstr, const char **defstr) { + static int warned; + + if (!blacklist_pulse && !local_contexts) + blacklist_pulse = 1; + + if (!blacklist_pulse || !devstr || strncmp(*defstr, "PulseAudio ", 11)) + return; + + if (!warned++) { + ERR("Disabling pulseaudio because of old openal version\n"); + ERR("Please upgrade to openal-soft v1.12 or newer\n"); + } + while (*devstr && !strncmp(devstr, "PulseAudio ", 11)) { + devstr += strlen(devstr) + 1; + } + TRACE("New default: %s\n", devstr); + *defstr = devstr; +} + static void openal_scanrender(void) { WCHAR name[MAX_PATH]; @@ -756,6 +780,7 @@ static void openal_scanrender(void) defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER); } + pulse_fixup(devstr, &defaultstr); defblacklisted = blacklist(defaultstr); if (defblacklisted) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); @@ -796,6 +821,7 @@ static void openal_scancapture(void) EnterCriticalSection(&openal_crst); devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); + pulse_fixup(devstr, &defaultstr); defblacklisted = blacklist(defaultstr); if (defblacklisted) WARN("Disabling blacklist because %s is blacklisted\n", defaultstr);

1 0

Roderick Colenbrander : wined3d: Remove temporary conv_byte_count fixup from d3dfmt_get_conv.
by Alexandre Julliard April 15, 2010

April 15, 2010

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

Piotr Caban : msvcrt: Make setlocale working with per thread locales.
by Alexandre Julliard April 15, 2010

April 15, 2010

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: Change _create_locale implementation so generated structure is easier to modify .
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: 10023a15d60f381084254f0c2b9dcbaf7a4d03b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10023a15d60f381084254f0c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:24:53 2010 +0200 msvcrt: Change _create_locale implementation so generated structure is easier to modify. --- dlls/msvcrt/locale.c | 38 ++++++++++++-------------------------- 1 files changed, 12 insertions(+), 26 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b5bbe74..07a793b 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -699,16 +699,10 @@ int CDECL ___lc_collate_cp_func(void) void CDECL _free_locale(MSVCRT__locale_t locale) { int i; - BOOL localeC = TRUE; for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { - if(locale->locinfo->lc_category[i].refcount) { - MSVCRT_free(locale->locinfo->lc_category[i].locale); - MSVCRT_free(locale->locinfo->lc_category[i].refcount); - } else if(localeC) { - MSVCRT_free(locale->locinfo->lc_category[i].locale); - localeC = FALSE; - } + MSVCRT_free(locale->locinfo->lc_category[i].locale); + MSVCRT_free(locale->locinfo->lc_category[i].refcount); } if(locale->locinfo->lconv) { @@ -744,7 +738,7 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) { MSVCRT__locale_t loc; LCID lcid; - char buf[256], *localeC; + char buf[256]; int i; TRACE("(%d %s)\n", category, locale); @@ -807,21 +801,6 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) memset(loc->locinfo, 0, sizeof(MSVCRT_threadlocinfo)); memset(loc->mbcinfo, 0, sizeof(MSVCRT_threadmbcinfo)); - if(category!=MSVCRT_LC_ALL || !lcid) { - localeC = MSVCRT_malloc(sizeof(char[2])); - - if(localeC) { - localeC[0] = 'C'; - localeC[1] = '\0'; - - for(i=MSVCRT_LC_ALL+1; i<=MSVCRT_LC_MAX; i++) - loc->locinfo->lc_category[i].locale = localeC; - } else { - _free_locale(loc); - return NULL; - } - } - loc->locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); if(!loc->locinfo->lconv) { _free_locale(loc); @@ -843,7 +822,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) _free_locale(loc); return NULL; } - } + } else + loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = strdup("C"); if(lcid && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) { CPINFO cp; @@ -883,6 +863,7 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) loc->locinfo->lc_clike = 1; loc->locinfo->mb_cur_max = 1; loc->locinfo->pctype = MSVCRT__ctype+1; + loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = strdup("C"); } for(i=0; i<256; i++) @@ -1069,6 +1050,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) loc->locinfo->lconv->n_sep_by_space = 127; loc->locinfo->lconv->p_sign_posn = 127; loc->locinfo->lconv->n_sign_posn = 127; + + loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = strdup("C"); } if(lcid && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) { @@ -1131,6 +1114,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) loc->locinfo->lconv->decimal_point[1] = '\0'; loc->locinfo->lconv->thousands_sep[0] = '\0'; loc->locinfo->lconv->grouping[0] = '\0'; + + loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = strdup("C"); } if(lcid && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) { @@ -1138,7 +1123,8 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) _free_locale(loc); return NULL; } - } + } else + loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = strdup("C"); return loc; }

1 0

Piotr Caban : msvcrt: Change implementation of setlocale.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: d58b385b385b9ba244377c534f2a7e09c50aa997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58b385b385b9ba244377c534… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:25:13 2010 +0200 msvcrt: Change implementation of setlocale. --- dlls/msvcrt/ctype.c | 9 +- dlls/msvcrt/locale.c | 380 +++++++++++++++++++++++--------------------------- dlls/msvcrt/main.c | 13 ++- dlls/msvcrt/msvcrt.h | 5 +- 4 files changed, 188 insertions(+), 219 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d58b385b385b9ba244377…

1 0

Piotr Caban : msvcr90: Forward _iswalpha_l calls to msvcrt.
by Alexandre Julliard April 15, 2010

April 15, 2010

Module: wine Branch: master Commit: b22ff84d6c842e1076c89fde88f6ea9f1cd6f965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22ff84d6c842e1076c89fde8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:24:28 2010 +0200 msvcr90: Forward _iswalpha_l calls to msvcrt. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 46e7077..ac3ca94 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -611,7 +611,7 @@ @ stub _isspace_l @ stub _isupper_l @ stub _iswalnum_l -@ stub _iswalpha_l +@ cdecl _iswalpha_l(long ptr) msvcrt._iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1d7e139..a038a8f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -599,7 +599,7 @@ @ stub _isspace_l @ stub _isupper_l @ stub _iswalnum_l -@ stub _iswalpha_l +@ cdecl _iswalpha_l(long ptr) msvcrt._iswalpha_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l

1 0

Alistair Leslie-Hughes : msxml4: Add Schema interfaces.
by Alexandre Julliard April 15, 2010

April 15, 2010

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