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

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 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

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

Maarten Lankhorst : mmdevapi: Don' t load openal on older openal-soft versions.
by Alexandre Julliard 15 Apr '10

15 Apr '10

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

Piotr Caban : msvcr90: Forward _iswalpha_l calls to msvcrt.
by Alexandre Julliard 15 Apr '10

15 Apr '10

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

Piotr Caban : msvcrt: Change _create_locale implementation so generated structure is easier to modify .
by Alexandre Julliard 15 Apr '10

15 Apr '10

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 15 Apr '10

15 Apr '10

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 : msvcrt: Add helper function that returns current locale.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 59c2201a9cd128eeaf3c93ba2d8f9e6e0ced3679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c2201a9cd128eeaf3c93ba2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:25:34 2010 +0200 msvcrt: Add helper function that returns current locale. --- dlls/msvcrt/locale.c | 10 ++++++++++ dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 2 ++ 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index c30b907..45547ae 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -317,6 +317,16 @@ static inline void swap_pointers(void **p1, void **p2) { *p2 = hlp; } +/* INTERNAL: returns _locale_t struct for current locale */ +MSVCRT__locale_t get_locale(void) { + thread_data_t *data = msvcrt_get_thread_data(); + + if(!data || !data->locale) + return MSVCRT_locale; + + return data->locale; +} + /********************************************************************* * wsetlocale (MSVCRT.@) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a8b77e1..e2184b3 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -69,6 +69,7 @@ static inline void msvcrt_free_tls_mem(void) HeapFree(GetProcessHeap(),0,tls->asctime_buffer); HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); HeapFree(GetProcessHeap(),0,tls->strerror_buffer); + _free_locale(tls->locale); } HeapFree(GetProcessHeap(), 0, tls); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 34d1c9e..9b99cd7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -115,6 +115,7 @@ struct __thread_data { MSVCRT_unexpected_function unexpected_handler; MSVCRT__se_translator_function se_translator; EXCEPTION_RECORD *exc_record; + struct MSVCRT_localeinfo_struct *locale; }; typedef struct __thread_data thread_data_t; @@ -791,6 +792,7 @@ typedef struct MSVCRT_localeinfo_struct } MSVCRT__locale_tstruct, *MSVCRT__locale_t; extern MSVCRT__locale_t MSVCRT_locale; +MSVCRT__locale_t get_locale(void); void __cdecl _free_locale(MSVCRT__locale_t); #ifndef __WINE_MSVCRT_TEST

1 0

Piotr Caban : msvcrt: Added _configthreadlocale implementation.
by Alexandre Julliard 15 Apr '10

15 Apr '10

Module: wine Branch: master Commit: 20b77f44289db4b072264d03bf83c4333346abf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b77f44289db4b072264d03b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 15 14:25:47 2010 +0200 msvcrt: Added _configthreadlocale implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ac3ca94..21367a9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -324,7 +324,7 @@ @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit @ extern _commode msvcrt._commode -@ stub _configthreadlocale +@ cdecl _configthreadlocale(long) msvcrt._configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp @ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a038a8f..d084047 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -316,7 +316,7 @@ @ cdecl _close(long) msvcrt._close @ cdecl _commit(long) msvcrt._commit @ extern _commode msvcrt._commode -@ stub _configthreadlocale +@ cdecl _configthreadlocale(long) msvcrt._configthreadlocale @ cdecl _control87(long long) msvcrt._control87 @ cdecl _controlfp(long long) msvcrt._controlfp @ cdecl _controlfp_s(ptr long long) msvcrt._controlfp_s diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 45547ae..bc65f04 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -954,6 +954,43 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) return loc; } +/* _configthreadlocale - not exported in native msvcrt */ +int CDECL _configthreadlocale(int type) +{ + thread_data_t *data = msvcrt_get_thread_data(); + int ret; + + if(!data) + return -1; + + ret = (data->locale ? MSVCRT__ENABLE_PER_THREAD_LOCALE : MSVCRT__DISABLE_PER_THREAD_LOCALE); + + if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) { + if(!data->locale) { + /* Copy current global locale */ + data->locale = _create_locale(MSVCRT_LC_ALL, MSVCRT_setlocale(MSVCRT_LC_ALL, NULL)); + if(!data->locale) + return -1; + } + + return ret; + } + + if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) { + if(data->locale) { + _free_locale(data->locale); + data->locale = NULL; + } + + return ret; + } + + if(!type) + return ret; + + return -1; +} + /********************************************************************* * setlocale (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9b99cd7..2ed5aeb 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -791,6 +791,9 @@ typedef struct MSVCRT_localeinfo_struct MSVCRT_pthreadmbcinfo mbcinfo; } MSVCRT__locale_tstruct, *MSVCRT__locale_t; +#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 +#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 + extern MSVCRT__locale_t MSVCRT_locale; MSVCRT__locale_t get_locale(void); void __cdecl _free_locale(MSVCRT__locale_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 22e921e..1f073d3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1417,3 +1417,4 @@ @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _create_locale(long str) @ cdecl _free_locale(ptr) +@ cdecl _configthreadlocale(long)

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