May 2010 - Wine-Commits - list.winehq.org

Sven Baars : msi: Fix English translation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: cc9e357ecfffaeec5e7858e4c670ecfca506d8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc9e357ecfffaeec5e7858e4c… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 21 20:11:32 2010 +0200 msi: Fix English translation. --- dlls/msi/msi_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi_En.rc b/dlls/msi/msi_En.rc index 4205758..c506e00 100644 --- a/dlls/msi/msi_En.rc +++ b/dlls/msi/msi_En.rc @@ -30,7 +30,7 @@ STRINGTABLE DISCARDABLE 9 "insert disk %s" 10 "Windows Installer %s\n\n" \ "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ + "msiexec command {required parameter} [optional parameter]\n\n" \ "Install a product:\n" \ "\t/i {package|productcode} [property]\n" \ "\t/package {package|productcode} [property]\n" \

1 0

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

May 24, 2010

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

1 0

Michael Stefaniuc : msacm32: Avoid using the long type.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: ff2813364a8426a54d268903e6eb95f749ae6a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2813364a8426a54d268903e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri May 21 20:34:53 2010 +0200 msacm32: Avoid using the long type. --- dlls/msacm32/driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index c02d89f..d0b543c 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -77,8 +77,8 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule, /* A->W translation of name */ if ((fdwAdd & ACM_DRIVERADDF_TYPEMASK) == ACM_DRIVERADDF_NAME) { - unsigned long len; - + INT len; + if (lParam == 0) return MMSYSERR_INVALPARAM; len = MultiByteToWideChar(CP_ACP, 0, (LPSTR)lParam, -1, NULL, 0); driverW = HeapAlloc(MSACM_hHeap, 0, len * sizeof(WCHAR));

1 0

Aric Stewart : usp10: Use font chartype only as a fallback if we do not know the characters script already .
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: a27e03bf5d796cabb8ec99eec418867254e17d54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a27e03bf5d796cabb8ec99eec… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:10:56 2010 -0500 usp10: Use font chartype only as a fallback if we do not know the characters script already. --- dlls/usp10/shape.c | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 71022ef..55c8a80 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -347,13 +347,29 @@ static UINT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* f return glyph; } -static const char* get_opentype_script(HDC hdc) +static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa) { + UINT charset; + + switch (psa->eScript) + { + case Script_Arabic: + return "arab"; + case Script_Syriac: + return "syrc"; + case Script_Hebrew: + return "hebr"; + case Script_Latin: + case Script_Numeric: + case Script_CR: + case Script_LF: + return "latn"; + } + /* - * I am not sure if this is the correct way to generate our script tag + * fall back to the font charset */ - UINT charset = GetTextCharsetInfo(hdc, NULL, 0x0); - + charset = GetTextCharsetInfo(hdc, NULL, 0x0); switch (charset) { case ANSI_CHARSET: return "latn"; @@ -375,7 +391,7 @@ static const char* get_opentype_script(HDC hdc) } } -static WORD get_GSUB_feature_glyph(HDC hdc, void* GSUB_Table, UINT glyph, const char* feat) +static WORD get_GSUB_feature_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, void* GSUB_Table, UINT glyph, const char* feat) { const GSUB_Header *header; const GSUB_Script *script; @@ -387,7 +403,7 @@ static WORD get_GSUB_feature_glyph(HDC hdc, void* GSUB_Table, UINT glyph, const header = GSUB_Table; - script = GSUB_get_script_table(header, get_opentype_script(hdc)); + script = GSUB_get_script_table(header, get_opentype_script(hdc,psa)); if (!script) { TRACE("Script not found\n"); @@ -509,7 +525,7 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC WORD newGlyph = pwOutGlyphs[i]; if (psc->GSUB_Table) - newGlyph = get_GSUB_feature_glyph(hdc, psc->GSUB_Table, pwOutGlyphs[i], contextual_features[context_shape[i]]); + newGlyph = get_GSUB_feature_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs[i], contextual_features[context_shape[i]]); if (newGlyph == pwOutGlyphs[i] && pwcChars[i] >= FIRST_ARABIC_CHAR && pwcChars[i] <= LAST_ARABIC_CHAR) { /* fall back to presentation form B */

1 0

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

May 24, 2010

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

1 0

Andrey Turkin : oleaut32: Fix ctl2_alloc_importfile offset calculations.
by Alexandre Julliard May 24, 2010

May 24, 2010

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

1 0

Sven Baars : view: Fix Dutch translation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 264d2737c570d501b6df57c9c29ed5424c861cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=264d2737c570d501b6df57c9c… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 21 22:04:48 2010 +0200 view: Fix Dutch translation. --- programs/view/Nl.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/view/Nl.rc b/programs/view/Nl.rc index 623506b..62627f4 100644 --- a/programs/view/Nl.rc +++ b/programs/view/Nl.rc @@ -32,8 +32,8 @@ VIEW MENU BEGIN POPUP "&Bestand" BEGIN - MENUITEM "&Openen", IDM_OPEN - MENUITEM "&Afsluiten", IDM_EXIT + MENUITEM "&Openen", IDM_OPEN + MENUITEM "&Afsluiten", IDM_EXIT END POPUP "&Verplaatsen" BEGIN @@ -67,5 +67,5 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Toont Metafile bestanden" + IDS_DESCRIPTION "Algemene Metafile weergave" END

1 0

Marcus Meissner : usp10: Check heap_alloc return value (Coverity).
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 163c7021b16dae97f3a5d4a726dd4310865d814e URL: http://source.winehq.org/git/wine.git/?a=commit;h=163c7021b16dae97f3a5d4a72… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri May 21 21:11:30 2010 +0200 usp10: Check heap_alloc return value (Coverity). --- dlls/usp10/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 261b634..27fe3b0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1378,6 +1378,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) { WCHAR *rChars = heap_alloc(sizeof(WCHAR) * cChars); + if (!rChars) return E_OUTOFMEMORY; for (i = 0; i < cChars; i++) { int idx = i;

1 0

Sven Baars : winemine: Fix Dutch translation.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: 08a956b92b755a94c5ad1e65fa1f8cc7e11e0537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a956b92b755a94c5ad1e65f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 21 20:11:25 2010 +0200 winemine: Fix Dutch translation. --- programs/winemine/Nl.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winemine/Nl.rc b/programs/winemine/Nl.rc index 18bbda6..fc14023 100644 --- a/programs/winemine/Nl.rc +++ b/programs/winemine/Nl.rc @@ -24,7 +24,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE { IDS_APPNAME, "WineMine" - IDS_NOBODY, "Nobody" + IDS_NOBODY, "Niemand" IDS_ABOUT, "Copyright 2000 Joshua Thielen" } @@ -38,13 +38,13 @@ MENU_WINEMINE MENU DISCARDABLE MENUITEM "&Beginner", IDM_BEGINNER MENUITEM "&Gevorderde", IDM_ADVANCED MENUITEM "&Expert", IDM_EXPERT - MENUITEM "Aa&ngepast spel", IDM_CUSTOM + MENUITEM "Aange&past spel", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "&Afsluiten\tAlt+X", IDM_EXIT } POPUP "&Info" { - MENUITEM "&Snelste tijden", IDM_TIMES - MENUITEM "&Info", IDM_ABOUT + MENUITEM "&Snelste tijden...", IDM_TIMES + MENUITEM "&Over WineMine", IDM_ABOUT } }

1 0

Alexandre Julliard : configure: Disable makefile auto-updating on BSD make, it's broken for parallel builds.
by Alexandre Julliard May 24, 2010

May 24, 2010

Module: wine Branch: master Commit: bd3110d8ab8971c520343a39f6cd23f484a99d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3110d8ab8971c520343a39f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 23 10:34:36 2010 +0200 configure: Disable makefile auto-updating on BSD make, it's broken for parallel builds. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 6c6ea6c..69d0e1a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -144,8 +144,8 @@ AC_DEFUN([WINE_CONFIG_HELPERS], # Rules automatically generated by configure .INIT: Makefile -.BEGIN: Makefile .MAKEFILEDEPS: +all: Makefile Makefile: Makefile.in Make.rules config.status @./config.status Make.tmp Makefile" diff --git a/configure b/configure index 213ba02..fe69a20 100755 --- a/configure +++ b/configure @@ -13967,8 +13967,8 @@ ALL_MAKEFILE_DEPENDS=" # Rules automatically generated by configure .INIT: Makefile -.BEGIN: Makefile .MAKEFILEDEPS: +all: Makefile Makefile: Makefile.in Make.rules config.status @./config.status Make.tmp Makefile"

1 0