October 2009 - Wine-commits

Stefan Dösinger : wined3d: Make shader specific constants accessible via GL_LIMITS.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 2d802af4d9ca1c0da6442a9bf40961196959cb9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d802af4d9ca1c0da6442a9bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 21:38:25 2009 +0200 wined3d: Make shader specific constants accessible via GL_LIMITS. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/directx.c | 82 ++++++++++++++++++------------------ dlls/wined3d/glsl_shader.c | 4 +- dlls/wined3d/wined3d_gl.h | 18 ++++---- 4 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d802af4d9ca1c0da6442…

1 0

Stefan Dösinger : wined3d: Use GLSL constant limits in GLSL.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 435646550b68509bba56e246fef7f0969706795f URL: http://source.winehq.org/git/wine.git/?a=commit;h=435646550b68509bba56e246f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 21:41:50 2009 +0200 wined3d: Use GLSL constant limits in GLSL. --- dlls/wined3d/glsl_shader.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9402432..6bf4144 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -844,7 +844,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont */ if(pshader) { /* No indirect addressing here */ - max_constantsF = GL_LIMITS(pshader_constantsF); + max_constantsF = GL_LIMITS(ps_glsl_constantsF); } else { if(This->baseShader.reg_maps.usesrelconstF) { /* Subtract the other potential uniforms from the max available (bools, ints, and 1 row of projection matrix). @@ -854,7 +854,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont * * Writing gl_ClipPos requires one uniform for each clipplane as well. */ - max_constantsF = GL_LIMITS(vshader_constantsF) - 3 - GL_LIMITS(clipplanes); + max_constantsF = GL_LIMITS(vs_glsl_constantsF) - 3 - GL_LIMITS(clipplanes); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); /* Strictly speaking a bool only uses one scalar, but the nvidia(Linux) compiler doesn't pack them properly, * so each scalar requires a full vec4. We could work around this by packing the booleans ourselves, but @@ -864,7 +864,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont /* Set by driver quirks in directx.c */ max_constantsF -= GLINFO_LOCATION.reserved_glsl_constants; } else { - max_constantsF = GL_LIMITS(vshader_constantsF); + max_constantsF = GL_LIMITS(vs_glsl_constantsF); } } max_constantsF = min(This->baseShader.limits.constant_float, max_constantsF); @@ -923,7 +923,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont srgb_cmp); } if(reg_maps->vpos || reg_maps->usesdsy) { - if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF)) { + if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(ps_glsl_constantsF)) { shader_addline(buffer, "uniform vec4 ycorrection;\n"); ((IWineD3DPixelShaderImpl *) This)->vpos_uniform = 1; extra_constants_needed++; @@ -4132,8 +4132,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, GL_EXTCALL(glLinkProgramARB(programId)); print_glsl_info_log(&GLINFO_LOCATION, programId); - entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(vshader_constantsF)); - for (i = 0; i < GL_LIMITS(vshader_constantsF); ++i) { + entry->vuniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(vs_glsl_constantsF)); + for (i = 0; i < GL_LIMITS(vs_glsl_constantsF); ++i) { snprintf(glsl_name, sizeof(glsl_name), "VC[%i]", i); entry->vuniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } @@ -4141,8 +4141,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, snprintf(glsl_name, sizeof(glsl_name), "VI[%i]", i); entry->vuniformI_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } - entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(pshader_constantsF)); - for (i = 0; i < GL_LIMITS(pshader_constantsF); ++i) { + entry->puniformF_locations = HeapAlloc(GetProcessHeap(), 0, sizeof(GLhandleARB) * GL_LIMITS(ps_glsl_constantsF)); + for (i = 0; i < GL_LIMITS(ps_glsl_constantsF); ++i) { snprintf(glsl_name, sizeof(glsl_name), "PC[%i]", i); entry->puniformF_locations[i] = GL_EXTCALL(glGetUniformLocationARB(programId, glsl_name)); } @@ -4521,7 +4521,7 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); - SIZE_T stack_size = wined3d_log2i(max(GL_LIMITS(vshader_constantsF), GL_LIMITS(pshader_constantsF))) + 1; + SIZE_T stack_size = wined3d_log2i(max(GL_LIMITS(vs_glsl_constantsF), GL_LIMITS(ps_glsl_constantsF))) + 1; if (!shader_buffer_init(&priv->shader_buffer)) { @@ -4536,13 +4536,13 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { goto fail; } - if (!constant_heap_init(&priv->vconst_heap, GL_LIMITS(vshader_constantsF))) + if (!constant_heap_init(&priv->vconst_heap, GL_LIMITS(vs_glsl_constantsF))) { ERR("Failed to initialize vertex shader constant heap\n"); goto fail; } - if (!constant_heap_init(&priv->pconst_heap, GL_LIMITS(pshader_constantsF))) + if (!constant_heap_init(&priv->pconst_heap, GL_LIMITS(ps_glsl_constantsF))) { ERR("Failed to initialize pixel shader constant heap\n"); goto fail; @@ -4616,7 +4616,7 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, else pCaps->VertexShaderVersion = WINED3DVS_VERSION(3,0); TRACE_(d3d_caps)("Hardware vertex shader version %d.%d enabled (GLSL)\n", (pCaps->VertexShaderVersion >> 8) & 0xff, pCaps->VertexShaderVersion & 0xff); - pCaps->MaxVertexShaderConst = GL_LIMITS(vshader_constantsF); + pCaps->MaxVertexShaderConst = GL_LIMITS(vs_glsl_constantsF); /* Older DX9-class videocards (GeforceFX / Radeon >9500/X*00) only support pixel shader 2.0/2.0a/2.0b. * In OpenGL the extensions related to GLSL abstract lowlevel GL info away which is needed @@ -4635,7 +4635,7 @@ static void shader_glsl_get_caps(WINED3DDEVTYPE devtype, else pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); - pCaps->MaxPixelShaderConst = GL_LIMITS(pshader_constantsF); + pCaps->MaxPixelShaderConst = GL_LIMITS(ps_glsl_constantsF); /* FIXME: The following line is card dependent. -8.0 to 8.0 is the * Direct3D minimum requirement.

1 0

Henri Verbeet : wined3d: Use context->valid in context_destroy_gl_resources ().
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: e3ca576576c46131330353f45990f55045cf7541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ca576576c46131330353f45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 20 11:05:05 2009 +0200 wined3d: Use context->valid in context_destroy_gl_resources(). Instead of relying on wglMakeCurrent() to do what we want. --- dlls/wined3d/context.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 16304ee..a96dea4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -633,22 +633,19 @@ static void context_destroy_gl_resources(struct wined3d_context *context) struct wined3d_occlusion_query *occlusion_query; struct wined3d_event_query *event_query; struct fbo_entry *entry, *entry2; - BOOL has_glctx; - - has_glctx = pwglMakeCurrent(context->hdc, context->glCtx); - if (!has_glctx) WARN("Failed to activate context. Window already destroyed?\n"); ENTER_GL(); LIST_FOR_EACH_ENTRY(occlusion_query, &context->occlusion_queries, struct wined3d_occlusion_query, entry) { - if (has_glctx && GL_SUPPORT(ARB_OCCLUSION_QUERY)) GL_EXTCALL(glDeleteQueriesARB(1, &occlusion_query->id)); + if (context->valid && GL_SUPPORT(ARB_OCCLUSION_QUERY)) + GL_EXTCALL(glDeleteQueriesARB(1, &occlusion_query->id)); occlusion_query->context = NULL; } LIST_FOR_EACH_ENTRY(event_query, &context->event_queries, struct wined3d_event_query, entry) { - if (has_glctx) + if (context->valid) { if (GL_SUPPORT(APPLE_FENCE)) GL_EXTCALL(glDeleteFencesAPPLE(1, &event_query->id)); else if (GL_SUPPORT(NV_FENCE)) GL_EXTCALL(glDeleteFencesNV(1, &event_query->id)); @@ -656,11 +653,13 @@ static void context_destroy_gl_resources(struct wined3d_context *context) event_query->context = NULL; } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - if (!has_glctx) entry->id = 0; + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) + { + if (!context->valid) entry->id = 0; context_destroy_fbo_entry(context, entry); } - if (has_glctx) + + if (context->valid) { if (context->src_fbo) {

1 0

Henri Verbeet : wined3d: Destroy FBO entries from the context that created them.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 94d33d3e861d8e01b4edcb940e8ab1aa98359520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d33d3e861d8e01b4edcb940… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 20 11:05:06 2009 +0200 wined3d: Destroy FBO entries from the context that created them. EXT_framebuffer_object doesn't specify if FBOs are shareable between GL contexts, but ARB_framebuffer_object explicitly prohibits it. --- dlls/wined3d/context.c | 38 +++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a96dea4..53997c8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -440,6 +440,13 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ /* GL locking is done by the caller */ static void context_apply_fbo_state(struct wined3d_context *context) { + struct fbo_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) + { + context_destroy_fbo_entry(context, entry); + } + if (context->render_offscreen) { context->current_fbo = context_find_fbo_entry(context); @@ -586,8 +593,6 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource { case WINED3DRTYPE_SURFACE: { - ActivateContext(This, NULL, CTXUSAGE_RESOURCELOAD); - for (i = 0; i < This->numContexts; ++i) { struct wined3d_context *context = This->contexts[i]; @@ -596,27 +601,27 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource if (context->current_rt == (IWineD3DSurface *)resource) context->current_rt = NULL; - ENTER_GL(); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - BOOL destroyed = FALSE; UINT j; - for (j = 0; !destroyed && j < GL_LIMITS(buffers); ++j) + if (entry->depth_stencil == (IWineD3DSurface *)resource) + { + list_remove(&entry->entry); + list_add_head(&context->fbo_destroy_list, &entry->entry); + continue; + } + + for (j = 0; j < GL_LIMITS(buffers); ++j) { if (entry->render_targets[j] == (IWineD3DSurface *)resource) { - context_destroy_fbo_entry(context, entry); - destroyed = TRUE; + list_remove(&entry->entry); + list_add_head(&context->fbo_destroy_list, &entry->entry); + break; } } - - if (!destroyed && entry->depth_stencil == (IWineD3DSurface *)resource) - context_destroy_fbo_entry(context, entry); } - - LEAVE_GL(); } break; @@ -653,6 +658,12 @@ static void context_destroy_gl_resources(struct wined3d_context *context) event_query->context = NULL; } + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) + { + if (!context->valid) entry->id = 0; + context_destroy_fbo_entry(context, entry); + } + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; @@ -1292,6 +1303,7 @@ struct wined3d_context *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceI TRACE("Successfully created new context %p\n", ret); list_init(&ret->fbo_list); + list_init(&ret->fbo_destroy_list); /* Set up the context defaults */ if (!context_set_current(ret)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9c4bd5e..a87d755 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1076,6 +1076,7 @@ struct wined3d_context /* FBOs */ UINT fbo_entry_count; struct list fbo_list; + struct list fbo_destroy_list; struct fbo_entry *current_fbo; GLuint src_fbo; GLuint dst_fbo;

1 0

Michael Stefaniuc : mshtml: Remove redundant NULL check before HeapFree ( Smatch).
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 975a93de6813706d71bdde017092dc7522afd8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975a93de6813706d71bdde017… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Oct 19 22:55:03 2009 +0200 mshtml: Remove redundant NULL check before HeapFree (Smatch). --- dlls/mshtml/htmllocation.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 5db5267..e7b6649 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -256,10 +256,8 @@ static HRESULT WINAPI HTMLLocation_get_href(IHTMLLocation *iface, BSTR *p) ret = S_OK; cleanup: - if(buf) - HeapFree(GetProcessHeap(), 0, buf); - if(url_path) - HeapFree(GetProcessHeap(), 0, url_path); + HeapFree(GetProcessHeap(), 0, buf); + HeapFree(GetProcessHeap(), 0, url_path); return ret; }

1 0

Nikolay Sivov : gdi32: Prevent possible buffer overrun.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: dd0a7078e0acd55f9cc5ac0afbf6342af8a53ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd0a7078e0acd55f9cc5ac0af… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 19 23:40:28 2009 +0400 gdi32: Prevent possible buffer overrun. --- dlls/gdi32/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c81a9c8..ed64166 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2596,13 +2596,13 @@ BOOL WINAPI TranslateCharsetInfo( int index = 0; switch (flags) { case TCI_SRCFONTSIG: - while (!(*lpSrc>>index & 0x0001) && index<MAXTCIINDEX) index++; + while (index < MAXTCIINDEX && !(*lpSrc>>index & 0x0001)) index++; break; case TCI_SRCCODEPAGE: - while (PtrToUlong(lpSrc) != FONT_tci[index].ciACP && index < MAXTCIINDEX) index++; + while (index < MAXTCIINDEX && PtrToUlong(lpSrc) != FONT_tci[index].ciACP) index++; break; case TCI_SRCCHARSET: - while (PtrToUlong(lpSrc) != FONT_tci[index].ciCharset && index < MAXTCIINDEX) index++; + while (index < MAXTCIINDEX && PtrToUlong(lpSrc) != FONT_tci[index].ciCharset) index++; break; default: return FALSE;

1 0

Jacek Caban : mshtml: Moved creating new element to separated function.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 9ce3e6b7c2bd952a360018b862e27b314de9ee4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce3e6b7c2bd952a360018b86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 23:04:19 2009 +0200 mshtml: Moved creating new element to separated function. --- dlls/mshtml/htmldoc.c | 22 ++++++---------------- dlls/mshtml/htmlelem.c | 29 +++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index ef3085e..f0c6360 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -911,28 +911,18 @@ static HRESULT WINAPI HTMLDocument_createElement(IHTMLDocument2 *iface, BSTR eTa IHTMLElement **newElem) { HTMLDocument *This = HTMLDOC_THIS(iface); - nsIDOMElement *nselem; + nsIDOMHTMLElement *nselem; HTMLElement *elem; - nsAString tag_str; - nsresult nsres; + HRESULT hres; TRACE("(%p)->(%s %p)\n", This, debugstr_w(eTag), newElem); - if(!This->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } - - nsAString_Init(&tag_str, eTag); - nsres = nsIDOMDocument_CreateElement(This->nsdoc, &tag_str, &nselem); - nsAString_Finish(&tag_str); - if(NS_FAILED(nsres)) { - ERR("CreateElement failed: %08x\n", nsres); - return E_FAIL; - } + hres = create_nselem(This->doc_node, eTag, &nselem); + if(FAILED(hres)) + return hres; elem = HTMLElement_Create(This->doc_node, (nsIDOMNode*)nselem, TRUE); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); *newElem = HTMLELEM(elem); IHTMLElement_AddRef(HTMLELEM(elem)); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d019634..24e8e15 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -38,6 +38,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define HTMLELEM_THIS(iface) DEFINE_THIS(HTMLElement, HTMLElement, iface) +HRESULT create_nselem(HTMLDocumentNode *doc, const WCHAR *tag, nsIDOMHTMLElement **ret) +{ + nsIDOMElement *nselem; + nsAString tag_str; + nsresult nsres; + + if(!doc->basedoc.nsdoc) { + WARN("NULL nsdoc\n"); + return E_UNEXPECTED; + } + + nsAString_Init(&tag_str, tag); + nsres = nsIDOMDocument_CreateElement(doc->basedoc.nsdoc, &tag_str, &nselem); + nsAString_Finish(&tag_str); + if(NS_FAILED(nsres)) { + ERR("CreateElement failed: %08x\n", nsres); + return E_FAIL; + } + + nsres = nsIDOMElement_QueryInterface(nselem, &IID_nsIDOMHTMLElement, (void**)ret); + nsIDOMElement_Release(nselem); + if(NS_FAILED(nsres)) { + ERR("Could not get nsIDOMHTMLElement iface: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; +} + #define HTMLELEM_NODE_THIS(iface) DEFINE_THIS2(HTMLElement, node, iface) static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4106500..6fa6ec4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -659,6 +659,8 @@ void detach_selection(HTMLDocumentNode*); void detach_ranges(HTMLDocumentNode*); HRESULT get_node_text(HTMLDOMNode*,BSTR*); +HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**); + HTMLDOMNode *HTMLDOMTextNode_Create(HTMLDocumentNode*,nsIDOMNode*); HTMLElement *HTMLElement_Create(HTMLDocumentNode*,nsIDOMNode*,BOOL);

1 0

Jacek Caban : mshtml: Use create_nselem in IHTMLOptionFactory::create.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: dd04cbc53cc4b73ff12f901e73ccc309059e4191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd04cbc53cc4b73ff12f901e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 23:04:36 2009 +0200 mshtml: Use create_nselem in IHTMLOptionFactory::create. --- dlls/mshtml/htmloption.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index 877eef2..e034d9d 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -448,9 +448,7 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory IHTMLOptionElement **optelem) { HTMLOptionElementFactory *This = HTMLOPTFACTORY_THIS(iface); - nsIDOMElement *nselem; - nsAString option_str; - nsresult nsres; + nsIDOMHTMLElement *nselem; HRESULT hres; static const PRUnichar optionW[] = {'O','P','T','I','O','N',0}; @@ -458,24 +456,20 @@ static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory TRACE("(%p)->(%s %s %s %s %p)\n", This, debugstr_variant(&text), debugstr_variant(&value), debugstr_variant(&defaultselected), debugstr_variant(&selected), optelem); - if(!This->window || !This->window->doc || !This->window->doc->basedoc.nsdoc) { - WARN("NULL nsdoc\n"); + if(!This->window || !This->window->doc) { + WARN("NULL doc\n"); return E_UNEXPECTED; } *optelem = NULL; - nsAString_Init(&option_str, optionW); - nsres = nsIDOMHTMLDocument_CreateElement(This->window->doc->basedoc.nsdoc, &option_str, &nselem); - nsAString_Finish(&option_str); - if(NS_FAILED(nsres)) { - ERR("CreateElement failed: %08x\n", nsres); - return E_FAIL; - } + hres = create_nselem(This->window->doc, optionW, &nselem); + if(FAILED(hres)) + return hres; hres = IHTMLDOMNode_QueryInterface(HTMLDOMNODE(get_node(This->window->doc, (nsIDOMNode*)nselem, TRUE)), &IID_IHTMLOptionElement, (void**)optelem); - nsIDOMElement_Release(nselem); + nsIDOMHTMLElement_Release(nselem); if(V_VT(&text) == VT_BSTR) IHTMLOptionElement_put_text(*optelem, V_BSTR(&text));

1 0

Jacek Caban : mshtml: Use create_nselem in set_font_size.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: 6f48c43581d35ccf4c35fb07103c80870c518643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f48c43581d35ccf4c35fb071… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 23:04:50 2009 +0200 mshtml: Use create_nselem in set_font_size. --- dlls/mshtml/editor.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index d1d9aad..feda624 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -93,8 +93,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define DOM_VK_HOME VK_HOME #define DOM_VK_END VK_END -static const WCHAR wszFont[] = {'f','o','n','t',0}; -static const WCHAR wszSize[] = {'s','i','z','e',0}; +static const WCHAR fontW[] = {'f','o','n','t',0}; +static const WCHAR sizeW[] = {'s','i','z','e',0}; void set_dirty(HTMLDocument *This, VARIANT_BOOL dirty) { @@ -292,13 +292,13 @@ static void get_font_size(HTMLDocument *This, WCHAR *ret) nsIDOMElement_GetTagName(elem, &tag_str); nsAString_GetData(&tag_str, &tag); - if(!strcmpiW(tag, wszFont)) { + if(!strcmpiW(tag, fontW)) { nsAString size_str, val_str; LPCWSTR val; TRACE("found font tag %p\n", elem); - nsAString_Init(&size_str, wszSize); + nsAString_Init(&size_str, sizeW); nsAString_Init(&val_str, NULL); nsIDOMElement_GetAttribute(elem, &size_str, &val_str); @@ -334,10 +334,9 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) { nsISelection *nsselection; PRBool collapsed; - nsIDOMElement *elem; + nsIDOMHTMLElement *elem; nsIDOMRange *range; PRInt32 range_cnt = 0; - nsAString font_str; nsAString size_str; nsAString val_str; @@ -359,11 +358,11 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) } } - nsAString_Init(&font_str, wszFont); - nsAString_Init(&size_str, wszSize); + create_nselem(This->doc_node, fontW, &elem); + + nsAString_Init(&size_str, sizeW); nsAString_Init(&val_str, size); - nsIDOMDocument_CreateElement(This->nsdoc, &font_str, &elem); nsIDOMElement_SetAttribute(elem, &size_str, &val_str); nsISelection_GetRangeAt(nsselection, 0, &range); @@ -376,7 +375,7 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsISelection_Collapse(nsselection, (nsIDOMNode*)elem, 0); }else { /* Remove all size attributes from the range */ - remove_child_attr(elem, wszFont, &size_str); + remove_child_attr((nsIDOMElement*)elem, fontW, &size_str); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)elem); } @@ -384,7 +383,6 @@ static void set_font_size(HTMLDocument *This, LPCWSTR size) nsIDOMRange_Release(range); nsIDOMElement_Release(elem); - nsAString_Finish(&font_str); nsAString_Finish(&size_str); nsAString_Finish(&val_str);

1 0

Jacek Caban : mshtml: Use create_nselem in exec_hyperlink.
by Alexandre Julliard 20 Oct '09

20 Oct '09

Module: wine Branch: master Commit: fa1388355f6eb51528b129485ea00d85f118199b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa1388355f6eb51528b129485… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 19 23:05:05 2009 +0200 mshtml: Use create_nselem in exec_hyperlink. --- dlls/mshtml/editor.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index feda624..a1d7b38 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1125,17 +1125,17 @@ static INT_PTR CALLBACK hyperlink_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LP static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - nsAString a_str, href_str, ns_url; + nsAString href_str, ns_url; nsIHTMLEditor *html_editor; - nsIDOMElement *anchor_elem; + nsIDOMHTMLElement *anchor_elem; PRBool insert_link_at_caret; nsISelection *nsselection; BSTR url = NULL; INT ret; HRESULT hres = E_FAIL; - static const WCHAR wszA[] = {'a',0}; - static const WCHAR wszHref[] = {'h','r','e','f',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR hrefW[] = {'h','r','e','f',0}; TRACE("%p, 0x%x, %p, %p\n", This, cmdexecopt, in, out); @@ -1164,16 +1164,13 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if (!nsselection) return E_FAIL; - nsAString_Init(&a_str, wszA); - nsAString_Init(&href_str, wszHref); - nsAString_Init(&ns_url, url); - /* create an element for the link */ - nsIDOMDocument_CreateElement(This->nsdoc, &a_str, &anchor_elem); - nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); + create_nselem(This->doc_node, aW, &anchor_elem); + nsAString_Init(&href_str, hrefW); + nsAString_Init(&ns_url, url); + nsIDOMElement_SetAttribute(anchor_elem, &href_str, &ns_url); nsAString_Finish(&href_str); - nsAString_Finish(&a_str); nsISelection_GetIsCollapsed(nsselection, &insert_link_at_caret); @@ -1197,10 +1194,10 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, if (insert_link_at_caret) { /* add them to the document at the caret position */ - nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, anchor_elem, FALSE); + nsres = nsIHTMLEditor_InsertElementAtSelection(html_editor, (nsIDOMElement*)anchor_elem, FALSE); nsISelection_SelectAllChildren(nsselection, (nsIDOMNode*)anchor_elem); }else /* add them around the selection using the magic provided to us by nsIHTMLEditor */ - nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, anchor_elem); + nsres = nsIHTMLEditor_InsertLinkAroundSelection(html_editor, (nsIDOMElement*)anchor_elem); nsIHTMLEditor_Release(html_editor); hres = NS_SUCCEEDED(nsres) ? S_OK : E_FAIL;

1 0