December 2011 - Wine-Commits

Francois Gouget : secur32: Fix the compilation on Solaris by including errno.h instead of sys/errno.h .
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: 3d9c7657bc5c943ee3fd6943d3d671a57b3fb9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9c7657bc5c943ee3fd6943d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:29:16 2011 +0100 secur32: Fix the compilation on Solaris by including errno.h instead of sys/errno.h. --- dlls/secur32/dispatcher.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/dispatcher.c b/dlls/secur32/dispatcher.c index 88e81ba..33b0512 100644 --- a/dlls/secur32/dispatcher.c +++ b/dlls/secur32/dispatcher.c @@ -29,9 +29,7 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif +#include <errno.h> #include <stdlib.h> #include <fcntl.h> #include "windef.h"

1 0

Francois Gouget : winspool: Fix the compilation on Solaris by including errno.h instead of sys/errno.h .
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: 915ddc4026f318e5665670d4b76930edfad22ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915ddc4026f318e5665670d4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:29:23 2011 +0100 winspool: Fix the compilation on Solaris by including errno.h instead of sys/errno.h. --- dlls/winspool.drv/info.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 68ab5d7..9bb8915 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -33,9 +33,7 @@ #include <string.h> #include <ctype.h> #include <stddef.h> -#ifdef HAVE_SYS_ERRNO_H -#include <sys/errno.h> -#endif +#include <errno.h> #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> #endif

1 0

Francois Gouget : libwine: Include a couple of extra system headers to fix the compilation on Solaris .
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: e4387430410c81cf339923b6d041a2e9b076293d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4387430410c81cf339923b6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 2 15:27:33 2011 +0100 libwine: Include a couple of extra system headers to fix the compilation on Solaris. --- libs/wine/mmap.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 1529a85..6ec814a 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -23,11 +23,15 @@ #include <assert.h> #include <ctype.h> +#include <errno.h> #include <fcntl.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <sys/types.h> +#ifdef HAVE_SYS_WAIT_H +#include <sys/wait.h> +#endif #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif

1 0

Aric Stewart : usp10: Handle Thai SARA AM differently than GDEF.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: 225de02a292e273dbfbf4a586fa7d6f580ea55ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=225de02a292e273dbfbf4a586… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 2 08:59:25 2011 -0600 usp10: Handle Thai SARA AM differently than GDEF. --- dlls/usp10/shape.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 8791bef..04f0ff4 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3131,6 +3131,8 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } } + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + for (i = 0; i < cGlyphs; i++) { int char_index[20]; @@ -3157,10 +3159,13 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; + + /* handle Thai SARA AM (U+0E33) differently than GDEF */ + if (char_count == 1 && pwcChars[char_index[0]] == 0x0e33) + pGlyphProp[i].sva.fClusterStart = 0; } HeapFree(GetProcessHeap(),0,spaces); - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */

1 0

Henri Verbeet : d3d9: Implement texture creation from system memory.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: b171d5f95d3120e58b0f3eec646e8123c4f6b404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b171d5f95d3120e58b0f3eec6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 2 08:15:50 2011 +0100 d3d9: Implement texture creation from system memory. --- dlls/d3d9/device.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2be0002..cdaac6d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -693,13 +693,23 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *ifa { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); IDirect3DTexture9Impl *object; + BOOL set_mem = FALSE; HRESULT hr; TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n", iface, width, height, levels, usage, format, pool, texture, shared_handle); if (shared_handle) - FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + { + if (pool == D3DPOOL_SYSTEMMEM) + { + if (levels != 1) + return D3DERR_INVALIDCALL; + set_mem = TRUE; + } + else + FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle); + } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -716,6 +726,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *ifa return hr; } + if (set_mem) + { + struct wined3d_resource *resource; + IDirect3DSurface9Impl *surface; + + resource = wined3d_texture_get_sub_resource(object->wined3d_texture, 0); + surface = wined3d_resource_get_parent(resource); + wined3d_surface_set_mem(surface->wined3d_surface, *shared_handle); + } + TRACE("Created texture %p.\n", object); *texture = &object->IDirect3DTexture9_iface;

1 0

Vitaliy Margolen : dinput: Fix device enumeration by DX8 device type.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: 7260132c5d8aa0aa753c12d1e7420c307e651359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260132c5d8aa0aa753c12d1e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Dec 1 21:08:14 2011 -0700 dinput: Fix device enumeration by DX8 device type. --- dlls/dinput/dinput_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index e69bbf0..6350a18 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -359,7 +359,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!lpCallback || dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - dwDevType > 4) + (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) return DIERR_INVALIDPARAM; if (!This->initialized) @@ -398,7 +398,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!lpCallback || dwFlags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN) || - dwDevType > 4) + (dwDevType > DI8DEVCLASS_GAMECTRL && dwDevType < DI8DEVTYPE_DEVICE) || dwDevType > DI8DEVTYPE_SUPPLEMENTAL) return DIERR_INVALIDPARAM; if (!This->initialized)

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: c066bdb24093c9507864cb043e5b646eafe5837f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c066bdb24093c9507864cb043… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 1 21:24:00 2011 +0100 po: Update German translation. --- po/de.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 0c1bf12..528293e 100644 --- a/po/de.po +++ b/po/de.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-01 20:05+0100\n" +"PO-Revision-Date: 2011-12-01 21:21+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -113,7 +113,6 @@ msgid "Wine Gecko Installer" msgstr "Wine-Gecko-Installation" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -128,7 +127,8 @@ msgstr "" "Wine kann das Paket für Sie herunterladen und installieren.\n" "\n" "Hinweis: Es wird empfohlen das Paket ihrer Distribution zu verwenden. " -"Weitere Hinweise finden Sie unter http://wiki.winehq.org/Gecko" +"Weitere Hinweise finden Sie unter <a href=\"http://wiki.winehq.org/Gecko\"> " +"http://wiki.winehq.org/Gecko</a>." #: appwiz.rc:106 msgid "&Install" @@ -6016,9 +6016,8 @@ msgid "&Data Rate" msgstr "&Datenrate" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "KB/sec" +msgstr "kB/Sek" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)"

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DRASTER_STATUS typedef.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: 360c1114d6bd829d786a6a8548a0a7a9725e3ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=360c1114d6bd829d786a6a854… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 2 08:15:53 2011 +0100 wined3d: Get rid of the WINED3DRASTER_STATUS typedef. --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/d3d9/swapchain.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d.h | 12 ++++++------ 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 88a5c4b..923046d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -648,7 +648,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(IDirect3DDevice8 *ifa TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_raster_status(This->wined3d_device, 0, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_device_get_raster_status(This->wined3d_device, 0, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f4686e3..684ae4d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -640,7 +640,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(IDirect3DDevice9Ex *i TRACE("iface %p, swapchain %u, raster_status %p.\n", iface, iSwapChain, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_device_get_raster_status(This->wined3d_device, iSwapChain, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_device_get_raster_status(This->wined3d_device, + iSwapChain, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index be0c244..928bb89 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -146,7 +146,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAI TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_raster_status(This->wined3d_swapchain, (WINED3DRASTER_STATUS *)pRasterStatus); + hr = wined3d_swapchain_get_raster_status(This->wined3d_swapchain, (struct wined3d_raster_status *)pRasterStatus); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 36b1208..1226390 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4572,7 +4572,7 @@ BOOL CDECL wined3d_device_get_software_vertex_processing(const struct wined3d_de } HRESULT CDECL wined3d_device_get_raster_status(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status) + UINT swapchain_idx, struct wined3d_raster_status *raster_status) { struct wined3d_swapchain *swapchain; HRESULT hr; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1ea7858..39886190 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -203,7 +203,7 @@ HRESULT CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain * } HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, - WINED3DRASTER_STATUS *raster_status) + struct wined3d_raster_status *raster_status) { static BOOL warned; /* No OpenGL equivalent */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 34abce9..1a0d170 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1696,11 +1696,11 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DRASTER_STATUS +struct wined3d_raster_status { - BOOL InVBlank; - UINT ScanLine; -} WINED3DRASTER_STATUS; + BOOL in_vblank; + UINT scan_line; +}; typedef struct _WINED3DDEVINFO_VERTEXSTATS { @@ -2177,7 +2177,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, - UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status); + UINT swapchain_idx, struct wined3d_raster_status *raster_status); HRESULT __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, WINED3DRENDERSTATETYPE state, DWORD *value); HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, @@ -2411,7 +2411,7 @@ void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swap HRESULT __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, struct wined3d_swapchain_desc *desc); HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, - WINED3DRASTER_STATUS *raster_status); + struct wined3d_raster_status *raster_status); ULONG __cdecl wined3d_swapchain_incref(struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_present(struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override,

1 0

Aric Stewart : usp10: Phags-Pa wants the calt feature enabled.
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: ceca716999dc6dd90d5fb816221d68f416ce18aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceca716999dc6dd90d5fb8162… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 2 07:22:13 2011 -0600 usp10: Phags-Pa wants the calt feature enabled. --- dlls/usp10/shape.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 36fa404..7772573 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -408,6 +408,13 @@ static OPENTYPE_FEATURE_RECORD tibetan_features[] = { MS_MAKE_TAG('b','l','w','s'), 1}, }; +static OPENTYPE_FEATURE_RECORD phags_features[] = +{ + { MS_MAKE_TAG('a','b','v','s'), 1}, + { MS_MAKE_TAG('b','l','w','s'), 1}, + { MS_MAKE_TAG('c','a','l','t'), 1}, +}; + static OPENTYPE_FEATURE_RECORD thai_features[] = { { MS_MAKE_TAG('c','c','m','p'), 1}, @@ -563,7 +570,7 @@ static const ScriptShapeData ShapingData[] = {{ 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}, + {{ phags_features, 3}, NULL, "phag", "", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai},

1 0

Aric Stewart : usp10: More properly handle the glyph properties on glyphs added by multiple substitutions .
by Alexandre Julliard Dec. 2, 2011

Dec. 2, 2011

Module: wine Branch: master Commit: 183fdedb905acf175357087091ee309f10acbcb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=183fdedb905acf17535708709… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 2 07:22:33 2011 -0600 usp10: More properly handle the glyph properties on glyphs added by multiple substitutions. --- dlls/usp10/shape.c | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7772573..8791bef 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1269,7 +1269,7 @@ static VOID *load_gdef_table(HDC hdc) return GDEF_Table; } -static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) +static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) { int i; @@ -1279,6 +1279,12 @@ static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyph for (i = 0; i < cGlyphs; i++) { WORD class; + int char_count = 0; + int k; + + for (k = 0; k < cChars; k++) + if (pwLogClust[k] == i) + char_count++; class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); @@ -1311,6 +1317,9 @@ static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyph pGlyphProp[i].sva.fDiacritic = 0; pGlyphProp[i].sva.fZeroWidth = 0; } + + if (char_count == 0) + pGlyphProp[i].sva.fClusterStart = 0; } } @@ -2964,10 +2973,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS } 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 */ { @@ -2978,7 +2984,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -3036,10 +3042,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI isFinal = (i == finaGlyph || (i+dirL > 0 && i+dirL < cGlyphs && spaces[i+dirL])); if (char_count == 0) - { - FIXME("No chars in this glyph? Must be an error\n"); continue; - } if (char_count == 1) { @@ -3092,7 +3095,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); HeapFree(GetProcessHeap(),0,spaces); } @@ -3143,10 +3146,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } 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 */ { @@ -3160,7 +3160,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } HeapFree(GetProcessHeap(),0,spaces); - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */ @@ -3190,10 +3190,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* } 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 */ { @@ -3203,7 +3200,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -3226,10 +3223,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS } 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 */ { @@ -3239,7 +3233,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */

1 0