December 2011 - Wine-commits

Aric Stewart : usp10: Use UpdateClusters in DecomposeVowels.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: a9058605d6af2151ee050c10ad43ad9421963ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9058605d6af2151ee050c10a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 08:48:37 2011 -0600 usp10: Use UpdateClusters in DecomposeVowels. --- dlls/usp10/shape.c | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8837213..18380d2 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1840,11 +1840,10 @@ static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutCha } } -static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const VowelComponents vowels[], WORD* pwLogClust) +static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const VowelComponents vowels[], WORD* pwLogClust, INT cChars) { int i; int cWalk; - int offset = 0; for (cWalk = 0; cWalk < *pcChars; cWalk++) { @@ -1852,14 +1851,11 @@ static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Vowe { if (pwOutChars[cWalk] == vowels[i].base) { - int j; - int o = 1; + int o = 0; ReplaceInsertChars(hdc, cWalk, pcChars, pwOutChars, vowels[i].parts); if (vowels[i].parts[1]) { cWalk++; o++; } if (vowels[i].parts[2]) { cWalk++; o++; } - offset += o; - for (j = (cWalk - offset) + 1; j < *pcChars - offset; j ++) - pwLogClust[j]+=o; + UpdateClusters(cWalk, o, 1, cChars, pwLogClust); break; } } @@ -2467,7 +2463,7 @@ static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose multi part vowels */ - DecomposeVowels(hdc, input, &cCount, Sinhala_vowels, pwLogClust); + DecomposeVowels(hdc, input, &cCount, Sinhala_vowels, pwLogClust, cChars); TRACE("New double vowel expanded string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2589,7 +2585,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels and Compose Consonents */ - DecomposeVowels(hdc, input, &cCount, Bengali_vowels, pwLogClust); + DecomposeVowels(hdc, input, &cCount, Bengali_vowels, pwLogClust, cChars); ComposeConsonants(hdc, input, &cCount, Bengali_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2749,7 +2745,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels and Compose Consonents */ - DecomposeVowels(hdc, input, &cCount, Oriya_vowels, pwLogClust); + DecomposeVowels(hdc, input, &cCount, Oriya_vowels, pwLogClust, cChars); ComposeConsonants(hdc, input, &cCount, Oriya_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2799,7 +2795,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels and Compose Consonents */ - DecomposeVowels(hdc, input, &cCount, Tamil_vowels, pwLogClust); + DecomposeVowels(hdc, input, &cCount, Tamil_vowels, pwLogClust, cChars); ComposeConsonants(hdc, input, &cCount, Tamil_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2849,7 +2845,7 @@ static void ContextualShape_Telugu(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels */ - DecomposeVowels(hdc, input, &cCount, Telugu_vowels, pwLogClust); + DecomposeVowels(hdc, input, &cCount, Telugu_vowels, pwLogClust, cChars); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2901,7 +2897,7 @@ static void ContextualShape_Kannada(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels */ - DecomposeVowels(hdc, input, &cCount, Kannada_vowels, pwLogClust); + DecomposeVowels(hdc, input, &cCount, Kannada_vowels, pwLogClust, cChars); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2946,7 +2942,7 @@ static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels */ - DecomposeVowels(hdc, input, &cCount, Malayalam_vowels, pwLogClust); + DecomposeVowels(hdc, input, &cCount, Malayalam_vowels, pwLogClust, cChars); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */

1 0

Aric Stewart : usp10: Sinhala, while behaving like a base Indic, does not set GlyphProps based on indic syllable.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 93a8499b95e3fc1bba20efa86708d91e61d84a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93a8499b95e3fc1bba20efa86… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 08:48:48 2011 -0600 usp10: Sinhala, while behaving like a base Indic, does not set GlyphProps based on indic syllable. --- dlls/usp10/shape.c | 53 ++++++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 18380d2..e040e48 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3256,12 +3256,9 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS } } -static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp, lexical_function lexical) +static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp, lexical_function lexical, BOOL use_syllables) { int i,k; - IndicSyllable *syllables = NULL; - int syllable_count = 0; - BOOL modern = get_GSUB_Indic2(psa, psc); GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); for (i = 0; i < cGlyphs; i++) @@ -3309,74 +3306,82 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL } } - Indic_ParseSyllables( hdc, psa, psc, pwcChars, cChars, &syllables, &syllable_count, lexical, modern); - - for (i = 0; i < syllable_count; i++) + if (use_syllables) { - int j; - WORD g = pwLogClust[syllables[i].start]; - for (j = syllables[i].start+1; j <= syllables[i].end; j++) + IndicSyllable *syllables = NULL; + int syllable_count = 0; + BOOL modern = get_GSUB_Indic2(psa, psc); + + Indic_ParseSyllables( hdc, psa, psc, pwcChars, cChars, &syllables, &syllable_count, lexical, modern); + + for (i = 0; i < syllable_count; i++) { - if (pwLogClust[j] != g) + int j; + WORD g = pwLogClust[syllables[i].start]; + for (j = syllables[i].start+1; j <= syllables[i].end; j++) { - pGlyphProp[pwLogClust[j]].sva.fClusterStart = 0; - pwLogClust[j] = g; + if (pwLogClust[j] != g) + { + pGlyphProp[pwLogClust[j]].sva.fClusterStart = 0; + pwLogClust[j] = g; + } } } + + HeapFree(GetProcessHeap(), 0, syllables); } UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); - HeapFree(GetProcessHeap(), 0, syllables); } static void ShapeCharGlyphProp_Sinhala( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, sinhala_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, sinhala_lex, FALSE); } static void ShapeCharGlyphProp_Devanagari( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, devanagari_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, devanagari_lex, TRUE); } static void ShapeCharGlyphProp_Bengali( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, bengali_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, bengali_lex, TRUE); } static void ShapeCharGlyphProp_Gurmukhi( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gurmukhi_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gurmukhi_lex, TRUE); } static void ShapeCharGlyphProp_Gujarati( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gujarati_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, gujarati_lex, TRUE); } static void ShapeCharGlyphProp_Oriya( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, oriya_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, oriya_lex, TRUE); } static void ShapeCharGlyphProp_Tamil( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, tamil_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, tamil_lex, TRUE); } static void ShapeCharGlyphProp_Telugu( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, telugu_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, telugu_lex, TRUE); } static void ShapeCharGlyphProp_Kannada( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, kannada_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, kannada_lex, TRUE); } static void ShapeCharGlyphProp_Malayalam( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) { - ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, malayalam_lex); + ShapeCharGlyphProp_BaseIndic(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp, malayalam_lex, TRUE); } void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp)

1 0

Alexandre Julliard : winex11: Store the visible region handle directly instead of making a copy.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 649e33de58d9e2cdf28850035d25daabe29b14ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=649e33de58d9e2cdf28850035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 13:31:46 2011 +0100 winex11: Store the visible region handle directly instead of making a copy. --- dlls/winex11.drv/graphics.c | 2 +- dlls/winex11.drv/init.c | 7 ------- 2 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 4f76a1f..356f7d7e 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -244,7 +244,7 @@ void X11DRV_SetDeviceClipping( PHYSDEV dev, HRGN rgn ) RGNDATA *data; X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - CombineRgn( physDev->region, rgn, 0, RGN_COPY ); + physDev->region = rgn; if ((data = X11DRV_GetRegionData( physDev->region, 0 ))) update_x11_clipping( physDev, data ); HeapFree( GetProcessHeap(), 0, data ); diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 8b3b951..39a57b5 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -126,12 +126,6 @@ static X11DRV_PDEVICE *create_x11_physdev( Drawable drawable ) if (!(physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ))) return NULL; - if (!(physDev->region = CreateRectRgn( 0, 0, 0, 0 ))) - { - HeapFree( GetProcessHeap(), 0, physDev ); - return NULL; - } - wine_tsx11_lock(); physDev->drawable = drawable; physDev->gc = XCreateGC( gdi_display, drawable, 0, NULL ); @@ -193,7 +187,6 @@ static BOOL X11DRV_DeleteDC( PHYSDEV dev ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - DeleteObject( physDev->region ); wine_tsx11_lock(); XFreeGC( gdi_display, physDev->gc ); wine_tsx11_unlock();

1 0

Alexandre Julliard : winex11: Allow the visible region to be zero when not clipping.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 8d6354c5b23bc2e5d1b0ebdb03583b1bd0c93353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6354c5b23bc2e5d1b0ebdb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 14:00:14 2011 +0100 winex11: Allow the visible region to be zero when not clipping. --- dlls/winex11.drv/bitblt.c | 5 +-- dlls/winex11.drv/graphics.c | 78 ++++++++++++++++++++++++++---------------- dlls/winex11.drv/text.c | 6 ++-- dlls/winex11.drv/x11drv.h | 4 +- dlls/winex11.drv/xrender.c | 75 +++++++++++++++++++++++++---------------- 5 files changed, 101 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d6354c5b23bc2e5d1b0e…

1 0

Piotr Caban : msvcrt: Added _get_current_locale implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: f84858ac2c2e31bfa0bf90af4b1f7f4df20491b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84858ac2c2e31bfa0bf90af4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:47:54 2011 +0100 msvcrt: Added _get_current_locale implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 24 ++++++++++++++++++++++-- dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 1760a1a..38ec0e1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -675,7 +675,7 @@ @ varargs _fwscanf_s_l(ptr wstr ptr) msvcrt._fwscanf_s_l @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 503864f..a083053 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -517,7 +517,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7976a0f..475e3a9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -512,7 +512,7 @@ @ cdecl _gcvt(double long str) msvcrt._gcvt @ cdecl _gcvt_s(ptr long double long) msvcrt._gcvt_s @ stub _get_amblksiz -@ stub _get_current_locale +@ cdecl _get_current_locale() msvcrt._get_current_locale @ stub _get_daylight @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 44fdf7c..6bb6162 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -603,6 +603,9 @@ void free_locinfo(MSVCRT_pthreadlocinfo locinfo) if(!locinfo) return; + if(InterlockedDecrement(&locinfo->refcount)) + return; + for(i=MSVCRT_LC_MIN+1; i<=MSVCRT_LC_MAX; i++) { MSVCRT_free(locinfo->lc_category[i].locale); MSVCRT_free(locinfo->lc_category[i].refcount); @@ -640,9 +643,26 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) if(!mbcinfo) return; + if(InterlockedDecrement(&mbcinfo->refcount)) + return; + MSVCRT_free(mbcinfo); } +/* _get_current_locale - not exported in native msvcrt */ +MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) +{ + MSVCRT__locale_t loc = MSVCRT_malloc(sizeof(MSVCRT__locale_tstruct)); + if(!loc) + return NULL; + + loc->locinfo = get_locinfo(); + loc->mbcinfo = get_mbcinfo(); + InterlockedIncrement(&loc->locinfo->refcount); + InterlockedIncrement(&loc->mbcinfo->refcount); + return loc; +} + /* _free_locale - not exported in native msvcrt */ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) { @@ -747,6 +767,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } memset(loc->locinfo, 0, sizeof(MSVCRT_threadlocinfo)); + loc->locinfo->refcount = 1; + loc->mbcinfo->refcount = 1; loc->locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); if(!loc->locinfo->lconv) { @@ -762,8 +784,6 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) return NULL; } - loc->locinfo->refcount = 1; - if(lcid[MSVCRT_LC_COLLATE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_COLLATE)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_COLLATE], loc, MSVCRT_LC_COLLATE)) { MSVCRT__free_locale(loc); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dfd3a07..75a3b35 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1490,6 +1490,7 @@ @ cdecl -arch=i386 __control87_2(long long ptr ptr) @ cdecl _configthreadlocale(long) @ cdecl _create_locale(long str) MSVCRT__create_locale +@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _dupenv_s(ptr ptr str) @ cdecl _free_locale(ptr) MSVCRT__free_locale @ cdecl _get_invalid_parameter_handler()

1 0

Piotr Caban : msvcrt: Fix lc_collate_cp initialization.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: dbff7a1ca2872cc305133d400891ff99b845b8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbff7a1ca2872cc305133d400… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:09 2011 +0100 msvcrt: Fix lc_collate_cp initialization. --- dlls/msvcrt/locale.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6bb6162..6893685 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -789,6 +789,8 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) MSVCRT__free_locale(loc); return NULL; } + + loc->locinfo->lc_collate_cp = loc->locinfo->lc_id[MSVCRT_LC_COLLATE].wCodePage; } else loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = MSVCRT__strdup("C"); @@ -802,7 +804,6 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } loc->locinfo->lc_codepage = loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage; - loc->locinfo->lc_collate_cp = loc->locinfo->lc_codepage; loc->locinfo->lc_clike = 1; if(!GetCPInfo(loc->locinfo->lc_codepage, &cp)) { MSVCRT__free_locale(loc); @@ -1155,6 +1156,7 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) switch(category) { case MSVCRT_LC_ALL: case MSVCRT_LC_COLLATE: + locinfo->lc_collate_cp = loc->locinfo->lc_collate_cp; locinfo->lc_handle[MSVCRT_LC_COLLATE] = loc->locinfo->lc_handle[MSVCRT_LC_COLLATE]; swap_pointers((void**)&locinfo->lc_category[MSVCRT_LC_COLLATE].locale, @@ -1174,7 +1176,6 @@ char* CDECL MSVCRT_setlocale(int category, const char* locale) (void**)&loc->locinfo->lc_category[MSVCRT_LC_CTYPE].refcount); locinfo->lc_codepage = loc->locinfo->lc_codepage; - locinfo->lc_collate_cp = loc->locinfo->lc_collate_cp; locinfo->lc_clike = loc->locinfo->lc_clike; locinfo->mb_cur_max = loc->locinfo->mb_cur_max;

1 0

Piotr Caban : include: Update msvcrt/locale.h.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: f4518b9a543d0f87b7303e918fb04d2f7758a04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4518b9a543d0f87b7303e918… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:31 2011 +0100 include: Update msvcrt/locale.h. --- include/msvcrt/locale.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index 2b97c54..5e0dd35 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -63,6 +63,10 @@ extern "C" { char* __cdecl setlocale(int,const char*); struct lconv* __cdecl localeconv(void); +int __cdecl _configthreadlocale(int); +_locale_t __cdecl _get_current_locale(void); +_locale_t __cdecl _create_locale(int, const char*); +void __cdecl _free_locale(_locale_t); #ifndef _WLOCALE_DEFINED #define _WLOCALE_DEFINED

1 0

Piotr Caban : msvcp90: Added _Locinfo constructor implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: e97578e4071831dcc2380802c1aae2dac2ff8a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97578e4071831dcc2380802c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:48:46 2011 +0100 msvcp90: Added _Locinfo constructor implementation. --- dlls/msvcp90/locale.c | 84 ++++++++++++++++++++++++++++++----------------- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcp90/string.c | 4 +- 3 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index e928d3e..2614724 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -712,29 +712,35 @@ void* __thiscall _Timevec__Getptr(_Timevec *this) return this->timeptr; } -/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ -/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ -_Locinfo* __cdecl _Locinfo__Locinfo_ctor_bstr(_Locinfo *locinfo, const basic_string_char *locstr) -{ - FIXME("(%p %p) stub\n", locinfo, locstr); - return NULL; -} - -/* ??0_Locinfo(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ -/* ??0_Locinfo(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ -DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_bstr, 8) -_Locinfo* __thiscall _Locinfo_ctor_bstr(_Locinfo *this, const basic_string_char *locstr) -{ - FIXME("(%p %p) stub\n", this, locstr); - return NULL; -} - /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)HPBD@Z */ /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)HPEBD@Z */ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", locinfo, category, locstr); - return NULL; + const char *locale = NULL; + + /* This function is probably modifying more global objects */ + FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + + if(!locstr) + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + + _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); + MSVCP_basic_string_char_ctor_cstr(&locinfo->days, ""); + MSVCP_basic_string_char_ctor_cstr(&locinfo->months, ""); + MSVCP_basic_string_char_ctor_cstr(&locinfo->oldlocname, setlocale(LC_ALL, NULL)); + + if(category) + locale = setlocale(LC_ALL, locstr); + else + locale = setlocale(LC_ALL, NULL); + + if(locale) + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); + else + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); + _Lockit_dtor(&locinfo->lock); + + return locinfo; } /* ??0_Locinfo(a)std@@QAE(a)HPBD@Z */ @@ -742,16 +748,29 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_cat_cstr, 12) _Locinfo* __thiscall _Locinfo_ctor_cat_cstr(_Locinfo *this, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", this, category, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, category, locstr); +} + +/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ +/* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ +_Locinfo* __cdecl _Locinfo__Locinfo_ctor_bstr(_Locinfo *locinfo, const basic_string_char *locstr) +{ + return _Locinfo__Locinfo_ctor_cat_cstr(locinfo, 1/*FIXME*/, MSVCP_basic_string_char_c_str(locstr)); +} + +/* ??0_Locinfo(a)std@@QAE(a)ABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +/* ??0_Locinfo(a)std@@QEAA(a)AEBV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@1@@Z */ +DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_bstr, 8) +_Locinfo* __thiscall _Locinfo_ctor_bstr(_Locinfo *this, const basic_string_char *locstr) +{ + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, MSVCP_basic_string_char_c_str(locstr)); } /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPAV12(a)PBD@Z */ /* ?_Locinfo_ctor(a)_Locinfo@std@@SAXPEAV12(a)PEBD@Z */ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cstr(_Locinfo *locinfo, const char *locstr) { - FIXME("(%p %s) stub\n", locinfo, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(locinfo, 1/*FIXME*/, locstr); } /* ??0_Locinfo(a)std@@QAE(a)PBD@Z */ @@ -759,16 +778,20 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cstr(_Locinfo *locinfo, const char *loc DEFINE_THISCALL_WRAPPER(_Locinfo_ctor_cstr, 8) _Locinfo* __thiscall _Locinfo_ctor_cstr(_Locinfo *this, const char *locstr) { - FIXME("(%p %s) stub\n", this, locstr); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, locstr); } /* ?_Locinfo_dtor(a)_Locinfo@std@@SAXPAV12@@Z */ /* ?_Locinfo_dtor(a)_Locinfo@std@@SAXPEAV12@@Z */ -_Locinfo* __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) +void __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) { - FIXME("(%p) stub\n", locinfo); - return NULL; + TRACE("(%p)\n", locinfo); + + setlocale(LC_ALL, MSVCP_basic_string_char_c_str(&locinfo->oldlocname)); + MSVCP_basic_string_char_dtor(&locinfo->days); + MSVCP_basic_string_char_dtor(&locinfo->months); + MSVCP_basic_string_char_dtor(&locinfo->oldlocname); + MSVCP_basic_string_char_dtor(&locinfo->newlocname); } /* ??_F_Locinfo(a)std@@QAEXXZ */ @@ -776,8 +799,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_dtor(_Locinfo *locinfo) DEFINE_THISCALL_WRAPPER(_Locinfo_ctor, 4) _Locinfo* __thiscall _Locinfo_ctor(_Locinfo *this) { - FIXME("(%p) stub\n", this); - return NULL; + return _Locinfo__Locinfo_ctor_cat_cstr(this, 1/*FIXME*/, "C"); } /* ??1_Locinfo(a)std@@QAE(a)XZ */ @@ -785,7 +807,7 @@ _Locinfo* __thiscall _Locinfo_ctor(_Locinfo *this) DEFINE_THISCALL_WRAPPER(_Locinfo_dtor, 4) void __thiscall _Locinfo_dtor(_Locinfo *this) { - FIXME("(%p) stub\n", this); + _Locinfo__Locinfo_dtor(this); } /* ?_Locinfo_Addcats(a)_Locinfo@std@@SAAAV12(a)PAV12@HPBD(a)Z */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 72e5d11..ed66d23 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -172,7 +172,7 @@ typedef struct _basic_string_char basic_string_char* __stdcall MSVCP_basic_string_char_ctor_cstr(basic_string_char*, const char*); basic_string_char* __stdcall MSVCP_basic_string_char_copy_ctor(basic_string_char*, const basic_string_char*); void __stdcall MSVCP_basic_string_char_dtor(basic_string_char*); -const char* __stdcall MSVCP_basic_string_char_c_str(basic_string_char*); +const char* __stdcall MSVCP_basic_string_char_c_str(const basic_string_char*); #define BUF_SIZE_WCHAR 8 typedef struct _basic_string_wchar diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 19459c1..906a99c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -882,7 +882,7 @@ MSVCP_size_t __thiscall basic_string_char_copy(const basic_string_char *this, /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBEPBDXZ */ /* ?data@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBAPEBDXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_c_str, 4) -const char* __thiscall MSVCP_basic_string_char_c_str(basic_string_char *this) +const char* __thiscall MSVCP_basic_string_char_c_str(const basic_string_char *this) { TRACE("%p\n", this); return basic_string_char_const_ptr(this); @@ -2724,7 +2724,7 @@ MSVCP_size_t __thiscall basic_string_wchar_copy(const basic_string_wchar *this, /* ?data@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBEPBGXZ */ /* ?data@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBAPEBGXZ */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_c_str, 4) -const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(basic_string_wchar *this) +const wchar_t* __thiscall MSVCP_basic_string_wchar_c_str(const basic_string_wchar *this) { TRACE("%p\n", this); return basic_string_wchar_const_ptr(this);

1 0

Piotr Caban : msvcp90: Added _Locinfo::_Addcats partial implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: bff3f0cd3c75253c6163e6e698026c7948d94e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff3f0cd3c75253c6163e6e69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:01 2011 +0100 msvcp90: Added _Locinfo::_Addcats partial implementation. --- dlls/msvcp90/locale.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2614724..0cc0c58 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -814,8 +814,28 @@ void __thiscall _Locinfo_dtor(_Locinfo *this) /* ?_Locinfo_Addcats(a)_Locinfo@std@@SAAEAV12(a)PEAV12@HPEBD(a)Z */ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, const char *locstr) { - FIXME("%p %d %s) stub\n", locinfo, category, locstr); - return NULL; + const char *locale = NULL; + + /* This function is probably modifying more global objects */ + FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); + if(!locstr) + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + + _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); + MSVCP_basic_string_char_dtor(&locinfo->newlocname); + + if(category) + locale = setlocale(LC_ALL, locstr); + else + locale = setlocale(LC_ALL, NULL); + + if(locale) + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, locale); + else + MSVCP_basic_string_char_ctor_cstr(&locinfo->newlocname, "*"); + _Lockit_dtor(&locinfo->lock); + + return locinfo; } /* ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z */ @@ -823,8 +843,7 @@ _Locinfo* __cdecl _Locinfo__Locinfo_Addcats(_Locinfo *locinfo, int category, con DEFINE_THISCALL_WRAPPER(_Locinfo__Addcats, 12) _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char *locstr) { - FIXME("(%p %d %s) stub\n", this, category, locstr); - return NULL; + return _Locinfo__Locinfo_Addcats(this, category, locstr); } /* ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ */

1 0

Piotr Caban : msvcp90: Added _Getcoll implementation.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 34d947189a665152de54dd8874aedfab31e1b3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d947189a665152de54dd887… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 6 12:49:16 2011 +0100 msvcp90: Added _Getcoll implementation. --- dlls/msvcp90/locale.c | 18 +++++++++++++++--- dlls/msvcp90/msvcp90.spec | 2 +- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0cc0c58..a319d12 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -846,14 +846,26 @@ _Locinfo* __thiscall _Locinfo__Addcats(_Locinfo *this, int category, const char return _Locinfo__Locinfo_Addcats(this, category, locstr); } +/* _Getcoll */ +_Collvec __cdecl _Getcoll(void) +{ + _Collvec ret; + _locale_t locale = _get_current_locale(); + + TRACE("\n"); + + ret.page = locale->locinfo->lc_collate_cp; + ret.handle = locale->locinfo->lc_handle[LC_COLLATE]; + _free_locale(locale); + return ret; +} + /* ?_Getcoll(a)_Locinfo@std@@QBE?AU_Collvec@@XZ */ /* ?_Getcoll(a)_Locinfo@std@@QEBA?AU_Collvec@@XZ */ DEFINE_THISCALL_WRAPPER(_Locinfo__Getcoll, 4) _Collvec __thiscall _Locinfo__Getcoll(const _Locinfo *this) { - _Collvec ret = { 0 }; /* FIXME */ - FIXME("(%p) stub\n", this); - return ret; + return _Getcoll(); } /* ?_Getctype(a)_Locinfo@std@@QBE?AU_Ctypevec@@XZ */ diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 43cc50e..2464328 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5750,7 +5750,7 @@ @ stub _FSinh @ extern _FSnan # extern _FXbig -@ stub _Getcoll +@ cdecl _Getcoll() @ stub _Getctype @ stub _Getcvt @ stub _Getdateorder

1 0