September 2009 - Wine-Commits

Jacek Caban : jscript: Code clean up.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: c444a4907e5e4c1e58c90d82f642389f33a37d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c444a4907e5e4c1e58c90d82f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 1 13:26:08 2009 +0200 jscript: Code clean up. --- dlls/jscript/array.c | 2 +- dlls/jscript/dispex.c | 8 ++++---- dlls/jscript/engine.c | 4 ++-- dlls/jscript/error.c | 6 +++--- dlls/jscript/jscript.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6b7a58f..04f3dde 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -924,7 +924,7 @@ HRESULT create_array_constr(script_ctx_t *ctx, DispatchEx *object_prototype, Dis hres = create_builtin_function(ctx, ArrayConstr_value, NULL, PROPF_CONSTR, &array->dispex, ret); - IDispatchEx_Release(_IDispatchEx_(&array->dispex)); + jsdisp_release(&array->dispex); return hres; } diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 12fcb3a..5e90e22 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -788,7 +788,7 @@ HRESULT init_dispex_from_constr(DispatchEx *dispex, script_ctx_t *ctx, const bui hres = init_dispex(dispex, ctx, builtin_info, prot); if(prot) - IDispatchEx_Release(_IDispatchEx_(prot)); + jsdisp_release(prot); return hres; } @@ -871,7 +871,7 @@ HRESULT disp_call(IDispatch *disp, DISPID id, LCID lcid, WORD flags, DISPPARAMS jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { hres = jsdisp_call(jsdisp, id, lcid, flags, dp, retv, ei, caller); - IDispatchEx_Release(_IDispatchEx_(jsdisp)); + jsdisp_release(jsdisp); return hres; } @@ -940,7 +940,7 @@ HRESULT disp_propput(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce else hres = DISP_E_MEMBERNOTFOUND; - IDispatchEx_Release(_IDispatchEx_(jsdisp)); + jsdisp_release(jsdisp); return hres; } @@ -1010,7 +1010,7 @@ HRESULT disp_propget(IDispatch *disp, DISPID id, LCID lcid, VARIANT *val, jsexce jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { hres = jsdisp_propget(jsdisp, id, lcid, val, ei, caller); - IDispatchEx_Release(_IDispatchEx_(jsdisp)); + jsdisp_release(jsdisp); return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 43b422c..cbd2797 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -174,7 +174,7 @@ void scope_release(scope_chain_t *scope) if(scope->next) scope_release(scope->next); - IDispatchEx_Release(_IDispatchEx_(scope->obj)); + jsdisp_release(scope->obj); heap_free(scope); } @@ -211,7 +211,7 @@ void exec_release(exec_ctx_t *ctx) if(ctx->scope_chain) scope_release(ctx->scope_chain); if(ctx->var_disp) - IDispatchEx_Release(_IDispatchEx_(ctx->var_disp)); + jsdisp_release(ctx->var_disp); if(ctx->this_obj) IDispatch_Release(ctx->this_obj); heap_free(ctx); diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 70fd008..f3da405 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -268,7 +268,7 @@ static HRESULT error_constr(DispatchEx *dispex, WORD flags, DISPPARAMS *dp, V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(err); } else - IDispatchEx_Release(_IDispatchEx_(err)); + jsdisp_release(err); return S_OK; @@ -367,7 +367,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype) V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(names[i]); if(!V_BSTR(&v)) { - IDispatchEx_Release(_IDispatchEx_(&err->dispex)); + jsdisp_release(&err->dispex); return E_OUTOFMEMORY; } @@ -377,7 +377,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, DispatchEx *object_prototype) hres = create_builtin_function(ctx, constr_val[i], NULL, PROPF_CONSTR, &err->dispex, constr_addr[i]); - IDispatchEx_Release(_IDispatchEx_(&err->dispex)); + jsdisp_release(&err->dispex); VariantClear(&v); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index b536014..0771e9b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -361,12 +361,12 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) change_state(This, SCRIPTSTATE_CLOSED); if(This->ctx->script_disp) { - IDispatchEx_Release(_IDispatchEx_(This->ctx->script_disp)); + jsdisp_release(This->ctx->script_disp); This->ctx->script_disp = NULL; } if(This->ctx->global) { - IDispatchEx_Release(_IDispatchEx_(This->ctx->global)); + jsdisp_release(This->ctx->global); This->ctx->global = NULL; } }

1 0

Henri Verbeet : ddraw: Remove trailing spaces.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: ee60e5fd712a26dbcf2444879bbcf8a7f257d9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee60e5fd712a26dbcf2444879… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 1 09:09:37 2009 +0200 ddraw: Remove trailing spaces. --- dlls/ddraw/ddraw.c | 25 +++++++++++++------------ dlls/ddraw/device.c | 6 +++--- dlls/ddraw/executebuffer.c | 24 ++++++++++++------------ dlls/ddraw/light.c | 16 ++++++++-------- dlls/ddraw/parent.c | 3 +-- dlls/ddraw/surface.c | 5 +---- dlls/ddraw/tests/ddrawmodes.c | 21 ++++++++++----------- dlls/ddraw/utils.c | 2 +- dlls/ddraw/viewport.c | 32 +++++++++++++++----------------- 9 files changed, 64 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee60e5fd712a26dbcf244…

1 0

Henri Verbeet : wined3d: Only warn about using Lod sample functions in fragment shaders is ARB_shader_texture_lod isn 't supported.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: ab8523931aff5ce25d334aec2ae3612ec16f2ff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab8523931aff5ce25d334aec2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 1 09:09:36 2009 +0200 wined3d: Only warn about using Lod sample functions in fragment shaders is ARB_shader_texture_lod isn't supported. --- dlls/wined3d/glsl_shader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8aae5f5..b6fac0c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2769,6 +2769,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; + const struct wined3d_gl_info *gl_info = &deviceImpl->adapter->gl_info; glsl_sample_function_t sample_function; glsl_src_param_t coord_param, lod_param; DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; @@ -2787,7 +2788,8 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) + if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] + && shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { /* The GLSL spec claims the Lod sampling functions are only supported in vertex shaders. * However, they seem to work just fine in fragment shaders as well. */

1 0

Henri Verbeet : wined3d: Add support for ARB_depth_clamp.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 078273afa6797453a9e7da444c470b4a2dbbfc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=078273afa6797453a9e7da444… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 1 09:09:35 2009 +0200 wined3d: Add support for ARB_depth_clamp. --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/state.c | 14 ++++++++------ dlls/wined3d/wined3d_gl.h | 7 +++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5e66f34..d9608f5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -56,6 +56,7 @@ static const struct { /* ARB */ {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT, 0 }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT, 0 }, + {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP, 0 }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE, 0 }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM, 0 }, @@ -1662,6 +1663,11 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) TRACE_(d3d_caps)(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n"); gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE; } + if (!gl_info->supported[ARB_DEPTH_CLAMP] && gl_info->supported[NV_DEPTH_CLAMP]) + { + TRACE_(d3d_caps)(" IMPLIED: ARB_depth_clamp support (by NV_depth_clamp).\n"); + gl_info->supported[ARB_DEPTH_CLAMP] = TRUE; + } if (gl_info->supported[NV_TEXTURE_SHADER2]) { if (gl_info->supported[NV_REGISTER_COMBINERS]) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8ddfd28..2df21ad 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -564,16 +564,18 @@ static void state_clipping(DWORD state, IWineD3DStateBlockImpl *stateblock, stru if (stateblock->renderState[WINED3DRS_CLIPPING]) { enable = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; disable = ~stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; - if(GL_SUPPORT(NV_DEPTH_CLAMP)) { - glDisable(GL_DEPTH_CLAMP_NV); - checkGLcall("glDisable(GL_DEPTH_CLAMP_NV)"); + if (GL_SUPPORT(ARB_DEPTH_CLAMP)) + { + glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); } } else { disable = 0xffffffff; enable = 0x00; - if(GL_SUPPORT(NV_DEPTH_CLAMP)) { - glEnable(GL_DEPTH_CLAMP_NV); - checkGLcall("glEnable(GL_DEPTH_CLAMP_NV)"); + if (GL_SUPPORT(ARB_DEPTH_CLAMP)) + { + glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); } } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index f5f5e18..9c85d57 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1528,6 +1528,12 @@ typedef void (WINE_GLAPI *PGLFNCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); #define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8dad #endif +/* GL_ARB_depth_clamp */ +#ifndef GL_ARB_depth_clamp +#define GL_ARB_depth_clamp 1 +#define GL_DEPTH_CLAMP 0x864f +#endif + /* GL_ARB_depth_texture */ #ifndef GL_ARB_depth_texture #define GL_ARB_depth_texture 1 @@ -3405,6 +3411,7 @@ typedef enum _GL_SupportedExt { /* ARB */ ARB_COLOR_BUFFER_FLOAT, ARB_DEPTH_BUFFER_FLOAT, + ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DRAW_BUFFERS, ARB_FRAGMENT_PROGRAM,

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectShaderVariable interface.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 89e7addf9cb645fa7f0e9f10529eefd8b9a2ccf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e7addf9cb645fa7f0e9f105… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 1 09:09:34 2009 +0200 d3d10: Add the ID3D10EffectShaderVariable interface. --- include/d3d10effect.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 645ff39..2178e7d 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -508,6 +508,49 @@ DECLARE_INTERFACE_(ID3D10EffectDepthStencilViewVariable, ID3D10EffectVariable) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectShaderVariable, 0x80849279, 0xc799, 0x4797, 0x8c, 0x33, 0x04, 0x07, 0xa0, 0x7d, 0x9e, 0x06); + +#define INTERFACE ID3D10EffectShaderVariable +DECLARE_INTERFACE_(ID3D10EffectShaderVariable, ID3D10EffectVariable) +{ + /* ID3D10EffectVariable methods */ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectType *, GetType)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_EFFECT_VARIABLE_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetMemberBySemantic)(THIS_ LPCSTR semantic) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetElement)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, GetParentConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectScalarVariable *, AsScalar)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectVectorVariable *, AsVector)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectMatrixVariable *, AsMatrix)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectStringVariable *, AsString)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderResourceVariable *, AsShaderResource)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRenderTargetViewVariable *, AsRenderTargetView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilViewVariable *, AsDepthStencilView)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectConstantBuffer *, AsConstantBuffer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectShaderVariable *, AsShader)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectBlendVariable *, AsBlend)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectDepthStencilVariable *, AsDepthStencil)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectRasterizerVariable *, AsRasterizer)(THIS) PURE; + STDMETHOD_(struct ID3D10EffectSamplerVariable *, AsSampler)(THIS) PURE; + STDMETHOD(SetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + STDMETHOD(GetRawValue)(THIS_ void *data, UINT offset, UINT count) PURE; + /* ID3D10EffectShaderVariable methods */ + STDMETHOD(GetShaderDesc)(THIS_ UINT index, D3D10_EFFECT_SHADER_DESC *desc) PURE; + STDMETHOD(GetVertexShader)(THIS_ UINT index, ID3D10VertexShader **shader) PURE; + STDMETHOD(GetGeometryShader)(THIS_ UINT index, ID3D10GeometryShader **shader) PURE; + STDMETHOD(GetPixelShader)(THIS_ UINT index, ID3D10PixelShader **shader) PURE; + STDMETHOD(GetInputSignatureElementDesc)(THIS_ UINT shader_index, UINT element_index, + D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE; + STDMETHOD(GetOutputSignatureElementDesc)(THIS_ UINT shader_index, UINT element_index, + D3D10_SIGNATURE_PARAMETER_DESC *desc) PURE; +}; +#undef INTERFACE + DEFINE_GUID(IID_ID3D10EffectTechnique, 0xdb122ce8, 0xd1c9, 0x4292, 0xb2, 0x37, 0x24, 0xed, 0x3d, 0xe8, 0xb1, 0x75); #define INTERFACE ID3D10EffectTechnique

1 0

Henri Verbeet : d3d10: Add the _D3D10_SIGNATURE_PARAMETER_DESC struct.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: d8f60a04e3f74592b5435ad5aa9453983dc9d32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f60a04e3f74592b5435ad5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 1 09:09:33 2009 +0200 d3d10: Add the _D3D10_SIGNATURE_PARAMETER_DESC struct. --- include/d3d10shader.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 7910057..4033c9b 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -113,4 +113,15 @@ typedef struct _D3D10_SHADER_MACRO LPCSTR Definition; } D3D10_SHADER_MACRO, *LPD3D10_SHADER_MACRO; +typedef struct _D3D10_SIGNATURE_PARAMETER_DESC +{ + LPCSTR SemanticName; + UINT SemanticIndex; + UINT Register; + D3D10_NAME SystemValueType; + D3D10_REGISTER_COMPONENT_TYPE ComponentType; + BYTE Mask; + BYTE ReadWriteMask; +} D3D10_SIGNATURE_PARAMETER_DESC; + #endif /* __WINE_D3D10SHADER_H */

1 0

Alexandre Julliard : msxml3: Move typelib definitions out of #ifdef HAVE_LIBXML2.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 5be5e06e125bb33f16f7192a9cb34fad9a0ca9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5be5e06e125bb33f16f7192a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 1 14:05:02 2009 +0200 msxml3: Move typelib definitions out of #ifdef HAVE_LIBXML2. --- dlls/msxml3/msxml_private.h | 78 +++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 39 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 08a324a..57dec0f 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -29,45 +29,6 @@ # error You must include config.h to use this header #endif -#ifdef HAVE_LIBXML2 - -#ifdef HAVE_LIBXML_PARSER_H -#include <libxml/parser.h> -#endif - -/* constructors */ -extern IUnknown *create_domdoc( xmlNodePtr document ); -extern IUnknown *create_xmldoc( void ); -extern IXMLDOMNode *create_node( xmlNodePtr node ); -extern IUnknown *create_element( xmlNodePtr element ); -extern IUnknown *create_attribute( xmlNodePtr attribute ); -extern IUnknown *create_text( xmlNodePtr text ); -extern IUnknown *create_pi( xmlNodePtr pi ); -extern IUnknown *create_comment( xmlNodePtr comment ); -extern IUnknown *create_cdata( xmlNodePtr text ); -extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); -extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); -extern IUnknown *create_doc_Implementation(); -extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); -extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); - -extern HRESULT queryresult_create( xmlNodePtr, LPWSTR, IXMLDOMNodeList ** ); - -/* data accessors */ -xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ); - -/* helpers */ -extern xmlChar *xmlChar_from_wchar( LPWSTR str ); - -extern LONG xmldoc_add_ref( xmlDocPtr doc ); -extern LONG xmldoc_release( xmlDocPtr doc ); -extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); -extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); - -extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); - -extern xmlDocPtr parse_xml(char *ptr, int len); - /* typelibs */ typedef enum tid_t { IXMLDOMAttribute_tid, @@ -139,6 +100,45 @@ typedef struct { void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*); BOOL dispex_query_interface(DispatchEx*,REFIID,void**); +#ifdef HAVE_LIBXML2 + +#ifdef HAVE_LIBXML_PARSER_H +#include <libxml/parser.h> +#endif + +/* constructors */ +extern IUnknown *create_domdoc( xmlNodePtr document ); +extern IUnknown *create_xmldoc( void ); +extern IXMLDOMNode *create_node( xmlNodePtr node ); +extern IUnknown *create_element( xmlNodePtr element ); +extern IUnknown *create_attribute( xmlNodePtr attribute ); +extern IUnknown *create_text( xmlNodePtr text ); +extern IUnknown *create_pi( xmlNodePtr pi ); +extern IUnknown *create_comment( xmlNodePtr comment ); +extern IUnknown *create_cdata( xmlNodePtr text ); +extern IXMLDOMNodeList *create_children_nodelist( xmlNodePtr ); +extern IXMLDOMNamedNodeMap *create_nodemap( IXMLDOMNode *node ); +extern IUnknown *create_doc_Implementation(); +extern IUnknown *create_doc_fragment( xmlNodePtr fragment ); +extern IUnknown *create_doc_entity_ref( xmlNodePtr entity ); + +extern HRESULT queryresult_create( xmlNodePtr, LPWSTR, IXMLDOMNodeList ** ); + +/* data accessors */ +xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ); + +/* helpers */ +extern xmlChar *xmlChar_from_wchar( LPWSTR str ); + +extern LONG xmldoc_add_ref( xmlDocPtr doc ); +extern LONG xmldoc_release( xmlDocPtr doc ); +extern HRESULT xmldoc_add_orphan( xmlDocPtr doc, xmlNodePtr node ); +extern HRESULT xmldoc_remove_orphan( xmlDocPtr doc, xmlNodePtr node ); + +extern HRESULT XMLElement_create( IUnknown *pUnkOuter, xmlNodePtr node, LPVOID *ppObj ); + +extern xmlDocPtr parse_xml(char *ptr, int len); + /* IXMLDOMNode Internal Structure */ typedef struct _xmlnode {

1 0

Austin English : ole32: Fix build on Power PC.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: f8daa90284d5119604bf0df96a7bbb39139d09ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8daa90284d5119604bf0df96… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 31 22:22:13 2009 -0500 ole32: Fix build on Power PC. --- dlls/ole32/stg_prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 9bf9481..1c77c9e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -977,7 +977,7 @@ static void PropertyStorage_ByteSwapString(LPWSTR str, size_t len) * FIXME: alignment? */ for (i = 0; i < len; i++) - str[i] = le16toh(str[i]); + str[i] = lendian16toh(str[i]); } #else #define PropertyStorage_ByteSwapString(s, l)

1 0

Austin English : oleaut32: Avoid a NULL pointer dereference.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: e7bbc32bd120351199dc1a1a7fb402ec089384a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bbc32bd120351199dc1a1a7… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Aug 31 20:38:01 2009 -0500 oleaut32: Avoid a NULL pointer dereference. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b86109c..be8462a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3131,7 +3131,7 @@ typedef struct static HRESULT sltg_get_typelib_ref(const sltg_ref_lookup_t *table, DWORD typeinfo_ref, HREFTYPE *typelib_ref) { - if(typeinfo_ref < table->num) + if(table && typeinfo_ref < table->num) { *typelib_ref = table->refs[typeinfo_ref]; return S_OK;

1 0

Nikolay Sivov : comctl32/listview: Call default handler for WM_PAINT disabled by WM_SETREDRAW.
by Alexandre Julliard Sept. 1, 2009

Sept. 1, 2009

Module: wine Branch: master Commit: 7420c0d0dea884c3338bd8af4025c66d4b8a6f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7420c0d0dea884c3338bd8af4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Aug 31 23:13:50 2009 +0400 comctl32/listview: Call default handler for WM_PAINT disabled by WM_SETREDRAW. --- dlls/comctl32/listview.c | 3 ++- dlls/comctl32/tests/listview.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 36e7b7e..afe7116 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9781,7 +9781,8 @@ static inline LRESULT LISTVIEW_WMPaint(LISTVIEW_INFO *infoPtr, HDC hdc) { TRACE("(hdc=%p)\n", hdc); - if (!is_redrawing(infoPtr)) return 0; + if (!is_redrawing(infoPtr)) + return DefWindowProcW (infoPtr->hwndSelf, WM_PAINT, (WPARAM)hdc, 0); return LISTVIEW_Paint(infoPtr, hdc); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b6a368b..244f3a5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2770,6 +2770,7 @@ static void test_setredraw(void) DWORD_PTR style; DWORD ret; HDC hdc; + RECT rect; hwnd = create_listview_control(LVS_OWNERDATA); ok(hwnd != NULL, "failed to create a listview window\n"); @@ -2790,6 +2791,16 @@ static void test_setredraw(void) ret = SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); expect(0, ret); + /* check update rect after redrawing */ + ret = SendMessage(hwnd, WM_SETREDRAW, FALSE, 0); + expect(0, ret); + InvalidateRect(hwnd, NULL, FALSE); + RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); + rect.right = rect.bottom = 1; + GetUpdateRect(hwnd, &rect, FALSE); + expect(0, rect.right); + expect(0, rect.bottom); + /* WM_ERASEBKGND */ hdc = GetWindowDC(hwndparent); ret = SendMessage(hwnd, WM_ERASEBKGND, (WPARAM)hdc, 0);

1 0