December 2010 - Wine-commits

Alexandre Julliard : msdaps: Convert dll registration to the IRegistrar mechanism.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: c57519cf4c90924facdb10423182ee77f2d1775b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57519cf4c90924facdb10423… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 1 14:14:45 2010 +0100 msdaps: Convert dll registration to the IRegistrar mechanism. --- dlls/msdaps/Makefile.in | 7 +- dlls/msdaps/main.c | 18 ++ dlls/msdaps/regsvr.c | 608 -------------------------------------------- dlls/msdaps/row_server.idl | 16 ++ 4 files changed, 39 insertions(+), 610 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c57519cf4c90924facdb1…

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private().
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 6b9118e4628059f166d1dcfcf71648e5aa1fc6ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9118e4628059f166d1dcfcf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:46 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to alloc_private(). --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++++--------- dlls/wined3d/ati_fragment_shader.c | 13 +++++++------ dlls/wined3d/device.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index efc0ab0..196d901 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5460,24 +5460,27 @@ static void arbfp_enable(BOOL enable) LEAVE_GL(); } -static HRESULT arbfp_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; +static HRESULT arbfp_alloc(IWineD3DDeviceImpl *device) +{ struct shader_arb_priv *priv; /* Share private data between the shader backend and the pipeline replacement, if both * are the arb implementation. This is needed to figure out whether ARBfp should be disabled * if no pixel shader is bound or not */ - if(This->shader_backend == &arb_program_shader_backend) { - This->fragment_priv = This->shader_priv; - } else { - This->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_arb_priv)); - if(!This->fragment_priv) return E_OUTOFMEMORY; + if (device->shader_backend == &arb_program_shader_backend) + { + device->fragment_priv = device->shader_priv; } - priv = This->fragment_priv; + else + { + device->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_arb_priv)); + if (!device->fragment_priv) return E_OUTOFMEMORY; + } + priv = device->fragment_priv; if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) { ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, This->fragment_priv); + HeapFree(GetProcessHeap(), 0, device->fragment_priv); return E_OUTOFMEMORY; } priv->use_arbfp_fixed_func = TRUE; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 8ea0cd5..85903ee 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1114,20 +1114,21 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxSimultaneousTextures = 6; } -static HRESULT atifs_alloc(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; +static HRESULT atifs_alloc(IWineD3DDeviceImpl *device) +{ struct atifs_private_data *priv; - This->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct atifs_private_data)); - if(!This->fragment_priv) { + device->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct atifs_private_data)); + if (!device->fragment_priv) + { ERR("Out of memory\n"); return E_OUTOFMEMORY; } - priv = This->fragment_priv; + priv = device->fragment_priv; if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) { ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, This->fragment_priv); + HeapFree(GetProcessHeap(), 0, device->fragment_priv); return E_OUTOFMEMORY; } return WINED3D_OK; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 102b65c..4a7f6dd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1968,7 +1968,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, TRACE("Shader private data couldn't be allocated\n"); goto err_out; } - hr = This->frag_pipe->alloc_private(iface); + hr = This->frag_pipe->alloc_private(This); if(FAILED(hr)) { TRACE("Fragment pipeline private data couldn't be allocated\n"); goto err_out; @@ -6251,7 +6251,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap goto err; } - hr = This->frag_pipe->alloc_private(iface); + hr = This->frag_pipe->alloc_private(This); if (FAILED(hr)) { ERR("Failed to allocate fragment pipe private data, hr %#x.\n", hr); diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index dcf7816..8e52057 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -693,7 +693,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct pCaps->MaxSimultaneousTextures = gl_info->limits.textures; } -static HRESULT nvrc_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static HRESULT nvrc_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ static void nvrc_fragment_free(IWineD3DDevice *iface) {} diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8c5db84..d4c2d11 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5696,7 +5696,7 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct pCaps->MaxSimultaneousTextures = gl_info->limits.textures; } -static HRESULT ffp_fragment_alloc(IWineD3DDevice *iface) { return WINED3D_OK; } +static HRESULT ffp_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } static void ffp_fragment_free(IWineD3DDevice *iface) {} static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e04c71e..1a0500f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1145,7 +1145,7 @@ struct fragment_pipeline { void (*enable_extension)(BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); - HRESULT (*alloc_private)(IWineD3DDevice *iface); + HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); void (*free_private)(IWineD3DDevice *iface); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); const struct StateEntryTemplate *states;

1 0

Henri Verbeet : wined3d: Pass an IWineD3DDeviceImpl pointer to free_private ().
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: a4477fea4ae9d893cffb9d9ee43c09622cb121c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4477fea4ae9d893cffb9d9ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:47 2010 +0100 wined3d: Pass an IWineD3DDeviceImpl pointer to free_private(). --- dlls/wined3d/arb_program_shader.c | 13 +++++++------ dlls/wined3d/ati_fragment_shader.c | 10 +++++----- dlls/wined3d/device.c | 8 ++++---- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 196d901..6c28d7f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5501,15 +5501,16 @@ static void arbfp_free_ffpshader(struct wine_rb_entry *entry, void *context) } /* Context activation is done by the caller. */ -static void arbfp_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct shader_arb_priv *priv = This->fragment_priv; +static void arbfp_free(IWineD3DDeviceImpl *device) +{ + struct shader_arb_priv *priv = device->fragment_priv; - wine_rb_destroy(&priv->fragment_shaders, arbfp_free_ffpshader, &This->adapter->gl_info); + wine_rb_destroy(&priv->fragment_shaders, arbfp_free_ffpshader, &device->adapter->gl_info); priv->use_arbfp_fixed_func = FALSE; - if(This->shader_backend != &arb_program_shader_backend) { - HeapFree(GetProcessHeap(), 0, This->fragment_priv); + if (device->shader_backend != &arb_program_shader_backend) + { + HeapFree(GetProcessHeap(), 0, device->fragment_priv); } } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 85903ee..0d17250 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1149,14 +1149,14 @@ static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *context) } /* Context activation is done by the caller. */ -static void atifs_free(IWineD3DDevice *iface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - struct atifs_private_data *priv = This->fragment_priv; +static void atifs_free(IWineD3DDeviceImpl *device) +{ + struct atifs_private_data *priv = device->fragment_priv; - wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, This); + wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, device); HeapFree(GetProcessHeap(), 0, priv); - This->fragment_priv = NULL; + device->fragment_priv = NULL; } static BOOL atifs_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a7f6dd..c9920e8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2053,7 +2053,7 @@ err_out: This->blitter->free_private(iface); } if (This->fragment_priv) { - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); } if (This->shader_priv) { This->shader_backend->shader_free_private(This); @@ -2186,7 +2186,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, /* Destroy the shader backend. Note that this has to happen after all shaders are destroyed. */ This->blitter->free_private(iface); - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); /* Release the buffers (with sanity checks)*/ @@ -6200,7 +6200,7 @@ static void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChainImpl LEAVE_GL(); This->blitter->free_private(iface); - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); destroy_dummy_textures(This, gl_info); @@ -6263,7 +6263,7 @@ static HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwap if (FAILED(hr)) { ERR("Failed to allocate blitter private data, hr %#x.\n", hr); - This->frag_pipe->free_private(iface); + This->frag_pipe->free_private(This); This->shader_backend->shader_free_private(This); goto err; } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 8e52057..599039e 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -695,7 +695,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct static HRESULT nvrc_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } /* Context activation is done by the caller. */ -static void nvrc_fragment_free(IWineD3DDevice *iface) {} +static void nvrc_fragment_free(IWineD3DDeviceImpl *device) {} /* Two fixed function pipeline implementations using GL_NV_register_combiners and * GL_NV_texture_shader. The nvts_fragment_pipeline assumes that both extensions diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d4c2d11..77f3b98 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5697,7 +5697,7 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct } static HRESULT ffp_fragment_alloc(IWineD3DDeviceImpl *device) { return WINED3D_OK; } -static void ffp_fragment_free(IWineD3DDevice *iface) {} +static void ffp_fragment_free(IWineD3DDeviceImpl *device) {} static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) { if (TRACE_ON(d3d)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a0500f..c10055f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1146,7 +1146,7 @@ struct fragment_pipeline void (*enable_extension)(BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); HRESULT (*alloc_private)(IWineD3DDeviceImpl *device); - void (*free_private)(IWineD3DDevice *iface); + void (*free_private)(IWineD3DDeviceImpl *device); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); const struct StateEntryTemplate *states; BOOL ffp_proj_control;

1 0

Henri Verbeet : wined3d: Move min_rel_offset / max_rel_offset to the shader_reg_maps structure.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 03d7f527cf206d254fbe6cad0bef4bd96ccb7321 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d7f527cf206d254fbe6cad0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 1 20:50:48 2010 +0100 wined3d: Move min_rel_offset / max_rel_offset to the shader_reg_maps structure. --- dlls/wined3d/shader.c | 27 +++++++++------------------ dlls/wined3d/wined3d_private.h | 4 +--- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9eaf89c..8220d65 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -399,17 +399,8 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *shader, struct case WINED3DSPR_CONST: if (reg->rel_addr) { - if (shader_type != WINED3D_SHADER_TYPE_PIXEL) - { - if (reg->idx < ((IWineD3DVertexShaderImpl *)shader)->min_rel_offset) - { - ((IWineD3DVertexShaderImpl *)shader)->min_rel_offset = reg->idx; - } - if (reg->idx > ((IWineD3DVertexShaderImpl *)shader)->max_rel_offset) - { - ((IWineD3DVertexShaderImpl *)shader)->max_rel_offset = reg->idx; - } - } + if (reg->idx < reg_maps->min_rel_offset) reg_maps->min_rel_offset = reg->idx; + if (reg->idx > reg_maps->max_rel_offset) reg_maps->max_rel_offset = reg->idx; reg_maps->usesrelconstF = TRUE; } else @@ -1904,21 +1895,21 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * if (device->vs_selected_mode == SHADER_ARB && (gl_info->quirks & WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT) - && shader->min_rel_offset <= shader->max_rel_offset) + && reg_maps->min_rel_offset <= reg_maps->max_rel_offset) { - if (shader->max_rel_offset - shader->min_rel_offset > 127) + if (reg_maps->max_rel_offset - reg_maps->min_rel_offset > 127) { FIXME("The difference between the minimum and maximum relative offset is > 127.\n"); FIXME("Which this OpenGL implementation does not support. Try using GLSL.\n"); - FIXME("Min: %d, Max: %d.\n", shader->min_rel_offset, shader->max_rel_offset); + FIXME("Min: %u, Max: %u.\n", reg_maps->min_rel_offset, reg_maps->max_rel_offset); } - else if (shader->max_rel_offset - shader->min_rel_offset > 63) + else if (reg_maps->max_rel_offset - reg_maps->min_rel_offset > 63) { - shader->rel_offset = shader->min_rel_offset + 63; + shader->rel_offset = reg_maps->min_rel_offset + 63; } - else if (shader->max_rel_offset > 63) + else if (reg_maps->max_rel_offset > 63) { - shader->rel_offset = shader->min_rel_offset; + shader->rel_offset = reg_maps->min_rel_offset; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c10055f..aa77211 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -568,7 +568,7 @@ typedef struct shader_reg_maps /* Whether or not loops are used in this shader, and nesting depth */ unsigned loop_depth; unsigned highest_render_target; - + UINT min_rel_offset, max_rel_offset; } shader_reg_maps; /* Keeps track of details for TEX_M#x# instructions which need to maintain @@ -2868,8 +2868,6 @@ typedef struct IWineD3DVertexShaderImpl { /* Vertex shader attributes. */ struct wined3d_shader_attribute attributes[MAX_ATTRIBS]; - - UINT min_rel_offset, max_rel_offset; UINT rel_offset; } IWineD3DVertexShaderImpl;

1 0

Piotr Caban : msvcrt: Added _get_terminate implementation.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: cab51a0546cfd389802b3eb531ca2ce790cd05c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cab51a0546cfd389802b3eb53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 1 21:14:23 2010 +0100 msvcrt: Added _get_terminate implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/cpp.c | 10 ++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4cd7f3a..1c2c66f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -688,7 +688,7 @@ @ stub _get_pgmptr @ stub _get_printf_count_output @ stub _get_purecall_handler -@ stub _get_terminate +@ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ab74956..8ab1835 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -533,7 +533,7 @@ @ stub _get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold -@ stub _get_terminate +@ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e6da0da..f1a2bde 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -523,7 +523,7 @@ @ stub _get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold -@ stub _get_terminate +@ cdecl _get_terminate() msvcrt._get_terminate @ stub _get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ stub _get_unexpected diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index c3e6ec8..4d0f5d5 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1026,6 +1026,16 @@ MSVCRT_terminate_function CDECL MSVCRT_set_terminate(MSVCRT_terminate_function f } /****************************************************************** + * _get_terminate (MSVCRT.@) + */ +MSVCRT_terminate_function CDECL MSVCRT__get_terminate(void) +{ + thread_data_t *data = msvcrt_get_thread_data(); + TRACE("returning %p\n", data->terminate_handler); + return data->terminate_handler; +} + +/****************************************************************** * ?set_unexpected@@YAP6AXXZP6AXXZ(a)Z (MSVCRT.@) * * Install a handler to be called when unexpected() is called. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index efa380a..379b7cd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -481,7 +481,7 @@ # stub _get_winminor # stub _get_winver # stub _get_wpgmptr -@ stub _get_terminate +@ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ stub _get_unexpected @ cdecl _getch()

1 0

Tristan Schmelcher : ddeml: More calling convention fixes.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 8fb6b02d946d751a9c26c20d94c71a83e1088349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb6b02d946d751a9c26c20d9… Author: Tristan Schmelcher <tristan_schmelcher(a)alumni.uwaterloo.ca> Date: Wed Dec 1 12:32:46 2010 -0800 ddeml: More calling convention fixes. --- dlls/ddeml.dll16/ddeml.c | 6 ++++++ dlls/ddeml.dll16/ddeml.dll16.spec | 18 +++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/ddeml.dll16/ddeml.c b/dlls/ddeml.dll16/ddeml.c index e0a9dda..c7cbd51 100644 --- a/dlls/ddeml.dll16/ddeml.c +++ b/dlls/ddeml.dll16/ddeml.c @@ -386,6 +386,12 @@ HDDEDATA WINAPI DdeClientTransaction16(LPVOID pData, DWORD cbData, HCONV hConv, HSZ hszItem, UINT16 wFmt, UINT16 wType, DWORD dwTimeout, LPDWORD pdwResult) { + if (cbData != (DWORD)-1) + { + /* pData is not a pointer if cbData is -1, so we linearize the address + * here rather than in the calling code. */ + pData = MapSL((SEGPTR)pData); + } return DdeClientTransaction(pData, cbData, hConv, hszItem, wFmt, wType, dwTimeout, pdwResult); } diff --git a/dlls/ddeml.dll16/ddeml.dll16.spec b/dlls/ddeml.dll16/ddeml.dll16.spec index 73fd461..ded7103 100644 --- a/dlls/ddeml.dll16/ddeml.dll16.spec +++ b/dlls/ddeml.dll16/ddeml.dll16.spec @@ -1,29 +1,29 @@ 2 pascal -ret16 DdeInitialize(ptr segptr long long) DdeInitialize16 3 pascal -ret16 DdeUninitialize(long) DdeUninitialize16 -4 pascal DdeConnectList(long long long word ptr) DdeConnectList16 +4 pascal DdeConnectList(long long long long ptr) DdeConnectList16 5 pascal DdeQueryNextServer(long long) DdeQueryNextServer16 6 pascal -ret16 DdeDisconnectList(long) DdeDisconnectList16 7 pascal DdeConnect(long long long ptr) DdeConnect16 8 pascal -ret16 DdeDisconnect(long) DdeDisconnect16 -9 pascal -ret16 DdeQueryConvInfo (long long ptr) DdeQueryConvInfo16 +9 pascal -ret16 DdeQueryConvInfo(long long ptr) DdeQueryConvInfo16 10 pascal -ret16 DdeSetUserHandle(long long long) DdeSetUserHandle16 -11 pascal DdeClientTransaction(ptr long long long s_word s_word long ptr) DdeClientTransaction16 +11 pascal DdeClientTransaction(long long long long word word long ptr) DdeClientTransaction16 12 pascal -ret16 DdeAbandonTransaction(long long long) DdeAbandonTransaction16 13 pascal -ret16 DdePostAdvise(long long long) DdePostAdvise16 14 pascal DdeCreateDataHandle(long ptr long long long word word) DdeCreateDataHandle16 -15 pascal DdeAddData(word ptr long long) DdeAddData16 -16 pascal DdeGetData(word ptr long long) DdeGetData16 -17 pascal DdeAccessData(word ptr) DdeAccessData16 -18 pascal -ret16 DdeUnaccessData(word) DdeUnaccessData16 +15 pascal DdeAddData(long ptr long long) DdeAddData16 +16 pascal DdeGetData(long ptr long long) DdeGetData16 +17 pascal DdeAccessData(long ptr) DdeAccessData16 +18 pascal -ret16 DdeUnaccessData(long) DdeUnaccessData16 19 pascal -ret16 DdeFreeDataHandle(long) DdeFreeDataHandle16 20 pascal -ret16 DdeGetLastError(long) DdeGetLastError16 21 pascal DdeCreateStringHandle(long str s_word) DdeCreateStringHandle16 22 pascal -ret16 DdeFreeStringHandle(long long) DdeFreeStringHandle16 -23 pascal DdeQueryString (long long ptr long word) DdeQueryString16 +23 pascal DdeQueryString(long long ptr long s_word) DdeQueryString16 24 pascal -ret16 DdeKeepStringHandle(long long) DdeKeepStringHandle16 26 pascal -ret16 DdeEnableCallback(long long word) DdeEnableCallback16 -27 pascal DdeNameService(long long long s_word) DdeNameService16 +27 pascal DdeNameService(long long long word) DdeNameService16 36 pascal -ret16 DdeCmpStringHandles(long long) DdeCmpStringHandles16 37 pascal DdeReconnect(long) DdeReconnect

1 0

Jacek Caban : mshtml: Better error handling in create_node calls.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 6bf247f9378c183c922fb0d2742d04189c179cb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf247f9378c183c922fb0d27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 22:42:03 2010 +0100 mshtml: Better error handling in create_node calls. --- dlls/mshtml/htmlcomment.c | 11 ++++++-- dlls/mshtml/htmldoc3.c | 5 +++- dlls/mshtml/htmldoc5.c | 11 ++++++--- dlls/mshtml/htmlnode.c | 49 ++++++++++++++++++++++++++++------------- dlls/mshtml/htmltextnode.c | 25 +++++++++++++++------ dlls/mshtml/mshtml_private.h | 4 +- 6 files changed, 72 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 077a746..49f116d 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -185,9 +185,13 @@ static dispex_static_data_t HTMLCommentElement_dispex = { HTMLCommentElement_iface_tids }; -HTMLElement *HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode) +HRESULT HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLElement **elem) { - HTMLCommentElement *ret = heap_alloc_zero(sizeof(*ret)); + HTMLCommentElement *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; ret->element.node.vtbl = &HTMLCommentElementImplVtbl; ret->lpIHTMLCommentElementVtbl = &HTMLCommentElementVtbl; @@ -197,5 +201,6 @@ HTMLElement *HTMLCommentElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode nsIDOMNode_AddRef(nsnode); ret->element.node.nsnode = nsnode; - return &ret->element; + *elem = &ret->element; + return S_OK; } diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 9a04208..0cab185 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -108,6 +108,7 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t HTMLDOMNode *node; nsAString text_str; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(text), newTextNode); @@ -124,8 +125,10 @@ static HRESULT WINAPI HTMLDocument3_createTextNode(IHTMLDocument3 *iface, BSTR t return E_FAIL; } - node = HTMLDOMTextNode_Create(This->doc_node, (nsIDOMNode*)nstext); + hres = HTMLDOMTextNode_Create(This->doc_node, (nsIDOMNode*)nstext, &node); nsIDOMElement_Release(nstext); + if(FAILED(hres)) + return hres; *newTextNode = HTMLDOMNODE(node); IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); diff --git a/dlls/mshtml/htmldoc5.c b/dlls/mshtml/htmldoc5.c index 12742f6..0f8cc7c 100644 --- a/dlls/mshtml/htmldoc5.c +++ b/dlls/mshtml/htmldoc5.c @@ -125,9 +125,10 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs { HTMLDocument *This = HTMLDOC5_THIS(iface); nsIDOMComment *nscomment; - HTMLDOMNode *node; + HTMLElement *elem; nsAString str; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrdata), ppRetNode); @@ -144,11 +145,13 @@ static HRESULT WINAPI HTMLDocument5_createComment(IHTMLDocument5 *iface, BSTR bs return E_FAIL; } - node = &HTMLCommentElement_Create(This->doc_node, (nsIDOMNode*)nscomment)->node; + hres = HTMLCommentElement_Create(This->doc_node, (nsIDOMNode*)nscomment, &elem); nsIDOMElement_Release(nscomment); + if(FAILED(hres)) + return hres; - *ppRetNode = HTMLDOMNODE(node); - IHTMLDOMNode_AddRef(HTMLDOMNODE(node)); + *ppRetNode = HTMLDOMNODE(&elem->node); + IHTMLDOMNode_AddRef(HTMLDOMNODE(&elem->node)); return S_OK; } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 0131d5f..aa1f55d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static HTMLDOMNode *get_node_obj(HTMLDocumentNode*,IUnknown*); -static HTMLDOMNode *create_node(HTMLDocumentNode*,nsIDOMNode*); +static HRESULT create_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); typedef struct { DispatchEx dispex; @@ -962,7 +962,12 @@ void HTMLDOMNode_destructor(HTMLDOMNode *This) static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) { - *ret = create_node(This->doc, nsnode); + HRESULT hres; + + hres = create_node(This->doc, nsnode, ret); + if(FAILED(hres)) + return hres; + IHTMLDOMNode_AddRef(HTMLDOMNODE(*ret)); return S_OK; } @@ -988,32 +993,45 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno doc->nodes = node; } -static HTMLDOMNode *create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode) +static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **ret) { - HTMLDOMNode *ret; PRUint16 node_type; + HRESULT hres; nsIDOMNode_GetNodeType(nsnode, &node_type); switch(node_type) { case ELEMENT_NODE: - ret = &HTMLElement_Create(doc, nsnode, FALSE)->node; + *ret = &HTMLElement_Create(doc, nsnode, FALSE)->node; break; case TEXT_NODE: - ret = HTMLDOMTextNode_Create(doc, nsnode); + hres = HTMLDOMTextNode_Create(doc, nsnode, ret); + if(FAILED(hres)) + return hres; break; - case COMMENT_NODE: - ret = &HTMLCommentElement_Create(doc, nsnode)->node; + case COMMENT_NODE: { + HTMLElement *comment; + hres = HTMLCommentElement_Create(doc, nsnode, &comment); + if(FAILED(hres)) + return hres; + *ret = &comment->node; break; - default: - ret = heap_alloc_zero(sizeof(HTMLDOMNode)); - ret->vtbl = &HTMLDOMNodeImplVtbl; - HTMLDOMNode_Init(doc, ret, nsnode); } + default: { + HTMLDOMNode *node; - TRACE("type %d ret %p\n", node_type, ret); + node = heap_alloc_zero(sizeof(HTMLDOMNode)); + if(!node) + return E_OUTOFMEMORY; - return ret; + node->vtbl = &HTMLDOMNodeImplVtbl; + HTMLDOMNode_Init(doc, node, nsnode); + *ret = node; + } + } + + TRACE("type %d ret %p\n", node_type, *ret); + return S_OK; } /* @@ -1037,8 +1055,7 @@ HRESULT get_node(HTMLDocumentNode *This, nsIDOMNode *nsnode, BOOL create, HTMLDO return S_OK; } - *ret = create_node(This, nsnode); - return *ret ? S_OK : E_OUTOFMEMORY; + return create_node(This, nsnode, ret); } /* diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 1bbca53..7cf7a11 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -190,8 +190,12 @@ static void HTMLDOMTextNode_destructor(HTMLDOMNode *iface) static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { HTMLDOMTextNode *This = HTMLTEXT_NODE_THIS(iface); + HRESULT hres; + + hres = HTMLDOMTextNode_Create(This->node.doc, nsnode, ret); + if(FAILED(hres)) + return hres; - *ret = HTMLDOMTextNode_Create(This->node.doc, nsnode); IHTMLDOMNode_AddRef(HTMLDOMNODE(*ret)); return S_OK; } @@ -217,21 +221,28 @@ static dispex_static_data_t HTMLDOMTextNode_dispex = { HTMLDOMTextNode_iface_tids }; -HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode) +HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNode **node) { HTMLDOMTextNode *ret; nsresult nsres; ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + ret->node.vtbl = &HTMLDOMTextNodeImplVtbl; ret->lpIHTMLDOMTextNodeVtbl = &HTMLDOMTextNodeVtbl; - init_dispex(&ret->node.dispex, (IUnknown*)HTMLTEXT(ret), &HTMLDOMTextNode_dispex); - HTMLDOMNode_Init(doc, &ret->node, nsnode); - nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMText, (void**)&ret->nstext); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { ERR("Could not get nsIDOMText iface: %08x\n", nsres); + heap_free(ret); + return E_FAIL; + } - return &ret->node; + init_dispex(&ret->node.dispex, (IUnknown*)HTMLTEXT(ret), &HTMLDOMTextNode_dispex); + HTMLDOMNode_Init(doc, &ret->node, nsnode); + + *node = &ret->node; + return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9d8113f..b8ffffe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -818,10 +818,10 @@ HRESULT get_node_text(HTMLDOMNode*,BSTR*); HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); -HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*); +HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); HTMLElement *HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL); -HTMLElement *HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*); +HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**); HTMLElement *HTMLAnchorElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLEmbedElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*);

1 0

Jacek Caban : mshtml: Use binary search in HTMLElement_Create.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 0835749af733cf2795d8519e4110f0964d1abfc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0835749af733cf2795d8519e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 22:42:35 2010 +0100 mshtml: Use binary search in HTMLElement_Create. --- dlls/mshtml/htmlelem.c | 118 +++++++++++++++++++++++++++--------------------- 1 files changed, 67 insertions(+), 51 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 78b9e09..a1d774d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -34,6 +34,67 @@ #include "mshtml_private.h" #include "htmlevent.h" +static const WCHAR aW[] = {'A',0}; +static const WCHAR bodyW[] = {'B','O','D','Y',0}; +static const WCHAR embedW[] = {'E','M','B','E','D',0}; +static const WCHAR formW[] = {'F','O','R','M',0}; +static const WCHAR frameW[] = {'F','R','A','M','E',0}; +static const WCHAR iframeW[] = {'I','F','R','A','M','E',0}; +static const WCHAR imgW[] = {'I','M','G',0}; +static const WCHAR inputW[] = {'I','N','P','U','T',0}; +static const WCHAR objectW[] = {'O','B','J','E','C','T',0}; +static const WCHAR optionW[] = {'O','P','T','I','O','N',0}; +static const WCHAR scriptW[] = {'S','C','R','I','P','T',0}; +static const WCHAR selectW[] = {'S','E','L','E','C','T',0}; +static const WCHAR styleW[] = {'S','T','Y','L','E',0}; +static const WCHAR tableW[] = {'T','A','B','L','E',0}; +static const WCHAR textareaW[] = {'T','E','X','T','A','R','E','A',0}; +static const WCHAR trW[] = {'T','R',0}; + +typedef struct { + const WCHAR *name; + HTMLElement *(*constructor)(HTMLDocumentNode*,nsIDOMHTMLElement*); +} tag_desc_t; + +static const tag_desc_t tag_descs[] = { + {aW, HTMLAnchorElement_Create}, + {bodyW, HTMLBodyElement_Create}, + {embedW, HTMLEmbedElement_Create}, + {formW, HTMLFormElement_Create}, + {frameW, HTMLFrameElement_Create}, + {iframeW, HTMLIFrame_Create}, + {imgW, HTMLImgElement_Create}, + {inputW, HTMLInputElement_Create}, + {objectW, HTMLObjectElement_Create}, + {optionW, HTMLOptionElement_Create}, + {scriptW, HTMLScriptElement_Create}, + {selectW, HTMLSelectElement_Create}, + {styleW, HTMLStyleElement_Create}, + {tableW, HTMLTable_Create}, + {textareaW, HTMLTextAreaElement_Create}, + {trW, HTMLTableRow_Create} +}; + +static const tag_desc_t *get_tag_desc(const WCHAR *tag_name) +{ + DWORD min=0, max=sizeof(tag_descs)/sizeof(*tag_descs)-1, i; + int r; + + while(min <= max) { + i = (min+max)/2; + r = strcmpW(tag_name, tag_descs[i].name); + if(!r) + return tag_descs+i; + + if(r < 0) + max = i-1; + else + min = i+1; + } + + return NULL; +} + typedef struct { DispatchEx dispex; @@ -1663,24 +1724,9 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL HTMLElement *ret = NULL; nsAString class_name_str; const PRUnichar *class_name; + const tag_desc_t *tag; nsresult nsres; - static const WCHAR wszA[] = {'A',0}; - static const WCHAR wszBODY[] = {'B','O','D','Y',0}; - static const WCHAR wszEMBED[] = {'E','M','B','E','D',0}; - static const WCHAR wszFORM[] = {'F','O','R','M',0}; - static const WCHAR wszFRAME[] = {'F','R','A','M','E',0}; - static const WCHAR wszIFRAME[] = {'I','F','R','A','M','E',0}; - static const WCHAR wszIMG[] = {'I','M','G',0}; - static const WCHAR wszINPUT[] = {'I','N','P','U','T',0}; - static const WCHAR wszOBJECT[] = {'O','B','J','E','C','T',0}; - static const WCHAR wszOPTION[] = {'O','P','T','I','O','N',0}; - static const WCHAR wszSCRIPT[] = {'S','C','R','I','P','T',0}; - static const WCHAR wszSELECT[] = {'S','E','L','E','C','T',0}; - static const WCHAR wszSTYLE[] = {'S','T','Y','L','E',0}; - static const WCHAR wszTABLE[] = {'T','A','B','L','E',0}; - static const WCHAR wszTR[] = {'T','R',0}; - static const WCHAR wszTEXTAREA[] = {'T','E','X','T','A','R','E','A',0}; nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) @@ -1691,42 +1737,12 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL nsAString_GetData(&class_name_str, &class_name); - if(!strcmpW(class_name, wszA)) - ret = HTMLAnchorElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszBODY)) - ret = HTMLBodyElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszEMBED)) - ret = HTMLEmbedElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszFORM)) - ret = HTMLFormElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszFRAME)) - ret = HTMLFrameElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszIFRAME)) - ret = HTMLIFrame_Create(doc, nselem); - else if(!strcmpW(class_name, wszIMG)) - ret = HTMLImgElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszINPUT)) - ret = HTMLInputElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszOBJECT)) - ret = HTMLObjectElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszOPTION)) - ret = HTMLOptionElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszSCRIPT)) - ret = HTMLScriptElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszSELECT)) - ret = HTMLSelectElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszSTYLE)) - ret = HTMLStyleElement_Create(doc, nselem); - else if(!strcmpW(class_name, wszTABLE)) - ret = HTMLTable_Create(doc, nselem); - else if(!strcmpW(class_name, wszTR)) - ret = HTMLTableRow_Create(doc, nselem); - else if(!strcmpW(class_name, wszTEXTAREA)) - ret = HTMLTextAreaElement_Create(doc, nselem); - else if(use_generic) + tag = get_tag_desc(class_name); + if(tag) { + ret = tag->constructor(doc, nselem); + }else if(use_generic) { ret = HTMLGenericElement_Create(doc, nselem); - - if(!ret) { + }else { ret = heap_alloc_zero(sizeof(HTMLElement)); HTMLElement_Init(ret, doc, nselem, &HTMLElement_dispex); ret->node.vtbl = &HTMLElementImplVtbl;

1 0

Jacek Caban : mshtml: Improved error handling in HTMLElement_Create calls.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: a8b94a0377fb56da55b83d0fd2a2a0e988ca454e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b94a0377fb56da55b83d0fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 22:42:51 2010 +0100 mshtml: Improved error handling in HTMLElement_Create calls. --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/htmlelem.c | 38 +++++++++++++++++++++++++------------- dlls/mshtml/htmlgeneric.c | 7 +++++-- dlls/mshtml/htmlimg.c | 9 ++++----- dlls/mshtml/htmlnode.c | 9 +++++++-- dlls/mshtml/mshtml_private.h | 4 ++-- 6 files changed, 46 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 6243ece..e9a0cd6 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -996,8 +996,10 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa if(FAILED(hres)) return hres; - elem = HTMLElement_Create(This->doc_node, (nsIDOMNode*)nselem, TRUE); + hres = HTMLElement_Create(This->doc_node, (nsIDOMNode*)nselem, TRUE, &elem); nsIDOMHTMLElement_Release(nselem); + if(FAILED(hres)) + return hres; *newElem = HTMLELEM(elem); IHTMLElement_AddRef(HTMLELEM(elem)); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index a1d774d..af60a2b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1666,10 +1666,13 @@ HRESULT HTMLElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode ** { HTMLElement *This = HTMLELEM_NODE_THIS(iface); HTMLElement *new_elem; + HRESULT hres; - new_elem = HTMLElement_Create(This->node.doc, nsnode, FALSE); - IHTMLElement_AddRef(HTMLELEM(new_elem)); + hres = HTMLElement_Create(This->node.doc, nsnode, FALSE, &new_elem); + if(FAILED(hres)) + return hres; + IHTMLElement_AddRef(HTMLELEM(new_elem)); *ret = &new_elem->node; return S_OK; } @@ -1718,19 +1721,19 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen ConnectionPointContainer_Init(&This->cp_container, (IUnknown*)HTMLELEM(This)); } -HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic) +HRESULT HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL use_generic, HTMLElement **ret) { nsIDOMHTMLElement *nselem; - HTMLElement *ret = NULL; nsAString class_name_str; const PRUnichar *class_name; const tag_desc_t *tag; + HTMLElement *elem; nsresult nsres; - + HRESULT hres; nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) - return NULL; + return E_FAIL; nsAString_Init(&class_name_str, NULL); nsIDOMHTMLElement_GetTagName(nselem, &class_name_str); @@ -1739,21 +1742,30 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL tag = get_tag_desc(class_name); if(tag) { - ret = tag->constructor(doc, nselem); + elem = tag->constructor(doc, nselem); + hres = elem ? S_OK : E_OUTOFMEMORY; }else if(use_generic) { - ret = HTMLGenericElement_Create(doc, nselem); + hres = HTMLGenericElement_Create(doc, nselem, &elem); }else { - ret = heap_alloc_zero(sizeof(HTMLElement)); - HTMLElement_Init(ret, doc, nselem, &HTMLElement_dispex); - ret->node.vtbl = &HTMLElementImplVtbl; + elem = heap_alloc_zero(sizeof(HTMLElement)); + if(elem) { + HTMLElement_Init(elem, doc, nselem, &HTMLElement_dispex); + elem->node.vtbl = &HTMLElementImplVtbl; + hres = S_OK; + }else { + hres = E_OUTOFMEMORY; + } } - TRACE("%s ret %p\n", debugstr_w(class_name), ret); + TRACE("%s ret %p\n", debugstr_w(class_name), elem); nsIDOMElement_Release(nselem); nsAString_Finish(&class_name_str); + if(FAILED(hres)) + return hres; - return ret; + *ret = elem; + return S_OK; } /* interface IHTMLFiltersCollection */ diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 1580929..119f366 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -166,16 +166,19 @@ static dispex_static_data_t HTMLGenericElement_dispex = { HTMLGenericElement_iface_tids }; -HTMLElement *HTMLGenericElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) +HRESULT HTMLGenericElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) { HTMLGenericElement *ret; ret = heap_alloc_zero(sizeof(HTMLGenericElement)); + if(!ret) + return E_OUTOFMEMORY; ret->lpHTMLGenericElementVtbl = &HTMLGenericElementVtbl; ret->element.node.vtbl = &HTMLGenericElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLGenericElement_dispex); - return &ret->element; + *elem = &ret->element; + return S_OK; } diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index b0ec04e..5cc02ea 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -820,10 +820,11 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i if(FAILED(hres)) return hres; - elem = HTMLElement_Create(This->window->doc, (nsIDOMNode*)nselem, FALSE); - if(!elem) { + hres = HTMLElement_Create(This->window->doc, (nsIDOMNode*)nselem, FALSE, &elem); + nsIDOMHTMLElement_Release(nselem); + if(FAILED(hres)) { ERR("HTMLElement_Create failed\n"); - return E_FAIL; + return hres; } hres = IHTMLElement_QueryInterface(HTMLELEM(elem), &IID_IHTMLImgElement, (void**)&img); @@ -832,8 +833,6 @@ static HRESULT WINAPI HTMLImageElementFactory_create(IHTMLImageElementFactory *i return hres; } - nsIDOMHTMLElement_Release(nselem); - l = var_to_size(&width); if(l) IHTMLImgElement_put_width(img, l); diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index aa1f55d..fd496b9 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1001,9 +1001,14 @@ static HRESULT create_node(HTMLDocumentNode *doc, nsIDOMNode *nsnode, HTMLDOMNod nsIDOMNode_GetNodeType(nsnode, &node_type); switch(node_type) { - case ELEMENT_NODE: - *ret = &HTMLElement_Create(doc, nsnode, FALSE)->node; + case ELEMENT_NODE: { + HTMLElement *elem; + hres = HTMLElement_Create(doc, nsnode, FALSE, &elem); + if(FAILED(hres)) + return hres; + *ret = &elem->node; break; + } case TEXT_NODE: hres = HTMLDOMTextNode_Create(doc, nsnode, ret); if(FAILED(hres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index b8ffffe..53f2e87 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -820,7 +820,7 @@ HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); HRESULT HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**); -HTMLElement *HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL); +HRESULT HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL,HTMLElement**); HRESULT HTMLCommentElement_Create(HTMLDocumentNode*,nsIDOMNode*,HTMLElement**); HTMLElement *HTMLAnchorElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLBodyElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); @@ -838,7 +838,7 @@ HTMLElement *HTMLSelectElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLTable_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLTableRow_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); HTMLElement *HTMLTextAreaElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); -HTMLElement *HTMLGenericElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*); +HRESULT HTMLGenericElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**); void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*); void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*);

1 0

Jacek Caban : mshtml: Improved error handling in element constructors.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: ecc551b911c0f8b68cd6e4b4d26922b265b681a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc551b911c0f8b68cd6e4b4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 1 22:43:14 2010 +0100 mshtml: Improved error handling in element constructors. --- dlls/mshtml/htmlanchor.c | 20 ++++++++++++++------ dlls/mshtml/htmlbody.c | 23 ++++++++++++++--------- dlls/mshtml/htmlelem.c | 5 ++--- dlls/mshtml/htmlembed.c | 11 ++++++++--- dlls/mshtml/htmlform.c | 20 ++++++++++++++------ dlls/mshtml/htmlframe.c | 7 +++++-- dlls/mshtml/htmliframe.c | 7 +++++-- dlls/mshtml/htmlimg.c | 16 ++++++++++++---- dlls/mshtml/htmlinput.c | 23 +++++++++++++++-------- dlls/mshtml/htmlobject.c | 20 ++++++++++++++------ dlls/mshtml/htmloption.c | 20 ++++++++++++++------ dlls/mshtml/htmlscript.c | 20 ++++++++++++++------ dlls/mshtml/htmlselect.c | 20 ++++++++++++++------ dlls/mshtml/htmlstyleelem.c | 11 ++++++++--- dlls/mshtml/htmltable.c | 23 +++++++++++++++-------- dlls/mshtml/htmltablerow.c | 20 ++++++++++++++------ dlls/mshtml/htmltextarea.c | 20 ++++++++++++++------ dlls/mshtml/mshtml_private.h | 32 ++++++++++++++++---------------- 18 files changed, 212 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc551b911c0f8b68cd6e…

1 0