wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Marcus Meissner : ntdll: qsort: comparator must not get the same pointer.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 34d17c9ea18f43abfc7eefa48fa862a611dccfa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34d17c9ea18f43abfc7eefa48… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun May 23 13:33:40 2010 +0200 ntdll: qsort: comparator must not get the same pointer. --- dlls/ntdll/misc.c | 2 +- dlls/ntdll/tests/string.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 621848e..2d7c0a7 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -272,7 +272,7 @@ NTDLL_mergesort( void *arr, void *barr, int elemsize, int(__cdecl *compar)(const for (k=left; k<=right; k++) { /*arr[k]=(barr[i]<barr[j])?barr[i++]:barr[j--];*/ - if (compar(X(barr,i),X(barr,j))<0) { + if (i != j && compar(X(barr,i),X(barr,j))<0) { memcpy(X(arr,k),X(barr,i),elemsize); i++; } else { diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index cd362ed..3f7236a 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1145,16 +1145,19 @@ static void test_wcsrchr(void) static __cdecl int intcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return (*(int*)a) - (*(int*)b); } static __cdecl int charcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return (*(char*)a) - (*(char*)b); } static __cdecl int strcomparefunc(const void *a, const void*b) { + ok (a != b, "must never get the same pointer\n"); return lstrcmpA(*(char**)a,*(char**)b); }

1 0

Piotr Caban : msvcrt: Fix wcstombs_l implementation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 6f358ef8675ff7b9c3101653e4dbc97532ada593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f358ef8675ff7b9c3101653e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 24 10:03:55 2010 +0200 msvcrt: Fix wcstombs_l implementation. --- dlls/msvcrt/wcs.c | 30 +++++++++++++++++++----------- 1 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 79be91a..c26809c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -240,26 +240,34 @@ MSVCRT_size_t CDECL MSVCRT__wcstombs_l(char *mbstr, const MSVCRT_wchar_t *wcstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { char default_char = '\0'; - MSVCRT_size_t tmp; + MSVCRT_size_t tmp = 0; BOOL used_default; if(!locale) locale = get_locale(); - /* FIXME: Use wcslen here */ - tmp = strlenW(wcstr); - if(tmp>count && mbstr) - tmp = count; + if(!mbstr) + return WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, -1, NULL, 0, &default_char, &used_default)-1; - tmp = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - wcstr, tmp, mbstr, count, &default_char, &used_default); + while(*wcstr) { + char buf[3]; + MSVCRT_size_t i, size; - if(used_default) - return -1; + size = WideCharToMultiByte(locale->locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + wcstr, 1, buf, 3, &default_char, &used_default); + if(used_default) + return -1; + if(tmp+size > count) + return tmp; - if(tmp<count && mbstr) - mbstr[tmp] = '\0'; + for(i=0; i<size; i++) + mbstr[tmp++] = buf[i]; + wcstr++; + } + if(tmp < count) + mbstr[tmp] = '\0'; return tmp; }

1 0

Piotr Caban : msvcrt: Fix mbstowcs_l implementation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 2ca3b9e0162fac9d2a09c8d92df08034c4cb6b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ca3b9e0162fac9d2a09c8d92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat May 22 22:24:40 2010 +0200 msvcrt: Fix mbstowcs_l implementation. --- dlls/msvcrt/mbcs.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 837ac02..8fca06d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1725,22 +1725,29 @@ MSVCRT_size_t CDECL _mbstrlen(const char* str) MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, MSVCRT_size_t count, MSVCRT__locale_t locale) { - MSVCRT_size_t tmp; + MSVCRT_size_t i, size; if(!locale) locale = get_locale(); - tmp = _mbstrlen_l(mbstr, locale); - if(tmp>count && wcstr) - tmp = count; + /* Ignore count parameter */ + if(!wcstr) + return MultiByteToWideChar(locale->locinfo->lc_codepage, 0, mbstr, -1, NULL, 0)-1; - tmp = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, - mbstr, tmp, wcstr, count); + for(i=0, size=0; i<count; i++) { + if(mbstr[size] == '\0') + break; + + size += (MSVCRT_isleadbyte(mbstr[size]) ? 2 : 1); + } + + size = MultiByteToWideChar(locale->locinfo->lc_codepage, 0, + mbstr, size, wcstr, count); - if(tmp<count && wcstr) - wcstr[tmp] = '\0'; + if(size<count && wcstr) + wcstr[size] = '\0'; - return tmp; + return size; } /*********************************************************************

1 0

Sven Baars : taskmgr: Fix Dutch translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 7b8243e5e55ece9b152cbee580a6603bd89c00fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b8243e5e55ece9b152cbee58… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat May 22 20:10:15 2010 +0200 taskmgr: Fix Dutch translation. --- programs/taskmgr/Nl.rc | 112 ++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b8243e5e55ece9b152cb…

1 0

Damjan Jovanovic : windowscodecs: Fix ICO palette size calculation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: b34f04f9c4204fa777412c8d636c5501438b44c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b34f04f9c4204fa777412c8d6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 22 07:57:54 2010 +0200 windowscodecs: Fix ICO palette size calculation. --- dlls/windowscodecs/icoformat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 180dbb3..8012b4e 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -192,7 +192,7 @@ static HRESULT IcoFrameDecode_ReadPixels(IcoFrameDecode *This) if (bih.biBitCount <= 8) { /* read the palette */ - colorcount = This->entry.bColorCount ? This->entry.bColorCount : 256; + colorcount = bih.biClrUsed ? bih.biClrUsed : 1 << bih.biBitCount; hr = IStream_Read(This->parent->stream, colors, sizeof(RGBQUAD)*colorcount, &bytesread); if (FAILED(hr) || bytesread != sizeof(RGBQUAD)*colorcount) goto fail;

1 0

Andrey Turkin : oleaut32: Don't rewrite name's hreftype.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 234afb88e8f62c6891a32b5848295cb8b84535ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=234afb88e8f62c6891a32b584… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 00:49:29 2010 +0400 oleaut32: Don't rewrite name's hreftype. --- dlls/oleaut32/typelib2.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b5d85ff..aa14d22 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2239,7 +2239,8 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( iter->name = offset; namedata = This->typelib->typelib_segment_data[MSFT_SEG_NAME] + offset; - *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; + if (*((INT*)namedata) == -1) + *((INT *)namedata) = This->typelib->typelib_typeinfo_offsets[This->typeinfo->typekind >> 16]; len = iter->u.data[0]/4 - iter->u.data[5]*3;

1 0

Andrey Turkin : oleaut32: Store correct offset for imported files in ICreateTypeInfo::AddRefTypeInfo .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 61dfc28b75bafc943fa7c35508b244dcbdd16bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dfc28b75bafc943fa7c3550… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 00:49:48 2010 +0400 oleaut32: Store correct offset for imported files in ICreateTypeInfo::AddRefTypeInfo. --- dlls/oleaut32/typelib2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 70454dc..b5d85ff 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1681,7 +1681,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( } guid.guid = tlibattr->guid; - guid.hreftype = This->typelib->typelib_guids*12+2; + guid.hreftype = This->typelib->typelib_segdir[MSFT_SEG_IMPORTFILES].length+2; guid.next_hash = -1; guid_offset = ctl2_alloc_guid(This->typelib, &guid);

1 0

Andrey Turkin : oleaut32: Fix ctl2_alloc_importfile offset calculations.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 9724c6d774f1834f3ccf61047577757277ca639c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9724c6d774f1834f3ccf61047… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sat May 22 00:48:19 2010 +0400 oleaut32: Fix ctl2_alloc_importfile offset calculations. --- dlls/oleaut32/typelib2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index b5ebea3..70454dc 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -779,8 +779,8 @@ static int ctl2_alloc_importfile( encoded_string[0] |= 1; for (offset = 0; offset < This->typelib_segdir[MSFT_SEG_IMPORTFILES].length; - offset += ((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff) - | (This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 0xc) { + offset += ((((((This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xd] << 8) & 0xff00) + | (This->typelib_segment_data[MSFT_SEG_IMPORTFILES][offset + 0xc] & 0xff)) >> 2) + 5) & 0xfffc) + 0xc) { if (!memcmp(encoded_string, This->typelib_segment_data[MSFT_SEG_IMPORTFILES] + offset + 0xc, length)) return offset; }

1 0

Aric Stewart : usp10: Apply the GSUB 'rlig' feature for Required ligature substitution.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 18b310a70373fe3c92195a03de82677a90a3f68d URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b310a70373fe3c92195a03d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:12:28 2010 -0500 usp10: Apply the GSUB 'rlig' feature for Required ligature substitution. --- dlls/usp10/shape.c | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 85fbb64..d7e9811 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -70,6 +70,8 @@ enum joined_forms { (ULONG)_x1 ) #define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') +#define GSUB_E_NOFEATURE -2 +#define GSUB_E_NOGLYPH -1 typedef struct { DWORD version; @@ -348,7 +350,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN } } } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) @@ -413,7 +415,7 @@ static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, } } } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) @@ -433,13 +435,13 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); } - return -1; + return GSUB_E_NOGLYPH; } static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int i; - int out_index = -1; + int out_index = GSUB_E_NOGLYPH; const GSUB_LookupList *lookup; lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); @@ -448,10 +450,10 @@ static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* fe for (i = 0; i < GET_BE_WORD(feature->LookupCount); i++) { out_index = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[i]), glyphs, glyph_index, write_dir, glyph_count); - if (out_index != -1) + if (out_index != GSUB_E_NOGLYPH) break; } - if (out_index == -1) + if (out_index == GSUB_E_NOGLYPH) TRACE("lookups found no glyphs\n"); return out_index; } @@ -508,7 +510,7 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, void* GSUB const GSUB_Feature *feature; if (!GSUB_Table) - return -1; + return GSUB_E_NOFEATURE; header = GSUB_Table; @@ -516,19 +518,19 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, void* GSUB if (!script) { TRACE("Script not found\n"); - return -1; + return GSUB_E_NOFEATURE; } language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ if (!language) { TRACE("Language not found\n"); - return -1; + return GSUB_E_NOFEATURE; } feature = GSUB_get_feature(header, language, feat); if (!feature) { TRACE("%s feature not found\n",feat); - return -1; + return GSUB_E_NOFEATURE; } TRACE("applying feature %s\n",feat); return GSUB_apply_feature(header, feature, glyphs, index, write_dir, glyph_count); @@ -647,9 +649,9 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC { INT nextIndex; nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs, i, dirL, pcGlyphs, contextual_features[context_shape[i]]); - if (nextIndex != -1) + if (nextIndex > GSUB_E_NOGLYPH) i = nextIndex; - shaped = (nextIndex != -1); + shaped = (nextIndex > GSUB_E_NOGLYPH); } if (!shaped) @@ -666,6 +668,23 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC } } + /* Required ligature substitution */ + if (psc->GSUB_Table) + { + i = 0; + while(i < *pcGlyphs) + { + INT nextIndex; + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs, i, dirL, pcGlyphs, "rlig"); + if (nextIndex > GSUB_E_NOGLYPH) + i = nextIndex; + else if (nextIndex == GSUB_E_NOFEATURE) + break; + else + i++; + } + } + HeapFree(GetProcessHeap(),0,context_shape); HeapFree(GetProcessHeap(),0,context_type); }

1 0

Aric Stewart : usp10: Handle Ligature Substitution Subtable from GSUB.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 6c73258725b7099f028a98443e676f8ed243f427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c73258725b7099f028a98443… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:12:03 2010 -0500 usp10: Handle Ligature Substitution Subtable from GSUB. This also involves a restructuring of the handling of glyph lookups from GSUB since Ligature Substitution can result in many glyphs being replaced with 1 glyph, and future looksup may result in one glyph being replaces with many glyphs. --- dlls/usp10/shape.c | 247 ++++++++++++++++++++++++++++++++---------- dlls/usp10/usp10.c | 2 +- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 190 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c73258725b7099f028a9…

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
96
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 May 2010