wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Aric Stewart : gdi32: Handle a BiDi string being shaped into more or less glyphs than characters in the string .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: ec62c33d79dd99e4ced80a1f248b1d6d98366b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec62c33d79dd99e4ced80a1f2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri May 21 15:11:34 2010 -0500 gdi32: Handle a BiDi string being shaped into more or less glyphs than characters in the string. --- dlls/gdi32/bidi.c | 5 ++++- dlls/gdi32/font.c | 9 +++++++-- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 20fde13..82691ed 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -352,7 +352,8 @@ BOOL BIDI_Reorder( LPWSTR lpOutString, /* [out] Reordered string */ INT uCountOut, /* [in] Size of output buffer */ UINT *lpOrder, /* [out] Logical -> Visual order map */ - WORD **lpGlyphs /* [out] reordered, mirrored, shaped glyphs to display */ + WORD **lpGlyphs, /* [out] reordered, mirrored, shaped glyphs to display */ + INT *cGlyphs /* [out] number of glyphs generated */ ) { WORD *chartype; @@ -637,6 +638,8 @@ BOOL BIDI_Reorder( done += i; } + if (cGlyphs) + *cGlyphs = glyph_i; HeapFree(GetProcessHeap(), 0, chartype); HeapFree(GetProcessHeap(), 0, levels); diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 963dadc..17fb381 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1702,16 +1702,21 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, if( !(flags & (ETO_GLYPH_INDEX | ETO_IGNORELANGUAGE)) && count > 0 ) { + INT cGlyphs; reordered_str = HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); BIDI_Reorder( hdc, str, count, GCP_REORDER, ((flags&ETO_RTLREADING)!=0 || (GetTextAlign(hdc)&TA_RTLREADING)!=0)? WINE_GCPW_FORCE_RTL:WINE_GCPW_FORCE_LTR, - reordered_str, count, NULL, &glyphs ); + reordered_str, count, NULL, &glyphs, &cGlyphs); flags |= ETO_IGNORELANGUAGE; if (glyphs) + { flags |= ETO_GLYPH_INDEX; + if (cGlyphs != count) + count = cGlyphs; + } } else if(flags & ETO_GLYPH_INDEX) glyphs = reordered_str; @@ -2874,7 +2879,7 @@ GetCharacterPlacementW( } else { BIDI_Reorder(NULL, lpString, uCount, dwFlags, WINE_GCPW_FORCE_LTR, lpResults->lpOutString, - nSet, lpResults->lpOrder, NULL ); + nSet, lpResults->lpOrder, NULL, NULL ); } /* FIXME: Will use the placement chars */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 10ff13e..d1cb66b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -356,7 +356,7 @@ typedef struct tagBITMAPOBJ #define WINE_GCPW_LOOSE_MASK 2 extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, DWORD dwWineGCP_Flags, - LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs ) DECLSPEC_HIDDEN; + LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN;

1 0

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

24 May '10

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

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

24 May '10

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

Maarten Lankhorst : winmm: Wake up timer after the timer list is empty.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 3e5f7f49fe12e87d7ecd30f0969e99814dfb0e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5f7f49fe12e87d7ecd30f09… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri May 21 21:31:26 2010 +0200 winmm: Wake up timer after the timer list is empty. --- dlls/winmm/time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 3d45fd9..e692fb6 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -369,8 +369,11 @@ MMRESULT WINAPI timeKillEvent(UINT wID) break; } } - if (list_empty(&timer_list)) + if (list_empty(&timer_list)) { + char c = 'q'; TIME_TimeToDie = 1; + write(TIME_fdWake[1], &c, sizeof(c)); + } LeaveCriticalSection(&WINMM_cs); if (!lpSelf)

1 0

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

24 May '10

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

Michael Stefaniuc : msacm32: Avoid using the long type.
by Alexandre Julliard 24 May '10

24 May '10

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

Sven Baars : msi: Update Dutch translation.
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 23f9b07d6aaba90c336cede38772075d1f7a41e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23f9b07d6aaba90c336cede38… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 21 20:17:23 2010 +0200 msi: Update Dutch translation. --- dlls/msi/msi_Nl.rc | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msi/msi_Nl.rc b/dlls/msi/msi_Nl.rc index e0ae9d6..306cfd7 100644 --- a/dlls/msi/msi_Nl.rc +++ b/dlls/msi/msi_Nl.rc @@ -1,5 +1,5 @@ /* - * Durch resources for MSI + * Dutch resources for MSI * * Copyright 2005 Hans Leidekker * @@ -28,30 +28,30 @@ STRINGTABLE DISCARDABLE 5 "Pad %s niet gevonden" 9 "Plaats disk %s" 10 "Windows Installer %s\n\n" \ - "Usage:\n" \ - "msiexec command {required parameter} [optional parammeter]\n\n" \ - "Install a product:\n" \ - "\t/i {package|productcode} [property]\n" \ - "\t/package {package|productcode} [property]\n" \ - "\t/a package [property]\n" \ - "Repair an installation:\n" \ - "\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" \ - "Uninstall a product:\n" \ - "\t/uninstall {package|productcode} [property]\n" \ - "\t/x {package|productcode} [property]\n" \ - "Advertise a product:\n" \ - "\t/j[u|m] package [/t transform] [/g languageid]\n" \ - "Apply a patch:\n" \ - "\t/p patchpackage [property]\n" \ - "\t/p patchpackage /a package [property]\n" \ - "Log and UI Modifiers for above commands:\n" \ - "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" \ + "Gebruik:\n" \ + "msiexec commando {vereiste parameter} [optionele parameter]\n\n" \ + "Installeer een product:\n" \ + "\t/i {pakket|productcode} [eigenschap]\n" \ + "\t/package {pakket|productcode} [eigenschap]\n" \ + "\t/a pakket [eigenschap]\n" \ + "Herstel een installatie:\n" \ + "\t/f[p|o|e|d|c|a|u|m|s|v] {pakket|productcode}\n" \ + "Verwijder een product:\n" \ + "\t/uninstall {pakket|productcode} [eigenschap]\n" \ + "\t/x {pakket|productcode} [eigenschap]\n" \ + "Adverteer een product:\n" \ + "\t/j[u|m] pakket [/t transform] [/g languageid]\n" \ + "Pas een patch toe:\n" \ + "\t/p patchpakket [eigenschap]\n" \ + "\t/p patchpakket /a pakket [eigenschap]\n" \ + "Log en UI Modifiers voor bovenstaande commando's:\n" \ + "\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logbestand\n" \ "\t/q{|n|b|r|f|n+|b+|b-}\n" \ - "Register MSI Service:\n" \ + "Registreer MSI Service:\n" \ "\t/y\n" \ - "Unregister MSI Service:\n" \ + "Maak registratie MSI Service ongedaan:\n" \ "\t/z\n" \ - "Display this help:\n" \ + "Laat dit helpvenster zien:\n" \ "\t/help\n" \ "\t/?\n" 11 "Voer de map in die %s bevat"

1 0

Sven Baars : msi: Fix English translation.
by Alexandre Julliard 24 May '10

24 May '10

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

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

24 May '10

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 : ntdll: Reimplement bsearch to avoid redundant and possibly out of bounds comparisons .
by Alexandre Julliard 24 May '10

24 May '10

Module: wine Branch: master Commit: 4dae774893615c1d78f7ddc46a2b20ab548b302a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dae774893615c1d78f7ddc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun May 23 22:25:06 2010 +0200 ntdll: Reimplement bsearch to avoid redundant and possibly out of bounds comparisons. --- dlls/ntdll/misc.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index eedef65..621848e 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -302,27 +302,20 @@ void * __cdecl NTDLL_bsearch( const void *key, const void *base, size_t nmemb, size_t size, int (__cdecl *compar)(const void *, const void *) ) { - int begin, end, cursor; - - begin = 0; - end = nmemb-1; - while (1) { - int ret; - cursor = (end-begin)/2+begin; - ret = compar(key,(char*)base+(cursor*size)); + ssize_t min = 0; + ssize_t max = nmemb - 1; + + while (min <= max) + { + ssize_t cursor = (min + max) / 2; + int ret = compar(key,(const char *)base+(cursor*size)); if (!ret) return (char*)base+(cursor*size); if (ret < 0) - end = cursor; + max = cursor - 1; else - begin = cursor; - if ((end-begin)<=1) - break; + min = cursor + 1; } - if (!compar(key,(char*)base+(begin*size))) - return (char*)base+(begin*size); - if (!compar(key,(char*)base+(end*size))) - return (char*)base+(end*size); return NULL; }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2010