December 2010 - Wine-commits

Rico Schüller : d3dcompiler: Use an iface instead of a vtbl pointer in d3dcompiler_blob.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 806961ec2873330f7df55ce08f83e050f15da703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806961ec2873330f7df55ce08… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 21 11:05:49 2010 +0100 d3dcompiler: Use an iface instead of a vtbl pointer in d3dcompiler_blob. --- dlls/d3dcompiler_43/blob.c | 15 ++++++++++----- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/blob.c b/dlls/d3dcompiler_43/blob.c index d7c8067..995ac41 100644 --- a/dlls/d3dcompiler_43/blob.c +++ b/dlls/d3dcompiler_43/blob.c @@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +static inline struct d3dcompiler_blob *impl_from_ID3DBlob(ID3DBlob *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_blob, ID3DBlob_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3dcompiler_blob_QueryInterface(ID3DBlob *iface, REFIID riid, void **object) @@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_blob_QueryInterface(ID3DBlob *iface static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface) { - struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedIncrement(&blob->refcount); TRACE("%p increasing refcount to %u\n", blob, refcount); @@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface) static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface) { - struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); ULONG refcount = InterlockedDecrement(&blob->refcount); TRACE("%p decreasing refcount to %u\n", blob, refcount); @@ -76,7 +81,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface) static void * STDMETHODCALLTYPE d3dcompiler_blob_GetBufferPointer(ID3DBlob *iface) { - struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); TRACE("iface %p\n", iface); @@ -85,7 +90,7 @@ static void * STDMETHODCALLTYPE d3dcompiler_blob_GetBufferPointer(ID3DBlob *ifac static SIZE_T STDMETHODCALLTYPE d3dcompiler_blob_GetBufferSize(ID3DBlob *iface) { - struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface; + struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface); TRACE("iface %p\n", iface); @@ -105,7 +110,7 @@ static const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl = HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) { - blob->vtbl = &d3dcompiler_blob_vtbl; + blob->ID3DBlob_iface.lpVtbl = &d3dcompiler_blob_vtbl; blob->refcount = 1; blob->size = data_size; diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 33c51d7..1cbe561 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -44,7 +44,7 @@ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN; /* ID3DBlob */ struct d3dcompiler_blob { - const struct ID3D10BlobVtbl *vtbl; + ID3DBlob ID3DBlob_iface; LONG refcount; SIZE_T size;

1 0

Rico Schüller : d3dcompiler: Use an iface instead of a vtbl pointer in d3dcompiler_shader_reflection.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 8f08d38520b0f35eb29037a94df9764298a780fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f08d38520b0f35eb29037a94… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 21 11:05:58 2010 +0100 d3dcompiler: Use an iface instead of a vtbl pointer in d3dcompiler_shader_reflection. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 +- dlls/d3dcompiler_43/reflection.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 1cbe561..feb2edd 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -60,7 +60,7 @@ HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { - const struct ID3D11ShaderReflectionVtbl *vtbl; + ID3D11ShaderReflection ID3D11ShaderReflection_iface; LONG refcount; }; diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e733a8f..2a64b93 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -25,6 +25,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflection(ID3D11ShaderReflection *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID3D11ShaderReflection *iface, REFIID riid, void **object) @@ -47,7 +52,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_QueryInterface(ID static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = (struct d3dcompiler_shader_reflection *)iface; + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -57,7 +62,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_AddRef(ID3D11Shader static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11ShaderReflection *iface) { - struct d3dcompiler_shader_reflection *This = (struct d3dcompiler_shader_reflection *)iface; + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -249,7 +254,7 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection HRESULT hr; unsigned int i; - reflection->vtbl = &d3dcompiler_shader_reflection_vtbl; + reflection->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; reflection->refcount = 1; hr = dxbc_parse(data, data_size, &src_dxbc);

1 0

Rico Schüller : d3dcompiler: Parse reflection STAT tag .
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 984ed6e9aca3c3f1009f6bdb9467d4e4fcca7407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=984ed6e9aca3c3f1009f6bdb9… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 21 11:06:01 2010 +0100 d3dcompiler: Parse reflection STAT tag. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 27 +++++++ dlls/d3dcompiler_43/reflection.c | 120 +++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index feb2edd..3e0915a 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -62,6 +62,33 @@ struct d3dcompiler_shader_reflection { ID3D11ShaderReflection ID3D11ShaderReflection_iface; LONG refcount; + + UINT mov_instruction_count; + UINT conversion_instruction_count; + UINT instruction_count; + UINT emit_instruction_count; + D3D_PRIMITIVE_TOPOLOGY gs_output_topology; + UINT gs_max_output_vertex_count; + D3D_PRIMITIVE input_primitive; + UINT cut_instruction_count; + UINT dcl_count; + UINT static_flow_control_count; + UINT float_instruction_count; + UINT temp_register_count; + UINT int_instruction_count; + UINT uint_instruction_count; + UINT temp_array_count; + UINT array_instruction_count; + UINT texture_normal_instructions; + UINT texture_load_instructions; + UINT texture_comp_instructions; + UINT texture_bias_instructions; + UINT texture_gradient_instructions; + UINT dynamic_flow_control_count; + UINT c_control_points; + D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; + D3D_TESSELLATOR_PARTITIONING hs_prtitioning; + D3D_TESSELLATOR_DOMAIN tessellator_domain; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 2a64b93..08eb44c 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -247,6 +247,116 @@ const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = d3dcompiler_shader_reflection_GetThreadGroupSize, }; +static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) +{ + const char *ptr = data; + DWORD size = data_size >> 2; + + TRACE("Size %u\n", size); + + read_dword(&ptr, &r->instruction_count); + TRACE("InstructionCount: %u\n", r->instruction_count); + + read_dword(&ptr, &r->temp_register_count); + TRACE("TempRegisterCount: %u\n", r->temp_register_count); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &r->dcl_count); + TRACE("DclCount: %u\n", r->dcl_count); + + read_dword(&ptr, &r->float_instruction_count); + TRACE("FloatInstructionCount: %u\n", r->float_instruction_count); + + read_dword(&ptr, &r->int_instruction_count); + TRACE("IntInstructionCount: %u\n", r->int_instruction_count); + + read_dword(&ptr, &r->uint_instruction_count); + TRACE("UintInstructionCount: %u\n", r->uint_instruction_count); + + read_dword(&ptr, &r->static_flow_control_count); + TRACE("StaticFlowControlCount: %u\n", r->static_flow_control_count); + + read_dword(&ptr, &r->dynamic_flow_control_count); + TRACE("DynamicFlowControlCount: %u\n", r->dynamic_flow_control_count); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &r->temp_array_count); + TRACE("TempArrayCount: %u\n", r->temp_array_count); + + read_dword(&ptr, &r->array_instruction_count); + TRACE("ArrayInstructionCount: %u\n", r->array_instruction_count); + + read_dword(&ptr, &r->cut_instruction_count); + TRACE("CutInstructionCount: %u\n", r->cut_instruction_count); + + read_dword(&ptr, &r->emit_instruction_count); + TRACE("EmitInstructionCount: %u\n", r->emit_instruction_count); + + read_dword(&ptr, &r->texture_normal_instructions); + TRACE("TextureNormalInstructions: %u\n", r->texture_normal_instructions); + + read_dword(&ptr, &r->texture_load_instructions); + TRACE("TextureLoadInstructions: %u\n", r->texture_load_instructions); + + read_dword(&ptr, &r->texture_comp_instructions); + TRACE("TextureCompInstructions: %u\n", r->texture_comp_instructions); + + read_dword(&ptr, &r->texture_bias_instructions); + TRACE("TextureBiasInstructions: %u\n", r->texture_bias_instructions); + + read_dword(&ptr, &r->texture_gradient_instructions); + TRACE("TextureGradientInstructions: %u\n", r->texture_gradient_instructions); + + read_dword(&ptr, &r->mov_instruction_count); + TRACE("MovInstructionCount: %u\n", r->mov_instruction_count); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &r->conversion_instruction_count); + TRACE("ConversionInstructionCount: %u\n", r->conversion_instruction_count); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &r->input_primitive); + TRACE("InputPrimitive: %x\n", r->input_primitive); + + read_dword(&ptr, &r->gs_output_topology); + TRACE("GSOutputTopology: %x\n", r->gs_output_topology); + + read_dword(&ptr, &r->gs_max_output_vertex_count); + TRACE("GSMaxOutputVertexCount: %u\n", r->gs_max_output_vertex_count); + + skip_dword_unknown(&ptr, 3); + + /* dx10 stat size */ + if (size == 29) return S_OK; + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &r->c_control_points); + TRACE("cControlPoints: %u\n", r->c_control_points); + + read_dword(&ptr, &r->hs_output_primitive); + TRACE("HSOutputPrimitive: %x\n", r->hs_output_primitive); + + read_dword(&ptr, &r->hs_prtitioning); + TRACE("HSPartitioning: %x\n", r->hs_prtitioning); + + read_dword(&ptr, &r->tessellator_domain); + TRACE("TessellatorDomain: %x\n", r->tessellator_domain); + + skip_dword_unknown(&ptr, 3); + + /* dx11 stat size */ + if (size == 37) return S_OK; + + FIXME("Unhandled size %u\n", size); + + return E_FAIL; +} + HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection *reflection, const void *data, SIZE_T data_size) { @@ -270,6 +380,16 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection switch (section->tag) { + case TAG_STAT: + hr = d3dcompiler_parse_stat(reflection, section->data, section->data_size); + if (FAILED(hr)) + { + dxbc_destroy(&src_dxbc); + WARN("Failed to parse section STAT.\n"); + return hr; + } + break; + default: FIXME("Unhandled section %s!\n", debugstr_an((const char *)&section->tag, 4)); break;

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetMovInstructionCount().
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: ff038cbcbedea1a6fe1d957c5fe480e6c9400657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff038cbcbedea1a6fe1d957c5… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 21 11:06:04 2010 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetMovInstructionCount(). --- dlls/d3dcompiler_43/reflection.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 08eb44c..c6594b3 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -151,9 +151,11 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovInstructionCount( ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return 0; + TRACE("iface %p\n", iface); + + return This->mov_instruction_count; } static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovcInstructionCount(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetConversionInstructionCount().
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 5ad0c856b69eb69e8851162a4138d5d84813fd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad0c856b69eb69e8851162a4… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 21 11:06:07 2010 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetConversionInstructionCount(). --- dlls/d3dcompiler_43/reflection.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index c6594b3..e0f634c 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -169,9 +169,11 @@ static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetMovcInstructionCo static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConversionInstructionCount( ID3D11ShaderReflection *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); - return 0; + TRACE("iface %p\n", iface); + + return This->conversion_instruction_count; } static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetBitwiseInstructionCount(

1 0

Rico Schüller : d3dcompiler: Parse ISGN in the reflection interface.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: f8e4771be4bfee1b67eb32c0bcdd763fb944b779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e4771be4bfee1b67eb32c0b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Dec 21 11:06:11 2010 +0100 d3dcompiler: Parse ISGN in the reflection interface. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 9 +++ dlls/d3dcompiler_43/reflection.c | 108 ++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 3e0915a..5c4f80f 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -57,6 +57,13 @@ HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size) D HRESULT d3dcompiler_get_blob_part(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; HRESULT d3dcompiler_strip_shader(const void *data, SIZE_T data_size, UINT flags, ID3DBlob **blob) DECLSPEC_HIDDEN; +struct d3dcompiler_shader_signature +{ + D3D11_SIGNATURE_PARAMETER_DESC *elements; + UINT element_count; + char *string_data; +}; + /* ID3D11ShaderReflection */ struct d3dcompiler_shader_reflection { @@ -89,6 +96,8 @@ struct d3dcompiler_shader_reflection D3D_TESSELLATOR_OUTPUT_PRIMITIVE hs_output_primitive; D3D_TESSELLATOR_PARTITIONING hs_prtitioning; D3D_TESSELLATOR_DOMAIN tessellator_domain; + + struct d3dcompiler_shader_signature *isgn; }; /* reflection handling */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e0f634c..1e287de 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -25,6 +25,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); +static void free_signature(struct d3dcompiler_shader_signature *sig) +{ + TRACE("Free signature %p\n", sig); + + HeapFree(GetProcessHeap(), 0, sig->elements); + HeapFree(GetProcessHeap(), 0, sig->string_data); +} + +static void reflection_cleanup(struct d3dcompiler_shader_reflection *ref) +{ + TRACE("Cleanup %p\n", ref); + + if (ref->isgn) + { + free_signature(ref->isgn); + HeapFree(GetProcessHeap(), 0, ref->isgn); + } +} + static inline struct d3dcompiler_shader_reflection *impl_from_ID3D11ShaderReflection(ID3D11ShaderReflection *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D11ShaderReflection_iface); @@ -69,6 +88,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_shader_reflection_Release(ID3D11Shade if (!refcount) { + reflection_cleanup(This); HeapFree(GetProcessHeap(), 0, This); } @@ -361,6 +381,68 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c return E_FAIL; } +HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature *s, const char *data, DWORD data_size) +{ + D3D11_SIGNATURE_PARAMETER_DESC *d; + unsigned int string_data_offset; + unsigned int string_data_size; + const char *ptr = data; + char *string_data; + unsigned int i; + DWORD count; + + read_dword(&ptr, &count); + TRACE("%u elements\n", count); + + skip_dword_unknown(&ptr, 1); + + d = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*d)); + if (!d) + { + ERR("Failed to allocate signature memory.\n"); + return E_OUTOFMEMORY; + } + + /* 2 DWORDs for the header, 6 for each element. */ + string_data_offset = 2 * sizeof(DWORD) + count * 6 * sizeof(DWORD); + string_data_size = data_size - string_data_offset; + string_data = HeapAlloc(GetProcessHeap(), 0, string_data_size); + if (!string_data) + { + ERR("Failed to allocate string data memory.\n"); + HeapFree(GetProcessHeap(), 0, d); + return E_OUTOFMEMORY; + } + memcpy(string_data, data + string_data_offset, string_data_size); + + for (i = 0; i < count; ++i) + { + UINT name_offset; + DWORD mask; + + read_dword(&ptr, &name_offset); + d[i].SemanticName = string_data + (name_offset - string_data_offset); + read_dword(&ptr, &d[i].SemanticIndex); + read_dword(&ptr, &d[i].SystemValueType); + read_dword(&ptr, &d[i].ComponentType); + read_dword(&ptr, &d[i].Register); + read_dword(&ptr, &mask); + d[i].ReadWriteMask = (mask >> 8) & 0xff; + d[i].Mask = mask & 0xff; + + TRACE("semantic: %s, semantic idx: %u, sysval_semantic %#x, " + "type %u, register idx: %u, use_mask %#x, input_mask %#x, stream %u\n", + debugstr_a(d[i].SemanticName), d[i].SemanticIndex, d[i].SystemValueType, + d[i].ComponentType, d[i].Register, d[i].Mask, d[i].ReadWriteMask, d[i].Stream); + } + + s->elements = d; + s->element_count = count; + s->string_data = string_data; + + return S_OK; +} + HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection *reflection, const void *data, SIZE_T data_size) { @@ -388,9 +470,25 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection hr = d3dcompiler_parse_stat(reflection, section->data, section->data_size); if (FAILED(hr)) { - dxbc_destroy(&src_dxbc); WARN("Failed to parse section STAT.\n"); - return hr; + goto err_out; + } + break; + + case TAG_ISGN: + reflection->isgn = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*reflection->isgn)); + if (!reflection->isgn) + { + ERR("Failed to allocate ISGN memory.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + hr = d3dcompiler_parse_signature(reflection->isgn, section->data, section->data_size); + if (FAILED(hr)) + { + WARN("Failed to parse section ISGN.\n"); + goto err_out; } break; @@ -403,4 +501,10 @@ HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_reflection dxbc_destroy(&src_dxbc); return hr; + +err_out: + reflection_cleanup(reflection); + dxbc_destroy(&src_dxbc); + + return hr; }

1 0

Michael Stefaniuc : d3dx9_36: Use an iface instead of an vtbl pointer in ID3DXConstantTableImpl.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 303f84c4093a431ac4da9ec70fb7dd1bc55e8b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=303f84c4093a431ac4da9ec70… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 21 11:30:28 2010 +0100 d3dx9_36: Use an iface instead of an vtbl pointer in ID3DXConstantTableImpl. --- dlls/d3dx9_36/shader.c | 65 +++++++++++++++++++++++++---------------------- 1 files changed, 35 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=303f84c4093a431ac4da9…

1 0

Michael Stefaniuc : sane.ds: The Da, En, Fi, Fr, Nl, Pt resources are using UTF-8.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: daaf185d0521c234907e0d6e3c9d626414841459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaf185d0521c234907e0d6e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 21 01:22:42 2010 +0100 sane.ds: The Da, En, Fi, Fr, Nl, Pt resources are using UTF-8. --- dlls/sane.ds/sane_Da.rc | 2 ++ dlls/sane.ds/sane_En.rc | 2 ++ dlls/sane.ds/sane_Fi.rc | 2 ++ dlls/sane.ds/sane_Fr.rc | 2 ++ dlls/sane.ds/sane_Nl.rc | 2 ++ dlls/sane.ds/sane_Pt.rc | 2 ++ 6 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/sane_Da.rc b/dlls/sane.ds/sane_Da.rc index 3cfb199..1e4a44b 100644 --- a/dlls/sane.ds/sane_Da.rc +++ b/dlls/sane.ds/sane_Da.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_DANISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_En.rc b/dlls/sane.ds/sane_En.rc index f899758..162e1cb 100644 --- a/dlls/sane.ds/sane_En.rc +++ b/dlls/sane.ds/sane_En.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Fi.rc b/dlls/sane.ds/sane_Fi.rc index 0f9869e..cccb8b7 100644 --- a/dlls/sane.ds/sane_Fi.rc +++ b/dlls/sane.ds/sane_Fi.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT IDD_DIALOG1 DIALOG 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Fr.rc b/dlls/sane.ds/sane_Fr.rc index d63f348..47160d2 100644 --- a/dlls/sane.ds/sane_Fr.rc +++ b/dlls/sane.ds/sane_Fr.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Nl.rc b/dlls/sane.ds/sane_Nl.rc index 4171637..94c14b8 100644 --- a/dlls/sane.ds/sane_Nl.rc +++ b/dlls/sane.ds/sane_Nl.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG 0, 0, 186, 46 diff --git a/dlls/sane.ds/sane_Pt.rc b/dlls/sane.ds/sane_Pt.rc index cc7a98b..13af245 100644 --- a/dlls/sane.ds/sane_Pt.rc +++ b/dlls/sane.ds/sane_Pt.rc @@ -21,6 +21,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_DIALOG1 DIALOG 0, 0, 186, 46

1 0

Luca Bennati : cmd: Update Italian translation.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: 93ef4396297d68850fc4d9cc0a6afdea05449401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93ef4396297d68850fc4d9cc0… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Dec 20 23:27:28 2010 +0100 cmd: Update Italian translation. --- programs/cmd/It.rc | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/cmd/It.rc b/programs/cmd/It.rc index 2254350..23ea12c 100644 --- a/programs/cmd/It.rc +++ b/programs/cmd/It.rc @@ -3,7 +3,7 @@ * Italian Language Support * * Copyright (C) 1999 D A Pickles - * Copyright (C) 2009 Luca Bennati + * Copyright (C) 2009-2010 Luca Bennati * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -210,6 +210,10 @@ PUSHD.\n" WCMD_MORE, "MORE mostra l'output di files o l'input dalla pipe in pagine.\n" + WCMD_CHOICE, "CHOICE mostra un testo e aspetta l'inserimento da parte\n\ +dell'utente di un tasto permesso da una lista selezionabile.\n\ +CHOICE è usato generalmente per creare un menù a selezione in un file batch.\n" + WCMD_EXIT, "EXIT termina la sessione corrente di cmd e torna al\n\ sistema operativo o alla shell dal quale hai chiamato cmd.\n" @@ -218,6 +222,7 @@ sistema operativo o alla shell dal quale hai chiamato cmd.\n" ATTRIB\t\tMostra o cambia gli attributi dei files DOS\n\ CALL\t\tInvoca un file batch da dentro un altro\n\ CD (CHDIR)\tCambia la cartella di default attuale\n\ +CHOICE\t\tAspetta la pressione di un tasto da una lista selezionabile\n\ CLS\t\tPulisce lo schermo della console\n\ COPY\t\tCopia files\n\ CTTY\t\tCambia il dispositivo di input/output\n\

1 0

Anders Jonsson : cmd: Update Swedish translation.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: f51d6df574b573bc10bcdf68ebee0e5ea863c458 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51d6df574b573bc10bcdf68e… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Dec 21 09:44:41 2010 +0100 cmd: Update Swedish translation. --- programs/cmd/Sv.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/cmd/Sv.rc b/programs/cmd/Sv.rc index d24d26e..eec6903 100644 --- a/programs/cmd/Sv.rc +++ b/programs/cmd/Sv.rc @@ -209,6 +209,10 @@ och ändrar sedan sökvägen till den angivna mappen.\n" WCMD_MORE, "MORE skriver ut filers utskrift eller vidarebefodrade förfrågningar på sidor.\n" + WCMD_CHOICE, "CHOICE visar en text och väntar tills användaren\n\ +trycker ner en tangent från en valbar lista.\n\ +CHOICE används främst för att skapa menyval i batchfiler.\n" + WCMD_EXIT, "EXIT avslutar cmd och skickar tillbaks användaren till\n\ operativsystemet eller skalet som cmd startades ifrån.\n" @@ -217,6 +221,7 @@ operativsystemet eller skalet som cmd startades ifrån.\n" ATTRIB\t\tVisa eller ändra DOS-filers attribut\n\ CALL\t\tAnropar en batchfil inifrån en annan\n\ CD (CHDIR)\tÄndrar nuvarande standardsökväg\n\ +CHOICE\t\tVäntar på en tangenttryckning från en valbar lista\n\ CLS\t\tRensar konsollen\n\ COPY\t\tKopierar en fil\n\ CTTY\t\tÄndrar input/output-enhet\n\

1 0