October 2011 - Wine-commits

Aric Stewart : user32: Improvement for performance in soft linebreaking.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: c83841ca0e08902bad88d1d9c3e04db8b3097bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83841ca0e08902bad88d1d9c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:15 2011 -0500 user32: Improvement for performance in soft linebreaking. --- dlls/user32/edit.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 71df7e6..bfee8f5 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -602,15 +602,20 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta if (!(es->style & ES_AUTOHSCROLL)) { if (current_line->width > fw) { - INT prev; + INT prev, next; int w; const SIZE *sz; + float d; prev = current_line->net_length - 1; w = current_line->net_length; + d = (float)current_line->width/(float)fw; + if (d > 1.2) d -= 0.2; + next = prev/d; + if (next >= prev) next = prev-1; do { prev = EDIT_CallWordBreakProc(es, current_position - es->text, - prev-1, current_line->net_length, WB_LEFT); + next, current_line->net_length, WB_LEFT); current_line->net_length = prev; EDIT_InvalidateUniscribeData_linedef(current_line); EDIT_UpdateUniscribeData_linedef(es, NULL, current_line); @@ -619,6 +624,7 @@ static void EDIT_BuildLineDefs_ML(EDITSTATE *es, INT istart, INT iend, INT delta current_line->width = sz->cx; else prev = 0; + next = prev - 1; } while (prev && current_line->width > fw); current_line->net_length = w;

1 0

Aric Stewart : usp10: All glyphs in a single indic syllable are part of the same cluster.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: ec23fe6543f6292aa81f70aa46430ad393c7082b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec23fe6543f6292aa81f70aa4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:42 2011 -0500 usp10: All glyphs in a single indic syllable are part of the same cluster. --- dlls/usp10/indic.c | 33 ++++++++++++++++++++++++--------- dlls/usp10/shape.c | 21 +++++++++++++++++++++ dlls/usp10/usp10_internal.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index f8e5b5e..df2a977 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -71,7 +71,8 @@ static void debug_output_string(LPCWSTR str, int cChar, lexical_function f) static inline BOOL is_matra( int type ) { return (type == lex_Matra_above || type == lex_Matra_below || - type == lex_Matra_pre || type == lex_Matra_post); + type == lex_Matra_pre || type == lex_Matra_post || + type == lex_Composed_Vowel); } static inline BOOL is_joiner( int type ) @@ -207,7 +208,7 @@ static INT Indic_process_next_syllable( LPCWSTR input, INT cChar, INT start, INT return parse_consonant_syllable(input, cChar, start, main, next, lex); } -static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -224,7 +225,7 @@ static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac return FALSE; } -static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -241,7 +242,7 @@ static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCa return FALSE; } -static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -258,14 +259,14 @@ static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return FALSE; } -static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical) +static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) { if ((lexical(pwChar[s->start])==lex_Ra) && s->end > s->start && lexical(pwChar[s->start+1]) == lex_Halant) return (SHAPE_does_GSUB_feature_apply_to_chars(hdc, psa, psc, &pwChar[s->start], 1, 2, "rphf") > 0); return FALSE; } -static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, IndicSyllable *s, lexical_function lex, BOOL modern) +static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, IndicSyllable *s, lexical_function lex, BOOL modern) { int i; BOOL blwf = FALSE; @@ -313,7 +314,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP return s->base; } -void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, reorder_function reorder_f, BOOL modern) +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) { int index = 0; int next = 0; @@ -321,7 +322,7 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L *syllable_count = 0; - if (!lex || ! reorder_f) + if (!lex) { ERR("Failure to have required functions\n"); return; @@ -349,7 +350,6 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L (*syllables)[*syllable_count].pref = -1; (*syllables)[*syllable_count].end = next-1; FindBaseConsonant(hdc, psa, psc, input, &(*syllables)[*syllable_count], lex, modern); - reorder_f(input, &(*syllables)[*syllable_count], lex); index = next; *syllable_count = (*syllable_count)+1; } @@ -361,3 +361,18 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L } TRACE("Processed %i of %i characters into %i syllables\n",index,cChar,*syllable_count); } + +void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, reorder_function reorder_f, BOOL modern) +{ + int i; + + if (!reorder_f) + { + ERR("Failure to have required functions\n"); + return; + } + + Indic_ParseSyllables(hdc, psa, psc, input, cChar, syllables, syllable_count, lex, modern); + for (i = 0; i < *syllable_count; i++) + reorder_f(input, &(*syllables)[i], lex); +} diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0b1af46..779e8f6 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3213,6 +3213,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) { int i,k; + IndicSyllable *syllables = NULL; + int syllable_count = 0; + BOOL modern = get_GSUB_Indic2(psa, psc); for (i = 0; i < cGlyphs; i++) { @@ -3257,7 +3260,25 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL break; } } + + Indic_ParseSyllables( hdc, psa, psc, pwcChars, cChars, &syllables, &syllable_count, lexical, modern); + + for (i = 0; i < syllable_count; i++) + { + int j; + WORD g = pwLogClust[syllables[i].start]; + for (j = syllables[i].start+1; j <= syllables[i].end; j++) + { + if (pwLogClust[j] != g) + { + pGlyphProp[pwLogClust[j]].sva.fClusterStart = 0; + pwLogClust[j] = g; + } + } + } + UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); + HeapFree(GetProcessHeap(), 0, syllables); } 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 ) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index e85afbe..7a88ac7 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -136,5 +136,6 @@ void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN; void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChars, IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, reorder_function reorder_f, BOOL modern) DECLSPEC_HIDDEN; +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;

1 0

Aric Stewart : usp10: Sinhala does glyph props like Indic languages.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 89a53d6f814f648bd784e0f45ff0ea6157c685da URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a53d6f814f648bd784e0f45… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:25 2011 -0500 usp10: Sinhala does glyph props like Indic languages. --- dlls/usp10/shape.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 779e8f6..7464b4a 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -61,6 +61,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI static void ShapeCharGlyphProp_Thai( 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 ); static void ShapeCharGlyphProp_None( 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 ); static void ShapeCharGlyphProp_Tibet( 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 ); +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 ); 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 ); 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 ); 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 ); @@ -553,7 +554,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "cyrl", "", NULL, NULL}, {{ standard_features, 2}, NULL, "armn", "", NULL, NULL}, {{ standard_features, 2}, NULL, "geor", "", NULL, NULL}, - {{ sinhala_features, 3}, NULL, "sinh", "", ContextualShape_Sinhala, NULL}, + {{ sinhala_features, 3}, NULL, "sinh", "", ContextualShape_Sinhala, ShapeCharGlyphProp_Sinhala}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "phag", "", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, @@ -3281,6 +3282,11 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL 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); +} + 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);

1 0

Frédéric Delanoy : cmd: Fix a comment.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: ecc4d8725374ed0e1c80f650888e2a4ec182ddbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc4d8725374ed0e1c80f6508… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 28 09:52:18 2011 +0200 cmd: Fix a comment. --- programs/cmd/tests/test_builtins.cmd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a56d0a3..13c9393 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1436,7 +1436,7 @@ if exist foo.cmd ( echo ------------ Testing setlocal/endlocal ------------ call :setError 0 -rem Note: setlocal EnableDelayedExtension already tested in the variable delayed expansion test section +rem Note: setlocal EnableDelayedExpansion already tested in the variable delayed expansion test section mkdir foobar & cd foobar echo ...enable/disable extensions setlocal DisableEXTensions

1 0

Jörg Höhle : winecoreaudio: Release buffer memory .
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 41c6ffea440f0814b16b3499f4d7dbdfdd7699e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c6ffea440f0814b16b3499f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Aug 21 06:53:56 2011 +0200 winecoreaudio: Release buffer memory. --- dlls/winecoreaudio.drv/mmdevdrv.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c45a8c6..79cf5e3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -509,16 +509,27 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ - IAudioClient_Stop(iface); - if(This->aqueue) + if(This->aqueue){ + AQBuffer *buf, *next; + if(This->public_buffer){ + buf = This->public_buffer->mUserData; + list_add_tail(&This->avail_buffers, &buf->entry); + } + IAudioClient_Stop(iface); + AudioQueueStop(This->aqueue, 1); + /* Stopped synchronously, all buffers returned. */ + LIST_FOR_EACH_ENTRY_SAFE(buf, next, &This->avail_buffers, AQBuffer, entry){ + AudioQueueFreeBuffer(This->aqueue, buf->buf); + HeapFree(GetProcessHeap(), 0, buf); + } AudioQueueDispose(This->aqueue, 1); + } if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->public_buffer); CoTaskMemFree(This->fmt); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This);

1 0

Jörg Höhle : mmdevapi: IsFormatSupported EXCLUSIVE mode never returns S_FALSE.
by Alexandre Julliard 28 Oct '11

28 Oct '11

Module: wine Branch: master Commit: 00684f84a550d5f4740b00f0d53a0ba5952ddc2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00684f84a550d5f4740b00f0d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 8 15:21:52 2011 +0200 mmdevapi: IsFormatSupported EXCLUSIVE mode never returns S_FALSE. --- dlls/winealsa.drv/mmdevdrv.c | 8 +++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 8 +++----- dlls/wineoss.drv/mmdevdrv.c | 16 +++++++++------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ac5be34..25693c0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1204,8 +1204,11 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(fmt); - if(out) + if(out){ *out = NULL; + if(mode != AUDCLNT_SHAREMODE_SHARED) + out = NULL; + } EnterCriticalSection(&This->lock); @@ -1339,6 +1342,9 @@ exit: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, formats); + if(hr == S_FALSE && !out) + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + if(hr == S_FALSE && out) { closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 79cf5e3..a35f18c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1145,6 +1145,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); + if(outpwfx) + *outpwfx = NULL; + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) @@ -1156,17 +1159,12 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, if(SUCCEEDED(hr)){ AudioQueueDispose(aqueue, 1); OSSpinLockUnlock(&This->lock); - if(outpwfx) - *outpwfx = NULL; TRACE("returning %08x\n", S_OK); return S_OK; } OSSpinLockUnlock(&This->lock); - if(outpwfx) - *outpwfx = NULL; - TRACE("returning %08x\n", AUDCLNT_E_UNSUPPORTED_FORMAT); return AUDCLNT_E_UNSUPPORTED_FORMAT; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index f8316ee..24cd147 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -714,9 +714,6 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEX *closest = NULL; - if(out) - *out = NULL; - tmp = oss_format = get_oss_format(fmt); if(oss_format < 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -767,6 +764,9 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, ret = S_FALSE; } + if(ret == S_FALSE && !out) + ret = AUDCLNT_E_UNSUPPORTED_FORMAT; + if(ret == S_FALSE && out){ closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; @@ -901,10 +901,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, } hr = setup_oss_device(This->fd, fmt, NULL, FALSE); - if(hr == S_FALSE){ - LeaveCriticalSection(&This->lock); - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } if(FAILED(hr)){ LeaveCriticalSection(&This->lock); return hr; @@ -1137,6 +1133,12 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); + if(outpwfx){ + *outpwfx = NULL; + if(mode != AUDCLNT_SHAREMODE_SHARED) + outpwfx = NULL; + } + if(This->dataflow == eRender) fd = open(This->devnode, O_WRONLY, 0); else if(This->dataflow == eCapture)

1 0

Henri Verbeet : wined3d: Use the correct pitch in surface_upload_data().
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 61550ff1decf346692deb6ae7c908926015789ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=61550ff1decf346692deb6ae7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:23 2011 +0200 wined3d: Use the correct pitch in surface_upload_data(). This fixes a regression introduced by commit 2da4f87a7e7551f17cd650ef6d8596f595efc13b. --- dlls/wined3d/surface.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0bee46d..91c0f60 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2412,14 +2412,14 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, + const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) { UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; - TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_w %u, dst_point %p, srgb %#x, data {%#x:%p}.\n", - surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_w, + TRACE("surface %p, gl_info %p, format %s, src_rect %s, src_pitch %u, dst_point %s, srgb %#x, data {%#x:%p}.\n", + surface, gl_info, debug_d3dformat(format->id), wine_dbgstr_rect(src_rect), src_pitch, wine_dbgstr_point(dst_point), srgb, data->buffer_object, data->addr); if (format->heightscale != 1.0f && format->heightscale != 0.0f) @@ -2437,7 +2437,6 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str { UINT row_length = wined3d_format_calculate_size(format, 1, update_w, 1); UINT row_count = (update_h + format->block_height - 1) / format->block_height; - UINT src_pitch = wined3d_format_calculate_size(format, 1, src_w, 1); const BYTE *addr = data->addr; GLenum internal; @@ -2480,14 +2479,14 @@ static void surface_upload_data(const struct wined3d_surface *surface, const str { const BYTE *addr = data->addr; - addr += src_rect->top * src_w * format->byte_count; + addr += src_rect->top * src_pitch; addr += src_rect->left * format->byte_count; TRACE("glTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, format %#x, type %#x, addr %p.\n", surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); - glPixelStorei(GL_UNPACK_ROW_LENGTH, src_w); + glPixelStorei(GL_UNPACK_ROW_LENGTH, src_pitch / format->byte_count); glTexSubImage2D(surface->texture_target, surface->texture_level, dst_point->x, dst_point->y, update_w, update_h, format->glFormat, format->glType, addr); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); @@ -2530,6 +2529,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P CONVERT_TYPES convert; UINT dst_w, dst_h; UINT src_w, src_h; + UINT src_pitch; POINT p; RECT r; @@ -2620,8 +2620,9 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P data.buffer_object = src_surface->pbo; data.addr = src_surface->resource.allocatedMemory; + src_pitch = wined3d_surface_get_pitch(src_surface); - surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_w, dst_point, FALSE, &data); + surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_pitch, dst_point, FALSE, &data); invalidate_active_texture(dst_surface->resource.device, context); @@ -6177,7 +6178,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, data.buffer_object = surface->flags & SFLAG_PBO ? surface->pbo : 0; data.addr = mem; - surface_upload_data(surface, gl_info, &format, &src_rect, width, &dst_point, srgb, &data); + surface_upload_data(surface, gl_info, &format, &src_rect, src_pitch, &dst_point, srgb, &data); context_release(context);

1 0

Henri Verbeet : ddraw: Only update primary_lock when we' re actually locking the frontbuffer.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: 38abddca68c2cb7ef8ed35bc2332a2f3baa15a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=38abddca68c2cb7ef8ed35bc2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:24 2011 +0200 ddraw: Only update primary_lock when we're actually locking the frontbuffer. This fixes a regression introduced by commit 8330558e125c9073068ffbd7741f1128c17c1e08. --- dlls/ddraw/surface.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index de32103..9f85153 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -972,12 +972,15 @@ static HRESULT surface_lock(IDirectDrawSurfaceImpl *This, } } - if (Flags & DDLOCK_READONLY) - memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); - else if (Rect) - This->ddraw->primary_lock = *Rect; - else - SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight); + if (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) + { + if (Flags & DDLOCK_READONLY) + memset(&This->ddraw->primary_lock, 0, sizeof(This->ddraw->primary_lock)); + else if (Rect) + This->ddraw->primary_lock = *Rect; + else + SetRect(&This->ddraw->primary_lock, 0, 0, This->surface_desc.dwWidth, This->surface_desc.dwHeight); + } /* Override the memory area. The pitch should be set already. Strangely windows * does not set the LPSURFACE flag on locked surfaces !?!.

1 0

Henri Verbeet : wined3d: Rename nCfgs to cfg_count.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: dbfe83baff0838e68e6b8108a5be7f8f54ff4ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbfe83baff0838e68e6b8108a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:25 2011 +0200 wined3d: Rename nCfgs to cfg_count. --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/directx.c | 40 ++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e384fb3..29d0b3f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1151,8 +1151,8 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC { FALSE, FALSE, FALSE }, }; - int i = 0; - int nCfgs = device->adapter->nCfgs; + unsigned int cfg_count = device->adapter->cfg_count; + unsigned int i; TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n", device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), @@ -1169,7 +1169,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC for (matchtry = 0; matchtry < (sizeof(matches) / sizeof(*matches)) && !iPixelFormat; ++matchtry) { - for (i = 0; i < nCfgs; ++i) + for (i = 0; i < cfg_count; ++i) { const struct wined3d_pixel_format *cfg = &device->adapter->cfgs[i]; BOOL exactDepthMatch = TRUE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d282d9..5422a74 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3164,7 +3164,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, unsigned int i; cfgs = adapter->cfgs; - cfg_count = adapter->nCfgs; + cfg_count = adapter->cfg_count; for (i = 0; i < cfg_count; ++i) { if (wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], rt_format) @@ -3234,8 +3234,6 @@ static BOOL CheckBumpMapCapability(const struct wined3d_adapter *adapter, const static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *display_format, const struct wined3d_format *ds_format) { - int it=0; - /* Only allow depth/stencil formats */ if (!(ds_format->depth_size || ds_format->stencil_size)) return FALSE; @@ -3258,10 +3256,12 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, } else { + unsigned int i; + /* Walk through all WGL pixel formats to find a match */ - for (it = 0; it < adapter->nCfgs; ++it) + for (i = 0; i < adapter->cfg_count; ++i) { - const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; + const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; if (wined3d_check_pixel_format_color(&adapter->gl_info, cfg, display_format) && wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) return TRUE; @@ -3290,7 +3290,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, BYTE AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; BYTE CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; const struct wined3d_pixel_format *cfgs = adapter->cfgs; - int it; + unsigned int i; getColorBits(adapter_format, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); getColorBits(check_format, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); @@ -3304,13 +3304,13 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, /* Check if there is a WGL pixel format matching the requirements, the format should also be window * drawable (not offscreen; e.g. Nvidia offers R5G6B5 for pbuffers even when X is running at 24bit) */ - for (it = 0; it < adapter->nCfgs; ++it) + for (i = 0; i < adapter->cfg_count; ++i) { - if (cfgs[it].windowDrawable - && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[it], check_format)) + if (cfgs[i].windowDrawable + && wined3d_check_pixel_format_color(&adapter->gl_info, &cfgs[i], check_format)) { TRACE_(d3d_caps)("Pixel format %d is compatible with format %s.\n", - cfgs[it].iPixelFormat, debug_d3dformat(check_format->id)); + cfgs[i].iPixelFormat, debug_d3dformat(check_format->id)); return TRUE; } } @@ -5289,15 +5289,17 @@ static BOOL InitAdapters(struct wined3d *wined3d) if (gl_info->supported[WGL_ARB_PIXEL_FORMAT]) { + GLint cfg_count; int attribute; int attribs[11]; int values[11]; int nAttribs = 0; attribute = WGL_NUMBER_PIXEL_FORMATS_ARB; - GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, &attribute, &adapter->nCfgs)); + GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, &attribute, &cfg_count)); + adapter->cfg_count = cfg_count; - adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->nCfgs * sizeof(*adapter->cfgs)); + adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, adapter->cfg_count * sizeof(*adapter->cfgs)); cfgs = adapter->cfgs; attribs[nAttribs++] = WGL_RED_BITS_ARB; attribs[nAttribs++] = WGL_GREEN_BITS_ARB; @@ -5311,7 +5313,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) attribs[nAttribs++] = WGL_DOUBLE_BUFFER_ARB; attribs[nAttribs++] = WGL_AUX_BUFFERS_ARB; - for (iPixelFormat=1; iPixelFormat <= adapter->nCfgs; ++iPixelFormat) + for (iPixelFormat=1; iPixelFormat <= adapter->cfg_count; ++iPixelFormat) { res = GL_EXTCALL(wglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, nAttribs, attribs, values)); @@ -5358,7 +5360,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) { int nCfgs = DescribePixelFormat(hdc, 0, 0, 0); adapter->cfgs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, nCfgs * sizeof(*adapter->cfgs)); - adapter->nCfgs = 0; /* We won't accept all formats e.g. software accelerated ones will be skipped */ + adapter->cfg_count = 0; /* We won't accept all formats e.g. software accelerated ones will be skipped */ cfgs = adapter->cfgs; for(iPixelFormat=1; iPixelFormat<=nCfgs; iPixelFormat++) @@ -5399,11 +5401,13 @@ static BOOL InitAdapters(struct wined3d *wined3d) cfgs->redSize, cfgs->greenSize, cfgs->blueSize, cfgs->alphaSize, cfgs->depthSize, cfgs->stencilSize, cfgs->windowDrawable); cfgs++; - adapter->nCfgs++; + adapter->cfg_count++; } - /* Yikes we haven't found any suitable formats. This should only happen in case of GDI software rendering which we can't use anyway as its 3D functionality is very, very limited */ - if(!adapter->nCfgs) + /* We haven't found any suitable formats. This should only happen + * in case of GDI software rendering, which is pretty useless + * anyway. */ + if (!adapter->cfg_count) { ERR("Disabling Direct3D because no hardware accelerated pixel formats have been found!\n"); @@ -5423,7 +5427,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) * Mark an adapter with this broken stencil behavior. */ adapter->brokenStencil = TRUE; - for (i = 0, cfgs = adapter->cfgs; i < adapter->nCfgs; ++i) + for (i = 0, cfgs = adapter->cfgs; i < adapter->cfg_count; ++i) { /* Nearly all drivers offer depth formats without stencil, only on i915 this if-statement won't be entered. */ if(cfgs[i].depthSize && !cfgs[i].stencilSize) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a398e3b..25a24e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1524,7 +1524,7 @@ struct wined3d_adapter struct wined3d_gl_info gl_info; struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ - int nCfgs; + unsigned int cfg_count; struct wined3d_pixel_format *cfgs; BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */

1 0

Henri Verbeet : wined3d: Make the device parameter to surface_blt_to_drawable() const.
by Alexandre Julliard 27 Oct '11

27 Oct '11

Module: wine Branch: master Commit: bf5ab0a199080347ff20435bff0f470210643c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5ab0a199080347ff20435bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 27 17:06:26 2011 +0200 wined3d: Make the device parameter to surface_blt_to_drawable() const. --- 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 91c0f60..c13fc26 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5324,7 +5324,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW rect->bottom = drawable_height - rect->bottom; } -static void surface_blt_to_drawable(struct wined3d_device *device, +static void surface_blt_to_drawable(const struct wined3d_device *device, WINED3DTEXTUREFILTERTYPE filter, BOOL color_key, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in)

1 0