June 2011 - Wine-commits - list.winehq.org

Michael Mc Donnell : d3dx9: Implement UpdateSemantics mesh method.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 39d4656b2a755c9aa0a81f3c76977c586862bbf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39d4656b2a755c9aa0a81f3c7… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Tue May 24 19:44:48 2011 +0200 d3dx9: Implement UpdateSemantics mesh method. --- dlls/d3dx9_36/mesh.c | 95 +++++++++++++++++++++++++++++++++++++------ dlls/d3dx9_36/tests/mesh.c | 46 +++++++++++----------- 2 files changed, 104 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39d4656b2a755c9aa0a81…

1 0

Michael Stefaniuc : mscoree: COM cleanup in corruntimehost.c.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: e79e6e30f46c1a719fb47b443abfc844a6ee911b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79e6e30f46c1a719fb47b443… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:54:50 2011 +0200 mscoree: COM cleanup in corruntimehost.c. --- dlls/mscoree/corruntimehost.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 607537c..146dd23 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -45,8 +45,8 @@ DEFINE_GUID(IID__AppDomain, 0x05f696dc,0x2b29,0x3663,0xad,0x8b,0xc4,0x38,0x9c,0x struct RuntimeHost { - const struct ICorRuntimeHostVtbl *lpVtbl; - const struct ICLRRuntimeHostVtbl *lpCLRHostVtbl; + ICorRuntimeHost ICorRuntimeHost_iface; + ICLRRuntimeHost ICLRRuntimeHost_iface; const CLRRuntimeInfo *version; loaded_mono *mono; struct list domains; @@ -207,12 +207,12 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d static inline RuntimeHost *impl_from_ICLRRuntimeHost( ICLRRuntimeHost *iface ) { - return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpCLRHostVtbl)); + return CONTAINING_RECORD(iface, RuntimeHost, ICLRRuntimeHost_iface); } static inline RuntimeHost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) { - return (RuntimeHost *)((char*)iface - FIELD_OFFSET(RuntimeHost, lpVtbl)); + return CONTAINING_RECORD(iface, RuntimeHost, ICorRuntimeHost_iface); } /*** IUnknown methods ***/ @@ -476,13 +476,13 @@ static HRESULT WINAPI CLRRuntimeHost_QueryInterface(ICLRRuntimeHost* iface, static ULONG WINAPI CLRRuntimeHost_AddRef(ICLRRuntimeHost* iface) { RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); - return IUnknown_AddRef((IUnknown*)&This->lpVtbl); + return ICorRuntimeHost_AddRef(&This->ICorRuntimeHost_iface); } static ULONG WINAPI CLRRuntimeHost_Release(ICLRRuntimeHost* iface) { RuntimeHost *This = impl_from_ICLRRuntimeHost( iface ); - return IUnknown_Release((IUnknown*)&This->lpVtbl); + return ICorRuntimeHost_Release(&This->ICorRuntimeHost_iface); } static HRESULT WINAPI CLRRuntimeHost_Start(ICLRRuntimeHost* iface) @@ -794,8 +794,8 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, if ( !This ) return E_OUTOFMEMORY; - This->lpVtbl = &corruntimehost_vtbl; - This->lpCLRHostVtbl = &CLRHostVtbl; + This->ICorRuntimeHost_iface.lpVtbl = &corruntimehost_vtbl; + This->ICLRRuntimeHost_iface.lpVtbl = &CLRHostVtbl; This->ref = 1; This->version = runtime_version; This->mono = loaded_mono; @@ -816,12 +816,12 @@ HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, if (IsEqualGUID(clsid, &CLSID_CorRuntimeHost)) { - unk = (IUnknown*)&This->lpVtbl; + unk = (IUnknown*)&This->ICorRuntimeHost_iface; IUnknown_AddRef(unk); } else if (IsEqualGUID(clsid, &CLSID_CLRRuntimeHost)) { - unk = (IUnknown*)&This->lpCLRHostVtbl; + unk = (IUnknown*)&This->ICLRRuntimeHost_iface; IUnknown_AddRef(unk); } else if (IsEqualGUID(clsid, &CLSID_CorMetaDataDispenser) ||

1 0

Francois Gouget : po: Add a number of missing '\n' characters in the Slovenian translation.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: e6fbfa76aa65ec21516cbaa73a721f0e9868f533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fbfa76aa65ec21516cbaa73… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Jun 22 12:57:41 2011 +0200 po: Add a number of missing '\n' characters in the Slovenian translation. --- po/sl.po | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/po/sl.po b/po/sl.po index 799e24f..630978e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -2615,7 +2615,7 @@ msgstr "Preveč semaforjev\n" #: winerror.mc:381 msgid "Exclusive semaphore already owned\n" -msgstr "Izključen semafor je ža " +msgstr "Izključen semafor je ža\n" #: winerror.mc:386 msgid "Semaphore is set\n" @@ -2936,7 +2936,7 @@ msgstr "Samodejni odseki podatkov presegajo 64k\n" #: winerror.mc:791 msgid "Ring 2 segment must be movable\n" -msgstr "Odsek obroč 2 mora biti premakljiv" +msgstr "Odsek obroč 2 mora biti premakljiv\n" #: winerror.mc:796 msgid "Relocation chain exceeds segment limit in %1\n" @@ -2986,7 +2986,6 @@ msgstr "Preveč modulov\n" msgid "Nesting LoadModule calls not allowed\n" msgstr "" "Klici gnezdenega modula nalaganja niso dovoljeni\n" -" " #: winerror.mc:856 msgid "Machine type mismatch\n" @@ -3064,7 +3063,6 @@ msgstr "Klicatelj ne sme biti lastnik mutexa\n" msgid "Too many posts to semaphore\n" msgstr "" "Preveč objav na semaforju\n" -" " #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed\n" @@ -3148,7 +3146,7 @@ msgstr "Neveljavna datoteka\n" #: winerror.mc:1051 msgid "Cannot run full-screen\n" -msgstr "Ni mogoče poganjati v celozaslonskem načinu" +msgstr "Ni mogoče poganjati v celozaslonskem načinu\n" #: winerror.mc:1056 msgid "Nonexistent token\n" @@ -3428,7 +3426,7 @@ msgstr "Zaporedni V/I je končan\n" #: winerror.mc:1401 msgid "Serial I/O counter timeout\n" -msgstr "Zakasnitev zaporednega števca V/I" +msgstr "Zakasnitev zaporednega števca V/I\n" #: winerror.mc:1406 msgid "Floppy ID address mark not found\n" @@ -3520,7 +3518,7 @@ msgstr "DLL-ja ni mogoče najti\n" #: winerror.mc:1516 msgid "Out of user handles\n" -msgstr "Ročnikov uporabnikov je zmanjkalo" +msgstr "Ročnikov uporabnikov je zmanjkalo\n" #: winerror.mc:1521 msgid "Message can only be used in synchronous calls\n" @@ -4276,7 +4274,7 @@ msgstr "Neveljaven ročnik ikone\n" #: winerror.mc:2471 msgid "Private dialog index\n" -msgstr "Kazalo zasebnega pogovornega okna" +msgstr "Kazalo zasebnega pogovornega okna\n" #: winerror.mc:2476 #, fuzzy @@ -4466,7 +4464,7 @@ msgstr "Zakasnitev\n" #: winerror.mc:2701 msgid "Invalid monitor handle\n" -msgstr "Neveljaven ročnik zaslona" +msgstr "Neveljaven ročnik zaslona\n" #: winerror.mc:2706 msgid "Event log file corrupt\n" @@ -4883,7 +4881,7 @@ msgstr "Vnosa ni mogoče najti\n" #: winerror.mc:3226 msgid "Name service unavailable\n" -msgstr "Ime storitve ni na voljo" +msgstr "Ime storitve ni na voljo\n" #: winerror.mc:3231 msgid "Invalid network address family\n" @@ -5062,19 +5060,16 @@ msgstr "Ni več vezav\n" msgid "Can't logon with interdomain trust account\n" msgstr "" "Ni se mogoče prijaviti z računom meddomenskega zaupanja\n" -" " #: winerror.mc:3451 msgid "Can't logon with workstation trust account\n" msgstr "" "Ni se mogoče prijaviti z računom zaupanja delovne postaja\n" -" " #: winerror.mc:3456 msgid "Can't logon with server trust account\n" msgstr "" "Ni se mogoče prijaviti z računom zaupanja strežnika\n" -" " #: winerror.mc:3461 msgid "Domain trust information inconsistent\n" @@ -6808,7 +6803,7 @@ msgstr "" "Kopijo Splošnega Javnega Dovoljenja GNU (angleško: GNU General Public " "License) bi morali prejeti skupaj s programom, v kolikor pa je niste, pišite " "na naslov Free Software Foundation, Inc.,59 Temple Place - Suite 330, " -"Boston, MA 02111-1307, USA in zahtevajte kopijo.\n" +"Boston, MA 02111-1307, USA in zahtevajte kopijo." #: shell32.rc:246 msgid "Wine License" @@ -8174,7 +8169,7 @@ msgstr "VER prikaže različico cmd\n" #: cmd.rc:206 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL pokaže oznako nosilca diskovne napreve" +msgstr "VOL pokaže oznako nosilca diskovne napreve.\n" #: cmd.rc:209 msgid ""

1 0

Alexandre Julliard : libwine: Avoid a potential loop in reserve_area.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 6d780048990b75effba8224f52688ca7b49a8e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d780048990b75effba8224f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 13:43:26 2011 +0200 libwine: Avoid a potential loop in reserve_area. --- libs/wine/mmap.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 0e02d16..63a597d 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -277,11 +277,11 @@ static inline void reserve_area( void *addr, void *end ) wine_mmap_add_reserved_area( addr, size ); return; } - if (size > granularity_mask + 1) + size = (size / 2) & ~granularity_mask; + if (size) { - size_t new_size = (size / 2) & ~granularity_mask; - reserve_area( addr, (char *)addr + new_size ); - reserve_area( (char *)addr + new_size, end ); + reserve_area( addr, (char *)addr + size ); + reserve_area( (char *)addr + size, end ); } #endif }

1 0

Matteo Bruni : wined3d: Fix context_apply_blit_state().
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 5b67bd4fb266856a54a152036b87f6c674f665f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b67bd4fb266856a54a152036… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 21 18:08:27 2011 +0200 wined3d: Fix context_apply_blit_state(). --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 40b9cee..872ba03 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2129,7 +2129,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); if (rt_mask != context->draw_buffers_mask) { - context_apply_draw_buffers(context, 1, &context->current_rt); + context_apply_draw_buffers(context, rt_mask, &context->current_rt); context->draw_buffers_mask = rt_mask; }

1 0

Matteo Bruni : wined3d: Fix context_apply_draw_buffers() with backbuffer ORM.
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 0919ac3b518904c40cfa0949f910bb2e6befd1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0919ac3b518904c40cfa0949f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 21 18:28:36 2011 +0200 wined3d: Fix context_apply_draw_buffers() with backbuffer ORM. --- dlls/wined3d/context.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 872ba03..a3c7c78 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2029,8 +2029,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, DWORD rt } else { - glDrawBuffer(draw_buffer_from_rt_mask(rt_mask)); - checkGLcall("glDrawBuffer()"); + ERR("Unexpected draw buffers mask with backbuffer ORM.\n"); } } } @@ -2095,6 +2094,16 @@ static void context_validate_onscreen_formats(struct wined3d_device *device, context_set_render_offscreen(context, device->StateTable, TRUE); } +static DWORD generate_rt_mask_no_fbo(struct wined3d_device *device, struct wined3d_surface *rt) +{ + if (!rt || rt->resource.format->id == WINED3DFMT_NULL) + return 0; + else if (rt->container.type == WINED3D_CONTAINER_SWAPCHAIN) + return generate_rt_mask_from_surface(rt); + else + return generate_rt_mask(device->offscreenBuffer); +} + /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { @@ -2123,7 +2132,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de } else { - rt_mask = generate_rt_mask_from_surface(context->current_rt); + rt_mask = generate_rt_mask_no_fbo(device, context->current_rt); } ENTER_GL(); @@ -2203,7 +2212,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d } else { - rt_mask = generate_rt_mask_from_surface(rts[0]); + rt_mask = generate_rt_mask_no_fbo(device, rts[0]); } ENTER_GL(); @@ -2285,7 +2294,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de } else { - rt_mask = generate_rt_mask_from_surface(fb->render_targets[0]); + rt_mask = generate_rt_mask_no_fbo(device, fb->render_targets[0]); } ENTER_GL();

1 0

Henri Verbeet : d3d9: Implement IDirect3DSurface9 private data handling on top of wined3d_resource .
by Alexandre Julliard 22 Jun '11

22 Jun '11

Module: wine Branch: master Commit: 0dd6b20af625f23f2d743e0d80d6f7e44fa36b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd6b20af625f23f2d743e0d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 19:50:06 2011 +0200 d3d9: Implement IDirect3DSurface9 private data handling on top of wined3d_resource. --- dlls/d3d9/surface.c | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 1d66bde..a4111ff 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -24,6 +24,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); +static inline IDirect3DSurface9Impl *impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) +{ + return CONTAINING_RECORD(iface, IDirect3DSurface9Impl, lpVtbl); +} + /* IDirect3DSurface9 IUnknown parts follow: */ static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; @@ -133,42 +138,53 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(IDirect3DSurface9 *iface, return D3D_OK; } -static HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(IDirect3DSurface9 *iface, REFGUID guid, + const void *data, DWORD data_size, DWORD flags) +{ + IDirect3DSurface9Impl *surface = impl_from_IDirect3DSurface9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", - iface, debugstr_guid(refguid), pData, SizeOfData, Flags); + iface, debugstr_guid(guid), data, data_size, flags); wined3d_mutex_lock(); - hr = wined3d_surface_set_private_data(This->wined3d_surface, refguid, pData, SizeOfData, Flags); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(IDirect3DSurface9 *iface, REFGUID guid, + void *data, DWORD *data_size) +{ + IDirect3DSurface9Impl *surface = impl_from_IDirect3DSurface9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", - iface, debugstr_guid(refguid), pData, pSizeOfData); + iface, debugstr_guid(guid), data, data_size); wined3d_mutex_lock(); - hr = wined3d_surface_get_private_data(This->wined3d_surface, refguid, pData, pSizeOfData); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_get_private_data(resource, guid, data, data_size); wined3d_mutex_unlock(); return hr; } -static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(IDirect3DSurface9 *iface, REFGUID guid) +{ + IDirect3DSurface9Impl *surface = impl_from_IDirect3DSurface9(iface); + struct wined3d_resource *resource; HRESULT hr; - TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); wined3d_mutex_lock(); - hr = wined3d_surface_free_private_data(This->wined3d_surface, refguid); + resource = wined3d_surface_get_resource(surface->wined3d_surface); + hr = wined3d_resource_free_private_data(resource, guid); wined3d_mutex_unlock(); return hr;

1 0

André Hentschel : Fix a typo
by Jeremy Newman 21 Jun '11

21 Jun '11

Module: website Branch: master Commit: 0ba3771e41ed53406245ab09a1608be73ca69494 URL: http://source.winehq.org/git/website.git/?a=commit;h=0ba3771e41ed53406245ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 21 00:30:26 2011 +0200 Fix a typo --- templates/de/documentation.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/de/documentation.template b/templates/de/documentation.template index 825aa2b..e66c6f2 100644 --- a/templates/de/documentation.template +++ b/templates/de/documentation.template @@ -18,7 +18,7 @@ <li> <a href="{$root}/docs/winelib-guide/index">Winelib Benutzerhandbuch (en)</a> - Wine man Wine benutzt um Windows Anwendungen nach Linux zu portieren. + Wie man Wine benutzt um Windows Anwendungen nach Linux zu portieren.    Formate: <a href="{$root}/docs/winelib-guide/index">Online</a> | <a href="http://ftp.winehq.org/pub/wine/docs/en/winelib-guide.html">HTML</a> |

1 0

Aric Stewart : usp10: Correct Post Base glyph index shifting.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 648b7f2afa2afe114a381f0c9a2e18319cc218ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=648b7f2afa2afe114a381f0c9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 21 10:07:49 2011 -0500 usp10: Correct Post Base glyph index shifting. --- dlls/usp10/shape.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index cbe186a..104757c 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2097,7 +2097,6 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa { INT index, nextIndex; INT count, g_offset; - INT prevCount = *pcGlyphs; count = syllable->end - syllable->base; @@ -2109,12 +2108,13 @@ static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa while (index >= 0) { + INT prevCount = *pcGlyphs; nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->base+g_offset, 1, pcGlyphs, feat); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); + shift_syllable_glyph_indexs(glyph_index,index+glyph_index->start+g_offset, (*pcGlyphs - prevCount)); g_offset += (*pcGlyphs - prevCount); - shift_syllable_glyph_indexs(glyph_index,index+glyph_index->start, g_offset); } index+=2;

1 0

Aric Stewart : usp10: Correct ralf glyph offset calculation in PostBase.
by Alexandre Julliard 21 Jun '11

21 Jun '11

Module: wine Branch: master Commit: 3d56d674aa32e9b8f092695190315652fdb94950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d56d674aa32e9b8f09269519… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jun 21 10:07:53 2011 -0500 usp10: Correct ralf glyph offset calculation in PostBase. --- dlls/usp10/shape.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 104757c..e0b32c9 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2096,19 +2096,21 @@ static inline INT find_halant_consonant(WCHAR* pwChars, INT index, INT end, lexi static void Apply_Indic_PostBase(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, const char* feat) { INT index, nextIndex; - INT count, g_offset; + INT count, g_offset=0; + INT ralf = syllable->ralf; count = syllable->end - syllable->base; - if (syllable->ralf >= syllable->base) - g_offset = -1; - else - g_offset = 0; index = find_halant_consonant(&pwChars[syllable->base], 0, count, lexical); while (index >= 0) { INT prevCount = *pcGlyphs; + if (ralf >=0 && ralf < index) + { + g_offset--; + ralf = -1; + } nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->base+g_offset, 1, pcGlyphs, feat); if (nextIndex > GSUB_E_NOGLYPH) {

1 0