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

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10ShaderReflection iface .
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: c69bb92463493ce5d9058a7f33e161d63ee523fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69bb92463493ce5d9058a7f3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:18:36 2011 +0200 d3d10: COM cleanup for the ID3D10ShaderReflection iface. --- dlls/d3d10/d3d10_main.c | 4 ++-- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/shader.c | 9 +++++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index f153ed3..9076b0a 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -276,10 +276,10 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad return E_OUTOFMEMORY; } - object->vtbl = &d3d10_shader_reflection_vtbl; + object->ID3D10ShaderReflection_iface.lpVtbl = &d3d10_shader_reflection_vtbl; object->refcount = 1; - *reflector = (ID3D10ShaderReflection *)object; + *reflector = &object->ID3D10ShaderReflection_iface; TRACE("Created ID3D10ShaderReflection %p\n", object); diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1df4611..df525ca 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -217,7 +217,7 @@ struct d3d10_effect extern const struct ID3D10ShaderReflectionVtbl d3d10_shader_reflection_vtbl DECLSPEC_HIDDEN; struct d3d10_shader_reflection { - const struct ID3D10ShaderReflectionVtbl *vtbl; + ID3D10ShaderReflection ID3D10ShaderReflection_iface; LONG refcount; }; diff --git a/dlls/d3d10/shader.c b/dlls/d3d10/shader.c index 29d7897..499da12 100644 --- a/dlls/d3d10/shader.c +++ b/dlls/d3d10/shader.c @@ -27,6 +27,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); /* IUnknown methods */ +static inline struct d3d10_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_shader_reflection, ID3D10ShaderReflection_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_QueryInterface(ID3D10ShaderReflection *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -47,7 +52,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_QueryInterface(ID3D10Sh static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflection *iface) { - struct d3d10_shader_reflection *This = (struct d3d10_shader_reflection *)iface; + struct d3d10_shader_reflection *This = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -57,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_AddRef(ID3D10ShaderReflec static ULONG STDMETHODCALLTYPE d3d10_shader_reflection_Release(ID3D10ShaderReflection *iface) { - struct d3d10_shader_reflection *This = (struct d3d10_shader_reflection *)iface; + struct d3d10_shader_reflection *This = impl_from_ID3D10ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount);

1 0

Aric Stewart : usp10/tests: Add Telugu shaping test.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: e3f92669ed701bab5b405ef329bc1c3d2e22426f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f92669ed701bab5b405ef32… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:51 2011 -0500 usp10/tests: Add Telugu shaping test. --- dlls/usp10/tests/usp10.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 497932c..cc4c1bf 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -813,6 +813,17 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + /* Telugu */ + static const WCHAR test_telugu[] = {0x0c24, 0x0c46, 0x0c32, 0x0c41, 0x0c17, 0x0c41}; + static const shapeTest_char telugu_c[] = {{0,{0,0}},{0,{0,0}},{2,{0,0}},{2,{0,0}},{4,{0,0}},{4,{0,0}}}; + static const shapeTest_glyph telugu_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -957,6 +968,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Gautami", 21, test_telugu[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_telugu, 6, &Control, &State, 0, 6, telugu_c, telugu_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in tab tests.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 16945559420182a53d6405e61bc3949d15cdb914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16945559420182a53d6405e61… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Thu Jun 2 17:31:30 2011 +0200 comctl32/tests: Removed sign comparison warning in tab tests. --- dlls/comctl32/tests/tab.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 7f5bbb7..c82f128 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -1254,7 +1254,7 @@ static void test_removeimage(void) static void test_delete_selection(void) { HWND hTab; - DWORD ret; + INT ret; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, 4); ok(hTab != NULL, "Failed to create tab control\n"); @@ -1312,8 +1312,8 @@ static void test_TCM_SETITEMEXTRA(void) static void test_TCS_OWNERDRAWFIXED(void) { - LPARAM lparam, lparam2; - ULONG_PTR itemdata; + LPARAM lparam; + ULONG_PTR itemdata, itemdata2; TCITEMA item; HWND hTab; BOOL ret; @@ -1338,7 +1338,7 @@ static void test_TCS_OWNERDRAWFIXED(void) itemdata = 0; memset(&itemdata, 0xde, 4); - ok(g_drawitem.itemData == itemdata, "got %lx, expected %lx\n", g_drawitem.itemData, itemdata); + ok(g_drawitem.itemData == itemdata, "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); @@ -1368,7 +1368,8 @@ static void test_TCS_OWNERDRAWFIXED(void) ShowWindow(hTab, SW_SHOW); RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW); - ok(*(ULONG_PTR*)g_drawitem.itemData == lparam, "got %lx, expected %lx\n", g_drawitem.itemData, lparam); + memset(&itemdata, 0xde, sizeof(ULONG_PTR)); + ok(*(ULONG_PTR*)g_drawitem.itemData == itemdata, "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); @@ -1397,11 +1398,11 @@ static void test_TCS_OWNERDRAWFIXED(void) ShowWindow(hTab, SW_SHOW); RedrawWindow(hTab, NULL, 0, RDW_UPDATENOW); - lparam = 0; - memset(&lparam, 0xde, 4); - memset(&lparam2, 0xde, sizeof(LPARAM)-1); - ok(g_drawitem.itemData == lparam || broken(g_drawitem.itemData == lparam2) /* win98 */, - "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, lparam); + itemdata = itemdata2 = 0; + memset(&itemdata, 0xde, 4); + memset(&itemdata2, 0xde, sizeof(LPARAM)-1); + ok(g_drawitem.itemData == itemdata || broken(g_drawitem.itemData == itemdata2) /* win98 */, + "got 0x%lx, expected 0x%lx\n", g_drawitem.itemData, itemdata); DestroyWindow(hTab); }

1 0

Austin English : imm32: Add a stub for ImmEnumInputContext.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 8f85b054290e805e5830c8f9c838d543392c7366 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f85b054290e805e5830c8f9c… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 2 16:53:13 2011 -0500 imm32: Add a stub for ImmEnumInputContext. --- dlls/imm32/imm.c | 10 ++++++++++ dlls/imm32/imm32.spec | 2 +- include/imm.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3122115..cc68305 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2821,3 +2821,13 @@ BOOL WINAPI ImmDisableTextFrameService(DWORD idThread) FIXME("Stub\n"); return FALSE; } + +/*********************************************************************** + * ImmEnumInputContext(IMM32.@) + */ + +BOOL WINAPI ImmEnumInputContext(DWORD idThread, IMCENUMPROC lpfn, LPARAM lParam) +{ + FIXME("Stub\n"); + return FALSE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 0d05362..03f64a5 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -12,7 +12,7 @@ @ stdcall ImmDisableIME(long) @ stdcall ImmDisableIme(long) ImmDisableIME @ stdcall ImmDisableTextFrameService(long) -@ stub ImmEnumInputContext +@ stdcall ImmEnumInputContext(long ptr long) @ stdcall ImmEnumRegisterWordA(long ptr str long str ptr) @ stdcall ImmEnumRegisterWordW(long ptr wstr long wstr ptr) @ stdcall ImmEscapeA(long long long ptr) diff --git a/include/imm.h b/include/imm.h index 57658de..eff9887 100644 --- a/include/imm.h +++ b/include/imm.h @@ -127,6 +127,8 @@ typedef struct _tagCOMPOSITIONFORM RECT rcArea; } COMPOSITIONFORM, *LPCOMPOSITIONFORM; +typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); + /* wParam for WM_IME_CONTROL */ #define IMC_GETCANDIDATEPOS 0x0007 #define IMC_SETCANDIDATEPOS 0x0008 @@ -482,6 +484,7 @@ BOOL WINAPI ImmConfigureIMEW(HKL, HWND, DWORD, LPVOID); HIMC WINAPI ImmCreateContext(void); BOOL WINAPI ImmDestroyContext(HIMC hIMC); BOOL WINAPI ImmDisableIME(DWORD idThread); +BOOL WINAPI ImmEnumInputContext(DWORD, IMCENUMPROC, LPARAM); UINT WINAPI ImmEnumRegisterWordA(HKL, REGISTERWORDENUMPROCA, LPCSTR, DWORD, LPCSTR, LPVOID); UINT WINAPI ImmEnumRegisterWordW(HKL, REGISTERWORDENUMPROCW, LPCWSTR, DWORD, LPCWSTR, LPVOID); #define ImmEnumRegisterWord WINELIB_NAME_AW(ImmEnumRegisterWord)

1 0

Michael Stefaniuc : d3d10: COM cleanup for the ID3D10Effect iface.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 9635f8b6efc45b051079434a9e91974bdf7dffa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9635f8b6efc45b051079434a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 3 11:15:47 2011 +0200 d3d10: COM cleanup for the ID3D10Effect iface. --- dlls/d3d10/d3d10_main.c | 6 +++--- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 27 ++++++++++++++++----------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 2c07bb3..f153ed3 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -222,7 +222,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl return E_OUTOFMEMORY; } - object->vtbl = &d3d10_effect_vtbl; + object->ID3D10Effect_iface.lpVtbl = &d3d10_effect_vtbl; object->refcount = 1; ID3D10Device_AddRef(device); object->device = device; @@ -231,11 +231,11 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl if (FAILED(hr)) { ERR("Failed to parse effect\n"); - IUnknown_Release((IUnknown *)object); + IUnknown_Release(&object->ID3D10Effect_iface); return hr; } - *effect = (ID3D10Effect *)object; + *effect = &object->ID3D10Effect_iface; TRACE("Created ID3D10Effect %p\n", object); diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 7758dbe..1df4611 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -180,7 +180,7 @@ struct d3d10_effect_anonymous_shader extern const struct ID3D10EffectVtbl d3d10_effect_vtbl DECLSPEC_HIDDEN; struct d3d10_effect { - const struct ID3D10EffectVtbl *vtbl; + ID3D10Effect ID3D10Effect_iface; LONG refcount; ID3D10Device *device; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a258a99..542489c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -897,7 +897,7 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr enum d3d10_effect_object_operation operation; HRESULT hr; struct d3d10_effect *effect = o->pass->technique->effect; - ID3D10Effect *e = (ID3D10Effect *)effect; + ID3D10Effect *e = &effect->ID3D10Effect_iface; read_dword(ptr, &o->type); TRACE("Effect object is of type %#x.\n", o->type); @@ -1885,6 +1885,11 @@ static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_variable *l) /* IUnknown methods */ +static inline struct d3d10_effect *impl_from_ID3D10Effect(ID3D10Effect *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect, ID3D10Effect_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -1905,7 +1910,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -1915,7 +1920,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_AddRef(ID3D10Effect *iface) static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -1990,7 +1995,7 @@ static BOOL STDMETHODCALLTYPE d3d10_effect_IsPool(ID3D10Effect *iface) static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDevice(ID3D10Effect *iface, ID3D10Device **device) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); TRACE("iface %p, device %p\n", iface, device); @@ -2010,7 +2015,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_GetDesc(ID3D10Effect *iface, D3D10 static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByIndex(ID3D10Effect *iface, UINT index) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); struct d3d10_effect_variable *l; TRACE("iface %p, index %u\n", iface, index); @@ -2031,7 +2036,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface, LPCSTR name) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2054,7 +2059,7 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByIndex(ID3D10Effect *iface, UINT index) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, index %u\n", iface, index); @@ -2088,7 +2093,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); @@ -2135,7 +2140,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableBySemantic(ID3D10Effect *iface, LPCSTR semantic) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, semantic %s\n", iface, debugstr_a(semantic)); @@ -2182,7 +2187,7 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByIndex(ID3D10Effect *iface, UINT index) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); struct d3d10_effect_technique *t; TRACE("iface %p, index %u\n", iface, index); @@ -2203,7 +2208,7 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface, LPCSTR name) { - struct d3d10_effect *This = (struct d3d10_effect *)iface; + struct d3d10_effect *This = impl_from_ID3D10Effect(iface); unsigned int i; TRACE("iface %p, name %s.\n", iface, debugstr_a(name));

1 0

Aric Stewart : usp10/tests: Add Oriya shaping test.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: ee45ab66baac1d9b8af5d78e7b1ef9ce4a1d229d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee45ab66baac1d9b8af5d78e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:39 2011 -0500 usp10/tests: Add Oriya shaping test. --- dlls/usp10/tests/usp10.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7d12ce9..322710c 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -795,6 +795,15 @@ static void test_ScriptShapeOpenType(HDC hdc) {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}} }; + /* Oriya */ + static const WCHAR test_oriya[] = {0x0b13, 0x0b21, 0x0b3c, 0x0b3f, 0x0b06}; + static const shapeTest_char oriya_c[] = {{0,{0,0}},{1,{0,0}},{1,{0,0}},{1,{0,0}},{3,{0,0}}}; + static const shapeTest_glyph oriya_g[] = { + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,0,0,0,0,0},0}}, + {1,{{SCRIPT_JUSTIFY_NONE,1,0,0,0,0},0}} }; + if (!pScriptItemizeOpenType || !pScriptShapeOpenType) { win_skip("ScriptShapeOpenType not available on this platform\n"); @@ -923,6 +932,14 @@ static void test_ScriptShapeOpenType(HDC hdc) SelectObject(hdc, hfont_orig); DeleteObject(hfont); } + + test_valid = find_font_for_range(hdc, "Kalinga", 19, test_oriya[0], &hfont, &hfont_orig); + if (hfont != NULL) + { + test_shape_ok_valid(test_valid, hdc, test_oriya, 5, &Control, &State, 0, 4, oriya_c, oriya_g); + SelectObject(hdc, hfont_orig); + DeleteObject(hfont); + } } static void test_ScriptShape(HDC hdc)

1 0

Aric Stewart : usp10: Add Tamil script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: c5747304f0411985c7dd2249f7b77bf8559e8358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5747304f0411985c7dd2249f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:49 2011 -0500 usp10: Add Tamil script. --- dlls/usp10/shape.c | 100 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 9 ++++ dlls/usp10/usp10.c | 11 ++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 121 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5747304f0411985c7dd2…

1 0

Aric Stewart : usp10: Add Telugu script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: af02c0e29c0b2af9ea2468c106492ba34bccb495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af02c0e29c0b2af9ea2468c10… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:56:55 2011 -0500 usp10: Add Telugu script. --- dlls/usp10/shape.c | 105 ++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/tests/usp10.c | 11 +++++ dlls/usp10/usp10.c | 11 ++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 127 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af02c0e29c0b2af9ea246…

1 0

Aric Stewart : usp10: Add Kannada script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 20f5613e61ce600cbce7871c63ca66aa393f47aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f5613e61ce600cbce7871c6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:04 2011 -0500 usp10: Add Kannada script. --- dlls/usp10/shape.c | 98 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 9 ++++ dlls/usp10/usp10.c | 11 ++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 119 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20f5613e61ce600cbce78…

1 0

Aric Stewart : ups10: Add Malayalam script.
by Alexandre Julliard June 3, 2011

June 3, 2011

Module: wine Branch: master Commit: 8d83e5d370bb9689bf51a8fb193f14f023d6bf42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d83e5d370bb9689bf51a8fb1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Jun 2 14:57:09 2011 -0500 ups10: Add Malayalam script. --- dlls/usp10/shape.c | 75 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 10 ++++++ dlls/usp10/usp10.c | 11 ++++++- dlls/usp10/usp10_internal.h | 2 + 4 files changed, 97 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d83e5d370bb9689bf51a…

1 0