December 2011 - Wine-commits

Frédéric Delanoy : crypt32: Avoid reading unitialized variables (Coverity).
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 56f035b56d5f3bd162906a723a9cd6c4bf7d0fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f035b56d5f3bd162906a723… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 16 13:35:29 2011 +0100 crypt32: Avoid reading unitialized variables (Coverity). --- dlls/crypt32/encode.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 05a3558..7590012 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -185,7 +185,7 @@ BOOL WINAPI CRYPT_AsnEncodeSequence(DWORD dwCertEncodingType, DWORD i, dataLen = 0; TRACE("%p, %d, %08x, %p, %p, %d\n", items, cItem, dwFlags, pEncodePara, - pbEncoded, *pcbEncoded); + pbEncoded, pbEncoded ? *pcbEncoded : 0); for (i = 0, ret = TRUE; ret && i < cItem; i++) { ret = items[i].encodeFunc(dwCertEncodingType, NULL, @@ -580,7 +580,7 @@ static BOOL CRYPT_AsnEncodeCRLEntry(const CRL_ENTRY *entry, DWORD cItem = 2; BOOL ret; - TRACE("%p, %p, %p\n", entry, pbEncoded, pcbEncoded); + TRACE("%p, %p, %d\n", entry, pbEncoded, pbEncoded ? *pcbEncoded : 0); if (entry->cExtension) { @@ -736,7 +736,7 @@ static BOOL CRYPT_AsnEncodeExtension(CERT_EXTENSION *ext, BYTE *pbEncoded, }; DWORD cItem = 1; - TRACE("%p, %p, %d\n", ext, pbEncoded, *pcbEncoded); + TRACE("%p, %p, %d\n", ext, pbEncoded, pbEncoded ? *pcbEncoded : 0); if (ext->fCritical) { @@ -3194,7 +3194,7 @@ BOOL WINAPI CRYPT_AsnEncodeOctets(DWORD dwCertEncodingType, DWORD bytesNeeded, lenBytes; TRACE("(%d, %p), %08x, %p, %p, %d\n", blob->cbData, blob->pbData, - dwFlags, pEncodePara, pbEncoded, *pcbEncoded); + dwFlags, pEncodePara, pbEncoded, pbEncoded ? *pcbEncoded : 0); CRYPT_EncodeLen(blob->cbData, NULL, &lenBytes); bytesNeeded = 1 + lenBytes + blob->cbData;

1 0

Jörg Höhle : mmdevapi: Enforce limits on period and duration.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 38f9ba0070f9b72d8c94d8124b488921078f8018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f9ba0070f9b72d8c94d8124… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Dec 15 23:07:41 2011 +0100 mmdevapi: Enforce limits on period and duration. --- dlls/winealsa.drv/mmdevdrv.c | 31 +++++++++++++++++++++---------- dlls/winecoreaudio.drv/mmdevdrv.c | 32 +++++++++++++++++++++----------- dlls/wineoss.drv/mmdevdrv.c | 30 +++++++++++++++++++++--------- 3 files changed, 63 insertions(+), 30 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 359997e..994628e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -835,14 +835,28 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_INVALIDARG; } - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - return AUDCLNT_E_DEVICE_IN_USE; + if(mode == AUDCLNT_SHAREMODE_SHARED){ + period = DefaultPeriod; + if( duration < 3 * period) + duration = 3 * period; + }else{ + if(!period) + period = DefaultPeriod; /* not minimum */ + if(period < MinimumPeriod || period > 5000000) + return AUDCLNT_E_INVALID_DEVICE_PERIOD; + if(duration > 20000000) /* the smaller the period, the lower this limit */ + return AUDCLNT_E_BUFFER_SIZE_ERROR; + if(flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ + if(duration != period) + return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + return AUDCLNT_E_DEVICE_IN_USE; + }else{ + if( duration < 8 * period) + duration = 8 * period; /* may grow above 2s */ + } } - if(!duration) - duration = 300000; /* 0.03s */ - EnterCriticalSection(&This->lock); if(This->initted){ @@ -1001,10 +1015,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, goto exit; } - if(period) - This->mmdev_period_rt = period; - else - This->mmdev_period_rt = DefaultPeriod; + This->mmdev_period_rt = period; /* Check if the ALSA buffer is so small that it will run out before * the next MMDevAPI period tick occurs. Allow a little wiggle room diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a648429..a2c72da 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -961,9 +961,26 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_INVALIDARG; } - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - return AUDCLNT_E_DEVICE_IN_USE; + if(mode == AUDCLNT_SHAREMODE_SHARED){ + period = DefaultPeriod; + if( duration < 3 * period) + duration = 3 * period; + }else{ + if(!period) + period = DefaultPeriod; /* not minimum */ + if(period < MinimumPeriod || period > 5000000) + return AUDCLNT_E_INVALID_DEVICE_PERIOD; + if(duration > 20000000) /* the smaller the period, the lower this limit */ + return AUDCLNT_E_BUFFER_SIZE_ERROR; + if(flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ + if(duration != period) + return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + return AUDCLNT_E_DEVICE_IN_USE; + }else{ + if( duration < 8 * period) + duration = 8 * period; /* may grow above 2s */ + } } OSSpinLockLock(&This->lock); @@ -987,15 +1004,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_OUTOFMEMORY; } - if(period){ - This->period_ms = period / 10000; - if(This->period_ms == 0) - This->period_ms = 1; - }else - This->period_ms = MinimumPeriod / 10000; + This->period_ms = period / 10000; - if(!duration) - duration = 300000; /* 0.03s */ This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); if(This->dataflow == eCapture){ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 571495d..dbbcd9f 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -906,9 +906,26 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_INVALIDARG; } - if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - return AUDCLNT_E_DEVICE_IN_USE; + if(mode == AUDCLNT_SHAREMODE_SHARED){ + period = DefaultPeriod; + if( duration < 3 * period) + duration = 3 * period; + }else{ + if(!period) + period = DefaultPeriod; /* not minimum */ + if(period < MinimumPeriod || period > 5000000) + return AUDCLNT_E_INVALID_DEVICE_PERIOD; + if(duration > 20000000) /* the smaller the period, the lower this limit */ + return AUDCLNT_E_BUFFER_SIZE_ERROR; + if(flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK){ + if(duration != period) + return AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + return AUDCLNT_E_DEVICE_IN_USE; + }else{ + if( duration < 8 * period) + duration = 8 * period; /* may grow above 2s */ + } } EnterCriticalSection(&This->lock); @@ -937,13 +954,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_OUTOFMEMORY; } - if(period) - This->period_us = period / 10; - else - This->period_us = DefaultPeriod / 10; + This->period_us = period / 10; - if(!duration) - duration = 300000; /* 0.03s */ This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign);

1 0

Aric Stewart : usp10: Code for the cmap format 12 table for unicode code points beyond the BMP.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 10ec7dacde5df4698f43feee97cb72e9a64a3025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ec7dacde5df4698f43feee9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 19 07:25:00 2011 -0600 usp10: Code for the cmap format 12 table for unicode code points beyond the BMP. --- dlls/usp10/shape.c | 117 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 4 ++ 3 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d0ab0b2..e889ba8 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -19,6 +19,7 @@ * */ #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -101,8 +102,10 @@ enum joined_forms { #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif /* These are all structures needed for the GSUB table */ @@ -312,6 +315,37 @@ typedef struct { GDEF_ClassRangeRecord ClassRangeRecord[1]; } GDEF_ClassDefFormat2; + +/* These are all structures needed for the cmap format 12 table */ +#define CMAP_TAG MS_MAKE_TAG('c', 'm', 'a', 'p') + +typedef struct { + WORD platformID; + WORD encodingID; + DWORD offset; +} CMAP_EncodingRecord; + +typedef struct { + WORD version; + WORD numTables; + CMAP_EncodingRecord tables[1]; +} CMAP_Header; + +typedef struct { + DWORD startCharCode; + DWORD endCharCode; + DWORD startGlyphID; +} CMAP_SegmentedCoverage_group; + +typedef struct { + WORD format; + WORD reserved; + DWORD length; + DWORD language; + DWORD nGroups; + CMAP_SegmentedCoverage_group groups[1]; +} CMAP_SegmentedCoverage; + static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); typedef struct tagVowelComponents @@ -3654,3 +3688,86 @@ HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANA return USP_E_SCRIPT_NOT_IN_FONT; } + +static VOID *load_CMAP_format12_table(HDC hdc, ScriptCache *psc) +{ + CMAP_Header *CMAP_Table = NULL; + int length; + int i; + + if (!psc->CMAP_Table) + { + length = GetFontData(hdc, CMAP_TAG , 0, NULL, 0); + if (length != GDI_ERROR) + { + psc->CMAP_Table = HeapAlloc(GetProcessHeap(),0,length); + GetFontData(hdc, CMAP_TAG , 0, psc->CMAP_Table, length); + TRACE("Loaded cmap table of %i bytes\n",length); + } + else + return NULL; + } + + CMAP_Table = psc->CMAP_Table; + + for (i = 0; i < GET_BE_WORD(CMAP_Table->numTables); i++) + { + if ( (GET_BE_WORD(CMAP_Table->tables[i].platformID) == 3) && + (GET_BE_WORD(CMAP_Table->tables[i].encodingID) == 10) ) + { + CMAP_SegmentedCoverage *format = (CMAP_SegmentedCoverage*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); + if (GET_BE_WORD(format->format) == 12) + return format; + } + } + return NULL; +} + +static int compare_group(const void *a, const void* b) +{ + const DWORD *chr = a; + const CMAP_SegmentedCoverage_group *group = b; + + if (*chr < GET_BE_DWORD(group->startCharCode)) + return -1; + if (*chr > GET_BE_DWORD(group->endCharCode)) + return 1; + return 0; +} + +DWORD CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) +{ + /* BMP: use gdi32 for ease */ + if (utf32c < 0x10000) + { + WCHAR ch = utf32c; + return GetGlyphIndicesW(hdc,&ch, 1, pgi, flags); + } + + if (!psc->CMAP_format12_Table) + psc->CMAP_format12_Table = load_CMAP_format12_table(hdc, psc); + + if (flags & GGI_MARK_NONEXISTING_GLYPHS) + *pgi = 0xffff; + else + *pgi = 0; + + if (psc->CMAP_format12_Table) + { + CMAP_SegmentedCoverage *format = NULL; + CMAP_SegmentedCoverage_group *group = NULL; + + format = (CMAP_SegmentedCoverage *)psc->CMAP_format12_Table; + + group = bsearch(&utf32c, format->groups, GET_BE_DWORD(format->nGroups), + sizeof(CMAP_SegmentedCoverage_group), compare_group); + + if (group) + { + DWORD offset = utf32c - GET_BE_DWORD(group->startCharCode); + *pgi = GET_BE_DWORD(group->startGlyphID) + offset; + return 0; + } + } + return 0; +} diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index ad1764a..a0e143e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -862,6 +862,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) } heap_free(((ScriptCache *)*psc)->GSUB_Table); heap_free(((ScriptCache *)*psc)->GDEF_Table); + heap_free(((ScriptCache *)*psc)->CMAP_Table); heap_free(((ScriptCache *)*psc)->features); heap_free(*psc); *psc = NULL; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 1692b60..f310011 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -129,6 +129,8 @@ typedef struct { ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; LPVOID GDEF_Table; + LPVOID CMAP_Table; + LPVOID CMAP_format12_Table; INT feature_count; LoadedFeature *features; @@ -181,3 +183,5 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern); void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) DECLSPEC_HIDDEN; + +DWORD CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN;

1 0

Aric Stewart : usp10: Decode surrogate pairs in get_char_script and handle ranges beyond the BMP .
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 0404d68999c6daa1a28e10300664d3314fa03c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0404d68999c6daa1a28e10300… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 16 13:15:43 2011 -0600 usp10: Decode surrogate pairs in get_char_script and handle ranges beyond the BMP. --- dlls/usp10/usp10.c | 53 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 43 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a0e143e..5f1ac5c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); typedef struct _scriptRange { WORD script; - WORD rangeFirst; - WORD rangeLast; + DWORD rangeFirst; + DWORD rangeLast; WORD numericScript; WORD punctScript; } scriptRange; @@ -774,24 +774,38 @@ static WCHAR mirror_char( WCHAR ch ) return ch + wine_mirror_map[wine_mirror_map[ch >> 8] + (ch & 0xff)]; } -static WORD get_char_script( WCHAR ch) +static inline DWORD decode_surrogate_pair(LPCWSTR str, INT index, INT end) +{ + if (index < end-1 && IS_SURROGATE_PAIR(str[index],str[index+1])) + { + DWORD ch = 0x10000 + ((str[index] - 0xd800) << 10) + (str[index+1] - 0xdc00); + TRACE("Surrogate Pair %x %x => %x\n",str[index], str[index+1], ch); + return ch; + } + return 0; +} + +static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) { static const WCHAR latin_punc[] = {'#','$','&','\'',',',';','<','>','?','@','\\','^','_','`','{','|','}','~', 0x00a0, 0}; WORD type = 0; + DWORD ch; int i; - if (ch == 0xc || ch == 0x20 || ch == 0x202f) + *consumed = 1; + + if (str[index] == 0xc || str[index] == 0x20 || str[index] == 0x202f) return Script_CR; /* These punctuation are separated out as Latin punctuation */ - if (strchrW(latin_punc,ch)) + if (strchrW(latin_punc,str[index])) return Script_Punctuation2; /* These chars are itemized as Punctuation by Windows */ - if (ch == 0x2212 || ch == 0x2044) + if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; - GetStringTypeW(CT_CTYPE1, &ch, 1, &type); + GetStringTypeW(CT_CTYPE1, &str[index], 1, &type); if (type == 0) return SCRIPT_UNDEFINED; @@ -799,6 +813,12 @@ static WORD get_char_script( WCHAR ch) if (type & C1_CNTRL) return Script_Control; + ch = decode_surrogate_pair(str, index, end); + if (ch) + *consumed = 2; + else + ch = str[index]; + i = 0; do { @@ -1114,6 +1134,7 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int WORD last_indic = -1; WORD layoutRTL = 0; BOOL forceLevels = FALSE; + INT consumed = 0; TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); @@ -1127,7 +1148,16 @@ HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int for (i = 0; i < cInChars; i++) { - scripts[i] = get_char_script(pwcInChars[i]); + if (consumed <= 0) + { + scripts[i] = get_char_script(pwcInChars,i,cInChars,&consumed); + consumed --; + } + else + { + scripts[i] = scripts[i-1]; + consumed --; + } /* Devanagari danda (U+0964) and double danda (U+0965) are used for all Indic scripts */ if ((pwcInChars[i] == 0x964 || pwcInChars[i] ==0x965) && last_indic > 0) @@ -2543,17 +2573,20 @@ HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) { int i; + INT consumed = 0; TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); - for (i = 0; i < len; i++) + for (i = 0; i < len; i+=consumed) { int script; + if (i >= len) + break; if ((flag & SIC_ASCIIDIGIT) && chars[i] >= 0x30 && chars[i] <= 0x39) return S_OK; - script = get_char_script(chars[i]); + script = get_char_script(chars,i,len, &consumed); if ((scriptInformation[script].props.fComplex && (flag & SIC_COMPLEX))|| (!scriptInformation[script].props.fComplex && (flag & SIC_NEUTRAL))) return S_OK;

1 0

Aric Stewart : usp10: Handle surrogate pairs when shaping.
by Alexandre Julliard 19 Dec '11

19 Dec '11

Module: wine Branch: master Commit: 4fbb6fd66d82667a5e678d6c37868a425c93f403 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbb6fd66d82667a5e678d6c3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 16 13:15:47 2011 -0600 usp10: Handle surrogate pairs when shaping. --- dlls/usp10/usp10.c | 67 +++++++++++++++++++++++++++++++++++---------------- 1 files changed, 46 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5f1ac5c..7a32937 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -708,7 +708,7 @@ static inline BYTE get_cache_pitch_family(SCRIPT_CACHE *psc) return ((ScriptCache *)*psc)->tm.tmPitchAndFamily; } -static inline WORD get_cache_glyph(SCRIPT_CACHE *psc, WCHAR c) +static inline WORD get_cache_glyph(SCRIPT_CACHE *psc, DWORD c) { WORD *block = ((ScriptCache *)*psc)->glyphs[c >> GLYPH_BLOCK_SHIFT]; @@ -2631,8 +2631,9 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_GLYPHPROP *pOutGlyphProps, int *pcGlyphs) { HRESULT hr; - unsigned int i; + unsigned int i,g; BOOL rtl; + int cluster; TRACE("(%p, %p, %p, %s, %s, %p, %p, %d, %s, %d, %d, %p, %p, %p, %p, %p )\n", hdc, psc, psa, @@ -2688,35 +2689,59 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, rChars = heap_alloc(sizeof(WCHAR) * cChars); if (!rChars) return E_OUTOFMEMORY; - for (i = 0; i < cChars; i++) + for (i = 0, g = 0, cluster = 0; i < cChars; i++) { int idx = i; - WCHAR chInput; + DWORD chInput; + if (rtl) idx = cChars - 1 - i; - if (psa->fRTL) - chInput = mirror_char(pwcChars[idx]); - else - chInput = pwcChars[idx]; - /* special case for tabs */ - if (chInput == 0x0009) - chInput = 0x0020; - if (!(pwOutGlyphs[i] = get_cache_glyph(psc, chInput))) + if (!cluster) { - WORD glyph; - if (!hdc) + chInput = decode_surrogate_pair(pwcChars, idx, cChars); + if (!chInput) { - heap_free(rChars); - return E_PENDING; + if (psa->fRTL) + chInput = mirror_char(pwcChars[idx]); + else + chInput = pwcChars[idx]; + /* special case for tabs */ + if (chInput == 0x0009) + chInput = 0x0020; + rChars[i] = chInput; } - if (GetGlyphIndicesW(hdc, &chInput, 1, &glyph, 0) == GDI_ERROR) + else { - heap_free(rChars); - return S_FALSE; + rChars[i] = pwcChars[idx]; + rChars[i+1] = pwcChars[(rtl)?idx-1:idx+1]; + cluster = 1; } - pwOutGlyphs[i] = set_cache_glyph(psc, chInput, glyph); + if (!(pwOutGlyphs[g] = get_cache_glyph(psc, chInput))) + { + WORD glyph; + if (!hdc) + { + heap_free(rChars); + return E_PENDING; + } + if (CMAP_GetGlyphIndex(hdc, (ScriptCache *)*psc, chInput, &glyph, 0) == GDI_ERROR) + { + heap_free(rChars); + return S_FALSE; + } + pwOutGlyphs[g] = set_cache_glyph(psc, chInput, glyph); + } + g++; + } + else + { + int k; + cluster--; + pwLogClust[idx] = (rtl)?pwLogClust[idx+1]:pwLogClust[idx-1]; + for (k = (rtl)?idx-1:idx+1; k >= 0 && k < cChars; (rtl)?k--:k++) + pwLogClust[k]--; } - rChars[i] = chInput; } + *pcGlyphs = g; SHAPE_ContextualShaping(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); SHAPE_ApplyDefaultOpentypeFeatures(hdc, (ScriptCache *)*psc, psa, pwOutGlyphs, pcGlyphs, cMaxGlyphs, cChars, pwLogClust);

1 0

André Hentschel : Wine 1.3.35 freigegeben
by Jeremy Newman 19 Dec '11

19 Dec '11

Module: website Branch: master Commit: f831c556beb10b9ceb03c8a82eb5c3299cc50701 URL: http://source.winehq.org/git/website.git/?a=commit;h=f831c556beb10b9ceb03c8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Dec 17 13:10:35 2011 +0100 Wine 1.3.35 freigegeben --- news/de/2011121601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2011121601.xml b/news/de/2011121601.xml new file mode 100644 index 0000000..1ded716 --- /dev/null +++ b/news/de/2011121601.xml @@ -0,0 +1,17 @@ +<news> +<date>16. Dezember 2011</date> +<title>Wine 1.3.35 freigegeben</title> +<body> + Die Entwicklungsversion 1.3.35 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.3.35">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für kosmetische breite Stifte und dreieckige Farbverläufe in der DIB Engine.</li> + <li>Alle Wine Dialoge können nun mit po-Dateien übersetzt werden.</li> + <li>UniScribe mit vielen neuen Scipts.</li> + <li>JScript benutzt Bytecode nun durchgehend.</li> + <li>Viele MSXML Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.35.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.34
by Jeremy Newman 19 Dec '11

19 Dec '11

Module: website Branch: master Commit: 4885eef9667e2dade3582568d5d1f49e0d012b17 URL: http://source.winehq.org/git/website.git/?a=commit;h=4885eef9667e2dade35825… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Dec 18 10:02:51 2011 +0100 Polish translation for release 1.3.34 --- news/pl/2011120201.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011120201.xml b/news/pl/2011120201.xml new file mode 100644 index 0000000..b79e332 --- /dev/null +++ b/news/pl/2011120201.xml @@ -0,0 +1,17 @@ +<news> +<date>Grudzień 2, 2011</date> +<title>Wydano Wine 1.3.34</title> +<body> + Wydanie rozwojowe Wine 1.3.34 jest już dostępne. + <a href="{$root}/announce/1.3.34">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla bytecode w JavaScript.</li> + <li>Wsparcie dla gradientów w silniku DIB.</li> + <li>Klika ulepszeń Uniscribe.</li> + <li>Poprawki do przełączania trybu DirectDraw.</li> + <li>Kilka funkcji więcej biblioteki uruchomieniowej MSVC.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.34.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.3.35
by Jeremy Newman 19 Dec '11

19 Dec '11

Module: website Branch: master Commit: 98beb6b7480888b2a0815f922b581b497f7a70a6 URL: http://source.winehq.org/git/website.git/?a=commit;h=98beb6b7480888b2a0815f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Dec 18 17:49:10 2011 +0100 Polish translation for release 1.3.35 --- news/pl/2011121601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2011121601.xml b/news/pl/2011121601.xml new file mode 100644 index 0000000..f9446db --- /dev/null +++ b/news/pl/2011121601.xml @@ -0,0 +1,17 @@ +<news> +<date>Grudzień 16, 2011</date> +<title>Wydano Wine 1.3.35</title> +<body> + Wydanie rozwojowe Wine 1.3.35 jest już dostępne. + <a href="{$root}/announce/1.3.35">Co nowego</a> w tym wydaniu: +<ul> + <li>Obsługa trójkątnych gradientów i kosmetycznych szerokich piór w silniku DIB.</li> + <li>Teraz wszystkie okna dialogowe mogą zostać przetłumaczone przez pliki po.</li> + <li>Dodano o wiele więcej skryptów do UniScribe.</li> + <li>JScript teraz wszędzie używa bytecode.</li> + <li>Kilka ulepszeń w MSXML.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.35.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Frédéric Delanoy : French translation for release 1.3.35
by Jeremy Newman 19 Dec '11

19 Dec '11

Module: website Branch: master Commit: 6d1a19b1af5386de7d5ceb35182df5e07d9181e9 URL: http://source.winehq.org/git/website.git/?a=commit;h=6d1a19b1af5386de7d5ceb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Dec 19 10:18:49 2011 +0100 French translation for release 1.3.35 --- news/fr/2011121601.xml | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/news/fr/2011121601.xml b/news/fr/2011121601.xml new file mode 100644 index 0000000..e5a666f --- /dev/null +++ b/news/fr/2011121601.xml @@ -0,0 +1,20 @@ +<news> +<date>16 décembre 2011</date> +<title>Sortie de Wine 1.3.35</title> +<body> + La version de développement 1.3.35 de Wine est disponible. + <a href="{$root}/announce/1.3.35">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des dégradés triangulaires et des crayons cosmétiques larges dans le moteur DIB.</li> + <li>Toutes les boîtes de dialogue de Wine peuvent à présent être traduites au travers de fichiers po.</li> + <li>Nombreux scripts additionnels dans UniScribe.</li> + <li>JScript utilise à présent continûment du bytecode.</li> + <li>Plusieurs améliorations MSXML.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a +href="http://prdownloads.sourceforge.net/wine/wine-3.3.35.tar.bz2">code +source</a> est disponible dès à présent. +Les paquets binaires sont en cours de construction, et apparaîtront sous peu +sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Frédéric Delanoy : Wine release 1.3.35
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: website Branch: master Commit: c9644dde21121af104d7dd65ebc8c93f14525ee8 URL: http://source.winehq.org/git/website.git/?a=commit;h=c9644dde21121af104d7dd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Dec 15 21:35:06 2011 +0100 Wine release 1.3.35 --- news/en/2011121601.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2011121601.xml b/news/en/2011121601.xml new file mode 100644 index 0000000..c6ef784 --- /dev/null +++ b/news/en/2011121601.xml @@ -0,0 +1,17 @@ +<news> +<date>December 16, 2011</date> +<title>Wine 1.3.35 Released</title> +<body> + The Wine development release 1.3.35 is now available. + <a href="{$root}/announce/1.3.35">What's new</a> in this release: +<ul> + <li>Triangular gradients and cosmetic wide pens support in the DIB engine.</li> + <li>All Wine dialogs can now be translated through po files.</li> + <li>Many more scripts added to UniScribe.</li> + <li>JScript using bytecode throughout now.</li> + <li>Several MSXML improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.35.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0