July 2012 - Wine-commits - list.winehq.org

Józef Kucia : d3dx9: Implement volume texture filtering in D3DXFilterTexture.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: ffe36a3894356f6e23107eb7f0fd1c87d0d71f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffe36a3894356f6e23107eb7f… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Fri Jul 13 17:21:55 2012 +0200 d3dx9: Implement volume texture filtering in D3DXFilterTexture. --- dlls/d3dx9_36/tests/texture.c | 27 ++++++++++++++++++++++ dlls/d3dx9_36/texture.c | 49 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 44bf235..95e1dc5 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -751,6 +751,7 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) { IDirect3DTexture9 *tex; IDirect3DCubeTexture9 *cubetex; + IDirect3DVolumeTexture9 *voltex; HRESULT hr; hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 5, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &tex, NULL); @@ -835,6 +836,32 @@ static void test_D3DXFilterTexture(IDirect3DDevice9 *device) else skip("Failed to create texture\n"); + /* Volume texture test */ + hr = IDirect3DDevice9_CreateVolumeTexture(device, 256, 256, 4, 0, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &voltex, NULL); + if (SUCCEEDED(hr)) + { + DWORD level_count = IDirect3DVolumeTexture9_GetLevelCount(voltex); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) voltex, NULL, 0, D3DX_FILTER_NONE); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) voltex, NULL, 0, D3DX_DEFAULT); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) voltex, NULL, 0, D3DX_FILTER_BOX); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) voltex, NULL, level_count - 1, D3DX_DEFAULT); + ok(hr == D3D_OK, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXFilterTexture((IDirect3DBaseTexture9*) voltex, NULL, level_count, D3DX_DEFAULT); + ok(hr == D3DERR_INVALIDCALL, "D3DXFilterTexture returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + IDirect3DVolumeTexture9_Release(voltex); + } + else + skip("Failed to create volume texture\n"); + /* Test textures with D3DUSAGE_AUTOGENMIPMAP usage */ if (!is_autogenmipmap_supported(device, D3DRTYPE_TEXTURE)) { diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 91f97c2..ec9bad9 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -61,8 +61,8 @@ static HRESULT get_surface(D3DRESOURCETYPE type, LPDIRECT3DBASETEXTURE9 tex, } } -HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, - CONST PALETTEENTRY *palette, +HRESULT WINAPI D3DXFilterTexture(IDirect3DBaseTexture9 *texture, + const PALETTEENTRY *palette, UINT srclevel, DWORD filter) { @@ -70,7 +70,7 @@ HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, HRESULT hr; D3DRESOURCETYPE type; - TRACE("(%p, %p, %d, %d)\n", texture, palette, srclevel, filter); + TRACE("(%p, %p, %u, %#x)\n", texture, palette, srclevel, filter); if (!texture) return D3DERR_INVALIDCALL; @@ -137,9 +137,48 @@ HRESULT WINAPI D3DXFilterTexture(LPDIRECT3DBASETEXTURE9 texture, return D3D_OK; } + case D3DRTYPE_VOLUMETEXTURE: + { + D3DVOLUME_DESC desc; + int level, level_count; + IDirect3DVolume9 *top_volume, *mip_volume; + IDirect3DVolumeTexture9 *volume_texture = (IDirect3DVolumeTexture9*) texture; + + IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, srclevel, &desc); + + if (filter == D3DX_DEFAULT) + { + if (is_pow2(desc.Width) && is_pow2(desc.Height) && is_pow2(desc.Depth)) + filter = D3DX_FILTER_BOX; + else + filter = D3DX_FILTER_BOX | D3DX_FILTER_DITHER; + } + + hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, srclevel, &top_volume); + if (FAILED(hr)) + return hr; + + level_count = IDirect3DVolumeTexture9_GetLevelCount(volume_texture); + for (level = srclevel + 1; level < level_count; level++) + { + IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, level, &mip_volume); + hr = D3DXLoadVolumeFromVolume(mip_volume, palette, NULL, top_volume, palette, NULL, filter, 0); + IDirect3DVolume9_Release(top_volume); + top_volume = mip_volume; + + if (FAILED(hr)) + break; + } + + IDirect3DVolume9_Release(top_volume); + if (FAILED(hr)) + return hr; + + return D3D_OK; + } + default: - FIXME("Implement volume texture filtering\n"); - return E_NOTIMPL; + return D3DERR_INVALIDCALL; } }

1 0

Aric Stewart : ups10: Rename common opentype tables used in both GSUB and GPOS to OT_.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 61895680720cf149d3669786a0c8a645d3eb3c92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61895680720cf149d3669786a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:27 2012 -0500 ups10: Rename common opentype tables used in both GSUB and GPOS to OT_. --- dlls/usp10/opentype.c | 76 ++++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61895680720cf149d3669…

1 0

Aric Stewart : usp10: Load the GPOS table.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 9d408bbbf0d66073040ae14220c490d67b570034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d408bbbf0d66073040ae1422… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:35 2012 -0500 usp10: Load the GPOS table. --- dlls/usp10/shape.c | 51 ++++++++++++++++++++++++++---------------- dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 1 + 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b574a85..e288878 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -603,6 +603,27 @@ static VOID *load_gsub_table(HDC hdc) return GSUB_Table; } +static VOID *load_gpos_table(HDC hdc) +{ + VOID* GPOS_Table = NULL; + int length = GetFontData(hdc, MS_MAKE_TAG('G', 'P', 'O', 'S'), 0, NULL, 0); + if (length != GDI_ERROR) + { + GPOS_Table = HeapAlloc(GetProcessHeap(),0,length); + GetFontData(hdc, MS_MAKE_TAG('G', 'P', 'O', 'S'), 0, GPOS_Table, length); + TRACE("Loaded GPOS table of %i bytes\n",length); + } + return GPOS_Table; +} + +static VOID load_ot_tables(HDC hdc, ScriptCache *psc) +{ + if (!psc->GSUB_Table) + psc->GSUB_Table = load_gsub_table(hdc); + if (!psc->GPOS_Table) + psc->GPOS_Table = load_gpos_table(hdc); +} + INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) { WORD *glyphs; @@ -957,8 +978,7 @@ static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p dirL = 1; } - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); context_type = HeapAlloc(GetProcessHeap(),0,cChars); context_shape = HeapAlloc(GetProcessHeap(),0,sizeof(INT) * cChars); @@ -1179,8 +1199,7 @@ static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p dirL = 1; } - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (!psc->GSUB_Table) return; @@ -1314,8 +1333,7 @@ static void ContextualShape_Phags_pa(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS dirL = 1; } - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (!psc->GSUB_Table) return; @@ -2650,8 +2668,7 @@ static void ContextualShape_Mongolian(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS else dirL = 1; - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (!psc->GSUB_Table) return; @@ -3153,8 +3170,7 @@ void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) { - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (ShapingData[psa->eScript].contextProc) ShapingData[psa->eScript].contextProc(hdc, psc, psa, pwcChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs, pwLogClust); @@ -3168,8 +3184,7 @@ static void SHAPE_ApplyOpenTypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYS if (!rpRangeProperties) return; - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (!psc->GSUB_Table) return; @@ -3202,8 +3217,7 @@ HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANA if (!ShapingData[psa->eScript].requiredFeatures) return S_OK; - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); /* we need to have at least one of the required features */ i = 0; @@ -3225,8 +3239,7 @@ HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, HRESULT hr; OPENTYPE_TAG searching = 0x00000000; - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (psa && scriptInformation[psa->eScript].scriptTag) searching = scriptInformation[psa->eScript].scriptTag; @@ -3246,8 +3259,7 @@ HRESULT SHAPE_GetFontLanguageTags( HDC hdc, ScriptCache *psc, OPENTYPE_TAG searching = 0x00000000; BOOL fellback = FALSE; - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (psa && psc->userLang != 0) searching = psc->userLang; @@ -3274,8 +3286,7 @@ HRESULT SHAPE_GetFontFeatureTags( HDC hdc, ScriptCache *psc, HRESULT hr; BOOL filter = FALSE; - if (!psc->GSUB_Table) - psc->GSUB_Table = load_gsub_table(hdc); + load_ot_tables(hdc, psc); if (psa && scriptInformation[psa->eScript].scriptTag) { diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8942a42..0e97405 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -984,6 +984,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->GSUB_Table); heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); + heap_free(((ScriptCache *)*psc)->GPOS_Table); for (i = 0; i < ((ScriptCache *)*psc)->script_count; i++) { int j; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 013e383..9644159 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -164,6 +164,7 @@ typedef struct { LPVOID GDEF_Table; LPVOID CMAP_Table; LPVOID CMAP_format12_Table; + LPVOID GPOS_Table; INT script_count; LoadedScript *scripts;

1 0

Aric Stewart : usp10: Change OpenType_GSUB_GetFontScriptTags to OpenType_GetFontScriptTags and load scripts from GPOS table as well .
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: e031293521a9673542983f53e66e13d2efcf52f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e031293521a9673542983f53e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:39 2012 -0500 usp10: Change OpenType_GSUB_GetFontScriptTags to OpenType_GetFontScriptTags and load scripts from GPOS table as well. --- dlls/usp10/opentype.c | 90 ++++++++++++++++++++++++++++++++++++++----- dlls/usp10/shape.c | 4 +- dlls/usp10/usp10_internal.h | 5 +- 3 files changed, 85 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index bf237eb..1aa77c02 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -277,6 +277,15 @@ typedef struct{ WORD Alternate[1]; } GSUB_AlternateSet; +/* These are all structures needed for the GPOS table */ + +typedef struct { + DWORD version; + WORD ScriptList; + WORD FeatureList; + WORD LookupList; +} GPOS_Header; + /********** * CMAP **********/ @@ -864,7 +873,7 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) { int i; - if (!psc->script_count) + if (psc->GSUB_Table) { const OT_ScriptList *script; const GSUB_Header* header = (const GSUB_Header*)psc->GSUB_Table; @@ -878,18 +887,81 @@ static void GSUB_initialize_script_cache(ScriptCache *psc) { int offset = GET_BE_WORD(script->ScriptRecord[i].Script); psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - psc->scripts[i].table = ((const BYTE*)script + offset); + psc->scripts[i].gsub_table = ((const BYTE*)script + offset); } } } } -HRESULT OpenType_GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table) +static void GPOS_expand_script_cache(ScriptCache *psc) +{ + int i, count; + const OT_ScriptList *script; + const GPOS_Header* header = (const GPOS_Header*)psc->GPOS_Table; + + if (!header) + return; + + script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); + count = GET_BE_WORD(script->ScriptCount); + + if (!psc->script_count) + { + psc->script_count = count; + TRACE("initializing %i scripts in this font\n",psc->script_count); + if (psc->script_count) + { + psc->scripts = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(LoadedScript) * psc->script_count); + for (i = 0; i < psc->script_count; i++) + { + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + psc->scripts[i].gpos_table = ((const BYTE*)script + offset); + } + } + } + else + { + for (i = 0; i < count; i++) + { + int j; + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + OPENTYPE_TAG tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + for (j = 0; j < psc->script_count; j++) + { + if (psc->scripts[j].tag == tag) + { + psc->scripts[j].gpos_table = ((const BYTE*)script + offset); + break; + } + } + if (j == psc->script_count) + { + psc->script_count++; + psc->scripts = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,psc->scripts, sizeof(LoadedScript) * psc->script_count); + psc->scripts[j].tag = tag; + psc->scripts[j].gpos_table = ((const BYTE*)script + offset); + } + } + } +} + +static void _initialize_script_cache(ScriptCache *psc) +{ + if (!psc->script_count) + { + GSUB_initialize_script_cache(psc); + GPOS_expand_script_cache(psc); + } +} + +HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) { int i; HRESULT rc = S_OK; - GSUB_initialize_script_cache(psc); + _initialize_script_cache(psc); + *pcTags = psc->script_count; if (!searchingFor && cMaxTags < *pcTags) @@ -908,8 +980,6 @@ HRESULT OpenType_GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searching { pScriptTags[0] = psc->scripts[i].tag; *pcTags = 1; - if (script_table) - *script_table = psc->scripts[i].table; rc = S_OK; break; } @@ -922,10 +992,10 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int i; - if (!script->language_count) + if (!script->language_count && script->gsub_table) { DWORD offset; - const OT_Script* table = script->table; + const OT_Script* table = script->gsub_table; script->language_count = GET_BE_WORD(table->LangSysCount); offset = GET_BE_WORD(table->DefaultLangSys); if (offset) @@ -956,7 +1026,7 @@ HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_ HRESULT rc = S_OK; LoadedScript *script = NULL; - GSUB_initialize_script_cache(psc); + _initialize_script_cache(psc); for (i = 0; i < psc->script_count; i++) { @@ -1061,7 +1131,7 @@ HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_t LoadedScript *script = NULL; LoadedLanguage *language = NULL; - GSUB_initialize_script_cache(psc); + _initialize_script_cache(psc); for (i = 0; i < psc->script_count; i++) { diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e288878..b7d2822 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -807,7 +807,7 @@ static inline BOOL get_GSUB_Indic2(SCRIPT_ANALYSIS *psa, ScriptCache *psc) HRESULT hr; int count = 0; - hr = OpenType_GSUB_GetFontScriptTags(psc, ShapingData[psa->eScript].newOtTag, 1, &tag, &count, NULL); + hr = OpenType_GetFontScriptTags(psc, ShapingData[psa->eScript].newOtTag, 1, &tag, &count); return(SUCCEEDED(hr)); } @@ -3244,7 +3244,7 @@ HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, if (psa && scriptInformation[psa->eScript].scriptTag) searching = scriptInformation[psa->eScript].scriptTag; - hr = OpenType_GSUB_GetFontScriptTags(psc, searching, cMaxTags, pScriptTags, pcTags, NULL); + hr = OpenType_GetFontScriptTags(psc, searching, cMaxTags, pScriptTags, pcTags); if (FAILED(hr)) *pcTags = 0; return hr; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9644159..3cb48d8 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -144,7 +144,8 @@ typedef struct { typedef struct { OPENTYPE_TAG tag; - LPCVOID table; + LPCVOID gsub_table; + LPCVOID gpos_table; LoadedLanguage default_language; INT language_count; LoadedLanguage *languages; @@ -234,6 +235,6 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) DECLSPEC_HIDDEN; -HRESULT OpenType_GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table) DECLSPEC_HIDDEN; +HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table) DECLSPEC_HIDDEN; HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : msxml3: Implement put/ get for DTD handler callback interface.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 2bff764df07e7c9830299f0e0b1d14f4d334f8bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bff764df07e7c9830299f0e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 14 23:05:34 2012 +0400 msxml3: Implement put/get for DTD handler callback interface. --- dlls/msxml3/saxreader.c | 61 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 49 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 485644a..1125d1c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -177,6 +177,8 @@ typedef struct IVBSAXLexicalHandler *vblexicalHandler; ISAXDeclHandler *declHandler; IVBSAXDeclHandler *vbdeclHandler; + ISAXDTDHandler *dtdHandler; + IVBSAXDTDHandler *vbdtdHandler; xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; @@ -2358,22 +2360,49 @@ static HRESULT internal_putContentHandler( return S_OK; } -static HRESULT internal_getDTDHandler( - saxreader* This, - void *pDTDHandler, - BOOL vbInterface) +static HRESULT internal_getDTDHandler(saxreader* This, void *dtdHandler, BOOL vbInterface) { - FIXME("(%p)->(%p) stub\n", This, pDTDHandler); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, dtdHandler); + + if (!dtdHandler) return E_POINTER; + + if ((vbInterface && This->vbdtdHandler) || (!vbInterface && This->dtdHandler)) + { + if (vbInterface) + IVBSAXContentHandler_AddRef(This->vbdtdHandler); + else + ISAXContentHandler_AddRef(This->dtdHandler); + } + if (vbInterface) *(IVBSAXDTDHandler**)dtdHandler = This->vbdtdHandler; + else *(ISAXDTDHandler**)dtdHandler = This->dtdHandler; + + return S_OK; } -static HRESULT internal_putDTDHandler( - saxreader* This, - void *pDTDHandler, - BOOL vbInterface) +static HRESULT internal_putDTDHandler(saxreader* This, void *dtdHandler, BOOL vbInterface) { - FIXME("(%p)->(%p) stub\n", This, pDTDHandler); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, dtdHandler); + + if (dtdHandler) + { + if (vbInterface) + IVBSAXDTDHandler_AddRef((IVBSAXDTDHandler*)dtdHandler); + else + ISAXDTDHandler_AddRef((ISAXDTDHandler*)dtdHandler); + } + if ((vbInterface && This->vbdtdHandler) || (!vbInterface && This->dtdHandler)) + { + if (vbInterface) + IVBSAXDTDHandler_Release(This->vbdtdHandler); + else + ISAXDTDHandler_Release(This->dtdHandler); + } + if (vbInterface) + This->vbdtdHandler = dtdHandler; + else + This->dtdHandler = dtdHandler; + + return S_OK; } static HRESULT internal_getErrorHandler( @@ -2809,6 +2838,12 @@ static ULONG WINAPI saxxmlreader_Release( if(This->vbdeclHandler) IVBSAXDeclHandler_Release(This->vbdeclHandler); + if(This->dtdHandler) + ISAXDTDHandler_Release(This->dtdHandler); + + if(This->vbdtdHandler) + IVBSAXDTDHandler_Release(This->vbdtdHandler); + free_bstr_pool(&This->pool); release_dispex(&This->dispex); @@ -3306,6 +3341,8 @@ HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *outer, LPVOID *ppOb reader->vblexicalHandler = NULL; reader->declHandler = NULL; reader->vbdeclHandler = NULL; + reader->dtdHandler = NULL; + reader->vbdtdHandler = NULL; reader->isParsing = FALSE; reader->pool.pool = NULL; reader->pool.index = 0;

1 0

Nikolay Sivov : msxml3: Implement a common way to store and get callback interface pointers.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 33a1f892b80df9ee4fddaa9a094aa2aba9c40dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a1f892b80df9ee4fddaa9a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 15 00:36:54 2012 +0400 msxml3: Implement a common way to store and get callback interface pointers. --- dlls/msxml3/saxreader.c | 533 +++++++++++++++------------------------- dlls/msxml3/tests/saxreader.c | 12 + 2 files changed, 212 insertions(+), 333 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33a1f892b80df9ee4fdda…

1 0

Dmitry Timoshkov : windowscodecs: Avoid casting IWICFormatConverter to IWICBitmapSource.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: a9d0f8976ca0d057f0f76adc578e7b9512413c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d0f8976ca0d057f0f76adc5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 16 14:53:44 2012 +0900 windowscodecs: Avoid casting IWICFormatConverter to IWICBitmapSource. --- dlls/windowscodecs/info.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index f1eaf4c..9531198 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -2181,8 +2181,9 @@ HRESULT WINAPI WICConvertBitmapSource(REFWICPixelFormatGUID dstFormat, IWICBitma if (converter) { - *ppIDst = (IWICBitmapSource*)converter; - return S_OK; + res = IWICFormatConverter_QueryInterface(converter, &IID_IWICBitmapSource, (void **)ppIDst); + IWICFormatConverter_Release(converter); + return res; } else {

1 0

Dmitry Timoshkov : windowscodecs: Use predefined WICBitmapPaletteTypeFixedBW palette instead of a hand-made one .
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: a0f9a251f94ef21b5af63d01f9120f30a71e8c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f9a251f94ef21b5af63d01f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jul 16 14:54:32 2012 +0900 windowscodecs: Use predefined WICBitmapPaletteTypeFixedBW palette instead of a hand-made one. --- dlls/windowscodecs/converter.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 98e727e..6ee3a16 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -103,24 +103,19 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - if (source_format == format_1bppIndexed) - { - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + if (source_format == format_1bppIndexed) res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); + else + res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedBW, FALSE); - IWICPalette_Release(palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 2, colors, &actualcolors); - if (FAILED(res)) return res; - } - else - { - colors[0] = 0xff000000; - colors[1] = 0xffffffff; - } + IWICPalette_Release(palette); + if (FAILED(res)) return res; srcstride = (prc->Width+7)/8; srcdatasize = srcstride * prc->Height;

1 0

Alexandre Julliard : opengl32: Mark invalid handles with ffff instead of 0.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: 8b97ff3278d98e1b9db55a028cc902f5b690c02a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b97ff3278d98e1b9db55a028… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 16 14:50:01 2012 +0200 opengl32: Mark invalid handles with ffff instead of 0. --- dlls/opengl32/wgl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 815dc42..4545cfa 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -164,7 +164,7 @@ static HGLRC alloc_handle( struct wgl_context *context, const struct wgl_funcs * static void free_handle_ptr( struct wgl_handle *ptr ) { - ptr->handle &= ~0xffff; + ptr->handle |= 0xffff; ptr->context = (struct wgl_context *)next_free; ptr->funcs = NULL; next_free = ptr;

1 0

Nozomi Kodama : d3dx9_36: Implementation of D3DXSHEvalDirection.
by Alexandre Julliard 16 Jul '12

16 Jul '12

Module: wine Branch: master Commit: c957f8a921154c293f1dda53595f45a396477d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c957f8a921154c293f1dda535… Author: Nozomi Kodama <Nozomi.Kodama(a)yahoo.com> Date: Sun Jul 15 10:18:50 2012 +0200 d3dx9_36: Implementation of D3DXSHEvalDirection. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 60 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 37 ++++++++++++++++++++++++++ include/d3dx9math.h | 1 + 4 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9230d55..b59c8a9 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -275,7 +275,7 @@ @ stdcall D3DXSHAdd(ptr long ptr ptr) @ stdcall D3DXSHDot(long ptr ptr) @ stub D3DXSHEvalConeLight(long ptr long long long long ptr ptr ptr) -@ stub D3DXSHEvalDirection(ptr long ptr) +@ stdcall D3DXSHEvalDirection(ptr long ptr) @ stub D3DXSHEvalDirectionalLight(long ptr long long long long ptr ptr ptr) @ stub D3DXSHEvalHemisphereLight(long ptr long long ptr ptr ptr) @ stub D3DXSHEvalSphericalLight(long ptr long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 79a0bca..89a19af 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1995,6 +1995,66 @@ FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b) return s; } +FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, CONST D3DXVECTOR3 *dir) +{ + + TRACE("(%p, %u, %p)\n", out, order, dir); + + if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) ) + return out; + + out[0] = 0.5f / sqrt(D3DX_PI); + out[1] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->y; + out[2] = 0.5f / sqrt(D3DX_PI / 3.0f) * dir->z; + out[3] = -0.5f / sqrt(D3DX_PI / 3.0f) * dir->x; + if ( order == 2 ) + return out; + + out[4] = 0.5f / sqrt(D3DX_PI / 15.0f) * dir->x * dir->y; + out[5] = -0.5f / sqrt(D3DX_PI / 15.0f) * dir->y * dir->z; + out[6] = 0.25f / sqrt(D3DX_PI / 5.0f) * ( 3.0f * dir->z * dir->z - 1.0f ); + out[7] = -0.5f / sqrt(D3DX_PI / 15.0f) * dir->x * dir->z; + out[8] = 0.25f / sqrt(D3DX_PI / 15.0f) * ( dir->x * dir->x - dir->y * dir->y ); + if ( order == 3 ) + return out; + + out[9] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->y * (3.0f * dir->x * dir->x - dir->y * dir->y ); + out[10] = sqrt(105.0f / D3DX_PI) / 2.0f * dir->x * dir->y * dir->z; + out[11] = -sqrt(42.0 / D3DX_PI) / 8.0f * dir->y * ( -1.0f + 5.0f * dir->z * dir->z ); + out[12] = sqrt(7.0f / D3DX_PI) / 4.0f * dir->z * ( 5.0f * dir->z * dir->z - 3.0f ); + out[13] = sqrt(42.0 / D3DX_PI) / 8.0f * dir->x * ( 1.0f - 5.0f * dir->z * dir->z ); + out[14] = sqrt(105.0f / D3DX_PI) / 4.0f * dir->z * ( dir->x * dir->x - dir->y * dir->y ); + out[15] = -sqrt(70.0f / D3DX_PI) / 8.0f * dir->x * ( dir->x * dir->x - 3.0f * dir->y * dir->y ); + if ( order == 4 ) + return out; + + out[16] = 0.75f * sqrt(35.0f / D3DX_PI) * dir->x * dir->y * (dir->x * dir->x - dir->y * dir->y ); + out[17] = 3.0f * dir->z * out[9]; + out[18] = 0.75f * sqrt(5.0f / D3DX_PI) * dir->x * dir->y * ( 7.0f * dir->z * dir->z - 1.0f ); + out[19] = 0.375f * sqrt(10.0f / D3DX_PI) * dir->y * dir->z * ( 3.0f - 7.0f * dir->z * dir->z ); + out[20] = 3.0f / ( 16.0f * sqrt(D3DX_PI) ) * ( 35.0f * dir->z * dir->z * dir->z * dir->z - 30.f * dir->z * dir->z + 3.0f ); + out[21] = 0.375f * sqrt(10.0f / D3DX_PI) * dir->x * dir->z * ( 3.0f - 7.0f * dir->z * dir->z ); + out[22] = 0.375f * sqrt(5.0f / D3DX_PI) * ( dir->x * dir->x - dir->y * dir->y ) * ( 7.0f * dir->z * dir->z - 1.0f); + out[23] = 3.0 * dir->z * out[15]; + out[24] = 3.0f / 16.0f * sqrt(35.0f / D3DX_PI) * ( dir->x * dir->x * dir->x * dir->x- 6.0f * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); + if ( order == 5 ) + return out; + + out[25] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->y * ( 5.0f * dir->x * dir->x * dir->x * dir->x - 10.0f * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); + out[26] = 0.75f * sqrt(385.0f / D3DX_PI) * dir->x * dir->y * dir->z * ( dir->x * dir->x - dir->y * dir->y ); + out[27] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->y * ( 3.0f * dir->x * dir->x - dir->y * dir->y ) * ( 1.0f - 9.0f * dir->z * dir->z ); + out[28] = sqrt(1155.0f / D3DX_PI) / 4.0f * dir->x * dir->y * dir->z * ( 3.0f * dir->z * dir->z - 1.0f); + out[29] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->y * ( 14.0f * dir->z * dir->z - 21.0f * dir->z * dir->z * dir->z * dir->z - 1.0f ); + out[30] = sqrt(11.0f / D3DX_PI) / 16.0f * dir->z * ( 63.0f * dir->z * dir->z * dir->z * dir->z - 70.0f * dir->z * dir->z + 15.0f ); + out[31] = sqrt(165.0f / D3DX_PI) / 16.0f * dir->x * ( 14.0f * dir->z * dir->z - 21.0f * dir->z * dir->z * dir->z * dir->z - 1.0f ); + out[32] = sqrt(1155.0f / D3DX_PI) / 8.0f * dir->z * ( dir->x * dir->x - dir->y * dir->y ) * ( 3.0f * dir->z * dir->z - 1.0f ); + out[33] = sqrt(770.0f / D3DX_PI) / 32.0f * dir->x * ( dir->x * dir->x - 3.0f * dir->y * dir->y ) * ( 1.0f - 9.0f * dir->z * dir->z ); + out[34] = 3.0f / 16.0f * sqrt(385.0f / D3DX_PI) * dir->z * ( dir->x * dir->x * dir->x * dir->x - 6.0 * dir->x * dir->x * dir->y * dir->y + dir->y * dir->y * dir->y * dir->y ); + out[35] = -3.0f/ 32.0f * sqrt(154.0f / D3DX_PI) * dir->x * ( dir->x * dir->x * dir->x * dir->x - 10.0f * dir->x * dir->x * dir->y * dir->y + 5.0f * dir->y * dir->y * dir->y * dir->y ); + + return out; +} + FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b) { FLOAT ta, tb; diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 66d4689..fecb413 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2422,6 +2422,42 @@ static void test_D3DXSHDot(void) return; } +static void test_D3DXSHEvalDirection(void) +{ + unsigned int i, order; + D3DXVECTOR3 d; + FLOAT a[100], expected[100], *received_ptr; + CONST FLOAT table[36] = + { 0.282095f, -0.977205f, 1.465808f, -0.488603f, 2.185097f, -6.555291f, + 8.200181f, -3.277646f, -1.638823f, 1.180087f, 17.343668f, -40.220032f, + 47.020218f, -20.110016f, -13.007751f, 6.490479f, -15.020058f, 10.620785f, + 117.325661f, -240.856750f, 271.657288f, -120.428375f, -87.994247f, 58.414314f, + -4.380850f, 24.942520f, -149.447693f, 78.278130f, 747.791748f, -1427.687866f, + 1574.619141, -713.843933f, -560.843811f, 430.529724, -43.588909, -26.911665, }; + + d.x = 1.0; d.y = 2.0f; d.z = 3.0f; + + for(order = 0; order < 10; order++) + { + for(i = 0; i < 100; i++) + a[i] = 1.5f + i; + + received_ptr = D3DXSHEvalDirection(a, order, &d); + ok(received_ptr == a, "Expected %p, received %p\n", a, received_ptr); + + for(i = 0; i < 100; i++) + { + /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or the index of the element is greater than order * order - 1, D3DXSHEvalDirection does not modify the output */ + if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) || (i >= order * order) ) + expected[i] = 1.5f + i; + else + expected[i] = table[i]; + + ok(relative_error(a[i], expected[i]) < admitted_error, "order %u, index %u: expected %f, received %f\n", order, i, expected[i], a[i]); + } + } +} + static void test_D3DXSHMultiply2(void) { unsigned int i; @@ -2512,6 +2548,7 @@ START_TEST(math) test_D3DXFloat_Array(); test_D3DXSHAdd(); test_D3DXSHDot(); + test_D3DXSHEvalDirection(); test_D3DXSHMultiply2(); test_D3DXSHMultiply3(); test_D3DXSHScale(); diff --git a/include/d3dx9math.h b/include/d3dx9math.h index ab3e2b0..602c2a4 100644 --- a/include/d3dx9math.h +++ b/include/d3dx9math.h @@ -379,6 +379,7 @@ FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n); FLOAT* WINAPI D3DXSHAdd(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT *b); FLOAT WINAPI D3DXSHDot(UINT order, CONST FLOAT *a, CONST FLOAT *b); +FLOAT* WINAPI D3DXSHEvalDirection(FLOAT *out, UINT order, CONST D3DXVECTOR3 *dir); FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, CONST FLOAT *a, CONST FLOAT *b); FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, CONST FLOAT *a, CONST FLOAT scale);

1 0