August 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Don' t respecify compressed textures in surface_upload_data().
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: b7812932bc74cf4411bfdbb2277fb0aaf8e24b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7812932bc74cf4411bfdbb22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 3 08:06:52 2009 +0200 wined3d: Don't respecify compressed textures in surface_upload_data(). Passing NULL to glCompressedTexImage2DARB() doesn't work particularly well when both client storage and PBOs are enabled. Also, two years is long enough to give driver developers a chance to fix the bug this was supposed to work around. --- dlls/wined3d/surface.c | 113 ++++++++++++++++++------------------------------ 1 files changed, 42 insertions(+), 71 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e74c90e..b375df4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -500,66 +500,48 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *data) { const struct GlPixelFormatDesc *format_desc = This->resource.format_desc; - if (format_desc->heightscale != 1.0f && format_desc->heightscale != 0.0f) height *= format_desc->heightscale; - - if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - /* glCompressedTexSubImage2D() for uploading and glTexImage2D() for - * allocating does not work well on some drivers (r200 dri, MacOS ATI - * driver). glCompressedTexImage2D() does not accept NULL pointers. So - * for compressed textures surface_allocate_surface() does nothing, - * and this function uses glCompressedTexImage2D() instead of - * glCompressedTexSubImage2D(). */ - TRACE("(%p) : Calling glCompressedTexImage2DARB w %u, h %u, data %p.\n", This, width, height, data); + TRACE("This %p, internal %#x, width %d, height %d, format %#x, type %#x, data %p.\n", + This, internal, width, height, format, type, data); + TRACE("target %#x, level %u, resource size %u.\n", + This->texture_target, This->texture_level, This->resource.size); - ENTER_GL(); + if (format_desc->heightscale != 1.0f && format_desc->heightscale != 0.0f) height *= format_desc->heightscale; - if (This->Flags & SFLAG_PBO) - { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); + ENTER_GL(); - TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data); + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); - GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, - internal, width, height, 0 /* border */, This->resource.size, NULL)); - checkGLcall("glCompressedTexImage2DARB"); + TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data); + data = NULL; + } - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } - else - { - GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, - internal, width, height, 0 /* border */, This->resource.size, data)); - checkGLcall("glCompressedTexSubImage2D"); - } + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + TRACE("Calling glCompressedTexSubImage2DARB.\n"); - LEAVE_GL(); + GL_EXTCALL(glCompressedTexSubImage2DARB(This->texture_target, This->texture_level, + 0, 0, width, height, internal, This->resource.size, data)); + checkGLcall("glCompressedTexSubImage2DARB"); } else { - TRACE("(%p) : Calling glTexSubImage2D w %d, h %d, data, %p\n", This, width, height, data); - ENTER_GL(); - - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, data); + TRACE("Calling glTexSubImage2D.\n"); - glTexSubImage2D(This->texture_target, This->texture_level, 0, 0, width, height, format, type, NULL); - checkGLcall("glTexSubImage2D"); - - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } - else { - glTexSubImage2D(This->texture_target, This->texture_level, 0, 0, width, height, format, type, data); - checkGLcall("glTexSubImage2D"); - } + glTexSubImage2D(This->texture_target, This->texture_level, + 0, 0, width, height, format, type, data); + checkGLcall("glTexSubImage2D"); + } - LEAVE_GL(); + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } + + LEAVE_GL(); } /* This call just allocates the texture, the caller is responsible for binding @@ -576,27 +558,6 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, This, This->texture_target, This->texture_level, debug_d3dformat(format_desc->format), internal, width, height, format, type); - if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - /* glCompressedTexImage2D does not accept NULL pointers, so we cannot allocate a compressed texture without uploading data */ - TRACE("Not allocating compressed surfaces, surface_upload_data will specify them\n"); - - /* We have to point GL to the client storage memory here, because upload_data might use a PBO. This means a double upload - * once, unfortunately - */ - if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { - /* Neither NONPOW2, DIBSECTION nor OVERSIZE flags can be set on compressed textures */ - This->Flags |= SFLAG_CLIENT; - mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); - ENTER_GL(); - GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, internal, - width, height, 0 /* border */, This->resource.size, mem)); - LEAVE_GL(); - } - - return; - } - ENTER_GL(); if(GL_SUPPORT(APPLE_CLIENT_STORAGE)) { @@ -621,8 +582,18 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, mem = (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); } } - glTexImage2D(This->texture_target, This->texture_level, internal, width, height, 0, format, type, mem); - checkGLcall("glTexImage2D"); + + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED && mem) + { + GL_EXTCALL(glCompressedTexImage2DARB(This->texture_target, This->texture_level, + internal, width, height, 0, This->resource.size, mem)); + } + else + { + glTexImage2D(This->texture_target, This->texture_level, + internal, width, height, 0, format, type, mem); + checkGLcall("glTexImage2D"); + } if(enable_client_storage) { glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE);

1 0

Henri Verbeet : wined3d: Rename WineD3DContext to struct wined3d_context.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: da1e5573dac77859a4c5c48b087d0d5e91223cfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1e5573dac77859a4c5c48b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 3 08:06:51 2009 +0200 wined3d: Rename WineD3DContext to struct wined3d_context. --- dlls/wined3d/arb_program_shader.c | 29 ++-- dlls/wined3d/ati_fragment_shader.c | 15 +- dlls/wined3d/context.c | 85 +++++---- dlls/wined3d/device.c | 16 +- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/gl_compat.c | 18 +- dlls/wined3d/nvidia_texture_shader.c | 15 +- dlls/wined3d/query.c | 4 +- dlls/wined3d/state.c | 307 ++++++++++++++++++++++------------ dlls/wined3d/surface.c | 4 +- dlls/wined3d/swapchain.c | 9 +- dlls/wined3d/utils.c | 6 +- dlls/wined3d/wined3d_private.h | 187 +++++++++++---------- 13 files changed, 414 insertions(+), 285 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da1e5573dac77859a4c5c…

1 0

Henri Verbeet : wined3d: Don' t use the GL texture flags to determine if a format is a depth stencil in CheckDepthStencilCapability ().
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 1d647283d5eeba840eb4de76ddb6fd33b7083388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d647283d5eeba840eb4de76d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 3 08:06:50 2009 +0200 wined3d: Don't use the GL texture flags to determine if a format is a depth stencil in CheckDepthStencilCapability(). The OpenGL implementation might not support ARB_depth_texture, but that doesn't mean we can't use the format for the depth buffer. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e6fb1c7..81f81db 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2698,7 +2698,7 @@ static BOOL CheckDepthStencilCapability(struct WineD3DAdapter *adapter, int it=0; /* Only allow depth/stencil formats */ - if (!(ds_format_desc->Flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))) return FALSE; + if (!(ds_format_desc->depth_size || ds_format_desc->stencil_size)) return FALSE; /* Walk through all WGL pixel formats to find a match */ for (it = 0; it < adapter->nCfgs; ++it)

1 0

Henri Verbeet : wined3d: Use the context' s current render target the get the swapchain drawable size.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 43bfb240add6c722993801bbbb82b4244b3535a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43bfb240add6c722993801bbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 3 08:06:49 2009 +0200 wined3d: Use the context's current render target the get the swapchain drawable size. "surface" might point to the frontbuffer while we're rendering to the backbuffer, etc. --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 0994c6d..c0e0457 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -404,7 +404,7 @@ WineD3DContext *IWineD3DSwapChainImpl_CreateContextForThread(IWineD3DSwapChain * void get_drawable_size_swapchain(struct WineD3DContext *context, UINT *width, UINT *height) { - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)context->surface; + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)context->current_rt; /* The drawable size of an onscreen drawable is the surface size. * (Actually: The window size, but the surface is created in window size) */ *width = surface->currentDesc.Width;

1 0

Henri Verbeet : wined3d: Handle destruction of a context' s current render target.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 0047c55e86e82478fd41e269f6746168e7c9e98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0047c55e86e82478fd41e269f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 3 08:06:48 2009 +0200 wined3d: Handle destruction of a context's current render target. --- dlls/wined3d/context.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 413c1d6..0d04728 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -594,6 +594,8 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource const struct wined3d_gl_info *gl_info = context->gl_info; struct fbo_entry *entry, *entry2; + 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) @@ -1716,7 +1718,6 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf struct WineD3DContext *current_context = context_get_current(); BOOL oldRenderOffscreen = This->render_offscreen; const struct StateEntry *StateTable = This->StateTable; - const struct GlPixelFormatDesc *old, *new; struct WineD3DContext *context; if (current_context && current_context->destroyed) current_context = NULL; @@ -1724,6 +1725,7 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf if (!target) { if (current_context + && current_context->current_rt && ((IWineD3DSurfaceImpl *)current_context->surface)->resource.wineD3DDevice == This) { target = current_context->current_rt; @@ -1833,15 +1835,23 @@ retry: /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ - old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; - new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; - if (old->format != new->format) + if (!context->current_rt) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + } + else { - /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ - if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) - || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + const struct GlPixelFormatDesc *old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc; + const struct GlPixelFormatDesc *new = ((IWineD3DSurfaceImpl *)target)->resource.format_desc; + + if (old->format != new->format) { - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ + if ((old->alpha_mask && !new->alpha_mask) || (!old->alpha_mask && new->alpha_mask) + || !(new->Flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) + { + Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); + } } } @@ -1871,7 +1881,7 @@ retry: * After that, the outer ActivateContext(which calls PreLoad) can activate the new * target for the new thread */ - if (readTexture && context->current_rt != target) + if (readTexture && context->current_rt && context->current_rt != target) { BOOL oldInDraw = This->isInDraw;

1 0

Ken Thomases : ntdll: For Darwin/Mac OS X, use legacy getdirentries if 64-bit inodes enabled.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 028b763f2f51e78084129975e6333271dd2f861c URL: http://source.winehq.org/git/wine.git/?a=commit;h=028b763f2f51e78084129975e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 31 16:25:48 2009 -0500 ntdll: For Darwin/Mac OS X, use legacy getdirentries if 64-bit inodes enabled. Fixes building on Snow Leopard. --- dlls/ntdll/directory.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index bccfba6..0cd531e 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1274,6 +1274,30 @@ done: #elif defined HAVE_GETDIRENTRIES +#if _DARWIN_FEATURE_64_BIT_INODE + +/* Darwin doesn't provide a version of getdirentries with support for 64-bit + * inodes. When 64-bit inodes are enabled, the getdirentries symbol is mapped + * to _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect so that + * we get link errors if we try to use it. We still need getdirentries, but we + * don't need it to support 64-bit inodes. So, we use the legacy getdirentries + * with 32-bit inodes. We have to be careful to use a corresponding dirent + * structure, too. + */ +int darwin_legacy_getdirentries(int, char *, int, long *) __asm("_getdirentries"); +#define getdirentries darwin_legacy_getdirentries + +struct darwin_legacy_dirent { + __uint32_t d_ino; + __uint16_t d_reclen; + __uint8_t d_type; + __uint8_t d_namlen; + char d_name[__DARWIN_MAXNAMLEN + 1]; +}; +#define dirent darwin_legacy_dirent + +#endif + /*********************************************************************** * wine_getdirentries * @@ -1438,6 +1462,12 @@ done: if (data != local_buffer) RtlFreeHeap( GetProcessHeap(), 0, data ); return res; } + +#if _DARWIN_FEATURE_64_BIT_INODE +#undef getdirentries +#undef dirent +#endif + #endif /* HAVE_GETDIRENTRIES */

1 0

Roderick Colenbrander : winex11: Fix XRender_GetSrcAreaStretch compile bug for when XRender isn't around.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 083aaca98ff5217778308caa6eaef8c099f0a69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=083aaca98ff5217778308caa6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Aug 2 18:43:43 2009 +0200 winex11: Fix XRender_GetSrcAreaStretch compile bug for when XRender isn't around. --- dlls/winex11.drv/xrender.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 072cd25..a5ea946 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2109,11 +2109,9 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT widthDst, BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - INT xDst, INT yDst, INT widthDst, INT heightDst, - RECT *visRectSrc, RECT *visRectDst) + RECT *visRectSrc, RECT *visRectDst ) { return FALSE; }

1 0

Roderick Colenbrander : wgl: Fix usage of non-GLX visual in glXCreateContext.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 390d3929f2b2a9641ecc8114cf94ae09fa851a15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=390d3929f2b2a9641ecc8114c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Fri Jul 31 22:50:36 2009 +0200 wgl: Fix usage of non-GLX visual in glXCreateContext. --- dlls/winex11.drv/opengl.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b2cf82a..4e4a3a0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -275,15 +275,12 @@ MAKE_FUNCPTR(glFlush) static BOOL infoInitialized = FALSE; static BOOL X11DRV_WineGL_InitOpenglInfo(void) { - int screen = DefaultScreen(gdi_display); Window win = RootWindow(gdi_display, screen); const char* str; - Visual *visual; - XVisualInfo template; XVisualInfo *vis; - int num; GLXContext ctx = NULL; + int attribList[] = {GLX_RGBA, GLX_DOUBLEBUFFER, None}; if (infoInitialized) return TRUE; @@ -291,9 +288,7 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) wine_tsx11_lock(); - visual = DefaultVisual(gdi_display, screen); - template.visualid = XVisualIDFromVisual(visual); - vis = XGetVisualInfo(gdi_display, VisualIDMask, &template, &num); + vis = pglXChooseVisual(gdi_display, screen, attribList); if (vis) { WORD old_fs = wine_get_fs(); /* Create a GLX Context. Without one we can't query GL information */

1 0

Jacek Caban : urlmon: Use one wininet internet handle for all connections.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 09436d69f181b8bae4afea28be73edb612a6f05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=09436d69f181b8bae4afea28b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 2 00:11:46 2009 +0200 urlmon: Use one wininet internet handle for all connections. --- dlls/urlmon/ftp.c | 4 +- dlls/urlmon/gopher.c | 4 +- dlls/urlmon/http.c | 4 +- dlls/urlmon/protocol.c | 83 +++++++++++++++++++++++------------------- dlls/urlmon/session.c | 13 +++++++ dlls/urlmon/tests/protocol.c | 10 +---- dlls/urlmon/urlmon_main.c | 28 ++++++++++----- dlls/urlmon/urlmon_main.h | 5 ++- 8 files changed, 88 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=09436d69f181b8bae4afe…

1 0

Jacek Caban : mshtml: Call set_ns_editmode in better place.
by Alexandre Julliard 03 Aug '09

03 Aug '09

Module: wine Branch: master Commit: 8809bef4280a1b98996825a83e2a7f9a5802fd0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8809bef4280a1b98996825a83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Aug 2 00:12:29 2009 +0200 mshtml: Call set_ns_editmode in better place. --- dlls/mshtml/olecmd.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index a122e0c..a8d3e6a 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -583,9 +583,6 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); } - if(This->nscontainer) - set_ns_editmode(This->nscontainer); - update_doc(This, UPDATE_UI); if(This->mon) { @@ -610,12 +607,17 @@ static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, return hres; if(This->ui_active) { - RECT rcBorderWidths; - if(This->ip_window) call_set_active_object(This->ip_window, NULL); if(This->hostui) IDocHostUIHandler_HideUI(This->hostui); + } + + if(This->nscontainer) + set_ns_editmode(This->nscontainer); + + if(This->ui_active) { + RECT rcBorderWidths; if(This->hostui) IDocHostUIHandler_ShowUI(This->hostui, DOCHOSTUITYPE_AUTHOR, ACTOBJ(This), CMDTARGET(This),

1 0