December 2010 - Wine-Commits

Alexandre Julliard : msxml2: Add an msxml2 library that contains the v2. 6 msxml typelib.
by Alexandre Julliard Dec. 21, 2010

Dec. 21, 2010

Module: wine Branch: master Commit: 41d6a923494decdec5a5a245f263c0e60f38c9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d6a923494decdec5a5a245f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 13:27:20 2010 +0100 msxml2: Add an msxml2 library that contains the v2.6 msxml typelib. --- .gitignore | 1 + configure | 1 + configure.ac | 1 + dlls/msxml2/Makefile.in | 10 + dlls/msxml2/main.c | 63 +++ dlls/msxml2/msxml2.spec | 4 + dlls/msxml2/msxml2_tlb.idl | 1166 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml2/rsrc.rc | 22 + dlls/msxml3/factory.c | 3 + dlls/msxml3/regsvr.c | 39 -- tools/wine.inf.in | 1 + 11 files changed, 1272 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41d6a923494decdec5a5a…

1 0

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

Dec. 21, 2010

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: Parse ISGN in the reflection interface.
by Alexandre Julliard Dec. 21, 2010

Dec. 21, 2010

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

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

Dec. 21, 2010

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

Alexandre Julliard : msxml3: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard Dec. 21, 2010

Dec. 21, 2010

Module: wine Branch: master Commit: c1c92d07d7d742e43bf3bdce26fd36ba044a7d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c92d07d7d742e43bf3bdce2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 13:41:29 2010 +0100 msxml3: Convert dll registration to the IRegistrar mechanism. --- dlls/msxml3/Makefile.in | 2 +- dlls/msxml3/main.c | 17 ++ dlls/msxml3/regsvr.c | 707 ----------------------------------------------- include/msxml2.idl | 180 +++++++++---- 4 files changed, 144 insertions(+), 762 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1c92d07d7d742e43bf3b…

1 0

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

Dec. 21, 2010

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: Implement ID3D11ShaderReflection::GetConversionInstructionCount().
by Alexandre Julliard Dec. 21, 2010

Dec. 21, 2010

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

Alexandre Julliard : msxml: Add an msxml library that contains the v2. 0 msxml typelib.
by Alexandre Julliard Dec. 21, 2010

Dec. 21, 2010

Module: wine Branch: master Commit: 25ccc90b4207299a3e9b04feb3f3e1c2370913c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ccc90b4207299a3e9b04feb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 12:03:14 2010 +0100 msxml: Add an msxml library that contains the v2.0 msxml typelib. --- .gitignore | 1 + configure | 1 + configure.ac | 1 + dlls/msxml/Makefile.in | 10 +++++++ dlls/msxml/main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msxml/msxml.spec | 4 +++ dlls/msxml/msxml_tlb.idl | 19 ++++++++++++++ dlls/msxml/rsrc.rc | 22 ++++++++++++++++ 8 files changed, 121 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 31b5dcb..75e33da 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,7 @@ dlls/msi/sql.tab.c dlls/msi/sql.tab.h dlls/mstask/mstask_local.h dlls/mstask/mstask_local_i.c +dlls/msxml/msxml_tlb.tlb dlls/msxml3/msxml3_v1.tlb dlls/msxml3/xslpattern.tab.c dlls/msxml3/xslpattern.tab.h diff --git a/configure b/configure index a83e6b7..00fbb6f 100755 --- a/configure +++ b/configure @@ -15065,6 +15065,7 @@ wine_fn_config_test dlls/msvfw32/tests msvfw32_test wine_fn_config_dll msvidc32 enable_msvidc32 wine_fn_config_dll msvideo.dll16 enable_win16 wine_fn_config_dll mswsock enable_mswsock mswsock +wine_fn_config_dll msxml enable_msxml wine_fn_config_dll msxml3 enable_msxml3 wine_fn_config_test dlls/msxml3/tests msxml3_test wine_fn_config_dll msxml4 enable_msxml4 diff --git a/configure.ac b/configure.ac index 0706192..1250730 100644 --- a/configure.ac +++ b/configure.ac @@ -2611,6 +2611,7 @@ WINE_CONFIG_TEST(dlls/msvfw32/tests) WINE_CONFIG_DLL(msvidc32) WINE_CONFIG_DLL(msvideo.dll16,enable_win16) WINE_CONFIG_DLL(mswsock,,[mswsock]) +WINE_CONFIG_DLL(msxml) WINE_CONFIG_DLL(msxml3) WINE_CONFIG_TEST(dlls/msxml3/tests) WINE_CONFIG_DLL(msxml4) diff --git a/dlls/msxml/Makefile.in b/dlls/msxml/Makefile.in new file mode 100644 index 0000000..25c45bc --- /dev/null +++ b/dlls/msxml/Makefile.in @@ -0,0 +1,10 @@ +MODULE = msxml.dll + +C_SRCS = main.c + +IDL_TLB_SRCS = msxml_tlb.idl +IDL_R_SRCS = msxml_tlb.idl + +RC_SRCS = rsrc.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/msxml/main.c b/dlls/msxml/main.c new file mode 100644 index 0000000..008c0a9 --- /dev/null +++ b/dlls/msxml/main.c @@ -0,0 +1,63 @@ +/* + * MSXML implementation + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "rpcproxy.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinstance; + DisableThreadLibraryCalls(hinstance); + break; + } + return TRUE; +} + +/*********************************************************************** + * DllCanUnloadNow (MSXML.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (MSXML.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( instance, NULL ); +} + +/*********************************************************************** + * DllUnregisterServer (MSXML.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( instance, NULL ); +} diff --git a/dlls/msxml/msxml.spec b/dlls/msxml/msxml.spec new file mode 100644 index 0000000..5fd4c28 --- /dev/null +++ b/dlls/msxml/msxml.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) msxml3.DllGetClassObject +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/msxml/msxml_tlb.idl b/dlls/msxml/msxml_tlb.idl new file mode 100644 index 0000000..8ad22a2 --- /dev/null +++ b/dlls/msxml/msxml_tlb.idl @@ -0,0 +1,19 @@ +/* + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msxml.idl" diff --git a/dlls/msxml/rsrc.rc b/dlls/msxml/rsrc.rc new file mode 100644 index 0000000..9537637 --- /dev/null +++ b/dlls/msxml/rsrc.rc @@ -0,0 +1,22 @@ +/* + * Resources for msxml + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* @makedep: msxml_tlb.tlb */ +1 TYPELIB msxml_tlb.tlb

1 0

Alexandre Julliard : include: Correctly define the msxml typelib by directly including xmldom. idl and xmldso.idl.
by Alexandre Julliard Dec. 21, 2010

Dec. 21, 2010

Module: wine Branch: master Commit: f6b6c7bade8fe07bb8d0065be55686093ea5bc23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b6c7bade8fe07bb8d0065be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 11:40:04 2010 +0100 include: Correctly define the msxml typelib by directly including xmldom.idl and xmldso.idl. --- .gitignore | 2 -- dlls/gameux/gameexplorer.c | 1 - dlls/mscoree/mscoree_main.c | 2 -- dlls/msxml3/factory.c | 1 - dlls/msxml3/regsvr.c | 2 -- dlls/msxml3/tests/domdoc.c | 1 - dlls/msxml3/tests/schema.c | 1 - dlls/msxml3/tests/xmlelem.c | 1 - dlls/msxml3/uuid.c | 2 -- dlls/uuid/uuid.c | 2 -- include/Makefile.in | 5 +++-- include/msxml.idl | 17 +++++++++++++++++ include/msxml2.idl | 5 +++-- include/msxml6.idl | 5 +++-- include/xmldom.h | 20 ++++++++++++++++++++ include/xmldom.idl | 6 +++--- include/xmldso.idl | 3 --- tools/make_makefiles | 2 ++ 18 files changed, 51 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 95b9fe9..31b5dcb 100644 --- a/.gitignore +++ b/.gitignore @@ -252,8 +252,6 @@ include/wine/winedxgi.h include/winsxs.h include/wtypes.h include/wuapi.h -include/xmldom.h -include/xmldso.h include/xmllite.h libs/wpp/ppl.yy.c libs/wpp/ppy.tab.c diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index ea9307b..096e48e 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -23,7 +23,6 @@ #include "ole2.h" #include "sddl.h" -#include "xmldom.h" #include "gameux.h" #include "gameux_private.h" diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index e63a1db..1f2cfb0 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -32,8 +32,6 @@ #include "ole2.h" #include "ocidl.h" #include "shellapi.h" -#include "xmldom.h" -#include "xmldso.h" #include "initguid.h" #include "msxml2.h" diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 4e7d29e..8ad1abc 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -29,7 +29,6 @@ #include "winuser.h" #include "ole2.h" #include "msxml.h" -#include "xmldom.h" #include "msxml2.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index ca1cc12..7097b41 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -34,8 +34,6 @@ #include "winerror.h" #include "ole2.h" #include "msxml.h" -#include "xmldom.h" -#include "xmldso.h" #include "msxml6.h" /* undef the #define in msxml2 so that we can access the v.2 version diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6c2bf25..d821bac 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -26,7 +26,6 @@ #include "windows.h" #include "ole2.h" #include "objsafe.h" -#include "xmldom.h" #include "msxml2.h" #include "msxml2did.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 9e8494a..2b20603 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -26,7 +26,6 @@ #include "initguid.h" #include "windows.h" #include "ole2.h" -#include "xmldom.h" #include "msxml2.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index f38d515..e591494 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -24,7 +24,6 @@ #include "windows.h" #include "ole2.h" -#include "xmldom.h" #include "msxml2.h" #include "ocidl.h" diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c index a3c7965..4abbe5e 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -35,8 +35,6 @@ * First include the version 2 headers so that we don't redefine their * uuids - they're already in libuuid */ -#include "xmldom.h" -#include "xmldso.h" #include "msxml.h" /* Now we can initialize the rest of the uuids */ diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index f8d19e2..8df7334 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -63,8 +63,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "mshtml.h" #include "mshtmhst.h" #include "richole.h" -#include "xmldom.h" -#include "xmldso.h" #include "downloadmgr.h" #include "objsel.h" #include "hlink.h" diff --git a/include/Makefile.in b/include/Makefile.in index ae0e842..d31bd74 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -101,8 +101,6 @@ PUBLIC_IDL_H_SRCS = \ winsxs.idl \ wtypes.idl \ wuapi.idl \ - xmldom.idl \ - xmldso.idl \ xmllite.idl IDL_TLB_SRCS = \ @@ -549,7 +547,10 @@ SRCDIR_INCLUDES = \ wtsapi32.h \ xcmc.h \ xinput.h \ + xmldom.h \ + xmldom.idl \ xmldomdid.h \ + xmldso.idl \ xmldsodid.h \ zmouse.h diff --git a/include/msxml.idl b/include/msxml.idl index 8c2496b..62dbcfa 100644 --- a/include/msxml.idl +++ b/include/msxml.idl @@ -18,6 +18,8 @@ */ #include <msxmldid.h> +#include <msxml2did.h> +#include <idispids.h> #ifndef DO_NO_IMPORTS import "unknwn.idl"; @@ -27,6 +29,19 @@ import "oaidl.idl"; #endif [ + uuid(d63e0ce2-a0a2-11d0-9c02-00c04fc99c8e), + version(2.0), + helpstring("Microsoft XML, v2.0") +] +library MSXML +{ + +importlib("stdole2.tlb"); + +#include <xmldom.idl> +#include <xmldso.idl> + +[ local, object, odl, @@ -334,3 +349,5 @@ coclass XMLDocument { [default] interface IXMLDocument; } + +} /* Library MSXML */ diff --git a/include/msxml2.idl b/include/msxml2.idl index d91ba47..c5738d2 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -107,7 +107,8 @@ interface ISchemaNotation; cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") +cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") +cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType { NODE_INVALID = 0, @@ -124,7 +125,7 @@ typedef enum tagDOMNodeType NODE_DOCUMENT_FRAGMENT = 11, NODE_NOTATION = 12 } DOMNodeType; -cpp_quote("#endif /* __WIDL_XMLDOM_H */") +cpp_quote("#endif") typedef enum _SOMITEMTYPE { diff --git a/include/msxml6.idl b/include/msxml6.idl index 45cef98..565f65e 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -113,7 +113,8 @@ interface ISchemaNotation; cpp_quote("#define DOMDocument DOMDocument2") cpp_quote("#define CLSID_DOMDocument CLSID_DOMDocument2") -cpp_quote("#ifndef __WIDL_XMLDOM_H") +cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") +cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType { NODE_INVALID = 0, @@ -130,7 +131,7 @@ typedef enum tagDOMNodeType NODE_DOCUMENT_FRAGMENT = 11, NODE_NOTATION = 12 } DOMNodeType; -cpp_quote("#endif /* __WIDL_XMLDOM_H */") +cpp_quote("#endif") typedef enum _SOMITEMTYPE { diff --git a/include/xmldom.h b/include/xmldom.h new file mode 100644 index 0000000..b774b30 --- /dev/null +++ b/include/xmldom.h @@ -0,0 +1,20 @@ +/* + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* xmldom.idl is included by msxml.idl so it doesn't need a stand-alone header */ +#include <msxml.h> diff --git a/include/xmldom.idl b/include/xmldom.idl index d5d51ff..d47c06e 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -19,8 +19,6 @@ #include <xmldomdid.h> #include <idispids.h> -import "ocidl.idl"; - interface IXMLDOMImplementation; interface IXMLDOMNode; interface IXMLDOMDocumentFragment; @@ -39,8 +37,9 @@ interface IXMLDOMNotation; interface IXMLDOMEntity; interface IXMLDOMEntityReference; interface IXMLDOMParseError; -interface IXTLRuntime; +cpp_quote("#ifndef __MSXML_DOMNODETYPE_DEFINED") +cpp_quote("#define __MSXML_DOMNODETYPE_DEFINED") typedef enum tagDOMNodeType { NODE_INVALID, NODE_ELEMENT, @@ -56,6 +55,7 @@ typedef enum tagDOMNodeType { NODE_DOCUMENT_FRAGMENT, NODE_NOTATION } DOMNodeType; +cpp_quote("#endif") [ local, diff --git a/include/xmldso.idl b/include/xmldso.idl index 14f66a1..c203422 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "wtypes.idl"; -import "ocidl.idl"; - #include <idispids.h> #include <xmldsodid.h> diff --git a/tools/make_makefiles b/tools/make_makefiles index 29cb8d6..4c00814 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -156,6 +156,8 @@ my %private_idl_headers = ( "rstloc.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1, + "xmldom.idl" => 1, + "xmldso.idl" => 1, "wine/wined3d.idl" => 1, "wine/winedxgi.idl" => 1, );

1 0

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

Dec. 21, 2010

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