August 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Make the shader parameter to shader_glsl_generate_vshader() const.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 3b3470b1515d43e48521c6e5cfea44a9c11e1c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3470b1515d43e48521c6e5c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:49 2011 +0200 wined3d: Make the shader parameter to shader_glsl_generate_vshader() const. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f3d8356..5175000 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4086,7 +4086,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context /* GL locking is done by the caller */ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context, - struct wined3d_shader_buffer *buffer, struct wined3d_shader *shader, + struct wined3d_shader_buffer *buffer, const struct wined3d_shader *shader, const struct vs_compile_args *args) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;

1 0

Henri Verbeet : wined3d: Make some parameters to get_glsl_program_entry() const.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 7d46943067486a79b84bb32ea5c3b4c26d33add6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d46943067486a79b84bb32ea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:50 2011 +0200 wined3d: Make some parameters to get_glsl_program_entry() const. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5175000..ee7c3b7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3726,9 +3726,9 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh } } -static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, +static struct glsl_shader_prog_link *get_glsl_program_entry(const struct shader_glsl_priv *priv, const struct wined3d_shader *vshader, const struct wined3d_shader *pshader, - struct vs_compile_args *vs_args, struct ps_compile_args *ps_args) + const struct vs_compile_args *vs_args, const struct ps_compile_args *ps_args) { struct wine_rb_entry *entry; struct glsl_program_key key;

1 0

Henri Verbeet : wined3d: Just call resource_unload() in updateSurfaceDesc() .
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 7b19efd9d5ca38ed844bbbebcec3b2cdd650a48c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b19efd9d5ca38ed844bbbebc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:46 2011 +0200 wined3d: Just call resource_unload() in updateSurfaceDesc(). Instead of trying to duplicate the functionality. --- dlls/wined3d/device.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0fa385c..3e616da 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5455,16 +5455,8 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1; } - if (surface->texture_name) - { - struct wined3d_context *context = context_acquire(device, NULL); - ENTER_GL(); - glDeleteTextures(1, &surface->texture_name); - LEAVE_GL(); - context_release(context); - surface->texture_name = 0; - surface->flags &= ~SFLAG_CLIENT; - } + surface->resource.resource_ops->resource_unload(&surface->resource); + if (surface->pow2Width != pPresentationParameters->BackBufferWidth || surface->pow2Height != pPresentationParameters->BackBufferHeight) {

1 0

Henri Verbeet : wined3d: Introduce a function to update a swapchain' s render_to_fbo field.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 9de5372036b37760659589da3986643a1d6c0bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de5372036b37760659589da3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:47 2011 +0200 wined3d: Introduce a function to update a swapchain's render_to_fbo field. --- dlls/wined3d/device.c | 26 +--------------------- dlls/wined3d/swapchain.c | 46 +++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3e616da..39219bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5879,31 +5879,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, stateblock_init_default_state(device->stateBlock); - if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) - { - RECT client_rect; - GetClientRect(swapchain->win_handle, &client_rect); - - if(!swapchain->presentParms.BackBufferCount) - { - TRACE("Single buffered rendering\n"); - swapchain->render_to_fbo = FALSE; - } - else if(swapchain->presentParms.BackBufferWidth != client_rect.right || - swapchain->presentParms.BackBufferHeight != client_rect.bottom ) - { - TRACE("Rendering to FBO. Backbuffer %ux%u, window %ux%u\n", - swapchain->presentParms.BackBufferWidth, - swapchain->presentParms.BackBufferHeight, - client_rect.right, client_rect.bottom); - swapchain->render_to_fbo = TRUE; - } - else - { - TRACE("Rendering directly to GL_BACK\n"); - swapchain->render_to_fbo = FALSE; - } - } + swapchain_update_render_to_fbo(swapchain); hr = create_primary_opengl_context(device, swapchain); wined3d_swapchain_decref(swapchain); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5ad6966..80e1f4c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -803,6 +803,39 @@ static const struct wined3d_swapchain_ops swapchain_gdi_ops = swapchain_gdi_present, }; +void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) +{ + RECT client_rect; + + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) + return; + + if (!swapchain->presentParms.BackBufferCount) + { + TRACE("Single buffered rendering.\n"); + swapchain->render_to_fbo = FALSE; + return; + } + + GetClientRect(swapchain->win_handle, &client_rect); + + TRACE("Backbuffer %ux%u, window %ux%u.\n", + swapchain->presentParms.BackBufferWidth, + swapchain->presentParms.BackBufferHeight, + client_rect.right, client_rect.bottom); + + if (swapchain->presentParms.BackBufferWidth == client_rect.right + && swapchain->presentParms.BackBufferHeight == client_rect.bottom) + { + TRACE("Backbuffer dimensions match window dimensions, rendering onscreen.\n"); + swapchain->render_to_fbo = FALSE; + return; + } + + TRACE("Rendering to FBO.\n"); + swapchain->render_to_fbo = TRUE; +} + /* Do not call while under the GL lock. */ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, WINED3DSURFTYPE surface_type, struct wined3d_device *device, WINED3DPRESENT_PARAMETERS *present_parameters, @@ -885,18 +918,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, WINED3DSURFTY } } swapchain->presentParms = *present_parameters; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && present_parameters->BackBufferCount - && (present_parameters->BackBufferWidth != client_rect.right - || present_parameters->BackBufferHeight != client_rect.bottom)) - { - TRACE("Rendering to FBO. Backbuffer %ux%u, window %ux%u.\n", - present_parameters->BackBufferWidth, - present_parameters->BackBufferHeight, - client_rect.right, client_rect.bottom); - swapchain->render_to_fbo = TRUE; - } + swapchain_update_render_to_fbo(swapchain); TRACE("Creating front buffer.\n"); hr = device->device_parent->ops->create_rendertarget(device->device_parent, parent, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b2da2ec..813b1ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2441,6 +2441,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0

1 0

Henri Verbeet : wined3d: Only delete the GL contexts after unloading resources in wined3d_device_reset ().
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: b4742253862c82affe5a1bbcb2f21eb955abaf6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4742253862c82affe5a1bbcb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:45 2011 +0200 wined3d: Only delete the GL contexts after unloading resources in wined3d_device_reset(). The updateSurfaceDesc() calls potentially make GL calls. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 819e481..0fa385c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5762,8 +5762,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_stateblock_decref(device->updateStateBlock); wined3d_stateblock_decref(device->stateBlock); - delete_opengl_contexts(device, swapchain); - if (present_parameters->Windowed) { mode.Width = swapchain->orig_width; @@ -5819,6 +5817,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } + delete_opengl_contexts(device, swapchain); + if (!present_parameters->Windowed != !swapchain->presentParms.Windowed || DisplayModeChanged) {

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_glsl_generate_pshader() const.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: f75675031f4d5bf39fd6b3f6076fd556349c8f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75675031f4d5bf39fd6b3f60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:48 2011 +0200 wined3d: Make the shader parameter to shader_glsl_generate_pshader() const. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2fec8b9..f3d8356 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3985,7 +3985,7 @@ static void hardcode_local_constants(const struct wined3d_shader *shader, /* GL locking is done by the caller */ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context, - struct wined3d_shader_buffer *buffer, struct wined3d_shader *shader, + struct wined3d_shader_buffer *buffer, const struct wined3d_shader *shader, const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;

1 0

Henri Verbeet : wined3d: Rename WineD3D_ChoosePixelFormat() to context_choose_pixel_format().
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 9df014b9de29c26bca0b42c78b6f10bb45cd5073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df014b9de29c26bca0b42c78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:44 2011 +0200 wined3d: Rename WineD3D_ChoosePixelFormat() to context_choose_pixel_format(). --- dlls/wined3d/context.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 53aeca3..9a67536 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1053,8 +1053,8 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state) context->isStateDirty[idx] |= (1 << shift); } -/* This function takes care of WineD3D pixel format selection. */ -static int WineD3D_ChoosePixelFormat(struct wined3d_device *device, HDC hdc, +/* This function takes care of wined3d pixel format selection. */ +static int context_choose_pixel_format(struct wined3d_device *device, HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format, BOOL auxBuffers, int numSamples, BOOL findCompatible) { @@ -1290,14 +1290,14 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, } /* Try to find a pixel format which matches our requirements. */ - pixel_format = WineD3D_ChoosePixelFormat(device, hdc, color_format, ds_format, + pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, numSamples, FALSE /* findCompatible */); /* Try to locate a compatible format if we weren't able to find anything. */ if (!pixel_format) { TRACE("Trying to locate a compatible pixel format because an exact match failed.\n"); - pixel_format = WineD3D_ChoosePixelFormat(device, hdc, color_format, ds_format, + pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, 0 /* numSamples */, TRUE /* findCompatible */); }

1 0

Nikolay Sivov : msxml3/mxnamespace: Implement declarePrefix() and getDeclaredPrefix().
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 42f65e1358eae2c8478ed5a5d6d5f7a83867f972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f65e1358eae2c8478ed5a5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:47:09 2011 +0400 msxml3/mxnamespace: Implement declarePrefix() and getDeclaredPrefix(). --- dlls/msxml3/mxnamespace.c | 139 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 88 ++++++++++++++++++++++++++-- 2 files changed, 215 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42f65e1358eae2c8478ed…

1 0

Nikolay Sivov : msxml3/mxnamespace: Implemented getURI().
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: a15fe5a75544724701eab0b5a403fa597aaf48b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15fe5a75544724701eab0b5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:48:15 2011 +0400 msxml3/mxnamespace: Implemented getURI(). --- dlls/msxml3/mxnamespace.c | 50 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 45 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index 1a8133f..2719bb5 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -101,6 +101,8 @@ static HRESULT declare_prefix(struct nscontext *ctxt, const WCHAR *prefix, const /* returned stored pointer, caller needs to copy it */ static HRESULT get_declared_prefix_idx(const struct nscontext *ctxt, LONG index, BSTR *prefix) { + *prefix = NULL; + if (index >= ctxt->count || index < 0) return E_FAIL; if (index > 0) index = ctxt->count - index; @@ -109,6 +111,21 @@ static HRESULT get_declared_prefix_idx(const struct nscontext *ctxt, LONG index, return S_OK; } +static HRESULT get_uri_from_prefix(const struct nscontext *ctxt, const WCHAR *prefix, BSTR *uri) +{ + int i; + + for (i = 0; i < ctxt->count; i++) + if (!strcmpW(ctxt->ns[i].prefix, prefix)) + { + *uri = ctxt->ns[i].uri; + return S_OK; + } + + *uri = NULL; + return S_FALSE; +} + static struct nscontext* alloc_ns_context(void) { struct nscontext *ctxt; @@ -257,8 +274,37 @@ static HRESULT WINAPI namespacemanager_getURI(IMXNamespaceManager *iface, const WCHAR *prefix, IXMLDOMNode *node, WCHAR *uri, int *uri_len) { namespacemanager *This = impl_from_IMXNamespaceManager( iface ); - FIXME("(%p)->(%s %p %p %p): stub\n", This, debugstr_w(prefix), node, uri, uri_len); - return E_NOTIMPL; + struct nscontext *ctxt; + HRESULT hr; + BSTR urib; + + TRACE("(%p)->(%s %p %p %p)\n", This, debugstr_w(prefix), node, uri, uri_len); + + if (!prefix) return E_INVALIDARG; + if (!uri_len) return E_POINTER; + + if (node) + { + FIXME("namespaces from DOM node not supported\n"); + return E_NOTIMPL; + } + + ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); + hr = get_uri_from_prefix(ctxt, prefix, &urib); + if (hr == S_OK) + { + if (uri) + { + if (*uri_len < (INT)SysStringLen(urib)) return E_XML_BUFFERTOOSMALL; + strcpyW(uri, urib); + } + } + else + if (uri) *uri = 0; + + *uri_len = SysStringLen(urib); + + return hr; } static const struct IMXNamespaceManagerVtbl MXNamespaceManagerVtbl = diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ef8c014..3db8e48 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10117,6 +10117,7 @@ static void test_load(void) static void test_nsnamespacemanager(void) { + static const char xmluriA[] = "http://www.w3.org/XML/1998/namespace"; IMXNamespaceManager *nsmgr; IVBMXNamespaceManager *mgr2; IDispatch *disp; @@ -10184,6 +10185,50 @@ todo_wine { ok(len == 3, "got %d\n", len); ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW)); + /* getURI */ + hr = IMXNamespaceManager_getURI(nsmgr, NULL, NULL, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + len = -1; + hr = IMXNamespaceManager_getURI(nsmgr, NULL, NULL, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(len == -1, "got %d\n", len); + + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + len = -1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, NULL, &len); + EXPECT_HR(hr, S_OK); + /* length of "xml" uri is constant */ + ok(len == strlen(xmluriA), "got %d\n", len); + + len = 100; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(len == strlen(xmluriA), "got %d\n", len); + ok(!lstrcmpW(buffW, _bstr_(xmluriA)), "got prefix %s\n", wine_dbgstr_w(buffW)); + + len = strlen(xmluriA)-1; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, buffW, &len); + EXPECT_HR(hr, E_XML_BUFFERTOOSMALL); + ok(len == strlen(xmluriA)-1, "got %d\n", len); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + + /* prefix xml1 not defined */ + len = -1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml1"), NULL, NULL, &len); + EXPECT_HR(hr, S_FALSE); + ok(len == 0, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml1"), NULL, buffW, &len); + EXPECT_HR(hr, S_FALSE); + ok(buffW[0] == 0, "got %x\n", buffW[0]); + ok(len == 0, "got %d\n", len); + IMXNamespaceManager_Release(nsmgr); free_bstrs();

1 0

Nikolay Sivov : msxml3/mxnamespace: Support prefix override mode.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 9c2288fceef98cf25cdb4f11803ac780e5611fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2288fceef98cf25cdb4f118… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:49:21 2011 +0400 msxml3/mxnamespace: Support prefix override mode. --- dlls/msxml3/mxnamespace.c | 65 ++++++++++++++++++++++++++++++++++--------- dlls/msxml3/tests/domdoc.c | 42 +++++++++++++++++++++++++--- 2 files changed, 88 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index 2719bb5..17fbab8 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -71,6 +71,8 @@ typedef struct LONG ref; struct list ctxts; + + VARIANT_BOOL override; } namespacemanager; static inline namespacemanager *impl_from_IMXNamespaceManager( IMXNamespaceManager *iface ) @@ -83,17 +85,46 @@ static inline namespacemanager *impl_from_IVBMXNamespaceManager( IVBMXNamespaceM return CONTAINING_RECORD(iface, namespacemanager, IVBMXNamespaceManager_iface); } -static HRESULT declare_prefix(struct nscontext *ctxt, const WCHAR *prefix, const WCHAR *uri) +static HRESULT declare_prefix(namespacemanager *This, const WCHAR *prefix, const WCHAR *uri) { + struct nscontext *ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); + static const WCHAR emptyW[] = {0}; + struct ns *ns; + int i; + if (ctxt->count == ctxt->max_alloc) { ctxt->max_alloc *= 2; ctxt->ns = heap_realloc(ctxt->ns, ctxt->max_alloc*sizeof(*ctxt->ns)); } - ctxt->ns[ctxt->count].prefix = SysAllocString(prefix); - ctxt->ns[ctxt->count].uri = SysAllocString(uri); - ctxt->count++; + if (!prefix) prefix = emptyW; + + ns = NULL; + for (i = 0; i < ctxt->count; i++) + if (!strcmpW(ctxt->ns[i].prefix, prefix)) + { + ns = &ctxt->ns[i]; + break; + } + + if (ns) + { + if (This->override == VARIANT_TRUE) + { + SysFreeString(ns->uri); + ns->uri = SysAllocString(uri); + return S_FALSE; + } + else + return E_FAIL; + } + else + { + ctxt->ns[ctxt->count].prefix = SysAllocString(prefix); + ctxt->ns[ctxt->count].uri = SysAllocString(uri); + ctxt->count++; + } return S_OK; } @@ -222,17 +253,13 @@ static HRESULT WINAPI namespacemanager_declarePrefix(IMXNamespaceManager *iface, static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; namespacemanager *This = impl_from_IMXNamespaceManager( iface ); - struct nscontext *ctxt; TRACE("(%p)->(%s %s)\n", This, debugstr_w(prefix), debugstr_w(namespaceURI)); - if (!prefix) return E_FAIL; - - if (!strcmpW(prefix, xmlW) || !strcmpW(prefix, xmlnsW) || (prefix && !namespaceURI)) + if (prefix && (!strcmpW(prefix, xmlW) || !strcmpW(prefix, xmlnsW) || !namespaceURI)) return E_INVALIDARG; - ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); - return declare_prefix(ctxt, prefix, namespaceURI); + return declare_prefix(This, prefix, namespaceURI); } static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *iface, @@ -451,16 +478,24 @@ static HRESULT WINAPI vbnamespacemanager_put_allowOverride(IVBMXNamespaceManager VARIANT_BOOL override) { namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); - FIXME("(%p)->(%d): stub\n", This, override); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, override); + This->override = override; + + return S_OK; } static HRESULT WINAPI vbnamespacemanager_get_allowOverride(IVBMXNamespaceManager *iface, VARIANT_BOOL *override) { namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); - FIXME("(%p)->(%p): stub\n", This, override); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, override); + + if (!override) return E_POINTER; + *override = This->override; + + return S_OK; } static HRESULT WINAPI vbnamespacemanager_reset(IVBMXNamespaceManager *iface) @@ -572,6 +607,8 @@ HRESULT MXNamespaceManager_create(IUnknown *outer, void **obj) ctxt = alloc_ns_context(); list_add_head(&ns->ctxts, &ctxt->entry); + ns->override = VARIANT_TRUE; + *obj = &ns->IMXNamespaceManager_iface; TRACE("returning iface %p\n", *obj); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3db8e48..2c3de42 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10142,14 +10142,13 @@ static void test_nsnamespacemanager(void) EXPECT_HR(hr, S_OK); IVBMXNamespaceManager_Release(mgr2); -todo_wine { hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, NULL); EXPECT_HR(hr, S_OK); /* prefix already added */ hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri")); EXPECT_HR(hr, S_FALSE); -} + hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), NULL); EXPECT_HR(hr, E_INVALIDARG); @@ -10238,6 +10237,7 @@ static void test_nsnamespacemanager_override(void) { IMXNamespaceManager *nsmgr; WCHAR buffW[250]; + VARIANT_BOOL b; HRESULT hr; INT len; @@ -10260,11 +10260,25 @@ static void test_nsnamespacemanager_override(void) hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len); EXPECT_HR(hr, E_FAIL); + hr = IMXNamespaceManager_getAllowOverride(nsmgr, NULL); + EXPECT_HR(hr, E_POINTER); + + b = VARIANT_FALSE; + hr = IMXNamespaceManager_getAllowOverride(nsmgr, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + hr = IMXNamespaceManager_putAllowOverride(nsmgr, VARIANT_FALSE); - todo_wine EXPECT_HR(hr, S_OK); + EXPECT_HR(hr, S_OK); hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri")); - todo_wine EXPECT_HR(hr, S_OK); + EXPECT_HR(hr, S_OK); + + len = sizeof(buffW)/sizeof(WCHAR); + buffW[0] = 0; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns0 uri")), "got uri %s\n", wine_dbgstr_w(buffW)); hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), _bstr_("ns0 uri")); EXPECT_HR(hr, S_OK); @@ -10284,7 +10298,7 @@ static void test_nsnamespacemanager_override(void) len = sizeof(buffW)/sizeof(WCHAR); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 2, buffW, &len); - todo_wine EXPECT_HR(hr, S_OK); + EXPECT_HR(hr, S_OK); ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW)); /* new prefix placed at index 1 always */ @@ -10306,6 +10320,24 @@ static void test_nsnamespacemanager_override(void) hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri")); EXPECT_HR(hr, E_FAIL); + hr = IMXNamespaceManager_putAllowOverride(nsmgr, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri override")); + EXPECT_HR(hr, S_FALSE); + + len = sizeof(buffW)/sizeof(WCHAR); + buffW[0] = 0; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns0 uri override")), "got uri %s\n", wine_dbgstr_w(buffW)); + + len = sizeof(buffW)/sizeof(WCHAR); + buffW[0] = 0; + hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 3, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW)); + IMXNamespaceManager_Release(nsmgr); free_bstrs();

1 0