December 2009 - Wine-commits

Stefan Dösinger : wined3d: Use GL_COLOR_ATTACHMENT0 as offscreen buffer with FBOs.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 2b0271b185bfa9b904d2e2c5c0ba373ab471f84a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b0271b185bfa9b904d2e2c5c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Dec 4 10:21:01 2009 +0100 wined3d: Use GL_COLOR_ATTACHMENT0 as offscreen buffer with FBOs. This is used by the offscreen render target->texture blit code if FBOs are enabled, but FBO_blit is not supported --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 12003d6..5c5f6ed 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1882,6 +1882,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, switch(wined3d_settings.offscreen_rendering_mode) { case ORM_FBO: + This->offscreenBuffer = GL_COLOR_ATTACHMENT0; + break; + case ORM_PBUFFER: This->offscreenBuffer = GL_BACK; break;

1 0

Stefan Dösinger : wined3d: Infrastructure to render swapchains to a FBO.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 817714912b59be49ea06251f2b91b959f07c1133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=817714912b59be49ea06251f2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 6 17:39:47 2009 +0100 wined3d: Infrastructure to render swapchains to a FBO. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 1 + dlls/wined3d/surface.c | 15 ++++- dlls/wined3d/swapchain.c | 135 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 149 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5bd06be..b56890e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1893,7 +1893,7 @@ static inline struct wined3d_context *FindContext(IWineD3DDeviceImpl *This, IWin context = findThreadContextForSwapChain(swapchain, tid); old_render_offscreen = context->render_offscreen; - context->render_offscreen = FALSE; + context->render_offscreen = ((IWineD3DSwapChainImpl *)swapchain)->render_to_fbo; /* The context != This->activeContext will catch a NOP context change. This can occur * if we are switching back to swapchain rendering in case of FBO or Back Buffer offscreen * rendering. No context change is needed in that case diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5c5f6ed..1f2cdac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6683,6 +6683,7 @@ HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain * } swapchain->context[0] = context_create(This, target, swapchain->win_handle, FALSE, &swapchain->presentParms); swapchain->num_contexts = 1; + swapchain->context[0]->render_offscreen = swapchain->render_to_fbo; create_dummy_textures(This); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7c4551b..bd283af 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -668,6 +668,10 @@ GLenum surface_get_gl_buffer(IWineD3DSurface *iface, IWineD3DSwapChain *swapchai TRACE("(%p) : swapchain %p\n", This, swapchain); if (swapchain_impl->backBuffer && swapchain_impl->backBuffer[0] == iface) { + if(swapchain_impl->render_to_fbo) { + TRACE("Returning GL_COLOR_ATTACHMENT0\n"); + return GL_COLOR_ATTACHMENT0; + } TRACE("Returning GL_BACK\n"); return GL_BACK; } else if (swapchain_impl->frontBuffer == iface) { @@ -5129,8 +5133,17 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { BOOL surface_is_offscreen(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) This->container; + + /* Not on a swapchain - must be offscreen */ + if (!(This->Flags & SFLAG_SWAPCHAIN)) return TRUE; + + /* The front buffer is always onscreen */ + if(iface == swapchain->frontBuffer) return FALSE; - return !(This->Flags & SFLAG_SWAPCHAIN); + /* If the swapchain is rendered to an FBO, the backbuffer is + * offscreen, otherwise onscreen */ + return swapchain->render_to_fbo; } const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a23166a..5b4075d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -95,6 +95,116 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) HeapFree(GetProcessHeap(), 0, This); } +/* A GL context is provided by the caller */ +static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context) +{ + RECT window; + IWineD3DDeviceImpl *device = This->wineD3DDevice; + IWineD3DSurfaceImpl *backbuffer = ((IWineD3DSurfaceImpl *) This->backBuffer[0]); + UINT w = backbuffer->currentDesc.Width; + UINT h = backbuffer->currentDesc.Height; + GLenum gl_filter; + const struct wined3d_gl_info *gl_info = context->gl_info; + + GetClientRect(This->win_handle, &window); + if(w == window.right && h == window.bottom) gl_filter = GL_NEAREST; + else gl_filter = GL_LINEAR; + + if(gl_info->supported[EXT_FRAMEBUFFER_BLIT]) + { + ENTER_GL(); + context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo); + context_attach_surface_fbo(context, GL_READ_FRAMEBUFFER, 0, This->backBuffer[0]); + context_attach_depth_stencil_fbo(context, GL_READ_FRAMEBUFFER, NULL, FALSE); + + context_bind_fbo(context, GL_DRAW_FRAMEBUFFER, NULL); + glDrawBuffer(GL_BACK); + + glDisable(GL_SCISSOR_TEST); + IWineD3DDeviceImpl_MarkStateDirty(This->wineD3DDevice, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); + + /* Note that the texture is upside down */ + gl_info->fbo_ops.glBlitFramebuffer(0, 0, w, h, + window.left, window.bottom, window.right, window.top, + GL_COLOR_BUFFER_BIT, gl_filter); + checkGLcall("Swapchain present blit(EXT_framebuffer_blit)\n"); + LEAVE_GL(); + } + else + { + struct wined3d_context *context2; + float tex_left = 0; + float tex_top = 0; + float tex_right = w; + float tex_bottom = h; + + context2 = context_acquire(This->wineD3DDevice, This->backBuffer[0], CTXUSAGE_BLIT); + + if(backbuffer->Flags & SFLAG_NORMCOORD) + { + tex_left /= w; + tex_right /= w; + tex_top /= h; + tex_bottom /= h; + } + + ENTER_GL(); + context_bind_fbo(context2, GL_DRAW_FRAMEBUFFER, NULL); + + /* Set up the texture. The surface is not in a IWineD3D*Texture container, + * so there are no d3d texture settings to dirtify + */ + device->blitter->set_shader((IWineD3DDevice *) device, backbuffer->resource.format_desc, + backbuffer->texture_target, backbuffer->pow2Width, + backbuffer->pow2Height); + glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(backbuffer->texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + + glDrawBuffer(GL_BACK); + + /* Set the viewport to the destination rectandle, disable any projection + * transformation set up by CTXUSAGE_BLIT, and draw a (-1,-1)-(1,1) quad. + * + * Back up viewport and matrix to avoid breaking last_was_blit + * + * Note that CTXUSAGE_BLIT set up viewport and ortho to match the surface + * size - we want the GL drawable(=window) size. + */ + glPushAttrib(GL_VIEWPORT_BIT); + glViewport(window.left, window.top, window.right, window.bottom); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); + + glBegin(GL_QUADS); + /* bottom left */ + glTexCoord2f(tex_left, tex_bottom); + glVertex2i(-1, -1); + + /* top left */ + glTexCoord2f(tex_left, tex_top); + glVertex2i(-1, 1); + + /* top right */ + glTexCoord2f(tex_right, tex_top); + glVertex2i(1, 1); + + /* bottom right */ + glTexCoord2f(tex_right, tex_bottom); + glVertex2i(1, -1); + glEnd(); + + glPopMatrix(); + glPopAttrib(); + + device->blitter->unset_shader((IWineD3DDevice *) device); + checkGLcall("Swapchain present blit(manual)\n"); + LEAVE_GL(); + + context_release(context2); + } +} + static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; struct wined3d_context *context; @@ -160,6 +270,22 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); } + if(This->render_to_fbo) + { + /* This codepath should only be hit with the COPY swapeffect. Otherwise a backbuffer- + * window size mismatch is impossible(fullscreen) and src and dst rectangles are + * not allowed(they need the COPY swapeffect) + * + * The DISCARD swap effect is ok as well since any backbuffer content is allowed after + * the swap + */ + if(This->presentParms.SwapEffect == WINED3DSWAPEFFECT_FLIP ) + { + FIXME("Render-to-fbo with WINED3DSWAPEFFECT_FLIP\n"); + } + swapchain_blit(This, context); + } + SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */ TRACE("SwapBuffers called, Starting new frame\n"); @@ -239,9 +365,12 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO WINED3DCLEAR_TARGET, 0xff00ffff, 1.0f, 0); } - if(((IWineD3DSurfaceImpl *) This->frontBuffer)->Flags & SFLAG_INSYSMEM || - ((IWineD3DSurfaceImpl *) This->backBuffer[0])->Flags & SFLAG_INSYSMEM ) { - /* Both memory copies of the surfaces are ok, flip them around too instead of dirtifying */ + if(!This->render_to_fbo && + ( ((IWineD3DSurfaceImpl *) This->frontBuffer)->Flags & SFLAG_INSYSMEM || + ((IWineD3DSurfaceImpl *) This->backBuffer[0])->Flags & SFLAG_INSYSMEM ) ) { + /* Both memory copies of the surfaces are ok, flip them around too instead of dirtifying + * Doesn't work with render_to_fbo because we're not flipping + */ IWineD3DSurfaceImpl *front = (IWineD3DSurfaceImpl *) This->frontBuffer; IWineD3DSurfaceImpl *back = (IWineD3DSurfaceImpl *) This->backBuffer[0]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4fb556c..3173d12 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2413,6 +2413,7 @@ typedef struct IWineD3DSwapChainImpl DWORD orig_width, orig_height; WINED3DFORMAT orig_fmt; WINED3DGAMMARAMP orig_gamma; + BOOL render_to_fbo; long prev_time, frames; /* Performance tracking */ unsigned int vSyncCounter;

1 0

Stefan Dösinger : wined3d: Render to a FBO if the window size is changed.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 548b0bcda5690f653f2c47e204cd19284eb352ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=548b0bcda5690f653f2c47e20… Author: Stefan Dösinger <stefan(a)e195-067.eduroam.tuwien.ac.at> Date: Tue Nov 24 12:31:39 2009 +0100 wined3d: Render to a FBO if the window size is changed. --- dlls/wined3d/swapchain.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5b4075d..21ee5bc 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -270,6 +270,34 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); } + /* Rendering to a window of different size, presenting partial rectangles, + * or rendering to a different window needs help from FBO_blit or a textured + * draw. Render the swapchain to a FBO in the future. + * + * Note that FBO_blit from the backbuffer to the frontbuffer cannot solve + * all these issues - this fails if the window is smaller than the backbuffer. + */ + if(This->presentParms.Windowed && !This->render_to_fbo && + wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + RECT window_size; + GetClientRect(This->win_handle, &window_size); + if(window_size.bottom != This->presentParms.BackBufferHeight || + window_size.right != This->presentParms.BackBufferWidth) + { + TRACE("Window size changed from %ux%u to %ux%u, switching to render-to-fbo mode\n", + This->presentParms.BackBufferWidth, This->presentParms.BackBufferHeight, + window_size.right, window_size.bottom); + + IWineD3DSurface_LoadLocation(This->backBuffer[0], SFLAG_INTEXTURE, NULL); + IWineD3DSurface_ModifyLocation(This->backBuffer[0], SFLAG_INDRAWABLE, FALSE); + This->render_to_fbo = TRUE; + + /* Force the context manager to update the render target configuration next draw */ + context->current_rt = NULL; + } + } + if(This->render_to_fbo) { /* This codepath should only be hit with the COPY swapeffect. Otherwise a backbuffer-

1 0

Stefan Dösinger : Render to fbo when the size mismatches at creation time.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 740e2d403edc46529c2475d50a9ceab7c0c77f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=740e2d403edc46529c2475d50… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Dec 6 18:08:39 2009 +0100 Render to fbo when the size mismatches at creation time. This is needed because the window(and thus the GL drawable) might be smaller than the D3D backbuffer. If we waited for the FBO switch until Present is called we'd lose data in the first frame. --- dlls/wined3d/device.c | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f2cdac..eb5ad5b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1043,6 +1043,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, BOOL displaymode_set = FALSE; WINED3DDISPLAYMODE Mode; const struct GlPixelFormatDesc *format_desc; + RECT client_rect; TRACE("(%p) : Created Additional Swap Chain\n", This); @@ -1115,20 +1116,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, object->orig_fmt = Mode.Format; format_desc = getFormatDescEntry(Mode.Format, &This->adapter->gl_info); + GetClientRect(object->win_handle, &client_rect); if (pPresentationParameters->Windowed && ((pPresentationParameters->BackBufferWidth == 0) || (pPresentationParameters->BackBufferHeight == 0) || (pPresentationParameters->BackBufferFormat == WINED3DFMT_UNKNOWN))) { - RECT Rect; - GetClientRect(object->win_handle, &Rect); - if (pPresentationParameters->BackBufferWidth == 0) { - pPresentationParameters->BackBufferWidth = Rect.right; + pPresentationParameters->BackBufferWidth = client_rect.right; TRACE("Updating width to %d\n", pPresentationParameters->BackBufferWidth); } if (pPresentationParameters->BackBufferHeight == 0) { - pPresentationParameters->BackBufferHeight = Rect.bottom; + pPresentationParameters->BackBufferHeight = client_rect.bottom; TRACE("Updating height to %d\n", pPresentationParameters->BackBufferHeight); } if (pPresentationParameters->BackBufferFormat == WINED3DFMT_UNKNOWN) { @@ -1137,6 +1136,23 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, } } + if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if(pPresentationParameters->BackBufferWidth != client_rect.right || + pPresentationParameters->BackBufferHeight != client_rect.bottom) + { + TRACE("Rendering to FBO. Backbuffer %ux%u, window %ux%u\n", + pPresentationParameters->BackBufferWidth, + pPresentationParameters->BackBufferHeight, + client_rect.right, client_rect.bottom); + object->render_to_fbo = TRUE; + } + else + { + TRACE("Rendering directly to GL_BACK\n"); + } + } + /* Put the correct figures in the presentation parameters */ TRACE("Copying across presentation parameters\n"); object->presentParms = *pPresentationParameters; @@ -1210,6 +1226,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSwapChain(IWineD3DDevice *iface, TRACE("Context created (HWND=%p, glContext=%p)\n", object->win_handle, object->context[0]->glCtx); } + object->context[0]->render_offscreen = object->render_to_fbo; } else { @@ -6911,6 +6928,27 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE ERR("Resetting the stateblock failed with error 0x%08x\n", hr); } + if(wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + RECT client_rect; + GetClientRect(swapchain->win_handle, &client_rect); + + 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; + } + } + hr = create_primary_opengl_context(iface, (IWineD3DSwapChain *) swapchain); IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain);

1 0

Henri Verbeet : d3d8: Fix GetDevice() for surfaces that are part of a texture.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 179cee08b043105da85fd9ffa87f1138f2534a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=179cee08b043105da85fd9ffa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:36 2009 +0100 d3d8: Fix GetDevice() for surfaces that are part of a texture. If the surface is part of a texture it doesn't keep its own reference to the device, but instead relies on the reference the texture has. This fixes a regression introduced by 3cedef2ffea3a72d9717470f01a3a046db923e4b. --- dlls/d3d8/surface.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 1d4b1dc..cf72e3e 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -106,6 +106,23 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, TRACE("iface %p, device %p.\n", iface, device); + if (This->forwardReference) + { + IDirect3DResource8 *resource; + HRESULT hr; + + hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource8, (void **)&resource); + if (SUCCEEDED(hr)) + { + hr = IDirect3DResource8_GetDevice(resource, device); + IDirect3DResource8_Release(resource); + + TRACE("Returning device %p.\n", *device); + } + + return hr; + } + *device = (IDirect3DDevice8 *)This->parentDevice; IDirect3DDevice8_AddRef(*device);

1 0

Henri Verbeet : d3d9: Fix GetDevice() for surfaces that are part of a texture.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 89c96ca31ea51554b70a4c59d56f3b1e8b2d3f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c96ca31ea51554b70a4c59d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:37 2009 +0100 d3d9: Fix GetDevice() for surfaces that are part of a texture. If the surface is part of a texture it doesn't keep its own reference to the device, but instead relies on the reference the texture has. This fixes a regression introduced by ff92e6eb6a6b0f5b6ee0d062f8434cad8f31c33d. --- dlls/d3d9/surface.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 6f55eca..210a0ee 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -108,6 +108,23 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(IDirect3DSurface9 *iface, TRACE("iface %p, device %p.\n", iface, device); + if (This->forwardReference) + { + IDirect3DResource9 *resource; + HRESULT hr; + + hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource9, (void **)&resource); + if (SUCCEEDED(hr)) + { + hr = IDirect3DResource9_GetDevice(resource, device); + IDirect3DResource9_Release(resource); + + TRACE("Returning device %p.\n", *device); + } + + return hr; + } + *device = (IDirect3DDevice9 *)This->parentDevice; IDirect3DDevice9_AddRef(*device);

1 0

Henri Verbeet : dxgi: Add a separate function for surface initialization.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4e29ade658188d7e6fc2df57437f9ec3d6dfb671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e29ade658188d7e6fc2df574… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:38 2009 +0100 dxgi: Add a separate function for surface initialization. --- dlls/dxgi/device.c | 19 +++++++------------ dlls/dxgi/dxgi_private.h | 4 ++-- dlls/dxgi/surface.c | 14 ++++++++++++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 8562d67..7860d0c 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -262,6 +262,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa DXGI_USAGE usage, const DXGI_SHARED_RESOURCE *shared_resource, IUnknown *outer, void **surface) { struct dxgi_surface *object; + HRESULT hr; FIXME("iface %p, desc %p, usage %#x, shared_resource %p, outer %p, surface %p partial stub!\n", iface, desc, usage, shared_resource, outer, surface); @@ -273,22 +274,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - object->vtbl = &dxgi_surface_vtbl; - object->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; - object->refcount = 1; - - if (outer) - { - object->outer_unknown = outer; - *surface = &object->inner_unknown_vtbl; - } - else + hr = dxgi_surface_init(object, outer); + if (FAILED(hr)) { - object->outer_unknown = (IUnknown *)&object->inner_unknown_vtbl; - *surface = object; + WARN("Failed to initialize surface, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; } TRACE("Created IDXGISurface %p\n", object); + *surface = outer ? (void *)&object->inner_unknown_vtbl : object; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 033168b..69c9f6c 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -130,8 +130,6 @@ struct dxgi_swapchain }; /* IDXGISurface */ -extern const struct IDXGISurfaceVtbl dxgi_surface_vtbl DECLSPEC_HIDDEN; -extern const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl DECLSPEC_HIDDEN; struct dxgi_surface { const struct IDXGISurfaceVtbl *vtbl; @@ -140,4 +138,6 @@ struct dxgi_surface LONG refcount; }; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) DECLSPEC_HIDDEN; + #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index bdbeaf3..1e5038b 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -165,7 +165,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface *iface) return E_NOTIMPL; } -const struct IDXGISurfaceVtbl dxgi_surface_vtbl = +static const struct IDXGISurfaceVtbl dxgi_surface_vtbl = { /* IUnknown methods */ dxgi_surface_QueryInterface, @@ -184,10 +184,20 @@ const struct IDXGISurfaceVtbl dxgi_surface_vtbl = dxgi_surface_Unmap, }; -const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = +static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = { /* IUnknown methods */ dxgi_surface_inner_QueryInterface, dxgi_surface_inner_AddRef, dxgi_surface_inner_Release, }; + +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) +{ + surface->vtbl = &dxgi_surface_vtbl; + surface->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; + surface->refcount = 1; + surface->outer_unknown = outer ? outer : (IUnknown *)&surface->inner_unknown_vtbl; + + return S_OK; +}

1 0

Henri Verbeet : dxgi: Implement IDXGISurface::GetDevice().
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: a6b9a637e26e3fac4b10ff0496f3d902520d8453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6b9a637e26e3fac4b10ff049… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 7 11:08:39 2009 +0100 dxgi: Implement IDXGISurface::GetDevice(). --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/surface.c | 11 ++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7860d0c..eddb1e4 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -274,7 +274,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa return E_OUTOFMEMORY; } - hr = dxgi_surface_init(object, outer); + hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer); if (FAILED(hr)) { WARN("Failed to initialize surface, hr %#x.\n", hr); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 69c9f6c..6151800 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -136,8 +136,9 @@ struct dxgi_surface const struct IUnknownVtbl *inner_unknown_vtbl; IUnknown *outer_unknown; LONG refcount; + IDXGIDevice *device; }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) DECLSPEC_HIDDEN; +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) DECLSPEC_HIDDEN; #endif /* __WINE_DXGI_PRIVATE_H */ diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 1e5038b..0d9aef1 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -72,6 +72,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) if (!refcount) { + IDXGIDevice_Release(This->device); HeapFree(GetProcessHeap(), 0, This); } @@ -138,9 +139,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface *iface, REF static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface *iface, REFIID riid, void **device) { - FIXME("iface %p, riid %s, device %p stub!\n", iface, debugstr_guid(riid), device); + struct dxgi_surface *This = (struct dxgi_surface *)iface; - return E_NOTIMPL; + TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + + return IDXGIDevice_QueryInterface(This->device, riid, device); } /* IDXGISurface methods */ @@ -192,12 +195,14 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = dxgi_surface_inner_Release, }; -HRESULT dxgi_surface_init(struct dxgi_surface *surface, IUnknown *outer) +HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) { surface->vtbl = &dxgi_surface_vtbl; surface->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; surface->outer_unknown = outer ? outer : (IUnknown *)&surface->inner_unknown_vtbl; + surface->device = device; + IDXGIDevice_AddRef(device); return S_OK; }

1 0

Marcus Meissner : reg: Fixed 2 functionality bugs in REG DELETE (Coverity).
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 552db89b06bd7d5d8f9afd126ee82ae87c54b849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552db89b06bd7d5d8f9afd126… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 6 22:45:48 2009 +0100 reg: Fixed 2 functionality bugs in REG DELETE (Coverity). --- programs/reg/reg.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f0a8f8b..07dbdbf 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -255,7 +255,8 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, /* FIXME: Prompt for delete */ } - if (!value_name) + /* Delete subtree only if no /v* option is given */ + if (!value_name && !value_empty && !value_all) { if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) { @@ -293,10 +294,10 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, while (1) { count = maxValue; - rc = RegEnumValueW(subkey, 0, value_name, &count, NULL, NULL, NULL, NULL); + rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { - rc = RegDeleteValueW(subkey,value_name); + rc = RegDeleteValueW(subkey, szValue); if (rc != ERROR_SUCCESS) break; }

1 0

Hans Leidekker : wininet: Cleanup any existing cache file before creating a new one.
by Alexandre Julliard 07 Dec '09

07 Dec '09

Module: wine Branch: master Commit: 4a22c88b3776e68ea8fc5b3c669be890b6e92204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a22c88b3776e68ea8fc5b3c6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 7 09:18:00 2009 +0100 wininet: Cleanup any existing cache file before creating a new one. Otherwise we leak the file name and handle when a request is sent again. Found by Valgrind. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 024d5d8..6123c5f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3638,6 +3638,9 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, b = CreateUrlCacheEntryW(url, lpwhr->dwContentLength > 0 ? lpwhr->dwContentLength : 0, NULL, cacheFileName, 0); if(b) { + HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile); + CloseHandle(lpwhr->hCacheFile); + lpwhr->lpszCacheFile = heap_strdupW(cacheFileName); lpwhr->hCacheFile = CreateFileW(lpwhr->lpszCacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0