wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

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: 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: 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: 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: 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

Alexandre Julliard : msxml3: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 21 Dec '10

21 Dec '10

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

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

21 Dec '10

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

Alexandre Julliard : msxml: Register the v2. 0 classes using the IRegistrar mechanism.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: cfa37214b90cc16747a99c8d8d542d294df39094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfa37214b90cc16747a99c8d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 13:26:15 2010 +0100 msxml: Register the v2.0 classes using the IRegistrar mechanism. --- dlls/msxml/msxml.rgs | 13 +++++++ dlls/msxml/rsrc.rc | 3 ++ dlls/msxml3/regsvr.c | 90 -------------------------------------------------- include/msxml.idl | 5 ++- include/xmldom.idl | 18 ++++++++-- include/xmldso.idl | 6 +++- tools/wine.inf.in | 1 + 7 files changed, 41 insertions(+), 95 deletions(-) diff --git a/dlls/msxml/msxml.rgs b/dlls/msxml/msxml.rgs new file mode 100644 index 0000000..6f235da --- /dev/null +++ b/dlls/msxml/msxml.rgs @@ -0,0 +1,13 @@ +HKCR +{ + ForceRemove MSXML.DOMDocument = s 'XML DOM Document' + { + CLSID = s '{2933BF90-7B36-11D2-B20E-00C04F983E60}' + CurVer = s 'Microsoft.XMLDOM.1.0' + } + ForceRemove MSXML.FreeThreadedDOMDocument = s 'Free Threaded XML DOM Document' + { + CLSID = s '{2933BF91-7B36-11D2-B20E-00C04F983E60}' + CurVer = s 'Microsoft.FreeThreadedXMLDOM.1.0' + } +} diff --git a/dlls/msxml/rsrc.rc b/dlls/msxml/rsrc.rc index 9537637..473a324 100644 --- a/dlls/msxml/rsrc.rc +++ b/dlls/msxml/rsrc.rc @@ -20,3 +20,6 @@ /* @makedep: msxml_tlb.tlb */ 1 TYPELIB msxml_tlb.tlb + +/* @makedep: msxml.rgs */ +1 WINE_REGISTRY msxml.rgs diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index 7097b41..bbefedd 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -466,14 +466,6 @@ static LONG register_key_defvalueA( * coclass list */ static struct regsvr_coclass const coclass_list[] = { - { &CLSID_DOMDocument, - "XML DOM Document", - NULL, - "msxml3.dll", - "Both", - "Microsoft.XMLDOM", - "1.0" - }, { &CLSID_DOMDocument2, "XML DOM Document", NULL, @@ -490,22 +482,6 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.DOMDocument", "3.0" }, - { &CLSID_DOMFreeThreadedDocument, - "Free threaded XML DOM Document", - NULL, - "msxml3.dll", - "Both", - "Microsoft.FreeThreadedXMLDOM", - "1.0" - }, - { &CLSID_DOMFreeThreadedDocument, - "Free threaded XML DOM Document", - NULL, - "msxml3.dll", - "Both", - "Microsoft.FreeThreadedXMLDOM", - NULL - }, { &CLSID_FreeThreadedDOMDocument, "Free Threaded XML DOM Document", NULL, @@ -530,14 +506,6 @@ static struct regsvr_coclass const coclass_list[] = { "Microsoft.FreeThreadedDOMDocument.1.0", "1.0" }, - { &CLSID_XMLHTTPRequest, - "XML HTTP Request", - NULL, - "msxml3.dll", - "Apartment", - "Microsoft.XMLHTTP", - "1.0" - }, { &CLSID_XMLHTTP26, "XML HTTP 2.6", NULL, @@ -554,14 +522,6 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.XMLHTTP.3.0", "3.0" }, - { &CLSID_XMLDSOControl, - "XML Data Source Object", - NULL, - "msxml3.dll", - "Apartment", - "Microsoft.XMLDSO", - "1.0" - }, { &CLSID_XMLDocument, "Msxml", NULL, @@ -655,21 +615,6 @@ static struct regsvr_interface const interface_list[] = { * progid list */ static struct progid const progid_list[] = { - { "Microsoft.XMLDOM", - "XML DOM Document", - &CLSID_DOMDocument, - "Microsoft.XMLDOM.1.0" - }, - { "Microsoft.XMLDOM.1.0", - "XML DOM Document", - &CLSID_DOMDocument, - NULL - }, - { "MSXML.DOMDocument", - "XML DOM Document", - &CLSID_DOMDocument, - "Microsoft.XMLDOM.1.0" - }, { "Msxml2.DOMDocument", "XML DOM Document", &CLSID_DOMDocument2, @@ -680,21 +625,6 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument30, NULL }, - { "Microsoft.FreeThreadedXMLDOM", - "Free threaded XML DOM Document", - &CLSID_DOMFreeThreadedDocument, - "Microsoft.FreeThreadedXMLDOM.1.0" - }, - { "Microsoft.FreeThreadedXMLDOM.1.0", - "Free threaded XML DOM Document", - &CLSID_DOMFreeThreadedDocument, - NULL - }, - { "MSXML.FreeThreadedDOMDocument", - "Free threaded XML DOM Document", - &CLSID_DOMFreeThreadedDocument, - "Microsoft.FreeThreadedXMLDOM.1.0" - }, { "MSXML.FreeThreadedDOMDocument26", "Free threaded XML DOM Document 2.6", &CLSID_FreeThreadedDOMDocument26, @@ -705,16 +635,6 @@ static struct progid const progid_list[] = { &CLSID_FreeThreadedDOMDocument30, NULL }, - { "Microsoft.XMLHTTP", - "XML HTTP Request", - &CLSID_XMLHTTPRequest, - "Microsoft.XMLHTTP.1.0" - }, - { "Microsoft.XMLHTTP.1.0", - "XML HTTP Request", - &CLSID_XMLHTTPRequest, - NULL - }, { "Msxml2.XMLHTTP.2.6", "XML HTTP 2.6", &CLSID_XMLHTTP26, @@ -725,16 +645,6 @@ static struct progid const progid_list[] = { &CLSID_XMLHTTP30, NULL }, - { "Microsoft.XMLDSO", - "XML Data Source Object", - &CLSID_XMLDSOControl, - "Microsoft.XMLDSO.1.0" - }, - { "Microsoft.XMLDSO.1.0", - "XML Data Source Object", - &CLSID_XMLDSOControl, - NULL - }, { "Msxml", "Msxml", &CLSID_XMLDocument, diff --git a/include/msxml.idl b/include/msxml.idl index 62dbcfa..c6dd745 100644 --- a/include/msxml.idl +++ b/include/msxml.idl @@ -343,7 +343,10 @@ interface IXMLElementNotificationSink : IDispatch } [ -uuid(cfc399af-d876-11d0-9c10-00c04fc99c8e) + helpstring("Msxml"), + progid("Msxml"), + threading(both), + uuid(cfc399af-d876-11d0-9c10-00c04fc99c8e) ] coclass XMLDocument { diff --git a/include/xmldom.idl b/include/xmldom.idl index d47c06e..3e3b613 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -736,7 +736,11 @@ dispinterface XMLDOMDocumentEvents } [ -uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) + helpstring("XML DOM Document"), + progid("Microsoft.XMLDOM.1.0"), + vi_progid("Microsoft.XMLDOM"), + threading(both), + uuid(2933bf90-7b36-11d2-b20e-00c04f983e60) ] coclass DOMDocument { @@ -745,7 +749,11 @@ coclass DOMDocument } [ -uuid(2933bf91-7b36-11d2-b20e-00c04f983e60) + helpstring("Free Threaded XML DOM Document"), + progid("Microsoft.FreeThreadedXMLDOM.1.0"), + vi_progid("Microsoft.FreeThreadedXMLDOM"), + threading(both), + uuid(2933bf91-7b36-11d2-b20e-00c04f983e60) ] coclass DOMFreeThreadedDocument { @@ -809,7 +817,11 @@ interface IXMLHttpRequest : IDispatch } [ -uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8) + helpstring("XML HTTP Request"), + progid("Microsoft.XMLHTTP.1.0"), + vi_progid("Microsoft.XMLHTTP"), + threading(apartment), + uuid(ed8c108e-4349-11d2-91a4-00c04f7969e8) ] coclass XMLHTTPRequest { diff --git a/include/xmldso.idl b/include/xmldso.idl index c203422..60af6c3 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -49,7 +49,11 @@ interface IXMLDSOControl : IDispatch } [ -uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) + helpstring("XML Data Source Object"), + progid("Microsoft.XMLDSO.1.0"), + vi_progid("Microsoft.XMLDSO"), + threading(apartment), + uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) ] coclass XMLDSOControl { diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 0221640..e65162d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2527,6 +2527,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,msimtf.dll,1 11,,msisip.dll,1 11,,mstask.dll,1 +11,,msxml.dll,1 11,,msxml3.dll,1 11,,msxml4.dll,1 11,,msxml6.dll,1

1 0

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

21 Dec '10

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 + +@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: Add a couple of missing interfaces in msxml2. idl.
by Alexandre Julliard 21 Dec '10

21 Dec '10

Module: wine Branch: master Commit: d1c07d11869764c85693b83b2a579e1147a30f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c07d11869764c85693b83b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 21 12:17:31 2010 +0100 include: Add a couple of missing interfaces in msxml2.idl. --- include/msxml2.idl | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msxml2did.h | 46 ++++++++++++++++++++++ 2 files changed, 152 insertions(+), 0 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index c5738d2..9d49f46 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -258,6 +258,85 @@ typedef enum _SCHEMATYPEVARIETY [ local, object, +odl, +dual, +oleautomation, +uuid(65725580-9b5d-11d0-9bfe-00c04fc99c8e) +] +interface IXMLElementCollection : IDispatch +{ + [propput, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] + HRESULT length( [in] LONG v ); + + [propget, id(DISPID_XMLELEMENTCOLLECTION_LENGTH)] + HRESULT length( [retval, out] LONG *p ); + + [propget, id(DISPID_XMLELEMENTCOLLECTION_NEWENUM)] + HRESULT _newEnum( [retval, out] IUnknown ** ppUnk ); + + [id(DISPID_XMLELEMENTCOLLECTION_ITEM)] + HRESULT item( + [optional, in] VARIANT var1, + [optional, in] VARIANT var2, + [retval, out] IDispatch ** ppDisp ); +} + +[ +local, +object, +uuid(3f7f31ac-e15f-11d0-9c25-00c04fc99c8e) +] +interface IXMLElement : IDispatch +{ + [propget, id(DISPID_XMLELEMENT_TAGNAME)] + HRESULT tagName( [retval, out] BSTR *p); + + [propput, id(DISPID_XMLELEMENT_TAGNAME)] + HRESULT tagName( [in] BSTR p ); + + [propget, id(DISPID_XMLELEMENT_PARENT)] + HRESULT parent( [retval, out] IXMLElement **parent ); + + [id(DISPID_XMLELEMENT_SETATTRIBUTE)] + HRESULT setAttribute( + [in] BSTR strPropertyName, + [in] VARIANT PropertyValue ); + + [id(DISPID_XMLELEMENT_GETATTRIBUTE)] + HRESULT getAttribute( + [in] BSTR strPropertyName, + [retval, out] VARIANT *PropertyValue ); + + [id(DISPID_XMLELEMENT_REMOVEATTRIBUTE)] + HRESULT removeAttribute( + [in] BSTR strPropertyName ); + + [propget, id(DISPID_XMLELEMENT_CHILDREN)] + HRESULT children( [retval, out] IXMLElementCollection **p ); + + [propget, id(DISPID_XMLELEMENT_TYPE)] + HRESULT type( [retval, out] LONG *p ); + + [propget, id(DISPID_XMLELEMENT_TEXT)] + HRESULT text( [retval, out] BSTR *p ); + + [propput, id(DISPID_XMLELEMENT_TEXT)] + HRESULT text( [in] BSTR p ); + + [id(DISPID_XMLELEMENT_ADDCHILD)] + HRESULT addChild( + [in] IXMLElement *pChildElem, + [in] LONG lIndex, + [in] LONG lreserved ); + + [id(DISPID_XMLELEMENT_REMOVECHILD)] + HRESULT removeChild( + [in] IXMLElement *pChildElem ); +} + +[ +local, +object, dual, oleautomation, uuid (2933BF80-7B36-11d2-B20E-00C04F983E60) @@ -1112,6 +1191,33 @@ interface IXTLRuntime : IXMLDOMNode } [ +local, +object, +odl, +dual, +oleautomation, +uuid(310afa62-0575-11d2-9ca9-0060b0ec3d39), +pointer_default(unique) +] +interface IDSOControl : IDispatch +{ + [propget,id(DISPID_XMLDSO_DOCUMENT)] + HRESULT XMLDocument([out, retval] IXMLDOMDocument** ppDoc); + + [propput,id(DISPID_XMLDSO_DOCUMENT)] + HRESULT XMLDocument([in] IXMLDOMDocument* ppDoc); + + [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] + HRESULT JavaDSOCompatible([out, retval] BOOL* fJavaDSOCompatible); + + [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] + HRESULT JavaDSOCompatible([in] BOOL fJavaDSOCompatible); + + [propget, id(DISPID_READYSTATE)] + HRESULT readyState([out, retval] long *state); +} + +[ uuid(3efaa427-272f-11d2-836f-0000f87a7782) ] dispinterface XMLDOMDocumentEvents diff --git a/include/msxml2did.h b/include/msxml2did.h index 1aae2a7..e9dbeb8 100644 --- a/include/msxml2did.h +++ b/include/msxml2did.h @@ -20,6 +20,52 @@ #ifndef __MSXML2DID_H__ #define __MSXML2DID_H__ +#define DISPID_XOBJ_MIN 0x10000 +#define DISPID_XOBJ_MAX 0x1FFFF +#define DISPID_XOBJ_BASE 0x10000 + +#define DISPID_XMLELEMENTCOLLECTION 0x10000 +#define DISPID_XMLELEMENTCOLLECTION_LENGTH 0x10001 +#define DISPID_XMLELEMENTCOLLECTION_NEWENUM DISPID_NEWENUM +#define DISPID_XMLELEMENTCOLLECTION_ITEM 0x10003 + +#define DISPID_XMLDOCUMENT 0x10064 +#define DISPID_XMLDOCUMENT_ROOT 0x10065 +#define DISPID_XMLDOCUMENT_FILESIZE 0x10066 +#define DISPID_XMLDOCUMENT_FILEMODIFIEDDATE 0x10067 +#define DISPID_XMLDOCUMENT_FILEUPDATEDDATE 0x10068 +#define DISPID_XMLDOCUMENT_URL 0x10069 +#define DISPID_XMLDOCUMENT_MIMETYPE 0x1006a +#define DISPID_XMLDOCUMENT_READYSTATE 0x1006b +#define DISPID_XMLDOCUMENT_CREATEELEMENT 0x1006c +#define DISPID_XMLDOCUMENT_CHARSET 0x1006d +#define DISPID_XMLDOCUMENT_VERSION 0x1006e +#define DISPID_XMLDOCUMENT_DOCTYPE 0x1006f +#define DISPID_XMLDOCUMENT_DTDURL 0x10070 +#define DISPID_XMLDOCUMENT_ASYNC 0x10071 +#define DISPID_XMLDOCUMENT_CASEINSENSITIVE 0x10072 + +#define DISPID_XMLELEMENT 0x100c8 +#define DISPID_XMLELEMENT_TAGNAME 0x100c9 +#define DISPID_XMLELEMENT_PARENT 0x100ca +#define DISPID_XMLELEMENT_SETATTRIBUTE 0x100cb +#define DISPID_XMLELEMENT_GETATTRIBUTE 0x100cc +#define DISPID_XMLELEMENT_REMOVEATTRIBUTE 0x100cd +#define DISPID_XMLELEMENT_CHILDREN 0x100ce +#define DISPID_XMLELEMENT_TYPE 0x100cf +#define DISPID_XMLELEMENT_TEXT 0x100d0 +#define DISPID_XMLELEMENT_ADDCHILD 0x100d1 +#define DISPID_XMLELEMENT_REMOVECHILD 0x100d2 +#define DISPID_XMLELEMENT_ATTRIBUTES 0x100d3 + +#define DISPID_XMLNOTIFSINK 0x1012c +#define DISPID_XMLNOTIFSINK_CHILDADDED 0x1012d + +#define DISPID_XMLATTRIBUTE 0x10190 +#define DISPID_XMLATTRIBUTE_NAME 0x10191 +#define DISPID_XMLATTRIBUTE_VALUE 0x10192 + + #define DISPID_DOM_BASE 0x00000001 #define DISPID_DOM_COLLECTION_BASE 0x000f4240 #define DISPID_DOM_COLLECTION_MAX 0x002dc6bf

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010