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

Henri Verbeet : d3d9: Implement IDirect3DVolume9 private data handling on top of wined3d_resource .
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 52fd36b68b3f115d2e5fe3040b6abc51bad862e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52fd36b68b3f115d2e5fe3040… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 00:02:33 2011 +0200 d3d9: Implement IDirect3DVolume9 private data handling on top of wined3d_resource. --- dlls/d3d9/volume.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index ba495b6..5e430b9 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -126,13 +126,15 @@ static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(IDirect3DVolume9 *ifac const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(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); wined3d_mutex_lock(); - hr = wined3d_volume_set_private_data(This->wined3d_volume, refguid, pData, SizeOfData, Flags); + resource = wined3d_volume_get_resource(This->wined3d_volume); + hr = wined3d_resource_set_private_data(resource, refguid, pData, SizeOfData, Flags); wined3d_mutex_unlock(); return hr; @@ -142,13 +144,15 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(IDirect3DVolume9 *ifac void *pData, DWORD *pSizeOfData) { IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); - hr = wined3d_volume_get_private_data(This->wined3d_volume, refguid, pData, pSizeOfData); + resource = wined3d_volume_get_resource(This->wined3d_volume); + hr = wined3d_resource_get_private_data(resource, refguid, pData, pSizeOfData); wined3d_mutex_unlock(); return hr; @@ -157,12 +161,14 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(IDirect3DVolume9 *ifac static HRESULT WINAPI IDirect3DVolume9Impl_FreePrivateData(IDirect3DVolume9 *iface, REFGUID refguid) { IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); - hr = wined3d_volume_free_private_data(This->wined3d_volume, refguid); + resource = wined3d_volume_get_resource(This->wined3d_volume); + hr = wined3d_resource_free_private_data(resource, refguid); wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Implement IDirect3DVolume8 private data handling on top of wined3d_resource .
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 330ffc83f2726a24e3e43737b42d9c19b95a331d URL: http://source.winehq.org/git/wine.git/?a=commit;h=330ffc83f2726a24e3e43737b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 00:02:34 2011 +0200 d3d8: Implement IDirect3DVolume8 private data handling on top of wined3d_resource. --- dlls/d3d8/volume.c | 12 +++++++++--- dlls/wined3d/volume.c | 17 ----------------- dlls/wined3d/wined3d.spec | 3 --- include/wine/wined3d.h | 5 ----- 4 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 2726880..f3d1132 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -126,13 +126,15 @@ static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(IDirect3DVolume8 *ifac const void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(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); wined3d_mutex_lock(); - hr = wined3d_volume_set_private_data(This->wined3d_volume, refguid, pData, SizeOfData, Flags); + resource = wined3d_volume_get_resource(This->wined3d_volume); + hr = wined3d_resource_set_private_data(resource, refguid, pData, SizeOfData, Flags); wined3d_mutex_unlock(); return hr; @@ -142,13 +144,15 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(IDirect3DVolume8 *ifac void *pData, DWORD *pSizeOfData) { IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s, data %p, data_size %p.\n", iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); - hr = wined3d_volume_get_private_data(This->wined3d_volume, refguid, pData, pSizeOfData); + resource = wined3d_volume_get_resource(This->wined3d_volume); + hr = wined3d_resource_get_private_data(resource, refguid, pData, pSizeOfData); wined3d_mutex_unlock(); return hr; @@ -157,12 +161,14 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(IDirect3DVolume8 *ifac static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(IDirect3DVolume8 *iface, REFGUID refguid) { IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); + struct wined3d_resource *resource; HRESULT hr; TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); - hr = wined3d_volume_free_private_data(This->wined3d_volume, refguid); + resource = wined3d_volume_get_resource(This->wined3d_volume); + hr = wined3d_resource_free_private_data(resource, refguid); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ec10d43..e176edc 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -173,23 +173,6 @@ void * CDECL wined3d_volume_get_parent(const struct wined3d_volume *volume) return volume->resource.parent; } -HRESULT CDECL wined3d_volume_set_private_data(struct wined3d_volume *volume, - REFGUID guid, const void *data, DWORD data_size, DWORD flags) -{ - return wined3d_resource_set_private_data(&volume->resource, guid, data, data_size, flags); -} - -HRESULT CDECL wined3d_volume_get_private_data(const struct wined3d_volume *volume, - REFGUID guid, void *data, DWORD *data_size) -{ - return wined3d_resource_get_private_data(&volume->resource, guid, data, data_size); -} - -HRESULT CDECL wined3d_volume_free_private_data(struct wined3d_volume *volume, REFGUID guid) -{ - return wined3d_resource_free_private_data(&volume->resource, guid); -} - DWORD CDECL wined3d_volume_set_priority(struct wined3d_volume *volume, DWORD priority) { return resource_set_priority(&volume->resource, priority); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7131b03..4483ba8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -278,15 +278,12 @@ @ cdecl wined3d_volume_create(ptr long long long long long long ptr ptr ptr) @ cdecl wined3d_volume_decref(ptr) -@ cdecl wined3d_volume_free_private_data(ptr ptr) @ cdecl wined3d_volume_from_resource(ptr) @ cdecl wined3d_volume_get_parent(ptr) @ cdecl wined3d_volume_get_priority(ptr) -@ cdecl wined3d_volume_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_volume_get_resource(ptr) @ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) @ cdecl wined3d_volume_preload(ptr) @ cdecl wined3d_volume_set_priority(ptr long) -@ cdecl wined3d_volume_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_volume_unmap(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40879ff..99dcc37 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2520,20 +2520,15 @@ HRESULT __cdecl wined3d_volume_create(struct wined3d_device *device, UINT width, DWORD usage, enum wined3d_format_id format_id, WINED3DPOOL pool, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_volume **volume); ULONG __cdecl wined3d_volume_decref(struct wined3d_volume *volume); -HRESULT __cdecl wined3d_volume_free_private_data(struct wined3d_volume *volume, REFGUID guid); struct wined3d_volume * __cdecl wined3d_volume_from_resource(struct wined3d_resource *resource); void * __cdecl wined3d_volume_get_parent(const struct wined3d_volume *volume); DWORD __cdecl wined3d_volume_get_priority(const struct wined3d_volume *volume); -HRESULT __cdecl wined3d_volume_get_private_data(const struct wined3d_volume *volume, - REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags); void __cdecl wined3d_volume_preload(struct wined3d_volume *volume); DWORD __cdecl wined3d_volume_set_priority(struct wined3d_volume *volume, DWORD new_priority); -HRESULT __cdecl wined3d_volume_set_private_data(struct wined3d_volume *volume, - REFGUID guid, const void *data, DWORD data_size, DWORD flags); HRESULT __cdecl wined3d_volume_unmap(struct wined3d_volume *volume); #endif /* __WINE_WINED3D_H */

1 0

Henri Verbeet : wined3d: Make the wined3d_shader_context shader pointer const.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 5a26da1d19020713266c57175e967cd04e128f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a26da1d19020713266c57175… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 00:02:35 2011 +0200 wined3d: Make the wined3d_shader_context shader pointer const. --- dlls/wined3d/arb_program_shader.c | 10 +++++----- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ee5bf86..7039841 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -944,7 +944,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction { /* oPos, oFog and oPts in D3D */ static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; @@ -1337,10 +1337,10 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; + const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_texture *texture; const char *tex_type; BOOL np2_fixup = FALSE; - struct wined3d_shader *shader = ins->ctx->shader; struct wined3d_device *device = shader->device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; const char *mod; @@ -1742,7 +1742,7 @@ static void shader_hw_nop(const struct wined3d_shader_instruction *ins) static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); struct shader_arb_ctx_priv *ctx = ins->ctx->backend_data; @@ -3202,7 +3202,7 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; BOOL vshader = shader_is_vshader_version(ins->ctx->reg_maps->shader_version.type); if(priv->target_version == ARB) return; @@ -5257,7 +5257,7 @@ static void free_recorded_instruction(struct list *list) static void shader_arb_handle_instruction(const struct wined3d_shader_instruction *ins) { SHADER_HANDLER hw_fct; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; struct control_frame *control_frame; struct wined3d_shader_buffer *buffer = ins->ctx->buffer; BOOL bool_const; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b2e6c00..6aabca3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1318,7 +1318,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* oPos, oFog and oPts in D3D */ static const char * const hwrastout_reg_names[] = {"OUT[10]", "OUT[11].x", "OUT[11].y"}; - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; char pshader = shader_is_pshader_version(reg_maps->shader_version.type); @@ -2842,8 +2842,8 @@ static void shader_glsl_sgn(const struct wined3d_shader_instruction *ins) static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; + const struct wined3d_shader *shader = ins->ctx->shader; glsl_src_param_t src1_param; - struct wined3d_shader *shader = ins->ctx->shader; const DWORD *control_values = NULL; const local_constant *constant; @@ -2926,7 +2926,7 @@ static void shader_glsl_end(const struct wined3d_shader_instruction *ins) static void shader_glsl_rep(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; struct wined3d_shader_loop_state *loop_state = ins->ctx->loop_state; glsl_src_param_t src0_param; const DWORD *control_values = NULL; @@ -3036,7 +3036,7 @@ static void shader_glsl_ret(const struct wined3d_shader_instruction *ins) ********************************************/ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; struct wined3d_device *device = shader->device; DWORD shader_version = WINED3D_SHADER_VERSION(ins->ctx->reg_maps->shader_version.major, ins->ctx->reg_maps->shader_version.minor); @@ -3126,7 +3126,7 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; glsl_sample_function_t sample_function; @@ -3159,7 +3159,7 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { - struct wined3d_shader *shader = ins->ctx->shader; + const struct wined3d_shader *shader = ins->ctx->shader; struct wined3d_device *device = shader->device; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; glsl_sample_function_t sample_function; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c35f51e..ed8ae0d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -583,7 +583,7 @@ struct wined3d_shader_loop_state struct wined3d_shader_context { - struct wined3d_shader *shader; + const struct wined3d_shader *shader; const struct wined3d_gl_info *gl_info; const struct wined3d_shader_reg_maps *reg_maps; struct wined3d_shader_buffer *buffer;

1 0

Henri Verbeet : wined3d: Make the device and target parameters to FindContext() const.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: c4da128b8f64a6b2fb8f85e1e7e645122ded5778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4da128b8f64a6b2fb8f85e1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 23 00:02:36 2011 +0200 wined3d: Make the device and target parameters to FindContext() const. --- 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 42141f2..8edace0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1923,7 +1923,7 @@ static void SetupForBlit(struct wined3d_device *device, struct wined3d_context * } /* Do not call while under the GL lock. */ -static struct wined3d_context *FindContext(struct wined3d_device *device, struct wined3d_surface *target) +static struct wined3d_context *FindContext(const struct wined3d_device *device, const struct wined3d_surface *target) { struct wined3d_context *current_context = context_get_current(); struct wined3d_context *context;

1 0

Aric Stewart : usp10: Non modern Indic fonts want blwf applied pre and post base.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 152d179149c23d5002d25ecc528e9119ae02bf93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152d179149c23d5002d25ecc5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 22 12:38:32 2011 -0500 usp10: Non modern Indic fonts want blwf applied pre and post base. --- dlls/usp10/shape.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5eeb12c..8152e33 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2036,7 +2036,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps static inline INT find_consonant_halant(WCHAR* pwChars, INT index, INT end, lexical_function lexical) { int i = 0; - while (i + index < end - 1 && !(lexical(pwChars[index+i]) == lex_Consonant && (lexical(pwChars[index+i+1]) == lex_Halant || (index + i < end - 2 && lexical(pwChars[index+i+1]) == lex_Nukta && lexical(pwChars[index+i+2] == lex_Halant))))) + while (i + index < end - 1 && !(is_consonant(lexical(pwChars[index+i])) && (lexical(pwChars[index+i+1]) == lex_Halant || (index + i < end - 2 && lexical(pwChars[index+i+1]) == lex_Nukta && lexical(pwChars[index+i+2] == lex_Halant))))) i++; if (index + i <= end-1) return index + i; @@ -2044,7 +2044,7 @@ static inline INT find_consonant_halant(WCHAR* pwChars, INT index, INT end, lexi return -1; } -static void Apply_Indic_Half(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) +static void Apply_Indic_PreBase(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* feature) { INT index, nextIndex; INT count,g_offset; @@ -2056,7 +2056,7 @@ static void Apply_Indic_Half(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC index = find_consonant_halant(&pwChars[syllable->start], 0, count, lexical); while (index >= 0 && index < (glyph_index->base - glyph_index->start)) { - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->start+g_offset, 1, pcGlyphs, "half"); + nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc, pwOutGlyphs, index+glyph_index->start+g_offset, 1, pcGlyphs, feature); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); @@ -2193,9 +2193,15 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, if (pref) Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, modern, "pref"); if (blwf) + { + if (!modern) + Apply_Indic_PreBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, "blwf"); + Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, modern, "blwf"); + + } if (half) - Apply_Indic_Half(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs); + Apply_Indic_PreBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, "half"); if (pstf) { TRACE("applying feature pstf\n");

1 0

Travis Athougies : d3dx9_36/tests: Fixed constant table sizes in shader.c.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 4eeba43168cdb6311ead0da73ed19d8152dbadea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eeba43168cdb6311ead0da73… Author: Travis Athougies <iammisc(a)gmail.com> Date: Wed Jun 22 11:31:39 2011 -0700 d3dx9_36/tests: Fixed constant table sizes in shader.c. --- dlls/d3dx9_36/tests/shader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index d1323e9..540317a 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -75,7 +75,7 @@ static const DWORD shader_with_ctab_constants[] = { static const DWORD ctab_basic[] = { 0xfffe0300, /* vs_3_0 */ - 0x00fcfffe, FCC_CTAB, /* CTAB comment */ + 0x0040fffe, FCC_CTAB, /* CTAB comment */ 0x0000001c, 0x000000ec, 0xfffe0300, 0x00000005, 0x0000001c, 0x20008100, /* Header */ 0x000000e4, 0x00000080, 0x00060002, 0x00000001, 0x00000084, 0x00000000, /* Constant 1 desc (f) */ @@ -101,7 +101,7 @@ static const D3DXCONSTANT_DESC ctab_basic_expected[] = { static const DWORD ctab_matrices[] = { 0xfffe0300, /* vs_3_0 */ - 0x00c8fffe, FCC_CTAB, /* CTAB comment */ + 0x0032fffe, FCC_CTAB, /* CTAB comment */ 0x0000001c, 0x000000b0, 0xfffe0300, 0x00000003, 0x0000001c, 0x20008100, /* Header */ 0x000000a8, 0x00000058, 0x00070002, 0x00000001, 0x00000064, 0x00000000, /* Constant 1 desc (fmatrix3x1) */ @@ -124,7 +124,7 @@ static const D3DXCONSTANT_DESC ctab_matrices_expected[] = { static const DWORD ctab_arrays[] = { 0xfffe0300, /* vs_3_0 */ - 0x0148fffe, FCC_CTAB, /* CTAB comment */ + 0x0052fffe, FCC_CTAB, /* CTAB comment */ 0x0000001c, 0x0000013c, 0xfffe0300, 0x00000006, 0x0000001c, 0x20008100, /* Header */ 0x00000134, 0x00000094, 0x000E0002, 0x00000002, 0x0000009c, 0x00000000, /* Constant 1 desc (barray) */

1 0

Aric Stewart : usp10: Update Indic framework to handle non-modern fonts.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 1fed1473a02b4183a38fb168b2ecba7004c79f39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fed1473a02b4183a38fb168b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 22 12:38:28 2011 -0500 usp10: Update Indic framework to handle non-modern fonts. --- dlls/usp10/indic.c | 50 ++++++++++++++++++++----- dlls/usp10/shape.c | 84 ++++++++++++++++++++++++++++-------------- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 97 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fed1473a02b4183a38fb…

1 0

Travis Athougies : d3dx9_36/tests: Added tests for constant table samplers.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 7a8a7b920e4c4f5ed7dcf750f9cf712a6e614172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8a7b920e4c4f5ed7dcf750f… Author: Travis Athougies <iammisc(a)gmail.com> Date: Wed Jun 22 13:10:52 2011 -0700 d3dx9_36/tests: Added tests for constant table samplers. --- dlls/d3dx9_36/tests/shader.c | 66 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index 540317a..5bcd216 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -102,8 +102,8 @@ static const D3DXCONSTANT_DESC ctab_basic_expected[] = { static const DWORD ctab_matrices[] = { 0xfffe0300, /* vs_3_0 */ 0x0032fffe, FCC_CTAB, /* CTAB comment */ - 0x0000001c, 0x000000b0, 0xfffe0300, 0x00000003, 0x0000001c, 0x20008100, /* Header */ - 0x000000a8, + 0x0000001c, 0x000000b4, 0xfffe0300, 0x00000003, 0x0000001c, 0x20008100, /* Header */ + 0x000000ac, 0x00000058, 0x00070002, 0x00000001, 0x00000064, 0x00000000, /* Constant 1 desc (fmatrix3x1) */ 0x00000074, 0x00000002, 0x00000004, 0x00000080, 0x00000000, /* Constant 2 desc (fmatrix4x4) */ 0x00000090, 0x00040002, 0x00000003, 0x0000009c, 0x00000000, /* Constant 3 desc (imatrix2x3) */ @@ -157,6 +157,29 @@ static const D3DXCONSTANT_DESC ctab_arrays_expected[] = { {"bvecarray", D3DXRS_FLOAT4, 16, 2, D3DXPC_VECTOR, D3DXPT_BOOL, 1, 3, 3, 0, 36, 0}, {"ivecarray", D3DXRS_FLOAT4, 18, 1, D3DXPC_VECTOR, D3DXPT_INT, 1, 4, 1, 0, 16, 0}}; +static const DWORD ctab_samplers[] = { + 0xfffe0300, /* vs_3_0 */ + 0x0032fffe, FCC_CTAB, /* CTAB comment */ + 0x0000001c, 0x000000b4, 0xfffe0300, 0x00000003, 0x0000001c, 0x20008100, /* Header */ + 0x000000ac, + 0x00000058, 0x00020002, 0x00000001, 0x00000064, 0x00000000, /* Constant 1 desc (notsampler) */ + 0x00000074, 0x00000003, 0x00000001, 0x00000080, 0x00000000, /* Constant 2 desc (sampler1) */ + 0x00000090, 0x00030003, 0x00000001, 0x0000009c, 0x00000000, /* Constant 3 desc (sampler2) */ + 0x73746f6e, 0x6c706d61, 0xab007265, /* Constant 1 name */ + 0x00030001, 0x00040001, 0x00000001, 0x00000000, /* Constant 1 type desc */ + 0x706d6173, 0x3172656c, 0xababab00, /* Constant 2 name */ + 0x000c0004, 0x00010001, 0x00000001, 0x00000000, /* Constant 2 type desc */ + 0x706d6173, 0x3272656c, 0xababab00, /* Constant 3 name */ + 0x000d0004, 0x00010001, 0x00000001, 0x00000000, /* Constant 3 type desc */ + 0x335f7376, 0xab00305f, /* Target name string */ + 0x656e6957, 0x6f727020, 0x7463656a, 0xababab00, /* Creator name string */ + 0x0000ffff}; /* END */ + +static const D3DXCONSTANT_DESC ctab_samplers_expected[] = { + {"sampler1", D3DXRS_SAMPLER, 0, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER2D, 1, 1, 1, 0, 4, 0}, + {"sampler2", D3DXRS_SAMPLER, 3, 1, D3DXPC_OBJECT, D3DXPT_SAMPLER3D, 1, 1, 1, 0, 4, 0}, + {"notsampler", D3DXRS_FLOAT4, 2, 1, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 4, 1, 0, 16, 0}}; + static void test_get_shader_size(void) { UINT shader_size, expected; @@ -370,8 +393,10 @@ static void test_constant_table(const char *test_name, const DWORD *ctable_fn, const_handle = ID3DXConstantTable_GetConstantByName(ctable, NULL, expected->Name); - ID3DXConstantTable_GetConstantDesc(ctable, const_handle, &actual, &pCount); - ok(pCount == 1, "Got more or less descriptions: %d\n", pCount); + res = ID3DXConstantTable_GetConstantDesc(ctable, const_handle, &actual, &pCount); + ok(SUCCEEDED(res), "%s in %s: ID3DXConstantTable_GetConstantDesc returned %08x\n", expected->Name, + test_name, res); + ok(pCount == 1, "%s in %s: Got more or less descriptions: %d\n", expected->Name, test_name, pCount); ok(strcmp(actual.Name, expected->Name) == 0, "%s in %s: Got different names: Got %s, expected %s\n", expected->Name, @@ -418,6 +443,8 @@ static void test_constant_tables(void) sizeof(ctab_matrices_expected)/sizeof(*ctab_matrices_expected)); test_constant_table("test_arrays", ctab_arrays, ctab_arrays_expected, sizeof(ctab_arrays_expected)/sizeof(*ctab_arrays_expected)); + test_constant_table("test_samplers", ctab_samplers, ctab_samplers_expected, + sizeof(ctab_samplers_expected)/sizeof(*ctab_samplers_expected)); } static void test_setting_basic_table(IDirect3DDevice9 *device) @@ -645,6 +672,36 @@ static void test_setting_constants(void) if (wnd) DestroyWindow(wnd); } +static void test_get_sampler_index(void) +{ + ID3DXConstantTable *ctable; + + HRESULT res; + UINT index; + + ULONG refcnt; + + res = D3DXGetShaderConstantTable(ctab_samplers, &ctable); + ok(res == D3D_OK, "D3DXGetShaderConstantTable failed on ctab_samplers: got %08x\n", res); + + index = ID3DXConstantTable_GetSamplerIndex(ctable, "sampler1"); + ok(index == 0, "ID3DXConstantTable_GetSamplerIndex returned wrong index: Got %d, expected 0\n", index); + + index = ID3DXConstantTable_GetSamplerIndex(ctable, "sampler2"); + ok(index == 3, "ID3DXConstantTable_GetSamplerIndex returned wrong index: Got %d, expected 3\n", index); + + index = ID3DXConstantTable_GetSamplerIndex(ctable, "nonexistent"); + ok(index == -1, "ID3DXConstantTable_GetSamplerIndex found non-existent sampler: Got %d\n", + index); + + index = ID3DXConstantTable_GetSamplerIndex(ctable, "notsampler"); + ok(index == -1, "ID3DXConstantTable_GetSamplerIndex succeeded on non-sampler constant: Got %d\n", + index); + + refcnt = ID3DXConstantTable_Release(ctable); + ok(refcnt == 0, "The ID3DXConstantTable reference count was %u, should be 0\n", refcnt); +} + START_TEST(shader) { test_get_shader_size(); @@ -653,4 +710,5 @@ START_TEST(shader) test_get_shader_constant_table_ex(); test_constant_tables(); test_setting_constants(); + test_get_sampler_index(); }

1 0

Travis Athougies : d3dx9_36: Implemented support for samplers in ID3DXConstantTable.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: a76ac0a894f2d046ba7f69795fc421a8ec061e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a76ac0a894f2d046ba7f69795… Author: Travis Athougies <iammisc(a)gmail.com> Date: Wed Jun 22 13:10:51 2011 -0700 d3dx9_36: Implemented support for samplers in ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 0e0709d..bddef33 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -748,13 +748,23 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* return D3D_OK; } -static UINT WINAPI ID3DXConstantTableImpl_GetSamplerIndex(LPD3DXCONSTANTTABLE iface, D3DXHANDLE constant) +static UINT WINAPI ID3DXConstantTableImpl_GetSamplerIndex(ID3DXConstantTable *iface, D3DXHANDLE constant) { ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface); + D3DXCONSTANT_DESC desc; + UINT count = 1; + HRESULT res; + + TRACE("(%p)->(%p)\n", This, constant); + + res = ID3DXConstantTable_GetConstantDesc(iface, constant, &desc, &count); + if (FAILED(res)) + return (UINT)-1; - FIXME("(%p)->(%p): stub\n", This, constant); + if (desc.RegisterSet != D3DXRS_SAMPLER) + return (UINT)-1; - return (UINT)-1; + return desc.RegisterIndex; } static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) @@ -1225,10 +1235,15 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, if (hr != D3D_OK) goto error; - if (constant_info[i].RegisterSet != D3DXRS_FLOAT4) - FIXME("Don't know how to calculate Bytes for non D3DXRS_FLOAT4 constants\n"); + if (constant_info[i].RegisterSet != D3DXRS_FLOAT4 && + constant_info[i].RegisterSet != D3DXRS_SAMPLER) + FIXME("Don't know how to calculate Bytes for constants of type %d\n", + constant_info[i].RegisterSet); - /* D3DXRS_FLOAT4 has a base size of 4 (not taking into account dimensions and element count) */ + /* + * D3DXRS_FLOAT4 and D3DXRS_SAMPLER have a base size of 4 + * (not taking into account dimensions and element count) + */ object->constants[i].desc.Bytes = 4; /* Take into account dimensions and elements */

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard June 23, 2011

June 23, 2011

Module: wine Branch: master Commit: 39ace9e138de759914502235a8e48599ae01381f URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ace9e138de759914502235a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 22 19:16:29 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp100/msvcp100.spec | 138 +++++++++--------- dlls/msvcp60/msvcp60.spec | 160 ++++++++++---------- dlls/msvcp70/msvcp70.spec | 192 ++++++++++++------------ dlls/msvcp71/msvcp71.spec | 268 ++++++++++++++++---------------- dlls/msvcp80/msvcp80.spec | 358 +++++++++++++++++++++--------------------- 5 files changed, 558 insertions(+), 558 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39ace9e138de759914502…

1 0