November 2006 - Wine-Commits

H. Verbeet : wined3d: Add FBO support for offscreen rendering.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 6d660851509fa0054c8db96ca7559c86042c57e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d660851509fa0054c8db96ca… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Nov 17 13:24:00 2006 +0100 wined3d: Add FBO support for offscreen rendering. --- dlls/wined3d/device.c | 69 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 6 +++ dlls/wined3d/drawprim.c | 14 ++++++++ dlls/wined3d/wined3d_main.c | 5 +++ dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 239d15d..ef0e046 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5985,7 +5985,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl checkGLcall("glFlush"); TRACE("End Scene\n"); - if(This->renderTarget != NULL) { + /* If we're using FBOs this isn't needed */ + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->renderTarget != NULL) { /* If the container of the rendertarget is a texture then we need to save the data from the pbuffer */ IUnknown *targetContainer = NULL; @@ -6989,6 +6990,66 @@ static HRESULT WINAPI IWineD3DDeviceIm return WINED3D_OK; } +static void bind_fbo(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + if (!This->fbo) { + GL_EXTCALL(glGenFramebuffersEXT(1, &This->fbo)); + checkGLcall("glGenFramebuffersEXT()"); + } + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, This->fbo)); + checkGLcall("glBindFramebuffer()"); +} + +/* TODO: Handle stencil attachments */ +static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_stencil) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DSurfaceImpl *depth_stencil_impl = (IWineD3DSurfaceImpl *)depth_stencil; + + bind_fbo(iface); + + if (depth_stencil_impl) { + IWineD3DSurface_PreLoad(depth_stencil); + glBindTexture (GL_TEXTURE_2D, depth_stencil_impl->glDescription.textureName); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); + + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, depth_stencil_impl->glDescription.textureName, 0)); + checkGLcall("glFramebufferTexture2DEXT()"); + } else { + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); + checkGLcall("glFramebufferTexture2DEXT()"); + } + + if (!This->render_offscreen) { + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + checkGLcall("glBindFramebuffer()"); + } +} + +static void set_render_target_fbo(IWineD3DDevice *iface, IWineD3DSurface *render_target) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DSurfaceImpl *rtimpl = (IWineD3DSurfaceImpl *)render_target; + + if (This->render_offscreen) { + bind_fbo(iface); + + IWineD3DSurface_PreLoad(render_target); + + glBindTexture (GL_TEXTURE_2D, rtimpl->glDescription.textureName); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + + GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, rtimpl->glDescription.textureName, 0)); + checkGLcall("glFramebufferTexture2DEXT()"); + } else { + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + checkGLcall("glBindFramebuffer()"); + } +} + /* internal static helper functions */ static HRESULT WINAPI IWineD3DDeviceImpl_ActiveRender(IWineD3DDevice* iface, IWineD3DSurface *RenderSurface); @@ -7040,6 +7101,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl implementations that use separate pbuffers for different swapchains or rendertargets will have to duplicate the stencil buffer and incure an extra memory overhead */ hr = IWineD3DDeviceImpl_ActiveRender(iface, pRenderTarget); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + set_render_target_fbo(iface, pRenderTarget); + } } if (SUCCEEDED(hr)) { @@ -7086,6 +7150,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl /** TODO: glEnable/glDisable on depth/stencil depending on * pNewZStencil is NULL and the depth/stencil is enabled in d3d **********************************************************/ + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + set_depth_stencil_fbo(iface, pNewZStencil); + } } return hr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 00c95cd..368f384 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -791,6 +791,12 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *i wined3d_settings.nonpower2_mode = NP2_NONE; } + /* We can only use ORM_FBO when the hardware supports it. */ + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !gl_info->supported[EXT_FRAMEBUFFER_OBJECT]) { + WARN_(d3d_caps)("GL_EXT_framebuffer_object not supported, falling back to PBuffer offscreen rendering mode.\n"); + wined3d_settings.offscreen_rendering_mode = ORM_PBUFFER; + } + /* Below is a list of Nvidia and ATI GPUs. Both vendors have dozens of different GPUs with roughly the same * features. In most cases GPUs from a certain family differ in clockspeeds, the amount of video memory and * in case of the latest videocards in the number of pixel/vertex pipelines. diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0bea61f..4a1bd8e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2078,6 +2078,16 @@ static void drawPrimitiveUploadTextures( } } +static void check_fbo_status(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + GLenum status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); + switch(status) { + case GL_FRAMEBUFFER_COMPLETE_EXT: TRACE("FBO complete.\n"); break; + default: TRACE("FBO status %#x.\n", status); break; + } +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void drawPrimitive(IWineD3DDevice *iface, int PrimitiveType, @@ -2101,6 +2111,10 @@ void drawPrimitive(IWineD3DDevice *iface BOOL lighting_changed, lighting_original = FALSE; + if (TRACE_ON(d3d_draw) && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + check_fbo_status(iface); + } + /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - * here simply check whether a shader was set, or the user disabled shaders */ if (This->vs_selected_mode != SHADER_NONE && This->stateBlock->vertexShader && diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index e339815..a3fc80b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -215,6 +215,11 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, TRACE("Using PBuffers for offscreen rendering\n"); wined3d_settings.offscreen_rendering_mode = ORM_PBUFFER; } + else if (!strcmp(buffer,"fbo")) + { + TRACE("Using FBOs for offscreen rendering\n"); + wined3d_settings.offscreen_rendering_mode = ORM_FBO; + } } if ( !get_config_key( hkey, appkey, "RenderTargetLockMode", buffer, size) ) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3465a8..6a4894c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -137,6 +137,7 @@ static WINED3DGLTYPE const glTypeLookup[ #define ORM_BACKBUFFER 0 #define ORM_PBUFFER 1 +#define ORM_FBO 2 #define SHADER_SW 0 #define SHADER_ARB 1 @@ -550,6 +551,7 @@ typedef struct IWineD3DDeviceImpl /* For rendering to a texture using glCopyTexImage */ BOOL render_offscreen; + GLuint fbo; /* Cursor management */ BOOL bCursorVisible;

1 0

H. Verbeet : wined3d: Make the offscreen render mode a registry setting.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: ad4c2bdb696fec1dc8e5a9e7603ccd9de487a7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad4c2bdb696fec1dc8e5a9e76… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Nov 17 13:23:53 2006 +0100 wined3d: Make the offscreen render mode a registry setting. --- dlls/wined3d/device.c | 5 +---- dlls/wined3d/wined3d_main.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab529a9..239d15d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -71,9 +71,6 @@ inline static Display *get_display( HDC return display; } -/* TODO: setup some flags in the regestry to enable, disable pbuffer support */ -/* enable pbuffer support for offscreen textures */ -BOOL pbuffer_support = FALSE; /* allocate one pbuffer per surface */ BOOL pbuffer_per_surface = FALSE; @@ -7414,7 +7411,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* Offscreen rendering: PBuffers (currently disabled). * Also note that this path is never reached if FBOs are supported */ - } else if (pbuffer_support && + } else if (wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER && (cfgs = device_find_fbconfigs(This, implicitSwapchainImpl, RenderSurface)) != NULL) { /** ******************************************************************** diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 6fe6a68..e339815 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -41,6 +41,7 @@ wined3d_settings_t wined3d_settings = VBO_HW, /* Hardware by default */ FALSE, /* Use of GLSL disabled by default */ NP2_NATIVE, /* Use native NPOT textures, when available */ + ORM_BACKBUFFER, /* Use the backbuffer to do offscreen rendering */ RTL_AUTO, /* Automatically determine best locking method */ 64*1024*1024 /* 64MB texture memory by default */ }; @@ -202,6 +203,19 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, } /* There will be a couple of other choices for nonpow2, they are: TextureRecrangle and OpenGL 2 */ } + if ( !get_config_key( hkey, appkey, "OffscreenRenderingMode", buffer, size) ) + { + if (!strcmp(buffer,"backbuffer")) + { + TRACE("Using the backbuffer for offscreen rendering\n"); + wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; + } + else if (!strcmp(buffer,"pbuffer")) + { + TRACE("Using PBuffers for offscreen rendering\n"); + wined3d_settings.offscreen_rendering_mode = ORM_PBUFFER; + } + } if ( !get_config_key( hkey, appkey, "RenderTargetLockMode", buffer, size) ) { if (!strcmp(buffer,"disabled")) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa38261..b3465a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -135,6 +135,9 @@ static WINED3DGLTYPE const glTypeLookup[ #define NP2_REPACK 1 #define NP2_NATIVE 2 +#define ORM_BACKBUFFER 0 +#define ORM_PBUFFER 1 + #define SHADER_SW 0 #define SHADER_ARB 1 #define SHADER_GLSL 2 @@ -160,6 +163,7 @@ typedef struct wined3d_settings_s { BOOL glslRequested; /* nonpower 2 function */ int nonpower2_mode; + int offscreen_rendering_mode; int rendertargetlock_mode; /* Memory tracking and object counting */ unsigned int emulated_textureram;

1 0

H. Verbeet : wined3d: Fix depth buffer formats to use actual depth textures .
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 44f4e254a679ab907bb04d3416ab8cb8d021fd74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f4e254a679ab907bb04d341… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Nov 17 15:02:02 2006 +0100 wined3d: Fix depth buffer formats to use actual depth textures. --- dlls/wined3d/utils.c | 18 +++++++++--------- include/wine/wined3d_gl.h | 10 ++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1ccff17..34e200f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -90,16 +90,16 @@ static const PixelFormatDesc formats[] = {WINED3DFMT_W11V11U10 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_A2W10V10U10 ,0xb0000000 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, /* Depth stencil formats */ - {WINED3DFMT_D16_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT }, - {WINED3DFMT_D32 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT }, - {WINED3DFMT_D15S1 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT }, - {WINED3DFMT_D24S8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT }, - {WINED3DFMT_D24X8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT }, - {WINED3DFMT_D24X4S4 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_INT }, - {WINED3DFMT_D16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_COLOR_INDEX ,GL_COLOR_INDEX ,GL_UNSIGNED_SHORT }, + {WINED3DFMT_D16_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_DEPTH_COMPONENT24_ARB,GL_DEPTH_COMPONENT,GL_UNSIGNED_SHORT }, + {WINED3DFMT_D32 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT32_ARB,GL_DEPTH_COMPONENT,GL_UNSIGNED_INT }, + {WINED3DFMT_D15S1 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_DEPTH_COMPONENT24_ARB,GL_DEPTH_COMPONENT,GL_UNSIGNED_SHORT }, + {WINED3DFMT_D24S8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB,GL_DEPTH_COMPONENT,GL_UNSIGNED_INT }, + {WINED3DFMT_D24X8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB,GL_DEPTH_COMPONENT,GL_UNSIGNED_INT }, + {WINED3DFMT_D24X4S4 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB,GL_DEPTH_COMPONENT,GL_UNSIGNED_INT }, + {WINED3DFMT_D16 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB,GL_DEPTH_COMPONENT,GL_UNSIGNED_SHORT }, {WINED3DFMT_L16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,GL_LUMINANCE16_EXT ,GL_LUMINANCE ,GL_UNSIGNED_SHORT }, - {WINED3DFMT_D32F_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, - {WINED3DFMT_D24FS8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,0 ,0 ,0 }, + {WINED3DFMT_D32F_LOCKABLE,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT32_ARB,GL_DEPTH_COMPONENT,GL_FLOAT }, + {WINED3DFMT_D24FS8 ,0x0 ,0x0 ,0x0 ,0x0 ,4 ,FALSE ,GL_DEPTH_COMPONENT24_ARB,GL_DEPTH_COMPONENT,GL_FLOAT }, /* Is this a vertex buffer? */ {WINED3DFMT_VERTEXDATA ,0x0 ,0x0 ,0x0 ,0x0 ,0 ,FALSE ,0 ,0 ,0 }, {WINED3DFMT_INDEX16 ,0x0 ,0x0 ,0x0 ,0x0 ,2 ,FALSE ,0 ,0 ,0 }, diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index dbe5214..c3b4528 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -51,6 +51,16 @@ * #defines and functions pointer ****************************************************/ +/* GL_ARB_depth_texture */ +#ifndef GL_ARB_depth_texture +#define GL_ARB_depth_texture 1 +#define GL_DEPTH_COMPONENT16_ARB 0x81A5 +#define GL_DEPTH_COMPONENT24_ARB 0x81A6 +#define GL_DEPTH_COMPONENT32_ARB 0x81A7 +#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A +#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B +#endif + /* GL_ARB_draw_buffers */ #ifndef GL_ARB_draw_buffers #define GL_MAX_DRAW_BUFFERS_ARB 0x8824

1 0

Huw Davies : msxml3: Implement createElement.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 459dd11f3f0ea95640da3c6b1344440111bac4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=459dd11f3f0ea95640da3c6b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 17 14:32:17 2006 +0000 msxml3: Implement createElement. --- dlls/msxml3/domdoc.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1314811..459e234 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -694,8 +694,25 @@ static HRESULT WINAPI domdoc_createEleme BSTR tagname, IXMLDOMElement** element ) { - FIXME("\n"); - return E_NOTIMPL; + xmlNodePtr xmlnode; + domdoc *This = impl_from_IXMLDOMDocument( iface ); + xmlChar *xml_name; + IUnknown *elem_unk; + HRESULT hr; + + TRACE("%p->(%s,%p)\n", iface, debugstr_w(tagname), element); + + xml_name = xmlChar_from_wchar((WCHAR*)tagname); + xmlnode = xmlNewDocNode(get_doc(This), NULL, xml_name, NULL); + + TRACE("created xmlptr %p\n", xmlnode); + elem_unk = create_element(xmlnode, NULL); + HeapFree(GetProcessHeap(), 0, xml_name); + + hr = IUnknown_QueryInterface(elem_unk, &IID_IXMLDOMElement, (void **)element); + IUnknown_Release(elem_unk); + TRACE("returning %p\n", *element); + return hr; }

1 0

H. Verbeet : wined3d: Rename renderUpsideDown to render_offscreen.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 9bf04ecd03c7abc33c46306ef64bfea0a0cc5efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf04ecd03c7abc33c46306ef… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Fri Nov 17 13:23:41 2006 +0100 wined3d: Rename renderUpsideDown to render_offscreen. --- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/drawprim.c | 10 +++++++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9cf6f25..ab529a9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3484,7 +3484,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DCULL_CW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); - if (This->renderUpsideDown) { + if (This->render_offscreen) { glFrontFace(GL_CW); checkGLcall("glFrontFace GL_CW"); } else { @@ -3496,7 +3496,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DCULL_CCW: glEnable(GL_CULL_FACE); checkGLcall("glEnable GL_CULL_FACE"); - if (This->renderUpsideDown) { + if (This->render_offscreen) { glFrontFace(GL_CCW); checkGLcall("glFrontFace GL_CCW"); } else { @@ -7199,9 +7199,12 @@ static void device_reapply_stateblock(IW This->updateStateBlock = oldUpdateStateBlock; } -/* Set the device to render to a texture, or not. - * This involves changing renderUpsideDown */ - +/* Set offscreen rendering. When rendering offscreen the surface will be + * rendered upside down to compensate for the fact that D3D texture coordinates + * are flipped compared to GL texture coordinates. The cullmode is affected by + * this, so it must be updated. To update the cullmode stateblock recording has + * to be temporarily disabled. The new state management code will hopefully + * make this unnecessary */ static void device_render_to_texture(IWineD3DDeviceImpl* This, BOOL isTexture) { DWORD cullMode; @@ -7214,9 +7217,7 @@ static void device_render_to_texture(IWi This->isRecordingState = FALSE; This->updateStateBlock = This->stateBlock; - /* Set upside-down rendering, and update the cull mode */ - /* The surface must be rendered upside down to cancel the flip produced by glCopyTexImage */ - This->renderUpsideDown = isTexture; + This->render_offscreen = isTexture; This->last_was_rhw = FALSE; This->proj_valid = FALSE; IWineD3DDevice_GetRenderState((IWineD3DDevice*) This, WINED3DRS_CULLMODE, &cullMode); @@ -7501,7 +7502,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl implicitSwapchainImpl->render_ctx = newContext->context; } } else { - /* Same context, but update renderUpsideDown and cull mode */ + /* Same context, but update render_offscreen and cull mode */ device_render_to_texture(This, TRUE); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 1bedda4..0bea61f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -195,7 +195,9 @@ void d3ddevice_set_ortho(IWineD3DDeviceI a pixel (See comment above glTranslate below) */ glTranslatef(0.375, 0.375, 0); checkGLcall("glTranslatef(0.375, 0.375, 0)"); - if (This->renderUpsideDown) { + /* D3D texture coordinates are flipped compared to OpenGL ones, so + * render everything upside down when rendering offscreen. */ + if (This->render_offscreen) { glMultMatrixf(invymat); checkGLcall("glMultMatrixf(invymat)"); } @@ -301,7 +303,9 @@ static void primitiveInitState( glTranslatef(0.9 / This->stateBlock->viewport.Width, -0.9 / This->stateBlock->viewport.Height, 0); checkGLcall("glTranslatef (0.9 / width, -0.9 / height, 0)"); - if (This->renderUpsideDown) { + /* D3D texture coordinates are flipped compared to OpenGL ones, so + * render everything upside down when rendering offscreen. */ + if (This->render_offscreen) { glMultMatrixf(invymat); checkGLcall("glMultMatrixf(invymat)"); } @@ -311,7 +315,7 @@ static void primitiveInitState( /* Vertex Shader output is already transformed, so set up identity matrices */ if (useVS) { - This->posFixup[1] = This->renderUpsideDown ? -1.0 : 1.0; + This->posFixup[1] = This->render_offscreen ? -1.0 : 1.0; This->posFixup[2] = 0.9 / This->stateBlock->viewport.Width; This->posFixup[3] = -0.9 / This->stateBlock->viewport.Height; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1d8bb10..aa38261 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -545,7 +545,7 @@ typedef struct IWineD3DDeviceImpl UINT currentPalette; /* For rendering to a texture using glCopyTexImage */ - BOOL renderUpsideDown; + BOOL render_offscreen; /* Cursor management */ BOOL bCursorVisible;

1 0

Jacek Caban : mshtml: Remove nscstring and nscwstring typedefs.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 7f9a5fac716dda565f9dc9edfd36b6777454017e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9a5fac716dda565f9dc9edf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:08:51 2006 +0100 mshtml: Remove nscstring and nscwstring typedefs. --- dlls/mshtml/nsiface.idl | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 39a9da7..e03ee4a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -34,9 +34,7 @@ typedef REFIID nsIIDRef; typedef nsIIDRef nsCIDRef; typedef void** nsQIResult; -typedef LPCSTR nscstring; typedef WCHAR PRUnichar; -typedef LPCWSTR nscwstring; typedef ULONG PRUint32; typedef LONG PRInt32; typedef WORD PRUint16; @@ -120,9 +118,9 @@ typedef nsISupports nsIDOMCSSRule; interface nsIServiceManager : nsISupports { nsresult GetService(nsCIDRef aClass, nsIIDRef aIID, void **result); - nsresult GetServiceByContactID(nscstring aContactID, nsIIDRef aIID, void **result); + nsresult GetServiceByContactID(const char *aContactID, nsIIDRef aIID, void **result); nsresult IsServiceInstantiated(nsCIDRef aClass, nsIIDRef aIID, BOOL *_retval); - nsresult IsServiceInstantiatedByContractID(nscstring aContractID, nsIIDRef aIID, BOOL *_retval); + nsresult IsServiceInstantiatedByContractID(const char *aContractID, nsIIDRef aIID, BOOL *_retval); } [ @@ -141,7 +139,7 @@ interface nsIFactory : nsISupports ] interface nsIObserver : nsISupports { - nsresult Observe(nsISupports *aSubject, nscstring aTopic, nscwstring aData); + nsresult Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData); } [ @@ -151,10 +149,10 @@ interface nsIObserver : nsISupports interface nsIComponentManager : nsISupports { nsresult GetClassObject(nsCIDRef aClass, nsIIDRef aIID, nsQIResult result); - nsresult GetClassObjectByContractID(nscstring aContractID, nsIIDRef aIID, nsQIResult result); + nsresult GetClassObjectByContractID(const char *aContractID, nsIIDRef aIID, nsQIResult result); nsresult CreateInstance(nsCIDRef aClass, nsISupports *aDelegate, nsIIDRef aIID, nsQIResult result); - nsresult CreateInstanceByContractID(nscstring aContractID, nsISupports *aDelegate, + nsresult CreateInstanceByContractID(const char *aContractID, nsISupports *aDelegate, nsIIDRef aIID, nsQIResult result); }

1 0

Hans Leidekker : setupapi: Add tests for SetupGet{SourceFileLocation, SourceInfo, TargetPath}.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 17f66b7086b01b889d71ed1c8adb714aabb6bb8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f66b7086b01b889d71ed1c8… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Nov 17 13:48:38 2006 +0100 setupapi: Add tests for SetupGet{SourceFileLocation, SourceInfo, TargetPath}. --- dlls/setupapi/tests/query.c | 130 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 130 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index a1d3e3e..50d341b 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -29,6 +29,9 @@ static void (WINAPI *pSetupCloseInfFile) static BOOL (WINAPI *pSetupGetInfInformationA)(LPCVOID,DWORD,PSP_INF_INFORMATION,DWORD,PDWORD); static HINF (WINAPI *pSetupOpenInfFileA)(PCSTR,PCSTR,DWORD,PUINT); static BOOL (WINAPI *pSetupQueryInfFileInformationA)(PSP_INF_INFORMATION,UINT,PSTR,DWORD,PDWORD); +static BOOL (WINAPI *pSetupGetSourceFileLocationA)(HINF,PINFCONTEXT,PCSTR,PUINT,PSTR,DWORD,PDWORD); +static BOOL (WINAPI *pSetupGetSourceInfoA)(HINF,UINT,UINT,PSTR,DWORD,PDWORD); +static BOOL (WINAPI *pSetupGetTargetPathA)(HINF,PINFCONTEXT,PCSTR,PSTR,DWORD,PDWORD); CHAR CURR_DIR[MAX_PATH]; CHAR WIN_DIR[MAX_PATH]; @@ -43,6 +46,9 @@ static void init_function_pointers(void) pSetupGetInfInformationA = (void *)GetProcAddress(hSetupAPI, "SetupGetInfInformationA"); pSetupOpenInfFileA = (void *)GetProcAddress(hSetupAPI, "SetupOpenInfFileA"); pSetupQueryInfFileInformationA = (void *)GetProcAddress(hSetupAPI, "SetupQueryInfFileInformationA"); + pSetupGetSourceFileLocationA = (void *)GetProcAddress(hSetupAPI, "SetupGetSourceFileLocationA"); + pSetupGetSourceInfoA = (void *)GetProcAddress(hSetupAPI, "SetupGetSourceInfoA"); + pSetupGetTargetPathA = (void *)GetProcAddress(hSetupAPI, "SetupGetTargetPathA"); } } @@ -80,6 +86,16 @@ static void create_inf_file(LPSTR filena append_str(&ptr, "[Version]\n"); append_str(&ptr, "Signature=\"$Chicago$\"\n"); append_str(&ptr, "AdvancedINF=2.5\n"); + append_str(&ptr, "[SourceDisksNames]\n"); + append_str(&ptr, "2 = %%SrcDiskName%%, LANCOM\\LANtools\\lanconf.cab\n"); + append_str(&ptr, "[SourceDisksFiles]\n"); + append_str(&ptr, "lanconf.exe = 2\n"); + append_str(&ptr, "[DestinationDirs]\n"); + append_str(&ptr, "DefaultDestDir = 24, %%DefaultDest%%\n"); + append_str(&ptr, "[Strings]\n"); + append_str(&ptr, "LangDir = english\n"); + append_str(&ptr, "DefaultDest = LANCOM\n"); + append_str(&ptr, "SrcDiskName = \"LANCOM Software CD\"\n"); WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); CloseHandle(hf); @@ -251,10 +267,124 @@ static void test_SetupGetInfInformation( DeleteFileA(inf_two); } +static void test_SetupGetSourceFileLocation(void) +{ + char buffer[MAX_PATH] = "not empty", inf_filename[MAX_PATH]; + UINT source_id; + DWORD required; + HINF hinf; + BOOL ret; + + lstrcpyA(inf_filename, CURR_DIR); + lstrcatA(inf_filename, "\\"); + lstrcatA(inf_filename, "test.inf"); + + create_inf_file(inf_filename); + + hinf = pSetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + required = 0; + source_id = 0; + + ret = pSetupGetSourceFileLocationA(hinf, NULL, "lanconf.exe", &source_id, buffer, sizeof(buffer), &required); + ok(ret, "SetupGetSourceFileLocation failed\n"); + + ok(required == 1, "unexpected required size: %d\n", required); + ok(source_id == 2, "unexpected source id: %d\n", source_id); + ok(!lstrcmpA("", buffer), "unexpected result string: %s\n", buffer); + + pSetupCloseInfFile(hinf); + DeleteFileA(inf_filename); +} + +static void test_SetupGetSourceInfo(void) +{ + char buffer[MAX_PATH], inf_filename[MAX_PATH]; + DWORD required; + HINF hinf; + BOOL ret; + + lstrcpyA(inf_filename, CURR_DIR); + lstrcatA(inf_filename, "\\"); + lstrcatA(inf_filename, "test.inf"); + + create_inf_file(inf_filename); + + hinf = pSetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + required = 0; + + ret = pSetupGetSourceInfoA(hinf, 2, SRCINFO_PATH, buffer, sizeof(buffer), &required); + ok(ret, "SetupGetSourceInfoA failed\n"); + + ok(required == 1, "unexpected required size: %d\n", required); + ok(!lstrcmpA("", buffer), "unexpected result string: %s\n", buffer); + + required = 0; + buffer[0] = 0; + + ret = pSetupGetSourceInfoA(hinf, 2, SRCINFO_TAGFILE, buffer, sizeof(buffer), &required); + ok(ret, "SetupGetSourceInfoA failed\n"); + + ok(required == 28, "unexpected required size: %d\n", required); + ok(!lstrcmpA("LANCOM\\LANtools\\lanconf.cab", buffer), "unexpected result string: %s\n", buffer); + + required = 0; + buffer[0] = 0; + + ret = pSetupGetSourceInfoA(hinf, 2, SRCINFO_DESCRIPTION, buffer, sizeof(buffer), &required); + ok(ret, "SetupGetSourceInfoA failed\n"); + + ok(required == 19, "unexpected required size: %d\n", required); + ok(!lstrcmpA("LANCOM Software CD", buffer), "unexpected result string: %s\n", buffer); + + pSetupCloseInfFile(hinf); + DeleteFileA(inf_filename); +} + +static void test_SetupGetTargetPath(void) +{ + char buffer[MAX_PATH], inf_filename[MAX_PATH]; + DWORD required; + HINF hinf; + INFCONTEXT ctx; + BOOL ret; + + lstrcpyA(inf_filename, CURR_DIR); + lstrcatA(inf_filename, "\\"); + lstrcatA(inf_filename, "test.inf"); + + create_inf_file(inf_filename); + + hinf = pSetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + ctx.Inf = hinf; + ctx.CurrentInf = hinf; + ctx.Section = 7; + ctx.Line = 0; + + required = 0; + + ret = pSetupGetTargetPathA(hinf, &ctx, NULL, buffer, sizeof(buffer), &required); + ok(ret, "SetupGetTargetPathA failed\n"); + + ok(required == 10, "unexpected required size: %d\n", required); + ok(!lstrcmpiA("C:\\LANCOM", buffer), "unexpected result string: %s\n", buffer); + + pSetupCloseInfFile(hinf); + DeleteFileA(inf_filename); +} + START_TEST(query) { init_function_pointers(); get_directories(); test_SetupGetInfInformation(); + test_SetupGetSourceFileLocation(); + test_SetupGetSourceInfo(); + test_SetupGetTargetPath(); }

1 0

Jacek Caban : mshtml: Added put_fontSize implementation.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 84af63604a1ab0d8a56181d7738aa2c7ac468a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84af63604a1ab0d8a56181d77… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:07:12 2006 +0100 mshtml: Added put_fontSize implementation. --- dlls/mshtml/htmlstyle.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 738fd79..ea84ea6 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -50,6 +50,8 @@ static const WCHAR attrBackgroundColor[] {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrFontFamily[] = {'f','o','n','t','-','f','a','m','i','l','y',0}; +static const WCHAR attrFontSize[] = + {'f','o','n','t','-','s','i','z','e',0}; static HRESULT set_style_attr(HTMLStyle *This, LPCWSTR name, LPCWSTR value) { @@ -222,8 +224,17 @@ static HRESULT WINAPI HTMLStyle_get_font static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + switch(V_VT(&v)) { + case VT_BSTR: + return set_style_attr(This, attrFontSize, V_BSTR(&v)); + default: + FIXME("not supported vt %d\n", V_VT(&v)); + } + + return S_OK; } static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p)

1 0

Jacek Caban : mshtml: Added put_backgroundColor implementation.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: c8c9a5fb2029eb85ed98f3f402d9d7d4e29698cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8c9a5fb2029eb85ed98f3f40… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:06:30 2006 +0100 mshtml: Added put_backgroundColor implementation. --- dlls/mshtml/htmlstyle.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e9c6529..738fd79 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -46,6 +46,8 @@ typedef struct { #define HTMLSTYLE(x) ((IHTMLStyle*) &(x)->lpHTMLStyleVtbl); +static const WCHAR attrBackgroundColor[] = + {'b','a','c','k','g','r','o','u','n','d','-','c','o','l','o','r',0}; static const WCHAR attrFontFamily[] = {'f','o','n','t','-','f','a','m','i','l','y',0}; @@ -276,8 +278,24 @@ static HRESULT WINAPI HTMLStyle_get_back static HRESULT WINAPI HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + + switch(V_VT(&v)) { + case VT_BSTR: + return set_style_attr(This, attrBackgroundColor, V_BSTR(&v)); + case VT_I4: { + WCHAR value[10]; + static const WCHAR format[] = {'#','%','0','6','x',0}; + + wsprintfW(value, format, V_I4(&v)); + return set_style_attr(This, attrBackgroundColor, value); + } + default: + FIXME("unsupported vt %d\n", V_VT(&v)); + } + + return S_OK; } static HRESULT WINAPI HTMLStyle_get_backgroundColor(IHTMLStyle *iface, VARIANT *p)

1 0

Jacek Caban : mshtml: Added semi-stub createStyleSheet implementation.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 2f853fadb1fedf387d11677e474d2b4ef81606ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f853fadb1fedf387d11677e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 17 13:08:09 2006 +0100 mshtml: Added semi-stub createStyleSheet implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmldoc.c | 8 +- dlls/mshtml/htmlstylesheet.c | 324 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 332 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f853fadb1fedf387d116…

1 0