December 2011 - Wine-Commits

Stefan Dösinger : wined3d: Remove fglrx GLSL constant quirks.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: e4f91774ac3a783b3df44c7d47898d8f71b23e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4f91774ac3a783b3df44c7d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 6 00:03:02 2011 +0100 wined3d: Remove fglrx GLSL constant quirks. Fglrx does not support r500 and earlier GPUs any longer, making those quirks obsolete and a problem for r300g. --- dlls/wined3d/directx.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e8cce94..43cbc52 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -807,8 +807,6 @@ static void quirk_apple_glsl_constants(struct wined3d_gl_info *gl_info) static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) { - quirk_arb_constants(gl_info); - /* MacOS advertises GL_ARB_texture_non_power_of_two on ATI r500 and earlier cards, although * these cards only support GL_ARB_texture_rectangle(D3DPTEXTURECAPS_NONPOW2CONDITIONAL). * If real NP2 textures are used, the driver falls back to software. We could just remove the @@ -826,11 +824,6 @@ static void quirk_amd_dx9(struct wined3d_gl_info *gl_info) gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] = FALSE; gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] = TRUE; } - - /* fglrx has the same structural issues as the one described in quirk_apple_glsl_constants, although - * it is generally more efficient. Reserve just 8 constants. */ - TRACE_(d3d_caps)("Reserving 8 GLSL constants for compiler private use.\n"); - gl_info->reserved_glsl_constants = max(gl_info->reserved_glsl_constants, 8); } static void quirk_no_np2(struct wined3d_gl_info *gl_info) @@ -932,7 +925,7 @@ static const struct driver_quirk quirk_table[] = { match_amd_r300_to_500, quirk_amd_dx9, - "AMD GLSL constant and normalized texrect quirk" + "AMD normalized texrect quirk" }, /* MacOS advertises more GLSL vertex shader uniforms than supported by the hardware, and if more are * used it falls back to software. While the compiler can detect if the shader uses all declared

1 0

Hans Leidekker : msi: Make sure to keep a reference to custom action data until the actions are finished .
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: cd4432bc9bd4168eba4d1f8e414313f265473133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd4432bc9bd4168eba4d1f8e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 6 13:13:21 2011 +0100 msi: Make sure to keep a reference to custom action data until the actions are finished. --- dlls/msi/custom.c | 39 ++++++++++++--------------------------- 1 files changed, 12 insertions(+), 27 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 3b8e677..cb7461b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -734,7 +734,6 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, msi_custom_action_info *info; WCHAR package_path[MAX_PATH]; DWORD size; - UINT r; size = MAX_PATH; msi_get_property(package->db, szSourceDir, package_path, &size); @@ -744,10 +743,7 @@ static UINT HANDLE_CustomType23(MSIPACKAGE *package, LPCWSTR source, TRACE("Installing package %s concurrently\n", debugstr_w(package_path)); info = do_msidbCAConcurrentInstall(package, type, package_path, target, action); - - r = wait_thread_handle(info); - release_custom_action_data( info ); - return r; + return wait_thread_handle(info); } static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, @@ -755,7 +751,6 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; MSIBINARY *binary; - UINT r; if (!(binary = get_temp_binary( package, source, TRUE ))) return ERROR_FUNCTION_FAILED; @@ -763,10 +758,7 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ); - - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) @@ -860,7 +852,6 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; MSIFILE *file; - UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -872,10 +863,7 @@ static UINT HANDLE_CustomType17(MSIPACKAGE *package, LPCWSTR source, } info = do_msidbCustomActionTypeDll( package, type, file->TargetPath, target, action ); - - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, @@ -1046,16 +1034,12 @@ static msi_custom_action_info *do_msidbCustomActionTypeScript( static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - UINT r; msi_custom_action_info *info; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); info = do_msidbCustomActionTypeScript( package, type, target, NULL, action ); - - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, @@ -1098,7 +1082,6 @@ static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); - release_custom_action_data( info ); done: msi_free(bufferw); @@ -1158,7 +1141,6 @@ static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, } info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); r = wait_thread_handle( info ); - release_custom_action_data( info ); done: msi_free(bufferw); @@ -1171,7 +1153,6 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, { msi_custom_action_info *info; WCHAR *prop; - UINT r; TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); @@ -1180,9 +1161,7 @@ static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, info = do_msidbCustomActionTypeScript( package, type, prop, NULL, action ); msi_free(prop); - r = wait_thread_handle( info ); - release_custom_action_data( info ); - return r; + return wait_thread_handle( info ); } UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL execute) @@ -1404,8 +1383,14 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) msi_dialog_check_messages( wait_handles[i] ); CloseHandle( wait_handles[i] ); } - msi_free( wait_handles ); + + EnterCriticalSection( &msi_custom_action_cs ); + LIST_FOR_EACH_ENTRY_SAFE( info, cursor, &msi_pending_custom_actions, msi_custom_action_info, entry ) + { + if (info->package == package) release_custom_action_data( info ); + } + LeaveCriticalSection( &msi_custom_action_cs ); } typedef struct _msi_custom_remote_impl {

1 0

Hans Leidekker : user32: Add stub implementations of MessageBoxTimeoutA/W.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: e54ab7a8b6edbffe5ef642f9258f84baafbe59fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e54ab7a8b6edbffe5ef642f92… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 6 13:12:57 2011 +0100 user32: Add stub implementations of MessageBoxTimeoutA/W. --- dlls/user32/msgbox.c | 20 ++++++++++++++++++++ dlls/user32/user32.spec | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index fe72166..91437bc 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -454,6 +454,26 @@ INT WINAPI MessageBoxExW( HWND hWnd, LPCWSTR text, LPCWSTR title, } /************************************************************************** + * MessageBoxTimeoutA (USER32.@) + */ +INT WINAPI MessageBoxTimeoutA( HWND hWnd, LPCSTR text, LPCSTR title, + UINT type, WORD langid, DWORD timeout ) +{ + FIXME("timeout not supported (%u)\n", timeout); + return MessageBoxExA( hWnd, text, title, type, langid ); +} + +/************************************************************************** + * MessageBoxTimeoutW (USER32.@) + */ +INT WINAPI MessageBoxTimeoutW( HWND hWnd, LPCWSTR text, LPCWSTR title, + UINT type, WORD langid, DWORD timeout ) +{ + FIXME("timeout not supported (%u)\n", timeout); + return MessageBoxExW( hWnd, text, title, type, langid ); +} + +/************************************************************************** * MessageBoxIndirectA (USER32.@) */ INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox ) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 104ca86..d5c123c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -498,8 +498,8 @@ @ stdcall MessageBoxExW(long wstr wstr long long) @ stdcall MessageBoxIndirectA(ptr) @ stdcall MessageBoxIndirectW(ptr) -# @ stub MessageBoxTimeoutA -# @ stub MessageBoxTimeoutW +@ stdcall MessageBoxTimeoutA(long str str long long long) +@ stdcall MessageBoxTimeoutW(long wstr wstr long long long) @ stdcall MessageBoxW(long wstr wstr long) # @ stub ModifyAccess @ stdcall ModifyMenuA(long long long long ptr)

1 0

Jacek Caban : mshtml: Added support for navigating to _self target.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 4352a9fa14451fa1c43a575a5e809759f0d251bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4352a9fa14451fa1c43a575a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 15:11:16 2011 +0100 mshtml: Added support for navigating to _self target. --- dlls/mshtml/htmlanchor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a1dc8c3..13bd2a4 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -47,13 +47,15 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsresult nsres; HRESULT hres = E_FAIL; + static const WCHAR _selfW[] = {'_','s','e','l','f',0}; + nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); if(NS_SUCCEEDED(nsres)) { const PRUnichar *target; nsAString_GetData(&target_str, &target); - if(*target) { + if(*target && strcmpiW(target, _selfW)) { FIXME("Navigating to target %s is not implemented\n", debugstr_w(target)); nsAString_Finish(&target_str); return S_OK;

1 0

Aric Stewart : usp10: Use UpdateClusters in DecomposeVowels.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

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 Dec. 6, 2011

Dec. 6, 2011

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

Aric Stewart : user32: Protect against NULL ssa to prevent crashes in old native usp10.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 4012cc070efb199df1e2ec980954d9995676b60b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4012cc070efb199df1e2ec980… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 08:31:12 2011 -0600 user32: Protect against NULL ssa to prevent crashes in old native usp10. --- dlls/user32/edit.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index eefe817..0ceb8cf 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -830,7 +830,7 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap) *after_wrap = (line_def->ending == END_WRAP); return line_index + line_def->net_length; } - if (x <= 0) { + if (x <= 0 || !line_def->ssa) { if (after_wrap) *after_wrap = FALSE; return line_index; @@ -863,17 +863,22 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap) EDIT_UpdateUniscribeData(es, NULL, 0); if (es->x_offset) { - if (es->x_offset>= get_text_length(es)) + if (es->ssa) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xoff = size->cx; + if (es->x_offset>= get_text_length(es)) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xoff = size->cx; + } + ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); } - ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); + else + xoff = 0; } if (x < 0) { - if (x + xoff > 0) + if (x + xoff > 0 || !es->ssa) { ScriptStringXtoCP(es->ssa, x+xoff, &index, &trailing); if (trailing) index++; @@ -892,11 +897,13 @@ static INT EDIT_CharFromPos(EDITSTATE *es, INT x, INT y, LPBOOL after_wrap) index = 0; else if (x > size->cx) index = get_text_length(es); - else + else if (es->ssa) { ScriptStringXtoCP(es->ssa, x+xoff, &index, &trailing); if (trailing) index++; } + else + index = 0; } else index = es->x_offset; @@ -1062,6 +1069,9 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) while (line_def->index != li) line_def = line_def->next; + if (!line_def->ssa) + return 0; + lw = line_def->width; w = es->format_rect.right - es->format_rect.left; ScriptStringCPtoX(line_def->ssa, (index - 1) - li, TRUE, &x); @@ -1077,18 +1087,23 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) EDIT_UpdateUniscribeData(es, NULL, 0); if (es->x_offset) { - if (es->x_offset >= get_text_length(es)) + if (es->ssa) { - if (es->ssa) + if (es->x_offset >= get_text_length(es)) { - const SIZE *size; - size = ScriptString_pSize(es->ssa); - xoff = size->cx; + if (es->ssa) + { + const SIZE *size; + size = ScriptString_pSize(es->ssa); + xoff = size->cx; + } + else + xoff = 0; } - else - xoff = 0; + ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); } - ScriptStringCPtoX(es->ssa, es->x_offset, FALSE, &xoff); + else + xoff = 0; } if (index) { @@ -1103,8 +1118,10 @@ static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap) else xi = 0; } - else + else if (es->ssa) ScriptStringCPtoX(es->ssa, index, FALSE, &xi); + else + xi = 0; } x = xi - xoff;

1 0

Aric Stewart : usp10: Use GDEF in baseIndic GlyphProp processing.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 894f2dc9bacc87cd85fac9d5e69ee5c922eda9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=894f2dc9bacc87cd85fac9d5e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 09:27:01 2011 -0600 usp10: Use GDEF in baseIndic GlyphProp processing. --- dlls/usp10/shape.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5fcb056..8706fad 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3263,6 +3263,7 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL 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++) { int char_index[20]; @@ -3277,11 +3278,12 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL } } + /* Indic scripts do not set fDiacritic or fZeroWidth */ + pGlyphProp[i].sva.fDiacritic = FALSE; + pGlyphProp[i].sva.fZeroWidth = FALSE; + if (char_count == 0) - { - FIXME("No chars in this glyph? Must be an error\n"); continue; - } if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */ {

1 0

Aric Stewart : usp10: Initialize the GSUB table before doing any contextual shaping.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 9cddd18cb913e081855ada106bfcd5f11ef3e3af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cddd18cb913e081855ada106… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Dec 6 08:47:51 2011 -0600 usp10: Initialize the GSUB table before doing any contextual shaping. --- dlls/usp10/shape.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 2189b92..5fcb056 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3387,6 +3387,9 @@ void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) { + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + if (ShapingData[psa->eScript].contextProc) ShapingData[psa->eScript].contextProc(hdc, psc, psa, pwcChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); }

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: f92dcb3305723d1c59a8463b17d2e59eec016b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92dcb3305723d1c59a8463b1… Author: Luca Bennati <lucak3(a)gmail.com> Date: Tue Dec 6 11:23:00 2011 +0100 po: Update Italian translation. --- po/it.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/it.po b/po/it.po index b1ecf24..9485dd5 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-02 12:11+0100\n" +"PO-Revision-Date: 2011-12-06 11:22+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -2291,9 +2291,8 @@ msgid "Mapping" msgstr "Corrispondenza" #: dinput.rc:53 -#, fuzzy msgid "Show Assigned First" -msgstr "Ordina assegnati" +msgstr "Mostra assegnati prima" #: dinput.rc:34 msgid "Action"

1 0